Переглянути джерело

feat:导出监督报告 10

shc 7 місяців тому
батько
коміт
08478ec5b9

+ 15 - 14
hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/manager/WmSupervisionManager.java

@@ -1523,8 +1523,9 @@ public class WmSupervisionManager {
         Map<Long, List<WmTaskSupervisionAdvice>> advices = taskSupervisionAdviceService.list(Wrappers.<WmTaskSupervisionAdvice>lambdaQuery().in(WmTaskSupervisionAdvice::getTaskSupervisionId, supIds)).stream().collect(Collectors.groupingBy(WmTaskSupervisionAdvice::getTaskSupervisionId));
 
 
-        Object[][] datas = {{"2024年第四季度" + user.getRealName() + "监督结果"}, {"服务ID", "服务类型", "代表名称", "产品名称", "生产企业", "执行包名称", "周期", "监督结果", "监督意见", "部门负责人意见", "分管领导意见", "总经理意见"}};
-        // datas[0][0] = "2024年第四季度" + user.getRealName() + "监督结果";
+        Object[][] datas = new Object[taskSupervisions.size() + 2][];
+                // {{"2024年第四季度" + user.getRealName() + "监督结果"}, {"服务ID", "服务类型", "代表名称", "产品名称", "生产企业", "执行包名称", "周期", "监督结果", "监督意见", "部门负责人意见", "分管领导意见", "总经理意见"}};
+        datas[0][0] = "2024年第四季度" + user.getRealName() + "监督结果";
         // datas[0][1] = "";
         // datas[0][2] = "";
         // datas[0][3] = "";
@@ -1538,18 +1539,18 @@ public class WmSupervisionManager {
         // datas[0][11] = "";
 
 
-        // datas[1][0] = "服务ID";
-        // datas[1][1] = "服务类型";
-        // datas[1][2] = "代表名称";
-        // datas[1][3] = "产品名称";
-        // datas[1][4] = "生产企业";
-        // datas[1][5] = "执行包名称";
-        // datas[1][6] = "周期";
-        // datas[1][7] = "监督结果";
-        // datas[1][8] = "监督意见";
-        // datas[1][9] = "部门负责人意见";
-        // datas[1][10] = "分管领导意见";
-        // datas[1][11] = "总经理意见";
+        datas[1][0] = "服务ID";
+        datas[1][1] = "服务类型";
+        datas[1][2] = "代表名称";
+        datas[1][3] = "产品名称";
+        datas[1][4] = "生产企业";
+        datas[1][5] = "执行包名称";
+        datas[1][6] = "周期";
+        datas[1][7] = "监督结果";
+        datas[1][8] = "监督意见";
+        datas[1][9] = "部门负责人意见";
+        datas[1][10] = "分管领导意见";
+        datas[1][11] = "总经理意见";
 
         DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy/MM/dd");
         int idx = 2;