From 99b53c056b309b935c8eb23a0ddf244bd4f4df96 Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期日, 01 九月 2024 21:54:32 +0800
Subject: [PATCH] 报备功能优化
---
ycl-server/src/main/resources/mapper/zgyw/ReportMapper.xml | 40 ++++++++++++++++++++++++----------------
1 files changed, 24 insertions(+), 16 deletions(-)
diff --git a/ycl-server/src/main/resources/mapper/zgyw/ReportMapper.xml b/ycl-server/src/main/resources/mapper/zgyw/ReportMapper.xml
index 3b06197..7ba82e0 100644
--- a/ycl-server/src/main/resources/mapper/zgyw/ReportMapper.xml
+++ b/ycl-server/src/main/resources/mapper/zgyw/ReportMapper.xml
@@ -11,6 +11,8 @@
<result column="people_id" property="peopleId" />
<result column="serial_number" property="serialNumber" />
<result column="auditing_time" property="auditingTime" />
+ <result column="result" property="result" />
+ <result column="result_remark" property="resultRemark" />
<result column="report_content" property="reportContent" />
<result column="report_materials" property="reportMaterials" />
<result column="error_type" property="errorType" />
@@ -18,18 +20,21 @@
<select id="page" resultType="com.ycl.platform.domain.vo.ReportVO">
SELECT
- r.*, u.unit_name, p.yw_person_name as peopleName, pt.point_name
+ r.id, r.report_materials, r.create_time, r.report_type, r.report_content, r.status, r.serial_number as pointId,
+ r.begin_create_time,
+ r.end_create_time,
+ u.unit_name,
+ p.yw_person_name as peopleName,
+ pt.point_name,
+ GROUP_CONCAT(DISTINCT ret.error_type SEPARATOR ',') AS errorType
FROM
t_report r
LEFT JOIN t_yw_unit u ON r.unit_id = u.id and u.deleted = 0
LEFT JOIN t_yw_people p ON r.people_id = p.id and p.deleted = 0
LEFT JOIN t_yw_point pt ON r.serial_number = pt.serial_number and pt.deleted = 0
- /* INNER JOIN (
- SELECT identify,MAX(create_time) AS create_time
- FROM t_report
- WHERE deleted = 0
- GROUP BY identify
- ) as rr ON r.create_time = rr.create_time*/
+ INNER JOIN t_report_error_type ret ON ret.report_id = r.id and ret.deleted = 0 <if test="query.errorTypeList != null and query.errorTypeList.size() > 0">
+ AND ret.error_type in <foreach collection="query.errorTypeList" open="(" separator="," close=")" item="errorType">#{errorType}</foreach>
+ </if>
WHERE
r.deleted = 0
<if test="query.reportType != null and query.reportType != ''">
@@ -41,24 +46,27 @@
<if test="query.keyword != null and query.keyword != ''">
AND (pt.point_name like concat('%', #{query.keyword}, '%') OR p.yw_person_name like concat('%', #{query.keyword}, '%'))
</if>
+ GROUP BY
+ r.id, r.report_materials, r.create_time, r.report_type, r.report_content, r.status, r.serial_number,
+ r.begin_create_time,
+ r.end_create_time,
+ u.unit_name,
+ p.yw_person_name,
+ pt.point_name
ORDER BY r.update_time DESC
</select>
<select id="examineRecord" resultMap="BaseResultMap">
SELECT
- r.*, u.unit_name, p.yw_person_name as peopleName, pt.point_name
+ r.*, u.unit_name, p.yw_person_name as peopleName, pt.point_name, ar.result, ar.result_remark, ar.create_time as auditing_time
FROM
- t_report r
+ t_report_auditing_record ar
+ INNER JOIN t_report r ON ar.report_id = r.id AND ar.report_id = #{id} AND ar.deleted = 0
LEFT JOIN t_yw_unit u ON r.unit_id = u.id and u.deleted = 0
LEFT JOIN t_yw_people p ON r.people_id = p.id and p.deleted = 0
LEFT JOIN t_yw_point pt ON r.serial_number = pt.serial_number and pt.deleted = 0
- INNER JOIN (
- SELECT identify, create_time
- FROM t_report
- WHERE id = #{id} AND deleted = 0
- ) as rr ON r.identify = rr.identify AND r.create_time <= rr.create_time
ORDER BY
- r.create_time DESC
+ ar.create_time DESC
</select>
<select id="selectNumberList" resultType="java.lang.String">
@@ -77,7 +85,7 @@
INNER JOIN t_work_order wo ON yo.serial_number = wo.serial_number AND wo.serial_number = #{serialNumber} AND wo.deleted = 0
WHERE
r.status = 1
- ORDER BY r.auditing_time DESC
+ ORDER BY r.update_time DESC
LIMIT 1
</select>
--
Gitblit v1.8.0