重构工时系统

xm-core/src/main/java/com/xm/core/ctrl/XmTaskSbillController.java

@@ -218,7 +218,7 @@ public class XmTaskSbillController {
 			if(xmTasksDb==null || xmTasksDb.size()==0){
 				return ResponseHelper.failed("xmTasksDb-0","相关任务已不存在。");
 			}
-			List<XmTask> xmTasksDb2=xmTasksDb.stream().filter(i->!"2".equals(i.getTaskState())).collect(Collectors.toList());
+			List<XmTask> xmTasksDb2=xmTasksDb.stream().filter(i->"2".equals(i.getTaskState())).collect(Collectors.toList());
 			if(xmTasksDb2==null || xmTasksDb2.size()==0){
 				return ResponseHelper.failed("taskState-not-2","任务必须是已完工状态才能结算。");
 			}

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

@@ -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",details.get(0).getSbillId(),"detailId",details.get(0).getId()));
+			this.xmTaskWorkloadService.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()));
 		}
 

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

@@ -49,11 +49,11 @@
     </sql>
 	<update id="updateStatusBySbillIdBySbillDel" parameterType="String">
 		update xm_task_workload res set detail_id=null,sstaus='1'
-		where exists (select 1 from xm_task_bill_detail d where d.id=res.detail_id and d.sbill_id=#{sbillId})
+		where exists (select 1 from xm_task_sbill_detail d where d.id=res.detail_id and d.sbill_id=#{sbillId})
 	</update>
 	<update id="updateStatusBySbillId" parameterType="HashMap">
 		update xm_task_workload res set sstatus=#{sstatus}
-		where exists (select 1 from xm_task_bill_detail d where d.id=res.detail_id and d.sbill_id=#{sbillId})
+		where exists (select 1 from xm_task_sbill_detail d where d.id=res.detail_id and d.sbill_id=#{sbillId})
 	</update>
 
 	<select id="listProjectWorkloadSetDay" parameterType="HashMap" resultType="HashMap">