3 Commits 09cb20439c ... 7b25759f6f

Auteur SHA1 Bericht Datum
  anderx 7b25759f6f 新增无打卡数据的判断 1 week geleden
  anderx c30fdfbc56 新增无打卡数据的判断 1 week geleden
  anderx 6274cca828 同步数据新增不同步数据未0小时的数据 1 week geleden

+ 3 - 0
ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ProjectTaskController.java

@@ -549,6 +549,9 @@ public class ProjectTaskController extends BaseController {
     @GetMapping("/getCompanyClock")
     public AjaxResult getCompanyClock(@RequestParam String usci,Integer year,Integer month){
         SysDept sysDept = sysDeptService.selectByusci(usci);
+        if (sysDept==null){
+            return AjaxResult.error("请先同步工时系统");
+        }
         Long deptId = sysDept.getDeptId();
         pushRdDataBo res = projectStaffRecordService.getCompanyClock(deptId,year,month);
         res.setUsci(usci);

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

@@ -1193,6 +1193,9 @@ public class ProjectStaffRecordServiceImpl implements ProjectStaffRecordService
         lastDay=lastDay+" 23:59:59";
         List<PushRdDataListBo> rdList =projectStaffRecordMapper.getCompanyClock(Math.toIntExact(deptId),
                 firsDay, lastDay);
+        if (rdList==null||rdList.size()==0){
+            throw new ServiceException("没有打卡数据");
+        }
         res.setRdList(rdList);
         return res;
     }

+ 6 - 0
ruoyi-system/src/main/java/com/ruoyi/project/service/impl/ProjectTaskServiceImpl.java

@@ -562,6 +562,9 @@ public class ProjectTaskServiceImpl   implements ProjectTaskService {
         //获取部门信息
         SysDept sysDept = new SysDept();
         SysDept sysDept2 = sysDeptMapper.selectByusci(usci);
+        if (sysDept2==null){
+            throw new ServiceException("打卡系统公司不存在");
+        }
         sysDept.setAncestors(sysDept2.getDeptId().toString());
         List<SysDept> sysDepts = sysDeptMapper.selectDeptList(sysDept);
         sysDepts.stream().forEach(System.out::println);
@@ -574,6 +577,9 @@ public class ProjectTaskServiceImpl   implements ProjectTaskService {
         sysUsers.stream().forEach(sysUser -> {
             projectTasks.addAll(projectTaskMapper.selectByUserId(sysUser.getUserId()));
         });
+        if (projectTasks.isEmpty()||sysUsers.isEmpty()||sysDepts.isEmpty()){
+            throw new ServiceException("打卡数据不存在");
+        }
         Map<String,Object> map=new HashMap();
         map.put("projectTasks",projectTasks);
         map.put("sysUsers",sysUsers);