From 0414ddb0b2b3a7199ae6181a770f97ac140dbd73 Mon Sep 17 00:00:00 2001
From: zhangf <1603559716@qq.com>
Date: 星期三, 08 五月 2024 16:46:22 +0800
Subject: [PATCH] spi统计

---
 emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/service/impl/EmergencyWorkApproveServiceImpl.java |   55 ++++++++++++++++++++++++++++++++-----------------------
 1 files changed, 32 insertions(+), 23 deletions(-)

diff --git a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/service/impl/EmergencyWorkApproveServiceImpl.java b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/service/impl/EmergencyWorkApproveServiceImpl.java
index 4e55c4a..e597290 100644
--- a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/service/impl/EmergencyWorkApproveServiceImpl.java
+++ b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/service/impl/EmergencyWorkApproveServiceImpl.java
@@ -87,6 +87,7 @@
         EmergencyWorkApproveInfo.setGmtCreate(nowDate);
         EmergencyWorkApproveInfo.setSubmitPersonId(uid);
         EmergencyWorkApproveInfo.setSubmitPersonName(uName);
+        EmergencyWorkApproveInfo.setSort(1);
         workApproveInfoService.addWorkApprove(EmergencyWorkApproveInfo);
         return new ResultVO(ResultCodes.OK);
     }
@@ -120,42 +121,50 @@
             newEmergencyWorkApproveInfo.setSubmitPersonName(uName);
             newEmergencyWorkApproveInfo.setApproveResult(null);
             newEmergencyWorkApproveInfo.setApproveMemo(null);
+            newEmergencyWorkApproveInfo.setSort(newEmergencyWorkApproveInfo.getSort()+1);
             workApproveInfoService.addWorkApprove(newEmergencyWorkApproveInfo);
         }
         return new ResultVO(ResultCodes.OK);
     }
 
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
     @Override
     public ResultVO<EmergencyWorkApproveDetailRespDTO> getWorkApproveById(Long id) {
-
         EmergencyWorkApproveInfoDetailDO EmergencyWorkApproveInfoDetailDO = workApproveInfoService.selectWorkApproveById(id);
+        if (EmergencyWorkApproveInfoDetailDO==null){
+            throw new EmergencyException(EmergencyResultCodes.APPROVE_NOT_EXIST);
+        }
         EmergencyWorkApproveDetailRespDTO emergencyWorkApproveDetailRespDTO = new EmergencyWorkApproveDetailRespDTO();
         BeanUtils.copyProperties(EmergencyWorkApproveInfoDetailDO, emergencyWorkApproveDetailRespDTO);
-
         return new ResultVO<>(ResultCodes.OK, emergencyWorkApproveDetailRespDTO);
     }
 
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
     @Override
     public ResultVO batchDeleteWorkApprove(String ids) {
         if (!StringUtils.isBlank(ids)) {

--
Gitblit v1.9.2