展示项和导出模板调整

jeeplus-modules/jeeplus-centrecareful/src/main/java/com/jeeplus/centrecareful/reportArchieve/service/ZsReportArchieveService.java

@@ -117,6 +117,9 @@ public class ZsReportArchieveService {
                     String placeValue = SpringUtil.getBean(IDictApi.class).getDictLabel(record.getStoragePlace(), "storage_place", "");
                     record.setStoragePlace(placeValue);
                 }
+                if (StringUtils.isNotBlank(record.getSpecialPlace())){
+                    record.setStoragePlace(record.getSpecialPlace());
+                }
 
             }
         }
@@ -426,6 +429,36 @@ public class ZsReportArchieveService {
      */
     public ZsReportArchieve findByReportNoType(String reportNoType) {
         ZsReportArchieve reportArchieve = reportArchieveMapper.findByReportNoType(reportNoType);
+
+        if (StringUtils.isNotBlank(reportArchieve.getStoragePlace())){
+            if (reportArchieve.getStoragePlace().contains(",")){
+                String[] split = reportArchieve.getStoragePlace().split(",");
+                StringBuilder vaBuilder = new StringBuilder();
+                for (String s : split) {
+                    String placeValue = SpringUtil.getBean(IDictApi.class).getDictLabel(s, "storage_place", "");
+                    if (StringUtils.isNotBlank(placeValue)) {
+                        if (vaBuilder.length() > 0) {
+                            vaBuilder.append(",");  // 用逗号分隔每个拼接的值
+                        }
+                        vaBuilder.append(placeValue);  // 拼接 label
+                    }
+                }
+                reportArchieve.setStoragePlace(vaBuilder.toString());
+            }else {
+                String placeValue = SpringUtil.getBean(IDictApi.class).getDictLabel(reportArchieve.getStoragePlace(), "storage_place", "");
+                reportArchieve.setStoragePlace(placeValue);
+            }
+
+        }
+
+        if(com.jeeplus.utils.StringUtils.isNotBlank(reportArchieve.getStoragePlace())){
+            String replace = reportArchieve.getStoragePlace().replace(",", "区");
+            String place = "江苏分所 "+replace+"区";
+            reportArchieve.setStoragePlace(place);
+        }
+        if (org.apache.commons.lang3.StringUtils.isNotBlank(reportArchieve.getSpecialPlace())){
+            reportArchieve.setStoragePlace(reportArchieve.getSpecialPlace());
+        }
         return reportArchieve;
     }