From b85a7f932b9d789a2e9bdb36e366c36c2e1eb3cc Mon Sep 17 00:00:00 2001
From: zxl <763096477@qq.com>
Date: 星期四, 17 四月 2025 11:31:53 +0800
Subject: [PATCH] 查询考核成绩为null，为前端添加数据默认为0
---
ycl-server/src/main/resources/mapper/zgyw/WorkOrderMapper.xml | 66 +++++++++++++++++++++++++++++----
1 files changed, 58 insertions(+), 8 deletions(-)
diff --git a/ycl-server/src/main/resources/mapper/zgyw/WorkOrderMapper.xml b/ycl-server/src/main/resources/mapper/zgyw/WorkOrderMapper.xml
index 4f2c8b9..6c43d09 100644
--- a/ycl-server/src/main/resources/mapper/zgyw/WorkOrderMapper.xml
+++ b/ycl-server/src/main/resources/mapper/zgyw/WorkOrderMapper.xml
@@ -68,12 +68,15 @@
<if test="query.unitId != null">
AND wo.unit_id = #{query.unitId}
</if>
- <if test="query.errorType != null and query.errorType != ''">
+ <if test="query.errorTypeList != null and query.errorTypeList.size>0">
AND (EXISTS (
SELECT 1
FROM t_work_order_error_type twoet
WHERE twoet.work_order_no = wo.work_order_no
- AND twoet.error_name = #{query.errorType}
+ AND twoet.error_name in
+ <foreach collection="query.errorTypeList" open="(" close=")" separator="," item="errorType">
+ #{errorType}
+ </foreach>
))
</if>
<if test="query.keyword != null and query.keyword != ''">
@@ -142,12 +145,15 @@
<if test="query.start != null and query.end != null">
AND wo.create_time BETWEEN #{query.start} AND #{query.end}
</if>
- <if test="query.errorType != null and query.errorType !='' ">
+ <if test="query.errorTypeList != null and query.errorTypeList.size>0">
AND (EXISTS (
SELECT 1
FROM t_work_order_error_type twoet
WHERE twoet.work_order_no = wo.work_order_no
- AND twoet.error_name = #{query.errorType}
+ AND twoet.error_name in
+ <foreach collection="query.errorTypeList" open="(" close=")" separator="," item="errorType">
+ #{errorType}
+ </foreach>
))
</if>
GROUP BY
@@ -265,6 +271,7 @@
WHERE DATE_FORMAT(w.create_time, '%Y') = DATE_FORMAT(NOW(), '%Y')
AND w.deleted = 0 AND unit_id = #{unitId}
GROUP BY dateType
+ ORDER BY dateType
</if>
<if test="dateType == 'week'">
@@ -281,6 +288,7 @@
w.create_time BETWEEN DATE_SUB(CURDATE(), INTERVAL WEEKDAY(CURDATE()) DAY) AND DATE_ADD(CURDATE(), INTERVAL (6 - WEEKDAY(CURDATE())) DAY)
AND w.deleted = 0 AND unit_id = #{unitId}
GROUP BY dateType
+ ORDER BY dateType
</if>
<if test="dateType == 'day'">
@@ -297,6 +305,7 @@
DATE_FORMAT(w.create_time, '%Y-%m-%d') BETWEEN DATE_FORMAT(CURDATE(), '%Y-%m-01') AND LAST_DAY(CURDATE())
AND w.deleted = 0 AND unit_id = #{unitId}
GROUP BY dateType
+ ORDER BY dateType
</if>
</select>
@@ -350,12 +359,16 @@
</insert>
<select id="selectPassOrder" resultType="com.ycl.platform.domain.vo.WorkOrderVO">
- SELECT wo.id,wo.work_order_no,wo.unit_id,woet.error_name as errorType,woet.distribute_time,woar.create_time as auditTime
+ SELECT wo.id,wo.work_order_no,wo.unit_id,woet.error_name as errorType,woet.create_time as distributeTime
FROM t_work_order wo
LEFT JOIN t_work_order_error_type woet ON woet.work_order_no = wo.work_order_no
- LEFT JOIN t_work_order_auditing_record woar ON woar.work_order_no = wo.work_order_no
- WHERE wo.deleted = 0 AND wo.status = #{status} AND woar.result = #{auditStatus}
- AND wo.deduct = 0 AND woar.create_time between #{startTime} and #{endTime}
+ LEFT JOIN t_work_order_auditing_record woar ON woar.work_order_no = wo.work_order_no and woar.result = #{auditStatus}
+ WHERE wo.deleted = 0 AND wo.deduct = 0 AND wo.status = #{status}
+ AND woet.error_name in
+ <foreach collection="errorList" item="error" separator="," open="(" close=")">
+ #{error}
+ </foreach>
+ AND woar.create_time between #{startTime} and #{endTime}
</select>
<update id="updateMany">
@@ -416,6 +429,29 @@
INNER JOIN t_monitor m ON m.serial_number = wo.serial_number
LEFT JOIN t_yw_unit yw ON yw.id = wo.unit_id AND yw.deleted = 0
</select>
+
+
+
+ <select id="detailByNoButNoDistributeRecord" resultType="com.ycl.platform.domain.vo.WorkOrderDetailVO">
+ SELECT
+ wo.id,
+ wo.work_order_no,
+ wo.serial_number,
+ dr.create_time as distributeTime,
+ m.name as source,
+ yw.unit_name,
+ yw.unit_contact,
+ yw.unit_contact_phone,
+ wo.overtime,
+ wo.processing_period,
+ wo.status
+ FROM
+ t_work_order wo
+ LEFT JOIN t_work_order_distribute_record dr ON wo.work_order_no = dr.work_order_no AND dr.deleted = 0
+ INNER JOIN t_monitor m ON m.serial_number = wo.serial_number
+ LEFT JOIN t_yw_unit yw ON yw.id = wo.unit_id AND yw.deleted = 0 Where wo.work_order_no = #{workOrderNo}
+ </select>
+
<select id="getRecoveryInfo" resultType="com.ycl.platform.domain.vo.WorkOrderVO">
SELECT
wo.work_order_no,
@@ -458,4 +494,18 @@
</foreach>
</where>
</select>
+
+ <select id="getAuditTimeList" resultType="com.ycl.platform.domain.vo.WorkOrderVO">
+ select work_order_no ,create_time as auditTime from t_work_order_auditing_record where work_order_no in
+ <foreach collection="workOrderNos" item="no" open="(" close=")" separator=",">
+ #{no}
+ </foreach>
+ </select>
+ <select id="getHandleTimeList" resultType="com.ycl.platform.domain.vo.WorkOrderVO">
+ select work_order_no ,create_time as handleTime from t_work_order_yw_condition_record
+ where sys_msg = 0 and work_order_no in
+ <foreach collection="workOrderNos" item="no" open="(" close=")" separator=",">
+ #{no}
+ </foreach>
+ </select>
</mapper>
--
Gitblit v1.8.0