*

L

4 天以前 24fc54262b62a4f6835be68cd318c14e4d7327ef

 src/main/java/com/zy/asrs/controller/TaskWrkLogController.java

@@ -102,6 +102,28 @@
        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());
        taskWrkLog1.setModiTime(taskWrkLog.getModiTime());//修改时间
//        taskWrkLog1.setCancelTime(taskWrkLog.getCancelTime());//取消时间
        taskWrkLog1.setAssignTime(taskWrkLog.getAssignTime());//派发时间
        taskWrkLog1.setCompleteTime(taskWrkLog.getCompleteTime());//完结时间
        taskWrkLog1.setExecuteTime(taskWrkLog.getExecuteTime());//执行时间
        taskWrkLog1.setCreateTime(taskWrkLog.getCreateTime());//执行时间
        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){