From 7346d923294999a51d7191f1ee0f0e711bbb7cf2 Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期日, 22 三月 2026 17:45:21 +0800
Subject: [PATCH] #
---
src/main/webapp/static/js/wrkAnalysis/wrkAnalysis.js | 10 ++++++----
src/main/java/com/zy/asrs/service/impl/WrkAnalysisServiceImpl.java | 11 +++++------
2 files changed, 11 insertions(+), 10 deletions(-)
diff --git a/src/main/java/com/zy/asrs/service/impl/WrkAnalysisServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/WrkAnalysisServiceImpl.java
index 7b3e214..04bc31d 100644
--- a/src/main/java/com/zy/asrs/service/impl/WrkAnalysisServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/WrkAnalysisServiceImpl.java
@@ -3,6 +3,7 @@
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.core.common.Cools;
@@ -126,13 +127,11 @@
if (wrkMast == null || wrkMast.getWrkNo() == null || !Objects.equals(wrkMast.getWrkSts(), WrkStsType.INBOUND_STATION_RUN.sts)) {
return false;
}
- WrkMast updateEntity = new WrkMast();
- updateEntity.setWrkNo(wrkMast.getWrkNo());
- updateEntity.setWrkSts(WrkStsType.INBOUND_STATION_RUN_COMPLETE.sts);
Date now = safeDate(operateTime);
- updateEntity.setIoTime(now);
- updateEntity.setModiTime(now);
- boolean updated = wrkMast.getWrkNo() != null && wrkMastService.update(updateEntity, new QueryWrapper<WrkMast>()
+ boolean updated = wrkMast.getWrkNo() != null && wrkMastService.update(null, new UpdateWrapper<WrkMast>()
+ .set("wrk_sts", WrkStsType.INBOUND_STATION_RUN_COMPLETE.sts)
+ .set("io_time", now)
+ .set("modi_time", now)
.eq("wrk_no", wrkMast.getWrkNo())
.eq("wrk_sts", WrkStsType.INBOUND_STATION_RUN.sts));
if (!updated) {
diff --git a/src/main/webapp/static/js/wrkAnalysis/wrkAnalysis.js b/src/main/webapp/static/js/wrkAnalysis/wrkAnalysis.js
index 12c5835..0214de8 100644
--- a/src/main/webapp/static/js/wrkAnalysis/wrkAnalysis.js
+++ b/src/main/webapp/static/js/wrkAnalysis/wrkAnalysis.js
@@ -202,16 +202,18 @@
});
},
syncCurrentPageSelection: function (selection) {
+ var nextMap = Object.assign({}, this.selectedWrkNoMap);
var selectedMap = {};
(selection || []).forEach(function (row) {
selectedMap[row.wrkNo] = true;
});
(this.tableData || []).forEach(function (row) {
- delete this.selectedWrkNoMap[row.wrkNo];
- }, this);
+ delete nextMap[row.wrkNo];
+ });
Object.keys(selectedMap).forEach(function (key) {
- this.selectedWrkNoMap[key] = true;
- }, this);
+ nextMap[key] = true;
+ });
+ this.selectedWrkNoMap = nextMap;
},
runAnalysis: function () {
var self = this;
--
Gitblit v1.9.1