Merge branch 'V0.0.3' of http://10.87.10.227:4000/jzyd_yyds/soc into V0.0.3

project_data/sql/0.0.3/soc/soc.sql

@@ -815,6 +815,14 @@ INSERT INTO sys_dict_data (dict_sort, dict_label, dict_value, dict_type, css_cla
 INSERT INTO sys_dict_data (dict_sort, dict_label, dict_value, dict_type, css_class, list_class, is_default, status, create_by, create_time, update_by, update_time, remark) VALUES (20, '灭火和应急疏散预案演练', '1', 'core_drill_category', null, 'default', 'N', '0',  null, now(), null, now(), null);
 INSERT INTO sys_dict_data (dict_sort, dict_label, dict_value, dict_type, css_class, list_class, is_default, status, create_by, create_time, update_by, update_time, remark) VALUES (30, '其他', '2', 'core_drill_category', null, 'default', 'N', '0',  null, now(), null, now(), null);
 
+-- 修改演练项目字典值
+delete from sys_dict_data where  dict_type='core_drill_type' and dict_value>=6;
+update sys_dict_data set dict_label='防抢应急预案'  where dict_type='core_drill_type' and dict_value=1;
+update sys_dict_data set dict_label='防盗应急预案'  where dict_type='core_drill_type' and dict_value=2;
+update sys_dict_data set dict_label='反诈应急预案'  where dict_type='core_drill_type' and dict_value=3;
+update sys_dict_data set dict_label='消防及疏散应急预案'  where dict_type='core_drill_type' and dict_value=4;
+update sys_dict_data set dict_label='防自然灾害应急预案'  where dict_type='core_drill_type' and dict_value=5;
+
 -- 报警控制器
 ALTER TABLE `core_protection_log`
 MODIFY COLUMN `status_updator_name` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '上报人姓名' AFTER `status_updator_id`;
@@ -835,12 +843,19 @@ INSERT INTO `sys_menu` (`id`, `menu_name`, `parent_id`, `order_num`, `path`, `co
 VALUES (01723993298998222849, '报警测试报表', 1719287834364436482, 6, '/resumptionReport/intrusionTest', 'core/reportForms/intrusionTestReport', NULL, 1, 1, 'C', '0', '0', 'core:resumptionReport:list', '1', 'chart', NULL, '超级管理员', '2023-09-21 10:37:52', '超级管理员', '2023-09-22 09:42:43', '');
 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 (01724607752400044034, '备用电源维护报表', 1719287834364436482, 7, '/resumptionReport/standbyPower', 'core/reportForms/standbyPowerReport', NULL, 1, 1, 'C', '0', '0', 'core:resumptionReport:list', '1', 'chart', NULL, '超级管理员', '2023-09-21 10:37:52', '超级管理员', '2023-09-22 09:42:43', '');
+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 (01724355771043504129, '离行式自助银行巡检报表', 1719287834364436482, 7, '/resumptionReport/serviceBank', 'core/reportForms/serviceBankReport', NULL, 1, 1, 'C', '0', '0', 'core:resumptionReport:list', '1', 'chart', NULL, '超级管理员', '2023-09-21 10:37:52', '超级管理员', '2023-09-22 09:42:43', '');
 
 
 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 (1722135552494403586, '登记簿批量导出', 1719287834364436482, 10, 'code/registerbook', 'registerBook/index', null, 1, 0, 'C', '0', '0', 'core:registerBook:list', '1', 'education', null, null, now(), null, now(), null);
 
-delete from sys_role_menu where menu_id IN(01723993298998222849,01722523915868221442,01719287834364436482,01719288533101928450,01719892877586239490,01720000571298115585);
+delete from sys_role_menu where menu_id IN(01724355771043504129,01723993298998222849,01722523915868221442,01719287834364436482,01719288533101928450,01719892877586239490,01720000571298115585);
+INSERT INTO `sys_role_menu`(`role_id`, `menu_id`) VALUES (116, 01724355771043504129);
+INSERT INTO `sys_role_menu`(`role_id`, `menu_id`) VALUES (120, 01724355771043504129);
+INSERT INTO `sys_role_menu`(`role_id`, `menu_id`) VALUES (121, 01724355771043504129);
+INSERT INTO `sys_role_menu`(`role_id`, `menu_id`) VALUES (122, 01724355771043504129);
+
 INSERT INTO `sys_role_menu`(`role_id`, `menu_id`) VALUES (116, 01724607752400044034);
 INSERT INTO `sys_role_menu`(`role_id`, `menu_id`) VALUES (120, 01724607752400044034);
 INSERT INTO `sys_role_menu`(`role_id`, `menu_id`) VALUES (121, 01724607752400044034);
@@ -1156,4 +1171,89 @@ INSERT INTO `sys_role_menu` (`role_id`, `menu_id`) VALUES (122, 0172401740487231
 
 -- 删除检查登记授权按钮权限
 DELETE from sys_menu WHERE perms='core:safetycheck:grant'  and menu_type='F';
-DELETE from sys_role_menu WHERE menu_id not in (SELECT id from sys_menu);
+DELETE from sys_role_menu WHERE menu_id not in (SELECT id from sys_menu);
+
+-- 履职任务类型修正
+DELETE FROM sys_dict_data where dict_type='resumption_plan_type';
+INSERT INTO `sys_dict_data`( `dict_sort`, `dict_label`, `dict_value`, `dict_type`, `css_class`, `list_class`, `is_default`, `status`, `create_by`, `create_time`, `update_by`, `update_time`, `remark`) VALUES ( 1, '营业前安全检查', '1', 'resumption_plan_type', NULL, 'default', 'N', '0', '何悦', '2023-08-28 18:44:08', '超级管理员', '2023-09-28 15:16:39', NULL);
+INSERT INTO `sys_dict_data`( `dict_sort`, `dict_label`, `dict_value`, `dict_type`, `css_class`, `list_class`, `is_default`, `status`, `create_by`, `create_time`, `update_by`, `update_time`, `remark`) VALUES ( 2, '营业期间安全管理', '2', 'resumption_plan_type', NULL, 'default', 'N', '0', '何悦', '2023-08-28 18:44:19', '超级管理员', '2023-09-28 15:16:51', NULL);
+INSERT INTO `sys_dict_data`( `dict_sort`, `dict_label`, `dict_value`, `dict_type`, `css_class`, `list_class`, `is_default`, `status`, `create_by`, `create_time`, `update_by`, `update_time`, `remark`) VALUES ( 3, '营业终了安全管理', '3', 'resumption_plan_type', NULL, 'default', 'N', '0', '何悦', '2023-08-29 10:56:15', '超级管理员', '2023-09-28 15:17:11', NULL);
+INSERT INTO `sys_dict_data`( `dict_sort`, `dict_label`, `dict_value`, `dict_type`, `css_class`, `list_class`, `is_default`, `status`, `create_by`, `create_time`, `update_by`, `update_time`, `remark`) VALUES ( 4, '“110”入侵报警系统测试', '4', 'resumption_plan_type', NULL, 'default', 'N', '0', '何悦', '2023-08-29 10:56:35', '超级管理员', '2023-09-28 15:17:23', NULL);
+INSERT INTO `sys_dict_data`( `dict_sort`, `dict_label`, `dict_value`, `dict_type`, `css_class`, `list_class`, `is_default`, `status`, `create_by`, `create_time`, `update_by`, `update_time`, `remark`) VALUES ( 5, '不间断电源(UPS)维护', '5', 'resumption_plan_type', NULL, 'default', 'N', '0', '何悦', '2023-08-29 10:56:50', '省联社账号', '2023-11-16 10:19:49', NULL);
+INSERT INTO `sys_dict_data`( `dict_sort`, `dict_label`, `dict_value`, `dict_type`, `css_class`, `list_class`, `is_default`, `status`, `create_by`, `create_time`, `update_by`, `update_time`, `remark`) VALUES ( 6, '离行式自助银行巡检', '6', 'resumption_plan_type', NULL, 'default', 'N', '0', '何悦', '2023-08-29 10:57:08', '超级管理员', '2023-09-28 15:17:42', NULL);
+INSERT INTO `sys_dict_data`( `dict_sort`, `dict_label`, `dict_value`, `dict_type`, `css_class`, `list_class`, `is_default`, `status`, `create_by`, `create_time`, `update_by`, `update_time`, `remark`) VALUES ( 7, '非营业时间安全管理', '7', 'resumption_plan_type', NULL, 'default', 'N', '0', '何悦', '2023-08-29 10:57:26', '超级管理员', '2023-09-28 15:17:51', NULL);
+INSERT INTO `sys_dict_data`( `dict_sort`, `dict_label`, `dict_value`, `dict_type`, `css_class`, `list_class`, `is_default`, `status`, `create_by`, `create_time`, `update_by`, `update_time`, `remark`) VALUES ( 8, '其他', '8', 'resumption_plan_type', NULL, 'default', 'N', '0', '超级管理员', '2023-11-14 11:03:01', '省联社账号', '2023-11-16 10:19:31', NULL);
+
+
+
+
+-- 出入管理相关表
+CREATE TABLE if not exists `core_introduce_letter` (
+                                                       `id` bigint NOT NULL,
+                                                       `letter_name` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '介绍信名称',
+    `start_time` datetime DEFAULT NULL COMMENT '有效开始时间',
+    `end_time` datetime DEFAULT NULL COMMENT '有效结束时间',
+    `letter_file` varchar(500) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '介绍信文件',
+    `org_id` bigint DEFAULT NULL COMMENT '创建机构',
+    `org_path` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '创建机构',
+    `org_name` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '创建机构',
+    `create_by` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '创建人',
+    `create_time` datetime DEFAULT NULL COMMENT '创建时间',
+    `deleted` int DEFAULT NULL COMMENT '0正常1删除',
+    `letter_no` varchar(20) COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '介绍信编号',
+    `description` varchar(500) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '备注',
+    `reasons` varchar(100) COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '出入事由',
+    `status` int DEFAULT NULL COMMENT '状态：0 草稿 ，1 使用中， 2 已逾期',
+    `update_by` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '修改人',
+    `update_time` datetime DEFAULT NULL COMMENT '修改时间',
+    `type` int DEFAULT NULL COMMENT '类型：1 职能部门出入, 2 临时出入，3 紧急出入',
+    PRIMARY KEY (`id`) USING BTREE
+    ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci COMMENT='介绍信';
+
+CREATE TABLE if not exists `core_introduce_letter_user` (
+                                                            `id` bigint DEFAULT NULL,
+                                                            `user_name` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL,
+    `company_name` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL,
+    `id_card` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL,
+    `img_file` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL,
+    `letter_id` bigint DEFAULT NULL,
+    `create_by` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL,
+    `create_time` datetime DEFAULT NULL,
+    KEY `index_letter_id` (`letter_id`) USING BTREE
+    ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci COMMENT='介绍信人员表';
+
+CREATE TABLE if not exists `core_introduce_letter_to_org` (
+                                                              `letter_id` bigint DEFAULT NULL,
+                                                              `org_id` bigint DEFAULT NULL,
+                                                              KEY `index_org_id` (`org_id`) USING BTREE,
+    KEY `index_letter_id` (`letter_id`) USING BTREE
+    ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci COMMENT='介绍信接待机构';
+
+CREATE TABLE if not exists `core_introduce_letter_approve_log` (
+                                                                   `id` bigint NOT NULL,
+                                                                   `letter_id` bigint DEFAULT NULL COMMENT '介绍信id',
+                                                                   `approve_user` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '审核人',
+    `approve_user_id` bigint DEFAULT NULL COMMENT '审核人Id',
+    `approve_time` datetime DEFAULT NULL COMMENT '审核时间',
+    `approve_status` int DEFAULT NULL COMMENT '审核状态:0待审批1通过2不通过3逾期',
+    `approve_remark` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '备注',
+    `org_id` bigint DEFAULT NULL COMMENT '接待机构',
+    PRIMARY KEY (`id`) USING BTREE,
+    KEY `index_letter_id` (`letter_id`) USING BTREE,
+    KEY `index_org_id` (`org_id`) USING BTREE
+    ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci COMMENT='介绍信审批记录';
+
+CREATE TABLE if not exists `core_out_in_record` (
+                                                    `id` bigint NOT NULL,
+                                                    `org_id` bigint DEFAULT NULL COMMENT '出入机构',
+                                                    `letter_id` bigint DEFAULT NULL COMMENT '介绍信/出入申请ID',
+                                                    `letter_user_id` bigint DEFAULT NULL COMMENT '介绍信/出入申请中 人员ID',
+                                                    `create_by` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '登记人员',
+    `create_time` datetime DEFAULT NULL COMMENT '登记时间',
+    `arrival_time` datetime DEFAULT NULL COMMENT '到达时间',
+    `departure_time` datetime DEFAULT NULL COMMENT '离开时间',
+    `accompanying_person` varchar(255) COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '陪同人员',
+    `check_image` varchar(255) COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '核验照片',
+    PRIMARY KEY (`id`),
+    KEY `index_letter_id` (`letter_id`) USING BTREE
+    ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci COMMENT='人员出入登记表';

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/reportForms/resumption/controller/ResumptionReportController.java

@@ -14,6 +14,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
+
 import java.time.LocalDate;
 import java.util.Date;
 import java.util.List;
@@ -35,12 +36,20 @@ public class ResumptionReportController {
     public AjaxResult list(ResumptionDTO resumptionDTO) {
         if (null == resumptionDTO.getSearchTime()) {
             LocalDate currentDate = LocalDate.now();
-            resumptionDTO.setSearchTime(currentDate.toString());
+            if (null == resumptionDTO.getCycle() || resumptionDTO.getCycle() == 1) {
+                resumptionDTO.setSearchTime(currentDate.toString());
+            } else {
+                resumptionDTO.setSearchTime(currentDate.getYear() + "-" + currentDate.getMonthValue());
+            }
         }
         AjaxResult ajaxResult = AjaxResult.success();
         List<ResumptionDayVO> report = resumptionReportService.report(resumptionDTO);
         ajaxResult.put(AjaxResult.DATA_TAG, report);
-        ajaxResult.put("title", "日报表-营业网点每日安全保卫履职(" + resumptionDTO.getSearchTime() + ")");
+        if (null == resumptionDTO.getCycle() || resumptionDTO.getCycle() == 1) {
+            ajaxResult.put("title", "日报表-营业网点每日安全保卫履职(" + resumptionDTO.getSearchTime() + ")");
+        } else {
+            ajaxResult.put("title", "月报表-营业网点每日安全保卫履职(" + resumptionDTO.getSearchTime() + ")");
+        }
         return ajaxResult;
     }
 
@@ -50,7 +59,7 @@ public class ResumptionReportController {
     public AjaxResult intrusionTest(ResumptionDTO resumptionDTO) {
         if (null == resumptionDTO.getSearchTime()) {
             LocalDate currentDate = LocalDate.now();
-            resumptionDTO.setSearchTime(currentDate.getYear()+"-"+currentDate.getMonthValue());
+            resumptionDTO.setSearchTime(currentDate.getYear() + "-" + currentDate.getMonthValue());
         }
         AjaxResult ajaxResult = AjaxResult.success();
         List<IntrusionTestReportVO> intrusionTestReportVOList = resumptionReportService.intrusionTest(resumptionDTO);
@@ -58,11 +67,12 @@ public class ResumptionReportController {
         ajaxResult.put("title", "报警测试报表(" + resumptionDTO.getSearchTime() + ")");
         return ajaxResult;
     }
+
     @ApiOperation(value = "备用电源维护报表")
     @RequiresPermissions("core:resumptionReport:list")
     @GetMapping("/standbyPower")
     public AjaxResult standbyPower(ResumptionDTO resumptionDTO) {
-     String time;
+        String time;
         if (null == resumptionDTO.getSearchTime()) {
             DateTime beginOfQuarter = DateUtil.beginOfQuarter(new java.util.Date());
             DateTime endOfQuarter = DateUtil.endOfQuarter(new Date());
@@ -71,10 +81,10 @@ public class ResumptionReportController {
             LocalDate currentDate = LocalDate.now();
             int month = currentDate.getMonthValue();
             int quarter = (month - 1) / 3 + 1;
-            time=currentDate.getYear()+"年第"+quarter+"季度";
-        }else {
+            time = currentDate.getYear() + "年第" + quarter + "季度";
+        } else {
             String[] split = resumptionDTO.getSearchTime().split("-");
-            time=    split[0]+"年第"+split[1]+"季度";
+            time = split[0] + "年第" + split[1] + "季度";
         }
         AjaxResult ajaxResult = AjaxResult.success();
         List<IntrusionTestReportVO> intrusionTestReportVOList = resumptionReportService.standbyPower(resumptionDTO);
@@ -82,13 +92,14 @@ public class ResumptionReportController {
         ajaxResult.put("title", "备用电源维护报表(" + time + ")");
         return ajaxResult;
     }
+
     @ApiOperation(value = "离行式自助银行巡检报表")
     @RequiresPermissions("core:resumptionReport:list")
     @GetMapping("/serviceBank")
     public AjaxResult serviceBank(ResumptionDTO resumptionDTO) {
         if (null == resumptionDTO.getSearchTime()) {
             LocalDate currentDate = LocalDate.now();
-            resumptionDTO.setSearchTime(currentDate.getYear()+"-"+currentDate.getMonthValue());
+            resumptionDTO.setSearchTime(currentDate.getYear() + "-" + currentDate.getMonthValue());
         }
         AjaxResult ajaxResult = AjaxResult.success();
         List<IntrusionTestReportVO> intrusionTestReportVOList = resumptionReportService.serviceBank(resumptionDTO);

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/reportForms/resumption/dto/ResumptionDTO.java

@@ -17,4 +17,5 @@ public class ResumptionDTO {
     private Integer planType;
     private Date startTime;
     private Date endTime;
+    private Integer cycle;
 }

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/reportForms/resumption/mapper/ResumptionReportMapper.java

@@ -16,7 +16,7 @@ import java.util.List;
 @Mapper
 public interface ResumptionReportMapper {
 
-    ResumptionDayVO selectReport(@Param("planType") Integer planType, @Param("orgId") Long orgId, @Param("date") String date, @Param("orgPath") String orgPath);
+    ResumptionDayVO selectReport(@Param("cycle") Integer cycle,@Param("planType") Integer planType, @Param("orgId") Long orgId, @Param("date") String date, @Param("orgPath") String orgPath);
 
     /**
      * 已整改数量

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/reportForms/resumption/service/impl/ResumptionReportServiceImpl.java

@@ -64,19 +64,19 @@ public class ResumptionReportServiceImpl implements ResumptionReportService {
             Integer integer = monitorAccessReportMapper.selectNetworkNumberByPath(o.getPath());
             resumptionDayVO.setNetworkNumber(integer);
             //营业前
-            ResumptionDayVO resumptionDayVO1 = resumptionReportMapper.selectReport(1, null, resumptionDTO.getSearchTime(), o.getPath());
+            ResumptionDayVO resumptionDayVO1 = resumptionReportMapper.selectReport(resumptionDTO.getCycle(),1, null, resumptionDTO.getSearchTime(), o.getPath());
             resumptionDayVO.setFrontRate(resumptionDayVO1.getFrontRate());
             resumptionDayVO.setFrontAbnormalNumber(resumptionDayVO1.getFrontAbnormalNumber());
             resumptionDayVO.setFrontPlanNumber(resumptionDayVO1.getFrontPlanNumber());
             resumptionDayVO.setFrontRealityNumber(resumptionDayVO1.getFrontRealityNumber());
             //营业中
-            ResumptionDayVO resumptionDayVO2 = resumptionReportMapper.selectReport(2, null, resumptionDTO.getSearchTime(), o.getPath());
+            ResumptionDayVO resumptionDayVO2 = resumptionReportMapper.selectReport(resumptionDTO.getCycle(),2, null, resumptionDTO.getSearchTime(), o.getPath());
             resumptionDayVO.setCentreRate(resumptionDayVO2.getFrontRate());
             resumptionDayVO.setCentreAbnormalNumber(resumptionDayVO2.getFrontAbnormalNumber());
             resumptionDayVO.setCentrePlanNumber(resumptionDayVO2.getFrontPlanNumber());
             resumptionDayVO.setCentreRealityNumber(resumptionDayVO2.getFrontRealityNumber());
             //后
-            ResumptionDayVO resumptionDayVO3 = resumptionReportMapper.selectReport(3, null, resumptionDTO.getSearchTime(), o.getPath());
+            ResumptionDayVO resumptionDayVO3 = resumptionReportMapper.selectReport(resumptionDTO.getCycle(),3, null, resumptionDTO.getSearchTime(), o.getPath());
             resumptionDayVO.setAfterRate(resumptionDayVO3.getFrontRate());
             resumptionDayVO.setAfterAbnormalNumber(resumptionDayVO3.getFrontAbnormalNumber());
             resumptionDayVO.setAfterPlanNumber(resumptionDayVO3.getFrontPlanNumber());
@@ -173,7 +173,7 @@ public class ResumptionReportServiceImpl implements ResumptionReportService {
             intrusionTestReportVO.setNetworkNumber(integer);
             intrusionTestReportVOList.add(intrusionTestReportVO);
         });
-        return null;
+        return intrusionTestReportVOList;
     }
     @Override
     public List<IntrusionTestReportVO> standbyPower(ResumptionDTO resumptionDTO) {

soc-modules/soc-modules-core/src/main/resources/mapper/reportForms/ResumptionReportMapper.xml

@@ -33,7 +33,10 @@
           <if test="orgId !=null">
               AND a.org_id = #{orgId}
           </if>
-          <if test="date !=null">
+          <if test=" cycle ==2">
+              AND a.ymd_date like concat(#{date},'%')
+          </if>
+          <if test="cycle ==1 || cycle ==null">
               AND a.ymd_date = #{date}
           </if>
         <if test="orgPath !=null">