From 0e36ba6afb4fd83e617f430734994366dfe242bb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E8=A3=95=E8=B4=A2?= Date: Fri, 8 Jul 2022 02:01:25 +0800 Subject: [PATCH] =?UTF-8?q?=E9=87=8D=E6=9E=84=E5=B7=A5=E6=97=B6=E7=B3=BB?= =?UTF-8?q?=E7=BB=9F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/xm/core/ctrl/XmTaskSbillController.java | 2 +- .../src/main/java/com/xm/core/service/XmTaskSbillService.java | 2 +- .../mybatis/mapper/xm/core/dao/XmTaskWorkloadMapper.xml | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) 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 c464a0df..a548dea7 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 @@ -218,7 +218,7 @@ public class XmTaskSbillController { if(xmTasksDb==null || xmTasksDb.size()==0){ return ResponseHelper.failed("xmTasksDb-0","相关任务已不存在。"); } - List xmTasksDb2=xmTasksDb.stream().filter(i->!"2".equals(i.getTaskState())).collect(Collectors.toList()); + List xmTasksDb2=xmTasksDb.stream().filter(i->"2".equals(i.getTaskState())).collect(Collectors.toList()); if(xmTasksDb2==null || xmTasksDb2.size()==0){ return ResponseHelper.failed("taskState-not-2","任务必须是已完工状态才能结算。"); } 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 556aa10c..153d6693 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 @@ -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())); } 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/XmTaskWorkloadMapper.xml index 0393ca8b..384fc902 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/XmTaskWorkloadMapper.xml @@ -49,11 +49,11 @@ 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 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})