From 84d1db0005eb9567810e1229636357d2a994d944 Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期一, 02 九月 2024 10:34:48 +0800
Subject: [PATCH] 报备功能优化
---
ycl-server/src/main/resources/mapper/zgyw/ReportMapper.xml | 6 +++---
ycl-pojo/src/main/java/com/ycl/platform/domain/vo/ReportVO.java | 5 +++++
ycl-server/src/main/java/com/ycl/platform/service/impl/ReportServiceImpl.java | 4 ++--
3 files changed, 10 insertions(+), 5 deletions(-)
diff --git a/ycl-pojo/src/main/java/com/ycl/platform/domain/vo/ReportVO.java b/ycl-pojo/src/main/java/com/ycl/platform/domain/vo/ReportVO.java
index ef49b3d..af41d18 100644
--- a/ycl-pojo/src/main/java/com/ycl/platform/domain/vo/ReportVO.java
+++ b/ycl-pojo/src/main/java/com/ycl/platform/domain/vo/ReportVO.java
@@ -90,6 +90,11 @@
*/
private Integer status;
+ /**
+ * 鎵归噺瀵煎叆鎵规鍙�
+ */
+ private String importBatchNumber;
+
public static ReportVO getVoByEntity(@NonNull Report entity, ReportVO vo) {
if(vo == null) {
vo = new ReportVO();
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 759fd9c..e315444 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
@@ -121,7 +121,7 @@
form.setPeopleId(people.getId());
form.setUnitId(people.getBelongUnit());
form.setBeginCreateTime(DateUtils.parseDate(form.getBeginCreateTimeStr()));
- form.setEndCreateTime(DateUtils.parseDate(form.getEndCreateTime()));
+ form.setEndCreateTime(DateUtils.parseDate(form.getEndCreateTimeStr()));
// 璇诲彇excel鏁版嵁
ExcelUtil<ReportImportDTO> excelUtil = new ExcelUtil<>(ReportImportDTO.class);
List<ReportImportDTO> list = excelUtil.importExcel(form.getImportPointId().getInputStream());
@@ -347,7 +347,7 @@
// 娣诲姞涓�鏉″鏍歌褰�
ReportAuditingRecord reportAuditingRecord = new ReportAuditingRecord();
- reportAuditingRecord.setReportId(form.getId());
+ reportAuditingRecord.setReportId(id);
reportAuditingRecord.setDeleted(0);
reportAuditingRecord.setCreateTime(now);
reportAuditingRecord.setResultRemark(form.getAuditOpinion());
diff --git a/ycl-server/src/main/resources/mapper/zgyw/ReportMapper.xml b/ycl-server/src/main/resources/mapper/zgyw/ReportMapper.xml
index e904349..606dabe 100644
--- a/ycl-server/src/main/resources/mapper/zgyw/ReportMapper.xml
+++ b/ycl-server/src/main/resources/mapper/zgyw/ReportMapper.xml
@@ -96,10 +96,10 @@
r.id,
p.point_name
FROM
- t_report t
- INNER JOIN t_yw_point p ON t.serial_number = p.serial_number
+ t_report r
+ INNER JOIN t_yw_point p ON r.serial_number = p.serial_number
WHERE
- t.import_batch_number = #{pid} AND r.deleted = 0 AND r.status != 1 AND p.deleted = 0
+ r.import_batch_number = #{pid} AND r.deleted = 0 AND r.status != 1 AND p.deleted = 0
</select>
--
Gitblit v1.8.0