Merge branch 'lj-project' of git.yfzx.zjtys.com.cn:912-system/monitor/inspect into lj-project

src/main/java/com/zjty/inspect/service/impl/DocumentServiceImpl.java

@@ -42,9 +42,7 @@ public class DocumentServiceImpl implements DocumentService {
                     String name = titleHead.getName();
                     if (!StringUtils.isEmpty(name)) {
                         //标题级别
-                        int parentId = titleHead.getParentId();
-                        String s = titleContent.replaceAll("#title#", name)
-                                .replaceAll("#parentId#", String.valueOf(parentId));
+                        String s = titleContent.replaceAll("#title#", name);
                         sb.append(s);
                     }
                     List<DocumentContent> documentContents = titleHead.getDocumentContents();

src/main/java/com/zjty/inspect/utils/WpsUtil.java

@@ -6,10 +6,7 @@ import com.zjty.inspect.enums.*;
 
 import java.text.DateFormat;
 import java.text.SimpleDateFormat;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 
 /**
  * @author Mcj
@@ -19,6 +16,7 @@ import java.util.Map;
 public class WpsUtil {
 
     public static Map<String,String> createWps(Evaluation evaluation) {
+        HashMap<String,List<TechnologyContent>> teMap=new HashMap<>();
         Reform reform = JSON.parseObject(evaluation.getInEva(), Reform.class);
         AssessmentReport assessmentReport = JSON.parseObject(evaluation.getOutEva(), AssessmentReport.class);
         HashMap<String, String> keyValue = new HashMap<>();
@@ -139,6 +137,7 @@ public class WpsUtil {
         SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
         String format = simpleDateFormat.format(assessmentReport.getTime());
         keyValue.put("inspectTime", format);
+        keyValue.put("createTime", System.currentTimeMillis()+"");
         keyValue.put("difficulty",String.valueOf(assessmentReport.getDifficulty()));
         keyValue.put("budget",assessmentReport.getBudget());
 
@@ -166,6 +165,32 @@ public class WpsUtil {
                 keyValue.put("technologyContentStrategy"+i+1+"-"+i1+1, getMode(technologyContent.getStrategy()));
             }
         }
+        for (TechnologyReport technologyReport : technologyReports) {
+           teMap.put(technologyReport.getTechnology(),technologyReport.getTechnologyContents());
+        }
+        Set<String> strings = teMap.keySet();
+
+        StringBuilder youhua=new StringBuilder();
+        StringBuilder xiugai=new StringBuilder();
+        StringBuilder weizhi=new StringBuilder();
+        for (String string : strings) {
+            if(string.contains("优化")){
+                List<TechnologyContent> technologyContents = teMap.get(string);
+                String str = DocumentWordUtil.getTableString(technologyContents, string, "优化");
+                youhua.append(str);
+            }else if(string.contains("不支持")){
+                List<TechnologyContent> technologyContents = teMap.get(string);
+                String str = DocumentWordUtil.getTableString(technologyContents, string, "重新开发");
+                xiugai.append(str);
+            }else if(string.contains("未知")){
+                List<TechnologyContent> technologyContents = teMap.get(string);
+                String str = DocumentWordUtil.getTableString(technologyContents, string, "验证修改或重新开发");
+                weizhi.append(str);
+            }
+        }
+        keyValue.put("teyouhua",youhua.toString());
+        keyValue.put("texiugai",xiugai.toString());
+        keyValue.put("teweizhi",weizhi.toString());
         Workload workload = assessmentReport.getWorkload();
         keyValue.put("workloadDes",workload.getDes());
         keyValue.put("workloadCost",String.valueOf(workload.getCost()));
@@ -244,11 +269,11 @@ public class WpsUtil {
     }
 
     public static DocumentContent setDocumentTable(List<String> data,int col){
-        String tableString = DocumentWordUtil.getTableString(data, col);
-        DocumentContent documentContent = new DocumentContent();
-        //设置进head标题下面的表格中
-        documentContent.setDocumentTable(tableString);
-        return documentContent;
+//        String tableString = DocumentWordUtil.getTableString(data, col);
+//        DocumentContent documentContent = new DocumentContent();
+//        设置进head标题下面的表格中
+//        documentContent.setDocumentTable(tableString);
+        return null;
     }
     public static List<DocumentContent> setDocumentContents(DocumentContent documentContent){
         ArrayList<DocumentContent> documentContents = new ArrayList<>();