陈裕财 2 years ago
parent
commit
72f605651a
  1. 2
      xm-core/src/main/java/com/xm/core/service/XmAttachmentService.java
  2. 2
      xm-core/src/main/java/com/xm/core/service/XmBranchTaskTypeStateService.java
  3. 4
      xm-core/src/main/java/com/xm/core/service/XmEnvListService.java
  4. 4
      xm-core/src/main/java/com/xm/core/service/XmFileService.java
  5. 4
      xm-core/src/main/java/com/xm/core/service/XmGroupService.java
  6. 2
      xm-core/src/main/java/com/xm/core/service/XmGroupStateService.java
  7. 4
      xm-core/src/main/java/com/xm/core/service/XmGroupUserService.java
  8. 6
      xm-core/src/main/java/com/xm/core/service/XmIterationService.java
  9. 2
      xm-core/src/main/java/com/xm/core/service/XmIterationStateService.java
  10. 6
      xm-core/src/main/java/com/xm/core/service/XmMenuCommentService.java
  11. 2
      xm-core/src/main/java/com/xm/core/service/XmMenuPlanService.java
  12. 41
      xm-core/src/main/java/com/xm/core/service/XmMenuService.java
  13. 6
      xm-core/src/main/java/com/xm/core/service/XmMenuStateService.java
  14. 8
      xm-core/src/main/java/com/xm/core/service/XmProductService.java
  15. 2
      xm-core/src/main/java/com/xm/core/service/XmProductStateService.java
  16. 4
      xm-core/src/main/java/com/xm/core/service/XmProjectContractService.java
  17. 6
      xm-core/src/main/java/com/xm/core/service/XmProjectService.java
  18. 6
      xm-core/src/main/java/com/xm/core/service/XmProjectStateService.java
  19. 2
      xm-core/src/main/java/com/xm/core/service/XmProjectTaskTypeStateService.java
  20. 6
      xm-core/src/main/java/com/xm/core/service/XmQuestionService.java
  21. 2
      xm-core/src/main/java/com/xm/core/service/XmRecordService.java
  22. 2
      xm-core/src/main/java/com/xm/core/service/XmTaskExecuserService.java
  23. 2
      xm-core/src/main/java/com/xm/core/service/XmTaskSbillService.java
  24. 26
      xm-core/src/main/java/com/xm/core/service/XmTaskService.java
  25. 2
      xm-core/src/main/java/com/xm/core/service/XmTaskSkillService.java
  26. 2
      xm-core/src/main/java/com/xm/core/service/XmTestPlanService.java
  27. 12
      xm-core/src/main/java/com/xm/core/service/XmWorkloadService.java

2
xm-core/src/main/java/com/xm/core/service/XmAttachmentService.java

@ -18,7 +18,7 @@ public class XmAttachmentService extends BaseService<XmAttachmentMapper,XmAttach
XmAttachment del = new XmAttachment(); XmAttachment del = new XmAttachment();
del.setOriginId(originId); del.setOriginId(originId);
del.setOriginType(originType); del.setOriginType(originType);
this.delete("deleteByOrigin",del);
this.baseMapper.deleteByOrigin(del);
if(attachmentList.size() > 0) { if(attachmentList.size() > 0) {
attachmentList.forEach(attach->{ attachmentList.forEach(attach->{
attach.setOriginId(originId); attach.setOriginId(originId);

2
xm-core/src/main/java/com/xm/core/service/XmBranchTaskTypeStateService.java

@ -28,7 +28,7 @@ public class XmBranchTaskTypeStateService extends BaseService<XmBranchTaskTypeSt
return baseMapper.selectListMapByWhere(page,ew,ext); return baseMapper.selectListMapByWhere(page,ew,ext);
} }
public void loadProjectTaskTypeStateToXmBranchTaskTypeState(String branchId) { public void loadProjectTaskTypeStateToXmBranchTaskTypeState(String branchId) {
this.update("loadProjectTaskTypeStateToXmBranchTaskTypeState", branchId);
baseMapper.loadProjectTaskTypeStateToXmBranchTaskTypeState( branchId);
} }
/** 请在此类添加自定义函数 */ /** 请在此类添加自定义函数 */

4
xm-core/src/main/java/com/xm/core/service/XmEnvListService.java

@ -114,7 +114,7 @@ public class XmEnvListService extends BaseService<XmEnvListMapper,XmEnvList> {
} }
private void updateFlowStateByProcInstForDeleteSuccess(Map<String, Object> flowVars) { private void updateFlowStateByProcInstForDeleteSuccess(Map<String, Object> flowVars) {
this.update("updateFlowStateByProcInstForDeleteSuccess", flowVars);
baseMapper.updateFlowStateByProcInstForDeleteSuccess( flowVars);
} }
@ -124,7 +124,7 @@ public class XmEnvListService extends BaseService<XmEnvListMapper,XmEnvList> {
if("1".equals(flowState)) { if("1".equals(flowState)) {
flowVars.put("bizProcInstId", flowVars.get("procInstId")); flowVars.put("bizProcInstId", flowVars.get("procInstId"));
} }
this.update("updateProcessApprova", flowVars);
baseMapper.updateProcessApprova( flowVars);
} }
} }

4
xm-core/src/main/java/com/xm/core/service/XmFileService.java

