From 1351034482501073f628b87cdb6c4722a01283ba Mon Sep 17 00:00:00 2001
From: lsh <lsh@163.com>
Date: 星期二, 18 十一月 2025 16:48:17 +0800
Subject: [PATCH] *
---
src/main/java/com/zy/asrs/controller/TaskWrkLogController.java | 57 ++++++++++++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 50 insertions(+), 7 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/TaskWrkLogController.java b/src/main/java/com/zy/asrs/controller/TaskWrkLogController.java
index f0f7ce1..881cf90 100644
--- a/src/main/java/com/zy/asrs/controller/TaskWrkLogController.java
+++ b/src/main/java/com/zy/asrs/controller/TaskWrkLogController.java
@@ -1,6 +1,5 @@
package com.zy.asrs.controller;
-import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.baomidou.mybatisplus.mapper.Wrapper;
@@ -37,12 +36,40 @@
@RequestParam(required = false)String orderByField,
@RequestParam(required = false)String orderByType,
@RequestParam Map<String, Object> param){
- EntityWrapper<TaskWrkLog> wrapper = new EntityWrapper<>();
- excludeTrash(param);
- convert(param, wrapper);
- if (!Cools.isEmpty(orderByField)){wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));}
- wrapper.orderDesc(Collections.singleton("CREATE_TIME"));
- return R.ok(taskWrkLogService.selectPage(new Page<>(curr, limit), wrapper));
+ try{
+ Integer wrkNo = null;
+ String taskNo = null;
+ Integer status = null;
+ Date modiTimeStart = null, modiTimeEnd = null;
+ for (Map.Entry<String, Object> entry : param.entrySet()) {
+ String val = String.valueOf(entry.getValue());
+ if (Cools.isEmpty(val)) {
+ continue;
+ }
+ if (val.contains(RANGE_TIME_LINK)) {
+ String[] dates = val.split(RANGE_TIME_LINK);
+ modiTimeStart = DateUtils.convert(dates[0]);
+ modiTimeEnd = DateUtils.convert(dates[1]);
+ } else if (entry.getKey().equals("wrk_no")) {
+ wrkNo = Integer.parseInt(val);
+ } else if (entry.getKey().equals("task_no")) {
+ taskNo = val;
+ } else if (entry.getKey().equals("status")) {
+ status = Integer.parseInt(val);
+ }
+ }
+ List<TaskWrkLog> taskWrkList = taskWrkLogService.selectTaskWrkLogList(wrkNo,taskNo,status,modiTimeStart,modiTimeEnd, curr, limit);
+ Page<TaskWrkLog> page = new Page<TaskWrkLog>(curr, limit).setRecords(taskWrkList);
+ if (page.getRecords().size()==0){
+ taskWrkList = taskWrkLogService.selectTaskWrkLogList(wrkNo,taskNo,status,modiTimeStart,modiTimeEnd, 1, limit);
+ page = new Page<TaskWrkLog>(1, limit).setRecords(taskWrkList);
+ }
+ page.setTotal(taskWrkLogService.selectTaskWrkLogListTotal(wrkNo,taskNo,status,modiTimeStart,modiTimeEnd));
+ return R.ok(page);
+
+ } catch (Exception e) {
+ return R.error("鏌ヨ澶辫触,璇锋鏌ュ弬鏁�:"+e.getMessage());
+ }
}
private <T> void convert(Map<String, Object> map, EntityWrapper<T> wrapper){
@@ -75,6 +102,22 @@
return R.ok();
}
+ @RequestMapping(value = "/taskWrkLog/updatePoint/auth")
+ @ManagerAuth
+ public R updatePoint(TaskWrkLog taskWrkLog){
+ if (Cools.isEmpty(taskWrkLog) || null == taskWrkLog.getTaskNo()) {
+ return R.error();
+ }
+ TaskWrkLog taskWrkLog1 = taskWrkLogService.selectOne(new EntityWrapper<TaskWrkLog>().eq("TASK_NO", taskWrkLog.getTaskNo()).eq("WRK_NO", taskWrkLog.getWrkNo()).orderBy("MODI_TIME",false));
+ if (taskWrkLog1 == null) {
+ return R.error();
+ }
+ taskWrkLog1.setStartPoint(taskWrkLog.getStartPoint());
+ taskWrkLog1.setTargetPoint(taskWrkLog.getTargetPoint());
+ taskWrkLogService.update(taskWrkLog1,new EntityWrapper<TaskWrkLog>().eq("TASK_NO", taskWrkLog.getTaskNo()).eq("WRK_NO", taskWrkLog.getWrkNo()).eq("MODI_TIME",taskWrkLog1.getModiTime()));
+ return R.ok();
+ }
+
@RequestMapping(value = "/taskWrkLog/delete/auth")
@ManagerAuth
public R delete(@RequestParam(value="ids[]") Long[] ids){
--
Gitblit v1.9.1