Merge remote-tracking branch 'origin/develop_tzs_register' into develop_tzs_register

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

@@ -861,8 +861,10 @@ public class IdxBizJgRegisterInfoServiceImpl extends BaseService<IdxBizJgRegiste
             } catch (IllegalAccessException e) {
                 throw new RuntimeException(e);
             }
+            if(!ValidationUtil.isEmpty(value)){
                 result.put(underscoreFieldName.toUpperCase(), value);
             }
+        }
         return result;
     }
 }
\ No newline at end of file

amos-boot-system-tzs/amos-boot-module-jyjc/amos-boot-module-jyjc-api/src/main/java/com/yeejoin/amos/boot/module/jyjc/api/model/JyjcInspectionResultModel.java

@@ -149,4 +149,7 @@ public class JyjcInspectionResultModel extends BaseModel {
 
     @ApiModelProperty(value = "报检单位")
     private String applicationUnitName;
+
+    @ApiModelProperty(value = "监管码")
+    private String supervisoryCode;
 }

amos-boot-system-tzs/amos-boot-module-jyjc/amos-boot-module-jyjc-api/src/main/resources/mapper/JyjcInspectionResultMapper.xml

@@ -10,10 +10,10 @@
         res.inspection_end_date, res.inspection_result_summary, res.non_conformance, res.rectification, res.remark,
         res.rec_user_id, res.rec_date, res.biz_type,res.equ_category, res.inspection_type, res.inspection_type_name,
         res.application_date,use_unit_name, use_unit_credit_code, province_name, city_name, county_name, street_name, equ_code, use_inner_code, ibjri.equ_list,
-         tec1.name equ_list_name, ibjri.equ_category
+         tec1.name equ_list_name, ibjri.equ_category , ibjoi.SUPERVISORY_CODE supervisoryCode
         , use_org_code, res.equ_define, ibjui.ADDRESS equUseAddress, bei.use_unit inspectionUnitName, bei1.use_unit applicationUnitName, cdb.name inspectionTypeName
         from tz_jyjc_inspection_result res
---         left join idx_biz_jg_other_info ibjoi on res.equip_unicode = ibjoi.supervisory_code
+        left join idx_biz_jg_other_info ibjoi on res.equip_unicode = ibjoi.record
         left join idx_biz_jg_use_info ibjui on ibjui.record = res.equip_unicode
         left join idx_biz_jg_register_info ibjri on ibjui.record = ibjri.record
         left join tz_equipment_category tec on ibjri.equ_category = tec.code