@ -155,7 +155,7 @@ public class XmFileService extends BaseService<XmFileMapper,XmFile> {
} }
private void updateFlowStateByProcInstForDeleteSuccess(Map<String, Object> flowVars) { private void updateFlowStateByProcInstForDeleteSuccess(Map<String, Object> flowVars) {
this.update("updateFlowStateByProcInstForDeleteSuccess", flowVars);
baseMapper.updateFlowStateByProcInstForDeleteSuccess( flowVars);
} }
@ -165,7 +165,7 @@ public class XmFileService extends BaseService<XmFileMapper,XmFile> {
if("1".equals(flowState)) { if("1".equals(flowState)) {
flowVars.put("bizProcInstId", flowVars.get("procInstId")); flowVars.put("bizProcInstId", flowVars.get("procInstId"));
} }
this.update("updateProcessApprova", flowVars);
baseMapper.updateProcessApprova( flowVars);
} }
} }

4
xm-core/src/main/java/com/xm/core/service/XmGroupService.java

@ -846,7 +846,7 @@ public class XmGroupService extends BaseService<XmGroupMapper,XmGroup> {
pidPathsList.add(pidPathss[i]); pidPathsList.add(pidPathss[i]);
} }
if(pidPathsList.size()>0){//暂时不处理改由前端手段更新 if(pidPathsList.size()>0){//暂时不处理改由前端手段更新
//super.update("sumParents",pidPathsList );
//baseMapper.sumParents(pidPathsList );
} }
} }
@ -889,7 +889,7 @@ public class XmGroupService extends BaseService<XmGroupMapper,XmGroup> {
List<String> ids=set.stream().filter(k->!allSet.contains(k)).collect(Collectors.toList()); List<String> ids=set.stream().filter(k->!allSet.contains(k)).collect(Collectors.toList());
if(ids.size()>0){ if(ids.size()>0){
allSet.addAll(ids.stream().collect(Collectors.toSet())); allSet.addAll(ids.stream().collect(Collectors.toSet()));
//super.update("batchSumParents", ids);////暂时不处理改由前端手段更新
//baseMapper.batchSumParents( ids);////暂时不处理改由前端手段更新
} }
} }

2
xm-core/src/main/java/com/xm/core/service/XmGroupStateService.java

@ -18,7 +18,7 @@ public class XmGroupStateService extends BaseService<XmGroupStateMapper,XmGroupS
*/ */
public int loadTasksToXmProjectGroupState(String projectId) { public int loadTasksToXmProjectGroupState(String projectId) {
return this.update("loadTasksToXmProjectGroupState", projectId);
return baseMapper.loadTasksToXmProjectGroupState( projectId);
} }
} }

4
xm-core/src/main/java/com/xm/core/service/XmGroupUserService.java

@ -19,11 +19,11 @@ public class XmGroupUserService extends BaseService<XmGroupUserMapper,XmGroupUse
XmRecordService xmRecordService; XmRecordService xmRecordService;
public List<XmGroupUser> selectGroupUserListByProjectId(String projectId) { public List<XmGroupUser> selectGroupUserListByProjectId(String projectId) {
return this.selectList("selectGroupUserListByProjectId", projectId);
return baseMapper.selectGroupUserListByProjectId( projectId);
} }
public List<XmGroupUser> selectGroupUserListByProductId(String productId) { public List<XmGroupUser> selectGroupUserListByProductId(String productId) {
return this.selectList("selectGroupUserListByProductId", productId);
return baseMapper.selectGroupUserListByProductId( productId);
} }

6
xm-core/src/main/java/com/xm/core/service/XmIterationService.java

@ -25,7 +25,7 @@ public class XmIterationService extends BaseService<XmIterationMapper,XmIteratio
* call load_tasks_to_xm_iteration_state(inIterationId) * call load_tasks_to_xm_iteration_state(inIterationId)
*/ */
public void loadTasksToXmIterationState(String inIterationId) { public void loadTasksToXmIterationState(String inIterationId) {
this.update("load_tasks_to_xm_iteration_state", inIterationId);
baseMapper.load_tasks_to_xm_iteration_state( inIterationId);
} }
/** /**
@ -35,7 +35,7 @@ public class XmIterationService extends BaseService<XmIterationMapper,XmIteratio
*/ */
public List<Map<String, Object>> selectListMapByWhereWithState(Map<String, Object> iterationMap) { public List<Map<String, Object>> selectListMapByWhereWithState(Map<String, Object> iterationMap) {
// TODO Auto-generated method stub // TODO Auto-generated method stub
return this.selectList("selectListMapByWhereWithState", iterationMap);
return baseMapper.selectListMapByWhereWithState( iterationMap);
} }
@Transactional @Transactional
@ -51,7 +51,7 @@ public class XmIterationService extends BaseService<XmIterationMapper,XmIteratio
seq="0"+seq; seq="0"+seq;
} }
} }
String code=sequenceService.getCommonNo("IT{date:yyyy}-"+seq+"-{rands:4}");
String code=getSequenceService().getCommonNo("IT{date:yyyy}-"+seq+"-{rands:4}");
return code; return code;
} }

2
xm-core/src/main/java/com/xm/core/service/XmIterationStateService.java

@ -36,7 +36,7 @@ public class XmIterationStateService extends BaseService<XmIterationStateMapper,
*/ */
public int loadTasksToXmIterationState(String iterationId) { public int loadTasksToXmIterationState(String iterationId) {
return this.update("loadTasksToXmIterationState", iterationId);
return baseMapper.loadTasksToXmIterationState( iterationId);
} }
} }

