修复问题

src/main/java/ieven/server/webapp/domain/model/ModelService.java

@@ -128,7 +128,7 @@ public class ModelService {
         }
 
         this.mongoTemplate.remove(new Query(Criteria.where("modelId").is(id)), TFromToFileIds.class);
-        String fileName=path+File.separator+model.getModelName()+".csv";
+        String fileName=path+File.separator+model.getModelName()+".xlsx";
         File file=new File(fileName);
         if(file.exists()){
             file.delete();

src/main/java/ieven/server/webapp/service/Ops.java

@@ -13,6 +13,7 @@ import ieven.server.webapp.domain.file.FileStatus;
 import ieven.server.webapp.domain.file.LogicalFile;
 import ieven.server.webapp.infrastructure.SpringContextUtil;
 import ieven.server.webapp.util.DataUtils;
+import ieven.server.webapp.util.excel.PublicStatic;
 import org.apache.commons.lang3.StringUtils;
 import org.bson.Document;
 import org.springframework.dao.DuplicateKeyException;
@@ -148,6 +149,9 @@ public class Ops {
             Object value = entry.getValue();
             if (!"id".equals(key) && !"_id".equals(key) && !"objectId".equals(key)) {
                 String upper = key.toUpperCase();
+                if("收款方的商户名称".equals(key)){
+                    value=PublicStatic.specialFormatStr(String.valueOf(value));
+                }
                 newData.put(upper, value);
             }
         }

src/main/java/ieven/server/webapp/service/alipay/AntiSecurityTrade3.java

@@ -156,8 +156,10 @@ public class AntiSecurityTrade3 extends Ops implements Runnable {
                 } else {
                     String newName = accountToName.getOrDefault(account, "");
                     if (StringUtils.isNotBlank(newName)) {
-                        dataMap.put("交易主体户名", newName);
-                    } /*else {
+                        dataMap.put("交易主体户名", PublicStatic.specialFormatStr(newName));
+                    }  else {
+                        dataMap.put("交易主体户名", PublicStatic.specialFormatStr(String.valueOf(dataMapUser.get(account))));
+                    }/*else {
                         //财付通-注册信息
                         List<DataMap> dataMaps = dataMapList.get(account);
                         if(CollectionUtils.isEmpty(dataMaps)){
@@ -175,6 +177,8 @@ public class AntiSecurityTrade3 extends Ops implements Runnable {
                         }
                     }*/
                 }
+            }else {
+                dataMap.put("交易主体户名", PublicStatic.specialFormatStr(String.valueOf(dataMap.get("交易主体户名"))));
             }
 
             String value = String.valueOf(dataMap.get("交易对手户名"));

src/main/java/ieven/server/webapp/service/alipay/EndAnalysis.java

