试车检查内容表头上层级目录显示提交一版

business-common/src/main/java/com/rongwei/bscommon/sys/dao/ZhcxCommissionCheckDetailDao.java

@@ -27,7 +27,6 @@ public interface ZhcxCommissionCheckDetailDao extends BaseMapper<ZhcxCommissionC
             "WHERE\n" +
             "DELETED = 0\n" +
             "AND PID = #{checkId}\n" +
-            "AND ONELEVELCLASSIFICATION is not null\n" +
             "ORDER BY SORT ASC")
     List<ZhcxCommissionCheckDetailDo> listData(Map<String, Object> map);
 

business-common/src/main/java/com/rongwei/bscommon/sys/service/ZhcxCommissionCheckService.java

@@ -36,4 +36,12 @@ public interface ZhcxCommissionCheckService extends IService<ZhcxCommissionCheck
      * @return
      */
     int wordExport(Map<String, Object> map, HttpServletResponse response);
+
+    /**
+     * 试车报告导出
+     * @param map
+     * @param response
+     * @return
+     */
+    int exportFile(Map<String, Object> map, HttpServletResponse response) throws Exception;
 }

business-common/src/main/java/com/rongwei/bscommon/sys/service/impl/commission/CustHandleMergeField4Heading.java

@@ -1,27 +1,46 @@
 package com.rongwei.bscommon.sys.service.impl.commission;
 
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
 import com.aspose.words.*;
 import com.rongwei.rwcommon.utils.StringUtils;
 import com.rongwei.rwcommoncomponent.excel.aspose.field.HandleMergeField4Heading;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Component;
 
+import java.util.List;
+
 @Slf4j
 @Component
 public class CustHandleMergeField4Heading extends HandleMergeField4Heading {
     @Override
     public void handle(FieldMergingArgs args) {
-        super.handle(args);
-
         final Object fieldValue = args.getFieldValue();
-
-        try {
-            DocumentBuilder builder = new DocumentBuilder(args.getDocument());
-            builder.insertHtml("<h1 style='text-align:left;font-family:Simsun;'>一级标题</h1>");
-            builder.insertHtml("<h2 style='text-align:left;font-family:Simsun;'>二级标题</h2>");
-            builder.insertHtml("<h3 style='text-align:left;font-family:Simsun;'>三级标题</h3>");
-            builder.insertHtml("<h4 style='text-align:left;font-family:Simsun;'>四级标题</h4>");
-        } catch (Exception e) {
+        String jsonString = String.valueOf(fieldValue);
+        if (StringUtils.isNotBlank(jsonString)){
+            List<JSONObject> objectList = JSONArray.parseArray(jsonString, JSONObject.class);
+            try {
+                for (JSONObject o:objectList){
+                    DocumentBuilder builder = new DocumentBuilder(args.getDocument());
+                    builder.moveToMergeField(args.getDocumentFieldName());
+                    if ("1".equals(o.getString("level"))){
+                        builder.insertHtml("<h1 style='text-align:left;font-family:Simsun;'>"+ o.getString("value") +"</h1>");
+                    }
+                    if ("2".equals(o.getString("level"))){
+                        builder.insertHtml("<h2 style='text-align:left;font-family:Simsun;'>"+ o.getString("value") +"</h2>");
+                    }
+                    if ("3".equals(o.getString("level"))){
+                        builder.insertHtml("<h3 style='text-align:left;font-family:Simsun;'>"+ o.getString("value") +"</h3>");
+                    }
+                    if ("4".equals(o.getString("level"))){
+                        builder.insertHtml("<h4 style='text-align:left;font-family:Simsun;'>"+ o.getString("value") +"</h4>");
+                    }
+//                    args.setText(StringUtils.EMPTY);
+                }
+            } catch (Exception e) {
+                log.error("输出目录异常"+e);
+            }
         }
     }
 }

business-entity/src/main/java/com/rongwei/bsentity/vo/ZhcxCommissionCheckDetailWordVO.java

@@ -1,8 +1,10 @@
 package com.rongwei.bsentity.vo;
 
+import com.rongwei.bsentity.domain.ZhcxCommissionCheckDetailDo;
 import lombok.Data;
 
 import java.math.BigDecimal;
+import java.util.List;
 
 /**
  * <p>
@@ -26,6 +28,12 @@ public class ZhcxCommissionCheckDetailWordVO{
      */
     private String content;
 
+    /**
+     * 测试标题中文
+     * 测试标题英文
+     */
+    private String titleContent;
+
     /**
      * 测试结果
      * 试车结果
@@ -36,4 +44,7 @@ public class ZhcxCommissionCheckDetailWordVO{
      * 试车问题
      */
     private String testnotes;
+
+    //子表数据
+    private List<ZhcxCommissionCheckDetailDo> detailList;
 }

business-server/src/main/java/com/rongwei/bsserver/controller/ZhcxCommissionCheckController.java

@@ -64,8 +64,8 @@ public class ZhcxCommissionCheckController {
 
     @PostMapping("wordExport")
     @ApiOperation("word导出")
-    public void wordExport(@RequestBody Map<String,Object> map, HttpServletResponse response){
-        int i = commissionCheckService.wordExport(map,response);
+    public void wordExport(@RequestBody Map<String,Object> map, HttpServletResponse response) throws Exception {
+        int i = commissionCheckService.exportFile(map,response);
         if(i == 0){
             throw new CustomException("导出失败");
         }else if(i == 1){

business-server/src/main/resources/aspose_license.xml

@@ -0,0 +1,13 @@
+<License>
+  <Data>
+    <Products>
+      <Product>Aspose.Total for Java</Product>
+      <Product>Aspose.Words for Java</Product>
+    </Products>
+    <EditionType>Enterprise</EditionType>
+    <SubscriptionExpiry>20991231</SubscriptionExpiry>
+    <LicenseExpiry>20991231</LicenseExpiry>
+    <SerialNumber>8bfe198c-7f0c-4ef8-8ff0-acc3237bf0d7</SerialNumber>
+  </Data>
+  <Signature>sNLLKGMUdF0r8O1kKilWAGdgfs2BvJb/2Xp8p5iuDVfZXmhppo+d0Ran1P9TKdjV4ABwAgKXxJ3jcQTqE/2IRfqwnPf8itN8aFZlV3TJPYeD3yWE7IT55Gz6EijUpC7aKeoohTb4w2fpox58wWoF3SNp6sK6jDfiAUGEHYJ9pjU=</Signature>
+</License>