diff --git a/xm-core/src/main/java/com/xm/core/ctrl/XmTaskSbillController.java b/xm-core/src/main/java/com/xm/core/ctrl/XmTaskSbillController.java index 7c9d1e8d..ad938453 100644 --- a/xm-core/src/main/java/com/xm/core/ctrl/XmTaskSbillController.java +++ b/xm-core/src/main/java/com/xm/core/ctrl/XmTaskSbillController.java @@ -9,11 +9,11 @@ import com.mdp.safe.client.utils.LoginUtils; import com.xm.core.entity.XmTask; import com.xm.core.entity.XmTaskSbill; import com.xm.core.entity.XmTaskSbillDetail; -import com.xm.core.entity.XmTaskWorkload; +import com.xm.core.entity.XmWorkload; import com.xm.core.service.XmTaskSbillDetailService; import com.xm.core.service.XmTaskSbillService; import com.xm.core.service.XmTaskService; -import com.xm.core.service.XmTaskWorkloadService; +import com.xm.core.service.XmWorkloadService; import com.xm.core.vo.BatchJoinToSbillVo; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; @@ -60,7 +60,7 @@ public class XmTaskSbillController { @Autowired - XmTaskWorkloadService xmTaskWorkloadService; + XmWorkloadService xmWorkloadService; @ApiOperation( value = "查询任务结算表信息列表",notes=" ") @@ -204,11 +204,11 @@ public class XmTaskSbillController { if(!user.getUserid().equals(sbillDb.getCuserid())){ return ResponseHelper.failed("cuserid-0","结算单不是您的结算单，您不能操作"); } - List workloadsDb=xmTaskWorkloadService.selectListByIds(batchJoinToSbill.getWorkloadIds()); + List workloadsDb= xmWorkloadService.selectListByIds(batchJoinToSbill.getWorkloadIds()); if(workloadsDb==null || workloadsDb.size()<=0){ return ResponseHelper.failed("workloadsDb-0","工时单已不存在"); } - List workloadsDb2=workloadsDb.stream().filter(i->!StringUtils.hasText(i.getSbillId()) && "1".equals(i.getSstatus())&&"1".equals(i.getWstatus())).collect(Collectors.toList()); + List workloadsDb2=workloadsDb.stream().filter(i->!StringUtils.hasText(i.getSbillId()) && "1".equals(i.getSstatus())&&"1".equals(i.getWstatus())).collect(Collectors.toList()); if(workloadsDb2==null || workloadsDb2.size()<=0){ return ResponseHelper.failed("workloadsDb-0","不存在可以结算的工时单。"); } @@ -228,7 +228,7 @@ public class XmTaskSbillController { if(xmTasksDb2==null || xmTasksDb2.size()==0){ return ResponseHelper.failed("taskState-not-2","任务必须是已完工状态才能结算。"); } - List workloadsDb3=workloadsDb2.stream().filter(i->xmTasksDb2.stream().filter(k->k.getId().equals(i.getTaskId())).findAny().isPresent()).collect(Collectors.toList()); + List workloadsDb3=workloadsDb2.stream().filter(i->xmTasksDb2.stream().filter(k->k.getId().equals(i.getTaskId())).findAny().isPresent()).collect(Collectors.toList()); //检查是否已有同样的数据加入了结算单，如果有，需要合并 @@ -245,7 +245,7 @@ public class XmTaskSbillController { if(sameSbillDetails!=null && sameSbillDetails.size()>0){ for (XmTaskSbillDetail detail : sameSbillDetails) { //进行合并操作 - for (XmTaskWorkload xmTaskWorkload : workloadsDb3) { + for (XmWorkload xmTaskWorkload : workloadsDb3) { if(detail.getUserid().equals(xmTaskWorkload.getUserid()) && detail.getTaskId().equals(xmTaskWorkload.getTaskId())){ detail.setWorkload(NumberUtil.getBigDecimal(detail.getWorkload(),BigDecimal.ZERO).add(NumberUtil.getBigDecimal(xmTaskWorkload.getWorkload(),BigDecimal.ZERO))); detail.setSworkload(NumberUtil.getBigDecimal(detail.getSworkload(),BigDecimal.ZERO).add(NumberUtil.getBigDecimal(xmTaskWorkload.getWorkload(),BigDecimal.ZERO))); @@ -255,9 +255,9 @@ public class XmTaskSbillController { } - List workloadsDb4=workloadsDb3.stream().filter(i->!sameSbillDetails.stream().filter(k->k.getUserid().equals(i.getUserid()) && k.getTaskId().equals(i.getTaskId())).findAny().isPresent()).collect(Collectors.toList()); + List workloadsDb4=workloadsDb3.stream().filter(i->!sameSbillDetails.stream().filter(k->k.getUserid().equals(i.getUserid()) && k.getTaskId().equals(i.getTaskId())).findAny().isPresent()).collect(Collectors.toList()); Map detailMap=new HashMap<>(); - for (XmTaskWorkload xmTaskWorkload : workloadsDb4) { + for (XmWorkload xmTaskWorkload : workloadsDb4) { XmTaskSbillDetail detail=detailMap.get(xmTaskWorkload.getUserid()+"-"+xmTaskWorkload.getTaskId()); if(detail==null){ detail=new XmTaskSbillDetail(); diff --git a/xm-core/src/main/java/com/xm/core/ctrl/XmTaskWorkloadController.java b/xm-core/src/main/java/com/xm/core/ctrl/XmTaskWorkloadController.java index ad1fd6cc..3847c9ac 100644 --- a/xm-core/src/main/java/com/xm/core/ctrl/XmTaskWorkloadController.java +++ b/xm-core/src/main/java/com/xm/core/ctrl/XmTaskWorkloadController.java @@ -12,7 +12,7 @@ import com.mdp.safe.client.entity.User; import com.mdp.safe.client.utils.LoginUtils; import com.xm.core.entity.XmMenu; import com.xm.core.entity.XmTask; -import com.xm.core.entity.XmTaskWorkload; +import com.xm.core.entity.XmWorkload; import com.xm.core.queue.XmTaskSumParentsPushService; import com.xm.core.service.*; import io.swagger.annotations.Api; @@ -51,7 +51,7 @@ public class XmTaskWorkloadController { static Logger logger =LoggerFactory.getLogger(XmTaskWorkloadController.class); @Autowired - private XmTaskWorkloadService xmTaskWorkloadService; + private XmWorkloadService xmWorkloadService; @Autowired XmTaskService xmTaskService; @@ -67,12 +67,12 @@ public class XmTaskWorkloadController { XmTaskSumParentsPushService pushService; - Map fieldsMap = BaseUtils.toMap(new XmTaskWorkload()); + Map fieldsMap = BaseUtils.toMap(new XmWorkload()); @ApiOperation( value = "查询工时登记表信息列表",notes=" ") @ApiResponses({ - @ApiResponse(code = 200,response=XmTaskWorkload.class,message = "{tips:{isOk:true/false,msg:'成功/失败原因',tipscode:'错误码'},total:总记录数,data:[数据对象1,数据对象2,...]}") + @ApiResponse(code = 200,response= XmWorkload.class,message = "{tips:{isOk:true/false,msg:'成功/失败原因',tipscode:'错误码'},total:总记录数,data:[数据对象1,数据对象2,...]}") }) @RequestMapping(value="/list",method=RequestMethod.GET) public Map listXmTaskWorkload( @ApiIgnore @RequestParam Map xmTaskWorkload){ @@ -88,7 +88,7 @@ public class XmTaskWorkloadController { String userid= (String) xmTaskWorkload.get("userid"); User user=LoginUtils.getCurrentUserInfo(); xmTaskWorkload.put("linkBranchId",user.getBranchId()); - List> xmTaskWorkloadList = xmTaskWorkloadService.selectListMapByWhere(xmTaskWorkload); //列出XmTaskWorkload列表 + List> xmTaskWorkloadList = xmWorkloadService.selectListMapByWhere(xmTaskWorkload); //列出XmTaskWorkload列表 PageUtils.responePage(m, xmTaskWorkloadList); m.put("data",xmTaskWorkloadList); @@ -97,7 +97,7 @@ public class XmTaskWorkloadController { } @ApiOperation( value = "查询项目每日登记工时情况",notes=" ") @ApiResponses({ - @ApiResponse(code = 200,response=XmTaskWorkload.class,message = "{tips:{isOk:true/false,msg:'成功/失败原因',tipscode:'错误码'},total:总记录数,data:[数据对象1,数据对象2,...]}") + @ApiResponse(code = 200,response= XmWorkload.class,message = "{tips:{isOk:true/false,msg:'成功/失败原因',tipscode:'错误码'},total:总记录数,data:[数据对象1,数据对象2,...]}") }) @RequestMapping(value="/listProjectWorkloadSetDay",method=RequestMethod.GET) public Map listProjectWorkloadSetDay( @ApiIgnore @RequestParam Map xmTaskWorkload){ @@ -106,7 +106,7 @@ public class XmTaskWorkloadController { PageUtils.startPage(xmTaskWorkload); User user=LoginUtils.getCurrentUserInfo(); xmTaskWorkload.put("linkBranchId",user.getBranchId()); - List> xmTaskWorkloadList = xmTaskWorkloadService.listProjectWorkloadSetDay(xmTaskWorkload); //列出XmTaskWorkload列表 + List> xmTaskWorkloadList = xmWorkloadService.listProjectWorkloadSetDay(xmTaskWorkload); //列出XmTaskWorkload列表 PageUtils.responePage(m, xmTaskWorkloadList); m.put("data",xmTaskWorkloadList); @@ -117,7 +117,7 @@ public class XmTaskWorkloadController { @ApiOperation( value = "查询项目每月登记工时情况",notes=" ") @ApiResponses({ - @ApiResponse(code = 200,response=XmTaskWorkload.class,message = "{tips:{isOk:true/false,msg:'成功/失败原因',tipscode:'错误码'},total:总记录数,data:[数据对象1,数据对象2,...]}") + @ApiResponse(code = 200,response= XmWorkload.class,message = "{tips:{isOk:true/false,msg:'成功/失败原因',tipscode:'错误码'},total:总记录数,data:[数据对象1,数据对象2,...]}") }) @RequestMapping(value="/listProjectWorkloadSetMonth",method=RequestMethod.GET) public Map listProjectWorkloadSetMonth( @ApiIgnore @RequestParam Map xmTaskWorkload){ @@ -126,7 +126,7 @@ public class XmTaskWorkloadController { PageUtils.startPage(xmTaskWorkload); User user=LoginUtils.getCurrentUserInfo(); xmTaskWorkload.put("linkBranchId",user.getBranchId()); - List> xmTaskWorkloadList = xmTaskWorkloadService.listProjectWorkloadSetMonth(xmTaskWorkload); //列出XmTaskWorkload列表 + List> xmTaskWorkloadList = xmWorkloadService.listProjectWorkloadSetMonth(xmTaskWorkload); //列出XmTaskWorkload列表 PageUtils.responePage(m, xmTaskWorkloadList); m.put("data",xmTaskWorkloadList); @@ -137,7 +137,7 @@ public class XmTaskWorkloadController { @ApiOperation( value = "按任务及报工人查询待确认工时",notes=" ") @ApiResponses({ - @ApiResponse(code = 200,response=XmTaskWorkload.class,message = "{tips:{isOk:true/false,msg:'成功/失败原因',tipscode:'错误码'},total:总记录数,data:[数据对象1,数据对象2,...]}") + @ApiResponse(code = 200,response= XmWorkload.class,message = "{tips:{isOk:true/false,msg:'成功/失败原因',tipscode:'错误码'},total:总记录数,data:[数据对象1,数据对象2,...]}") }) @RequestMapping(value="/ListGroupByTaskIdAndUserid",method=RequestMethod.GET) public Map ListGroupByTaskIdAndUserid( @ApiIgnore @RequestParam Map xmTaskWorkload){ @@ -153,7 +153,7 @@ public class XmTaskWorkloadController { if("my".equals(queryScope)){ xmTaskWorkload.put("userid",user.getUserid()); } - List> xmTaskWorkloadList = xmTaskWorkloadService.ListGroupByTaskIdAndUserid(xmTaskWorkload); //列出XmTaskWorkload列表 + List> xmTaskWorkloadList = xmWorkloadService.ListGroupByTaskIdAndUserid(xmTaskWorkload); //列出XmTaskWorkload列表 PageUtils.responePage(m, xmTaskWorkloadList); m.put("data",xmTaskWorkloadList); @@ -163,7 +163,7 @@ public class XmTaskWorkloadController { @ApiOperation( value = "按任务及报工人查询待确认工时",notes=" ") @ApiResponses({ - @ApiResponse(code = 200,response=XmTaskWorkload.class,message = "{tips:{isOk:true/false,msg:'成功/失败原因',tipscode:'错误码'},total:总记录数,data:[数据对象1,数据对象2,...]}") + @ApiResponse(code = 200,response= XmWorkload.class,message = "{tips:{isOk:true/false,msg:'成功/失败原因',tipscode:'错误码'},total:总记录数,data:[数据对象1,数据对象2,...]}") }) @RequestMapping(value="/ListGroupByTaskIdAndUseridToSet",method=RequestMethod.GET) public Map ListGroupByTaskIdAndUseridToSet( @ApiIgnore @RequestParam Map xmTaskWorkload){ @@ -179,7 +179,7 @@ public class XmTaskWorkloadController { if("my".equals(queryScope)){ xmTaskWorkload.put("userid",user.getUserid()); } - List> xmTaskWorkloadList = xmTaskWorkloadService.ListGroupByTaskIdAndUseridToSet(xmTaskWorkload); //列出XmTaskWorkload列表 + List> xmTaskWorkloadList = xmWorkloadService.ListGroupByTaskIdAndUseridToSet(xmTaskWorkload); //列出XmTaskWorkload列表 PageUtils.responePage(m, xmTaskWorkloadList); m.put("data",xmTaskWorkloadList); @@ -190,15 +190,15 @@ public class XmTaskWorkloadController { @ApiOperation( value = "新增一条工时登记表信息",notes=" ") @ApiResponses({ - @ApiResponse(code = 200,response=XmTaskWorkload.class,message = "{tips:{isOk:true/false,msg:'成功/失败原因',tipscode:'失败时错误码'},data:数据对象}") + @ApiResponse(code = 200,response= XmWorkload.class,message = "{tips:{isOk:true/false,msg:'成功/失败原因',tipscode:'失败时错误码'},data:数据对象}") }) @RequestMapping(value="/add",method=RequestMethod.POST) - public Map addXmTaskWorkload(@RequestBody XmTaskWorkload xmTaskWorkload) { + public Map addXmTaskWorkload(@RequestBody XmWorkload xmTaskWorkload) { Map m = new HashMap<>(); Tips tips=new Tips("成功新增一条数据"); try{ User user= LoginUtils.getCurrentUserInfo(); - xmTaskWorkload.setId(xmTaskWorkloadService.createKey("id")); + xmTaskWorkload.setId(xmWorkloadService.createKey("id")); if(!StringUtils.hasText(xmTaskWorkload.getTaskId())) { return failed("taskId-0","请上送任务编号"); @@ -221,11 +221,11 @@ public class XmTaskWorkloadController { if(xmTaskWorkload.getWorkload().compareTo(BigDecimal.ZERO)==0) { return failed("workload-0","工时不能为0"); } - XmTaskWorkload xmTaskWorkloadCount=new XmTaskWorkload(); + XmWorkload xmTaskWorkloadCount=new XmWorkload(); //xmTaskWorkloadCount.setUserid(user.getUserid()); xmTaskWorkloadCount.setBizDate(xmTaskWorkload.getBizDate()); xmTaskWorkloadCount.setTaskId(xmTaskWorkload.getTaskId()); - long count=this.xmTaskWorkloadService.countByWhere(xmTaskWorkloadCount); + long count=this.xmWorkloadService.countByWhere(xmTaskWorkloadCount); if(count>0){ return failed("data-1","当前任务今天已经报工"); } @@ -255,7 +255,7 @@ public class XmTaskWorkloadController { xmTaskWorkload.setWstatus("0"); xmTaskWorkload.setProjectId(xmTaskDb.getProjectId()); xmTaskWorkload.setBranchId(xmTaskDb.getCbranchId()); - xmTaskWorkloadService.insert(xmTaskWorkload); + xmWorkloadService.insert(xmTaskWorkload); if(xmTaskWorkload.getRworkload()!=null && BigDecimal.ZERO.compareTo(xmTaskWorkload.getRworkload())<=0){ BigDecimal newBudgetWorkload= xmTaskWorkload.getRworkload().add(NumberUtil.getBigDecimal(xmTaskWorkload.getWorkload(),BigDecimal.ZERO)).add(NumberUtil.getBigDecimal(xmTaskDb.getActWorkload(),BigDecimal.ZERO)); List ids=new ArrayList<>(); @@ -277,17 +277,17 @@ public class XmTaskWorkloadController { } @ApiOperation( value = "根据主键修改一条工时登记表信息",notes=" ") @ApiResponses({ - @ApiResponse(code = 200,response=XmTaskWorkload.class, message = "{tips:{isOk:true/false,msg:'成功/失败原因',tipscode:'失败时错误码'},data:数据对象}") + @ApiResponse(code = 200,response= XmWorkload.class, message = "{tips:{isOk:true/false,msg:'成功/失败原因',tipscode:'失败时错误码'},data:数据对象}") }) @RequestMapping(value="/edit",method=RequestMethod.POST) - public Map editXmTaskWorkload(@RequestBody XmTaskWorkload xmTaskWorkload) { + public Map editXmTaskWorkload(@RequestBody XmWorkload xmTaskWorkload) { Map m = new HashMap<>(); Tips tips=new Tips("成功更新一条数据"); try{ if(!StringUtils.hasText(xmTaskWorkload.getId())) { return failed("pk-not-exists","请上送主键参数id"); } - XmTaskWorkload xmTaskWorkloadDb = xmTaskWorkloadService.selectOneObject(xmTaskWorkload); + XmWorkload xmTaskWorkloadDb = xmWorkloadService.selectOneObject(xmTaskWorkload); if( xmTaskWorkloadDb == null ){ return failed("data-not-exists","数据不存在，无法修改"); } @@ -309,7 +309,7 @@ public class XmTaskWorkloadController { } } - xmTaskWorkloadService.updateSomeFieldByPk(xmTaskWorkload); + xmWorkloadService.updateSomeFieldByPk(xmTaskWorkload); pushService.pushXmTask(xmTaskDb); this.xmTaskService.calcWorkloadByRecord(xmTaskWorkload.getTaskId()); @@ -331,14 +331,14 @@ public class XmTaskWorkloadController { @ApiResponse(code = 200, message = "{tips:{isOk:true/false,msg:'成功/失败原因',tipscode:'失败时错误码'}") }) @RequestMapping(value="/batchDel",method=RequestMethod.POST) - public Map batchDelXmTaskWorkload(@RequestBody List xmTaskWorkloads) { + public Map batchDelXmTaskWorkload(@RequestBody List xmTaskWorkloads) { Map m = new HashMap<>(); Tips tips=new Tips("成功删除"+xmTaskWorkloads.size()+"条数据"); try{ if(xmTaskWorkloads.stream().filter(i->!StringUtils.hasText(i.getId())).findAny().isPresent()){ return ResponseHelper.failed("id-0","主键不能为空"); } - xmTaskWorkloads = xmTaskWorkloadService.selectListByIds(xmTaskWorkloads.stream().map(i->i.getId()).collect(Collectors.toList())); + xmTaskWorkloads = xmWorkloadService.selectListByIds(xmTaskWorkloads.stream().map(i->i.getId()).collect(Collectors.toList())); if(xmTaskWorkloads==null || xmTaskWorkloads.size()==0){ return ResponseHelper.failed("data-0","工时已不存在"); } @@ -367,10 +367,10 @@ public class XmTaskWorkloadController { xmMenuIds.add(xmTaskDb.getMenuId()); } } - List canDel=new ArrayList<>(); - List state1Ndel=new ArrayList<>(); - List noQxDel=new ArrayList<>(); - for (XmTaskWorkload xmTaskWorkload : xmTaskWorkloads) { + List canDel=new ArrayList<>(); + List state1Ndel=new ArrayList<>(); + List noQxDel=new ArrayList<>(); + for (XmWorkload xmTaskWorkload : xmTaskWorkloads) { if(canDelTaskMap.containsKey(xmTaskWorkload.getTaskId())){ if(!"1".equals(xmTaskWorkload.getWstatus())){ canDel.add(xmTaskWorkload); @@ -392,7 +392,7 @@ public class XmTaskWorkloadController { List msgs=new ArrayList<>(); if(canDel.size()>0){ - xmTaskWorkloadService.batchDelete(canDel); + xmWorkloadService.batchDelete(canDel); this.xmTaskService.calcWorkloadByRecord(canDelTaskMap.keySet().stream().collect(Collectors.toList())); pushService.pushXmTasks(canDelTaskMap.values().stream().collect(Collectors.toList())); msgs.add("成功删除"+canDel.size()+"条工时单据。"); @@ -450,7 +450,7 @@ public class XmTaskWorkloadController { return ResponseHelper.failed(fieldName+"-no-edit",fieldName+"不允许修改"); } } - List xmTaskWorkloadsDb=xmTaskWorkloadService.selectListByIds(ids); + List xmTaskWorkloadsDb= xmWorkloadService.selectListByIds(ids); if(xmTaskWorkloadsDb==null ||xmTaskWorkloadsDb.size()==0){ return ResponseHelper.failed("tasks-0","该工时已不存在"); } @@ -476,10 +476,10 @@ public class XmTaskWorkloadController { } } - List canChanges=new ArrayList<>(); - List sstatusNot01=new ArrayList<>(); - List taskStateNot34=new ArrayList<>(); - for (XmTaskWorkload xmTaskWorkload : xmTaskWorkloadsDb) { + List canChanges=new ArrayList<>(); + List sstatusNot01=new ArrayList<>(); + List taskStateNot34=new ArrayList<>(); + for (XmWorkload xmTaskWorkload : xmTaskWorkloadsDb) { if(!"1".equals(xmTaskWorkload.getSstatus()) && !"0".equals(xmTaskWorkload.getSstatus()) &&StringUtils.hasText(xmTaskWorkload.getSstatus())){ sstatusNot01.add(xmTaskWorkload); }else{ @@ -502,7 +502,7 @@ public class XmTaskWorkloadController { fieldKey=fieldKey.stream().filter(i->!StringUtils.isEmpty(xmTaskWorkloadMap.get(i) )).collect(Collectors.toSet()); if(fieldKey.size()>0){ - xmTaskWorkloadService.editSomeFieldsWithSbillIds(xmTaskWorkloadMap,null); + xmWorkloadService.editSomeFieldsWithSbillIds(xmTaskWorkloadMap,null); } } List msgs=new ArrayList<>(); diff --git a/xm-core/src/main/java/com/xm/core/entity/XmTaskWorkload.java b/xm-core/src/main/java/com/xm/core/entity/XmWorkload.java similarity index 97% rename from xm-core/src/main/java/com/xm/core/entity/XmTaskWorkload.java rename to xm-core/src/main/java/com/xm/core/entity/XmWorkload.java index 1bf2bc79..4d9b36a2 100644 --- a/xm-core/src/main/java/com/xm/core/entity/XmTaskWorkload.java +++ b/xm-core/src/main/java/com/xm/core/entity/XmWorkload.java @@ -15,7 +15,7 @@ import java.math.BigDecimal; */ @Data @ApiModel(description="工时登记表") -public class XmTaskWorkload implements java.io.Serializable { +public class XmWorkload implements java.io.Serializable { private static final long serialVersionUID = 1L; @@ -101,14 +101,14 @@ public class XmTaskWorkload implements java.io.Serializable { /** *主键 **/ - public XmTaskWorkload(String id) { + public XmWorkload(String id) { this.id = id; } /** * 工时登记表 **/ - public XmTaskWorkload() { + public XmWorkload() { } } \ No newline at end of file diff --git a/xm-core/src/main/java/com/xm/core/service/XmTaskSbillDetailService.java b/xm-core/src/main/java/com/xm/core/service/XmTaskSbillDetailService.java index 313534b8..0be8175e 100644 --- a/xm-core/src/main/java/com/xm/core/service/XmTaskSbillDetailService.java +++ b/xm-core/src/main/java/com/xm/core/service/XmTaskSbillDetailService.java @@ -24,7 +24,7 @@ public class XmTaskSbillDetailService extends BaseService { static Logger logger =LoggerFactory.getLogger(XmTaskSbillDetailService.class); @Autowired - XmTaskWorkloadService xmTaskWorkloadService; + XmWorkloadService xmWorkloadService; @Autowired XmTaskSbillService xmTaskSbillService; @@ -38,7 +38,7 @@ public class XmTaskSbillDetailService extends BaseService { String sbillId=xmTaskSbillDetails.get(0).getSbillId(); super.batchDelete(xmTaskSbillDetails); //更新工时表数据状态 - xmTaskWorkloadService.updateStatusAfterDetailDel(xmTaskSbillDetails.stream().map(i->i.getId()).collect(Collectors.toList())); + xmWorkloadService.updateStatusAfterDetailDel(xmTaskSbillDetails.stream().map(i->i.getId()).collect(Collectors.toList())); //更新结算单数据 xmTaskSbillService.updateBySbillDetailList(Arrays.asList(sbillId)); diff --git a/xm-core/src/main/java/com/xm/core/service/XmTaskSbillService.java b/xm-core/src/main/java/com/xm/core/service/XmTaskSbillService.java index 153d6693..b615512d 100644 --- a/xm-core/src/main/java/com/xm/core/service/XmTaskSbillService.java +++ b/xm-core/src/main/java/com/xm/core/service/XmTaskSbillService.java @@ -28,7 +28,7 @@ public class XmTaskSbillService extends BaseService { static Logger logger =LoggerFactory.getLogger(XmTaskSbillService.class); @Autowired - XmTaskWorkloadService xmTaskWorkloadService; + XmWorkloadService xmWorkloadService; @Autowired XmTaskSbillDetailService xmTaskSbillDetailService; @@ -38,7 +38,7 @@ public class XmTaskSbillService extends BaseService { @Transactional(rollbackFor = Exception.class) public void deleteByPkAndReturnWorkload(XmTaskSbill xmTaskSbill){ - xmTaskWorkloadService.updateStatusBySbillIdBySbillDel(xmTaskSbill.getId()); + xmWorkloadService.updateStatusBySbillIdBySbillDel(xmTaskSbill.getId()); this.deleteByPk(xmTaskSbill); } @@ -127,18 +127,18 @@ public class XmTaskSbillService extends BaseService { if("1".equals(bizFlowState)){ //发起审核，更新sbill表状态，工时登记表状态无需更新 xmTaskSbill.setStatus("1"); - xmTaskWorkloadService.updateStatusBySbillIdByFlowState(xmTaskSbill.getId(),"2"); + xmWorkloadService.updateStatusBySbillIdByFlowState(xmTaskSbill.getId(),"2"); }else if("2".equals(bizFlowState)){ //审核通过，工时登记表更新为已通过-3 xmTaskSbill.setStatus("2");//结算单状态-已通过 - xmTaskWorkloadService.updateStatusBySbillIdByFlowState(xmTaskSbill.getId(),"4"); + xmWorkloadService.updateStatusBySbillIdByFlowState(xmTaskSbill.getId(),"4"); }else if("3".equals(bizFlowState)){ //3为审批不通过，退回发起人，可继续向上提交。工时表无需修改 xmTaskSbill.setStatus("1");//结算单状态-已提交 }else if("4".equals(bizFlowState)){ //4为流程删除或者取消，sbill可重新发起审批/删除。工时表无需修改 xmTaskSbill.setStatus("0");//结算单状态-待提交 - xmTaskWorkloadService.updateStatusBySbillIdByFlowState(xmTaskSbill.getId(),"1"); + xmWorkloadService.updateStatusBySbillIdByFlowState(xmTaskSbill.getId(),"1"); } this.updateSomeFieldByPk(xmTaskSbill); @@ -162,7 +162,7 @@ public class XmTaskSbillService extends BaseService { detailsAll.addAll(canAdd); detailsAll.addAll(details); if(detailsAll.size()>0){ - this.xmTaskWorkloadService.updateStatusAfterJoinSbill(map("ids",workloadIds,"sbillId",detailsAll.get(0).getSbillId(),"detailId",detailsAll.get(0).getId())); + this.xmWorkloadService.updateStatusAfterJoinSbill(map("ids",workloadIds,"sbillId",detailsAll.get(0).getSbillId(),"detailId",detailsAll.get(0).getId())); this.updateBySbillDetailList(detailsAll.stream().map(i->i.getSbillId()).collect(Collectors.toSet()).stream().collect(Collectors.toList())); } diff --git a/xm-core/src/main/java/com/xm/core/service/XmTaskWorkloadService.java b/xm-core/src/main/java/com/xm/core/service/XmWorkloadService.java similarity index 94% rename from xm-core/src/main/java/com/xm/core/service/XmTaskWorkloadService.java rename to xm-core/src/main/java/com/xm/core/service/XmWorkloadService.java index c60714bf..34192090 100644 --- a/xm-core/src/main/java/com/xm/core/service/XmTaskWorkloadService.java +++ b/xm-core/src/main/java/com/xm/core/service/XmWorkloadService.java @@ -16,8 +16,8 @@ import java.util.Map; * 实体 XmTaskWorkload 表 xm_workload 当前主键(包括多主键): id; ***/ @Service("xm.core.xmTaskWorkloadService") -public class XmTaskWorkloadService extends BaseService { - static Logger logger =LoggerFactory.getLogger(XmTaskWorkloadService.class); +public class XmWorkloadService extends BaseService { + static Logger logger =LoggerFactory.getLogger(XmWorkloadService.class); @Autowired XmTaskSbillService xmTaskSbillService; diff --git a/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmTaskWorkloadMapper.xml b/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmWorkloadMapper.xml similarity index 96% rename from xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmTaskWorkloadMapper.xml rename to xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmWorkloadMapper.xml index 92c646f7..ed2192d8 100644 --- a/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmTaskWorkloadMapper.xml +++ b/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmWorkloadMapper.xml @@ -1,6 +1,6 @@ - + @@ -247,7 +247,7 @@ - select * from xm_workload res @@ -255,12 +255,12 @@ - select * from xm_workload res where res.id = #{id} - select * from xm_workload res where (res.id) in @@ -274,14 +274,14 @@ res.id = #{id} - select count(*) from xm_workload res - + insert into xm_workload( ) values ( @@ -290,7 +290,7 @@ - + delete from xm_workload res @@ -298,13 +298,13 @@ - + delete from xm_workload where id = #{id} - + update xm_workload @@ -313,7 +313,7 @@ - + update xm_workload