From f906ca73bbfe33187936f1a4635dd3ec8edd50b0 Mon Sep 17 00:00:00 2001
From: lsh <lsh@163.com>
Date: 星期二, 25 十一月 2025 19:07:32 +0800
Subject: [PATCH] *
---
src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java | 8 ++++----
src/main/java/com/zy/asrs/mapper/WrkMastMapper.java | 2 ++
src/main/resources/mapper/WrkMastMapper.xml | 5 +++++
3 files changed, 11 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/zy/asrs/mapper/WrkMastMapper.java b/src/main/java/com/zy/asrs/mapper/WrkMastMapper.java
index 06cdb1d..0132f30 100644
--- a/src/main/java/com/zy/asrs/mapper/WrkMastMapper.java
+++ b/src/main/java/com/zy/asrs/mapper/WrkMastMapper.java
@@ -18,6 +18,8 @@
List<WrkMast> selectByCrnNo(@Param("crnNo") Integer crnNo);
+ List<WrkMast> selectByCrnNoLog(@Param("crnNo") Integer crnNo);
+
// @Select("select * from asr_wrk_mast where ((wrk_sts = 4 Or wrk_sts = 14 ) and io_type <> 103 and io_type <> 104 and io_type <> 107 ) or (wrk_sts = 2 and io_type=6) order by upd_mk,io_time,wrk_no")
List<WrkMast> selectToBeCompleteData();
diff --git a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
index 0ab224d..39aec0b 100644
--- a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
@@ -1176,11 +1176,11 @@
if (!wrkMasts.isEmpty()) {
continue;
}
- List<TaskWrkLog> taskWrkLogs = taskWrkLogService.selectList(new EntityWrapper<TaskWrkLog>().eq("CRN_NO",crnProtocol.getCrnNo()).orderBy("COMPLETE_TIME",false));
- if (!taskWrkLogs.isEmpty()) {
+ List<WrkMast> WrkMastLogList = wrkMastMapper.selectByCrnNoLog(crnProtocol.getCrnNo());
+ if (!WrkMastLogList.isEmpty()) {
boolean signT = false;
- for (TaskWrkLog taskWrkLog : taskWrkLogs){
- Date completeTime = taskWrkLog.getCompleteTime();
+ for (WrkMast wrkMast : WrkMastLogList){
+ Date completeTime = wrkMast.getIoTime();
if (completeTime==null){
continue;
}
diff --git a/src/main/resources/mapper/WrkMastMapper.xml b/src/main/resources/mapper/WrkMastMapper.xml
index 8bcc878..55e863a 100644
--- a/src/main/resources/mapper/WrkMastMapper.xml
+++ b/src/main/resources/mapper/WrkMastMapper.xml
@@ -79,6 +79,11 @@
select * from asr_wrk_mast where 1=1 and crn_no = #{crnNo}
</select>
+ <select id="selectByCrnNoLog" resultMap="BaseResultMap">
+ select * from asr_wrk_mast_log where 1=1 and crn_no = #{crnNo}
+ order by io_time desc
+ </select>
+
<select id="selectToBeCompleteData" resultMap="BaseResultMap">
select * from asr_wrk_mast where ((wrk_sts = 4 Or wrk_sts = 14 ) and io_type != 103 and io_type != 104 and io_type != 107 ) or (wrk_sts = 2 and io_type=6) order by upd_mk,io_time,wrk_no
</select>
--
Gitblit v1.9.1