Merge remote-tracking branch 'origin/V0.0.2' into V0.0.2

# Conflicts:
#	project_data/sql/0.0.3/soc/soc.sql

project_data/sql/0.0.3/soc/soc.sql

@@ -526,4 +526,58 @@ UPDATE sys_dict_data set dict_label ='待登记' WHERE dict_label ='待演练' A
 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`;
 -- 修改安全指数机构分数表机构path字段长度
-alter table core_safe_month_score modify org_path varchar(225) null comment '机构path';
+alter table core_safe_month_score modify org_path varchar(225) null comment '机构path';
+DELETE FROM sys_menu WHERE id IN(01719287834364436482,01719288533101928450,01719892877586239490);
+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 (01719287834364436482, '统计报表', 0, 1, 'reportForms', NULL, NULL, 1, 0, 'M', '0', '0', 'core:send: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 (01719288533101928450, '安全检查统计报表', 1719287834364436482, 1, 'core/reportForms', 'core/reportForms/safetyInspectReport', NULL, 1, 1, 'C', '0', '0', 'core:safetyInspectReport: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 (01719892877586239490, '外包履职评价统计表', 1719287834364436482, 1, 'evaluateTable', 'evaluateTable/index', NULL, 1, 1, 'C', '0', '0', 'core:safetyInspectReport:list', '1', 'chart', NULL, '超级管理员', '2023-09-21 10:37:52', '超级管理员', '2023-09-22 09:42:43', '');
+delete from sys_role_menu where menu_id IN(01719287834364436482,01719288533101928450,01719892877586239490);
+
+INSERT INTO `sys_role_menu`(`role_id`, `menu_id`) VALUES (116, 01719287834364436482);
+INSERT INTO `sys_role_menu`(`role_id`, `menu_id`) VALUES (120, 01719287834364436482);
+INSERT INTO `sys_role_menu`(`role_id`, `menu_id`) VALUES (121, 01719287834364436482);
+INSERT INTO `sys_role_menu`(`role_id`, `menu_id`) VALUES (122, 01719287834364436482);
+
+INSERT INTO `sys_role_menu`(`role_id`, `menu_id`) VALUES (116, 01719288533101928450);
+INSERT INTO `sys_role_menu`(`role_id`, `menu_id`) VALUES (120, 01719288533101928450);
+INSERT INTO `sys_role_menu`(`role_id`, `menu_id`) VALUES (121, 01719288533101928450);
+INSERT INTO `sys_role_menu`(`role_id`, `menu_id`) VALUES (122, 01719288533101928450);
+
+INSERT INTO `sys_role_menu`(`role_id`, `menu_id`) VALUES (116, 01719892877586239490);
+INSERT INTO `sys_role_menu`(`role_id`, `menu_id`) VALUES (120, 01719892877586239490);
+INSERT INTO `sys_role_menu`(`role_id`, `menu_id`) VALUES (121, 01719892877586239490);
+INSERT INTO `sys_role_menu`(`role_id`, `menu_id`) VALUES (122, 01719892877586239490);
+-- 新增省联社角色
+delete from sys_role where role_name IN('省联社部门管理层');
+INSERT INTO `sys_role` VALUES (114, '1', '省联社部门管理层', 'default', 0, 1, 1, 1, '0', 0, '超级管理员', '2023-09-04 09:39:13', '超级管理员', '2023-09-16 23:57:16', NULL);
+
+-- 同步机构 特殊机构移动配置数据
+DELETE FROM `sync_fjnx_org_move` WHERE id IN (1,2,3,4);
+INSERT INTO `sync_fjnx_org_move` (`id`, `org_code`, `org_type`) VALUES (1, '910020000', 1);
+INSERT INTO `sync_fjnx_org_move` (`id`, `org_code`, `org_type`) VALUES (2, '910040000', 1);
+INSERT INTO `sync_fjnx_org_move` (`id`, `org_code`, `org_type`) VALUES (3, '910060000', 1);
+INSERT INTO `sync_fjnx_org_move` (`id`, `org_code`, `org_type`) VALUES (4, '910030000', 1);
+
+-- 同步机构 业务机构层级配置数据
+DELETE FROM `sync_fjnx_org_business_relation` WHERE id <=19;
+INSERT INTO `sync_fjnx_org_business_relation` (`id`, `org_code`, `business_parent_code`, `tree_show_parent_code`, `org_type`, `dqhs_org_code`, `create_time`, `modified_name`, `update_time`, `modified_id`) VALUES (1, 'M39000000', 'M31000000', 'C900000000', 3, NULL, NULL, NULL, NULL, NULL);
+INSERT INTO `sync_fjnx_org_business_relation` (`id`, `org_code`, `business_parent_code`, `tree_show_parent_code`, `org_type`, `dqhs_org_code`, `create_time`, `modified_name`, `update_time`, `modified_id`) VALUES (2, 'M42000000', 'M33000000', 'C900000000', 3, NULL, NULL, NULL, NULL, NULL);
+INSERT INTO `sync_fjnx_org_business_relation` (`id`, `org_code`, `business_parent_code`, `tree_show_parent_code`, `org_type`, `dqhs_org_code`, `create_time`, `modified_name`, `update_time`, `modified_id`) VALUES (3, 'M43000000', 'M34000000', 'C900000000', 3, NULL, NULL, NULL, NULL, NULL);
+INSERT INTO `sync_fjnx_org_business_relation` (`id`, `org_code`, `business_parent_code`, `tree_show_parent_code`, `org_type`, `dqhs_org_code`, `create_time`, `modified_name`, `update_time`, `modified_id`) VALUES (5, 'M45000000', 'M36000000', 'C900000000', 3, NULL, NULL, NULL, NULL, NULL);
+INSERT INTO `sync_fjnx_org_business_relation` (`id`, `org_code`, `business_parent_code`, `tree_show_parent_code`, `org_type`, `dqhs_org_code`, `create_time`, `modified_name`, `update_time`, `modified_id`) VALUES (6, 'M46000000', 'M37000000', 'C900000000', 3, NULL, NULL, NULL, NULL, NULL);
+INSERT INTO `sync_fjnx_org_business_relation` (`id`, `org_code`, `business_parent_code`, `tree_show_parent_code`, `org_type`, `dqhs_org_code`, `create_time`, `modified_name`, `update_time`, `modified_id`) VALUES (7, 'M47000000', 'M38000000', 'C900000000', 3, NULL, NULL, NULL, NULL, NULL);
+INSERT INTO `sync_fjnx_org_business_relation` (`id`, `org_code`, `business_parent_code`, `tree_show_parent_code`, `org_type`, `dqhs_org_code`, `create_time`, `modified_name`, `update_time`, `modified_id`) VALUES (8, '900000000', 'C900000000', 'C900000000', 1, NULL, NULL, NULL, NULL, NULL);
+INSERT INTO `sync_fjnx_org_business_relation` (`id`, `org_code`, `business_parent_code`, `tree_show_parent_code`, `org_type`, `dqhs_org_code`, `create_time`, `modified_name`, `update_time`, `modified_id`) VALUES (9, 'M40000000', '900000000', 'C900000000', 3, NULL, NULL, NULL, NULL, NULL);
+INSERT INTO `sync_fjnx_org_business_relation` (`id`, `org_code`, `business_parent_code`, `tree_show_parent_code`, `org_type`, `dqhs_org_code`, `create_time`, `modified_name`, `update_time`, `modified_id`) VALUES (10, 'M44000000', '900000000', 'C900000000', 3, NULL, NULL, NULL, NULL, NULL);
+INSERT INTO `sync_fjnx_org_business_relation` (`id`, `org_code`, `business_parent_code`, `tree_show_parent_code`, `org_type`, `dqhs_org_code`, `create_time`, `modified_name`, `update_time`, `modified_id`) VALUES (11, 'M31000000', NULL, NULL, 2, 'M39000000', NULL, NULL, NULL, NULL);
+INSERT INTO `sync_fjnx_org_business_relation` (`id`, `org_code`, `business_parent_code`, `tree_show_parent_code`, `org_type`, `dqhs_org_code`, `create_time`, `modified_name`, `update_time`, `modified_id`) VALUES (12, 'M32000000', NULL, NULL, 2, 'M41000000', NULL, NULL, NULL, NULL);
+INSERT INTO `sync_fjnx_org_business_relation` (`id`, `org_code`, `business_parent_code`, `tree_show_parent_code`, `org_type`, `dqhs_org_code`, `create_time`, `modified_name`, `update_time`, `modified_id`) VALUES (13, 'M33000000', NULL, NULL, 2, 'M42000000', NULL, NULL, NULL, NULL);
+INSERT INTO `sync_fjnx_org_business_relation` (`id`, `org_code`, `business_parent_code`, `tree_show_parent_code`, `org_type`, `dqhs_org_code`, `create_time`, `modified_name`, `update_time`, `modified_id`) VALUES (14, 'M34000000', NULL, NULL, 2, 'M43000000', NULL, NULL, NULL, NULL);
+INSERT INTO `sync_fjnx_org_business_relation` (`id`, `org_code`, `business_parent_code`, `tree_show_parent_code`, `org_type`, `dqhs_org_code`, `create_time`, `modified_name`, `update_time`, `modified_id`) VALUES (15, 'M35000000', NULL, NULL, 2, 'M39000000', NULL, NULL, NULL, NULL);
+INSERT INTO `sync_fjnx_org_business_relation` (`id`, `org_code`, `business_parent_code`, `tree_show_parent_code`, `org_type`, `dqhs_org_code`, `create_time`, `modified_name`, `update_time`, `modified_id`) VALUES (16, 'M36000000', NULL, NULL, 2, 'M45000000', NULL, NULL, NULL, NULL);
+INSERT INTO `sync_fjnx_org_business_relation` (`id`, `org_code`, `business_parent_code`, `tree_show_parent_code`, `org_type`, `dqhs_org_code`, `create_time`, `modified_name`, `update_time`, `modified_id`) VALUES (17, 'M37000000', NULL, NULL, 2, 'M46000000', NULL, NULL, NULL, NULL);
+INSERT INTO `sync_fjnx_org_business_relation` (`id`, `org_code`, `business_parent_code`, `tree_show_parent_code`, `org_type`, `dqhs_org_code`, `create_time`, `modified_name`, `update_time`, `modified_id`) VALUES (18, 'M38000000', NULL, NULL, 2, 'M47000000', NULL, NULL, NULL, NULL);
+INSERT INTO `sync_fjnx_org_business_relation` (`id`, `org_code`, `business_parent_code`, `tree_show_parent_code`, `org_type`, `dqhs_org_code`, `create_time`, `modified_name`, `update_time`, `modified_id`) VALUES (19, 'M41000000', 'M32000000', 'C900000000', 3, NULL, NULL, NULL, NULL, NULL);

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/evaluate/controller/CoreEvaluatePlanController.java

@@ -18,6 +18,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
 import java.time.LocalDate;
+import java.util.List;
 
 /**
  * 外包评价计划Controller
@@ -35,13 +36,19 @@ public class CoreEvaluatePlanController extends BaseController {
     /**
      * 查询外包评价计划列表
      */
-    @ApiOperation(value = "查询CoreEvaluatePlan列表")
+    @ApiOperation(value = "查询CoreEvaluatePlan列表分页")
     @RequiresPermissions("core:evaluatePlan:list")
     @GetMapping("/list")
     public TableDataInfo list(EvaluateQueryDTO coreEvaluatePlan) {
         return coreEvaluatePlanService.selectPage(coreEvaluatePlan);
     }
 
+    @ApiOperation(value = "查询CoreEvaluatePlan列表全部")
+    @RequiresPermissions("core:evaluatePlan:list")
+    @GetMapping("/allList")
+    public List<CoreEvaluatePlan> allList() {
+        return coreEvaluatePlanService.allList();
+    }
 
     /**
      * 获取外包评价计划详细信息
@@ -70,8 +77,10 @@ public class CoreEvaluatePlanController extends BaseController {
     public AjaxResult add(@RequestBody CoreEvaluatePlanDTO coreEvaluatePlan) {
         return toAjax(coreEvaluatePlanService.insertCoreEvaluatePlan(coreEvaluatePlan));
     }
+
     /**
      * 每季度生成
+     *
      * @param cycle
      * @return
      */
@@ -86,6 +95,7 @@ public class CoreEvaluatePlanController extends BaseController {
             return AjaxResult.error("任务生成失败" + e.getMessage());
         }
     }
+
     /**
      * 修改外包评价计划
      */
@@ -106,12 +116,14 @@ public class CoreEvaluatePlanController extends BaseController {
     public AjaxResult distribute(@PathVariable(value = "id", required = false) Long id) {
         return toAjax(coreEvaluatePlanService.distribute(id));
     }
+
     @ApiOperation(value = "取消下发")
     @RequiresPermissions("core:evaluatePlan:remove")
     @GetMapping(value = "/withdraw/{id}")
     public AjaxResult withdraw(@PathVariable(value = "id", required = false) Long id) {
         return toAjax(coreEvaluatePlanService.withdraw(id));
     }
+
     /**
      * 删除外包评价计划
      */

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/evaluate/controller/CoreEvaluateTaskController.java

@@ -43,6 +43,7 @@ public class CoreEvaluateTaskController extends BaseController {
     public TableDataInfo<CoreEvaluateTaskVO> list(EvaluateTaskDTO coreEvaluateTask) {
         return coreEvaluateTaskService.selectPage(coreEvaluateTask);
     }
+
     /**
      * 查询外包评价任务列表app
      */
@@ -52,11 +53,12 @@ public class CoreEvaluateTaskController extends BaseController {
     public TableDataInfo<CoreEvaluateTaskVO> appList(EvaluateTaskDTO coreEvaluateTask) {
         return coreEvaluateTaskService.selectAPPPage(coreEvaluateTask);
     }
+
     @ApiOperation(value = "统计")
     @RequiresPermissions("core:evaluateTask:list")
     @GetMapping("/statistics")
-    public List<Map> statistics(EvaluateTaskStatisticsDTO evaluateTaskStatisticsDTO) {
-        return coreEvaluateTaskService.statistics(evaluateTaskStatisticsDTO);
+    public AjaxResult statistics(EvaluateTaskStatisticsDTO evaluateTaskStatisticsDTO) {
+        return success(coreEvaluateTaskService.statistics(evaluateTaskStatisticsDTO));
     }
 
     /**
@@ -68,6 +70,7 @@ public class CoreEvaluateTaskController extends BaseController {
     public AjaxResult getInfo(@PathVariable("id") Long id) {
         return success(coreEvaluateTaskService.selectCoreEvaluateTaskContentById(id));
     }
+
     /**
      * 获取外包评价任务详细信息
      */
@@ -77,6 +80,7 @@ public class CoreEvaluateTaskController extends BaseController {
     public AjaxResult details(@PathVariable("id") Long id) {
         return success(coreEvaluateTaskService.selectCoreEvaluateTaskById(id));
     }
+
     /**
      * 新增外包评价任务
      */

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/evaluate/mapper/CoreEvaluatePlanMapper.java

@@ -76,4 +76,6 @@ public interface CoreEvaluatePlanMapper extends BaseMapper<CoreEvaluatePlan> {
      * @return
      */
     List<CoreEvaluatePlan>selectPlanByCycle(String cycle);
+
+    List<CoreEvaluatePlan>allList();
 }

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/evaluate/mapper/CoreEvaluateTaskMapper.java

@@ -11,6 +11,7 @@ import com.xunmei.core.evaluate.vo.CoreEvaluatePlanListVO;
 import com.xunmei.core.evaluate.vo.CoreEvaluateTaskVO;
 import org.apache.ibatis.annotations.Param;
 
+import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
 
@@ -70,8 +71,12 @@ public interface CoreEvaluateTaskMapper extends BaseMapper<CoreEvaluateTask> {
     int deleteCoreEvaluateTaskByIds(Long[] ids);
 
     Page<CoreEvaluateTaskVO> selectPageList(@Param("page") Page<CoreEvaluateTaskVO> page, @Param("request") EvaluateTaskDTO request);
+
     Page<CoreEvaluateTaskVO> selectAppPageList(@Param("page") Page<CoreEvaluateTaskVO> page, @Param("request") EvaluateTaskDTO request);
+
     Page<Map> statistics(@Param("page") Page<Map> page, @Param("request") EvaluateTaskStatisticsDTO request);
-List<Map>statisticsAll(@Param("request") EvaluateTaskStatisticsDTO request);
+
+    List<LinkedHashMap> statisticsAll(@Param("request") EvaluateTaskStatisticsDTO request);
+
     List<Map> getContentByTaskId(@Param("id") Long id);
 }

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/evaluate/service/ICoreEvaluatePlanService.java

@@ -89,4 +89,5 @@ int withdraw(Long id);
      * @return Page
      */
     TableDataInfo<CoreEvaluatePlanListVO> selectPage(EvaluateQueryDTO evaluateQueryDTO);
+    List<CoreEvaluatePlan>allList();
 }

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/evaluate/service/ICoreEvaluateTaskService.java

@@ -9,6 +9,7 @@ import com.xunmei.core.evaluate.dto.EvaluateTaskDTO;
 import com.xunmei.core.evaluate.dto.EvaluateTaskStatisticsDTO;
 import com.xunmei.core.evaluate.vo.CoreEvaluateTaskVO;
 
+import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
 
@@ -95,5 +96,5 @@ public interface ICoreEvaluateTaskService extends IService<CoreEvaluateTask> {
      * @param evaluateTaskDTO
      * @return
      */
-    List<Map> statistics(EvaluateTaskStatisticsDTO evaluateTaskDTO);
+    List<LinkedHashMap> statistics(EvaluateTaskStatisticsDTO evaluateTaskDTO);
 }

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/evaluate/service/impl/CoreEvaluatePlanServiceImpl.java

@@ -248,9 +248,6 @@ public class CoreEvaluatePlanServiceImpl extends ServiceImpl<CoreEvaluatePlanMap
             coreEvaluatePlanContent.setEvaluateId(coreEvaluatePlanDTO.getId());
             coreEvaluatePlanContentMapper.insert(coreEvaluatePlanContent);
         });
-      /*  if (coreEvaluatePlanDTO.getBuildTaskNow()) {
-            this.distribute(coreEvaluatePlanDTO.getId());
-        }*/
         return i;
     }
 
@@ -402,4 +399,9 @@ public class CoreEvaluatePlanServiceImpl extends ServiceImpl<CoreEvaluatePlanMap
         //抓换为TableDataInfo适配前端
         return TableDataInfo.build(page);
     }
+
+    @Override
+    public List<CoreEvaluatePlan> allList() {
+        return baseMapper.allList();
+    }
 }

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/evaluate/service/impl/CoreEvaluateTaskServiceImpl.java

@@ -107,7 +107,7 @@ public class CoreEvaluateTaskServiceImpl extends ServiceImpl<CoreEvaluateTaskMap
     }
 
     @Override
-    public List<Map> statistics(EvaluateTaskStatisticsDTO evaluateTaskStatisticsDTO) {
+    public List<LinkedHashMap> statistics(EvaluateTaskStatisticsDTO evaluateTaskStatisticsDTO) {
         Page<Map> page;
         //分页
         if (evaluateTaskStatisticsDTO.getPageNum() != null && evaluateTaskStatisticsDTO.getPageSize() != null) {
@@ -117,10 +117,13 @@ public class CoreEvaluateTaskServiceImpl extends ServiceImpl<CoreEvaluateTaskMap
         }
         SysOrg sysOrg = remoteOrgService.selectSysOrgById(evaluateTaskStatisticsDTO.getOrgId(), SecurityConstants.INNER);
         evaluateTaskStatisticsDTO.setOrgPath(sysOrg.getPath());
-        List<Map> rows = baseMapper.statisticsAll(evaluateTaskStatisticsDTO);
+        evaluateTaskStatisticsDTO.setOrgId(null);
+        evaluateTaskStatisticsDTO.setOrgPath(null);
+        List<LinkedHashMap> rows = baseMapper.statisticsAll(evaluateTaskStatisticsDTO);
 
         for (int i = 0; i < rows.size(); i++) {
             Object id = rows.get(i).get("id");
+            rows.get(i).remove("id");
             List<Map> contentByTaskId = baseMapper.getContentByTaskId((Long) id);
             if (CollectionUtils.isNotEmpty(contentByTaskId)) {
                 int total = 0;

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/reportForms/monitor/controller/MonitorAccessReportController.java

@@ -1,10 +1,16 @@
 package com.xunmei.core.reportForms.monitor.controller;
+import com.xunmei.common.core.constant.SecurityConstants;
+import com.xunmei.common.core.web.domain.AjaxResult;
 import com.xunmei.common.core.web.page.TableDataInfo;
 import com.xunmei.common.log.annotation.Log;
 import com.xunmei.common.log.enums.BusinessType;
 import com.xunmei.common.security.annotation.RequiresPermissions;
+import com.xunmei.common.security.utils.SecurityUtils;
 import com.xunmei.core.reportForms.monitor.dto.MonitoringAccessDTO;
 import com.xunmei.core.reportForms.monitor.service.MonitorAccessReportService;
+import com.xunmei.core.reportForms.monitor.vo.MonitoringAccessVO;
+import com.xunmei.system.api.RemoteOrgService;
+import com.xunmei.system.api.domain.SysOrg;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -12,8 +18,11 @@ import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
+
+import javax.annotation.Resource;
 import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
+import java.time.LocalDate;
 
 /**
  * @author :LuoWei
@@ -25,12 +34,21 @@ import java.io.IOException;
 public class MonitorAccessReportController {
     @Autowired
     private MonitorAccessReportService monitorAccessReportService;
-
+    @Resource
+    private RemoteOrgService remoteOrgService;
     @ApiOperation(value = "监控调阅报表")
     @RequiresPermissions("core:monitorAccessReport:list")
     @GetMapping("/list")
-    public TableDataInfo list(MonitoringAccessDTO monitoringAccessDTO) {
-        return monitorAccessReportService.report(monitoringAccessDTO);
+    public AjaxResult list(MonitoringAccessDTO monitoringAccessDTO) {
+        if (null==monitoringAccessDTO.getCycle()){
+            monitoringAccessDTO.setCycle("2");
+        }
+        AjaxResult ajax = AjaxResult.success();
+        TableDataInfo<MonitoringAccessVO> report = monitorAccessReportService.report(monitoringAccessDTO);
+        ajax.put(AjaxResult.DATA_TAG,report);
+        String title = monitorAccessReportService.getTitle(monitoringAccessDTO);
+        ajax.put("title",title);
+        return ajax;
     }
     /**
      * 导出excel

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/reportForms/monitor/service/MonitorAccessReportService.java

@@ -17,4 +17,5 @@ public interface MonitorAccessReportService {
     TableDataInfo<MonitoringAccessVO> report(MonitoringAccessDTO monitoringAccessDTO);
     List<MonitoringAccessVO>selectAll(MonitoringAccessDTO monitoringAccessDTO);
     void export(MonitoringAccessDTO monitoringAccessDTO, HttpServletResponse response) throws IOException;
+    String getTitle(MonitoringAccessDTO monitoringAccessDTO);
 }

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/reportForms/monitor/service/impl/MonitorAccessReportServiceImpl.java

@@ -7,6 +7,7 @@ import com.xunmei.common.core.constant.SecurityConstants;
 import com.xunmei.common.core.domain.retrieval.vo.CoreMonitoringRetrievalTaskExcelVo;
 import com.xunmei.common.core.utils.DateHelper;
 import com.xunmei.common.core.web.page.TableDataInfo;
+import com.xunmei.common.security.utils.SecurityUtils;
 import com.xunmei.core.access.vo.TMonitoringRetrievalPlanVO;
 import com.xunmei.core.reportForms.monitor.dto.MonitoringAccessDTO;
 import com.xunmei.core.reportForms.monitor.mapper.MonitorAccessReportMapper;
@@ -23,6 +24,9 @@ import javax.annotation.Resource;
 import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
 import java.net.URLEncoder;
+import java.text.SimpleDateFormat;
+import java.time.LocalDate;
+import java.util.Calendar;
 import java.util.Date;
 import java.util.List;
 
@@ -36,6 +40,7 @@ public class MonitorAccessReportServiceImpl implements MonitorAccessReportServic
     private MonitorAccessReportMapper monitorAccessReportMapper;
     @Resource
     private RemoteOrgService remoteOrgService;
+
     @Override
     public TableDataInfo<MonitoringAccessVO> report(MonitoringAccessDTO monitoringAccessDTO) {
         Page<MonitoringAccessVO> page;
@@ -44,7 +49,7 @@ public class MonitorAccessReportServiceImpl implements MonitorAccessReportServic
         } else {
             page = new Page<>();
         }
-        if (null!=monitoringAccessDTO.getOrgId()){
+        if (null != monitoringAccessDTO.getOrgId()) {
             SysOrg sysOrg = remoteOrgService.selectSysOrgById(monitoringAccessDTO.getOrgId(), SecurityConstants.INNER);
             monitoringAccessDTO.setOrgPath(sysOrg.getPath());
         }
@@ -60,7 +65,7 @@ public class MonitorAccessReportServiceImpl implements MonitorAccessReportServic
     public List<MonitoringAccessVO> selectAll(MonitoringAccessDTO monitoringAccessDTO) {
 
         List<MonitoringAccessVO> monitoringAccessVOS = monitorAccessReportMapper.selectAll(monitoringAccessDTO);
-        monitoringAccessVOS.forEach(m->{
+        monitoringAccessVOS.forEach(m -> {
             Integer integer = monitorAccessReportMapper.selectNetworkNumberByPath(m.getPath());
             m.setNetworkNumber(integer);
         });
@@ -70,10 +75,10 @@ public class MonitorAccessReportServiceImpl implements MonitorAccessReportServic
     @Override
     public void export(MonitoringAccessDTO monitoringAccessDTO, HttpServletResponse response) throws IOException {
         String orgName = null;
-        if (null!=monitoringAccessDTO.getOrgId()){
+        if (null != monitoringAccessDTO.getOrgId()) {
             SysOrg sysOrg = remoteOrgService.selectSysOrgById(monitoringAccessDTO.getOrgId(), SecurityConstants.INNER);
             monitoringAccessDTO.setOrgPath(sysOrg.getPath());
-            orgName=sysOrg.getName();
+            orgName = sysOrg.getName();
         }
         List<MonitoringAccessVO> monitoringAccessVOS = this.selectAll(monitoringAccessDTO);
         if (ObjectUtil.isEmpty(monitoringAccessVOS)) {
@@ -93,4 +98,57 @@ public class MonitorAccessReportServiceImpl implements MonitorAccessReportServic
         // 调用EasyExcel的导出方法
         EasyExcel.write(response.getOutputStream(), MonitoringAccessVO.class).sheet("Sheet1").doWrite(monitoringAccessVOS);
     }
+
+    @Override
+    public String getTitle(MonitoringAccessDTO monitoringAccessDTO) {
+        if (null == monitoringAccessDTO.getOrgId()) {
+            monitoringAccessDTO.setOrgId(SecurityUtils.getLoginUser().getOrgId());
+        }
+        SysOrg sysOrg = remoteOrgService.selectSysOrgById(monitoringAccessDTO.getOrgId(), SecurityConstants.INNER);
+        String timeUnit = "年";
+        int amount = 0;
+        LocalDate lastDayOfMonth;
+        switch (monitoringAccessDTO.getCycle()) {
+            case "2":
+                amount = 7;
+                timeUnit = "周";
+                break;
+            case "3":
+                LocalDate currentDate = LocalDate.now();
+                lastDayOfMonth = currentDate.withDayOfMonth(currentDate.lengthOfMonth());
+                amount = lastDayOfMonth.getDayOfMonth() - currentDate.getDayOfMonth();
+                timeUnit = "月";
+                break;
+            default:
+                amount = getDayNum(12);
+                break;
+        }
+        Calendar cal = Calendar.getInstance();
+        cal.setTime(new Date());
+        cal.add(Calendar.DATE, -amount);
+        Date time = cal.getTime();
+        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
+        String title = sysOrg.getShortName() + "监控调阅" + timeUnit + "报(" + sdf.format(time) + "~" + sdf.format(new Date()) + ")";
+        return title;
+    }
+
+    private int getDayNum(int monthsToAdd) {
+        LocalDate lastDayOfMonth;
+        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
+        LocalDate localDate = LocalDate.now();
+        LocalDate nextMonthFirstDay = null;
+        nextMonthFirstDay = localDate.plusMonths(monthsToAdd).withDayOfMonth(1);
+        lastDayOfMonth = nextMonthFirstDay.minusDays(1);
+        int dayNum = 0;
+        try {
+            Date d1 = sdf.parse(lastDayOfMonth.toString());
+            Date d2 = sdf.parse(localDate.toString());
+            long date_interval = Math.abs(d1.getTime() - d2.getTime());//绝对值
+            long day = 1000 * 24 * 60 * 60;//1000*24*60*60毫秒是一天
+            dayNum = new Long(date_interval / day).intValue();
+        } catch (Exception e) {
+            e.getMessage();
+        }
+        return dayNum;
+    }
 }

soc-modules/soc-modules-core/src/main/resources/mapper/evaluate/CoreEvaluatePlanMapper.xml

@@ -110,6 +110,9 @@
           AND
             evaluate_cycle = #{cycle}
     </select>
+    <select id="allList" resultType="com.xunmei.core.evaluate.domain.CoreEvaluatePlan">
+        SELECT * FROM core_evaluate_plan
+    </select>
 
     <insert id="insertCoreEvaluatePlan" parameterType="com.xunmei.core.evaluate.domain.CoreEvaluatePlan">
         insert into core_evaluate_plan

soc-modules/soc-modules-core/src/main/resources/mapper/evaluate/CoreEvaluateTaskMapper.xml

@@ -184,43 +184,24 @@
         </if>
         GROUP BY a.id
     </select>
-    <select id="statisticsAll" resultType="java.util.Map">
-        SELECT
-        a.id,
-        a.org_name,
-        GROUP_CONCAT( c.role_name ) as roleName,
-        a.evaluate_name,
-        a.start_time,
-        a.end_time,
-        a.evaluate_by,
-        a.complete_time,
-        a.`status`,
-        IFNULL( SUM( d.score )/ COUNT( d.id ), 0 )  AS averageScore
-        FROM
-        core_evaluate_task a
-        LEFT JOIN core_evaluate_role b ON b.evaluate_id = a.plan_id
-        LEFT JOIN sys_role c ON c.id = b.role_id
-        LEFT JOIN core_evaluate_task_user e ON e.task_id=a.id
-        LEFT JOIN core_evaluate_task_user_content d on d.task_user_id=e.id
-        WHERE
-        a. is_deleted =0
-        <if test="request.orgId != null ">
-            and a.org_id = #{request.orgId}
-        </if>
-        <if test="request.orgPath != null  and request.orgPath != ''">
-            and a.org_path like concat( #{request.orgPath}, '%')
-        </if>
-        <if test="request.evaluateName != null  and request.evaluateName != ''">
-            and a.evaluate_name like concat('%', #{request.evaluateName}, '%')
-        </if>
-
-        <if test="request.status != null and '' neq request.status">
-            and a.status = #{request.status}
-        </if>
-        <if test="request.date != null and request.date != ''">
-            and e.complete_time like concat( #{request.date}, '%')
-        </if>
-        GROUP BY a.id
+    <select id="statisticsAll" resultType="java.util.LinkedHashMap">
+            SELECT
+            c.id AS id,
+            a.org_name AS '评价机构',
+            d.score AS '被评价机构名称'
+            FROM
+            core_evaluate_task_user_content d LEFT JOIN
+            core_evaluate_task_user c ON d.task_user_id=c.id AND d.code=1 LEFT JOIN
+            core_evaluate_task a ON a.id=c.task_id
+            LEFT JOIN core_evaluate_plan b ON a.plan_id = b.id
+            WHERE
+            a.`status` = 2
+            <if test="request.orgPath != null  and request.orgPath != ''">
+                AND a.org_path like concat(#{request.orgPath}, '%')
+            </if>
+            <if test="request.planId != null">
+                AND b.id = #{request.planId}
+            </if>
     </select>