From 224c12c7ae9a3b9d0380962ff92dac18812434a6 Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期三, 08 一月 2025 10:19:18 +0800
Subject: [PATCH] 报备回显问题
---
ycl-server/src/main/resources/mapper/zgyw/ReportMapper.xml | 2 +-
ycl-server/src/main/resources/mapper/zgyw/CalculateReportMapper.xml | 2 ++
ycl-pojo/src/main/java/com/ycl/platform/domain/vo/CalculateReportDetailVO.java | 2 ++
ycl-server/src/main/java/com/ycl/platform/service/impl/ReportServiceImpl.java | 2 ++
4 files changed, 7 insertions(+), 1 deletions(-)
diff --git a/ycl-pojo/src/main/java/com/ycl/platform/domain/vo/CalculateReportDetailVO.java b/ycl-pojo/src/main/java/com/ycl/platform/domain/vo/CalculateReportDetailVO.java
index 2717bf1..3d4870e 100644
--- a/ycl-pojo/src/main/java/com/ycl/platform/domain/vo/CalculateReportDetailVO.java
+++ b/ycl-pojo/src/main/java/com/ycl/platform/domain/vo/CalculateReportDetailVO.java
@@ -24,6 +24,7 @@
private Integer id;
+
@JsonFormat(pattern = "yyyy-MM-dd")
private Date createTime;
@@ -33,6 +34,7 @@
private Integer whichYear;
/** 杩愮淮鍗曚綅 */
private String unitName;
+ private Integer unitId;
/** 鍚堝悓鍚嶇О */
private String contractName;
diff --git a/ycl-server/src/main/java/com/ycl/platform/service/impl/ReportServiceImpl.java b/ycl-server/src/main/java/com/ycl/platform/service/impl/ReportServiceImpl.java
index b9df674..d367241 100644
--- a/ycl-server/src/main/java/com/ycl/platform/service/impl/ReportServiceImpl.java
+++ b/ycl-server/src/main/java/com/ycl/platform/service/impl/ReportServiceImpl.java
@@ -74,6 +74,8 @@
throw new RuntimeException("闈炶繍缁村崟浣嶆殏鏃舵棤娉曟姤澶�");
}
form.setUnitId(unitId);
+ Long userId = SecurityUtils.getLoginUser().getUserId();
+ form.setPeopleId(Integer.parseInt(userId+""));
if ("浜嬪墠鎶ュ".equals(form.getReportType())) {
// 濡傛灉鏄簨鍓嶆姤澶囬渶瑕佹楠屾槸鍚﹀凡缁忕敓鎴愪笅鍙戝伐鍗�
YwPointVO point = ywpointMapper.countNotFinishedWorkOrderByGb(form.getPointId());
diff --git a/ycl-server/src/main/resources/mapper/zgyw/CalculateReportMapper.xml b/ycl-server/src/main/resources/mapper/zgyw/CalculateReportMapper.xml
index 67e03ba..5227511 100644
--- a/ycl-server/src/main/resources/mapper/zgyw/CalculateReportMapper.xml
+++ b/ycl-server/src/main/resources/mapper/zgyw/CalculateReportMapper.xml
@@ -79,6 +79,7 @@
<result column="id" property="id"/>
<result column="create_time" property="createTime"/>
<result column="unit_name" property="unitName"/>
+ <result column="unit_id" property="unitId"/>
<result column="name" property="contractName"/>
<result column="contract_id" property="contractId"/>
<result column="which_year" property="whichYear"/>
@@ -127,6 +128,7 @@
<select id="getById" resultMap="DetailResultMap">
SELECT tyu.unit_name,
+ tyu.id as unit_id,
tc.name,
tcr.id,
tcr.contract_id,
diff --git a/ycl-server/src/main/resources/mapper/zgyw/ReportMapper.xml b/ycl-server/src/main/resources/mapper/zgyw/ReportMapper.xml
index 1877141..732099c 100644
--- a/ycl-server/src/main/resources/mapper/zgyw/ReportMapper.xml
+++ b/ycl-server/src/main/resources/mapper/zgyw/ReportMapper.xml
@@ -31,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>
--
Gitblit v1.8.0