From 3d63e7c025d5d8164df640d7c947e601c149e951 Mon Sep 17 00:00:00 2001
From: zhangherong <571457620@qq.com>
Date: 星期一, 21 七月 2025 14:12:52 +0800
Subject: [PATCH] art: 技术状态鉴定工单-定时任务生成

---
 lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamTechnicalStatusEvaluationOrderServiceImpl.java |   15 +++++++++------
 1 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamTechnicalStatusEvaluationOrderServiceImpl.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamTechnicalStatusEvaluationOrderServiceImpl.java
index 941c25f..1ebf51d 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamTechnicalStatusEvaluationOrderServiceImpl.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamTechnicalStatusEvaluationOrderServiceImpl.java
@@ -166,14 +166,15 @@
             throw new JeecgBootException("鎶�鏈姸鎬侀壌瀹氳鑼冩鏌ラ」涓虹┖锛屾坊鍔犲け璐ワ紒");
         }
         EamTechnicalStatusEvaluationOrder order = new EamTechnicalStatusEvaluationOrder();
-        order.setOrderNum(request.getOrderNum());
         order.setEquipmentId(request.getEquipmentId());
         order.setStandardId(request.getStandardId());
         order.setEvaluationDate(request.getEvaluationDate());
+        order.setFreezeOrderDate(request.getFreezeOrderDate());
+        order.setOrderExpirationDate(request.getOrderExpirationDate());
         order.setRemark(request.getRemark());
         String codeSeq = businessCodeRuleService.generateBusinessCodeSeq(BusinessCodeConst.TECHNICAL_STATUS_EVALUATION_ORDER_CODE_RULE);
         order.setOrderNum(codeSeq);
-        order.setCreationMethod(OrderCreationMethodEnum.MANUAL.name());
+        order.setCreationMethod(request.getCreationMethod());
         //鐘舵�佸垵濮嬪寲
         order.setEvaluationStatus(TechnicalStatusEvaluationOrderStatusEnum.WAIT_EVALUATION.name());
         //鍒犻櫎鏍囪
@@ -485,6 +486,7 @@
                 entity.setRepairManagerSignature(user.getUsername());
                 entity.setRepairManagerSignatureTime(new Date());
                 entity.setRepairManagerComment(request.getRepairManagerComment());
+                entity.setRepairManagerSignatureResult(request.getRepairManagerSignatureResult());
                 //璁剧疆entity
                 if (BusinessCodeConst.APPROVED.equals(request.getRepairManagerSignatureResult())) {
                     values.put("NextAssignee", userApprovalList);
@@ -531,14 +533,15 @@
                 entity.setDepartTechnicalLeaderSignature(user.getUsername());
                 entity.setDepartTechnicalLeaderSignatureTime(new Date());
                 entity.setDepartTechnicalLeaderComment(request.getDepartTechnicalLeaderComment());
+                entity.setDepartTechnicalLeaderSignatureResult(request.getDepartTechnicalLeaderSignatureResult());
                 //璁剧疆entity
                 if (BusinessCodeConst.APPROVED.equals(request.getDepartTechnicalLeaderSignatureResult())) {
                     values.put("NextAssignee", userApprovalList);
-                    entity.setEvaluationStatus(TechnicalStatusEvaluationOrderStatusEnum.PROCESS_TECHNICIAN_SIGNING.name());
+                    entity.setEvaluationStatus(TechnicalStatusEvaluationOrderStatusEnum.INSPECTOR_SIGNING.name());
                 } else {
                     userApprovalList = Collections.singletonList(entity.getProcessTechnicianSignature());
                     values.put("NextAssignee", userApprovalList);
-                    entity.setEvaluationStatus(TechnicalStatusEvaluationOrderStatusEnum.INSPECTOR_SIGNING.name());
+                    entity.setEvaluationStatus(TechnicalStatusEvaluationOrderStatusEnum.PROCESS_TECHNICIAN_SIGNING.name());
                 }
                 break;
             case INSPECTOR_SIGNING:
@@ -572,10 +575,10 @@
     @Transactional(rollbackFor = Exception.class)
     public boolean updateEvaluationStatus(String orderId, String evaluationStatus) {
         UpdateWrapper<EamTechnicalStatusEvaluationOrder> updateWrapper = new UpdateWrapper<>();
-        updateWrapper.eq("order_id", orderId);
+        updateWrapper.eq("id", orderId);
         updateWrapper.set("evaluation_status", evaluationStatus);
         updateWrapper.eq("del_flag", CommonConstant.DEL_FLAG_0);
-        updateWrapper.eq("evaluation_status", TechnicalStatusEvaluationOrderStatusEnum.WAIT_EVALUATION.name());
+        updateWrapper.in("evaluation_status", Arrays.asList(TechnicalStatusEvaluationOrderStatusEnum.WAIT_EVALUATION.name(), TechnicalStatusEvaluationOrderStatusEnum.LOCKED.name()));
         int update = this.getBaseMapper().update(null, updateWrapper);
         return update > 0;
     }

--
Gitblit v1.9.3