连表查字段

songhuangfeng123

2022-07-21 73bec5d5d03df5855eb74c8144934541efc8eecd

连表查字段

 incident-manage/incident-manage-service/src/main/java/com/gkhy/safePlatform/incidentManage/entity/AccidentReportInfoDetailDO.java

@@ -11,6 +11,14 @@
@TableName("accident_report")
public class AccidentReportInfoDetailDO {

    private String accidentName;

    private Long accidentDepartmentId;

    private Date occurrenceTime;

    private String occurrencePlace;

    @TableId(type = IdType.AUTO)
    private Long id;

@@ -222,6 +230,38 @@
        this.otherMaterials = otherMaterials;
    }

    public String getAccidentName() {
        return accidentName;
    }

    public void setAccidentName(String accidentName) {
        this.accidentName = accidentName;
    }

    public Long getAccidentDepartmentId() {
        return accidentDepartmentId;
    }

    public void setAccidentDepartmentId(Long accidentDepartmentId) {
        this.accidentDepartmentId = accidentDepartmentId;
    }

    public Date getOccurrenceTime() {
        return occurrenceTime;
    }

    public void setOccurrenceTime(Date occurrenceTime) {
        this.occurrenceTime = occurrenceTime;
    }

    public String getOccurrencePlace() {
        return occurrencePlace;
    }

    public void setOccurrencePlace(String occurrencePlace) {
        this.occurrencePlace = occurrencePlace;
    }

    @Override
    public String toString() {
        return "AccidentReportInfo{" +

 incident-manage/incident-manage-service/src/main/java/com/gkhy/safePlatform/incidentManage/entity/AccidentReportInfoPageDO.java

@@ -4,11 +4,18 @@
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;

import java.math.BigDecimal;
import java.util.Date;

@TableName("accident_report")
public class AccidentReportInfoPageDO {

    private String accidentName;

    private Long accidentDepartmentId;

    private Date occurrenceTime;

    private String occurrencePlace;

    @TableId(type = IdType.AUTO)
    private Long id;
@@ -71,4 +78,35 @@
        this.accidentGrade = accidentGrade;
    }

    public String getAccidentName() {
        return accidentName;
    }

    public void setAccidentName(String accidentName) {
        this.accidentName = accidentName;
    }

    public Long getAccidentDepartmentId() {
        return accidentDepartmentId;
    }

    public void setAccidentDepartmentId(Long accidentDepartmentId) {
        this.accidentDepartmentId = accidentDepartmentId;
    }

    public Date getOccurrenceTime() {
        return occurrenceTime;
    }

    public void setOccurrenceTime(Date occurrenceTime) {
        this.occurrenceTime = occurrenceTime;
    }

    public String getOccurrencePlace() {
        return occurrencePlace;
    }

    public void setOccurrencePlace(String occurrencePlace) {
        this.occurrencePlace = occurrencePlace;
    }
}

 incident-manage/incident-manage-service/src/main/java/com/gkhy/safePlatform/incidentManage/entity/WorkInjuryDeclarationInfoDetailDO.java

@@ -11,6 +11,26 @@
@TableName("work_injury_declaration")
public class WorkInjuryDeclarationInfoDetailDO {

    private String accidentName;

    private Date occurrenceTime;

    public String getAccidentName() {
        return accidentName;
    }

    public void setAccidentName(String accidentName) {
        this.accidentName = accidentName;
    }

    public Date getOccurrenceTime() {
        return occurrenceTime;
    }

    public void setOccurrenceTime(Date occurrenceTime) {
        this.occurrenceTime = occurrenceTime;
    }

    @TableId(type = IdType.AUTO)
    private Long id;


 incident-manage/incident-manage-service/src/main/java/com/gkhy/safePlatform/incidentManage/entity/WorkInjuryDeclarationInfoPageDO.java

@@ -9,6 +9,16 @@
@TableName("work_injury_declaration")
public class WorkInjuryDeclarationInfoPageDO {

    private String accidentName;

    public String getAccidentName() {
        return accidentName;
    }

    public void setAccidentName(String accidentName) {
        this.accidentName = accidentName;
    }

    @TableId(type = IdType.AUTO)
    private Long id;


 incident-manage/incident-manage-service/src/main/java/com/gkhy/safePlatform/incidentManage/model/dto/resp/AccidentReportDetailRespDTO.java

@@ -2,7 +2,6 @@


import com.fasterxml.jackson.annotation.JsonFormat;
import com.gkhy.safePlatform.incidentManage.entity.AccidentReportFileInfoDO;

import java.math.BigDecimal;
import java.util.Date;
@@ -10,6 +9,47 @@

public class AccidentReportDetailRespDTO {

