Merge branch 'develop_tzs_register' of…

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

@@ -127,8 +127,9 @@
                      jci.USC_UNIT_NAME                                                      as uscUnitName,
                      jci.USC_UNIT_CREDIT_CODE                                               as uscUnitCreditCode,
                      jri.OTHER_ACCESSORIES_REG                                              as otherAccessoriesReg,
-                     jfi.OTHER_ACCESSORIES_FACT                                             as otherAccessoriesFact
-
+                     jfi.OTHER_ACCESSORIES_FACT                                             as otherAccessoriesFact,
+                     jfi.FACT_SUPERVISION_INSPECTION_REPORT                                 as factSupervisionInspectionReport,
+                     jfi.BOILER_ENERGY_EFFICIENCY_CERTIFICATE                               as boilerEnergyEfficiencyCertificate
               from idx_biz_jg_register_info jri
                        LEFT JOIN idx_biz_jg_factory_info jfi on jri.RECORD = jfi.RECORD
                        LEFT JOIN idx_biz_jg_construction_info jci on jri.RECORD = jci.RECORD

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

@@ -97,7 +97,7 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
             "inspectReport", "designStandard", "designDoc", "longitudeLatitude", "otherAccessoriesDes", "otherAccessoriesFact",
             "otherAccessoriesReg", "installProxyStatementAttachment", "installContractAttachment", "insOtherAccessories",
             "maintenanceContract", "maintOtherAccessories", "installProxyStatementAttachment", "installContractAttachment",
-            "insOtherAccessories", "maintenanceContract"};
+            "insOtherAccessories", "maintenanceContract","factSupervisionInspectionReport","boilerEnergyEfficiencyCertificate"};
     @Autowired
     private IdxBizJgUseInfoMapper useInfoMapper;
     @Autowired