事故统计优化bug修改

zlmy-modules/zlmy-boot/src/main/java/com/testor/module/accident/model/domain/AccidentReport.java

@@ -193,8 +193,8 @@ public class AccidentReport extends SuperModel {
      * 事故等级（国家）(字典:accident_level_country)
      */
     @ApiModelProperty(value = "事故等级（国家）(字典:accident_level_country)")
-    @TableField("t_accident_report")
-    private String tAccidentReport;
+    @TableField("accident_level_country")
+    private String accidentLevelCountry;
 
     /**
      * 事人员追责问责情况

zlmy-modules/zlmy-boot/src/main/java/com/testor/module/accident/model/dto/AccidentReportDetail.java

 package com.testor.module.accident.model.dto;
 
 import com.alibaba.fastjson.annotation.JSONField;
-import com.baomidou.mybatisplus.annotation.TableField;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.testor.module.accident.model.domain.AccidentPersonnel;
-import com.testor.module.accident.model.domain.AccidentReport;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import org.springframework.format.annotation.DateTimeFormat;
@@ -61,7 +59,6 @@ public class AccidentReportDetail {
      * 损失工作日
      */
     @ApiModelProperty(value = "损失工作日")
-    @TableField("lost_working_days")
     private String lostWorkingDays;
 
     /**
@@ -77,19 +74,19 @@ public class AccidentReportDetail {
      * 涉及集团八大类风险(多选 字典:group_risk)
      */
     @ApiModelProperty(value = "多选 涉及集团八大类风险(字典:group_risk)")
-    private String groupRiskDetail;
+    private String groupRisk;
 
     /**
      * 涉及危险作业类型(多选 字典:dangerous_homework_category)
      */
     @ApiModelProperty(value = "多选 涉及危险作业类型(字典:dangerous_homework_category)")
-    private String dangerousHomeworkCategoryDetail;
+    private String dangerousHomeworkCategory;
 
     /**
      * 受伤部位(多选 字典:injured_area)
      */
     @ApiModelProperty(value = "多选 受伤部位(字典:injured_area)")
-    private String injuredAreaDetail;
+    private String injuredArea;
     /**
      * 事故详细经过
      */

zlmy-modules/zlmy-boot/src/main/resources/mapper/accident/AccidentReport.xml

@@ -21,7 +21,7 @@
         <id column="accident_cause" property="accidentCause"/>
         <id column="improvements" property="improvements"/>
         <id column="attachment" property="attachment"/>
-        <id column="t_accident_report" property="tAccidentReport"/>
+        <id column="accident_level_country" property="accidentLevelCountry"/>
         <id column="personnel_accountability_status" property="personnelAccountabilityStatus"/>
         <id column="lost_working_days" property="lostWorkingDays"/>
         <id column="group_risk" property="groupRisk"/>
@@ -184,7 +184,7 @@
         ON cause_dict.dict_key = causes.cause_key
         AND cause_dict.dict_id = '5ed4476803994013b0ee319f479f199f'
         )
-        END as accidentCauseDetail,
+        END as accidentCause,
 
         CASE
         WHEN tar.dangerous_homework_category IS NULL OR tar.dangerous_homework_category = '' THEN NULL
@@ -197,7 +197,7 @@
         ON dangerous_dict.dict_key = dangerous_categories.dangerous_key
         AND dangerous_dict.dict_id = '4'
         )
-        END as dangerousHomeworkCategoryDetail,
+        END as dangerousHomeworkCategory,
 
         CASE
         WHEN tar.group_risk IS NULL OR tar.group_risk = '' THEN NULL
@@ -210,7 +210,7 @@
         ON risk_dict.dict_key = risks.risk_key
         AND risk_dict.dict_id = '3'
         )
-        END as groupRiskDetail,
+        END as groupRisk,
 
         CASE
         WHEN tar.injured_area IS NULL OR tar.injured_area = '' THEN NULL
@@ -225,7 +225,7 @@
         )
         END as injuredArea,
 
-        sdd_country.dict_value as accidentLevelCountryDetail,
+        sdd_country.dict_value as accidentLevelCountry,
         so.org_name as currentOrgName,
         bd.org_name as businessDeptName,
         rg.org_name as regionName,
@@ -236,14 +236,22 @@
         0
         ) as reportCount
         ,
-        tar.id
+        tar.id,
+        tar.accident_time as accidentTime,
+        tar.direct_economic_loss directEconomicLoss,
+        tar.lost_working_days lostWorkingDays,
+        tar.improvements improvements,
+        tar.accident_passed accidentPassed,
+        tar.improvements improvements,
+        tar.personnel_accountability_status personnelAccountabilityStatus,
+        tar.remarks remarks
 
         FROM t_accident_report tar
         LEFT JOIN t_sys_dict_data sdd2 ON tar.accident_level = sdd2.dict_key
         AND sdd2.dict_id = 'cd94e04e8ddd4a078dfaf2b5d784c798'
         LEFT JOIN t_sys_dict_data sdd_country ON tar.accident_level_country = sdd_country.dict_key
         AND sdd_country.dict_id = '2'
-        LEFT JOIN t_sys_org so ON tar.basic_unit_id = so.org_id
+        LEFT JOIN t_sys_org so ON tar.org_id = so.org_id
         LEFT JOIN t_sys_org bd ON so.parent_id = bd.org_id
         LEFT JOIN t_sys_org bd2 ON so.parent_id = bd2.org_id
         LEFT JOIN t_sys_org rg ON bd2.parent_id = rg.org_id