Merge remote-tracking branch 'origin/master'

xiangpei

2024-09-01 cc623a1a25fe1861fbeaba79a76bfc29724141f9

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

@@ -9,13 +9,14 @@
        <result column="yw_condition" property="ywCondition"/>
        <result column="commit_user" property="commitUser"/>
        <result column="nick_name" property="commitUserName"/>
        <result column="sys_msg" property="sysMsg"/>
        <result column="yw_proofMaterials" property="ywProofMaterials"/>
    </resultMap>

    <select id="selectYwConditionByYwId" resultMap="BaseResultMap">
        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_no = #{workOrderId}
                 INNER JOIN sys_user su ON yw.commit_user = su.user_id AND yw.deleted = 0 AND yw.work_order_no = #{workOrderNo}
        ORDER BY yw.create_time DESC
    </select>