    private String accidentName;

    private Long accidentDepartmentId;

    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    private Date occurrenceTime;

    private String occurrencePlace;

    public String getAccidentName() {
        return accidentName;
    }

    public void setAccidentName(String accidentName) {
        this.accidentName = accidentName;
    }

    public Long getAccidentDepartmentId() {
        return accidentDepartmentId;
    }

    public void setAccidentDepartmentId(Long accidentDepartmentId) {
        this.accidentDepartmentId = accidentDepartmentId;
    }

    public Date getOccurrenceTime() {
        return occurrenceTime;
    }

    public void setOccurrenceTime(Date occurrenceTime) {
        this.occurrenceTime = occurrenceTime;
    }

    public String getOccurrencePlace() {
        return occurrencePlace;
    }

    public void setOccurrencePlace(String occurrencePlace) {
        this.occurrencePlace = occurrencePlace;
    }

    private Long id;

    private Boolean status ;

 incident-manage/incident-manage-service/src/main/java/com/gkhy/safePlatform/incidentManage/model/dto/resp/AccidentReportPageRespDTO.java

@@ -1,8 +1,53 @@
package com.gkhy.safePlatform.incidentManage.model.dto.resp;


import com.fasterxml.jackson.annotation.JsonFormat;

import java.util.Date;

public class AccidentReportPageRespDTO {

    private String accidentName;

    private Long accidentDepartmentId;

    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    private Date occurrenceTime;

    private String occurrencePlace;

    public String getAccidentName() {
        return accidentName;
    }

    public void setAccidentName(String accidentName) {
        this.accidentName = accidentName;
    }

    public Long getAccidentDepartmentId() {
        return accidentDepartmentId;
    }

    public void setAccidentDepartmentId(Long accidentDepartmentId) {
        this.accidentDepartmentId = accidentDepartmentId;
    }

    public Date getOccurrenceTime() {
        return occurrenceTime;
    }

    public void setOccurrenceTime(Date occurrenceTime) {
        this.occurrenceTime = occurrenceTime;
    }

    public String getOccurrencePlace() {
        return occurrencePlace;
    }

    public void setOccurrencePlace(String occurrencePlace) {
        this.occurrencePlace = occurrencePlace;
    }

    private Long id;

    private Boolean status ;

 incident-manage/incident-manage-service/src/main/java/com/gkhy/safePlatform/incidentManage/model/dto/resp/WorkInjuryDeclarationDetailRespDTO.java

@@ -9,6 +9,26 @@

public class WorkInjuryDeclarationDetailRespDTO {

    private String accidentName;

    private Date occurrenceTime;

    public String getAccidentName() {
        return accidentName;
    }

    public void setAccidentName(String accidentName) {
        this.accidentName = accidentName;
    }

    public Date getOccurrenceTime() {
        return occurrenceTime;
    }

    public void setOccurrenceTime(Date occurrenceTime) {
        this.occurrenceTime = occurrenceTime;
    }

    private Long id;

    private String declareUserName;

 incident-manage/incident-manage-service/src/main/java/com/gkhy/safePlatform/incidentManage/model/dto/resp/WorkInjuryDeclarationPageRespDTO.java

@@ -7,6 +7,16 @@

public class WorkInjuryDeclarationPageRespDTO {

    private String accidentName;

    public String getAccidentName() {
        return accidentName;
    }

    public void setAccidentName(String accidentName) {
        this.accidentName = accidentName;
    }

    private Long id;

    private String declareUserName;

 incident-manage/incident-manage-service/src/main/resources/config/mapper/incidentManage/AccidentReportInfoMapper.xml

@@ -14,8 +14,22 @@
    </resultMap>

    <select id="selectAccidentReportList" resultMap="AccidentReportInfoPageDOResult">
        select id,`accident_express_id`,`accident_type`,`accident_grade` , status from accident_report where del_flag = 0
        <if test="query.status != null  and query.status != ''">and `status` = #{query.status}</if>
        SELECT
        a.id,
        a.`accident_express_id`,
        a.`accident_type`,
        a.`accident_grade`,
        a.`status`,
        b.accident_name as accidentName,
        b.accident_department_id as accidentDepartmentId,
        b.occurrence_place as occurrencePlace,
        b.occurrence_time as occurrenceTime
        FROM
        accident_report a
        LEFT JOIN accident_express b ON a.accident_express_id = b.id
        WHERE
        a.del_flag = 0
        <if test="query.status != null  and query.status != ''">and a.`status` = #{query.status}</if>
    </select>

