From 148618dedf32b373af1eb45772590be1d38ab1bd Mon Sep 17 00:00:00 2001
From: chen <2710907404@qq.com>
Date: Wed, 15 Jan 2025 10:08:56 +0800
Subject: [PATCH] =?UTF-8?q?20250114=20=E6=9B=B4=E6=96=B0=201.=E5=8F=97?=
 =?UTF-8?q?=E7=90=86=E7=BC=96=E5=8F=B7=E7=94=9F=E6=88=90=EF=BC=8C=E6=9C=89?=
 =?UTF-8?q?=E5=8F=97=E7=90=86=E6=88=90=E5=8A=9F=E5=90=8E=E5=9C=A8=E5=8F=97?=
 =?UTF-8?q?=E7=90=86=E6=94=B9=E4=B8=BA=E5=A7=94=E6=89=98=E5=8D=95=E4=BD=8D?=
 =?UTF-8?q?=E6=8F=90=E4=BA=A4=E5=90=8E=EF=BC=8C=E5=8F=97=E7=90=86=E5=8D=95?=
 =?UTF-8?q?=E4=BD=8D=E5=AE=A1=E6=A0=B8=E9=80=9A=E8=BF=87=E5=B0=B1=E7=94=9F?=
 =?UTF-8?q?=E6=88=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/EntrustmentServiceImpl.java  | 112 +++++++++---------
 1 file changed, 54 insertions(+), 58 deletions(-)

diff --git a/src/main/java/digital/laboratory/platform/entrustment/service/impl/EntrustmentServiceImpl.java b/src/main/java/digital/laboratory/platform/entrustment/service/impl/EntrustmentServiceImpl.java
index 686bcfd..854f39e 100644
--- a/src/main/java/digital/laboratory/platform/entrustment/service/impl/EntrustmentServiceImpl.java
+++ b/src/main/java/digital/laboratory/platform/entrustment/service/impl/EntrustmentServiceImpl.java
@@ -1596,11 +1596,15 @@ public class EntrustmentServiceImpl extends ServiceImpl<EntrustmentMapper, Entru
 
         // 审核任务已经提交了, 转到新的环节
         int newStatus = -1;     // 新的状态(环节)
