Merge branch 'develop_tzs_register' of…

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/java/com/yeejoin/amos/boot/module/jg/api/dto/EquipRequestParamsDto.java

@@ -52,4 +52,6 @@ public class EquipRequestParamsDto {
     private String address;
     private String usePlace;
     private String useDate;
+    private String startLatitudeLongitude;
+    private String endLatitudeLongitude;
 }
\ No newline at end of file

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/controller/JgChangeRegistrationUnitController.java

@@ -193,7 +193,10 @@ public class JgChangeRegistrationUnitController extends BaseController {
         LinkedHashMap model1 = (LinkedHashMap) model.get("changeRegisInfo");
         String opinion = (String) model.get("opinion");
         LinkedHashMap installationInfo = (LinkedHashMap) model1.get("changeRegisInfo");
-        installationInfo.put("registrationList", model.get("newCarNumberList"));
+        List<String> newCarNumberList = (List<String>) model.get("newCarNumberList");
+        if (newCarNumberList != null && !newCarNumberList.isEmpty()) {
+            installationInfo.put("registrationList", newCarNumberList);
+        }
         JgChangeRegistrationUnitDto changeRegistrationUnitDto = JSON.parseObject(JSON.toJSONString(installationInfo), JgChangeRegistrationUnitDto.class);
         changeRegistrationUnitDto.setProcessAdvice(opinion);
         ReginParams reginParams = getSelectedOrgInfo();

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

@@ -1751,6 +1751,8 @@ public class DataDockServiceImpl {
                 .setPipelineLength(equLists.stream().mapToDouble(item -> Double.parseDouble(item.getPipeLength())).sum())
                 .setInspectUnitCreditCode(inspectUnitCreditCode)
                 .setInspectUnitName(inspectUnitName)
+                .setStartLatitudeLongitude(toJSONString(equipInfo.get("startLatitudeLongitude")))
+                .setEndLatitudeLongitude(toJSONString(equipInfo.get("endLatitudeLongitude")))
                 .setEquCode(installationNoticeService.generateEquCode(equListCode, equCategoryCode, equDefineCode, new Date(), receiveOrgCode));
     }
 
@@ -2150,6 +2152,8 @@ public class DataDockServiceImpl {
                 .province(paramsDto.getProvince()).provinceName(paramsDto.getProvinceName()).city(paramsDto.getCity()).cityName(paramsDto.getCityName())
                 .county(paramsDto.getCounty()).countyName(paramsDto.getCountyName()).street(paramsDto.getStreet()).streetName(paramsDto.getStreetName())
                 .address(paramsDto.getAddress())
+                .startLatitudeLongitude(paramsDto.getStartLatitudeLongitude())
+                .endLatitudeLongitude(paramsDto.getEndLatitudeLongitude())
                 .supervisoryCode(idxBizJgRegisterInfoServiceImpl.getSupervisoryCode(paramsDto.getVehicleApanage(), paramsDto.getEquCategoryCode())).isIntoManagement(Boolean.TRUE).dataSource(paramsDto.getDataSource()).equCode(paramsDto.getEquCode()).isFirstMerge(Boolean.FALSE).build();
         contraption.setSequenceNbr(seq);
         paramsDto.setProjectContraptionSeq(String.valueOf(seq));

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

@@ -1143,7 +1143,7 @@ public class JgChangeRegistrationUnitServiceImpl extends BaseService<JgChangeReg
             dto.getRegistrationList().forEach(v -> {
                 String newCarNumber = String.valueOf(v.get("newCarNumber"));
                 String useOrgCode = String.valueOf(v.get("useRegistrationCode"));
-                if (!ObjectUtils.isEmpty(newCarNumber)) {
+                if (!ObjectUtils.isEmpty(newCarNumber) && "0".equals(op)) {
                     // 更新安全追溯-场内车辆中的“车牌号字段” 保证唯一性
                     Integer count = idxBizJgRegisterInfoMapper.checkCarNumberUniqueness(newCarNumber, useOrgCode);
                     if (count > 0) {