Merge remote-tracking branch 'origin/develop_tzs_register_to_0715' into…

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

@@ -1624,6 +1624,9 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
             jsonObject.put("applyNo", jgUseRegistration.getApplyNo());
             jsonObject.remove("submit");
             jsonObject.remove("instanceId");
+            if (!ObjectUtils.isEmpty(jsonObject.get("factoryUseSiteStreet"))) {
+                jsonObject.put("factoryUseSiteStreet", String.valueOf(Long.valueOf(jsonObject.get("factoryUseSiteStreet").toString())));
+            }
             if (!"unit".equals(jgUseRegistration.getManageType())) {
                 // 作废时（完成时）equipId 为空
                 record = setDefaultRecord(jgUseRegistration, record);
@@ -1676,6 +1679,9 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
             detail.putAll(inspectDetail);
         }
         if (!ObjectUtils.isEmpty(useDetail)) {
+            if (!ObjectUtils.isEmpty(useDetail.get("factoryUseSiteStreet"))) {
+                useDetail.put("factoryUseSiteStreet", String.valueOf(Long.valueOf(useDetail.get("factoryUseSiteStreet").toString())));
+            }
             detail.putAll(useDetail);
         }
         if (!ObjectUtils.isEmpty(desDetail)) {