Browse Source

批量打卡时间修改

anderx 1 year ago
parent
commit
3b64ec6a9e

+ 3 - 2
ruoyi-system/src/main/java/com/ruoyi/project/service/impl/ProjectStaffRecordServiceImpl.java

@@ -539,7 +539,7 @@ public class ProjectStaffRecordServiceImpl implements ProjectStaffRecordService
         ProjectStaffRecord use = projectStaffRecordMapper.selectByPrimaryKey(id);
         if (processStatus==2||processStatus==3){
             if (use.getProcessStatus()!=1){
-                AjaxResult.error("项目打卡无需审核!");
+                return AjaxResult.error("项目打卡无需审核!");
             }
             if(processStatus==2){
                 sysUserMapper.userAddDuration(use.getAid(),use.getDuration());
@@ -567,7 +567,8 @@ public class ProjectStaffRecordServiceImpl implements ProjectStaffRecordService
             Date date=new Date();
             if (in.getExamineTime()!=null)date.setTime(in.getExamineTime().getTime());
             for (String s : split) {
-                examineRecord(Long.valueOf(s),in.getProcessStatus(),in.getContent(),date);
+                AjaxResult ajaxResult = examineRecord(Long.valueOf(s), in.getProcessStatus(), in.getContent(), date);
+                if (ajaxResult.isError())return ajaxResult;
                 date.setTime(date.getTime()+(1000*100));
             }
         }