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

@@ -117,7 +117,10 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
 
     private static final String DEFINITION_KEY = "useRegistration";
     private final List<String> NOT_FLOWING_STATE = Arrays.asList("使用单位待提交", "一级受理已驳回", "使用单位已撤回", "已作废");
-
+    private static final String CITY = "CITY";
+    private static final String COUNTY = "COUNTY";
+    private static final String REGION = "REGION";
+    private static final String STREET = "STREET";
     private ApplicationContext applicationContext;
     @Autowired
     RedisUtils redisUtils;
@@ -1080,10 +1083,38 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
             jgUseRegistration.setProjectContraption(jgProjectContraption.getProjectContraption());
             jgProjectContraption.setUseRegistrationCode(jgUseRegistration.getUseRegistrationCode());
             jgProjectContraption.setUseDate(String.valueOf(mapData.get("useDate")));
+            jgProjectContraption.setCity(String.valueOf(mapData.get("city")));
+            jgProjectContraption.setCounty(String.valueOf(mapData.get("county")));
+            jgProjectContraption.setStreet(String.valueOf(mapData.get("factoryUseSiteStreet")));
+            jgProjectContraption.setAddress(String.valueOf(mapData.get("address")));
+            jgProjectContraption.setCityName(getRegionName(CITY, CITY.toLowerCase(), mapData));
+            jgProjectContraption.setCountyName(getRegionName(REGION, COUNTY.toLowerCase(), mapData));
+            jgProjectContraption.setStreetName(getRegionName(STREET, "factoryUseSiteStreet", mapData));
+            if (!StringUtils.isEmpty(mapData.get("orgBranchCode"))) {
+                jgProjectContraption.setOrgName(String.valueOf(mapData.getString("orgBranchCode")).split("_")[1]);
+                jgProjectContraption.setOrgCode(String.valueOf(mapData.getString("orgBranchCode")).split("_")[0]);
+            }
             jgProjectContraptionService.updateById(jgProjectContraption);
         }
     }
 
+    /**
+     * 根据code获取市区县名字
+     * @param key key
+     * @param codeKey codeKey
+     * @param mapData 表单信息
+     * @return name
+     */
+    private String getRegionName(String key, String codeKey, JSONObject mapData) {
+        return Optional.ofNullable((List<LinkedHashMap>) redisUtils.get(key))
+                .flatMap(list -> list.stream()
+                        .filter(item -> String.valueOf(item.get("regionCode"))
+                                .equals(String.valueOf(mapData.get(codeKey))))
+                        .map(item -> (String) item.get("regionName"))
+                        .findFirst())
+                .orElse("");
+    }
+
     private String getInspectConclusionName(JSONObject mapData) {
         if( !ObjectUtils.isEmpty(mapData.get("inspectConclusion"))) {
             String code = mapData.get("inspectConclusion").toString();