Merge remote-tracking branch 'origin/master'

xiangpei

2024-03-19 37f41a7c17d81a60092e9d69363905f21d9b1a49

 ycl-server/src/main/resources/mapper/zgyw/TCheckPublishMapper.xml

@@ -19,10 +19,16 @@
        <result property="updateUserName"    column="update_user_name"    />
        <result property="description"    column="description"    />
        <result property="alarmScore"    column="alarm_score"    />
        <result property="auditState"    column="audit_state"    />
        <result property="auditUser"    column="audit_user"    />
        <result property="auditDescription"    column="audit_description"    />
        <result property="auditTime"    column="audit_time"    />
    </resultMap>

    <sql id="selectTCheckPublishVo">
        select id , examine_name, template_id , examine_range , frequency , state , create_time , create_user , update_time , update_user , description,create_user_name,update_user_name,alarm_score from t_check_publish
        select id , examine_name, template_id , examine_range , frequency , state , create_time , create_user , update_time ,
               update_user , description,create_user_name,update_user_name,alarm_score ,audit_state,audit_user,audit_description,audit_time
        from t_check_publish
    </sql>

    <select id="selectTCheckPublishList" parameterType="com.ycl.platform.domain.entity.TCheckPublish" resultMap="TCheckPublishResult">
@@ -37,6 +43,7 @@
            <if test="updateUser != null "> and update_user = #{updateUser}</if>
            <if test="description != null  and description != ''"> and description = #{description}</if>
            <if test="alarmScore != null"> and alarm_score = #{alarmScore}</if>
            <if test="auditState != null"> and audit_state = #{auditState}</if>
        </where>
    </select>
    
@@ -62,6 +69,10 @@
            <if test="updateUserName != null and updateUserName!= ''">update_user_name,</if>
            <if test="description != null">description,</if>
            <if test="alarmScore != null">alarm_score,</if>
            <if test="auditState != null">alarm_state,</if>
            <if test="auditUser != null and auditUser!=''">alarm_user,</if>
            <if test="auditDescription != null auditDescription!=''">alarm_description,</if>
            <if test="auditTime != null">alarm_time,</if>
         </trim>
        <trim prefix="values (" suffix=")" suffixOverrides=",">
            <if test="id != null">#{id},</if>
@@ -78,6 +89,10 @@
            <if test="updateUserName != null and updateUserName!= ''">#{updateUserName},</if>
            <if test="description != null">#{description},</if>
            <if test="alarmScore != null">#{alarmScore},</if>
            <if test="auditState != null">#{alarmState),</if>
            <if test="auditUser != null and auditUser!=''">#{auditUser},</if>
            <if test="auditDescription != null auditDescription!=''">#{auditDescription},</if>
            <if test="auditTime != null">#{auditTime},</if>
         </trim>
    </insert>

@@ -97,6 +112,10 @@
            <if test="updateUserName != null and updateUserName!= ''">update_user_name = #{updateUserName},</if>
            <if test="description != null">description = #{description},</if>
            <if test="alarmScore != null">alarm_score = #{alarmScore},</if>
            <if test="auditState != null">audit_state = #{alarmState),</if>
            <if test="auditUser != null and auditUser!=''">audit_user = #{auditUser},</if>
            <if test="auditDescription != null auditDescription!=''">audit_description = #{auditDescription},</if>
            <if test="auditTime != null">audit_time = #{auditTime},</if>
        </trim>
        where id = #{id}
    </update>