From 0f1422e675bb1a687b67fa6da186bf3596747112 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E8=A3=95=E8=B4=A2?= Date: Mon, 25 Apr 2022 03:35:36 +0800 Subject: [PATCH] =?UTF-8?q?=E9=87=8D=E6=96=B0=E7=94=9F=E6=88=90=E5=B7=A5?= =?UTF-8?q?=E6=97=B6=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/xm/core/ctrl/XmTaskSbillController.java | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) 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 855dc677..9dda4470 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 @@ -2,6 +2,7 @@ package com.xm.core.ctrl; import java.math.BigDecimal; import java.util.*; +import java.util.stream.Collectors; import com.mdp.core.utils.*; import com.mdp.safe.client.entity.User; @@ -215,7 +216,15 @@ public class XmTaskSbillController { return ResponseHelper.failed("projectId-not-same","请选择同一个项目的任务加入工时单"); } //检查是否已有同样的数据加入了结算单，如果有，需要合并 - List details=xmTaskSbillDetailService.selectListByUserTasks(batchJoinToSbill); + BatchJoinToSbillVo batchJoinToSbillQuery=new BatchJoinToSbillVo(); + batchJoinToSbillQuery.setUserTasks(batchJoinToSbill.getUserTasks()); + List details=xmTaskSbillDetailService.selectListByUserTasks(batchJoinToSbillQuery); + List othSbillDetails=details.stream().filter(i->sbillDb.getId().equals(i.getSbillId())).collect(Collectors.toList()); + for (XmTaskSbillDetail i : othSbillDetails) { + if(!"4".equals(i.getSstatus())){ + return ResponseHelper.failed("user-task-exists-not-4",String.format("任务【%s】，人员【%s】存在未完成的结算单【%s】，暂时不允许发起结算。",i.getName(),i.getUsername(),i.getSbillId())); + } + } if(details!=null && details.size()>0){ for (XmTaskSbillDetail detail : details) { //进行合并操作