From 17f8dd032fc267b38cdddc88de416aeab2600f90 Mon Sep 17 00:00:00 2001
From: zhangfeng <1603559716@qq.com>
Date: 星期三, 21 九月 2022 14:38:23 +0800
Subject: [PATCH] 根据物资类型分类-应急物资列表
---
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