流程fix

songhuangfeng123

2022-08-05 c4354b452cb7b09fe28a9e8ea81f455df1c68de8

 emergency/emergency-service/src/main/resource/config/mapper/emergency/EmergencyDrillExecuteInfoMapper.xml

@@ -15,7 +15,22 @@
    </resultMap>

    <select id="selectEmergencyDrillExecuteList" resultMap="emergencyDrillExecuteInfoPageDOResult">
        select id,`status`,`drill_record_date`,`drill_plan_id`,`record_user_uid`,process_desc  from emergency_drill_execute where del_flag = 0
        SELECT
            a.id,
            a.drill_plan_id,
            b.drill_name as drillName,
            b.drill_address as drillAddress,
            b.drill_way as drillWay,
            b.drill_level as drillLevel,
            b.drill_plan_date as drillPlanDate,
            a.`drill_record_date`,
            c.`name` as emergencyPlanName
        FROM
            emergency_drill_execute a
            LEFT JOIN emergency_drill_plan b ON a.drill_plan_id = b.id
            LEFT JOIN emergency_plan c ON b.plan_id = c.id
        WHERE
            a.del_flag = 0
    </select>

    <insert id="addEmergencyDrillExecute" parameterType="com.gkhy.safePlatform.emergency.entity.EmergencyDrillExecuteInfo"
@@ -32,6 +47,7 @@
            <if test="drillRecordDate != null ">drill_record_date,</if>
            <if test="drillPlanId != null ">drill_plan_id,</if>
            <if test="recordUserUid != null ">record_user_uid,</if>
            <if test="recordUserName != null and recordUserName != ''">`record_user_name`,</if>
            <if test="processDesc != null and processDesc != ''">`process_desc`,</if>
        </trim>
        <trim prefix="values (" suffix=")" suffixOverrides=",">
@@ -45,6 +61,7 @@
            <if test="drillRecordDate != null ">#{drillRecordDate},</if>
            <if test="drillPlanId != null ">#{drillPlanId},</if>
            <if test="recordUserUid != null ">#{recordUserUid},</if>
            <if test="recordUserName != null and recordUserName != ''">#{recordUserName},</if>
            <if test="processDesc != null and processDesc != ''">#{processDesc},</if>
        </trim>
    </insert>
@@ -57,25 +74,38 @@
        <result column="drill_record_date" property="drillRecordDate"/>
        <result column="drill_plan_id" property="drillPlanId"/>
        <result column="record_user_uid" property="recordUserUid"/>
        <result column="record_user_name" property="recordUserName"/>
        <result column="process_desc" property="processDesc"/>
    </resultMap>

    <select id="selectEmergencyDrillExecuteById" resultMap="emergencyDrillExecuteInfoDetailDOResult">
        select id,`status`,`drill_record_date`,`drill_plan_id`,`record_user_uid`,process_desc  from emergency_drill_execute
        where del_flag = 0 and id = #{id}
        SELECT
            a.id,
            a.`status`,
            a.`drill_record_date`,
            a.`drill_plan_id`,
            a.`record_user_uid`,
            a.record_user_name,
            a.process_desc,
            b.drill_name AS drillName
        FROM
            emergency_drill_execute a
            LEFT JOIN emergency_drill_plan b ON a.drill_plan_id = b.id
        WHERE
            a.del_flag = 0
            AND a.id = #{id}
    </select>

    <update id="updateEmergencyDrillExecute" parameterType="com.gkhy.safePlatform.emergency.entity.EmergencyDrillExecuteInfo">
        update emergency_drill_execute
        <trim prefix="SET" suffixOverrides=",">
            <if test="gmtCreate != null ">gmt_create = #{gmtCreate},</if>
            <if test="gmtModitify != null ">gmt_moditify = #{gmtModitify},</if>
            <if test="createUid != null ">create_uid = #{createUid},</if>
            <if test="updateUid != null ">update_uid = #{updateUid},</if>
            <if test="status != null ">status = #{status},</if>
            <if test="drillRecordDate != null ">drill_record_date=#{drillRecordDate},</if>
            <if test="drillPlanId != null ">drill_plan_id=#{drillPlanId},</if>
            <if test="recordUserUid != null ">record_user_uid=#{recordUserUid},</if>
            <if test="recordUserName != null and recordUserName != ''">record_user_name = #{recordUserName},</if>
            <if test="processDesc != null and processDesc != ''">process_desc=#{processDesc},</if>

        </trim>