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 8b9b56f8..fd59c73e 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 @@ -48,7 +48,7 @@ public class XmTaskSbillDetailService extends BaseService { xmTaskWorkloadService.updateStatusAfterDetailDel(xmTaskSbillDetails.stream().map(i->i.getId()).collect(Collectors.toList())); //更新结算单数据 - xmTaskSbillService.updateByWorkloadList(Arrays.asList(sbillId)); + 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 fa1ee278..03a80fe5 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 @@ -157,8 +157,8 @@ public class XmTaskSbillService extends BaseService { this.updateSomeFieldByPk(xmTaskSbill); } - public void updateByWorkloadList(List sbillIds) { - super.update("updateByWorkloadList",sbillIds); + public void updateBySbillDetailList(List sbillIds) { + super.update("updateBySbillDetailList",sbillIds); } @Transactional diff --git a/xm-core/src/main/java/com/xm/core/service/XmTaskWorkloadService.java b/xm-core/src/main/java/com/xm/core/service/XmTaskWorkloadService.java index ab482fc9..b52ca17d 100644 --- a/xm-core/src/main/java/com/xm/core/service/XmTaskWorkloadService.java +++ b/xm-core/src/main/java/com/xm/core/service/XmTaskWorkloadService.java @@ -40,19 +40,6 @@ public class XmTaskWorkloadService extends BaseService { - @Transactional - public void editWorkloadToSbill(String sbillId, List canChanges) { - this.batchEditSbillId(sbillId,canChanges.stream().map(i->i.getId()).collect(Collectors.toList())); - xmTaskSbillService.updateByWorkloadList(Arrays.asList(sbillId)); - } - - private void batchEditSbillId(String sbillId, List ids) { - Map map=map("sbillId",sbillId,"ids",ids); - super.update("batchEditSbillId",map); - } - - - public List> listProjectWorkloadSetDay(Map xmTaskWorkload) { return super.selectList("listProjectWorkloadSetDay",xmTaskWorkload); } @@ -69,16 +56,10 @@ public class XmTaskWorkloadService extends BaseService { super.update("updateStatusBySbillIdBySbillDel",sbillId); } - public void batchSetSbillIdNull(List ids) { - super.update("batchSetSbillIdNull",ids); - } @Transactional public void editSomeFieldsWithSbillIds(Map xmTaskWorkloadMap, List sbillIds) { super.editSomeFields(xmTaskWorkloadMap); - if(sbillIds!=null && sbillIds.size()>0){ - this.xmTaskSbillService.updateByWorkloadList(sbillIds); - } } public void updateStatusBySbillIdByFlowState(String sbillId,String sstatus) { diff --git a/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmTaskSbillMapper.xml b/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmTaskSbillMapper.xml index 856bc817..a98c9f4b 100644 --- a/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmTaskSbillMapper.xml +++ b/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmTaskSbillMapper.xml @@ -20,14 +20,13 @@ - + update xm_task_sbill res inner join ( - select w.sbill_id,sum(ifnull(w.amt,0)) as amt,sum(ifnull(w.samt,0)) as samt,sum(ifnull(w.sworkload,0)) as workload from xm_task_workload w + select w.sbill_id,sum(ifnull(w.amt,0)) as amt,sum(ifnull(w.samt,0)) as samt,sum(ifnull(w.sworkload,0)) as workload from xm_task_sbill_detail w where w.sbill_id in ( #{item}) - and w.wstatus='1' group by w.sbill_id ) as w on res.id=w.sbill_id set