Explorar el Código

获取公司打卡数据修改

anderx hace 2 meses
padre
commit
5fd0431bc4

+ 10 - 6
ruoyi-system/src/main/java/com/ruoyi/project/service/impl/ProjectStaffRecordServiceImpl.java

@@ -88,11 +88,16 @@ public class ProjectStaffRecordServiceImpl implements ProjectStaffRecordService
         }
         in.setName(username);
         if(in.getProcessStatus()>1)in.setProcessStatus(1);
-
+        //需要不需要打卡
         boolean flag=false;
         // 总监与上级是自己的情况下跳过审核
-        if (SecurityUtils.hashRoles(UserRolesType.INSPECTORS.getCode())||
-                user.getUserId().equals(user.getSuperiorId())){
+//        if (SecurityUtils.hashRoles(UserRolesType.INSPECTORS.getCode())||
+//                user.getUserId().equals(user.getSuperiorId())){
+//            flag=false;
+//        }else {
+//            flag=true;
+//        }
+        if (flag){
             in.setProcessStatus(2);
             sysUserMapper.userAddDuration(in.getAid(),in.getDuration());
             projectTaskMapper.projectAddDuration(in.getPid(),in.getDuration());
@@ -518,16 +523,15 @@ public class ProjectStaffRecordServiceImpl implements ProjectStaffRecordService
             log.setAid(in.getAid());
             log.setName(in.getName());
             log.setContent(getContent(in.getProcessStatus()));
+            projectStaffRecordLogMapper.insertSelective(log);
         }else {
             log.setAid(SecurityUtils.getUserId());
             log.setName(SecurityUtils.getLoginUser().getUser().getNickName());
             if (flag){
                 log.setContent(getContent(in.getProcessStatus())+in.getContent());
-            }else {
-                log.setContent("技术总监打卡无需审核");
+
             }
         }
-        projectStaffRecordLogMapper.insertSelective(log);
     }
 
     private void addRecordLog(Long id ,Integer processStatus,Long aid,String name,String content,boolean flag,Date date) {