@@ -140,7 +140,7 @@ public class EndAnalysis extends Ops implements Runnable {
                         } else {
                             Set<String> mainIds = new HashSet<>();
                             mainIds.add(mainIdhm);
-                            hm.put(alipayId, mainIds);
+                            hm.put(mainId, mainIds);
                         }
                     }
                     if (idToMainIds.containsKey(alipayId)) {

src/main/java/ieven/server/webapp/service/datastatic/DataStaticAnalysisDs.java

@@ -167,11 +167,13 @@ public class DataStaticAnalysisDs extends Ops implements Runnable {
                         Set<String>jyzthm = new HashSet<>();
                         for (String mainId : mainIds) {
                             Set<String> strings = hm.get(mainId);
-                            jyzthm.addAll(strings);
+                            if(CollectionUtils.isNotEmpty(strings)){
+                                jyzthm.addAll(strings);
+                            }
                             str+=CollectionUtils.isEmpty(strings)?mainId+";":mainId+"("+StringUtils.join(strings, ",")+");";
                         }
                         value.put("共同交易主体账号汇总", str);
-                        value.put("共同交易主体户名汇总", jyzthm.size());
+                        value.put("共同交易主体户名汇总", Math.min(mainIds.size(),jyzthm.size()));
                     }
                     DataMap dataMap = entry.getValue();
                     BigDecimal money1 = (BigDecimal) dataMap.get("交易总额");
@@ -303,11 +305,13 @@ public class DataStaticAnalysisDs extends Ops implements Runnable {
                         Set<String>jyzthm = new HashSet<>();
                         for (String mainId : mainIds) {
                             Set<String> strings = hm.get(mainId);
-                            jyzthm.addAll(strings);
+                            if(CollectionUtils.isNotEmpty(strings)){
+                                jyzthm.addAll(strings);
+                            }
                             str+=CollectionUtils.isEmpty(strings)?mainId+";":mainId+"("+StringUtils.join(strings, ",")+");";
                         }
                         value.put("共同交易主体账号汇总", str);
-                        value.put("共同交易主体户名汇总", jyzthm.size());
+                        value.put("共同交易主体户名汇总", Math.min(mainIds.size(),jyzthm.size()));
                     }
                     DataMap dataMap = entry.getValue();
                     BigDecimal money1 = (BigDecimal) dataMap.get("交易总额");
@@ -435,13 +439,16 @@ public class DataStaticAnalysisDs extends Ops implements Runnable {
                         value.put("共同交易主体数", mainIds.size());
                         String str="";
                         Set<String>jyzthm = new HashSet<>();
+                        int count=0;
                         for (String mainId : mainIds) {
                             Set<String> strings = hm.get(mainId);
-                            jyzthm.addAll(strings);
+                            if(CollectionUtils.isNotEmpty(strings)){
+                                count++;
+                            }
                             str+=CollectionUtils.isEmpty(strings)?mainId+";":mainId+"("+StringUtils.join(strings, ",")+");";
                         }
                         value.put("共同交易主体账号汇总", str);
-                        value.put("共同交易主体户名汇总", jyzthm.size());
+                        value.put("共同交易主体户名汇总", Math.min(mainIds.size(),count));
                     }
 
                     DataMap dataMap = entry.getValue();

src/main/java/ieven/server/webapp/service/datastatic/DataStaticService.java

@@ -119,13 +119,19 @@ public class DataStaticService extends Ops {
                 String jyzthm = String.valueOf(dataMap.get("交易主体户名"));
                 if (!PublicStatic.checkStr(jyzthm)) {
                     String[] split = jyzthm.split(";");
-                    for (String s : split) {
+                    for (int i = 0; i < split.length; i++) {
+                        String s=split[i];
                         List<DataMap> dataMaps = personzhmcMap.get(s);
                         if (CollectionUtils.isEmpty(dataMaps)) {
+                            DataMap datamapnew =new DataMap();
                             dataMaps = new ArrayList<>();
+                            datamapnew.putAll(dataMap);
+                            String id = String.valueOf(dataMap.get("_id"))+i;
+                            datamapnew.put("_id",id);
+                            datamapnew.put("交易主体户名",s);
+                            dataMaps.add(datamapnew);
+                            personzhmcMap.put(s, dataMaps);
                         }
-                        dataMaps.add(dataMap);
-                        personzhmcMap.put(s, dataMaps);
                     }
                 }
             }
@@ -179,27 +185,31 @@ public class DataStaticService extends Ops {
         if (null != staticModelInput.getStartNum() || null != staticModelInput.getEndNum()) {
             Query queryDs = new Query();
             if (null != staticModelInput.getStartNum()) {
-                query.addCriteria(Criteria.where("共同交易主体户名汇总").gte(staticModelInput.getStartNum()));
+                queryDs.addCriteria(Criteria.where("共同交易主体户名汇总").gte(staticModelInput.getStartNum()));
             } else if (null != staticModelInput.getEndNum()) {
-                query.addCriteria(Criteria.where("共同交易主体户名汇总").lte(staticModelInput.getStartNum()));
+                queryDs.addCriteria(Criteria.where("共同交易主体户名汇总").lte(staticModelInput.getStartNum()));
             } else if (null != staticModelInput.getStartNum() && null != staticModelInput.getEndNum()) {
-                query.addCriteria(Criteria.where("共同交易主体户名汇总").gte(staticModelInput.getStartNum()).lte(staticModelInput.getStartNum()));
+                queryDs.addCriteria(Criteria.where("共同交易主体户名汇总").gte(staticModelInput.getStartNum()).lte(staticModelInput.getStartNum()));
             }
-            query.addCriteria(Criteria.where("fileId").is(dateFileIdDs));
+            queryDs.addCriteria(Criteria.where("fileId").is(dateFileIdDs));
             List<DataMap> dataDsList = this.mongoTemplate.find(queryDs, DataMap.class);
             if(CollectionUtils.isNotEmpty(dataDsList)){
                 for (DataMap dataMap : dataDsList) {
                     String jydszh = String.valueOf(dataMap.get("交易对手账号"));
                     if(!PublicStatic.checkStr(jydszh)){
+                        if(CollectionUtils.isEmpty(strings1)){
+                            strings1=new ArrayList<>();
+                        }
                         strings1.add(jydszh);
                     }
                 }
-
             }
         }
 
         if (CollectionUtils.isNotEmpty(strings1)) {
             query.addCriteria(Criteria.where("交易对手账号").in(Objects.requireNonNull(strings1)));
+        }else {
+            return Mapped.ERROR("当前无数据");
         }
 
         Map<String, Object> dataMap = new HashMap<>();
@@ -378,6 +388,17 @@ public class DataStaticService extends Ops {
 
         }
 
+      /*  Map<String,String>aa=new HashMap<>();
+        List<Map<String, Object>> partyDataListnew = new ArrayList<>();
+        for (Map<String, Object> stringObjectMap : partyDataList) {
+            String id =String.valueOf(stringObjectMap.get("id"));
+            String name =String.valueOf(stringObjectMap.get("name"));
+            if(aa.containsKey(id+name)){
+                continue;
+            }
+            aa.put(id+name,id+name);
+            partyDataListnew.add(stringObjectMap);
+        }*/
         dataMap.put("partyData", partyDataList);
         dataMap.put("relationshipGraph", relationshipGraphListnew);
         Mapped mapped = Mapped.OK();