Merge remote-tracking branch 'origin/develop_tzs_register' into develop_tzs_register

amos-boot-system-tzs/amos-boot-module-96333/amos-boot-module-96333-biz/src/main/java/com/yeejoin/amos/boot/module/elevator/biz/controller/MaintenanceUnitController.java

@@ -395,7 +395,7 @@ public class MaintenanceUnitController extends BaseController {
         MaintenanceUnitDto maintenanceUnitVo = new MaintenanceUnitDto();
         maintenanceUnitVo.setUnitName(ObjectUtils.isEmpty(list.get(0).get("unitName")) ? null :String.valueOf(list.get(0).get("unitName")));
         maintenanceUnitVo.setAddress(ObjectUtils.isEmpty(list.get(0).get("address")) ? null :String.valueOf(list.get(0).get("address")));
-        maintenanceUnitVo.setSequenceNbr(ObjectUtils.isEmpty(list.get(0).get("sequenceNbr")) ? null : Long.valueOf(String.valueOf(list.get(0).get("sequenceNbr"))));
+//        maintenanceUnitVo.setSequenceNbr(ObjectUtils.isEmpty(list.get(0).get("sequenceNbr")) ? null : Long.valueOf(String.valueOf(list.get(0).get("sequenceNbr"))));
         List<DutyPersonDto> dutyPersonList = new ArrayList<DutyPersonDto>();
         DutyPersonDto principal = new DutyPersonDto();
         principal.setDeptName("主要负责人1");
@@ -405,9 +405,9 @@ public class MaintenanceUnitController extends BaseController {
         dutyPersonList.add(principal);
         DutyPersonDto manager = new DutyPersonDto();
         manager.setDeptName("主要负责人2");
-        manager.setPhone(list.size() == 2 ? String.valueOf(list.get(0).get("phone")) : null);
-        manager.setUserId(null);
-        manager.setUserName(list.size() == 2 ? String.valueOf(list.get(0).get("userName")) : null);
+//        manager.setPhone(list.size() == 2 ? String.valueOf(list.get(0).get("phone")) : null);
+//        manager.setUserId(null);
+//        manager.setUserName(list.size() == 2 ? String.valueOf(list.get(0).get("userName")) : null);
         dutyPersonList.add(manager);
         maintenanceUnitVo.setDutyPersonList(dutyPersonList);
 

amos-boot-system-tzs/amos-boot-module-ymt/amos-boot-module-ymt-biz/src/main/java/com/yeejoin/amos/boot/module/ymt/biz/service/impl/EquipmentCategoryServiceImpl.java

@@ -399,7 +399,8 @@ public class EquipmentCategoryServiceImpl extends BaseService<EquipmentCategoryD
                 for (Terms.Bucket field2Bucket : field2Terms.getBuckets()) {
                     String field1Value = field1Bucket.getKeyAsString();
                     String field2Value = EquipmentCategoryEnum.YRL.getName().equals(field2Bucket.getKeyAsString()) ? "alreadyClaim" :
-                            EquipmentCategoryEnum.DRL.getName().equals(field2Bucket.getKeyAsString()) ? "waitClaim" : "refuseClaim";
+                                         EquipmentCategoryEnum.DRL.getName().equals(field2Bucket.getKeyAsString()) ? "waitClaim" :
+                                         EquipmentCategoryEnum.YJL.getName().equals(field2Bucket.getKeyAsString()) ? "refuseClaim" : "caogao";
                     long docCount = field2Bucket.getDocCount();
                     statusCountMap.put(field1Value + "|" + field2Value, docCount);
                 }