Merge remote-tracking branch 'origin/master'

xiangpei

2024-08-24 633b96bb1ced95e60df5e28249ce51b6ffe82d27

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

@@ -13,10 +13,18 @@
    </resultMap>

    <select id="selectYwConditionByYwId" resultMap="BaseResultMap">
        SELECT yw.id, yw.commit_user, yw.yw_condition, yw.yw_proofMaterials, yw.create_time, su.nick_name
        SELECT yw.id, yw.commit_user, yw.yw_condition, yw.yw_proofMaterials, yw.create_time, yw.sys_msg, su.nick_name
        FROM t_work_order_yw_condition_record yw
                 INNER JOIN sys_user su ON yw.commit_user = su.user_id AND yw.deleted = 0 AND yw.work_order_id = #{workOrderId}
                 INNER JOIN sys_user su ON yw.commit_user = su.user_id AND yw.deleted = 0 AND yw.work_order_no = #{workOrderId}
        ORDER BY yw.create_time DESC
    </select>

    <insert id="insertMany">
        insert into t_work_order_yw_condition_record (work_order_no, commit_user, yw_condition, deleted, create_time)
        values
        <foreach collection="ywRecordList" item="item" separator=",">
            (#{item.workOrderNo}, #{item.commitUser}, #{item.ywCondition}, 0, now())
        </foreach>
    </insert>

</mapper>