From 8983c1446528ea4265d37c8401d76c6565b76f51 Mon Sep 17 00:00:00 2001
From: yinzuomei <576302893@qq.com>
Date: Mon, 24 Apr 2023 09:48:51 +0800
Subject: [PATCH] test

---
 .../IcDangerousChemicalsController.java        | 18 ++++++++++++++++++
 .../epmet/excel/IcDangerousChemicalsExcel.java |  2 +-
 .../impl/IcDangerousChemicalsServiceImpl.java  |  8 ++++----
 3 files changed, 23 insertions(+), 5 deletions(-)

diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/IcDangerousChemicalsController.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/IcDangerousChemicalsController.java
index 1c8bcfadf1..5561fdcbaf 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/IcDangerousChemicalsController.java
+++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/IcDangerousChemicalsController.java
@@ -133,6 +133,24 @@ public class IcDangerousChemicalsController {
         return new Result();
     }
 
+    /**
+     * 批量删除
+     * @param tokenDto
+     * @param ids
+     * @return
+     */
+    @PostMapping("batch-del")
+    public Result delete(@LoginUser TokenDto tokenDto, @RequestBody List<String> ids) {
+        ids.forEach(id->{
+            IcDangerousChemicalsAddEditFormDTO formDTO=new IcDangerousChemicalsAddEditFormDTO();
+            formDTO.setIcDangerousChemicalsId(id);
+            formDTO.setCustomerId(tokenDto.getCustomerId());
+            formDTO.setUserId(tokenDto.getUserId());
+            icDangerousChemicalsService.delete(formDTO);
+        });
+        return new Result();
+    }
+
     /**
      * 重点危化品企业 查看详情
      * @param formDTO
diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/excel/IcDangerousChemicalsExcel.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/excel/IcDangerousChemicalsExcel.java
index fd11614c6c..ee012d722e 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/excel/IcDangerousChemicalsExcel.java
+++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/excel/IcDangerousChemicalsExcel.java
@@ -49,7 +49,7 @@ public class IcDangerousChemicalsExcel {
     @ColumnWidth(25)
     private String securityPrincipalName;
 
-    @ExcelProperty(value = "安全负责电话人")
+    @ExcelProperty(value = "安全负责电话")
     @ColumnWidth(25)
     private String securityPrincipalMobile;
 
diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcDangerousChemicalsServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcDangerousChemicalsServiceImpl.java
index 25cfb3b0e0..42e644d84d 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcDangerousChemicalsServiceImpl.java
+++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcDangerousChemicalsServiceImpl.java
@@ -156,11 +156,11 @@ public class IcDangerousChemicalsServiceImpl extends BaseServiceImpl<IcDangerous
         CustomerStaffInfoCacheResult staffInfoCacheResult=CustomerStaffRedis.getStaffInfo(formDTO.getCustomerId(),formDTO.getUserId());
         entity.setAgencyId(staffInfoCacheResult.getAgencyId());
         entity.setAgencyIdPath(StringUtils.isNotBlank(staffInfoCacheResult.getAgencyPIds()) ? staffInfoCacheResult.getAgencyPIds().concat(StrConstant.COLON).concat(staffInfoCacheResult.getAgencyId()) : staffInfoCacheResult.getAgencyId());
-        if(OrgTypeEnum.GRID.equals(formDTO.getOrgType())){
+        if(OrgTypeEnum.GRID.getCode().equals(formDTO.getOrgType())){
             // 获取网格信息
             CustomerGridDTO customerGridDTO=SpringContextUtils.getBean(CustomerGridService.class).get(formDTO.getOrgId());
             entity.setOrgIdPath(PidUtils.convertPid2OrgIdPath(customerGridDTO.getId(),customerGridDTO.getPids()));
-        }else if(OrgTypeEnum.AGENCY.equals(formDTO.getOrgType())){
+        }else if(OrgTypeEnum.AGENCY.getCode().equals(formDTO.getOrgType())){
             CustomerAgencyDTO customerAgencyDTO=SpringContextUtils.getBean(CustomerAgencyService.class).get(formDTO.getOrgId());
             entity.setOrgIdPath(PidUtils.convertPid2OrgIdPath(customerAgencyDTO.getId(),customerAgencyDTO.getPids()));
         }
@@ -195,11 +195,11 @@ public class IcDangerousChemicalsServiceImpl extends BaseServiceImpl<IcDangerous
         CustomerStaffInfoCacheResult staffInfoCacheResult=CustomerStaffRedis.getStaffInfo(formDTO.getCustomerId(),formDTO.getUserId());
         entity.setAgencyId(staffInfoCacheResult.getAgencyId());
         entity.setAgencyIdPath(StringUtils.isNotBlank(staffInfoCacheResult.getAgencyPIds()) ? staffInfoCacheResult.getAgencyPIds().concat(StrConstant.COLON).concat(staffInfoCacheResult.getAgencyId()) : staffInfoCacheResult.getAgencyId());
-        if(OrgTypeEnum.GRID.equals(formDTO.getOrgType())){
+        if(OrgTypeEnum.GRID.getCode().equals(formDTO.getOrgType())){
             // 获取网格信息
             CustomerGridDTO customerGridDTO=SpringContextUtils.getBean(CustomerGridService.class).get(formDTO.getOrgId());
             entity.setOrgIdPath(PidUtils.convertPid2OrgIdPath(customerGridDTO.getId(),customerGridDTO.getPids()));
-        }else if(OrgTypeEnum.AGENCY.equals(formDTO.getOrgType())){
+        }else if(OrgTypeEnum.AGENCY.getCode().equals(formDTO.getOrgType())){
             CustomerAgencyDTO customerAgencyDTO=SpringContextUtils.getBean(CustomerAgencyService.class).get(formDTO.getOrgId());
             entity.setOrgIdPath(PidUtils.convertPid2OrgIdPath(customerAgencyDTO.getId(),customerAgencyDTO.getPids()));
         }