Merge branch 'feature-bieao' of lift-manager/lift-server into develop

lift-business-service/src/main/java/cn/com/ty/lift/business/capital/service/CapitalRepairService.java

@@ -124,11 +124,15 @@ public class CapitalRepairService extends ServiceImpl<CapitalRepairMapper, Capit
      * @date 2020/2/4 12:46 下午
      */
     public boolean audit(CapitalRepairAuditRequest request) {
-        CapitalRepair capitalRepair = new CapitalRepair();
-        capitalRepair.setId(request.getId());
+        CapitalRepair capitalRepair = getOne(request.getId());
         //逾期审核
         if ("0".equals(request.getType())) {
-            capitalRepair.setOverdueFlag("0".equals(request.getPass()) ? 1 : 0);
+            if ("0".equals(request.getPass())) {
+                capitalRepair.setOverdueFlag(0);
+            }
+            //延期后的结束时间
+            capitalRepair.setDelayTime(capitalRepair.getOverdueDate());
+            capitalRepair.setOverdueFlag(1);
         }
         //竣工审核
         capitalRepair.setProjectStatus("0".equals(request.getPass()) ?
@@ -147,8 +151,6 @@ public class CapitalRepairService extends ServiceImpl<CapitalRepairMapper, Capit
         capitalRepair.setId(request.getId());
         capitalRepair.setOverdueDate(request.getOverdueDate());
         capitalRepair.setOverdueReason(request.getOverdueReason());
-        //延期后的结束时间
-        capitalRepair.setDelayTime(request.getOverdueDate());
         capitalRepair.setOverdueFlag(1);
         return updateById(capitalRepair);
     }

lift-business-service/src/main/java/cn/com/ty/lift/business/project/dao/entity/model/request/ProjectUserListRequest.java

@@ -16,7 +16,7 @@ public class ProjectUserListRequest {
      * 项目ID
      */
     @NotNull(message = "notEmpty")
-    private Long projectId;
+    private Long id;
 
     /**
      * 维保公司ID

lift-business-service/src/main/java/cn/com/ty/lift/business/project/dao/mapper/ProjectUserMapper.java

@@ -19,8 +19,6 @@ public interface ProjectUserMapper extends BaseMapper<ProjectUser> {
 
     List<ProjectUserResponse> findUserListById(@Param("projectId") Long projectId, @Param("mtCompanyId") Long mtCompanyId);
 
-    List<ProjectUserResponse> findUserListById(@Param("projectId") Long projectId);
-
     /**
      * @param request 项目ID、公司ID
      * @return List<ProjectAppUser> 项目成员名称和头像地址

lift-business-service/src/main/java/cn/com/ty/lift/business/project/service/ProjectLiftRelevanceService.java

@@ -208,7 +208,7 @@ public class ProjectLiftRelevanceService extends ServiceImpl<ProjectLiftRelevanc
      * @date 2020/2/12 5:01 下午
      */
     public List<ProjectUserResponse> userList(Long projectId) {
-        List<ProjectUserResponse> userList = projectUserService.getUserList(projectId);
+        List<ProjectUserResponse> userList = projectUserService.getUserList(projectId, null);
         return userList.stream().filter(user -> (
                 CommonEnum.DefaultRole.MTWORK.getCode().equals(user.getUserRole())
         )).collect(Collectors.toList());

lift-business-service/src/main/java/cn/com/ty/lift/business/project/service/ProjectService.java

@@ -102,11 +102,15 @@ public class ProjectService extends ServiceImpl<ProjectMapper,Project> {
         lambdaQueryWrapper.eq(Project::getMtCompanyId, mtCompanyId);
         List<Project> projects = list(lambdaQueryWrapper);
         Map<String, Long> collect = projects.stream().collect(Collectors.groupingBy(Project::getProjectStatus, Collectors.counting()));
-        Map<String, Integer> totalMap = new HashMap<>();
-        totalMap.put("notStart", collect.get(CommonEnum.ProjectStatus.NOT_START.getCode()).intValue());
-        totalMap.put("inService", collect.get(CommonEnum.ProjectStatus.IN_SERVICE.getCode()).intValue());
-        totalMap.put("stopService", collect.get(CommonEnum.ProjectStatus.STOP_SERVICE.getCode()).intValue());
-        totalMap.put("overdue", collect.get(CommonEnum.ProjectStatus.OVERDUE.getCode()).intValue());
+        Map<String, Long> totalMap = new HashMap<>();
+        Long notStart = collect.get(CommonEnum.ProjectStatus.NOT_START.getCode());
+        Long inService = collect.get(CommonEnum.ProjectStatus.IN_SERVICE.getCode());
+        Long stopService = collect.get(CommonEnum.ProjectStatus.STOP_SERVICE.getCode());
+        Long overdue = collect.get(CommonEnum.ProjectStatus.OVERDUE.getCode());
+        totalMap.put("notStart", notStart == null ? 0 : notStart);
+        totalMap.put("inService", inService == null ? 0 : inService);
+        totalMap.put("stopService", stopService == null ? 0 : stopService);
+        totalMap.put("overdue", overdue == null ? 0 : overdue);
         int projectCount = count(mtCompanyId, projectStatus);
         int liftCount = projectLiftRelevanceService.count(mtCompanyId, projectStatus);
         int stopLiftCount = platformCompanyService.count(mtCompanyId, projectStatus);
@@ -201,7 +205,7 @@ public class ProjectService extends ServiceImpl<ProjectMapper,Project> {
      */
     public Map<String, Object> detail(Long id) {
         Project project = getOne(id);
-        List<ProjectUserResponse> userList = projectUserService.getUserList(id);
+        List<ProjectUserResponse> userList = projectUserService.getUserList(id, null);
         Map<String, Object> resultMap = new HashMap<>();
         resultMap.put("project", project);
         resultMap.put("userList", userList);

lift-business-service/src/main/java/cn/com/ty/lift/business/project/service/ProjectUserService.java

@@ -29,10 +29,6 @@ public class ProjectUserService extends ServiceImpl<ProjectUserMapper, ProjectUs
         return baseMapper.findUserListById(projectId, mtCompanyId);
     }
 
-    public List<ProjectUserResponse> getUserList(Long projectId) {
-        return baseMapper.findUserListById(projectId);
-    }
-
     public List<ProjectUserResponse> getCapitalUserList(Long projectId, Long mtCompanyId) {
         List<ProjectUserResponse> userList = baseMapper.findUserListById(projectId, mtCompanyId);
         return userList.stream().filter(user -> (
@@ -47,7 +43,7 @@ public class ProjectUserService extends ServiceImpl<ProjectUserMapper, ProjectUs
      * @date 2019/12/13 2:40 PM
      */
     public List<ProjectUserResponse> userList(ProjectUserListRequest request) {
-        List<ProjectUserResponse> userList = getUserList(request.getProjectId(), request.getMtCompanyId());
+        List<ProjectUserResponse> userList = getUserList(request.getId(), request.getMtCompanyId());
         return userList.stream().filter(user -> (
                 CommonEnum.DefaultRole.MTWORK.getCode().equals(user.getUserRole())
                         || CommonEnum.DefaultRole.REGION_DIRECTOR.getCode().equals(user.getUserRole())

lift-business-service/src/main/resources/mapper/capital/CapitalRepairLiftRelevanceMapper.xml

@@ -46,7 +46,7 @@
         cr.id            AS projectId,
         cr.project_code  AS projectCode,
         cr.project_name  AS projectName,
-        cr.project_usage AS projectUsage,
+        cr.project_usage AS projectUsage
         FROM capital_repair_lift_relevance crlr
         LEFT JOIN capital_repair cr ON crlr.project_id = cr.id
         WHERE 1=1