6
xm-core/src/main/java/com/xm/core/service/XmMenuCommentService.java

@ -32,15 +32,15 @@ public class XmMenuCommentService extends BaseService<XmMenuCommentMapper, XmMen
} }
public void showComment(String[] ids) { public void showComment(String[] ids) {
this.update("showComment", ids);
baseMapper.showComment( ids);
} }
public void unShowComment(String[] ids) { public void unShowComment(String[] ids) {
this.update("unShowComment", ids);
baseMapper.unShowComment( ids);
} }
public void updateChildrenSum(String pid,Integer addCount) { public void updateChildrenSum(String pid,Integer addCount) {
super.update("updateChildrenSum",map("pid",pid,"addCount",addCount));
baseMapper.updateChildrenSum(map("pid",pid,"addCount",addCount));
} }
public List<Map<String, Object>> selectListByPids(List<String> pids) { public List<Map<String, Object>> selectListByPids(List<String> pids) {

2
xm-core/src/main/java/com/xm/core/service/XmMenuPlanService.java

@ -90,7 +90,7 @@ public class XmMenuPlanService extends BaseService<XmMenuPlanMapper,XmMenuPlan>
*/ */
public int loadTasksToXmMenuPlan(String projectId) { public int loadTasksToXmMenuPlan(String projectId) {
return this.update("loadTasksToXmMenuPlan", projectId);
return baseMapper.loadTasksToXmMenuPlan( projectId);
} }
} }

41
xm-core/src/main/java/com/xm/core/service/XmMenuService.java