+        String currentAcceptNo = "";
         {
             newStatus = ProcessFlowMapper.getNextStatus(entrustment.getStatus(), opCode);
 
-            if (opCode == 1) {
-
+            if (opCode == 1 && StrUtil.isBlank(entrustment.getAcceptNo())) {
+                // 20250114 贵阳需求，审核通过后就生成受理编号
+                String yearStr = String.valueOf(LocalDateTime.now().getYear());
+                String maxEntrustAcceptNo = baseMapper.getMaxEntrustAcceptNo(yearStr);
+                currentAcceptNo = yearStr + "-" + (StrUtil.isBlank(maxEntrustAcceptNo) ? "1" : (Integer.parseInt(maxEntrustAcceptNo) + 1));
             }
 
             if (newStatus == EntrustmentStatusConstants.ENTRUSTMENT_STATUS_CREATED.getStatus()) {
@@ -1621,18 +1625,18 @@ public class EntrustmentServiceImpl extends ServiceImpl<EntrustmentMapper, Entru
         //-------------------
         // 更新数据库表数据
         //-------------------
-        entrustment.setDestructiveAnalysis(entrust.getDestructiveAnalysis());
-        entrustment.setOtherIdentificationNotes(entrust.getOtherIdentificationNotes());
+//        entrustment.setDestructiveAnalysis(entrust.getDestructiveAnalysis());
+//        entrustment.setOtherIdentificationNotes(entrust.getOtherIdentificationNotes());
         //entrustment.setOtherAgreement(entrust.getOtherAgreement());
-        entrustment.setAvoidIdentifier(entrust.getAvoidIdentifier());
-        entrustment.setComments(entrust.getComments());
+//        entrustment.setAvoidIdentifier(entrust.getAvoidIdentifier());
+//        entrustment.setComments(entrust.getComments());
 
-        entrustment.setCheckUser(dlpUser.getId());
-        entrustment.setCheckTime(LocalDateTime.now());
-        entrustment.setCheckComments(entrust.getCheckComments());
-        entrustment.setCheckTimes(entrustment.getCheckTimes() + 1);   // 审核次数加 1
-        entrustment.setPreviousStatus(entrustment.getStatus());       // 可能是从其他环节转过来的, 一旦提交, 保存上一个状态
-        entrustment.setStatus(newStatus);           // 新的状态(环节), 可能会是审批或提交前
+//        entrustment.setCheckUser(dlpUser.getId());
+//        entrustment.setCheckTime(LocalDateTime.now());
+//        entrustment.setCheckComments(entrust.getCheckComments());
+//        entrustment.setCheckTimes(entrustment.getCheckTimes() + 1);   // 审核次数加 1
+//        entrustment.setPreviousStatus(entrustment.getStatus());       // 可能是从其他环节转过来的, 一旦提交, 保存上一个状态
+//        entrustment.setStatus(newStatus);           // 新的状态(环节), 可能会是审批或提交前
 
         List<UpdateInfo> pis = entrustment.getProcessInfo();
         if (pis == null) {
@@ -1657,28 +1661,28 @@ public class EntrustmentServiceImpl extends ServiceImpl<EntrustmentMapper, Entru
 
             pis.add(pi);
         }
-        entrustment.setProcessInfo(pis);
+//        entrustment.setProcessInfo(pis);
 
         UpdateWrapper<Entrustment> updateWrapper = new UpdateWrapper<Entrustment>();
         updateWrapper.eq("id", entrustment.getId());        // 查询条件是 id 相等
 
-        updateWrapper.set("destructive_analysis", entrustment.getDestructiveAnalysis());
-        updateWrapper.set("other_identification_notes", entrustment.getOtherIdentificationNotes());
+        updateWrapper.set("destructive_analysis", entrust.getDestructiveAnalysis());
+        updateWrapper.set("other_identification_notes", entrust.getOtherIdentificationNotes());
         updateWrapper.set("other_agreement", entrustment.getOtherAgreement());
-        updateWrapper.set("avoid_identifier", entrustment.getAvoidIdentifier(), "typeHandler=com.baomidou.mybatisplus.extension.handlers.FastjsonTypeHandler");
-        updateWrapper.set("comments", entrustment.getComments());
+        updateWrapper.set("avoid_identifier", entrust.getAvoidIdentifier(), "typeHandler=com.baomidou.mybatisplus.extension.handlers.FastjsonTypeHandler");
+        updateWrapper.set("comments", entrust.getComments());
         updateWrapper.set("return_or_not", entrustment.getReturnOrNot());
 
-        updateWrapper.set("check_user", entrustment.getCheckUser());
-        updateWrapper.set("check_time", entrustment.getCheckTime());
-        updateWrapper.set("check_comments", entrustment.getCheckComments());
-        updateWrapper.set("check_times", entrustment.getCheckTimes());
+        updateWrapper.set("check_user", dlpUser.getId());
+        updateWrapper.set("check_time", LocalDateTime.now());
+        updateWrapper.set("check_comments", entrust.getCheckComments());
+        updateWrapper.set("check_times", entrustment.getCheckTimes() + 1); // 审核次数加 1
         updateWrapper.set("approve_candidate_user", entrustment.getApproveCandidateUser());
-        updateWrapper.set("status", entrustment.getStatus());
-        updateWrapper.set("previous_status", entrustment.getPreviousStatus());
+        updateWrapper.set("status", newStatus); // 新的状态(环节), 可能会是审批或提交前
+        updateWrapper.set("previous_status", entrustment.getStatus()); // 可能是从其他环节转过来的, 一旦提交, 保存上一个状态
 //		updateWrapper.set("process_info", entrustment.getProcessInfo(), "javaType=String,jdbcType=VARCHAR,typeHandler=com.baomidou.mybatisplus.extension.handlers.JacksonTypeHandler");
-        updateWrapper.set("process_info", entrustment.getProcessInfo(), "javaType=String,jdbcType=VARCHAR,typeHandler=com.baomidou.mybatisplus.extension.handlers.FastjsonTypeHandler");
-
+        updateWrapper.set("process_info", pis, "javaType=String,jdbcType=VARCHAR,typeHandler=com.baomidou.mybatisplus.extension.handlers.FastjsonTypeHandler");
+        updateWrapper.set(StrUtil.isNotBlank(currentAcceptNo), "accept_no", currentAcceptNo);
         if (!this.update(null, updateWrapper)) {
             throw new RuntimeException("保存委托信息失败");
         }
@@ -2343,28 +2347,19 @@ public class EntrustmentServiceImpl extends ServiceImpl<EntrustmentMapper, Entru
         //-------------------
         // 更新数据库表数据
         //-------------------
-        entrustment.setDestructiveAnalysis(entrust.getDestructiveAnalysis());
-        entrustment.setOtherIdentificationNotes(entrust.getOtherIdentificationNotes());
-        entrustment.setAvoidIdentifier(entrust.getAvoidIdentifier());
-        entrustment.setOtherAgreement(entrust.getOtherAgreement());
-        entrustment.setComments(entrust.getComments());
-
-        entrustment.setAcceptUser(null);    // 之前可能受理过, 现在后悔了, 置 null
-        entrustment.setAcceptTime(null);    // 之前可能受理过, 现在后悔了, 置 null
-        entrustment.setAcceptComments(entrust.getAcceptComments());
 
         UpdateWrapper<Entrustment> updateWrapper = new UpdateWrapper<Entrustment>();
         updateWrapper.eq("id", entrustment.getId());        // 查询条件是 id 相等
 
-        updateWrapper.set("destructive_analysis", entrustment.getDestructiveAnalysis());
-        updateWrapper.set("other_identification_notes", entrustment.getOtherIdentificationNotes());
-        updateWrapper.set("avoid_identifier", entrustment.getAvoidIdentifier(), "typeHandler=com.baomidou.mybatisplus.extension.handlers.FastjsonTypeHandler");
-        updateWrapper.set("other_agreement", entrustment.getOtherAgreement());
-        updateWrapper.set("comments", entrustment.getComments());
+        updateWrapper.set("destructive_analysis", entrust.getDestructiveAnalysis());
+        updateWrapper.set("other_identification_notes", entrust.getOtherIdentificationNotes());
+        updateWrapper.set("avoid_identifier", entrust.getAvoidIdentifier(), "typeHandler=com.baomidou.mybatisplus.extension.handlers.FastjsonTypeHandler");
+        updateWrapper.set("other_agreement", entrust.getOtherAgreement());
+        updateWrapper.set("comments", entrust.getComments());
 
-        updateWrapper.set("accept_user", entrustment.getAcceptUser());
-        updateWrapper.set("accept_time", entrustment.getAcceptTime());
-        updateWrapper.set("accept_comments", entrustment.getAcceptComments());
+        updateWrapper.set("accept_user", null); // 之前可能受理过, 现在后悔了, 置 null
+        updateWrapper.set("accept_time", null);
+        updateWrapper.set("accept_comments", entrust.getAcceptComments());
 
 
         if (!this.update(null, updateWrapper)) {
@@ -2382,7 +2377,8 @@ public class EntrustmentServiceImpl extends ServiceImpl<EntrustmentMapper, Entru
     @Override
     @GlobalTransactional
     public Entrustment bizAccept_Apply(Entrustment entrust, Integer opCode, DLPUser dlpUser) {
-        String newEntrustAcceptNo = "";
+        // 20250114 贵阳禁毒需求，受理编号在提交审核时就生成
+//        String newEntrustAcceptNo = "";
         if (opCode == null) {
             throw new RuntimeException(String.format("受理必须提供 opCode"));
         }
@@ -2451,15 +2447,15 @@ public class EntrustmentServiceImpl extends ServiceImpl<EntrustmentMapper, Entru
                 }
             }
             //从检材中取出委托的受理号
-            String materialAcceptNo = imList.get(0).getAcceptNo();
-            // 3-26 如果是大数据平台同步的委托，那么我们在受理完成的时候先生成一个空的受理编号，最后在同步大数据平台信息的时候会把这个编号赋值过去
-//            newEntrustAcceptNo = materialAcceptNo.substring(0, materialAcceptNo.lastIndexOf("-"));
-            entrustmentIdentificationMaterialService.getNewIdentificationMaterialNo(newEntrustAcceptNo);
-            if (entrustment.getDataSources() != 1) {
-                newEntrustAcceptNo = materialAcceptNo.substring(0, materialAcceptNo.lastIndexOf("-"));
-            } else {
-                newEntrustAcceptNo = "acceptNo";
-            }
+//            String materialAcceptNo = imList.get(0).getAcceptNo(); 20250114
+//            // 3-26 如果是大数据平台同步的委托，那么我们在受理完成的时候先生成一个空的受理编号，最后在同步大数据平台信息的时候会把这个编号赋值过去
+////            newEntrustAcceptNo = materialAcceptNo.substring(0, materialAcceptNo.lastIndexOf("-"));
+//            entrustmentIdentificationMaterialService.getNewIdentificationMaterialNo(newEntrustAcceptNo);
+//            if (entrustment.getDataSources() != 1) {
+//                newEntrustAcceptNo = materialAcceptNo.substring(0, materialAcceptNo.lastIndexOf("-"));
+//            } else {
+//                newEntrustAcceptNo = "acceptNo";
+//            }
         }
         int newStatus = ProcessFlowMapper.getNextStatus(entrustment.getStatus(), opCode);
 
@@ -2528,12 +2524,12 @@ public class EntrustmentServiceImpl extends ServiceImpl<EntrustmentMapper, Entru
         entrustment.setProcessInfo(pis);
 
         //上面注释的代码前面已经设置过，不需要再设置一次，直接更新
-        if (StringUtils.isNotBlank(newEntrustAcceptNo)) {
-            entrustment.setAcceptNo(newEntrustAcceptNo);//设置受理编号
-        }
-        if (!StringUtils.isNotBlank(newEntrustAcceptNo) && opCode == 1) {
-            throw new RuntimeException("受理编号不能为空");
-        }
+//        if (StringUtils.isNotBlank(newEntrustAcceptNo)) { 20250114
+//            entrustment.setAcceptNo(newEntrustAcceptNo);//设置受理编号
+//        }
+//        if (!StringUtils.isNotBlank(newEntrustAcceptNo) && opCode == 1) {
+//            throw new RuntimeException("受理编号不能为空");
+//        }
         entrustment.setIsTrans(1);//如果是通过我们系统进行受理，就让他不能再手动流转了
         if (!this.updateById(entrustment)) {
             throw new RuntimeException("保存委托信息失败");