From ec674d362bf2dba85ba7fdf9c42b73ac62bf3333 Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期三, 04 九月 2024 05:23:57 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ycl-server/src/main/resources/mapper/zgyw/WorkOrderMapper.xml | 292 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 283 insertions(+), 9 deletions(-)
diff --git a/ycl-server/src/main/resources/mapper/zgyw/WorkOrderMapper.xml b/ycl-server/src/main/resources/mapper/zgyw/WorkOrderMapper.xml
index 2c73866..4717be2 100644
--- a/ycl-server/src/main/resources/mapper/zgyw/WorkOrderMapper.xml
+++ b/ycl-server/src/main/resources/mapper/zgyw/WorkOrderMapper.xml
@@ -4,15 +4,289 @@
<!-- 閫氱敤鏌ヨ鏄犲皠缁撴灉 -->
<resultMap id="BaseResultMap" type="com.ycl.platform.domain.vo.WorkOrderVO">
- <result column="id" property="id" />
- <result column="create_time" property="createTime" />
- <result column="work_order_no" property="workOrderNo" />
- <result column="unit_id" property="unitId" />
- <result column="yw_people_id" property="ywPeopleId" />
- <result column="yw_handle_time" property="ywHandleTime" />
- <result column="yw_result" property="ywResult" />
- <result column="yw_condition" property="ywCondition" />
- <result column="yw_check_result" property="ywCheckResult" />
+ <result column="id" property="id"/>
+ <result column="create_time" property="createTime"/>
+ <result column="work_order_no" property="workOrderNo"/>
+ <result column="unit_id" property="unitId"/>
+ <result column="yw_people_id" property="ywPeopleId"/>
+ <result column="yw_handle_time" property="ywHandleTime"/>
+ <result column="yw_result" property="ywResult"/>
+ <result column="yw_check_result" property="ywCheckResult"/>
+ <result column="overtime" property="overtime"/>
+ <result column="deduct" property="deduct"/>
+ <result column="errorType" property="errorType"/>
+ <result column="status" property="status"/>
+ <result column="source" property="source"/>
+ <result column="imgListStr" property="imgListStr"/>
+<!-- <collection property="errorTypeList" select="getErrorType" column="{workOrderNo=work_order_no,errList=errList}" ofType="string"/>-->
</resultMap>
+ <select id="getErrorType" resultType="string">
+ SELECT DISTINCT da.dict_label
+ FROM
+ t_work_order_error_type et
+ LEFT JOIN sys_dict_data da ON da.dict_value = et.error_name AND da.dict_type = 'error_type' <if test="errList != null and errList.size() > 0">AND da.dict_value in <foreach
+ collection="errList" open="(" separator="," close=")" item="errorType">#{errorType}</foreach> </if>
+ WHERE et.work_order_no = #{workOrderNo}
+ </select>
+
+ <select id="page" resultMap="BaseResultMap">
+ SELECT
+ wo.id,wo.status, wo.work_order_no, wo.serial_number,wo.create_time, wo.unit_id, wo.yw_people_id, wo.yw_handle_time, wo.yw_result, wo.yw_check_result, wo.overtime, wo.deduct,
+ u.unit_name,
+ p.yw_person_name,
+ tm.name as source,
+ GROUP_CONCAT(DISTINCT da.dict_label ORDER BY da.dict_label SEPARATOR ',') AS errorType,
+ GROUP_CONCAT(DISTINCT ci.img_url ORDER BY ci.create_time DESC SEPARATOR ',') AS imgListStr
+ FROM
+ t_work_order wo
+ INNER JOIN t_monitor tm ON wo.serial_number = tm.serial_number
+ INNER JOIN t_work_order_error_type et ON wo.work_order_no = et.work_order_no
+ INNER JOIN t_yw_unit u ON wo.unit_id = u.id AND u.deleted = 0
+ INNER JOIN sys_dict_data da ON da.dict_value = et.error_name AND da.dict_type = 'error_type' <if test="query.errorTypeList != null and query.errorTypeList.size() > 0">AND da.dict_value in <foreach
+ collection="query.errorTypeList" open="(" separator="," close=")" item="errorType">#{errorType}</foreach> </if>
+ LEFT JOIN t_work_order_check_img ci ON ci.work_order_no = wo.work_order_no
+ LEFT JOIN t_yw_people p ON wo.yw_people_id = p.id AND p.deleted = 0
+ WHERE
+ wo.deleted = 0
+ <if test="query.unitId != null">
+ AND wo.unit_id = #{query.unitId}
+ </if>
+ <if test="query.workOrderNo != null and query.workOrderNo != ''">
+ AND wo.work_order_no = #{query.workOrderNo}
+ </if>
+ <if test="query.status != null and query.status != ''">
+ AND wo.status = #{query.status}
+ </if>
+ <if test="query.status == null or query.status == ''">
+ AND wo.status = 'DISTRIBUTED'
+ </if>
+ <if test="query.start != null">
+ AND wo.yw_handle_time BETWEEN #{query.start} AND #{query.end}
+ </if>
+ GROUP BY
+ wo.id, wo.status, wo.work_order_no, wo.serial_number,wo.create_time, wo.unit_id, wo.yw_people_id,tm.name, wo.yw_handle_time, wo.yw_result, wo.yw_check_result, wo.overtime, wo.deduct,
+ u.unit_name,
+ p.yw_person_name
+ ORDER BY wo.create_time DESC
+ </select>
+
+ <select id="distributePage" resultType="com.ycl.platform.domain.vo.WorkOrderVO">
+ SELECT
+ wo.id,wo.status, wo.work_order_no,wo.create_time, wo.unit_id, wo.yw_people_id, wo.yw_handle_time, wo.yw_result, wo.yw_check_result, wo.overtime, wo.deduct,
+ u.unit_name,
+ p.yw_person_name,
+ yp.province_tag,
+ yp.important_tag,
+ yp.important_command_image_tag,
+ odr.create_time as distributeTime,
+ su.nick_name as realName,
+ tm.name as source,
+ GROUP_CONCAT(DISTINCT da.dict_label ORDER BY da.dict_label SEPARATOR '銆�') AS errorType
+ FROM
+ t_work_order wo
+ INNER JOIN t_monitor tm ON wo.serial_number = tm.serial_number
+ INNER JOIN t_yw_point yp ON yp.serial_number = wo.serial_number AND yp.deleted = 0
+ INNER JOIN t_work_order_error_type et ON wo.work_order_no = et.work_order_no
+ INNER JOIN sys_dict_data da ON da.dict_value = et.error_name AND da.dict_type = 'error_type' <if test="query.errorTypeList != null and query.errorTypeList.size() > 0">AND da.dict_value in <foreach
+ collection="query.errorTypeList" open="(" separator="," close=")" item="errorType">#{errorType}</foreach> </if>
+ INNER JOIN t_yw_unit u ON wo.unit_id = u.id and u.deleted = 0
+ LEFT JOIN t_yw_people p ON wo.yw_people_id = p.id and p.deleted = 0
+ LEFT JOIN t_work_order_distribute_record odr ON odr.work_order_no = wo.work_order_no AND odr.deleted = 0
+ LEFT JOIN sys_user su ON su.user_id = odr.user_id
+ WHERE
+ wo.deleted = 0
+ <if test="query.unitId != null">
+ AND wo.unit_id = #{query.unitId}
+ </if>
+ <if test="query.unitId == null">
+ AND wo.unit_id is not null
+ </if>
+ <if test="query.status != null and query.status != ''">
+ AND wo.status = #{query.status}
+ </if>
+ <if test="query.keyword != null and query.keyword != ''">
+ AND (tm.name like concat('%', #{query.keyword}, '%') or tm.serial_number like concat('%', #{query.keyword}, '%'))
+ </if>
+ GROUP BY
+ wo.id, wo.status, wo.work_order_no,wo.create_time, wo.unit_id, wo.yw_people_id, tm.name, wo.yw_handle_time, wo.yw_result, wo.yw_check_result, wo.overtime, wo.deduct,
+ u.unit_name,
+ p.yw_person_name,
+ yp.province_tag,
+ yp.important_tag,
+ yp.important_command_image_tag,
+ odr.create_time,
+ su.nick_name
+ ORDER BY wo.create_time DESC
+ </select>
+
+ <select id="handlingWorkOrderList" resultType="com.ycl.platform.domain.vo.YwPointJobVO">
+ SELECT
+ wo.id,
+ wod.create_time,
+ yp.province_tag,
+ yp.important_tag,
+ yp.important_command_image_tag
+ FROM
+ t_work_order wo
+ INNER JOIN t_yw_point yp ON yp.serial_number = wo.serial_number AND yp.deleted = 0
+ INNER JOIN t_work_order_distribute_record wod ON wod.work_order_no = wo.work_order_no
+ WHERE
+ wo.status = 'DISTRIBUTED' AND wo.deleted = 0
+ </select>
+
+ <select id="screenWorkOrder" resultType="com.ycl.platform.domain.vo.screen.ScreenWorkOrderVO">
+ SELECT
+ count(*) AS total,
+ SUM(CASE WHEN status = 'AUDITING_SUCCESS' THEN 1 ELSE 0 END) AS totalHandler,
+ SUM(CASE WHEN status = 'DISTRIBUTED' THEN 1 ELSE 0 END) AS totalNotFinish
+ FROM
+ t_work_order
+ </select>
+
+ <select id="home" resultType="java.util.Map">
+ <if test="dateType == 'month'">
+ -- 鏈堝伐鍗曟暟
+ SELECT
+ u.unit_name AS name,
+ CONCAT(MONTH(w.create_time), '鏈�') AS dateType,
+ COUNT(IF(status = 'AUDITING_SUCCESS', 1, NULL)) AS num1,
+ COUNT(IF(status = 'DISTRIBUTED', 1, NULL)) AS num2,
+ COUNT(IF(status = 'YW_HANDLE', 1, NULL)) AS num3
+ FROM t_work_order w
+ LEFT JOIN t_yw_unit u ON w.unit_id = u.id
+ WHERE DATE_FORMAT(w.create_time, '%Y') = DATE_FORMAT(NOW(), '%Y')
+ AND w.deleted = 0 AND unit_id = #{unitId}
+ GROUP BY dateType
+ </if>
+
+ <if test="dateType == 'week'">
+ -- 鍛ㄥ伐鍗曟暟
+ SELECT
+ u.unit_name AS name,
+ CONCAT('鍛�', WEEKDAY(w.create_time)) AS dateType,
+ COUNT(IF(status = 'AUDITING_SUCCESS', 1, NULL)) AS num1,
+ COUNT(IF(status = 'DISTRIBUTED', 1, NULL)) AS num2,
+ COUNT(IF(status = 'YW_HANDLE', 1, NULL)) AS num3
+ FROM t_work_order w
+ LEFT JOIN t_yw_unit u ON w.unit_id = u.id
+ WHERE
+ 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
+ </if>
+
+ <if test="dateType == 'day'">
+ -- 鏃ュ伐鍗曟暟
+ SELECT
+ u.unit_name AS name,
+ DATE_FORMAT(w.create_time, '%d') AS dateType,
+ COUNT(IF(status = 'AUDITING_SUCCESS', 1, NULL)) AS num1,
+ COUNT(IF(status = 'DISTRIBUTED', 1, NULL)) AS num2,
+ COUNT(IF(status = 'YW_HANDLE', 1, NULL)) AS num3
+ FROM t_work_order w
+ LEFT JOIN t_yw_unit u ON w.unit_id = u.id
+ WHERE
+ 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
+ </if>
+ </select>
+
+ <select id="workOrderTotal" resultType="com.ycl.platform.domain.vo.screen.WorkOrderTotalVO">
+ SELECT
+ COUNT(*) AS totalNum,
+ COUNT(IF(w.status != 'AUDITING_SUCCESS' and w.status != 'WAIT_DISTRIBUTED', 1, NULL)) AS todoNum,
+ COUNT(IF(w.status = 'AUDITING_SUCCESS', 1, NULL)) AS doneNum
+ FROM t_work_order w
+ LEFT JOIN t_yw_point p ON w.serial_number = p.serial_number AND p.deleted = 0
+ WHERE w.deleted = 0
+ <if test="dataScope == 1"> AND p.province_tag = 1 </if>
+ <if test="dataScope == 3"> AND p.important_tag = 1 </if>
+ <if test="deptId != null"> AND p.dept_id = #{deptId} </if>
+ </select>
+
+ <select id="workOrderRegion" resultType="com.ycl.platform.domain.vo.screen.WorkOrderRegionVO">
+ SELECT
+ d.area,
+ COUNT(IF(w.status = 'DISTRIBUTED', 1, NULL)) + COUNT(IF(w.status = 'AUDITING_FAIL', 1, NULL)) + COUNT(IF(w.status = 'WAIT_DISTRIBUTE', 1, NULL)) AS todoNum,
+ COUNT(IF(w.status = 'YW_HANDLE', 1, NULL)) + COUNT(IF(w.status = 'AUDITING_SUCCESS', 1, NULL)) + COUNT(IF(w.status = 'AUDITING', 1, NULL)) AS doneNum
+ FROM
+ sys_dept d
+ LEFT JOIN t_yw_point p ON p.dept_id = d.dept_id AND p.deleted = 0
+ LEFT JOIN t_work_order w ON w.serial_number = p.serial_number AND w.deleted = 0
+ WHERE d.del_flag = 0 AND d.area IS NOT NULL
+ <if test="dataScope == 1"> AND p.province_tag = 1 </if>
+ <if test="dataScope == 3"> AND p.important_tag = 1 </if>
+ <!-- <if test="deptId != null"> AND p.dept_id = #{deptId} </if> -->
+ GROUP BY d.area, d.dept_id
+ ORDER BY d.dept_id
+ </select>
+
+ <select id="hasErrorWorkOrderList" resultType="com.ycl.platform.domain.vo.DeviceInfoVO">
+ SELECT
+ wo.id as workOrderId,
+ wo.work_order_no as workOrderNo,
+ wo.serial_number as deviceId
+ FROM
+ t_work_order wo
+ WHERE
+ wo.create_time BETWEEN #{start} AND #{end}
+ AND deleted = 0
+ </select>
+
+ <insert id="addMany">
+ INSERT INTO t_work_order (work_order_no, status, serial_number, unit_id, create_time, update_time, deleted)
+ VALUES <foreach collection="workOrderList" item="workOrder" separator=",">
+ (#{workOrder.workOrderNo}, #{workOrder.status}, #{workOrder.serialNumber}, #{workOrder.unitId}, #{workOrder.createTime}, #{workOrder.updateTime}, 0)
+ </foreach>
+ </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
+ 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}
+ </select>
+
+ <update id="updateMany">
+ <foreach collection="workOrderList" separator=";" item="item">
+ UPDATE t_work_order
+ SET
+ update_time = #{item.updateTime},
+ status = #{item.status}
+ WHERE id = #{item.id}
+ </foreach>
+ </update>
+
+
+ <select id="getNotFinishedWorkOrders" resultMap="GenWorkOrderMap">
+ SELECT
+ DISTINCT
+ wo.id,
+ wo.serial_number,
+ wo.status,
+ wo.work_order_no,
+ GROUP_CONCAT(DISTINCT et.error_name SEPARATOR ',') AS error_names
+ FROM
+ t_work_order wo
+ LEFT JOIN t_work_order_error_type et ON et.work_order_no = wo.work_order_no
+ WHERE
+ wo.status != 'AUDITING_SUCCESS'
+ AND wo.deleted = 0
+ AND wo.serial_number in <foreach collection="list" open="(" separator="," close=")" item="serialNumber">
+ #{serialNumber}
+ </foreach>
+ GROUP BY
+ wo.id, wo.serial_number, wo.status, wo.work_order_no
+ </select>
+
+ <resultMap id="GenWorkOrderMap" type="com.ycl.platform.domain.entity.WorkOrder">
+ <id column="id" property="id"/>
+ <result column="serial_number" property="serialNumber"/>
+ <result column="status" property="status" typeHandler="com.baomidou.mybatisplus.core.handlers.MybatisEnumTypeHandler"/>
+ <result column="error_names" property="errorType"/>
+ </resultMap>
</mapper>
--
Gitblit v1.8.0