@ -48,7 +48,7 @@ public class XmMenuService extends BaseService<XmMenuMapper,XmMenu> {
* @return * @return
*/ */
public List<Map<String, Object>> selectListMapByWhereWithPlan(Map<String, Object> xmMenu) { public List<Map<String, Object>> selectListMapByWhereWithPlan(Map<String, Object> xmMenu) {
return this.selectList("selectListMapByWhereWithPlan", xmMenu);
return baseMapper.selectListMapByWhereWithPlan( xmMenu);
} }
/** /**
@ -59,7 +59,7 @@ public class XmMenuService extends BaseService<XmMenuMapper,XmMenu> {
*/ */
public List<Map<String, Object>> selectListMapByWhereWithState(Map<String, Object> xmMenu) { public List<Map<String, Object>> selectListMapByWhereWithState(Map<String, Object> xmMenu) {
return this.selectList("selectListMapByWhereWithState", xmMenu);
return baseMapper.selectListMapByWhereWithState( xmMenu);
} }
/** /**
@ -70,16 +70,17 @@ public class XmMenuService extends BaseService<XmMenuMapper,XmMenu> {
*/ */
public List<Map<String, Object>> selectListMapByWhereWithPhase(Map<String, Object> xmMenu) { public List<Map<String, Object>> selectListMapByWhereWithPhase(Map<String, Object> xmMenu) {
return this.selectList("selectListMapByWhereWithPhase", xmMenu);
return baseMapper.selectListMapByWhereWithPhase( xmMenu);
} }
public void updateMenuChildrenCntByMenuId(String menuId) { public void updateMenuChildrenCntByMenuId(String menuId) {
super.update("updateMenuChildrenCntByMenuId", menuId);
baseMapper.updateMenuChildrenCntByMenuId( menuId);
} }
public void updateChildrenCntByIds(List<String> ids) { public void updateChildrenCntByIds(List<String> ids) {
super.update("updateChildrenCntByIds", ids);
baseMapper.updateChildrenCntByIds( ids);
} }
@Transactional @Transactional
@ -106,12 +107,12 @@ public class XmMenuService extends BaseService<XmMenuMapper,XmMenu> {
} }
public List<Map<String, Object>> queryTaskUsersByMenuId(String menuId) { public List<Map<String, Object>> queryTaskUsersByMenuId(String menuId) {
return this.selectList("queryTaskUsersByMenuId", menuId);
return baseMapper.queryTaskUsersByMenuId( menuId);
} }
public List<XmMenu> selectExistIterationMenus(List<String> menuIds) { public List<XmMenu> selectExistIterationMenus(List<String> menuIds) {
return this.selectList("selectExistIterationMenus", map("menuIds", menuIds));
return baseMapper.selectExistIterationMenus( map("menuIds", menuIds));
} }
public List<XmMenu> parentIdPathsCalcBeforeSave(List<XmMenu> nodes) { public List<XmMenu> parentIdPathsCalcBeforeSave(List<XmMenu> nodes) {
@ -256,7 +257,7 @@ public class XmMenuService extends BaseService<XmMenuMapper,XmMenu> {
@Transactional @Transactional
public void doBatchDeleteByProductIds(List<String> productIds) { public void doBatchDeleteByProductIds(List<String> productIds) {
super.delete("doBatchDeleteByProductIds", productIds);
super.baseMapper.doBatchDeleteByProductIds( productIds);
} }
@ -288,32 +289,32 @@ public class XmMenuService extends BaseService<XmMenuMapper,XmMenu> {
} }
public void batchUnIteration(XmIterationMenuVo xmIterationMenus) { public void batchUnIteration(XmIterationMenuVo xmIterationMenus) {
super.update("batchUnIteration", xmIterationMenus);
baseMapper.batchUnIteration( xmIterationMenus);
} }
public void batchIteration(XmIterationMenuVo xmIterationMenus) { public void batchIteration(XmIterationMenuVo xmIterationMenus) {
super.update("batchIteration", xmIterationMenus);
baseMapper.batchIteration( xmIterationMenus);
} }
public void batchUnProductPhase(XmPhaseMenusVo xmPhaseMenusVo) { public void batchUnProductPhase(XmPhaseMenusVo xmPhaseMenusVo) {
super.update("batchUnProductPhase", xmPhaseMenusVo);
baseMapper.batchUnProductPhase( xmPhaseMenusVo);
} }
public void batchProductPhase(XmPhaseMenusVo xmPhaseMenusVo) { public void batchProductPhase(XmPhaseMenusVo xmPhaseMenusVo) {
super.update("batchProductPhase", xmPhaseMenusVo);
baseMapper.batchProductPhase( xmPhaseMenusVo);
} }
public List<XmMenu> listTenMenuByProductIdAndIterationId(String productId, String iterationId) { public List<XmMenu> listTenMenuByProductIdAndIterationId(String productId, String iterationId) {
return baseMapper.listTenMenuByProductIdAndIterationId", map("productId", productId, "iterationId( iterationId));
return baseMapper.listTenMenuByProductIdAndIterationId( map("productId", productId, "iterationId", iterationId));
} }
@Transactional @Transactional
public void batchChangeParent(List<XmMenu> xmMenus,XmMenu parentMenu) { public void batchChangeParent(List<XmMenu> xmMenus,XmMenu parentMenu) {
super.update("batchChangeParent",map("menuIds",xmMenus.stream().map(i->i.getMenuId()).collect(Collectors.toList()),"pmenuId",parentMenu.getMenuId(),"parentPidPaths",parentMenu.getPidPaths()));
baseMapper.batchChangeParent(map("menuIds",xmMenus.stream().map(i->i.getMenuId()).collect(Collectors.toList()),"pmenuId",parentMenu.getMenuId(),"parentPidPaths",parentMenu.getPidPaths()));
pushService.pushXmMenu(parentMenu); pushService.pushXmMenu(parentMenu);
} }
@ -349,7 +350,7 @@ public class XmMenuService extends BaseService<XmMenuMapper,XmMenu> {
pidPathsList.add(pidPathss[i]); pidPathsList.add(pidPathss[i]);
} }
if(pidPathsList.size()>0){ if(pidPathsList.size()>0){
super.update("sumParents",pidPathsList );
baseMapper.sumParents(pidPathsList );
} }
} }
@ -391,7 +392,7 @@ public class XmMenuService extends BaseService<XmMenuMapper,XmMenu> {
if(set.size()>0){ if(set.size()>0){
List<String> ids=set.stream().collect(Collectors.toList()); List<String> ids=set.stream().collect(Collectors.toList());
if(ids.size()>0){ if(ids.size()>0){
super.update("batchSumParents", ids);
baseMapper.batchSumParents( ids);
} }
} }
@ -414,18 +415,18 @@ public class XmMenuService extends BaseService<XmMenuMapper,XmMenu> {
@Override @Override
public String createKey(String keyName) { public String createKey(String keyName) {
return "M"+sequenceService.getCommonNo("{date62:yyyyMMddHHmmss}{rands:4}");
return "M"+getSequenceService().getCommonNo("{date62:yyyyMMddHHmmss}{rands:4}");
} }
public void updateUps(List<String> menuIds) { public void updateUps(List<String> menuIds) {
super.update("updateUps",menuIds);
baseMapper.updateUps(menuIds);
} }
public void updateComments(List<String> menuIds) { public void updateComments(List<String> menuIds) {
super.update("updateComments",menuIds);
baseMapper.updateComments(menuIds);
} }
public void upReads(String menuId,Integer reads) { public void upReads(String menuId,Integer reads) {
super.update("upReads",map("menuId",menuId,"reads",reads));
baseMapper.upReads(map("menuId",menuId,"reads",reads));
} }
} }

6
xm-core/src/main/java/com/xm/core/service/XmMenuStateService.java

@ -116,7 +116,7 @@ public class XmMenuStateService extends BaseService<XmMenuStateMapper,XmMenuStat
pidPathsList.add(pidPathss[i]); pidPathsList.add(pidPathss[i]);
} }
if(pidPathsList.size()>0){ if(pidPathsList.size()>0){
super.update("sumParents",pidPathsList );
baseMapper.sumParents(pidPathsList );
} }
} }
@ -159,7 +159,7 @@ public class XmMenuStateService extends BaseService<XmMenuStateMapper,XmMenuStat
List<String> ids=set.stream().filter(k->!allSet.contains(k)).collect(Collectors.toList()); List<String> ids=set.stream().filter(k->!allSet.contains(k)).collect(Collectors.toList());
if(ids.size()>0){ if(ids.size()>0){
allSet.addAll(ids.stream().collect(Collectors.toSet())); allSet.addAll(ids.stream().collect(Collectors.toSet()));
super.update("batchSumParents", ids);
baseMapper.batchSumParents( ids);
} }
} }
@ -179,7 +179,7 @@ public class XmMenuStateService extends BaseService<XmMenuStateMapper,XmMenuStat
*/ */
public int loadTasksToXmMenuState(String productId) { public int loadTasksToXmMenuState(String productId) {
return this.update("loadTasksToXmMenuState", productId);
return baseMapper.loadTasksToXmMenuState( productId);
} }
} }

