列表

epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/model/DangerousChemicalsModel.java

@@ -28,8 +28,8 @@ public class DangerousChemicalsModel {
     @ExcelProperty(value = "企业名称")
     private String name;
 
-    @NotBlank(message = "企业类型不能为空")
-    @ExcelProperty(value = "企业类型")
+    @NotBlank(message = "企业类别不能为空")
+    @ExcelProperty(value = "企业类别")
     private String categoryName;
 
     /**
@@ -168,7 +168,7 @@ public class DangerousChemicalsModel {
         /**
          * 灵山：企业介绍
          */
-        @ColumnWidth(5)
+        @ColumnWidth(50)
         @ExcelProperty(value = "企业介绍")
         private String companyProfile;
 

epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcDangerousChemicalsServiceImpl.java

@@ -258,7 +258,7 @@ public class IcDangerousChemicalsServiceImpl extends BaseServiceImpl<IcDangerous
             String staffAgencyPath=PidUtils.convertPid2OrgIdPath(staffInfo.getAgencyId(),staffAgencyInfo.getPids());
             //危化品种类字典
             Result<Map<String, String>> statusRes = adminOpenFeignClient.dictMap(DictTypeEnum.IC_DANGER_TYPE.getCode());
-            if (!statusRes.success() || MapUtils.isNotEmpty(statusRes.getData())) {
+            if (!statusRes.success() || MapUtils.isEmpty(statusRes.getData())) {
                 throw new EpmetException("获取IC_DANGER_TYPE字典表失败");
             }
             Map<String, String> dangerTypeMap = statusRes.getData();
@@ -326,7 +326,7 @@ public class IcDangerousChemicalsServiceImpl extends BaseServiceImpl<IcDangerous
             importFinishTaskForm.setTaskId(importTaskId);
             importFinishTaskForm.setProcessStatus(ImportTaskConstants.PROCESS_STATUS_FINISHED_FAIL);
             importFinishTaskForm.setOperatorId(tokenDto.getUserId());
-            importFinishTaskForm.setResultDesc("导入失败");
+            importFinishTaskForm.setResultDesc("导入失败"+errorMsg);
 
             Result result = commonServiceOpenFeignClient.finishImportTask(importFinishTaskForm);
             if (!result.success()) {

epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcDangerousChemicalsDao.xml

@@ -104,7 +104,7 @@
         </if>
         <if test='orgType == "agency"'>
             <if test="orgIdPath != null and orgIdPath != '' ">
-                AND dc.org_id_path like concat(#{orgIdPath},'%')
+                AND dc.AGENCY_ID_PATH like concat(#{orgIdPath},'%')
             </if>
         </if>
         <if test='orgType == "grid"'>