演练培训Web统计报表代码提交

project_data/sql/0.0.4/soc/soc.sql

@@ -25,6 +25,21 @@ INSERT INTO `sys_role_menu` (`role_id`, `menu_id`) VALUES (120, 1729308502301728
 delete  from `sys_menu` where  id=01729407886809481218;
 INSERT INTO `sys_menu`(`id`, `menu_name`, `parent_id`, `order_num`, `path`, `component`, `query`, `is_frame`, `is_cache`, `menu_type`, `visible`, `status`, `perms`, `platform_type`, `icon`, `image_path`, `create_by`, `create_time`, `update_by`, `update_time`, `remark`) VALUES (01729407886809481218, '导出', 2318, 8, '', NULL, NULL, 1, 0, 'F', '0', '0', 'core:safetycheck:export', '1', NULL, NULL, '省联社账号', '2023-11-28 15:52:54', '', NULL, '');
 
+-- web培训统计报表菜单及权限
+delete from sys_menu where id = 1730059329344102401;
+INSERT INTO `sys_menu`(`id`, `menu_name`, `parent_id`, `order_num`, `path`, `component`, `query`, `is_frame`, `is_cache`, `menu_type`, `visible`, `status`, `perms`, `platform_type`, `icon`, `image_path`, `create_by`, `create_time`, `update_by`, `update_time`, `remark`) VALUES (01730059329344102401, '培训统计排行', 1719287834364436482, 700, 'core/reportForms/eduTraining', 'core/reportForms/eduTraining', NULL, 1, 0, 'C', '0', '0', NULL, '1', 'chart', NULL, NULL, NOW(),NULL , NOW(), NULL);
+delete from sys_role_menu where menu_id=1730059329344102401;
+insert into sys_role_menu select  id,1730059329344102401 from sys_role where org_type in (1,2,3);
+
+-- web演练统计报表菜单及权限
+delete from sys_menu where id = 01730111975367106562;
+INSERT INTO `sys_menu`(`id`, `menu_name`, `parent_id`, `order_num`, `path`, `component`, `query`, `is_frame`, `is_cache`, `menu_type`, `visible`, `status`, `perms`, `platform_type`, `icon`, `image_path`, `create_by`, `create_time`, `update_by`, `update_time`, `remark`) VALUES (01730111975367106562, '演练统计排行', 1719287834364436482, 701, 'core/reportForms/drill', 'core/reportForms/drill', NULL, 1, 0, 'C', '0', '0', NULL, '1', 'chart', NULL, NULL, NOW(),NULL , NOW(), NULL);
+delete from sys_role_menu where menu_id=01730111975367106562;
+insert into sys_role_menu select  id,01730111975367106562 from sys_role where org_type in (1,2,3);
+
+
+
+
 update sys_menu set menu_name='履职手册' WHERE menu_name='履职内容库' and platform_type=1 and menu_type='C' ;
 update sys_menu set menu_name='检查手册' WHERE menu_name='检查内容库' and platform_type=1 and menu_type='C' ;
 update sys_menu set menu_name='检查手册' WHERE menu_name='检查内容库' and platform_type=1 and menu_type='C' ;
@@ -59,3 +74,4 @@ UPDATE `sys_menu` SET `order_num` = 26 WHERE `menu_name` = '档案管理';
 UPDATE `sys_menu` SET `order_num` = 28 WHERE `menu_name` = '系统管理';
 UPDATE `sys_menu` SET `menu_name` = '系统运维' WHERE `menu_name` = '系统监控';
 UPDATE `sys_menu` SET `order_num` = 30 WHERE `menu_name` = '系统运维';
+UPDATE `sys_menu` SET `order_num` = 999 WHERE `menu_name` = '登记簿批量导出' limit 1;

soc-common/soc-common-core/src/main/java/com/xunmei/common/core/domain/drill/dto/CoreDrillTaskReportDto.java

@@ -10,21 +10,21 @@ import java.util.Date;
 public class CoreDrillTaskReportDto {
 
     @NotNull(message = "请选择计划进行查看!")
-    @ApiModelProperty(value = "教育培训计划Id")
+    @ApiModelProperty(value = "演练计划Id")
     private Long planId;
 
     @NotNull(message = "请选择机构进行查看!")
     @ApiModelProperty(value = "机构")
     private Long orgId;
 
-    @NotNull(message = "统计月份开始日期不能为空!")
     @ApiModelProperty(value = "统计月份开始日期")
     private Date startTime;
 
-    @NotNull(message = "统计月份结束日期不能为空!")
     @ApiModelProperty(value = "统计月份结束日期")
     private Date endTime;
 
     private String orgPath;
 
+    private Date[] range;
+
 }

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/drill/service/impl/CoreDrillTaskServiceImpl.java

@@ -662,8 +662,14 @@ public class CoreDrillTaskServiceImpl extends ServiceImpl<CoreDrillTaskMapper, C
         if (ObjectUtil.isAllEmpty(planId, planIdList)) {
             return new ArrayList<>();
         }
-        request.setStartTime(DateUtil.beginOfMonth(request.getStartTime()));
-        request.setEndTime(DateUtil.endOfMonth(request.getEndTime()));
+        if (ObjectUtil.isEmpty(request.getRange())){
+            request.setStartTime(DateUtil.beginOfMonth(request.getStartTime()));
+            request.setEndTime(DateUtil.endOfMonth(request.getEndTime()));
+        }else {
+            request.setStartTime(DateUtil.beginOfMonth(request.getRange()[0]));
+            request.setEndTime(DateUtil.endOfMonth(request.getRange()[0]));
+        }
+
 
         Long orgId = request.getOrgId();
         SysOrg sysOrg = RemoteCallHandlerExecutor.executeRemoteCall(() -> orgService.selectOrgById(orgId, SecurityConstants.INNER), ErrorMsgConstants.QUERY_ORG_DATA_ERROR);
@@ -688,7 +694,7 @@ public class CoreDrillTaskServiceImpl extends ServiceImpl<CoreDrillTaskMapper, C
                 List<CoreDrillTaskReportVo> childrenOrgData = list.stream().filter(vo -> vo.getOrgPath().startsWith(org.getPath())).collect(Collectors.toList());
                 CoreDrillTaskReportVo reportVo = new CoreDrillTaskReportVo();
                 reportVo.setOrgId(org.getId());
-                reportVo.setOrgName(org.getName());
+                reportVo.setOrgName(org.getShortName());
                 if (ObjectUtil.isEmpty(childrenOrgData)) {
                     reportVo.setShouldFinish(0);
                     reportVo.setFinish(0);