8
xm-core/src/main/java/com/xm/core/service/XmProductService.java

@ -97,7 +97,7 @@ public class XmProductService extends BaseService<XmProductMapper,XmProduct> {
*/ */
public List<Map<String, Object>> selectListMapByWhereWithState(Map<String, Object> iterationMap) { public List<Map<String, Object>> selectListMapByWhereWithState(Map<String, Object> iterationMap) {
// TODO Auto-generated method stub // TODO Auto-generated method stub
return this.selectList("selectListMapByWhereWithState", iterationMap);
return baseMapper.selectListMapByWhereWithState( iterationMap);
} }
@Transactional @Transactional
@ -368,16 +368,16 @@ public class XmProductService extends BaseService<XmProductMapper,XmProduct> {
seq="0"+seq; seq="0"+seq;
} }
} }
String code=sequenceService.getCommonNo("PD{date:yyyy}-"+seq+"-{rands:2}");
String code=getSequenceService().getCommonNo("PD{date:yyyy}-"+seq+"-{rands:2}");
return code; return code;
} }
public String createProductId(String code){ public String createProductId(String code){
String id=sequenceService.getCommonNo(code+"-{rands:4}");
String id=getSequenceService().getCommonNo(code+"-{rands:4}");
XmProduct xmProduct=new XmProduct(id); XmProduct xmProduct=new XmProduct(id);
long idcount=this.countByWhere(xmProduct); long idcount=this.countByWhere(xmProduct);
while (idcount>0){ while (idcount>0){
id=sequenceService.getCommonNo(code+"-{rands:4}");
id=getSequenceService().getCommonNo(code+"-{rands:4}");
xmProduct=new XmProduct(id); xmProduct=new XmProduct(id);
idcount=this.countByWhere(xmProduct); idcount=this.countByWhere(xmProduct);
} }

2
xm-core/src/main/java/com/xm/core/service/XmProductStateService.java

@ -34,7 +34,7 @@ public class XmProductStateService extends BaseService<XmProductStateMapper, XmP
*/ */
public int loadTasksToXmProductState(String productId) { public int loadTasksToXmProductState(String productId) {
return this.update("loadTasksToXmProductState", productId);
return baseMapper.loadTasksToXmProductState( productId);
} }
} }

4
xm-core/src/main/java/com/xm/core/service/XmProjectContractService.java

@ -101,7 +101,7 @@ public class XmProjectContractService extends BaseService<XmProjectContractMappe
} }
private void updateFlowStateByProcInstForDeleteSuccess(Map<String, Object> flowVars) { private void updateFlowStateByProcInstForDeleteSuccess(Map<String, Object> flowVars) {
this.update("updateFlowStateByProcInstForDeleteSuccess", flowVars);
baseMapper.updateFlowStateByProcInstForDeleteSuccess( flowVars);
} }
@ -111,7 +111,7 @@ public class XmProjectContractService extends BaseService<XmProjectContractMappe
if("1".equals(flowState)) { if("1".equals(flowState)) {
flowVars.put("bizProcInstId", flowVars.get("procInstId")); flowVars.put("bizProcInstId", flowVars.get("procInstId"));
} }
this.update("updateProcessApprova", flowVars);
baseMapper.updateProcessApprova( flowVars);
} }
/** 请在此类添加自定义函数 */ /** 请在此类添加自定义函数 */

6
xm-core/src/main/java/com/xm/core/service/XmProjectService.java

@ -339,16 +339,16 @@ public class XmProjectService extends BaseService<XmProjectMapper,XmProject> {
seq="0"+seq; seq="0"+seq;
} }
} }
String code=sequenceService.getCommonNo("PJ{date:yyyy}-"+seq+"-{rands:2}");
String code=getSequenceService().getCommonNo("PJ{date:yyyy}-"+seq+"-{rands:2}");
return code; return code;
} }
public String createProjectId(String code){ public String createProjectId(String code){
String id=sequenceService.getCommonNo(code+"-{rands:4}");
String id=getSequenceService().getCommonNo(code+"-{rands:4}");
XmProject xmProject=new XmProject(id); XmProject xmProject=new XmProject(id);
long idcount=this.countByWhere(xmProject); long idcount=this.countByWhere(xmProject);
while (idcount>0){ while (idcount>0){
id=sequenceService.getCommonNo(code+"-{rands:4}");
id=getSequenceService().getCommonNo(code+"-{rands:4}");
xmProject=new XmProject(id); xmProject=new XmProject(id);
idcount=this.countByWhere(xmProject); idcount=this.countByWhere(xmProject);
} }

6
xm-core/src/main/java/com/xm/core/service/XmProjectStateService.java

@ -35,14 +35,14 @@ public class XmProjectStateService extends BaseService<XmProjectStateMapper, XmP
return baseMapper.selectListMapByWhere(page,ew,ext); return baseMapper.selectListMapByWhere(page,ew,ext);
} }
public int loadTasksToXmProjectState(String projectId) { public int loadTasksToXmProjectState(String projectId) {
return this.update("loadTasksToXmProjectState", projectId);
return baseMapper.loadTasksToXmProjectState( projectId);
} }
public int loadTasksSettleToXmProjectState(String projectId) { public int loadTasksSettleToXmProjectState(String projectId) {
return this.update("loadTasksSettleToXmProjectState", projectId);
return baseMapper.loadTasksSettleToXmProjectState( projectId);
} }
public List<Map<String, Object>> selectPortalProjectStates(Map<String,Object> params) { public List<Map<String, Object>> selectPortalProjectStates(Map<String,Object> params) {
return this.selectList("selectPortalProjectStates",params);
return baseMapper.selectPortalProjectStates(params);
} }
} }

