Merge branch 'wanghaicheng' of lift-manager/lift-server into develop

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-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);
         }