From 4f365007869668ee035dc44ca98263b85ced8d8a Mon Sep 17 00:00:00 2001
From: wuxw <928255095@qq.com>
Date: 星期二, 25 二月 2025 21:18:05 +0800
Subject: [PATCH] 处理完成工单评分

---
 service-oa/src/main/java/com/java110/oa/cmd/work/FinishWorkCopyCmd.java |    7 ++++++-
 1 files changed, 6 insertions(+), 1 deletions(-)

diff --git a/service-oa/src/main/java/com/java110/oa/cmd/work/FinishWorkCopyCmd.java b/service-oa/src/main/java/com/java110/oa/cmd/work/FinishWorkCopyCmd.java
index c729bf6..260e0b8 100644
--- a/service-oa/src/main/java/com/java110/oa/cmd/work/FinishWorkCopyCmd.java
+++ b/service-oa/src/main/java/com/java110/oa/cmd/work/FinishWorkCopyCmd.java
@@ -85,16 +85,21 @@
 
         Assert.listOnlyOne(userDtos, "鐢ㄦ埛涓嶅瓨鍦�");
         String deductionMoney = "0.00";
+        String score= "10";
         String deductionReason = reqJson.getString("deductionReason");
         if (reqJson.containsKey("deductionMoney") && !StringUtil.isEmpty(reqJson.getString("deductionMoney"))) {
             deductionMoney = reqJson.getString("deductionMoney");
             deductionReason += (" 鎵f " + deductionMoney + "鍏�");
+        }
+        if (reqJson.containsKey("score") && !StringUtil.isEmpty(reqJson.getString("score"))) {
+            score = reqJson.getString("score");
         }
 
         WorkTaskItemPo workTaskItemPo = new WorkTaskItemPo();
         workTaskItemPo.setItemId(reqJson.getString("itemId"));
         workTaskItemPo.setDeductionMoney(deductionMoney);
         workTaskItemPo.setDeductionReason(deductionReason);
+        workTaskItemPo.setScore(score);
         workTaskItemPo.setDeductionPersonId(userDtos.get(0).getUserId());
         workTaskItemPo.setDeductionPersonName(userDtos.get(0).getName());
         workTaskItemPo.setState(WorkTaskItemDto.STATE_COPY_COMPLETE);
@@ -119,7 +124,7 @@
 
         workTaskItemDto = new WorkTaskItemDto();
         workTaskItemDto.setTaskId(reqJson.getString("taskId"));
-        workTaskItemDto.setState(WorkTaskItemDto.STATE_COMPLETE);
+        workTaskItemDto.setStates(new String[]{WorkTaskItemDto.STATE_COMPLETE,WorkTaskItemDto.STATE_WAIT});
         int count = workTaskItemV1InnerServiceSMOImpl.queryWorkTaskItemsCount(workTaskItemDto);
 
         if (count > 0) {

--
Gitblit v1.8.0