fix(jg):使用登记表

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

@@ -1338,9 +1338,14 @@ public class CommonServiceImpl implements ICommonService {
             case "vehicle":
                 return jgVehicleInformationService.saveOrUpdateHisData(jsonObject);
             case "set_sp"://特殊历史登记
+                Map<String, Object> useRegFormUploadObj = (Map<String, Object>) map.get(useRegFormUpload);
                 jsonObject.put("regType", "2");
                 jsonObject.put("businessCode", "DJ_SY");
-                jsonObject.put("submit", Boolean.TRUE);
+                String uploadMode = String.valueOf(useRegFormUploadObj.get("uploadMode"));
+                if (Integer.toString(1).equals(uploadMode)) {
+                    jsonObject.put("submit", Boolean.TRUE);
+                }
+                jsonObject.putAll(useRegFormUploadObj);
                 return jgUseRegistrationServiceImpl.handleUseRegistration(jsonObject);
             default:
                 return jgUseRegistrationServiceImpl.handleHistoryEquip(jsonObject);

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

@@ -612,9 +612,9 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
             Optional.ofNullable(map.get("useRegistrationFormFile"))
                     .map(JSONObject::toJSONString)
                     .ifPresent(jgUseRegistration::setUseRegistrationFormFile);
-            Optional.ofNullable(map.get("useRegistrationFormUrl"))
-                    .map(String::valueOf)
-                    .ifPresent(jgUseRegistration::setUseRegistrationFormUrl);
+            Map<String, Object> useRegistrationFormUrlMap = commonService.getRegistrationFormUrl("set", map);
+            Optional.ofNullable(useRegistrationFormUrlMap)
+                    .ifPresent(item -> jgUseRegistration.setUseRegistrationFormUrl(String.valueOf(item.get("useRegistrationFormUrl"))));
             if (map.containsKey("type") && "edit".equals(String.valueOf(map.get("type")))) {
                 jgUseRegistration.setUseUnitCreditCode(null);
                 jgUseRegistration.setSequenceNbr(Long.valueOf(String.valueOf(map.get("sequenceNbr"))));
@@ -893,9 +893,9 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
             Optional.ofNullable(map.get("useRegistrationFormFile"))
                     .map(JSONObject::toJSONString)
                     .ifPresent(useRegistration::setUseRegistrationFormFile);
-            Optional.ofNullable(map.get("useRegistrationFormUrl"))
-                    .map(String::valueOf)
-                    .ifPresent(useRegistration::setUseRegistrationFormUrl);
+            Map<String, Object> useRegistrationFormUrlMap = commonService.getRegistrationFormUrl("unit", map);
+            Optional.ofNullable(useRegistrationFormUrlMap)
+                    .ifPresent(item -> useRegistration.setUseRegistrationFormUrl(String.valueOf(item.get("useRegistrationFormUrl"))));
             // 新增或编辑保存
             if (StringUtils.isEmpty(useRegistration.getSequenceNbr())) {
                 ResponseModel<List<String>> listResponseModel = tzsServiceFeignClient.applicationFormCode(ApplicationFormTypeEnum.getCode.get(String.valueOf(map.get("businessCode"))), 1);