Merge branch 'develop' of http://132.232.206.88:3000/lift-manager/lift-server into huangyuan-user

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

@@ -132,4 +132,6 @@ public class LiftRequest extends PageRequest {
      * 电梯类型
      */
     private Integer liftType;
+
+    private String condition;
 }

lift-business-service/src/main/java/cn/com/ty/lift/business/maintenance/dao/entity/model/response/PropertyMtResponse.java

@@ -3,6 +3,7 @@ package cn.com.ty.lift.business.maintenance.dao.entity.model.response;
 import lombok.Data;
 
 import java.time.LocalDate;
+import java.time.LocalDateTime;
 
 @Data
 public class PropertyMtResponse {
@@ -14,5 +15,6 @@ public class PropertyMtResponse {
     private Object category;
     private String workerName;
     private LocalDate planDate;
+    private LocalDateTime recoveryDate;
     private Integer hasEvaluate;
 }

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

@@ -169,6 +169,18 @@ public class ProjectController {
         return projectService.modify(project);
     }
 
+    /**
+     * @param request 删除项目数据项
+     * @return 1.成功, 0.失败, 消息描述
+     * @description 删除项目，并删除项目组成员，删除项目关联数据
+     * @date 2020/5/26 5:21 下午
+     */
+    @PostMapping("remove")
+    @Validation(fields = {"id"})
+    public RestResponse remove(@Val @RequestBody ProjectRequest request){
+        return projectService.remove(request.getId(),request.getMtCompanyId());
+    }
+
     /**
      * @param request mtCompanyId 公司id
      * @param request projectId 项目id

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

@@ -36,10 +36,7 @@ import org.springframework.transaction.annotation.Transactional;
 import org.springframework.transaction.interceptor.TransactionAspectSupport;
 
 import javax.annotation.Resource;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Objects;
-import java.util.Optional;
+import java.util.*;
 import java.util.stream.Collectors;
 
 /**
@@ -316,6 +313,20 @@ public class ProjectLiftRelevanceService extends ServiceImpl<ProjectLiftRelevanc
         return removeById(id);
     }
 
+    /**
+     * @param id          项目id
+     * @param mtCompanyId 公司id
+     * @return 是否成功
+     * @description 批量删除项目关联数据
+     * @date 2020/5/26 5:33 下午
+     */
+    public boolean removeByMap(Long id, Long mtCompanyId) {
+        Map<String, Object> columnMap = new HashMap<>(2);
+        columnMap.put("mt_company_id", mtCompanyId);
+        columnMap.put("project_id", id);
+        return removeByMap(columnMap);
+    }
+
     /**
      * @param projectId 项目ID
      * @return List<ProjectUser> userList项目组维保工列表

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

@@ -375,6 +375,33 @@ public class ProjectService extends ServiceImpl<ProjectMapper, Project> {
         return RestResponse.success(null, MessageUtils.get("msg.add.success"));
     }
 
+    /**
+     * @param id          项目id
+     * @param mtCompanyId 公司id
+     * @return 1.成功, 0.失败, 消息描述
+     * @description 删除项目，并删除项目组成员，删除项目关联数据
+     * @date 2020/5/26 5:21 下午
+     */
+    @Transactional(rollbackFor = Exception.class)
+    public RestResponse remove(Long id, Long mtCompanyId) {
+        //删除项目
+        boolean projectResult = removeById(id);
+        if (!projectResult) return RestResponse.fail(MessageUtils.get("msg.delete.fail"));
+        //删除项目关联
+        boolean relevanceResult = projectLiftRelevanceService.removeByMap(id, mtCompanyId);
+        if (!relevanceResult) {
+            TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
+            return RestResponse.fail(MessageUtils.get("msg.delete.fail"));
+        }
+        //删除项目组成员
+        boolean userResult = projectUserService.removeByMap(id, mtCompanyId);
+        if (!userResult) {
+            TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
+            return RestResponse.fail(MessageUtils.get("msg.delete.fail"));
+        }
+        return RestResponse.success(null, MessageUtils.get("msg.delete.success"));
+    }
+
     /**
      * @param project 修改项目数据项
      * @return 是否成功

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

@@ -16,10 +16,7 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.transaction.interceptor.TransactionAspectSupport;
 
-import java.util.Comparator;
-import java.util.List;
-import java.util.Objects;
-import java.util.Optional;
+import java.util.*;
 import java.util.stream.Collectors;
 
 /**
@@ -115,6 +112,20 @@ public class ProjectUserService extends ServiceImpl<ProjectUserMapper, ProjectUs
         }
     }
 
+    /**
+     * @param id          项目id
+     * @param mtCompanyId 公司id
+     * @return 是否成功
+     * @description 批量删除项目组成员
+     * @date 2020/5/26 5:33 下午
+     */
+    public boolean removeByMap(Long id, Long mtCompanyId) {
+        Map<String, Object> columnMap = new HashMap<>(2);
+        columnMap.put("mt_company_id", mtCompanyId);
+        columnMap.put("project_id", id);
+        return removeByMap(columnMap);
+    }
+
     /**
      * @param request 批量删除项目组成员
      * @return Integer 成功1或失败0

lift-business-service/src/main/resources/mapper/lift/LiftMapper.xml

@@ -149,6 +149,10 @@
         <if test="request.projectId!=null and request.projectId!=''">
             AND plr.project_id = #{request.projectId,jdbcType=BIGINT}
         </if>
+        <if test="request.condition!=null and request.condition!=''">
+            AND (l.registration_code LIKE CONCAT('%',#{request.condition,jdbcType=VARCHAR},'%')
+            OR ui.name LIKE CONCAT('%',#{request.condition,jdbcType=VARCHAR},'%'))
+        </if>
     </select>
 
     <!-- 选择电梯 -->

lift-business-service/src/main/resources/mapper/project/ProjectMapper.xml

@@ -99,7 +99,7 @@
 			AND (p.project_name LIKE CONCAT('%',#{request.condition,jdbcType=VARCHAR},'%')
 			OR p.project_code LIKE CONCAT('%',#{request.condition,jdbcType=VARCHAR},'%')
 			OR p.address LIKE CONCAT('%',#{request.condition,jdbcType=VARCHAR},'%')
-		    OR r.user_id LIKE CONCAT('%',#{request.condition,jdbcType=VARCHAR},'%'))
+		    OR ui.name LIKE CONCAT('%',#{request.condition,jdbcType=VARCHAR},'%'))
 		</if>
 		<if test="request.projectStatus!=null and request.projectStatus!=''">
 			AND p.project_status = #{request.projectStatus,jdbcType=VARCHAR}

lift-common/src/main/java/cn.com.ty.lift.common/constants/SqlConstants.java

@@ -11,6 +11,7 @@ public interface SqlConstants {
                     "       l.category category," +
                     "       ui.name workerName," +
                     "       mp.plan_date planDate," +
+                    "       mr.recovery_date recoveryDate," +
                     "       mr.has_evaluate hasEvaluate" +
                     "          from maintenance_plan mp" +
                     "           left join lift l on mp.lift_id = l.id" +

lift-enterprise-service/src/main/java/cn/com/ty/lift/enterprise/region/service/impl/RegionServiceImpl.java

@@ -52,18 +52,16 @@ public class RegionServiceImpl extends ServiceImpl<RegionMapper, Region> impleme
 
         //遍历区域列表
         for (RegionResponse region : records) {
+            region.setProvinceName("无");
+            region.setCityName("无");
             //遍历省市列表，将省市的code转化为name
             for (Map<String, Object> area : areaCodes) {
                 if (null != region.getProvinceCode() && region.getProvinceCode().equals(area.get("code"))) {
                     region.setProvinceName(area.get("name").toString());
                     continue;
-                } else {
-                    region.setProvinceName("无");
                 }
                 if (null != region.getCityCode() && region.getCityCode().equals(area.get("code"))) {
                     region.setCityName(area.get("name").toString());
-                } else {
-                    region.setCityName("无");
                 }
             }
 
@@ -156,12 +154,12 @@ public class RegionServiceImpl extends ServiceImpl<RegionMapper, Region> impleme
         //添加新老区域主管
         userInfos.add(pushUserService.listByUserId(byId.getMtCompanyId(), byId.getUserId()));
         userInfos.add(pushUserService.listByUserId(byId.getMtCompanyId(), region.getUserId()));
-        String[] stringIds = byId.getClerk().replace(" ", "").split(",");
+        String[] clerkIds = byId.getClerk().replace(" ", "").split(",");
         List<PushUserInfo> clerks = new ArrayList<>();
-        if (stringIds.length > 0) {
+        if (clerkIds.length > 0 && !"".equals(clerkIds[0])) {
             List<Long> ids = new ArrayList<>();
-            for (String stringId : stringIds) {
-                ids.add(Long.valueOf(stringId));
+            for (String clerkId : clerkIds) {
+                ids.add(Long.valueOf(clerkId));
             }
             clerks = pushUserService.listByUserIds(byId.getMtCompanyId(), ids);
         }