From a77530a0e917f8d2dca1bae55a3730471c8e10a2 Mon Sep 17 00:00:00 2001
From: cpT <1@123>
Date: 星期三, 02 七月 2025 09:22:32 +0800
Subject: [PATCH] #改造
---
src/main/java/com/zy/asrs/controller/TaskWrkController.java | 12 +++++++-----
1 files changed, 7 insertions(+), 5 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/TaskWrkController.java b/src/main/java/com/zy/asrs/controller/TaskWrkController.java
index 58e205d..990db0d 100644
--- a/src/main/java/com/zy/asrs/controller/TaskWrkController.java
+++ b/src/main/java/com/zy/asrs/controller/TaskWrkController.java
@@ -88,11 +88,11 @@
status = Integer.parseInt(val);
}
}
-
- EntityWrapper<TaskWrk> wrapper = new EntityWrapper<>();
- excludeTrash(param);
- convert(param, wrapper);
- if (!Cools.isEmpty(orderByField)){wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));}
+//
+// EntityWrapper<TaskWrk> wrapper = new EntityWrapper<>();
+// excludeTrash(param);
+// convert(param, wrapper);
+// if (!Cools.isEmpty(orderByField)){wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));}
List<TaskWrk> taskWrkList = taskWrkService.selectTaskWrkList(wrkNo,taskNo,status,modiTimeStart,modiTimeEnd, curr, limit);
Page<TaskWrk> page = new Page<TaskWrk>(curr, limit).setRecords(taskWrkList);
@@ -246,6 +246,8 @@
taskWrk.setMemo("鎵嬪姩寮哄埗鍒犻櫎锛侊紒锛�");
taskWrk.setModiTime(now);
taskWrk.setModiUser(getUserId());
+ taskWrk.setCompleteTime(now);
+ taskWrk.setCancelTime(now);
if (!taskWrkService.updateById(taskWrk)){
log.error("鍒犻櫎澶辫触" + taskWrk);
return R.error("鍒犻櫎澶辫触" + taskWrk);
--
Gitblit v1.9.1