From 9490c47566a0f253f35a1019fd1b1e1473630d67 Mon Sep 17 00:00:00 2001 From: fuliqi <fuliqi@qq.com> Date: 星期一, 20 一月 2025 09:48:53 +0800 Subject: [PATCH] Merge branch 'dev' --- ycl-server/src/main/resources/mapper/zgyw/WorkOrderErrorTypeMapper.xml | 25 ++++++++++++++++++++++++- 1 files changed, 24 insertions(+), 1 deletions(-) diff --git a/ycl-server/src/main/resources/mapper/zgyw/WorkOrderErrorTypeMapper.xml b/ycl-server/src/main/resources/mapper/zgyw/WorkOrderErrorTypeMapper.xml index 5c80034..d2bf388 100644 --- a/ycl-server/src/main/resources/mapper/zgyw/WorkOrderErrorTypeMapper.xml +++ b/ycl-server/src/main/resources/mapper/zgyw/WorkOrderErrorTypeMapper.xml @@ -82,4 +82,27 @@ </foreach> </insert> -</mapper> \ No newline at end of file + <select id="getNotFinishWorkOrderErrors" resultType="string"> + SELECT + ot.error_name + FROM + t_work_order_error_type ot + INNER JOIN t_work_order wo ON wo.work_order_no = ot.work_order_no AND wo.work_order_no = #{workOrderNo} AND wo.status != 'AUDITING_SUCCESS' + </select> + + <insert id="addMany"> + INSERT INTO t_work_order_error_type (work_order_no, error_name, create_time, update_time, deleted) VALUES + <foreach collection="errorTypeList" item="errorType" separator=","> + (#{errorType.workOrderNo}, #{errorType.errorName}, #{errorType.createTime}, #{errorType.updateTime}, 0) + </foreach> + </insert> + + <select id="getErrorList" resultType="com.ycl.system.entity.SysDictData"> + SELECT da.dict_value, da.dict_label + FROM t_work_order_error_type oer + INNER JOIN sys_dict_data da ON oer.error_name = da.dict_value + WHERE oer.work_order_no = #{workOrderNo} + ORDER BY oer.create_time + </select> + +</mapper> -- Gitblit v1.8.0