筹建完善

platform-rest/src/main/java/com/platform/rest/controller/upms/SysUserController.java

@@ -638,4 +638,16 @@ public class SysUserController {
         //dto.setDeptId(deptId);
         return R.success(sysUserService.selectDeptRoleUser(dto));
     }
+
+    /**
+     * 根据角色名称获取用户集合
+     * @param roleName
+     * @return :
+     */
+    @GetMapping("/query/roleName/dept/{roleName}")
+    public R selectRoleDeptNameUsers(@PathVariable("roleName") String roleName) {
+        SysUserDTO dto = new SysUserDTO();
+        dto.setRoleCode(roleName);
+        return R.success(sysUserService.selectDeptRoleNameUser(dto));
+    }
 }

platform-service/src/main/java/com/platform/service/repair/impl/RepairApplicationFormServiceImpl.java

@@ -329,21 +329,29 @@ public class RepairApplicationFormServiceImpl extends BaseServiceImpl<RepairAppl
     }
     private void addPrepationNums(NoticeNumberVO noticeNumberVO,PreparationDTO preparationDTO){
         List<PreparationVO> preparationVOS = preparationMapper.getCountByUserId(preparationDTO);
+        noticeNumberVO.setNotDealNum(initNum);
+        noticeNumberVO.setYesDealNum(initNum);
+        noticeNumberVO.setFinishNum(initNum);
+        noticeNumberVO.setReturnNum(initNum);
         for (PreparationVO vo : preparationVOS){
-            if (vo.getStatus() == PreparationStatusEnum.NOT_ALLOCATED.getValue()){
+            BigDecimal tempVal = vo.getCounts() == null ? initNum : vo.getCounts();
+            if (vo.getStatus() == PreparationStatusEnum.NOT_ALLOCATED.getValue() ||
+                    vo.getStatus() == PreparationStatusEnum.APPLY_MANAGER_VERIFY_SUCCESS.getValue() ||
+                    vo.getStatus() == PreparationStatusEnum.FIRST_PROCESSING_VERIFYING.getValue() ||
+                    vo.getStatus() == PreparationStatusEnum.SECOND_PROCESSING_VERIFYING.getValue()){
                 // 待审核
-                noticeNumberVO.setNotDealNum(vo.getCounts()==null?initNum:vo.getCounts());
-            }else if (vo.getStatus() == PreparationStatusEnum.NOT_ALLOCATED.getValue()){
-                // 待接单
-                noticeNumberVO.setYesDealNum(vo.getCounts()==null?initNum:vo.getCounts());
+                noticeNumberVO.setNotDealNum(noticeNumberVO.getNotDealNum().add(tempVal));
+            }else if (vo.getStatus() == PreparationStatusEnum.SECOND_PROCESSING.getValue()){
+                // 执行中
+                noticeNumberVO.setYesDealNum(noticeNumberVO.getYesDealNum().add(tempVal));
             }
-            else if (vo.getStatus() == PreparationStatusEnum.NOT_ALLOCATED.getValue()){
-                // 待分配
-                noticeNumberVO.setFinishNum(vo.getCounts() == null ? initNum : vo.getCounts());
+            else if (vo.getStatus() == PreparationStatusEnum.FINISHED.getValue()){
+                // 已完成
+                noticeNumberVO.setFinishNum(noticeNumberVO.getFinishedNum().add(tempVal));
             }
             else if (vo.getStatus() == PreparationStatusEnum.PROCESSING.getValue()){
-                // 执行中
-                noticeNumberVO.setReturnNum(vo.getCounts()==null?initNum:vo.getCounts());
+                // 费用审核
+                noticeNumberVO.setReturnNum(noticeNumberVO.getReturnNum().add(tempVal));
             }
         }
     }

platform-service/src/main/java/com/platform/service/upms/SysUserService.java

@@ -216,6 +216,8 @@ public interface SysUserService extends IBaseService<SysUser, SysUserDTO> {
      */
     List<SysUserVO> selectDeptRoleUser(SysUserDTO sysUserDTO);
 
+    List<SysUserVO> selectDeptRoleNameUser(SysUserDTO sysUserDTO);
+
     List<SysUserVO> getSysUserList(SysUserDeptDTO sysUserDeptDTO);
 
     List<SysUserVO> getRepairUsers(SysUserDTO sysUserDTO);

platform-service/src/main/java/com/platform/service/upms/impl/SysUserServiceImpl.java

@@ -23,10 +23,7 @@ import com.platform.dao.entity.upms.*;
 import com.platform.dao.enums.DeptNatureEnum;
 import com.platform.dao.enums.SysRoleCodeEnum;
 import com.platform.dao.enums.SysUserIdentityType;
-import com.platform.dao.mapper.upms.SysDeptManagerMapper;
-import com.platform.dao.mapper.upms.SysDeptMapper;
-import com.platform.dao.mapper.upms.SysDeptRelationMapper;
-import com.platform.dao.mapper.upms.SysUserMapper;
+import com.platform.dao.mapper.upms.*;
 import com.platform.dao.util.UserUtil;
 import com.platform.dao.vo.SysUserDeptVO;
 import com.platform.dao.vo.SysUserVO;
@@ -50,6 +47,7 @@ import org.springframework.util.CollectionUtils;
 import tk.mybatis.mapper.weekend.Weekend;
 import tk.mybatis.mapper.weekend.WeekendCriteria;
 
+import javax.annotation.Resource;
 import java.util.*;
 import java.util.stream.Collectors;
 
@@ -98,6 +96,9 @@ public class SysUserServiceImpl extends BaseServiceImpl<SysUserMapper, SysUser,
     @Autowired
     private SysDeptManagerMapper sysDeptManagerMapper;
 
+    @Resource
+    private SysUserDeptMapper sysUserDeptMapper;
+
     @Value("${security.oauth2.client.client-id}")
     private String clientId;
 
@@ -769,6 +770,13 @@ public class SysUserServiceImpl extends BaseServiceImpl<SysUserMapper, SysUser,
         return mapper.selectDeptRoleUser(sysUserDTO);
     }
 
+    @Override
+    public List<SysUserVO> selectDeptRoleNameUser(SysUserDTO sysUserDTO) {
+        String applyDept = sysUserDeptMapper.selectDeptIdByUserId(SecurityUtils.getUserInfo().getUserId());
+        sysUserDTO.setDeptId(applyDept);
+        return selectDeptRoleUser(sysUserDTO);
+    }
+
     @Override
     public List<SysUserVO> getSysUserList(SysUserDeptDTO sysUserDeptDTO) {
         List<SysUserVO> sysUserVOS=mapper.getSysUserList(sysUserDeptDTO);