From 802e1716ee87787e68e820ab0739e220ed745526 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E8=A3=95=E8=B4=A2?= Date: Fri, 22 Apr 2022 23:55:21 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E8=8A=82=E7=82=B9=E7=B1=BB?= =?UTF-8?q?=E5=9E=8B=E3=80=81=E6=A0=87=E7=AD=BE=E7=AD=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/xm/core/ctrl/XmTaskWorkloadController.java | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) 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 798e77bf..5d04cdb8 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 @@ -541,15 +541,10 @@ public class XmTaskWorkloadController { sstatus="1"; xmTaskWorkloadMap.put("sstatus",sstatus); } - - if("0".equals(wstatus)){ - sstatus="1"; - xmTaskWorkloadMap.put("sstatus",sstatus); - } List taskIds=xmTaskWorkloadsDb.stream().map(i->i.getTaskId()).collect(Collectors.toSet()).stream().collect(Collectors.toList()); Map taskMap=new HashMap<>(); - if(xmTaskWorkloadMap.containsKey("wstatus") && "1".equals(wstatus)){ + if(xmTaskWorkloadMap.containsKey("sstatus") && "1".equals(sstatus)){ List tasks=this.xmTaskService.selectListByIds(taskIds); for (XmTask task : tasks) { taskMap.put(task.getId(),task); @@ -563,7 +558,7 @@ public class XmTaskWorkloadController { if(!"1".equals(xmTaskWorkload.getSstatus()) && !"0".equals(xmTaskWorkload.getSstatus()) &&StringUtils.hasText(xmTaskWorkload.getSstatus())){ sstatusNot01.add(xmTaskWorkload); }else{ - if(xmTaskWorkloadMap.containsKey("wstatus") && "1".equals(wstatus)){ + if(xmTaskWorkloadMap.containsKey("sstatus") && "1".equals(sstatus)){ XmTask task=taskMap.get(xmTaskWorkload.getTaskId()); if(task==null || (!"2".equals(task.getTaskState()) && !"3".equals(task.getTaskState()))){ taskStateNot34.add(xmTaskWorkload); @@ -592,7 +587,7 @@ public class XmTaskWorkloadController { msgs.add("有"+sstatusNot01.size()+"条工时不是待结算状态，不允许更改"); } if(taskStateNot34.size()>0){ - msgs.add("有"+taskStateNot34.size()+"条工时对应的任务不是已完工状态，不允许确认工时"); + msgs.add("有"+taskStateNot34.size()+"条工时对应的任务不是已完工状态，不允许进入结算池"); } if(canChanges.size()>0){ tips.setOkMsg(msgs.stream().collect(Collectors.joining()));