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

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/resources/mapper/JgUseRegistrationMapper.xml

@@ -384,7 +384,8 @@
     </select>
 
     <select id="getMaintenanceDetail" resultType="java.util.Map">
-        SELECT tjmc."maintenance_unit_name"         as maintenanceUnitName,
+        SELECT
+               tjmc."maintenance_unit_name"         as maintenanceUnitName,
                tjmc."use_unit_name"                 as maintenanceUseUnitName,
                tjmc."maintenance_manager_name"      as maintenanceManagerName,
                tjmc."maintenance_manager_phone"     as maintenanceManagerPhone,
@@ -393,14 +394,17 @@
                tjmc."maintenance_manager_two_name"  as maintenanceManagerTwoName,
                tjmc."maintenance_manager_two_phone" as maintenanceManagerTwoPhone,
                tjmc."maintenance_contract"          as maintenanceContract,
-               tjmc."other_accessories"             as maintOtherAccessories
-        FROM "tzs_jg_maintenance_contract_eq" as tjmce
-                 LEFT JOIN "tzs_jg_maintenance_contract" as tjmc
-                           ON tjmce."equip_transfer_id" = tjmc."sequence_nbr"
-        WHERE tjmce."equ_id" = #{id}
+               tjmc."other_accessories"             as maintOtherAccessories,
+               tjmc."inform_start"         as informStart,
+               tjmc."inform_end"           as informEnd
+        FROM
+            "tzs_jg_maintenance_contract_eq" as tjmce
+             LEFT JOIN "tzs_jg_maintenance_contract" as tjmc ON tjmce."equip_transfer_id" = tjmc."sequence_nbr"
+        WHERE
+          tjmce."equ_id" = #{id}
           AND tjmc."status" = '已完成'
-        ORDER BY tjmce."rec_date" desc
-        LIMIT 1
+          ORDER BY tjmce."rec_date" desc
+          LIMIT 1
     </select>
 
     <select id="getMaintenanceDetailByIdx" resultType="java.util.Map">

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/JgUseRegistrationServiceImpl.java

@@ -3070,7 +3070,7 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
                 this.historyEquUpdateInstallInfo(map);
 
                 // 设备维保信息更新,只有电梯
-                if ("3000".equals(map.get("equList"))){
+                if ("3000".equals(map.get("equList")) || "3000".equals(map.get("equListCode"))){
                     this.historyEquUpdateMaintenanceInfo(map);
                 }
 
@@ -3096,7 +3096,6 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
      * 历史设备登记-》更新维保信息
      */
     private void historyEquUpdateMaintenanceInfo(JSONObject map) {
-        SimpleDateFormat format = new SimpleDateFormat();
         IdxBizJgMaintenanceRecordInfo info = new IdxBizJgMaintenanceRecordInfo();
         info.setRecord(String.valueOf(map.get("equipId")));
         String meUnitName = String.valueOf(map.get("meUnitName"));
@@ -3111,8 +3110,8 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
         info.setMeMaster1Phone(ValidationUtil.isEmpty(map.get("maintenanceManagerTwoPhone")) ? null : String.valueOf(map.get("maintenanceManagerTwoPhone")));
         info.setMeMaster1Id(ValidationUtil.isEmpty(map.get("maintenanceManagerTwoID")) ? null : String.valueOf(map.get("maintenanceManagerTwoID")));
         try {
-            info.setInformStart(ValidationUtil.isEmpty(map.get("informStart")) ? null : format.parse(String.valueOf(map.get("informStart"))));
-            info.setInformEnd(ValidationUtil.isEmpty(map.get("informEnd")) ? null : format.parse(String.valueOf(map.get("informEnd"))));
+            info.setInformStart(ValidationUtil.isEmpty(map.get("informStart")) ? null : DateUtil.parse(String.valueOf(map.get("informStart"))));
+            info.setInformEnd(ValidationUtil.isEmpty(map.get("informEnd")) ? null : DateUtil.parse(String.valueOf(map.get("informEnd"))));
         } catch (Exception exception) {
             exception.printStackTrace();
             log.info("date转化失败");