From d2e460b56d4b194d6e532e3ad7e5ebf859a114aa Mon Sep 17 00:00:00 2001
From: aikai <ZZL86tdd>
Date: Mon, 15 Apr 2024 14:02:48 +0800
Subject: [PATCH] =?UTF-8?q?=E6=88=91=E7=AE=A1=E7=90=86=E7=9A=84/=E6=88=91?=
 =?UTF-8?q?=E9=9C=80=E8=A6=81=E5=A1=AB=E5=86=99=E7=9A=84=20=E5=88=97?=
 =?UTF-8?q?=E8=A1=A8=E8=BF=94=E5=9B=9E=E6=A8=A1=E7=89=88=E7=B1=BB=E5=9E=8B?=
 =?UTF-8?q?=201=E6=97=A5=E6=8A=A5=202=E5=91=A8=E6=8A=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../admin/worklog/vo/statistics/LogStatisticsModelVO.java      | 3 +++
 .../system/service/worklog/LogStatisticsServiceImpl.java       | 2 ++
 2 files changed, 5 insertions(+)

diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/worklog/vo/statistics/LogStatisticsModelVO.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/worklog/vo/statistics/LogStatisticsModelVO.java
index 6249cef1..8d976760 100644
--- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/worklog/vo/statistics/LogStatisticsModelVO.java
+++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/worklog/vo/statistics/LogStatisticsModelVO.java
@@ -21,5 +21,8 @@ public class LogStatisticsModelVO extends LogFormDO {
 
     @Schema(description = "提交范围")
     private String commitTimeRange;
+
+    @Schema(description = "模版类型 1日报 2周报 3月报")
+    private Integer type;
 }
 
diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/worklog/LogStatisticsServiceImpl.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/worklog/LogStatisticsServiceImpl.java
index 109e77e7..c0b27b7a 100644
--- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/worklog/LogStatisticsServiceImpl.java
+++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/worklog/LogStatisticsServiceImpl.java
@@ -118,6 +118,7 @@ public class LogStatisticsServiceImpl implements LogStatisticsService {
             List<LogInstanceDO> instanceDOS = logInstanceService.myManageLogInstanceByTimeRange(logFormDO.getId(), logRuleDO.getType(), thisDate);
             LogStatisticsModelVO vo = new LogStatisticsModelVO();
             BeanUtil.copyProperties(logFormDO, vo);
+            vo.setType(logRuleDO.getType());
             //查询下应该提交多少日志实例 - 直接通过模版id查询使用表
             Integer num = Math.toIntExact(logUseMapper.selectCount(new LambdaQueryWrapper<LogUseDO>()
                     .eq(LogUseDO::getFormId, logFormDO.getId())));
@@ -268,6 +269,7 @@ public class LogStatisticsServiceImpl implements LogStatisticsService {
                 vo.setUnSubmittedNum(unSubmittedNum);
                 vo.setLateNum(lateNum);
             }
+            vo.setType(logRuleDO.getType());
             list.add(vo);
         }
         return list;