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

amos-boot-system-tzs/amos-boot-module-96333/amos-boot-module-96333-api/src/main/resources/mapper/ElevatorMapper.xml

@@ -518,8 +518,10 @@
     <select id="selectMtByAlertId" resultType="java.util.Map">
         SELECT
             SEQUENCE_NBR AS sequenceNbr,
-            ME_MASTER AS userName,
-            EMERGENCYCALL AS phone,
+            ME_MASTER AS userName1,
+            ME_MASTER_PHONE AS phone1,
+            ME_MASTER1 AS userName2,
+            ME_MASTER1_PHONE AS phone2,
             '' AS address,
             ME_UNIT_NAME AS unitName,
             ME_UNIT_CREDIT_CODE AS useCode

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

@@ -402,15 +402,15 @@ public class MaintenanceUnitController extends BaseController {
         List<DutyPersonDto> dutyPersonList = new ArrayList<DutyPersonDto>();
         DutyPersonDto principal = new DutyPersonDto();
         principal.setDeptName("主要负责人1");
-        principal.setPhone(ObjectUtils.isEmpty(list.get(0).get("phone")) ? null : String.valueOf(list.get(0).get("phone")));
+        principal.setPhone(ObjectUtils.isEmpty(list.get(0).get("phone1")) ? null : String.valueOf(list.get(0).get("phone1")));
         principal.setUserId(null);
-        principal.setUserName(ObjectUtils.isEmpty(list.get(0).get("userName")) ? null : String.valueOf(list.get(0).get("userName")));
+        principal.setUserName(ObjectUtils.isEmpty(list.get(0).get("userName1")) ? null : String.valueOf(list.get(0).get("userName1")));
         dutyPersonList.add(principal);
         DutyPersonDto manager = new DutyPersonDto();
         manager.setDeptName("主要负责人2");
-        manager.setPhone(list.size() == 2 ? String.valueOf(list.get(0).get("phone")) : null);
+        manager.setPhone(ObjectUtils.isEmpty(list.get(0).get("phone2")) ? null : String.valueOf(list.get(0).get("phone2")));
         manager.setUserId(null);
-        manager.setUserName(list.size() == 2 ? String.valueOf(list.get(0).get("userName")) : null);
+        manager.setUserName(ObjectUtils.isEmpty(list.get(0).get("userName2")) ? null : String.valueOf(list.get(0).get("userName2")));
         dutyPersonList.add(manager);
         maintenanceUnitVo.setDutyPersonList(dutyPersonList);
 

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

@@ -1090,6 +1090,14 @@ public class IdxBizJgRegisterInfoServiceImpl extends BaseService<IdxBizJgRegiste
             boolMust.must(elBuilder);
         }
 
+        // 设备类别
+        if (!ObjectUtils.isEmpty(map.getString("EQU_CATEGORY_CODE"))) {
+            BoolQueryBuilder pBuilder = QueryBuilders.boolQuery();
+            String test = QueryParser.escape(map.getString("EQU_CATEGORY_CODE"));
+            pBuilder.must(QueryBuilders.termQuery("EQU_CATEGORY_CODE",test));
+            boolMust.must(pBuilder);
+        }
+
 
         builder.query(boolMust);
         builder.sort("REC_DATE", SortOrder.DESC);

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

@@ -146,7 +146,7 @@ public class JgInstallationNoticeServiceImpl extends BaseService<JgInstallationN
     @Value("classpath:/json/urlInfo.json")
     public Resource bizTypeInfo;
 
-    @Value("${tzs.domain}")
+    @Value("${tzs.domain:http://sxtzsb.sxsei.com}")
     String TZSDOMAIN ;
 
     @Autowired

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

