fix: 报告生成

itdmServer/module-iTDM/src/main/java/org/jeecg/modules/baogao/service/impl/ItdmBaogaoServiceImpl.java

@@ -199,9 +199,7 @@ public class ItdmBaogaoServiceImpl extends ServiceImpl<ItdmBaogaoMapper, ItdmBao
         map.put("daqiya", dto.getDaqiya());
         map.putAll(PoiTiUtils.getBaogaoImage(getBaogaoImage(dto)));
 
-        map.putAll(PoiTiUtils.getYSdata(getBaogaoShuju(dto)));
-
-
+        map.putAll(PoiTiUtils.getYSdata(getBaogaoShuju(dto), this.getYSZItdmMobanPath()));
 
 
         return map;
@@ -215,15 +213,14 @@ public class ItdmBaogaoServiceImpl extends ServiceImpl<ItdmBaogaoMapper, ItdmBao
                 .stream().distinct().collect(Collectors.toList());
     }
 
-    private List<Map<String,Object>> getBaogaoShuju(ItdmBaogaoCreateDTO dto) {
+    private List<Map<String, Object>> getBaogaoShuju(ItdmBaogaoCreateDTO dto) {
 
 
         return tdmTestPlanMapper.getShujuByShiyanid(dto.getTestItemsIds())
-                .stream().distinct().collect(Collectors.toList());
+                .stream().collect(Collectors.toList());
     }
 
 
-
     private List<ItdmDevice> getDeviceList(List<String> list) {
 
 
@@ -260,4 +257,12 @@ public class ItdmBaogaoServiceImpl extends ServiceImpl<ItdmBaogaoMapper, ItdmBao
 
 
     }
+
+
+    public String getYSZItdmMobanPath() {
+        String filepath = mobanMapper.selectOne(Wrappers.lambdaQuery(ItdmMoban.class).eq(ItdmMoban::getName, "温湿度原始记录子模版")).getFilePath();
+
+        return jeecgBaseConfig.getPath().getUpload() + File.separator + filepath;
+    }
+
 }

itdmServer/module-iTDM/src/main/java/org/jeecg/modules/baogao/util/PoiTiUtils.java

@@ -5,6 +5,7 @@ import com.alibaba.fastjson.JSON;
 import com.deepoove.poi.XWPFTemplate;
 import com.deepoove.poi.config.Configure;
 import com.deepoove.poi.config.ConfigureBuilder;
+import com.deepoove.poi.data.Includes;
 import com.deepoove.poi.plugin.table.LoopRowTableRenderPolicy;
 import org.apache.commons.collections4.ListUtils;
 import org.apache.commons.lang3.time.DateUtils;
@@ -259,37 +260,43 @@ public class PoiTiUtils {
     }
 
 
-    public static Map<String, Object> getYSdata(List<Map<String, Object>> list) {
-        Map<String, Object> returnMap = new HashMap<>();
-
+    public static Map<String, Object> getYSdata(List<Map<String, Object>> list, String tempPath) {
 
-        for (int i = 0; i < 69; i++) {
+        Map<String, Object> returnMap = new HashMap<>();
 
 
-            if (i < list.size()) {
-                returnMap.put("yd"+i, list.get(i).get("shiyan_time"));
-                returnMap.put("yw"+i, list.get(i).get("shiyan_wendu"));
-                returnMap.put("ys"+i, list.get(i).get("shiyan_shidu"));
+        List<List<Map<String, Object>>> listList = ListUtils.partition(list, 69);
 
 
+        List<Map<String, Object>> data = listList.stream().map(i -> getOneYUanshiData(i)).collect(Collectors.toList());
 
 
+        returnMap.put("data", Includes.ofLocal(tempPath).setRenderModel(data).create());
 
-            }
+        return returnMap;
 
 
+    }
 
-        }
 
+    private static Map<String, Object> getOneYUanshiData(List<Map<String, Object>> list) {
+        Map<String, Object> returnMap = new HashMap<>();
+        for (int i = 0; i < 69; i++) {
 
-        return returnMap;
 
+            if (i < list.size()) {
+                returnMap.put("yd" + i, list.get(i).get("shiyan_time"));
+                returnMap.put("yw" + i, list.get(i).get("shiyan_wendu"));
+                returnMap.put("ys" + i, list.get(i).get("shiyan_shidu"));
 
 
-    }
+            }
 
 
+        }
+        return returnMap;
 
+    }
 
 
     public static void main(String[] args) throws ParseException, IOException {
@@ -303,8 +310,6 @@ public class PoiTiUtils {
         }
 
 
-
-
     }
 
 }