修改考勤汇总

attendance-performance-manager/src/main/java/com/mortals/xhx/busiz/TestController.java

@@ -15,6 +15,9 @@ import com.mortals.xhx.base.system.user.model.UserEntity;
 import com.mortals.xhx.base.system.user.model.UserQuery;
 import com.mortals.xhx.base.system.user.service.UserService;
 import com.mortals.xhx.common.code.YesNoEnum;
+import com.mortals.xhx.module.dept.model.DeptEntity;
+import com.mortals.xhx.module.dept.model.DeptQuery;
+import com.mortals.xhx.module.dept.service.DeptService;
 import com.mortals.xhx.module.hik.face.model.req.img.ImgReq;
 import com.mortals.xhx.module.hik.face.service.IHikFaceService;
 import com.mortals.xhx.module.perform.service.PerformPerposeStaffService;
@@ -36,6 +39,7 @@ import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.stream.Collectors;
 
 
 /**
@@ -62,6 +66,8 @@ public class TestController {
     private IHikFaceService faceService;
     @Autowired
     private UploadService uploadService;
+    @Autowired
+    private DeptService deptService;
 
     @Autowired
     private PerformPerposeStaffService performPerposeStaffService;
@@ -82,6 +88,49 @@ public class TestController {
         return "ok";
     }
 
+    @GetMapping("updateDeptNum")
+    @UnAuth
+    public String updateDeptNum() {
+        log.info("更新部门用户数量");
+        Map<Long, Long> collect = staffService.find(new StaffQuery()).stream().collect(Collectors.groupingBy(x -> x.getDeptId(), Collectors.counting()));
+
+        collect.entrySet().stream().forEach(item -> {
+            Long deptId = item.getKey();
+            Long count = item.getValue();
+            DeptEntity deptEntity = deptService.get(deptId);
+            deptEntity.setPersonNum(count.intValue());
+            deptService.update(deptEntity);
+        });
+
+        //更新父部门的人数归集
+        collect.entrySet().stream().forEach(item -> {
+            Long deptId = item.getKey();
+            DeptEntity deptEntity = deptService.get(deptId);
+            updateDeptPersonNum(deptEntity);
+
+
+        });
+
+
+        return "ok";
+    }
+
+    private void updateDeptPersonNum(DeptEntity deptEntity) {
+        if(ObjectUtils.isEmpty(deptEntity.getParentId())){
+            int sum = deptService.find(new DeptQuery().parentId(deptEntity.getId())).stream().mapToInt(i -> i.getPersonNum()).sum();
+            DeptEntity parentDept = deptService.get(deptEntity.getParentId());
+
+           if(ObjectUtils.isEmpty(parentDept)){
+               parentDept.setPersonNum(sum);
+               deptService.update(parentDept);
+
+               updateDeptPersonNum(parentDept);
+           }
+
+
+        }
+    }
+
     //
     @GetMapping("updatePersons")
     @UnAuth
@@ -211,7 +260,8 @@ public class TestController {
 
     /**
      * 生成模拟数据
-     *  mortals_xhx_perform_perpose_staff_stat
+     * mortals_xhx_perform_perpose_staff_stat
+     *
      * @return
      */
     @GetMapping("randomStatPerposeStaffData")

attendance-performance-manager/src/main/java/com/mortals/xhx/module/job/web/JobController.java

@@ -42,7 +42,7 @@ public class JobController extends BaseCRUDJsonBodyMappingController<JobService,
     @Override
     protected void init(Map<String, Object> model, Context context) {
         this.addDict(model, "type", JobTypeEnum.getEnumMap());
-        this.addDict(model, "group",service.queryGroupName(new JobQuery()).stream().collect(Collectors.toMap(x->x.getId().toString(), y->y.getGroupName(),(o, n)->n)));
+        this.addDict(model, "groupId",service.queryGroupName(new JobQuery()).stream().collect(Collectors.toMap(x->x.getId().toString(), y->y.getGroupName(),(o, n)->n)));
         super.init(model, context);
     }