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 | 46 +++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 45 insertions(+), 1 deletions(-)
diff --git a/ycl-server/src/main/resources/mapper/zgyw/ReportMapper.xml b/ycl-server/src/main/resources/mapper/zgyw/ReportMapper.xml
index 7ba82e0..732099c 100644
--- a/ycl-server/src/main/resources/mapper/zgyw/ReportMapper.xml
+++ b/ycl-server/src/main/resources/mapper/zgyw/ReportMapper.xml
@@ -23,6 +23,7 @@
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,
@@ -30,7 +31,7 @@
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_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>
@@ -39,6 +40,9 @@
r.deleted = 0
<if test="query.reportType != null and query.reportType != ''">
AND r.report_type = #{query.reportType}
+ </if>
+ <if test="query.unitId != null">
+ AND r.unit_id = #{query.unitId}
</if>
<if test="query.status != null">
AND r.status = #{query.status}
@@ -50,9 +54,38 @@
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>
@@ -89,6 +122,17 @@
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>
+
--
Gitblit v1.8.0