    <insert id="addAccidentReport" parameterType="com.gkhy.safePlatform.incidentManage.entity.AccidentReportInfo"
@@ -106,12 +120,36 @@
    </resultMap>

    <select id="selectAccidentReportById" resultMap="AccidentReportInfoDetailDOResult">
        select id ,status ,`accident_express_id`,`accident_type`,`accident_grade`,`economic_loss`,minor_injury_num ,serious_injury_num ,
        `death_num`,`accident_cause`,`report_deadline`,`accident_level`,accident_delay_apply ,comprehensive_analysis_direct ,
        `comprehensive_analysis_indirect`,`rectification_measures`,`accident_handling`,`fill_in_user_uid`,fill_in_time,
        `relevant_personnel_records`,`other_materials`
         from accident_report
        where del_flag = 0 and id = #{id}
    SELECT
        a.id,
        a.STATUS,
        a.`accident_express_id`,
        a.`accident_type`,
        a.`accident_grade`,
        a.`economic_loss`,
        a.minor_injury_num,
        a.serious_injury_num,
        a.`death_num`,
        a.`accident_cause`,
        a.`report_deadline`,
        a.`accident_level`,
        a.accident_delay_apply,
        a.comprehensive_analysis_direct,
        a.`comprehensive_analysis_indirect`,
        a.`rectification_measures`,
        a.`accident_handling`,
        a.`fill_in_user_uid`,
        a.fill_in_time,
        a.`relevant_personnel_records`,
        a.`other_materials`,
        b.accident_name AS accidentName,
        b.accident_department_id AS accidentDepartmentId,
        b.occurrence_place AS occurrencePlace,
        b.occurrence_time AS occurrenceTime
    FROM
        accident_report a
        LEFT JOIN accident_express b ON a.accident_express_id = b.id
        WHERE del_flag = 0 and id = #{id}
    </select>

    <update id="updateAccidentReport" parameterType="com.gkhy.safePlatform.incidentManage.entity.AccidentReportInfo">

 incident-manage/incident-manage-service/src/main/resources/config/mapper/incidentManage/WorkInjuryDeclarationInfoMapper.xml

@@ -16,9 +16,21 @@
    </resultMap>

    <select id="selectWorkInjuryDeclarationList" resultMap="WorkInjuryDeclarationInfoPageDOResult">
        select id,`declare_user_name`,`declare_department_id`,`accident_express_id` ,work_injury_type ,declare_date ,visit_hospital
         from work_injury_declaration where del_flag = 0
        <if test="query.accidentExpressId != null">and `accident_express_id` = #{query.accidentExpressId}</if>
        SELECT
        a.id,
        a.`declare_user_name`,
        a.`declare_department_id`,
        a.`accident_express_id`,
        a.work_injury_type,
        a.declare_date,
        a.visit_hospital,
        b.accident_name AS accidentName
        FROM
        work_injury_declaration a
        LEFT JOIN accident_express b ON a.accident_express_id = b.id
            WHERE
            a.del_flag = 0
        <if test="query.accidentExpressId != null">and a.`accident_express_id` = #{query.accidentExpressId}</if>
    </select>

    <insert id="addWorkInjuryDeclaration" parameterType="com.gkhy.safePlatform.incidentManage.entity.WorkInjuryDeclarationInfo"
@@ -84,10 +96,26 @@
    </resultMap>

    <select id="selectWorkInjuryDeclarationById" resultMap="WorkInjuryDeclarationInfoDetailDOResult">
        select id ,declare_user_name ,`declare_user_gender`,`declare_department_id`,`accident_express_id`,`work_injury_type`,declare_date ,lost_time ,
        `visit_hospital`,`visit_result`,`matters_needing_attention`,`complete_materials`,remark
         from work_injury_declaration
        where del_flag = 0 and id = #{id}
        SELECT
            a.id,
            a.declare_user_name,
            a.`declare_user_gender`,
            a.`declare_department_id`,
            a.`accident_express_id`,
            a.`work_injury_type`,
            a.declare_date,
            a.lost_time,
            a.`visit_hospital`,
            a.`visit_result`,
            a.`matters_needing_attention`,
            a.`complete_materials`,
            a.remark,
            b.accident_name AS accidentName,
            b.occurrence_time AS occurrenceTime
        FROM
            work_injury_declaration a
            LEFT JOIN accident_express b ON a.accident_express_id = b.id
        WHERE del_flag = 0 and id = #{id}
    </select>

    <update id="updateWorkInjuryDeclaration" parameterType="com.gkhy.safePlatform.incidentManage.entity.WorkInjuryDeclarationInfo">