事故,危险作业bug修改

zlmy-modules/zlmy-boot/src/main/java/com/testor/module/accident/model/template/AccidentReportDetailTemplate.java

@@ -51,7 +51,7 @@ public class AccidentReportDetailTemplate {
 
     @ExcelProperty("受伤人数")
     @ColumnWidth(10)
-    private String reportCount;
+    private Integer reportCount;
 
     @ExcelProperty("直接经济损失")
     @ColumnWidth(15)
@@ -131,7 +131,7 @@ public class AccidentReportDetailTemplate {
 
         template.setAccidentLevelCountry(detail.getAccidentLevelCountry());
         template.setAccidentLevel(detail.getAccidentLevel());
-        template.setReportCount(detail.getReportCount() != null ? String.valueOf(detail.getReportCount()) : "0");
+        template.setReportCount(detail.getReportCount());
         template.setDirectEconomicLoss(formatBigDecimal(detail.getDirectEconomicLoss()));
         template.setLostWorkingDays(detail.getLostWorkingDays());
         template.setAccidentType(detail.getAccidentType());
@@ -179,9 +179,9 @@ public class AccidentReportDetailTemplate {
             String belongType = person.getBelongType();
             if (StringUtils.hasText(belongType)) {
                 if ("0".equals(belongType)) {
-                    belongTypes.add("承包商人员");
+                    belongTypes.add("相关方");
                 } else if ("1".equals(belongType)) {
-                    belongTypes.add("企业人员");
+                    belongTypes.add("本单位");
                 } else {
                     belongTypes.add(belongType); // 如果是其他值，保持原样
                 }

zlmy-modules/zlmy-boot/src/main/resources/application-pre.yml

@@ -59,15 +59,14 @@ swagger:
     mail: a@b.c.d
 
 minio:
-  accessKey: ${MINIO_ACCESSKEY:admin}
-  secretKey: ${MINIO_SECRETKEY:ZLmy@Minio}
-  bucket: ${MINIO_BUCKET:zlmy}
-  endpoint: http://${MINIO_IP:127.0.0.1}:${MINIO_IP:9000}
-  access-Key: ${MINIO_ACCESSKEY:admin}
+  accessKey: admin
+  secretKey: ZLmy@Minio
+  bucket: zlmy
+  endpoint: http://10.25.84.101:9000
+  access-Key: admin
   access-secret: ZLmy@Minio
   path: http://10.25.84.101/minio
-  #内部下载地址
-  imgInport: http://127.0.0.1:9000
+  imgInport: http://10.25.84.101:9000
 
 ## 网关地址
 apisix:

zlmy-modules/zlmy-boot/src/main/resources/license.dat

-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   o= 
+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   o= 
\ No newline at end of file

zlmy-modules/zlmy-boot/src/main/resources/mapper/hazard/HazardWorkPlanStatistics.xml

@@ -414,7 +414,7 @@
         inner join t_sys_dict_data sdd on sdd.dict_data_id = hwp.work_type and sdd.dict_id = '42a87414a06a4f57b9d3ffb1907284b4'
         inner join t_sys_dict_data sdd2 on sdd2.dict_data_id = hwp.work_level and sdd2.dict_id = '222842ea3bb4468bbbeaa3856a4f2731'
         left join t_sys_org so on hwp.org_id = so.org_id
-        where hwp.status = '0' and hwp.work_type!='' and hwp.work_level !=''
+        where hwp.status = '0'
         <if test="query.workType!=null and query.workType != ''">
             and hwp.work_type = #{query.workType}
         </if>