重新生成工时表

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));
     }
 }
 

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<String> sbillIds) {
-		super.update("updateByWorkloadList",sbillIds);
+	public void updateBySbillDetailList(List<String> sbillIds) {
+		super.update("updateBySbillDetailList",sbillIds);
 	}
 
 	@Transactional

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<XmTaskWorkload> canChanges) {
-		this.batchEditSbillId(sbillId,canChanges.stream().map(i->i.getId()).collect(Collectors.toList()));
-		xmTaskSbillService.updateByWorkloadList(Arrays.asList(sbillId));
-	}
-
-	private void batchEditSbillId(String sbillId, List<String> ids) {
-		Map<String,Object> map=map("sbillId",sbillId,"ids",ids);
-		super.update("batchEditSbillId",map);
-	}
-
-
-
 	public List<Map<String, Object>> listProjectWorkloadSetDay(Map<String, Object> xmTaskWorkload) {
 		return super.selectList("listProjectWorkloadSetDay",xmTaskWorkload);
 	}
@@ -69,16 +56,10 @@ public class XmTaskWorkloadService extends BaseService {
 		super.update("updateStatusBySbillIdBySbillDel",sbillId);
 	}
 
-	public void batchSetSbillIdNull(List<String> ids) {
-		super.update("batchSetSbillIdNull",ids);
-	}
 
 	@Transactional
 	public void editSomeFieldsWithSbillIds(Map<String, Object> xmTaskWorkloadMap, List<String> sbillIds) {
 		super.editSomeFields(xmTaskWorkloadMap);
-		if(sbillIds!=null && sbillIds.size()>0){
-			 this.xmTaskSbillService.updateByWorkloadList(sbillIds);
-		}
 	}
 
 	public void updateStatusBySbillIdByFlowState(String sbillId,String sstatus) {

xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmTaskSbillMapper.xml

@@ -20,14 +20,13 @@
 		</if>
     </sql>
 
-	<update id="updateByWorkloadList" parameterType="List">
+	<update id="updateBySbillDetailList" parameterType="List">
 		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
 		<foreach collection="list" item="item" index="index" open="(" separator="," close=")" >
 			( #{item})
 		</foreach>
-		and w.wstatus='1'
 		group by w.sbill_id
 		) as w on res.id=w.sbill_id
 		set