2
xm-core/src/main/java/com/xm/core/service/XmProjectTaskTypeStateService.java

@ -18,7 +18,7 @@ import java.util.Map;
public class XmProjectTaskTypeStateService extends BaseService<XmProjectTaskTypeStateMapper, XmProjectTaskTypeState> { public class XmProjectTaskTypeStateService extends BaseService<XmProjectTaskTypeStateMapper, XmProjectTaskTypeState> {
public void loadTasksToXmProjectTaskTypeState(String projectId) { public void loadTasksToXmProjectTaskTypeState(String projectId) {
this.update("loadTasksToXmProjectTaskTypeState", projectId);
baseMapper.loadTasksToXmProjectTaskTypeState( projectId);
} }
/** /**

6
xm-core/src/main/java/com/xm/core/service/XmQuestionService.java

@ -192,7 +192,7 @@ public class XmQuestionService extends BaseService<XmQuestionMapper,XmQuestion>
} }
private void updateFlowStateByProcInstForDeleteSuccess(Map<String, Object> flowVars) { private void updateFlowStateByProcInstForDeleteSuccess(Map<String, Object> flowVars) {
this.update("updateFlowStateByProcInstForDeleteSuccess", flowVars);
baseMapper.updateFlowStateByProcInstForDeleteSuccess( flowVars);
} }
@ -202,7 +202,7 @@ public class XmQuestionService extends BaseService<XmQuestionMapper,XmQuestion>
if("1".equals(flowState)) { if("1".equals(flowState)) {
flowVars.put("bizProcInstId", flowVars.get("procInstId")); flowVars.put("bizProcInstId", flowVars.get("procInstId"));
} }
this.update("updateProcessApprova", flowVars);
baseMapper.updateProcessApprova( flowVars);
} }
@ -220,7 +220,7 @@ public class XmQuestionService extends BaseService<XmQuestionMapper,XmQuestion>
@Override @Override
public String createKey(String keyName) { public String createKey(String keyName) {
return "Q"+sequenceService.getCommonNo("{date62:yyyyMMddHHmmss}{rands:4}");
return "Q"+getSequenceService().getCommonNo("{date62:yyyyMMddHHmmss}{rands:4}");
} }
public List<Map<String, Object>> getXmQuestionRetestDist(Map<String, Object> xmQuestion) { public List<Map<String, Object>> getXmQuestionRetestDist(Map<String, Object> xmQuestion) {

2
xm-core/src/main/java/com/xm/core/service/XmRecordService.java

@ -444,7 +444,7 @@ public class XmRecordService extends BaseService<XmRecordMapper,XmRecord> {
} }
@Override @Override
public String createKey(String keyName) { public String createKey(String keyName) {
return "R"+sequenceService.getCommonNo("{date62:yyyyMMddHHmmss}{rands:4}");
return "R"+getSequenceService().getCommonNo("{date62:yyyyMMddHHmmss}{rands:4}");
} }
public List<String> selectChangeProjectIds() { public List<String> selectChangeProjectIds() {

2
xm-core/src/main/java/com/xm/core/service/XmTaskExecuserService.java

@ -268,7 +268,7 @@ public class XmTaskExecuserService extends BaseService<XmTaskExecuserMapper,XmTa
* @param taskId * @param taskId
*/ */
public void updateXmTaskExeUseridsAndUsernamesByTaskId(String taskId) { public void updateXmTaskExeUseridsAndUsernamesByTaskId(String taskId) {
this.update("updateXmTaskExeUseridsAndUsernamesByTaskId", taskId);
baseMapper.updateXmTaskExeUseridsAndUsernamesByTaskId( taskId);
} }
public List<Map<String,Object>> selectListMapByWhereWithTask(Map<String,Object> params){ public List<Map<String,Object>> selectListMapByWhereWithTask(Map<String,Object> params){

2
xm-core/src/main/java/com/xm/core/service/XmTaskSbillService.java

@ -157,7 +157,7 @@ public class XmTaskSbillService extends BaseService<XmTaskSbillMapper,XmTaskSbil
} }
public void updateBySbillDetailList(List<String> sbillIds) { public void updateBySbillDetailList(List<String> sbillIds) {
super.update("updateBySbillDetailList",sbillIds);
baseMapper.updateBySbillDetailList(sbillIds);
} }
@Transactional @Transactional

26
xm-core/src/main/java/com/xm/core/service/XmTaskService.java

@ -191,7 +191,7 @@ public class XmTaskService extends BaseService<XmTaskMapper,XmTask> {
} }
public void updateTaskChildrenCntByTaskId(String taskId){ public void updateTaskChildrenCntByTaskId(String taskId){
super.update("updateTaskChildrenCntByTaskId",taskId);
baseMapper.updateTaskChildrenCntByTaskId(taskId);
} }
public List<Map<String,Object>> getTask(Map<String,Object> xmTask){ public List<Map<String,Object>> getTask(Map<String,Object> xmTask){
@ -496,7 +496,7 @@ public class XmTaskService extends BaseService<XmTaskMapper,XmTask> {
@Transactional @Transactional
public void batchRelTasksWithMenu(BatchRelTasksWithMenu tasksWithMenu,XmMenu xmMenuDb) { public void batchRelTasksWithMenu(BatchRelTasksWithMenu tasksWithMenu,XmMenu xmMenuDb) {
Map<String,Object> map=map("menuId",tasksWithMenu.getMenuId(),"menuName",xmMenuDb.getMenuName(),"productId",xmMenuDb.getProductId(),"taskIds",tasksWithMenu.getTaskIds()); Map<String,Object> map=map("menuId",tasksWithMenu.getMenuId(),"menuName",xmMenuDb.getMenuName(),"productId",xmMenuDb.getProductId(),"taskIds",tasksWithMenu.getTaskIds());
super.update("batchRelTasksWithMenu",map);
baseMapper.batchRelTasksWithMenu(map);
} }
@Transactional @Transactional
@ -520,7 +520,7 @@ public class XmTaskService extends BaseService<XmTaskMapper,XmTask> {
} }
public void updateChildrenCntByIds(List<String> ids) { public void updateChildrenCntByIds(List<String> ids) {
super.update("updateChildrenCntByIds",ids);
baseMapper.updateChildrenCntByIds(ids);
} }
@ -668,7 +668,7 @@ public class XmTaskService extends BaseService<XmTaskMapper,XmTask> {
pidPathsList.add(pidPathss[i]); pidPathsList.add(pidPathss[i]);
} }
if(pidPathsList.size()>0){ if(pidPathsList.size()>0){
super.update("sumParents",pidPathsList );
baseMapper.sumParents(pidPathsList );
} }
} }
@ -711,7 +711,7 @@ public class XmTaskService extends BaseService<XmTaskMapper,XmTask> {
if(set.size()>0){ if(set.size()>0){
List<String> ids=set.stream().collect(Collectors.toList()); List<String> ids=set.stream().collect(Collectors.toList());
if(ids.size()>0){ if(ids.size()>0){
super.update("batchSumParents", ids);
baseMapper.batchSumParents( ids);
} }
} }
@ -761,7 +761,7 @@ public class XmTaskService extends BaseService<XmTaskMapper,XmTask> {
} }
public void batchRelTasksWithPhase(BatchRelTasksWithPhase tasksPhase) { public void batchRelTasksWithPhase(BatchRelTasksWithPhase tasksPhase) {
super.update("batchRelTasksWithPhase",tasksPhase);
baseMapper.batchRelTasksWithPhase(tasksPhase);
} }
public Map<String,Object> calcProjectAndTaskBudget(String projectId,List<String> excludeTaskIds){ public Map<String,Object> calcProjectAndTaskBudget(String projectId,List<String> excludeTaskIds){
@ -802,7 +802,7 @@ public class XmTaskService extends BaseService<XmTaskMapper,XmTask> {
@Transactional @Transactional
public void batchChangeParent(List<XmTask> xmTasks,XmTask parentTask) { public void batchChangeParent(List<XmTask> xmTasks,XmTask parentTask) {
super.update("batchChangeParent",map("taskIds",xmTasks.stream().map(i->i.getId()).collect(Collectors.toList()),"parentTaskid",parentTask.getId(),"parentTaskname",parentTask.getName(),"parentPidPaths",parentTask.getPidPaths()));
baseMapper.batchChangeParent(map("taskIds",xmTasks.stream().map(i->i.getId()).collect(Collectors.toList()),"parentTaskid",parentTask.getId(),"parentTaskname",parentTask.getName(),"parentPidPaths",parentTask.getPidPaths()));
pushService.pushXmTask(parentTask); pushService.pushXmTask(parentTask);
} }
@ -811,7 +811,7 @@ public class XmTaskService extends BaseService<XmTaskMapper,XmTask> {
* @param taskId * @param taskId
*/ */
public void updateActCostAndActWorkloadAfterSettle(String taskId,String toTaskState) { public void updateActCostAndActWorkloadAfterSettle(String taskId,String toTaskState) {
super.update("updateActCostAndActWorkloadAfterSettle",map("id",taskId,"taskState",toTaskState));
baseMapper.updateActCostAndActWorkloadAfterSettle(map("id",taskId,"taskState",toTaskState));
} }
public void calcWorkloadByRecord(String id) { public void calcWorkloadByRecord(String id) {
@ -827,11 +827,11 @@ public class XmTaskService extends BaseService<XmTaskMapper,XmTask> {
return; return;
} }
ids=ids.stream().collect(Collectors.toSet()).stream().collect(Collectors.toList()); ids=ids.stream().collect(Collectors.toSet()).stream().collect(Collectors.toList());
super.update("calcWorkloadByRecord",ids);
baseMapper.calcWorkloadByRecord(ids);
} }
public void batchUpdateBudgetWorkloadAndRate(List<String> ids,BigDecimal budgetWorkload) { public void batchUpdateBudgetWorkloadAndRate(List<String> ids,BigDecimal budgetWorkload) {
super.update("batchUpdateBudgetWorkloadAndRate",map("ids",ids,"budgetWorkload",budgetWorkload));
baseMapper.batchUpdateBudgetWorkloadAndRate(map("ids",ids,"budgetWorkload",budgetWorkload));
} }
public List<Map<String, Object>> getXmTaskAttDist(Map<String, Object> xmTask) { public List<Map<String, Object>> getXmTaskAttDist(Map<String, Object> xmTask) {
@ -848,15 +848,15 @@ public class XmTaskService extends BaseService<XmTaskMapper,XmTask> {
@Override @Override
public String createKey(String keyName) { public String createKey(String keyName) {
return "T"+sequenceService.getCommonNo("{date62:yyyyMMddHHmmss}{rands:4}");
return "T"+getSequenceService().getCommonNo("{date62:yyyyMMddHHmmss}{rands:4}");
} }
public void upBrowseTimes(String id,Integer nums) { public void upBrowseTimes(String id,Integer nums) {
super.update("upBrowseTimes",map("id",id,"nums",nums));
baseMapper.upBrowseTimes(map("id",id,"nums",nums));
} }
public void updateSomeFieldByPkAfterPaySuccess(XmTask xmTaskUpdate) { public void updateSomeFieldByPkAfterPaySuccess(XmTask xmTaskUpdate) {
super.update("updateSomeFieldByPkAfterPaySuccess",xmTaskUpdate);
baseMapper.updateSomeFieldByPkAfterPaySuccess(xmTaskUpdate);
} }
} }

2
xm-core/src/main/java/com/xm/core/service/XmTaskSkillService.java

@ -52,7 +52,7 @@ public class XmTaskSkillService extends BaseService<XmTaskSkillMapper,XmTaskSkil
} }
public void updateXmTaskSkillIdsAndNamesByTaskId(String taskId) { public void updateXmTaskSkillIdsAndNamesByTaskId(String taskId) {
super.update("updateXmTaskSkillIdsAndNamesByTaskId", taskId);
baseMapper.updateXmTaskSkillIdsAndNamesByTaskId( taskId);
} }
} }

