1.历史登记是维保开始结束日期未入库bug

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转化失败");