#改造

cpT

2025-07-01 11c05e46db27c8a951cf9f31e103765897ca0078

 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);