@@ -513,32 +513,24 @@ public class JgMaintenanceContractServiceImpl extends BaseService<JgMaintenanceC
      */
     private void updateEquipMessage(Long id) {
         JgMaintenanceContract jgMaintenanceContract = this.getBaseMapper().selectById(id);
-        ArrayList<String[]> maintenanceManager = new ArrayList<>();
-        maintenanceManager.add(new String[]{jgMaintenanceContract.getMaintenanceManagerOneName(), jgMaintenanceContract.getMaintenanceManagerOnePhone()});
-        maintenanceManager.add(new String[]{jgMaintenanceContract.getMaintenanceManagerTwoName(), jgMaintenanceContract.getMaintenanceManagerTwoPhone()});
-
-
         LambdaQueryWrapper<JgMaintenanceContractEq> lambda = new QueryWrapper<JgMaintenanceContractEq>().lambda();
         lambda.eq(JgMaintenanceContractEq::getEquipTransferId, id);
         List<JgMaintenanceContractEq> list = jgMaintenanceContractEqService.getBaseMapper().selectList(lambda);
-
         ArrayList<IdxBizJgMaintenanceRecordInfo> data = new ArrayList<>();
         // 循环设备
         list.forEach(item -> {
-            // 循环添加两条维保备案信息表数据，存储两个维保负责人
-            for (int i = 0; i < 2; i++) {
-                IdxBizJgMaintenanceRecordInfo info = new IdxBizJgMaintenanceRecordInfo();
-                info.setRecord(item.getEquId());
-                info.setMeUnitName(ObjectUtils.isEmpty(jgMaintenanceContract.getMaintenanceUnitName()) ? null : jgMaintenanceContract.getMaintenanceUnitName());
-                info.setMeUnitCreditCode(ObjectUtils.isEmpty(jgMaintenanceContract.getMaintenanceUnitCode()) ? null : jgMaintenanceContract.getMaintenanceUnitCode());
-                String[] manager = maintenanceManager.get(i);
-                info.setMeMaster(ObjectUtils.isEmpty(manager[0]) ? null : manager[0]);
-                info.setEmergencycall(ObjectUtils.isEmpty(manager[1]) ? null : manager[1]);
-                info.setInformStart(ObjectUtils.isEmpty(jgMaintenanceContract.getInformStart()) ? null : jgMaintenanceContract.getInformStart());
-                info.setInformEnd(ObjectUtils.isEmpty(jgMaintenanceContract.getInformEnd()) ? null : jgMaintenanceContract.getInformEnd());
-                info.setRepairInform(ObjectUtils.isEmpty(jgMaintenanceContract.getMaintenanceContract()) ? null : jgMaintenanceContract.getMaintenanceContract());
-                data.add(info);
-            }
+            IdxBizJgMaintenanceRecordInfo info = new IdxBizJgMaintenanceRecordInfo();
+            info.setRecord(item.getEquId());
+            info.setMeUnitName(ObjectUtils.isEmpty(jgMaintenanceContract.getMaintenanceUnitName()) ? null : jgMaintenanceContract.getMaintenanceUnitName());
+            info.setMeUnitCreditCode(ObjectUtils.isEmpty(jgMaintenanceContract.getMaintenanceUnitCode()) ? null : jgMaintenanceContract.getMaintenanceUnitCode());
+            info.setMeMaster(ObjectUtils.isEmpty(jgMaintenanceContract.getMaintenanceManagerOneName()) ? null : jgMaintenanceContract.getMaintenanceManagerOneName());
+            info.setMeMasterPhone(ObjectUtils.isEmpty(jgMaintenanceContract.getMaintenanceManagerOnePhone()) ? null : jgMaintenanceContract.getMaintenanceManagerOnePhone());
+            info.setMeMaster1(ObjectUtils.isEmpty(jgMaintenanceContract.getMaintenanceManagerTwoName()) ? null : jgMaintenanceContract.getMaintenanceManagerTwoName());
+            info.setMeMaster1Phone(ObjectUtils.isEmpty(jgMaintenanceContract.getMaintenanceManagerTwoPhone()) ? null : jgMaintenanceContract.getMaintenanceManagerTwoPhone());
+            info.setInformStart(ObjectUtils.isEmpty(jgMaintenanceContract.getInformStart()) ? null : jgMaintenanceContract.getInformStart());
+            info.setInformEnd(ObjectUtils.isEmpty(jgMaintenanceContract.getInformEnd()) ? null : jgMaintenanceContract.getInformEnd());
+            info.setRepairInform(ObjectUtils.isEmpty(jgMaintenanceContract.getMaintenanceContract()) ? null : jgMaintenanceContract.getMaintenanceContract());
+            data.add(info);
         });
         idxBizJgMaintenanceRecordInfoService.saveBatch(data);
     }

amos-boot-system-tzs/amos-boot-module-ymt/amos-boot-module-ymt-api/src/main/java/com/yeejoin/amos/boot/module/ymt/api/entity/IdxBizJgMaintenanceRecordInfo.java

@@ -2,11 +2,11 @@ package com.yeejoin.amos.boot.module.ymt.api.entity;
 
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
-import com.yeejoin.amos.boot.biz.common.entity.BaseEntity;
 import com.yeejoin.amos.boot.biz.common.entity.TzsBaseEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
+
 import java.util.Date;
 
 /**
@@ -74,18 +74,41 @@ public class IdxBizJgMaintenanceRecordInfo extends TzsBaseEntity {
     private Date informEnd;
 
     /**
-     *
+     *维保负责人1姓名
      */
 	@TableField("\"ME_MASTER\"")
     private String meMaster;
 
     /**
-     *
+     *维保负责人2姓名
+     */
+	@TableField("\"ME_MASTER1\"")
+    private String meMaster1;
+
+    /**
+     *维保负责人1身份证
      */
 	@TableField("\"ME_MASTER_ID\"")
     private String meMasterId;
 
     /**
+     *维保负责人2身份证
+     */
+	@TableField("\"ME_MASTER1_ID\"")
+    private String meMaster1Id;
+
+    /**
+     *维保负责人2电话
+     */
+	@TableField("\"ME_MASTER1_PHONE\"")
+    private String meMaster1Phone;
+    /**
+     *维保负责人1电话
+     */
+	@TableField("\"ME_MASTER_PHONE\"")
+    private String meMasterPhone;
+
+    /**
      *
      */
 	@TableField("\"EMERGENCYCALL\"")