2
xm-core/src/main/java/com/xm/core/service/XmTestPlanService.java

@ -31,7 +31,7 @@ public class XmTestPlanService extends BaseService<XmTestPlanMapper, XmTestPlan>
return baseMapper.selectListMapByWhere(page,ew,ext); return baseMapper.selectListMapByWhere(page,ew,ext);
} }
public void calcXmTestPlan(String id) { public void calcXmTestPlan(String id) {
super.update("calcXmTestPlan",id);
baseMapper.calcXmTestPlan(id);
} }
} }

12
xm-core/src/main/java/com/xm/core/service/XmWorkloadService.java

@ -46,11 +46,11 @@ public class XmWorkloadService extends BaseService<XmWorkloadMapper, XmWorkload>
public List<Map<String,Object>> listTaskWorkloadBySbillIdGroupByUseridAndTaskId(String sbillId) { public List<Map<String,Object>> listTaskWorkloadBySbillIdGroupByUseridAndTaskId(String sbillId) {
return this.selectList("listTaskWorkloadBySbillIdGroupByUseridAndTaskId",sbillId);
return baseMapper.listTaskWorkloadBySbillIdGroupByUseridAndTaskId(sbillId);
} }
public void updateStatusBySbillIdBySbillDel(String sbillId) { public void updateStatusBySbillIdBySbillDel(String sbillId) {
super.update("updateStatusBySbillIdBySbillDel",sbillId);
baseMapper.updateStatusBySbillIdBySbillDel(sbillId);
} }
@ -60,7 +60,7 @@ public class XmWorkloadService extends BaseService<XmWorkloadMapper, XmWorkload>
} }
public void updateStatusBySbillIdByFlowState(String sbillId,String sstatus) { public void updateStatusBySbillIdByFlowState(String sbillId,String sstatus) {
super.update("updateStatusBySbillIdByFlowState",map("sbillId",sbillId,"sstatus",sstatus));
baseMapper.updateStatusBySbillIdByFlowState(map("sbillId",sbillId,"sstatus",sstatus));
} }
public List<Map<String, Object>> ListGroupByTaskIdAndUserid(Map<String, Object> xmWorkload) { public List<Map<String, Object>> ListGroupByTaskIdAndUserid(Map<String, Object> xmWorkload) {
@ -72,16 +72,16 @@ public class XmWorkloadService extends BaseService<XmWorkloadMapper, XmWorkload>
} }
public void updateStatusAfterJoinSbill(Map<String,Object> details) { public void updateStatusAfterJoinSbill(Map<String,Object> details) {
super.update("updateStatusAfterJoinSbill",details);
baseMapper.updateStatusAfterJoinSbill(details);
} }
public void updateStatusAfterDetailDel(List<String> detailIds) { public void updateStatusAfterDetailDel(List<String> detailIds) {
super.update("updateStatusAfterDetailDel",detailIds);
baseMapper.updateStatusAfterDetailDel(detailIds);
} }
@Override @Override
public String createKey(String keyName) { public String createKey(String keyName) {
return "TW"+sequenceService.getCommonNo("{date62:yyyyMMddHHmmss}{rands:4}");
return "TW"+getSequenceService().getCommonNo("{date62:yyyyMMddHHmmss}{rands:4}");
} }
} }
Loading…
Cancel
Save