fix(jg):【现场问题】无证工业管道设备特殊登记，与历史登记的装置合并后，登记单页面未回显设备的使用信息和投用日期信息

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

@@ -51,4 +51,5 @@ public class EquipRequestParamsDto {
     private String streetName;
     private String address;
     private String usePlace;
+    private String useDate;
 }
\ 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/CommonController.java

@@ -315,8 +315,10 @@ public class CommonController extends BaseController {
     public ResponseModel<Map<String, Object>> getUserInfoSplit(@RequestParam(value = "sequenceNbr", required = false) String sequenceNbr) {
         return Optional.ofNullable(sequenceNbr)
                 .filter(s -> s.contains("_"))
-                .map(s -> ResponseHelper.buildResponse(commonService.getUserInfo(s.split("_")[0])))
-                .orElse(null);
+                .map(s -> s.split("_", 2)[0])
+                .map(commonService::getUserInfo)
+                .map(ResponseHelper::buildResponse)
+                .orElseGet(() -> ResponseHelper.buildResponse(null));
     }
 
     /**

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

@@ -1706,6 +1706,7 @@ public class DataDockServiceImpl {
         String street = String.valueOf(equipInfo.get("street"));
         String address = String.valueOf(equipInfo.get("address"));
         String usePlace = String.valueOf(equipInfo.get("usePlace"));
+        String useDate = String.valueOf(equipInfo.get("useDate"));
         return new EquipRequestParamsDto().setCompanyCode(company.getCompanyCode().split("_")[0])
                 .setProvince(province)
                 .setProvinceName("陕西省")
@@ -1727,6 +1728,7 @@ public class DataDockServiceImpl {
                 .setEquCategoryName(EquCategoryConverter.getKeyByValue(equCategoryCode))
                 .setEquDefineCode(equDefineCode).setEquDefineName(EquDefineConverter.getKeyByValue(equDefineCode))
                 .setDataSource(dataSource)
+                .setUseDate(useDate)
                 .setOrgBranchCode(orgBranchCode.split("_").length > 1 ? orgBranchCode.split("_")[0] : "")
                 .setOrgBranchName(orgBranchCode.split("_").length > 1 ? orgBranchCode.split("_")[1] : "")
                 .setUseOrgCode(useOrgCode)
@@ -1838,6 +1840,7 @@ public class DataDockServiceImpl {
             useInfo.setUseUnitCreditCode(paramsDto.getCompanyCode());
             useInfo.setUseUnitName(paramsDto.getCompanyName());
             useInfo.setProjectContraption(paramsDto.getProjectContraption());
+            useInfo.setUseDate(paramsDto.getUseDate());
             useInfo.setProjectContraptionId(paramsDto.getProjectContraptionSeq());
             BeanUtils.copyProperties(paramsDto, useInfo);
             useInfoList.add(useInfo);
@@ -2142,6 +2145,7 @@ public class DataDockServiceImpl {
                 .otherAccessories(paramsDto.getOtherAccessories())
                 .orgCode(paramsDto.getOrgBranchCode())
                 .orgName(paramsDto.getOrgBranchName())
+                .useDate(paramsDto.getUseDate())
                 .productQualificationCertificate(paramsDto.getProductQualificationCertificate())
                 .province(paramsDto.getProvince()).provinceName(paramsDto.getProvinceName()).city(paramsDto.getCity()).cityName(paramsDto.getCityName())
                 .county(paramsDto.getCounty()).countyName(paramsDto.getCountyName()).street(paramsDto.getStreet()).streetName(paramsDto.getStreetName())