Commit f4729585 authored by 陈晓晋's avatar 陈晓晋
Browse files

Merge branch 'xjchen' into 'develop' 

固定风险增加发生可能性和后果严重性成程度20230707

See merge request !5
parents 729328d2 3e1ad0e2

censoft-rongtong/src/main/java/com/censoft/censoftrongtong/domain/RiskPlanInherentList.java

+26 −0
Original line number Original line Diff line number Diff line
@@ -59,6 +59,14 @@ public class RiskPlanInherentList extends BaseEntity 
    @Excel(name = "风险等级")

    @Excel(name = "风险等级")

    private String level;

    private String level;





    /** 风险可能性 */

    @Excel(name = "风险可能性")

    private String riskLikelihood;



    /** 后果严重性 */

    @Excel(name = "后果严重性")

    private String riskSeverity;



    /** 存在部位 */

    /** 存在部位 */

    @Excel(name = "存在部位")

    @Excel(name = "存在部位")

    private String presenceLocation;

    private String presenceLocation;
@@ -301,6 +309,22 @@ public class RiskPlanInherentList extends BaseEntity 
        return delFlag;

        return delFlag;

    }

    }





    public String getRiskLikelihood() {

        return riskLikelihood;

    }



    public void setRiskLikelihood(String riskLikelihood) {

        this.riskLikelihood = riskLikelihood;

    }



    public String getRiskSeverity() {

        return riskSeverity;

    }



    public void setRiskSeverity(String riskSeverity) {

        this.riskSeverity = riskSeverity;

    }



    @Override

    @Override

    public String toString() {

    public String toString() {

        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)

        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
@@ -315,6 +339,8 @@ public class RiskPlanInherentList extends BaseEntity 
            .append("evaluationModel", getEvaluationModel())

            .append("evaluationModel", getEvaluationModel())

            .append("evaluationRange", getEvaluationRange())

            .append("evaluationRange", getEvaluationRange())

            .append("level", getLevel())

            .append("level", getLevel())

            .append("riskLikelihood", getRiskLikelihood())

            .append("riskSeverity", getRiskSeverity())

            .append("presenceLocation", getPresenceLocation())

            .append("presenceLocation", getPresenceLocation())

            .append("pictureFileIds", getPictureFileIds())

            .append("pictureFileIds", getPictureFileIds())

            .append("factor", getFactor())

            .append("factor", getFactor())

censoft-rongtong/src/main/resources/mapper/system/RiskPlanInherentListMapper.xml

+11 −1
Original line number Original line Diff line number Diff line
@@ -16,6 +16,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" 
        <result property="evaluationModel"    column="evaluation_model"    />

        <result property="evaluationModel"    column="evaluation_model"    />

        <result property="evaluationRange"    column="evaluation_range"    />

        <result property="evaluationRange"    column="evaluation_range"    />

        <result property="level"    column="level"    />

        <result property="level"    column="level"    />

        <result property="riskLikelihood"    column="risk_likelihood"    />

        <result property="riskSeverity"    column="risk_severity"    />

        <result property="presenceLocation"    column="presence_location"    />

        <result property="presenceLocation"    column="presence_location"    />

        <result property="pictureFileIds"    column="picture_file_ids"    />

        <result property="pictureFileIds"    column="picture_file_ids"    />

        <result property="factor"    column="factor"    />

        <result property="factor"    column="factor"    />
@@ -34,7 +36,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" 
    </resultMap>

    </resultMap>





    <sql id="selectRiskPlanInherentListVo">

    <sql id="selectRiskPlanInherentListVo">

        select id, user_id, room_id, plan_id, code, name, type, describe, evaluation_model, evaluation_range, level, presence_location, picture_file_ids, factor, measures_project, measures_project_file_ids, measures_administration, measures_administration_file_ids, measures_emergency, measures_emergency_file_ids, reference_basis, del_flag, create_by, create_time, update_by, update_time from risk_plan_inherent_list

        select id, user_id, room_id, plan_id, code, name, type, describe, evaluation_model, evaluation_range, level,risk_likelihood,risk_severity, presence_location, picture_file_ids, factor, measures_project, measures_project_file_ids, measures_administration, measures_administration_file_ids, measures_emergency, measures_emergency_file_ids, reference_basis, del_flag, create_by, create_time, update_by, update_time from risk_plan_inherent_list

    </sql>

    </sql>





    <select id="selectRiskPlanInherentListList" parameterType="com.censoft.censoftrongtong.domain.RiskPlanInherentList" resultMap="RiskPlanInherentListResult">

    <select id="selectRiskPlanInherentListList" parameterType="com.censoft.censoftrongtong.domain.RiskPlanInherentList" resultMap="RiskPlanInherentListResult">
@@ -110,6 +112,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" 
            rpil.factor,

            rpil.factor,

            rpil.type,

            rpil.type,

            rpil.`level`,

            rpil.`level`,

            rpil.`risk_likelihood`,

            rpil.`risk_severity`,

            rpil.presence_location AS presenceLocation,

            rpil.presence_location AS presenceLocation,

            rpil.picture_file_ids AS pictureFileIds,

            rpil.picture_file_ids AS pictureFileIds,

            rpil.measures_project AS measuresProject,

            rpil.measures_project AS measuresProject,
@@ -160,6 +164,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" 
            <if test="evaluationModel != null">evaluation_model,</if>

            <if test="evaluationModel != null">evaluation_model,</if>

            <if test="evaluationRange != null">evaluation_range,</if>

            <if test="evaluationRange != null">evaluation_range,</if>

            <if test="level != null">level,</if>

            <if test="level != null">level,</if>

            <if test="riskLikelihood != null">risk_likelihood,</if>

            <if test="riskSeverity != null">risk_severity,</if>

            <if test="presenceLocation != null">presence_location,</if>

            <if test="presenceLocation != null">presence_location,</if>

            <if test="pictureFileIds != null">picture_file_ids,</if>

            <if test="pictureFileIds != null">picture_file_ids,</if>

            <if test="factor != null">factor,</if>

            <if test="factor != null">factor,</if>
@@ -187,6 +193,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" 
            <if test="evaluationModel != null">#{evaluationModel},</if>

            <if test="evaluationModel != null">#{evaluationModel},</if>

            <if test="evaluationRange != null">#{evaluationRange},</if>

            <if test="evaluationRange != null">#{evaluationRange},</if>

            <if test="level != null">#{level},</if>

            <if test="level != null">#{level},</if>

            <if test="riskLikelihood != null">#{riskLikelihood},</if>

            <if test="riskSeverity != null">#{riskSeverity},</if>

            <if test="presenceLocation != null">#{presenceLocation},</if>

            <if test="presenceLocation != null">#{presenceLocation},</if>

            <if test="pictureFileIds != null">#{pictureFileIds},</if>

            <if test="pictureFileIds != null">#{pictureFileIds},</if>

            <if test="factor != null">#{factor},</if>

            <if test="factor != null">#{factor},</if>
@@ -218,6 +226,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" 
            <if test="evaluationModel != null">evaluation_model = #{evaluationModel},</if>

            <if test="evaluationModel != null">evaluation_model = #{evaluationModel},</if>

            <if test="evaluationRange != null">evaluation_range = #{evaluationRange},</if>

            <if test="evaluationRange != null">evaluation_range = #{evaluationRange},</if>

            <if test="level != null">level = #{level},</if>

            <if test="level != null">level = #{level},</if>

            <if test="riskLikelihood != null">risk_likelihood = #{riskLikelihood},</if>

            <if test="riskSeverity != null">risk_severity = #{riskSeverity},</if>

            <if test="presenceLocation != null">presence_location = #{presenceLocation},</if>

            <if test="presenceLocation != null">presence_location = #{presenceLocation},</if>

            <if test="pictureFileIds != null">picture_file_ids = #{pictureFileIds},</if>

            <if test="pictureFileIds != null">picture_file_ids = #{pictureFileIds},</if>

            <if test="factor != null">factor = #{factor},</if>

            <if test="factor != null">factor = #{factor},</if>