Merge remote-tracking branch 'origin/ghtzwcsOld' into ghtzwcsOld

zjj

2024-01-10 b610e067cf2c44fdcc99ec3a3190820d1a5b7bcb

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

@@ -228,11 +228,11 @@
            if (taskWrk == null) {
                return R.error();
            }
            if (taskWrk.getStatus().equals(TaskStatusType.COMPLETE.id)) {
            if (taskWrk.getStatus().equals(TaskStatusType.OVER.id)) {
                return R.error(taskWrk.getTaskNo() + "已完结");
            }
            Date now = new Date();
            taskWrk.setStatus(TaskStatusType.COMPLETE.id);
            taskWrk.setStatus(TaskStatusType.OVER.id);
            taskWrk.setModiTime(now);//操作时间
            try{
                taskWrk.setModiUser(getUserId());//操作员