From b91945ea32378a71d1e57356af6e16703a1ceaa7 Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期五, 01 十一月 2024 14:52:16 +0800
Subject: [PATCH] 工单只下发考核的、阈值bug
---
ycl-server/src/main/resources/mapper/zgyw/YwPointMapper.xml | 175 +++++++++++++++++++++++++++++++++++++---------------------
1 files changed, 111 insertions(+), 64 deletions(-)
diff --git a/ycl-server/src/main/resources/mapper/zgyw/YwPointMapper.xml b/ycl-server/src/main/resources/mapper/zgyw/YwPointMapper.xml
index 946239a..cd9b458 100644
--- a/ycl-server/src/main/resources/mapper/zgyw/YwPointMapper.xml
+++ b/ycl-server/src/main/resources/mapper/zgyw/YwPointMapper.xml
@@ -22,11 +22,36 @@
<result column="dept_tag" property="deptTag"/>
</resultMap>
- <select id="selectData" resultType="com.ycl.platform.base.BaseSelect">
+ <!-- 鍒嗛〉鏄犲皠缁撴灉 -->
+ <resultMap id="pageMap" type="com.ycl.platform.domain.vo.YwPointVO">
+ <result column="id" property="id"/>
+ <result column="point_name" property="pointName"/>
+ <result column="start_time" property="startTime"/>
+ <result column="end_time" property="endTime"/>
+ <result column="unit_id" property="unitId"/>
+ <result column="unit_name" property="unitName"/>
+ <result column="status" property="status"/>
+ <result column="dept_id" property="deptId"/>
+ <result column="dept_name" property="deptName"/>
+ <result column="remark" property="remark"/>
+ <result column="create_time" property="createTime"/>
+ <result column="update_time" property="updateTime"/>
+ <result column="province_tag" property="provinceTag"/>
+ <result column="important_tag" property="importantTag"/>
+ <result column="important_command_image_tag" property="importantCommandImageTag"/>
+ <result column="dept_tag" property="deptTag"/>
+ <collection property="dynamicColumnList" select="getDyColumns"
+ column="{id=id,tableName=tableName,pointName=pointName}"
+ ofType="com.ycl.platform.domain.vo.DynamicColumnVO"/>
+ </resultMap>
- </select>
+ <resultMap id="dynamicColumnMap" type="com.ycl.platform.domain.vo.DynamicColumnVO">
+ <result column="prop_name" property="propName"/>
+ <result column="label_value" property="labelValue"/>
+ <result column="column_value" property="columnValue"/>
+ </resultMap>
- <select id="page" resultMap="BaseResultMap">
+ <select id="page" resultMap="pageMap">
SELECT
typ.id,
typ.point_name,
@@ -43,26 +68,43 @@
typ.important_tag,
typ.province_tag,
typ.important_command_image_tag,
- typ.dept_tag
+ typ.dept_tag,
+ 't_yw_point' as tableName,
+ #{query.pointName} as pointName
FROM
t_yw_point typ
LEFT JOIN t_yw_unit tyu ON typ.unit_id = tyu.id AND tyu.deleted = 0
LEFT JOIN sys_dept sd ON typ.dept_id = sd.dept_id AND sd.del_flag = 0
<where>
+ typ.examine_status = 1
<if test="query.pointName != null and query.pointName != ''">
AND typ.point_name like concat('%', #{query.pointName}, '%')
</if>
</where>
</select>
- <select id="dataCenterPage">
+ <select id="getDyColumns" resultMap="dynamicColumnMap">
SELECT
- m.*
+ *
FROM
- t_yw_point p INNER JOIN t_monitor m ON p.serial_number = m.serial_number
+ t_dynamic_column_value dcv
+ LEFT JOIN t_dynamic_column dc ON dc.id = dcv.dynamic_column_id AND dc.table_name = #{tableName}
+ WHERE
+ dcv.ref_id = #{id}
+<!-- <if test="pointName != null and pointName != ''">-->
+<!-- and dcv.column_value like concat('%', #{pointName}, '%')-->
+<!-- </if>-->
+ </select>
+
+ <select id="dataCenterPage" resultType="com.ycl.platform.domain.vo.PointDetailVO">
+ SELECT
+ m.*
+ FROM
+ t_yw_point p INNER JOIN t_monitor m ON p.serial_number = m.serial_number
<where>
<if test="query.keyword != null and query.keyword != ''">
- AND (m.name like concat('%', #{query.keyword}, '%') OR m.serial_number like concat('%', #{query.keyword}, '%'))
+ AND (m.name like concat('%', #{query.keyword}, '%') OR m.serial_number like concat('%',
+ #{query.keyword}, '%'))
</if>
<if test="query.dataType == 1">
AND p.province_tag = 1
@@ -103,12 +145,15 @@
<select id="distinctCount" resultType="integer">
SELECT
- count(DISTINCT m.serial_number)
+ count(DISTINCT m.serial_number)
FROM
- t_yw_point p INNER JOIN t_monitor m ON p.serial_number = m.serial_number
+ t_yw_point p INNER JOIN t_monitor m ON p.serial_number = m.serial_number
<where>
<if test="query.dataType == 1">
AND p.province_tag = 1
+ </if>
+ <if test="query.dataType == 2">
+ AND p.dept_tag = 1
</if>
<choose>
<when test="query.deptTag == 1">
@@ -150,7 +195,7 @@
AND TIMESTAMPDIFF(MONTH, NOW(), end_time) <= (SELECT config_value
FROM sys_config
WHERE config_key = 'operation.and.maintenance.expiration.warning.time')
- ORDER BY end_time
+ ORDER BY end_time limit 50
]]>
</select>
@@ -172,23 +217,27 @@
</where>
</select>
- <select id="export" resultType="com.ycl.platform.domain.excel.PointExport">
+ <select id="export" resultType ="com.ycl.platform.domain.excel.PointExport">
SELECT
+ yp.id,
m.name as pointName,
m.serial_number,
- m.ip as pointIp,
+ m.ip as pointIP,
yu.unit_name,
yp.start_time,
yp.end_time,
+ d.area,
CASE WHEN yp.province_tag = 0 THEN '鍚�' ELSE '鏄�' END AS provinceTagString,
CASE WHEN yp.important_tag = 0 THEN '鍚�' ELSE '鏄�' END AS importantTagString,
CASE WHEN yp.important_command_image_tag = 0 THEN '鍚�' ELSE '鏄�' END AS importantCommandImageTagString,
- CASE WHEN yp.dept_tag = 0 THEN '鍚�' ELSE '鏄�' END AS deptTag
+ CASE WHEN yp.dept_tag = 0 THEN '鍚�' ELSE '鏄�' END AS deptTagString
FROM
t_yw_point yp
INNER JOIN t_monitor m ON yp.serial_number = m.serial_number
LEFT JOIN t_yw_unit yu ON yu.id = yp.unit_id
+ LEFT JOIN sys_dept d ON yp.dept_id = d.dept_id
<where>
+ yp.examine_status = 1
<if test="query.pointName != null and query.pointName != ''">
AND m.name like concat('%', #{query.pointName} ,'%')
</if>
@@ -197,7 +246,8 @@
</select>
<delete id="deleteAll">
- delete from t_yw_point
+ delete
+ from t_yw_point
</delete>
<update id="updatePoint">
@@ -224,54 +274,52 @@
</update>
<select id="countNotFinishedWorkOrderByPointId" resultType="com.ycl.platform.domain.vo.YwPointVO">
- SELECT
- yp.id, yp.point_name, wo.serial_number
- FROM
- t_yw_point yp
+ SELECT yp.id,
+ yp.point_name,
+ wo.serial_number
+ FROM t_yw_point yp
INNER JOIN t_work_order wo ON yp.serial_number = wo.serial_number
- AND wo.status not in ('AUDITING_SUCCESS','WAIT_DISTRIBUTE')
- AND wo.deleted = 0
- AND yp.deleted = 0
- WHERE
- yp.id = #{pointId}
+ AND wo.status not in ('AUDITING_SUCCESS', 'WAIT_DISTRIBUTE')
+ AND wo.deleted = 0
+ AND yp.deleted = 0
+ WHERE yp.id = #{pointId}
</select>
<select id="countNotFinishedWorkOrderByGb" resultType="com.ycl.platform.domain.vo.YwPointVO">
- SELECT
- yp.id, yp.point_name, wo.serial_number
- FROM
- t_yw_point yp
- INNER JOIN t_work_order wo ON yp.serial_number = wo.serial_number
- AND wo.status not in ('AUDITING_SUCCESS','WAIT_DISTRIBUTE')
- AND wo.deleted = 0
- AND yp.deleted = 0
- AND yp.serial_number = #{serialNumber}
- LIMIT 1
+ SELECT yp.id,
+ yp.point_name,
+ wo.serial_number
+ FROM t_yw_point yp
+ INNER JOIN t_work_order wo ON yp.serial_number = wo.serial_number
+ AND wo.status not in ('AUDITING_SUCCESS', 'WAIT_DISTRIBUTE')
+ AND wo.deleted = 0
+ AND yp.deleted = 0
+ AND yp.serial_number = #{serialNumber} LIMIT 1
</select>
<select id="getDeptPointGB" resultType="string">
SELECT
- DISTINCT serial_number
+ DISTINCT serial_number
FROM
- t_yw_point
+ t_yw_point
WHERE
- <if test="tagType == 0">
- dept_tag = 1
- </if>
- <if test="tagType == 1">
- important_tag = 1
- </if>
- <if test="tagType == 2">
- important_command_image_tag = 1
- </if>
- AND deleted = 0
+ <if test="tagType == 0">
+ dept_tag = 1
+ </if>
+ <if test="tagType == 1">
+ important_tag = 1
+ </if>
+ <if test="tagType == 2">
+ important_command_image_tag = 1
+ </if>
+ AND deleted = 0
</select>
<select id="select" resultType="com.ycl.platform.domain.entity.YwPoint">
SELECT
- *
+ *
FROM
- t_yw_point
+ t_yw_point
<where>
<if test="keyword != null and keyword != ''">
AND (serial_number like concat('%', #{keyword}, '%') or point_name like concat('%', #{keyword}, '%'))
@@ -285,30 +333,29 @@
</select>
<select id="getReportResult" resultType="com.ycl.platform.domain.vo.ReportAuditingRecordVO">
- SELECT
- ar.result, r.begin_create_time, r.end_create_time
- FROM
- t_report r
+ SELECT ar.result,
+ r.begin_create_time,
+ r.end_create_time
+ FROM t_report r
INNER JOIN t_report_auditing_record ar ON r.id = ar.report_id
- AND ar.deleted = 0
- AND r.report_type = #{reportType}
- AND r.deleted = 0
- AND r.serial_number = #{serialNumber}
- AND ar.result = 1
- ORDER BY
- ar.create_time DESC
- limit 1
+ AND ar.deleted = 0
+ AND r.report_type = #{reportType}
+ AND r.deleted = 0
+ AND r.serial_number = #{serialNumber}
+ AND ar.result = 1
+ ORDER BY ar.create_time DESC limit 1
</select>
<select id="getTagsByGB" resultType="com.ycl.platform.domain.vo.CheckTagVO">
SELECT
- serial_number as no, province_tag, important_tag, important_command_image_tag, dept_tag
+ serial_number as no, province_tag, important_tag, important_command_image_tag, dept_tag
FROM
- t_yw_point
+ t_yw_point
WHERE
- deleted = 0 AND serial_number in <foreach collection="gbList" open="(" separator="," close=")" item="no">#{no}</foreach>
+ deleted = 0 AND serial_number in
+ <foreach collection="gbList" open="(" separator="," close=")" item="no">#{no}</foreach>
GROUP BY
- serial_number, province_tag, important_tag, important_command_image_tag, dept_tag
+ serial_number, province_tag, important_tag, important_command_image_tag, dept_tag
</select>
--
Gitblit v1.8.0