From 9ce6a7ccf03d7d04d8559e49550d576be3bd37a3 Mon Sep 17 00:00:00 2001
From: songhuangfeng123 <shf18767906695@163.com>
Date: 星期三, 03 八月 2022 18:08:58 +0800
Subject: [PATCH] 应急物资fix
---
emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/model/dto/req/EmergencySuppliesReqDTO.java | 11 +
emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/model/dto/resp/EmergencySuppliesMaintainUserRespDTO.java | 10 +
emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/controller/EmergencySuppliesController.java | 4
emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/model/dto/req/EmergencySuppliesInspectUserReqDTO.java | 10 +
emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/entity/EmergencySuppliesMaintainInfoDetailDO.java | 10 +
emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/model/dto/resp/EmergencySuppliesMaintainPageRespDTO.java | 10 +
emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/model/dto/resp/EmergencySuppliesPageRespDTO.java | 10 +
emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/entity/EmergencySuppliesInspectInfoDetailDO.java | 10 +
emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/service/EmergencySuppliesInspectService.java | 2
emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/model/dto/resp/EmergencySuppliesInspectPageRespDTO.java | 10 +
emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/entity/EmergencySuppliesMaintainInfoPageDO.java | 10 +
emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/service/impl/EmergencySuppliesMaintainServiceImpl.java | 12 +-
emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/model/dto/resp/EmergencySuppliesInspectDetailRespDTO.java | 10 +
emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/entity/EmergencySuppliesInspectUserInfo.java | 10 +
emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/model/dto/resp/EmergencySuppliesMaintainDetailRespDTO.java | 10 +
emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/entity/EmergencySuppliesMaintainUserInfoDO.java | 10 +
emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/controller/EmergencySuppliesInspectController.java | 4
emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/service/impl/EmergencySuppliesServiceImpl.java | 38 +++++-
emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/entity/EmergencySuppliesInfo.java | 10 +
emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/service/impl/EmergencySuppliesInspectServiceImpl.java | 12 +-
emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/model/dto/req/EmergencySuppliesMaintainUserReqDTO.java | 10 +
emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/service/EmergencySuppliesService.java | 2
emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/model/dto/resp/EmergencySuppliesInspectUserRespDTO.java | 10 +
emergency/emergency-service/src/main/resource/config/mapper/emergency/EmergencySuppliesMaintainInfoMapper.xml | 27 ++++
emergency/emergency-service/src/main/resource/config/mapper/emergency/EmergencySuppliesMaintainUserInfoMapper.xml | 5
emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/controller/EmergencySuppliesMaintainController.java | 4
emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/entity/EmergencySuppliesInfoDetailDO.java | 10 +
emergency/emergency-service/src/main/resource/config/mapper/emergency/EmergencySuppliesInfoMapper.xml | 6
emergency/emergency-service/src/main/resource/config/mapper/emergency/EmergencySuppliesInspectUserInfoMapper.xml | 5
emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/entity/EmergencySuppliesInspectInfoPageDO.java | 10 +
emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/entity/EmergencySuppliesMaintainUserInfo.java | 10 +
emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/model/dto/resp/EmergencySuppliesDetailRespDTO.java | 10 +
emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/service/EmergencySuppliesMaintainService.java | 2
emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/entity/EmergencySuppliesInspectUserInfoDO.java | 10 +
emergency/emergency-service/src/main/resource/config/mapper/emergency/EmergencySuppliesInspectInfoMapper.xml | 26 +++
35 files changed, 323 insertions(+), 37 deletions(-)
diff --git a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/controller/EmergencySuppliesController.java b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/controller/EmergencySuppliesController.java
index 42723fa..39648dd 100644
--- a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/controller/EmergencySuppliesController.java
+++ b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/controller/EmergencySuppliesController.java
@@ -61,8 +61,8 @@
/**
* 应急预案删除/批量删除
*/
- @RequestMapping(value = "/batchDelete/{ids}",method = RequestMethod.GET)
- public ResultVO batchDeleteEmergencySupplies(@PathVariable("ids")String ids){
+ @RequestMapping(value = "/batchDelete",method = RequestMethod.POST)
+ public ResultVO batchDeleteEmergencySupplies(@RequestBody Long[] ids){
return emergencySuppliesService.batchDeleteEmergencySupplies(ids);
}
}
diff --git a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/controller/EmergencySuppliesInspectController.java b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/controller/EmergencySuppliesInspectController.java
index d3ca771..a8dd4ba 100644
--- a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/controller/EmergencySuppliesInspectController.java
+++ b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/controller/EmergencySuppliesInspectController.java
@@ -61,8 +61,8 @@
/**
* 应急物资检查删除/批量删除
*/
- @RequestMapping(value = "/batchDelete/{ids}",method = RequestMethod.GET)
- public ResultVO batchDeleteEmergencySuppliesInspect(@PathVariable("ids")String ids){
+ @RequestMapping(value = "/batchDelete",method = RequestMethod.POST)
+ public ResultVO batchDeleteEmergencySuppliesInspect(@RequestBody Long[] ids){
return emergencySuppliesInspectService.batchDeleteEmergencySuppliesInspect(ids);
}
}
diff --git a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/controller/EmergencySuppliesMaintainController.java b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/controller/EmergencySuppliesMaintainController.java
index 7cf7dc8..8e2be46 100644
--- a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/controller/EmergencySuppliesMaintainController.java
+++ b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/controller/EmergencySuppliesMaintainController.java
@@ -61,8 +61,8 @@
/**
* 应急物资检查删除/批量删除
*/
- @RequestMapping(value = "/batchDelete/{ids}",method = RequestMethod.GET)
- public ResultVO batchDeleteEmergencySuppliesMaintain(@PathVariable("ids")String ids){
+ @RequestMapping(value = "/batchDelete",method = RequestMethod.POST)
+ public ResultVO batchDeleteEmergencySuppliesMaintain(@RequestBody Long[] ids){
return emergencySuppliesMaintainService.batchDeleteEmergencySuppliesMaintain(ids);
}
}
diff --git a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/entity/EmergencySuppliesInfo.java b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/entity/EmergencySuppliesInfo.java
index 36f6c50..a7af3a0 100644
--- a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/entity/EmergencySuppliesInfo.java
+++ b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/entity/EmergencySuppliesInfo.java
@@ -26,6 +26,7 @@
private Integer usePeriod;
private Long departmentId;
private Long principalUserUid;
+ private String principalUserName;
private String status;
private String classification;
private String name;
@@ -246,6 +247,15 @@
this.useExplain = useExplain;
}
+
+ public String getPrincipalUserName() {
+ return principalUserName;
+ }
+
+ public void setPrincipalUserName(String principalUserName) {
+ this.principalUserName = principalUserName;
+ }
+
@Override
public String toString() {
return "EmergencySuppliesInfo{" +
diff --git a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/entity/EmergencySuppliesInfoDetailDO.java b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/entity/EmergencySuppliesInfoDetailDO.java
index 30e30ea..6a4b6b7 100644
--- a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/entity/EmergencySuppliesInfoDetailDO.java
+++ b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/entity/EmergencySuppliesInfoDetailDO.java
@@ -9,6 +9,16 @@
@TableName("emergency_supplies")
public class EmergencySuppliesInfoDetailDO {
+ private String principalUserName;
+
+ public String getPrincipalUserName() {
+ return principalUserName;
+ }
+
+ public void setPrincipalUserName(String principalUserName) {
+ this.principalUserName = principalUserName;
+ }
+
@TableId(type = IdType.AUTO)
private Long id;
private Date productionDate;
diff --git a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/entity/EmergencySuppliesInspectInfoDetailDO.java b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/entity/EmergencySuppliesInspectInfoDetailDO.java
index bbe7396..a90bd56 100644
--- a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/entity/EmergencySuppliesInspectInfoDetailDO.java
+++ b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/entity/EmergencySuppliesInspectInfoDetailDO.java
@@ -9,6 +9,16 @@
@TableName("emergency_supplies_inspect")
public class EmergencySuppliesInspectInfoDetailDO {
+ private String suppliesName;
+
+ public String getSuppliesName() {
+ return suppliesName;
+ }
+
+ public void setSuppliesName(String suppliesName) {
+ this.suppliesName = suppliesName;
+ }
+
@TableId(type = IdType.AUTO)
private Long id;
diff --git a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/entity/EmergencySuppliesInspectInfoPageDO.java b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/entity/EmergencySuppliesInspectInfoPageDO.java
index 4d5b50b..6edcb78 100644
--- a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/entity/EmergencySuppliesInspectInfoPageDO.java
+++ b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/entity/EmergencySuppliesInspectInfoPageDO.java
@@ -9,6 +9,16 @@
@TableName("emergency_supplies_inspect")
public class EmergencySuppliesInspectInfoPageDO {
+ private String suppliesName;
+
+ public String getSuppliesName() {
+ return suppliesName;
+ }
+
+ public void setSuppliesName(String suppliesName) {
+ this.suppliesName = suppliesName;
+ }
+
@TableId(type = IdType.AUTO)
private Long id;
diff --git a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/entity/EmergencySuppliesInspectUserInfo.java b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/entity/EmergencySuppliesInspectUserInfo.java
index b6de476..8f9d384 100644
--- a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/entity/EmergencySuppliesInspectUserInfo.java
+++ b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/entity/EmergencySuppliesInspectUserInfo.java
@@ -9,6 +9,16 @@
@TableName("emergency_supplies_inspect")
public class EmergencySuppliesInspectUserInfo {
+ private String userName;
+
+ public String getUserName() {
+ return userName;
+ }
+
+ public void setUserName(String userName) {
+ this.userName = userName;
+ }
+
@TableId(type = IdType.AUTO)
private Long id;
private Boolean delFlag;
diff --git a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/entity/EmergencySuppliesInspectUserInfoDO.java b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/entity/EmergencySuppliesInspectUserInfoDO.java
index adc5c98..6a17202 100644
--- a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/entity/EmergencySuppliesInspectUserInfoDO.java
+++ b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/entity/EmergencySuppliesInspectUserInfoDO.java
@@ -9,6 +9,16 @@
@TableName("emergency_supplies_inspect")
public class EmergencySuppliesInspectUserInfoDO {
+ private String userName;
+
+ public String getUserName() {
+ return userName;
+ }
+
+ public void setUserName(String userName) {
+ this.userName = userName;
+ }
+
@TableId(type = IdType.AUTO)
private Long id;
diff --git a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/entity/EmergencySuppliesMaintainInfoDetailDO.java b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/entity/EmergencySuppliesMaintainInfoDetailDO.java
index 404fff9..3357a6c 100644
--- a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/entity/EmergencySuppliesMaintainInfoDetailDO.java
+++ b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/entity/EmergencySuppliesMaintainInfoDetailDO.java
@@ -9,6 +9,16 @@
@TableName("emergency_supplies_maintain")
public class EmergencySuppliesMaintainInfoDetailDO {
+ private String suppliesName;
+
+ public String getSuppliesName() {
+ return suppliesName;
+ }
+
+ public void setSuppliesName(String suppliesName) {
+ this.suppliesName = suppliesName;
+ }
+
@TableId(type = IdType.AUTO)
private Long id;
diff --git a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/entity/EmergencySuppliesMaintainInfoPageDO.java b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/entity/EmergencySuppliesMaintainInfoPageDO.java
index d87d48c..0102aa0 100644
--- a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/entity/EmergencySuppliesMaintainInfoPageDO.java
+++ b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/entity/EmergencySuppliesMaintainInfoPageDO.java
@@ -9,6 +9,16 @@
@TableName("emergency_supplies_maintain")
public class EmergencySuppliesMaintainInfoPageDO {
+ private String suppliesName;
+
+ public String getSuppliesName() {
+ return suppliesName;
+ }
+
+ public void setSuppliesName(String suppliesName) {
+ this.suppliesName = suppliesName;
+ }
+
@TableId(type = IdType.AUTO)
private Long id;
diff --git a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/entity/EmergencySuppliesMaintainUserInfo.java b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/entity/EmergencySuppliesMaintainUserInfo.java
index 60b826d..1a958f9 100644
--- a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/entity/EmergencySuppliesMaintainUserInfo.java
+++ b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/entity/EmergencySuppliesMaintainUserInfo.java
@@ -9,6 +9,16 @@
@TableName("emergency_supplies_maintain")
public class EmergencySuppliesMaintainUserInfo {
+ private String userName;
+
+ public String getUserName() {
+ return userName;
+ }
+
+ public void setUserName(String userName) {
+ this.userName = userName;
+ }
+
@TableId(type = IdType.AUTO)
private Long id;
private Boolean delFlag;
diff --git a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/entity/EmergencySuppliesMaintainUserInfoDO.java b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/entity/EmergencySuppliesMaintainUserInfoDO.java
index 3472ad8..c4934e2 100644
--- a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/entity/EmergencySuppliesMaintainUserInfoDO.java
+++ b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/entity/EmergencySuppliesMaintainUserInfoDO.java
@@ -9,6 +9,16 @@
@TableName("emergency_supplies_maintain")
public class EmergencySuppliesMaintainUserInfoDO {
+ private String userName;
+
+ public String getUserName() {
+ return userName;
+ }
+
+ public void setUserName(String userName) {
+ this.userName = userName;
+ }
+
@TableId(type = IdType.AUTO)
private Long id;
diff --git a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/model/dto/req/EmergencySuppliesInspectUserReqDTO.java b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/model/dto/req/EmergencySuppliesInspectUserReqDTO.java
index 1506da0..c1bc3af 100644
--- a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/model/dto/req/EmergencySuppliesInspectUserReqDTO.java
+++ b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/model/dto/req/EmergencySuppliesInspectUserReqDTO.java
@@ -3,6 +3,16 @@
public class EmergencySuppliesInspectUserReqDTO {
+ private String userName;
+
+ public String getUserName() {
+ return userName;
+ }
+
+ public void setUserName(String userName) {
+ this.userName = userName;
+ }
+
private Long id;
private Long inspectId;
diff --git a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/model/dto/req/EmergencySuppliesMaintainUserReqDTO.java b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/model/dto/req/EmergencySuppliesMaintainUserReqDTO.java
index 65400be..f694486 100644
--- a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/model/dto/req/EmergencySuppliesMaintainUserReqDTO.java
+++ b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/model/dto/req/EmergencySuppliesMaintainUserReqDTO.java
@@ -3,6 +3,16 @@
public class EmergencySuppliesMaintainUserReqDTO {
+ private String userName;
+
+ public String getUserName() {
+ return userName;
+ }
+
+ public void setUserName(String userName) {
+ this.userName = userName;
+ }
+
private Long id;
private Long maintainId;
diff --git a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/model/dto/req/EmergencySuppliesReqDTO.java b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/model/dto/req/EmergencySuppliesReqDTO.java
index 0e6c520..5dac4a3 100644
--- a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/model/dto/req/EmergencySuppliesReqDTO.java
+++ b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/model/dto/req/EmergencySuppliesReqDTO.java
@@ -9,7 +9,16 @@
public class EmergencySuppliesReqDTO {
- @TableId(type = IdType.AUTO)
+ private String principalUserName;
+
+ public String getPrincipalUserName() {
+ return principalUserName;
+ }
+
+ public void setPrincipalUserName(String principalUserName) {
+ this.principalUserName = principalUserName;
+ }
+
private Long id;
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date productionDate;
diff --git a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/model/dto/resp/EmergencySuppliesDetailRespDTO.java b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/model/dto/resp/EmergencySuppliesDetailRespDTO.java
index 67b7853..873ab54 100644
--- a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/model/dto/resp/EmergencySuppliesDetailRespDTO.java
+++ b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/model/dto/resp/EmergencySuppliesDetailRespDTO.java
@@ -9,6 +9,16 @@
public class EmergencySuppliesDetailRespDTO {
+ private String principalUserName;
+
+ public String getPrincipalUserName() {
+ return principalUserName;
+ }
+
+ public void setPrincipalUserName(String principalUserName) {
+ this.principalUserName = principalUserName;
+ }
+
@TableId(type = IdType.AUTO)
private Long id;
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
diff --git a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/model/dto/resp/EmergencySuppliesInspectDetailRespDTO.java b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/model/dto/resp/EmergencySuppliesInspectDetailRespDTO.java
index d87a04c..edab939 100644
--- a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/model/dto/resp/EmergencySuppliesInspectDetailRespDTO.java
+++ b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/model/dto/resp/EmergencySuppliesInspectDetailRespDTO.java
@@ -9,6 +9,16 @@
public class EmergencySuppliesInspectDetailRespDTO {
+ private String suppliesName;
+
+ public String getSuppliesName() {
+ return suppliesName;
+ }
+
+ public void setSuppliesName(String suppliesName) {
+ this.suppliesName = suppliesName;
+ }
+
private Long id;
private Long suppliesId;
diff --git a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/model/dto/resp/EmergencySuppliesInspectPageRespDTO.java b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/model/dto/resp/EmergencySuppliesInspectPageRespDTO.java
index ed6da8f..2044c09 100644
--- a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/model/dto/resp/EmergencySuppliesInspectPageRespDTO.java
+++ b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/model/dto/resp/EmergencySuppliesInspectPageRespDTO.java
@@ -8,6 +8,16 @@
public class EmergencySuppliesInspectPageRespDTO {
+ private String suppliesName;
+
+ public String getSuppliesName() {
+ return suppliesName;
+ }
+
+ public void setSuppliesName(String suppliesName) {
+ this.suppliesName = suppliesName;
+ }
+
private Long id;
private Long suppliesId;
diff --git a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/model/dto/resp/EmergencySuppliesInspectUserRespDTO.java b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/model/dto/resp/EmergencySuppliesInspectUserRespDTO.java
index a964788..c25d519 100644
--- a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/model/dto/resp/EmergencySuppliesInspectUserRespDTO.java
+++ b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/model/dto/resp/EmergencySuppliesInspectUserRespDTO.java
@@ -4,6 +4,16 @@
public class EmergencySuppliesInspectUserRespDTO {
+ private String userName;
+
+ public String getUserName() {
+ return userName;
+ }
+
+ public void setUserName(String userName) {
+ this.userName = userName;
+ }
+
private Long id;
private Long inspectId;
diff --git a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/model/dto/resp/EmergencySuppliesMaintainDetailRespDTO.java b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/model/dto/resp/EmergencySuppliesMaintainDetailRespDTO.java
index 6e578d4..9bbbfb6 100644
--- a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/model/dto/resp/EmergencySuppliesMaintainDetailRespDTO.java
+++ b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/model/dto/resp/EmergencySuppliesMaintainDetailRespDTO.java
@@ -9,6 +9,16 @@
public class EmergencySuppliesMaintainDetailRespDTO {
+ private String suppliesName;
+
+ public String getSuppliesName() {
+ return suppliesName;
+ }
+
+ public void setSuppliesName(String suppliesName) {
+ this.suppliesName = suppliesName;
+ }
+
private Long id;
private Long suppliesId;
diff --git a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/model/dto/resp/EmergencySuppliesMaintainPageRespDTO.java b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/model/dto/resp/EmergencySuppliesMaintainPageRespDTO.java
index 4085733..469e1bc 100644
--- a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/model/dto/resp/EmergencySuppliesMaintainPageRespDTO.java
+++ b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/model/dto/resp/EmergencySuppliesMaintainPageRespDTO.java
@@ -8,6 +8,16 @@
public class EmergencySuppliesMaintainPageRespDTO {
+ private String suppliesName;
+
+ public String getSuppliesName() {
+ return suppliesName;
+ }
+
+ public void setSuppliesName(String suppliesName) {
+ this.suppliesName = suppliesName;
+ }
+
private Long id;
private Long suppliesId;
diff --git a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/model/dto/resp/EmergencySuppliesMaintainUserRespDTO.java b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/model/dto/resp/EmergencySuppliesMaintainUserRespDTO.java
index a9047b8..1434f85 100644
--- a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/model/dto/resp/EmergencySuppliesMaintainUserRespDTO.java
+++ b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/model/dto/resp/EmergencySuppliesMaintainUserRespDTO.java
@@ -2,6 +2,16 @@
public class EmergencySuppliesMaintainUserRespDTO {
+ private String userName;
+
+ public String getUserName() {
+ return userName;
+ }
+
+ public void setUserName(String userName) {
+ this.userName = userName;
+ }
+
private Long id;
private Long maintainId;
diff --git a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/model/dto/resp/EmergencySuppliesPageRespDTO.java b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/model/dto/resp/EmergencySuppliesPageRespDTO.java
index bcc5653..a7b57b6 100644
--- a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/model/dto/resp/EmergencySuppliesPageRespDTO.java
+++ b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/model/dto/resp/EmergencySuppliesPageRespDTO.java
@@ -6,6 +6,16 @@
public class EmergencySuppliesPageRespDTO {
+ private String deptName;
+
+ public String getDeptName() {
+ return deptName;
+ }
+
+ public void setDeptName(String deptName) {
+ this.deptName = deptName;
+ }
+
private Long id;
private String name;
diff --git a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/service/EmergencySuppliesInspectService.java b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/service/EmergencySuppliesInspectService.java
index 0b6d08a..da0e0ea 100644
--- a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/service/EmergencySuppliesInspectService.java
+++ b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/service/EmergencySuppliesInspectService.java
@@ -20,5 +20,5 @@
ResultVO updateEmergencySuppliesInspect(Long uid, EmergencySuppliesInspectReqDTO emergencySuppliesInspectReqDTO);
- ResultVO batchDeleteEmergencySuppliesInspect(String ids);
+ ResultVO batchDeleteEmergencySuppliesInspect(Long[] ids);
}
diff --git a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/service/EmergencySuppliesMaintainService.java b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/service/EmergencySuppliesMaintainService.java
index 9473ae4..2325233 100644
--- a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/service/EmergencySuppliesMaintainService.java
+++ b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/service/EmergencySuppliesMaintainService.java
@@ -20,5 +20,5 @@
ResultVO updateEmergencySuppliesMaintain(Long uid, EmergencySuppliesMaintainReqDTO emergencySuppliesMaintainReqDTO);
- ResultVO batchDeleteEmergencySuppliesMaintain(String ids);
+ ResultVO batchDeleteEmergencySuppliesMaintain(Long[] ids);
}
diff --git a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/service/EmergencySuppliesService.java b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/service/EmergencySuppliesService.java
index 3979ceb..4463d16 100644
--- a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/service/EmergencySuppliesService.java
+++ b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/service/EmergencySuppliesService.java
@@ -20,5 +20,5 @@
ResultVO updateEmergencySupplies(Long uid, EmergencySuppliesReqDTO emergencySuppliesReqDTO);
- ResultVO batchDeleteEmergencySupplies(String ids);
+ ResultVO batchDeleteEmergencySupplies( Long[] ids);
}
diff --git a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/service/impl/EmergencySuppliesInspectServiceImpl.java b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/service/impl/EmergencySuppliesInspectServiceImpl.java
index adf4e12..bf8433d 100644
--- a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/service/impl/EmergencySuppliesInspectServiceImpl.java
+++ b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/service/impl/EmergencySuppliesInspectServiceImpl.java
@@ -195,13 +195,13 @@
}
@Override
- public ResultVO batchDeleteEmergencySuppliesInspect(String ids) {
- if (StringUtils.isBlank(ids)) {
+ public ResultVO batchDeleteEmergencySuppliesInspect(Long[] ids) {
+
+ if (ids == null || ids.length==0){
throw new EmergencyException(EmergencyResultCodes.SUPPLIES_INSPECT_NULL);
- } else {
- String[] idArr = ids.split(",");
- for (String id : idArr) {
- deleteEmergencySuppliesInspect(Long.valueOf(id));
+ }else{
+ for (Long id : ids){
+ deleteEmergencySuppliesInspect(id);
}
return new ResultVO(ResultCodes.OK);
}
diff --git a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/service/impl/EmergencySuppliesMaintainServiceImpl.java b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/service/impl/EmergencySuppliesMaintainServiceImpl.java
index dfa0570..8c27628 100644
--- a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/service/impl/EmergencySuppliesMaintainServiceImpl.java
+++ b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/service/impl/EmergencySuppliesMaintainServiceImpl.java
@@ -195,13 +195,13 @@
}
@Override
- public ResultVO batchDeleteEmergencySuppliesMaintain(String ids) {
- if (StringUtils.isBlank(ids)) {
+ public ResultVO batchDeleteEmergencySuppliesMaintain(Long[] ids) {
+
+ if (ids == null || ids.length==0){
throw new EmergencyException(EmergencyResultCodes.SUPPLIES_MAINTAIN_NULL);
- } else {
- String[] idArr = ids.split(",");
- for (String id : idArr) {
- deleteEmergencySuppliesMaintain(Long.valueOf(id));
+ }else{
+ for (Long id : ids){
+ deleteEmergencySuppliesMaintain(id);
}
return new ResultVO(ResultCodes.OK);
}
diff --git a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/service/impl/EmergencySuppliesServiceImpl.java b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/service/impl/EmergencySuppliesServiceImpl.java
index dc637b0..b95c086 100644
--- a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/service/impl/EmergencySuppliesServiceImpl.java
+++ b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/service/impl/EmergencySuppliesServiceImpl.java
@@ -1,6 +1,8 @@
package com.gkhy.safePlatform.emergency.service.impl;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.gkhy.safePlatform.account.rpc.apimodel.AccountDepartmentService;
+import com.gkhy.safePlatform.account.rpc.apimodel.model.resp.DepInfoRPCRespDTO;
import com.gkhy.safePlatform.commons.enums.ResultCodes;
import com.gkhy.safePlatform.commons.query.PageQuery;
import com.gkhy.safePlatform.commons.utils.BeanCopyUtils;
@@ -16,18 +18,24 @@
import com.gkhy.safePlatform.emergency.query.db.EmergencySuppliesDBQuery;
import com.gkhy.safePlatform.emergency.service.EmergencySuppliesService;
import com.gkhy.safePlatform.emergency.service.baseService.*;
+import org.apache.dubbo.config.annotation.DubboReference;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.util.Date;
+import java.util.HashMap;
import java.util.List;
+import java.util.Map;
@Service("emergencySuppliesService")
public class EmergencySuppliesServiceImpl implements EmergencySuppliesService {
@Autowired
private EmergencySuppliesInfoService emergencySuppliesInfoService;
+
+ @DubboReference(check = false)
+ private AccountDepartmentService accountDepartmentService;
@Override
@@ -42,6 +50,24 @@
}
List<EmergencySuppliesInfoPageDO> emergencySuppliesListDoInfoList = emergencySuppliesInfoService.selectEmergencySuppliesList(page,emergencySuppliesDBQuery);
List<EmergencySuppliesPageRespDTO> respList = BeanCopyUtils.copyBeanList(emergencySuppliesListDoInfoList, EmergencySuppliesPageRespDTO.class);
+
+ Map<Long, String> depPool = new HashMap<>();
+
+ respList.forEach(AccidentExpressPageRespDTO ->{
+ // 设置部门名称
+ if (!depPool.containsKey(AccidentExpressPageRespDTO.getDepartmentId())) {
+ ResultVO<DepInfoRPCRespDTO> rpcResult = accountDepartmentService.getDepInfoByDepId(AccidentExpressPageRespDTO.getDepartmentId());
+ if (rpcResult != null && rpcResult.getCode().equals(ResultCodes.OK.getCode())) {
+ if (rpcResult.getData() != null) {
+ DepInfoRPCRespDTO dep = (DepInfoRPCRespDTO) rpcResult.getData();
+
+ depPool.put(dep.getDepId(), dep.getDepName());
+ }
+ }}
+
+ String depName = depPool.get(AccidentExpressPageRespDTO.getDepartmentId());
+ AccidentExpressPageRespDTO.setDeptName(depName);
+ });
return new SearchResultVO<>(
true,
@@ -99,13 +125,13 @@
}
@Override
- public ResultVO batchDeleteEmergencySupplies(String ids) {
- if (StringUtils.isBlank(ids)) {
+ public ResultVO batchDeleteEmergencySupplies( Long[] ids) {
+
+ if (ids == null || ids.length==0){
throw new EmergencyException(EmergencyResultCodes.SUPPLIES_NULL);
- } else {
- String[] idArr = ids.split(",");
- for (String id : idArr) {
- deleteEmergencySupplies(Long.valueOf(id));
+ }else{
+ for (Long id : ids){
+ deleteEmergencySupplies(id);
}
return new ResultVO(ResultCodes.OK);
}
diff --git a/emergency/emergency-service/src/main/resource/config/mapper/emergency/EmergencySuppliesInfoMapper.xml b/emergency/emergency-service/src/main/resource/config/mapper/emergency/EmergencySuppliesInfoMapper.xml
index c9d7844..9b4c5c5 100644
--- a/emergency/emergency-service/src/main/resource/config/mapper/emergency/EmergencySuppliesInfoMapper.xml
+++ b/emergency/emergency-service/src/main/resource/config/mapper/emergency/EmergencySuppliesInfoMapper.xml
@@ -38,6 +38,7 @@
<if test="usePeriod != null ">use_period,</if>
<if test="departmentId != null ">department_id,</if>
<if test="principalUserUid != null ">`principal_user_uid`,</if>
+ <if test="principalUserName != null and principalUserName != ''">`principal_user_name`,</if>
<if test="status != null and status != ''">status,</if>
<if test="classification != null and classification != ''">`classification`,</if>
<if test="name != null and name != ''">`name`,</if>
@@ -66,6 +67,7 @@
<if test="usePeriod != null ">#{usePeriod},</if>
<if test="departmentId != null ">#{departmentId},</if>
<if test="principalUserUid != null ">#{principalUserUid},</if>
+ <if test="principalUserName != null and principalUserName != ''">#{principalUserName},</if>
<if test="status != null and status != ''">#{status},</if>
<if test="classification != null and classification != ''">#{classification},</if>
<if test="name != null and name != ''">#{name},</if>
@@ -92,6 +94,7 @@
<result column="use_period" property="usePeriod"/>
<result column="department_id" property="departmentId"/>
<result column="principal_user_uid" property="principalUserUid"/>
+ <result column="principal_user_name" property="principalUserName"/>
<result column="status" property="status"/>
<result column="classification" property="classification"/>
<result column="name" property="name"/>
@@ -106,7 +109,7 @@
</resultMap>
<select id="selectEmergencySuppliesById" resultMap="emergencySuppliesInfoDetailDOResult">
- select id ,`production_date`,`use_date`,`inspect_date`,`next_inspect_date`,inspect_period ,`count` ,use_period ,department_id ,principal_user_uid ,
+ select id ,`production_date`,`use_date`,`inspect_date`,`next_inspect_date`,inspect_period ,`count` ,use_period ,department_id ,principal_user_uid ,principal_user_name,
status ,classification ,`name` ,`number` ,model ,longitude ,latitude ,`use` ,area_id ,place ,use_explain
from emergency_supplies where del_flag = 0 and id = #{id}
</select>
@@ -125,6 +128,7 @@
<if test="usePeriod != null ">use_period = #{usePeriod},</if>
<if test="departmentId != null ">department_id = #{departmentId},</if>
<if test="principalUserUid != null ">`principal_user_uid` = #{principalUserUid},</if>
+ <if test="principalUserName != null and principalUserName != ''">principal_user_name = #{principalUserName},</if>
<if test="status != null and status != ''">status = #{status},</if>
<if test="classification != null and classification != ''">`classification` = #{classification},</if>
<if test="name != null and name != ''">`name` = #{name},</if>
diff --git a/emergency/emergency-service/src/main/resource/config/mapper/emergency/EmergencySuppliesInspectInfoMapper.xml b/emergency/emergency-service/src/main/resource/config/mapper/emergency/EmergencySuppliesInspectInfoMapper.xml
index e8d07fb..e14e9c9 100644
--- a/emergency/emergency-service/src/main/resource/config/mapper/emergency/EmergencySuppliesInspectInfoMapper.xml
+++ b/emergency/emergency-service/src/main/resource/config/mapper/emergency/EmergencySuppliesInspectInfoMapper.xml
@@ -12,8 +12,18 @@
</resultMap>
<select id="selectEmergencySuppliesInspectList" resultMap="emergencySuppliesInspectInfoPageDOResult">
- select id,`supplies_id`,`inspect_result`,`inspect_time` from emergency_supplies_inspect where del_flag = 0
- <if test="query.suppliesId != null and query.suppliesId != ''">and `supplies_id` = #{query.suppliesId}</if>
+ SELECT
+ a.id,
+ a.`supplies_id`,
+ a.`inspect_result`,
+ a.`inspect_time`,
+ b.`name` AS suppliesName
+ FROM
+ emergency_supplies_inspect a
+ LEFT JOIN emergency_supplies b ON a.supplies_id = b.id
+ WHERE
+ a.del_flag = 0
+ <if test="query.suppliesId != null and query.suppliesId != ''">and a.supplies_id = #{query.suppliesId}</if>
</select>
<insert id="addEmergencySuppliesInspect" parameterType="com.gkhy.safePlatform.emergency.entity.EmergencySuppliesInspectInfo"
@@ -52,7 +62,17 @@
</resultMap>
<select id="selectEmergencySuppliesInspectById" resultMap="emergencySuppliesInspectInfoDetailDOResult">
- select id,`supplies_id`,`inspect_result`,`inspect_time` from emergency_supplies_inspect where del_flag = 0 and id = #{id}
+ SELECT
+ a.id,
+ a.`supplies_id`,
+ a.`inspect_result`,
+ a.`inspect_time`,
+ b.`name` AS suppliesName
+ FROM
+ emergency_supplies_inspect a
+ LEFT JOIN emergency_supplies b ON a.supplies_id = b.id
+ WHERE
+ a.del_flag = 0 and a.id = #{id}
</select>
<update id="updateEmergencySuppliesInspect" parameterType="com.gkhy.safePlatform.emergency.entity.EmergencySuppliesInspectInfo">
diff --git a/emergency/emergency-service/src/main/resource/config/mapper/emergency/EmergencySuppliesInspectUserInfoMapper.xml b/emergency/emergency-service/src/main/resource/config/mapper/emergency/EmergencySuppliesInspectUserInfoMapper.xml
index a632cb8..96280c6 100644
--- a/emergency/emergency-service/src/main/resource/config/mapper/emergency/EmergencySuppliesInspectUserInfoMapper.xml
+++ b/emergency/emergency-service/src/main/resource/config/mapper/emergency/EmergencySuppliesInspectUserInfoMapper.xml
@@ -15,6 +15,7 @@
<if test="updateUid != null ">update_uid,</if>
<if test="inspectId != null ">inspect_id,</if>
<if test="userUid != null ">user_uid,</if>
+ <if test="userName != null and userName != ''">user_name,</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="id != null ">#{id},</if>
@@ -25,6 +26,7 @@
<if test="updateUid != null ">#{updateUid},</if>
<if test="inspectId != null ">#{inspectId},</if>
<if test="userUid != null ">#{userUid},</if>
+ <if test="userName != null and userName != ''">#{userName},</if>
</trim>
</insert>
@@ -32,10 +34,11 @@
<id column="id" property="id" jdbcType="BIGINT"/>
<result column="inspect_id" property="inspectId" />
<result column="user_uid" property="userUid" />
+ <result column="user_name" property="userName" />
</resultMap>
<select id="selectEmergencySuppliesInspectUserBySuppliesInspectId" resultMap="emergencySuppliesInspectUserInfoDOResult">
- select id,`inspect_id`,`user_uid` from emergency_supplies_inspect_user where del_flag = 0 and inspect_id = #{suppliesInspectId}
+ select id,`inspect_id`,`user_uid`,user_name from emergency_supplies_inspect_user where del_flag = 0 and inspect_id = #{suppliesInspectId}
</select>
<update id = "deleteEmergencySuppliesInspectUserByIds" >
diff --git a/emergency/emergency-service/src/main/resource/config/mapper/emergency/EmergencySuppliesMaintainInfoMapper.xml b/emergency/emergency-service/src/main/resource/config/mapper/emergency/EmergencySuppliesMaintainInfoMapper.xml
index ab81784..f2b4486 100644
--- a/emergency/emergency-service/src/main/resource/config/mapper/emergency/EmergencySuppliesMaintainInfoMapper.xml
+++ b/emergency/emergency-service/src/main/resource/config/mapper/emergency/EmergencySuppliesMaintainInfoMapper.xml
@@ -12,8 +12,18 @@
</resultMap>
<select id="selectEmergencySuppliesMaintainList" resultMap="emergencySuppliesMaintainInfoPageDOResult">
- select id,`supplies_id`,`maintain_result`,`maintain_time` from emergency_supplies_maintain where del_flag = 0
- <if test="query.suppliesId != null and query.suppliesId != ''">and `supplies_id` = #{query.suppliesId}</if>
+ SELECT
+ a.id,
+ a.`supplies_id`,
+ a.`maintain_result`,
+ a.`maintain_time`,
+ b.`name` AS suppliesName
+ FROM
+ emergency_supplies_maintain a
+ LEFT JOIN emergency_supplies b ON a.supplies_id = b.id
+ WHERE
+ a.del_flag = 0
+ <if test="query.suppliesId != null and query.suppliesId != ''">and a.supplies_id = #{query.suppliesId}</if>
</select>
<insert id="addEmergencySuppliesMaintain" parameterType="com.gkhy.safePlatform.emergency.entity.EmergencySuppliesMaintainInfo"
@@ -52,7 +62,18 @@
</resultMap>
<select id="selectEmergencySuppliesMaintainById" resultMap="emergencySuppliesMaintainInfoDetailDOResult">
- select id,`supplies_id`,`maintain_result`,`maintain_time` from emergency_supplies_maintain where del_flag = 0 and id = #{id}
+
+ SELECT
+ a.id,
+ a.`supplies_id`,
+ a.`maintain_result`,
+ a.`maintain_time`,
+ b.`name` AS suppliesName
+ FROM
+ emergency_supplies_maintain a
+ LEFT JOIN emergency_supplies b ON a.supplies_id = b.id
+ WHERE
+ a.del_flag = 0 and a.id = #{id}
</select>
<update id="updateEmergencySuppliesMaintain" parameterType="com.gkhy.safePlatform.emergency.entity.EmergencySuppliesMaintainInfo">
diff --git a/emergency/emergency-service/src/main/resource/config/mapper/emergency/EmergencySuppliesMaintainUserInfoMapper.xml b/emergency/emergency-service/src/main/resource/config/mapper/emergency/EmergencySuppliesMaintainUserInfoMapper.xml
index 0103449..99515b2 100644
--- a/emergency/emergency-service/src/main/resource/config/mapper/emergency/EmergencySuppliesMaintainUserInfoMapper.xml
+++ b/emergency/emergency-service/src/main/resource/config/mapper/emergency/EmergencySuppliesMaintainUserInfoMapper.xml
@@ -15,6 +15,7 @@
<if test="updateUid != null ">update_uid,</if>
<if test="maintainId != null ">maintain_id,</if>
<if test="userUid != null ">user_uid,</if>
+ <if test="userName != null and userName != ''">user_name,</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="id != null ">#{id},</if>
@@ -25,6 +26,7 @@
<if test="updateUid != null ">#{updateUid},</if>
<if test="maintainId != null ">#{maintainId},</if>
<if test="userUid != null ">#{userUid},</if>
+ <if test="userName != null and userName != ''">#{userName},</if>
</trim>
</insert>
@@ -32,10 +34,11 @@
<id column="id" property="id" jdbcType="BIGINT"/>
<result column="maintain_id" property="maintainId" />
<result column="user_uid" property="userUid" />
+ <result column="user_name" property="userName" />
</resultMap>
<select id="selectEmergencySuppliesMaintainUserBySuppliesMaintainId" resultMap="emergencySuppliesMaintainUserInfoDOResult">
- select id,`maintain_id`,`user_uid` from emergency_supplies_maintain_user where del_flag = 0 and maintain_id = #{suppliesMaintainId}
+ select id,`maintain_id`,`user_uid`,user_name from emergency_supplies_maintain_user where del_flag = 0 and maintain_id = #{suppliesMaintainId}
</select>
<update id = "deleteEmergencySuppliesMaintainUserByIds" >
--
Gitblit v1.9.2