bug统一修改

src/main/java/com/lyy/admin/VO/DevelopmentInfoAllVO.java

@@ -19,7 +19,8 @@ public class DevelopmentInfoAllVO {
 //    private List<DevelopmentTrafficInfo> developmentTrafficInfoList = new ArrayList<>();
     private JSONArray developmentTrafficInfoList = new JSONArray();
     private JSONArray developmentPrimaryEnterpriseInfoList = new JSONArray();
-    private List<DevelopmentIndustryPolicyInfo> developmentIndustryPolicyInfoList = new ArrayList<>();
+//    private List<DevelopmentIndustryPolicyInfo> developmentIndustryPolicyInfoList = new ArrayList<>();
+    private JSONArray developmentIndustryPolicyInfoList = new JSONArray();
     private List<DevelopmentIndustryFundInfo> developmentIndustryFundInfoList = new ArrayList<>();
     private List<DevelopmentIndustrialLandInfo> developmentIndustrialLandInfoList = new ArrayList<>();
     private List<DevelopmentInvestmentDirectionInfo> developmentInvestmentDirectionInfoList = new ArrayList<>();

src/main/java/com/lyy/admin/service/developmentinfo/impl/DevelopmentInfoServiceImpl.java

@@ -196,6 +196,14 @@ public class DevelopmentInfoServiceImpl extends ServiceImpl<DevelopmentInfoMappe
             QueryWrapper<DevelopmentIndustryPolicyInfo> developmentIndustryPolicyInfoQW = new QueryWrapper<>();
             developmentIndustryPolicyInfoQW.eq("development_id", id);
             List<DevelopmentIndustryPolicyInfo> developmentIndustryPolicyInfoList = developmentIndustryPolicyInfoService.list(developmentIndustryPolicyInfoQW);
+            Map<String, List<DevelopmentIndustryPolicyInfo>> developmentIndustryPolicyInfoListVOs= developmentIndustryPolicyInfoList.stream().collect(Collectors.groupingBy(DevelopmentIndustryPolicyInfo::getType));
+            JSONArray developmentIndustryPolicyInfoJsonArray = new JSONArray();
+            for(Map.Entry<String, List<DevelopmentIndustryPolicyInfo>>  entry: developmentIndustryPolicyInfoListVOs.entrySet()){
+                JSONObject jsonObject = new JSONObject();
+                jsonObject.putOpt("typeName",entry.getKey());
+                jsonObject.putOpt("info",entry.getValue());
+                developmentIndustryPolicyInfoJsonArray.add(jsonObject);
+            }
 
             //招商方向
             QueryWrapper<DevelopmentInvestmentDirectionInfo> developmentInvestmentDirectionInfoQW = new QueryWrapper<>();
@@ -228,7 +236,7 @@ public class DevelopmentInfoServiceImpl extends ServiceImpl<DevelopmentInfoMappe
             developmentInfoAllVO.setDevelopmentInfoVO(developmentInfoVO);
             developmentInfoAllVO.setDevelopmentTrafficInfoList(developmentTrafficInfoJsonArray);
             developmentInfoAllVO.setDevelopmentPrimaryEnterpriseInfoList(developmentPrimaryEnterpriseInfoJsonArray);
-            developmentInfoAllVO.setDevelopmentIndustryPolicyInfoList(developmentIndustryPolicyInfoList);
+            developmentInfoAllVO.setDevelopmentIndustryPolicyInfoList(developmentIndustryPolicyInfoJsonArray);
             developmentInfoAllVO.setDevelopmentIndustryFundInfoList(developmentIndustryFundInfoList);
             developmentInfoAllVO.setDevelopmentIndustrialLandInfoList(developmentIndustrialLandInfoList);
             developmentInfoAllVO.setDevelopmentInvestmentDirectionInfoList(developmentInvestmentDirectionInfoList);