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

@@ -29,7 +29,6 @@ public class EquipRequestParamsDto {
     private String orgBranchName;
     private String useOrgCode;
     private String vehicleApanage;
-    private String orgCompanyCode;
     private String receiveOrgCode;
     private String receiveOrgName;
     private String projectContraptionSeq;

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

@@ -1573,9 +1573,6 @@ 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 orgCompanyCode = receiveOrgCode.split("_")[0];
-        CompanyModel parentModel = JSON.parseObject(JSON.toJSONString(orgCompanyCode), CompanyModel.class);
-        orgBranchCode = parentModel.getOrgCode();
         return new EquipRequestParamsDto().setCompanyCode(company.getCompanyCode().split("_")[0])
                 .setProvince(province)
                 .setProvinceName("陕西省")
@@ -1601,8 +1598,7 @@ public class DataDockServiceImpl {
                 .setOrgBranchName(orgBranchCode.split("_").length > 1 ? orgBranchCode.split("_")[1] : "")
                 .setUseOrgCode(useOrgCode)
                 .setVehicleApanage(String.valueOf(equipInfo.get("VEHICLE_APANAGE")))
-                .setOrgCompanyCode(orgCompanyCode)
-                .setReceiveOrgCode(parentModel.getOrgCode())
+                .setReceiveOrgCode(receiveOrgCode.split("_")[0])
                 .setReceiveOrgName(receiveOrgCode.split("_")[1])
                 .setProjectContraption(String.valueOf(equipInfo.get("PROJECT_CONTRAPTION")))
                 .setProjectContraptionNo(String.valueOf(equipInfo.get("PROJECT_CONTRAPTION_NO")))
@@ -1956,7 +1952,7 @@ public class DataDockServiceImpl {
                 .receiveOrgName(paramsDto.getReceiveOrgName())
                 .auditPassDate(new Date())
                 .useRegistrationCode(paramsDto.getUseOrgCode())
-                .certificateNo(commonService.generateCertificateNo(equType, new Date(), paramsDto.getOrgCompanyCode()))
+                .certificateNo(commonService.generateCertificateNo(equType, new Date(), paramsDto.getReceiveOrgCode()))
                 .regType(BusinessTypeEnum.JG_HISTORY_USAGE_REGISTRATION.getName())
                 .certificateStatus("已登记")
                 .regDate(new Date())
@@ -1995,8 +1991,8 @@ public class DataDockServiceImpl {
                 .productPhoto(paramsDto.getProductPhoto())
                 .useRegistrationCode(paramsDto.getUseOrgCode())
                 .otherAccessories(paramsDto.getOtherAccessories())
-                .orgCode(paramsDto.getReceiveOrgCode())
-                .orgName(paramsDto.getReceiveOrgName())
+                .orgCode(paramsDto.getOrgBranchCode())
+                .orgName(paramsDto.getOrgBranchName())
                 .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())