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/ReportMapper.xml | 125 +++++++++++++++++++++++++++++++++++++----
1 files changed, 111 insertions(+), 14 deletions(-)
diff --git a/ycl-server/src/main/resources/mapper/zgyw/ReportMapper.xml b/ycl-server/src/main/resources/mapper/zgyw/ReportMapper.xml
index d6d1b62..732099c 100644
--- a/ycl-server/src/main/resources/mapper/zgyw/ReportMapper.xml
+++ b/ycl-server/src/main/resources/mapper/zgyw/ReportMapper.xml
@@ -9,8 +9,10 @@
<result column="update_time" property="updateTime" />
<result column="unit_id" property="unitId" />
<result column="people_id" property="peopleId" />
- <result column="point_id" property="pointId" />
+ <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,27 +20,122 @@
<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,
+ r.import_batch_number,
+ 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.point_id = pt.id and pt.deleted = '0'
- where
- r.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.user_id and p.deleted = 0
+ LEFT JOIN t_yw_point pt ON r.serial_number = pt.serial_number and pt.deleted = 0
+ 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 != ''">
AND r.report_type = #{query.reportType}
</if>
- <if test="query.beginCreateTime != null">
- AND r.create_time between #{query.beginCreateTime} and #{query.endCreateTime}
+ <if test="query.unitId != null">
+ AND r.unit_id = #{query.unitId}
</if>
- <if test="query.pointId != null and query.pointId != ''">
- AND pt.point_name like concat('%', #{query.pointId}, '%')
+ <if test="query.status != null">
+ AND r.status = #{query.status}
</if>
- <if test="query.peopleId != null and query.peopleId != ''">
- AND p.yw_person_name like concat('%', #{query.peopleId}, '%')
+ <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>
- ORDER BY r.create_time DESC
+ 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,
+ r.import_batch_number,
+ u.unit_name,
+ p.yw_person_name,
+ pt.point_name
+ ORDER BY r.update_time DESC
</select>
+ <select id="getListByGb" resultType="com.ycl.platform.domain.vo.ReportVO">
+ SELECT
+ DISTINCT
+ 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,
+ r.import_batch_number,
+ r.update_time,
+ u.unit_name,
+ p.yw_person_name as peopleName,
+ pt.point_name
+ FROM
+ t_report r
+ INNER JOIN t_report_error_type ret ON ret.report_id = r.id and ret.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
+ WHERE
+ r.serial_number = #{gb} AND r.deleted = 0
+ 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, ar.result, ar.result_remark, ar.create_time as auditing_time
+ FROM
+ 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
+ ORDER BY
+ ar.create_time DESC
+ </select>
+
+ <select id="selectNumberList" resultType="java.lang.String">
+ SELECT yp.serial_number FROM t_report r
+ LEFT JOIN t_yw_point yp ON r.serial_number = yp.serial_number
+ WHERE r.status = #{status} AND
+ #{date} between r.begin_create_time and r.end_create_time
+ </select>
+
+ <select id="checkPointReported" resultType="com.ycl.platform.domain.vo.ReportVO">
+ SELECT
+ r.id, r.error_type
+ FROM
+ t_report r
+ INNER JOIN t_yw_point yo ON r.serial_number = yo.serial_number AND yo.deleted = 0
+ 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.update_time DESC
+ LIMIT 1
+ </select>
+
+ <select id="getTogether" resultType="com.ycl.platform.domain.vo.ReportVO">
+ SELECT
+ r.id,
+ p.point_name
+ FROM
+ t_report r
+ INNER JOIN t_yw_point p ON r.serial_number = p.serial_number
+ WHERE
+ r.import_batch_number = #{pid} AND r.deleted = 0 AND r.status != 1 AND p.deleted = 0
+ </select>
+
+
+
+
+
+
</mapper>
--
Gitblit v1.8.0