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

project_data/sql/0.0.4/soc/soc.sql

@@ -5,6 +5,17 @@ DELETE FROM `sys_dict_data` WHERE dict_type='rule_status';
 INSERT INTO `sys_dict_type` (`dict_id`, `dict_name`, `dict_type`, `status`, `create_by`, `create_time`, `update_by`, `update_time`, `remark`) VALUES (20231113157, '手册状态', 'rule_status', '0', 'jwx', '2023-11-27 14:55:51', '', NULL, NULL);
 INSERT INTO `sys_dict_data` (`dict_code`, `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 (20231114641, 0, '启用', '0', 'rule_status', NULL, 'default', 'N', '0', 'jwx', '2023-11-27 14:56:36', '', NULL, NULL);
 INSERT INTO `sys_dict_data` (`dict_code`, `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 (20231114643, 1, '停用', '1', 'rule_status', NULL, 'default', 'N', '0', 'jwx', '2023-11-27 14:56:44', '', NULL, NULL);
+DELETE FROM `sys_dict_data` WHERE dict_type='current_position';
+INSERT INTO `sys_dict_data` (`dict_code`, `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 (416, 1, '安全保卫部负责人', '1', 'current_position', NULL, 'default', 'N', '0', 'jwx', '2023-11-27 14:56:44', '', NULL, NULL);
+INSERT INTO `sys_dict_data` (`dict_code`, `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 (417, 2, '监控中心负责人', '2', 'current_position', NULL, 'default', 'N', '0', 'jwx', '2023-11-27 14:56:44', '', NULL, NULL);
+INSERT INTO `sys_dict_data` (`dict_code`, `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 (418, 3, '一般管理人员', '3', 'current_position', NULL, 'default', 'N', '0', 'jwx', '2023-11-27 14:56:44', '', NULL, NULL);
+INSERT INTO `sys_dict_data` (`dict_code`, `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 (419, 4, '监控中心操作人员', '4', 'current_position', NULL, 'default', 'N', '0', 'jwx', '2023-11-27 14:56:44', '', NULL, NULL);
+INSERT INTO `sys_dict_data` (`dict_code`, `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 (420, 5, '监控中心技术维护岗', '5', 'current_position', NULL, 'default', 'N', '0', 'jwx', '2023-11-27 14:56:44', '', NULL, NULL);
 -- 字典名称修改: "教育培训资料类型"->"知识库资料类型"
 update sys_dict_type set dict_name='知识库资料类型' where dict_type='edu_materials_type' limit 1;
 
@@ -14,7 +25,7 @@ update sys_dict_data set dict_label='登记中' where dict_type='edu_training_do
 -- 履职状态描述变更
 update sys_dict_data set dict_label='履职中' where dict_type='resumption_status' and dict_label='进行中' and dict_value=2 LIMIT 1;
 
-delete from sys_menu where id in (1731503585113534466,1729308502301728769,1731496383090913282,1731498925506031618,1731499700525330433,1731501484262158338,1731502833360039937);
+delete from sys_menu where id in (1731872300761878529,1731503585113534466,1729308502301728769,1731496383090913282,1731498925506031618,1731499700525330433,1731501484262158338,1731502833360039937);
 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 (1729308502301728769, '导出全省农信系统物防建设达标情况', 103, 5, '', null, null, 1, 0, 'F', '0', '0', 'system:dept:exportConstruction', '1', null, null, null, now(), '', null, '');
 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`)
@@ -29,9 +40,18 @@ INSERT INTO `sys_menu`(`id`, `menu_name`, `parent_id`, `order_num`, `path`, `com
 VALUES (1731502833360039937, '导出', 1724607752400044034, 1, '', NULL, NULL, 1, 0, 'F', '0', '0', 'core:resumptionReport:export', '1', NULL, NULL, '省联社账号', '2023-11-28 15:52:54', '', NULL, '');
 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 (1731503585113534466, '导出', 1726904309791121409, 1, '', NULL, NULL, 1, 0, 'F', '0', '0', 'core:safetyInspectReport:export', '1', NULL, NULL, '省联社账号', '2023-11-28 15:52:54', '', NULL, '');
+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 (1731872300761878529, '导出', 1719892877586239490, 1, '', NULL, NULL, 1, 0, 'F', '0', '0', 'core:evaluateTaskReport:export', '1', NULL, NULL, '省联社账号', '2023-11-28 15:52:54', '', NULL, '');
+
 
+delete from sys_role_menu where menu_id in (1731872300761878529,1731503585113534466,1731502833360039937,1729308502301728769,1731496383090913282,1731498925506031618,1731499700525330433,1731501484262158338);
+INSERT INTO `sys_role_menu` (`role_id`, `menu_id`) VALUES (115, 1731872300761878529);
+INSERT INTO `sys_role_menu` (`role_id`, `menu_id`) VALUES (116, 1731872300761878529);
+INSERT INTO `sys_role_menu` (`role_id`, `menu_id`) VALUES (117, 1731872300761878529);
+INSERT INTO `sys_role_menu` (`role_id`, `menu_id`) VALUES (118, 1731872300761878529);
+INSERT INTO `sys_role_menu` (`role_id`, `menu_id`) VALUES (119, 1731872300761878529);
+INSERT INTO `sys_role_menu` (`role_id`, `menu_id`) VALUES (120, 1731872300761878529);
 
-delete from sys_role_menu where menu_id in (1731503585113534466,1731502833360039937,1729308502301728769,1731496383090913282,1731498925506031618,1731499700525330433,1731501484262158338);
 INSERT INTO `sys_role_menu` (`role_id`, `menu_id`) VALUES (115, 1731503585113534466);
 INSERT INTO `sys_role_menu` (`role_id`, `menu_id`) VALUES (116, 1731503585113534466);
 INSERT INTO `sys_role_menu` (`role_id`, `menu_id`) VALUES (117, 1731503585113534466);
@@ -94,6 +114,12 @@ 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);
+-- 添加行社高管部署登记主持人字典
+DELETE FROM `sys_dict_type` WHERE `dict_type`='hsggbsdj_role';
+INSERT INTO `sys_dict_type`(`dict_id`, `dict_name`, `dict_type`, `status`, `create_by`, `create_time`, `update_by`, `update_time`, `remark`) VALUES (20231113159, '行社高管部署登记主持人', 'hsggbsdj_role', '0', '省联社账号', '2023-12-05 14:56:22', '', NULL, NULL);
+DELETE FROM `sys_dict_data` WHERE `dict_type`='hsggbsdj_role';
+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 ( 0, '董事长', '1', 'hsggbsdj_role', NULL, 'default', 'N', '0', '省联社账号', '2023-12-05 14:56:48', '', NULL, 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 ( 0, '行长', '2', 'hsggbsdj_role', NULL, 'default', 'N', '0', '省联社账号', '2023-12-05 14:56:55', '', NULL, NULL);
 
 
 
@@ -162,6 +188,18 @@ DROP PROCEDURE
         ALTER TABLE `core_safety_book_user` ADD COLUMN `party_b_org` VARCHAR ( 255 ) NULL COMMENT '乙方机构';
 
     END IF;
+    -- 行社高管部署登记修改主持人
+    IF
+        NOT EXISTS ( SELECT * FROM INFORMATION_SCHEMA.COLUMNS WHERE table_schema = DATABASE () AND TABLE_NAME = 'core_safety_book_hsggbsdj' AND COLUMN_NAME = 'role_id' ) THEN
+        ALTER TABLE `core_safety_book_hsggbsdj` ADD COLUMN `role_id` bigint NULL COMMENT '主持人';
+
+    END IF;
+
+    IF
+NOT EXISTS ( SELECT * FROM INFORMATION_SCHEMA.COLUMNS WHERE table_schema = DATABASE () AND TABLE_NAME = 'sys_device' AND COLUMN_NAME = 'definition' ) THEN
+ALTER TABLE `sys_device` ADD COLUMN `definition` VARCHAR ( 2 ) NULL COMMENT '是否高清';
+
+END IF;
 
 END ??
 DELIMITER;

soc-api/soc-api-system/src/main/java/com/xunmei/system/api/domain/CheckDataVo.java

@@ -15,6 +15,7 @@ public class CheckDataVo {
     private Long itemId;
 
     private String pointName;
+    private String rectificationDeadline;
 
     private int pointNum;
 

soc-api/soc-api-system/src/main/java/com/xunmei/system/api/domain/SysDevice.java

@@ -102,7 +102,8 @@ public class SysDevice extends BaseEntity {
      */
     @ApiModelProperty(value = "通道号")
     private Long channel;
-
+    @ApiModelProperty(value = "是否高清")
+    private String definition;
 
     @Override
     public String toString() {

soc-common/soc-common-core/src/main/java/com/xunmei/common/core/domain/worktime/domain/SysWorkTime.java

@@ -230,7 +230,8 @@ public class SysWorkTime extends BaseEntity {
      */
     @ApiModelProperty(value = "分钟")
     private Long ymdMinute;
-
+    @TableField(exist = false)
+    private Long orgType;
     /**
      * 是否手动配置1是0否
      */

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

@@ -3,6 +3,7 @@ package com.xunmei.core.evaluate.controller;
 
 import cn.hutool.core.date.DateTime;
 import cn.hutool.core.date.DateUtil;
+import com.xunmei.common.core.constant.SecurityConstants;
 import com.xunmei.common.core.utils.DateUtils;
 import com.xunmei.common.core.web.controller.BaseController;
 import com.xunmei.common.core.web.domain.AjaxResult;
@@ -18,12 +19,18 @@ import com.xunmei.core.evaluate.service.ICoreEvaluatePlanService;
 import com.xunmei.core.evaluate.service.ICoreEvaluateTaskService;
 import com.xunmei.core.evaluate.vo.CoreEvaluatePlanVO;
 import com.xunmei.core.evaluate.vo.CoreEvaluateTaskVO;
+import com.xunmei.core.reportForms.monitor.dto.MonitoringAccessDTO;
 import com.xunmei.core.retrieval.service.impl.CoreMonitoringRetrievalTaskServiceImpl;
+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;
 import org.springframework.web.bind.annotation.*;
 
+import javax.annotation.Resource;
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
 import java.time.LocalDate;
 import java.util.Date;
 import java.util.List;
@@ -45,7 +52,8 @@ public class CoreEvaluateTaskController extends BaseController {
     private ICoreEvaluatePlanService coreEvaluatePlanService;
     @Autowired
     private CoreMonitoringRetrievalTaskServiceImpl coreMonitoringRetrievalTaskService;
-
+    @Resource
+    private RemoteOrgService remoteOrgService;
     /**
      * 查询外包评价任务列表
      */
@@ -65,6 +73,40 @@ public class CoreEvaluateTaskController extends BaseController {
     public TableDataInfo<CoreEvaluateTaskVO> appList(EvaluateTaskDTO coreEvaluateTask) {
         return coreEvaluateTaskService.selectAPPPage(coreEvaluateTask);
     }
+
+    @ApiOperation(value = "外包履职评价导出")
+    @RequiresPermissions("core:evaluateTaskReport:export")
+    @Log(title = "外包履职评价导出", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(EvaluateTaskStatisticsDTO evaluateTaskStatisticsDTO, HttpServletResponse response) throws IOException {
+        if (null != evaluateTaskStatisticsDTO.getPlanId()) {
+            CoreEvaluatePlanVO coreEvaluatePlanVO = coreEvaluatePlanService.selectCoreEvaluatePlanById(evaluateTaskStatisticsDTO.getPlanId());
+            LocalDate localDate = LocalDate.now();
+            try {
+                switch (coreEvaluatePlanVO.getEvaluateCycle()) {
+                    case "0":
+                        evaluateTaskStatisticsDTO.setStartTime(DateUtils.parseDate(localDate.getYear() + "-" + localDate.getMonthValue() + "-01 00:00:00", "yyyy-MM-dd HH:mm:ss", "yyyy-MM-dd HH:mm:ss.SSS"));
+                        String lastDay = coreMonitoringRetrievalTaskService.getLastDay(localDate.getYear(), localDate.getMonthValue(), "yyyy-MM-dd");
+                        evaluateTaskStatisticsDTO.setEndTime(DateUtils.parseDate(lastDay + " 23:59:59", "yyyy-MM-dd HH:mm:ss", "yyyy-MM-dd HH:mm:ss.SSS"));
+                        break;
+                    case "1":
+                        DateTime beginOfQuarter = DateUtil.beginOfQuarter(new java.util.Date());
+                        DateTime endOfQuarter = DateUtil.endOfQuarter(new Date());
+                        evaluateTaskStatisticsDTO.setStartTime(beginOfQuarter);
+                        evaluateTaskStatisticsDTO.setEndTime(endOfQuarter);
+                        break;
+                    default:
+                        evaluateTaskStatisticsDTO.setStartTime(DateUtils.parseDate(localDate.getYear() + "-01-01 00:00:00", "yyyy-MM-dd HH:mm:ss", "yyyy-MM-dd HH:mm:ss.SSS"));
+                        evaluateTaskStatisticsDTO.setEndTime(DateUtils.parseDate(localDate.getYear() + "-12-31 23:59:59", "yyyy-MM-dd HH:mm:ss", "yyyy-MM-dd HH:mm:ss.SSS"));
+                        break;
+                }
+            } catch (Exception e) {
+                e.printStackTrace();
+            }
+        }
+        coreEvaluateTaskService.export(evaluateTaskStatisticsDTO, response);
+    }
+
     @ApiOperation(value = "统计")
     @RequiresPermissions("core:evaluateTask:list")
     @GetMapping("/statistics")
@@ -104,6 +146,8 @@ public class CoreEvaluateTaskController extends BaseController {
             ajaxResult.put("tittle", coreEvaluatePlanVO.getEvaluateName() + "(" + dateTitle);
         }
         ajaxResult.put(AjaxResult.DATA_TAG, coreEvaluateTaskService.statistics(evaluateTaskStatisticsDTO));
+        SysOrg sysOrg = remoteOrgService.selectSysOrgById(evaluateTaskStatisticsDTO.getOrgId(), SecurityConstants.INNER);
+        ajaxResult.put("orgName", sysOrg.getShortName());
         return ajaxResult;
     }
 

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

@@ -6,9 +6,11 @@ import com.xunmei.common.core.web.page.TableDataInfo;
 import com.xunmei.core.evaluate.domain.CoreEvaluatePlan;
 import com.xunmei.core.evaluate.dto.CoreEvaluatePlanDTO;
 import com.xunmei.core.evaluate.dto.EvaluateQueryDTO;
+import com.xunmei.core.evaluate.dto.EvaluateTaskStatisticsDTO;
 import com.xunmei.core.evaluate.vo.CoreEvaluatePlanListVO;
 import com.xunmei.core.evaluate.vo.CoreEvaluatePlanVO;
 
+import javax.servlet.http.HttpServletResponse;
 import java.util.List;
 
 /**

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

@@ -11,6 +11,8 @@ import com.xunmei.core.evaluate.dto.EvaluateTaskDTO;
 import com.xunmei.core.evaluate.dto.EvaluateTaskStatisticsDTO;
 import com.xunmei.core.evaluate.vo.CoreEvaluateTaskVO;
 
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
 import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
@@ -100,4 +102,6 @@ public interface ICoreEvaluateTaskService extends IService<CoreEvaluateTask> {
      * @return
      */
     Map  statistics(EvaluateTaskStatisticsDTO evaluateTaskDTO);
+
+    void export(EvaluateTaskStatisticsDTO evaluateTaskStatisticsDTO, HttpServletResponse response)throws IOException;
 }

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

@@ -14,6 +14,7 @@ import com.xunmei.common.security.utils.SecurityUtils;
 import com.xunmei.core.evaluate.domain.*;
 import com.xunmei.core.evaluate.dto.CoreEvaluatePlanDTO;
 import com.xunmei.core.evaluate.dto.EvaluateQueryDTO;
+import com.xunmei.core.evaluate.dto.EvaluateTaskStatisticsDTO;
 import com.xunmei.core.evaluate.mapper.CoreEvaluateContentMapper;
 import com.xunmei.core.evaluate.mapper.CoreEvaluatePlanContentMapper;
 import com.xunmei.core.evaluate.mapper.CoreEvaluatePlanMapper;
@@ -31,6 +32,7 @@ import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import javax.annotation.Resource;
+import javax.servlet.http.HttpServletResponse;
 import java.text.SimpleDateFormat;
 import java.time.LocalDate;
 import java.time.ZoneId;

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

@@ -3,6 +3,7 @@ package com.xunmei.core.evaluate.service.impl;
 
 import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.util.ObjectUtil;
+import com.alibaba.excel.EasyExcel;
 import com.alibaba.nacos.shaded.org.checkerframework.checker.units.qual.C;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
@@ -13,6 +14,7 @@ import com.xunmei.common.core.constant.SecurityConstants;
 import com.xunmei.common.core.domain.panel.dto.PanelListDto;
 import com.xunmei.common.core.domain.panel.enums.PanelTypeEnums;
 import com.xunmei.common.core.domain.panel.vo.PanelListVo;
+import com.xunmei.common.core.utils.DateHelper;
 import com.xunmei.common.core.utils.DateUtils;
 import com.xunmei.common.core.utils.StringUtils;
 import com.xunmei.common.core.web.page.TableDataInfo;
@@ -28,6 +30,7 @@ import com.xunmei.core.evaluate.mapper.*;
 import com.xunmei.core.evaluate.service.ICoreEvaluatePlanService;
 import com.xunmei.core.evaluate.service.ICoreEvaluateTaskService;
 import com.xunmei.core.evaluate.vo.*;
+import com.xunmei.core.reportForms.monitor.vo.MonitoringAccessVO;
 import com.xunmei.system.api.RemoteOrgService;
 import com.xunmei.system.api.RemoteRoleService;
 import com.xunmei.system.api.RemoteUserService;
@@ -39,6 +42,9 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+import java.net.URLEncoder;
 import java.util.*;
 import java.util.stream.Collectors;
 
@@ -120,6 +126,55 @@ public class CoreEvaluateTaskServiceImpl extends ServiceImpl<CoreEvaluateTaskMap
         return panelListVos;
     }
 
+    @Override
+    public void export(EvaluateTaskStatisticsDTO evaluateTaskStatisticsDTO, HttpServletResponse response) throws IOException {
+        String orgName = null;
+        if (null != evaluateTaskStatisticsDTO.getOrgId()) {
+            SysOrg sysOrg = remoteOrgService.selectSysOrgById(evaluateTaskStatisticsDTO.getOrgId(), SecurityConstants.INNER);
+            orgName = sysOrg.getName();
+        }
+        List<SysOrg> sysOrgs = remoteOrgService.selectSysOrgByParentId(evaluateTaskStatisticsDTO.getOrgId(), SecurityConstants.INNER);
+        List<EvaluateTaskExportVO> list = new ArrayList<>();
+        for (int i = 0; i < sysOrgs.size(); i++) {
+            EvaluateTaskExportVO evaluateTaskExportVO = new EvaluateTaskExportVO();
+            evaluateTaskExportVO.setOrderNum(i + 1);
+            evaluateTaskExportVO.setOrgName(sysOrgs.get(i).getShortName());
+            evaluateTaskStatisticsDTO.setOrgId(sysOrgs.get(i).getId());
+            LinkedHashMap linkedHashMap = baseMapper.statisticsAll(evaluateTaskStatisticsDTO);
+            if (null == linkedHashMap) {
+                evaluateTaskExportVO.setEvaluatedOrgName("");
+                evaluateTaskExportVO.setScore(0);
+            } else {
+                evaluateTaskExportVO.setEvaluatedOrgName(linkedHashMap.get("被评价机构名称").toString());
+            }
+            if (null != linkedHashMap) {
+                Object id = linkedHashMap.get("id");
+                List<Map> contentByTaskId = baseMapper.getContentByTaskId((Long) id, evaluateTaskStatisticsDTO.getStartTime(), evaluateTaskStatisticsDTO.getEndTime());
+                if (CollectionUtils.isNotEmpty(contentByTaskId)) {
+                    int total = 0;
+                    for (int l = 0; l < contentByTaskId.size(); l++) {
+                        Double score = Double.valueOf(contentByTaskId.get(l).get("score").toString());
+                        total += score;
+                    }
+                    evaluateTaskExportVO.setScore(total);
+                }
+            }
+            list.add(evaluateTaskExportVO);
+        }
+        if (ObjectUtil.isEmpty(list)) {
+            throw new RuntimeException("导出数据为空!");
+        }
+
+        if (list.size() > 10000) {
+            throw new RuntimeException("导出数据量过大（单次导出限量10000条数据），请填写条件分批导出");
+        }
+        response.setContentType("application/vnd.ms-excel");
+        response.setCharacterEncoding("utf-8");
+        String fileName = URLEncoder.encode("【" + orgName + "】-监控调阅报表" + DateHelper.getDateString(new Date()), "UTF-8");
+        response.setHeader("Content-disposition", "attachment;filename=" + fileName + ".xlsx");
+        // 调用EasyExcel的导出方法
+        EasyExcel.write(response.getOutputStream(), EvaluateTaskExportVO.class).sheet("Sheet1").doWrite(list);
+    }
 
     @Override
     public Map statistics(EvaluateTaskStatisticsDTO evaluateTaskStatisticsDTO) {
@@ -142,7 +197,7 @@ public class CoreEvaluateTaskServiceImpl extends ServiceImpl<CoreEvaluateTaskMap
             }
             Object id = linkedHashMap.get("id");
             linkedHashMap.remove("id");
-            List<Map> contentByTaskId = baseMapper.getContentByTaskId((Long) id,evaluateTaskStatisticsDTO.getStartTime(),evaluateTaskStatisticsDTO.getEndTime());
+            List<Map> contentByTaskId = baseMapper.getContentByTaskId((Long) id, evaluateTaskStatisticsDTO.getStartTime(), evaluateTaskStatisticsDTO.getEndTime());
             if (CollectionUtils.isNotEmpty(contentByTaskId)) {
                 int total = 0;
                 for (int l = 0; l < contentByTaskId.size(); l++) {
@@ -292,7 +347,7 @@ public class CoreEvaluateTaskServiceImpl extends ServiceImpl<CoreEvaluateTaskMap
         }
         List<Long> roleByEvaluateId = coreEvaluateRoleMapper.getRoleByEvaluateId(coreEvaluateTask.getPlanId());
         Set<Long> rIds = new HashSet<>();
-        if(ObjectUtil.isNotEmpty(roleByEvaluateId)){
+        if (ObjectUtil.isNotEmpty(roleByEvaluateId)) {
             rIds.addAll(roleByEvaluateId);
         }
         List<SysRole> roleByUserId = remoteRoleService.getRoleByUserId(SecurityUtils.getUserId(), SecurityConstants.INNER);

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/evaluate/vo/EvaluateTaskExportVO.java

@@ -0,0 +1,20 @@
+package com.xunmei.core.evaluate.vo;
+
+import com.alibaba.excel.annotation.ExcelProperty;
+import lombok.Data;
+
+/**
+ * @author :LuoWei
+ * @date : 2023/12/5
+ */
+@Data
+public class EvaluateTaskExportVO {
+    @ExcelProperty("序号")
+    private Integer orderNum;
+    @ExcelProperty("评价机构")
+    private String orgName;
+    @ExcelProperty("被评价机构名称")
+    private String evaluatedOrgName;
+    @ExcelProperty("评价得分")
+    private Integer score;
+}

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/safetyCheck/service/impl/CoreSafecheckPlanServiceImpl.java

@@ -729,6 +729,7 @@ public class CoreSafecheckPlanServiceImpl extends ServiceImpl<CoreSafecheckPlanM
             v.setItemName(vo.getItemName());
             v.setPointName(vo.getPointName());
             v.setResRemark(vo.getRemark());
+            v.setRectificationDeadline(vo.getRectificationDeadline());
             pointCheckDataList.add(v);
         }
 

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/safetybook/domain/CoreSafetyBookHsggbsdj.java

@@ -48,6 +48,7 @@ public class CoreSafetyBookHsggbsdj extends BaseEntity {
     private String userNames;
     @ApiModelProperty(value = "机构id")
     private Long orgId;
+    private Long roleId;
     @TableField(exist = false)
     private String orgName;
     /**

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/safetybook/service/impl/CoreSafetyBookHsggbsdjServiceImpl.java

@@ -75,10 +75,10 @@ public class CoreSafetyBookHsggbsdjServiceImpl extends ServiceImpl<CoreSafetyBoo
     @Override
     public CoreSafetyBookHsggbsdj selectCoreSafetyBookHsggbsdjById(Long id) {
         CoreSafetyBookHsggbsdj coreSafetyBookHsggbsdj = coreSafetyBookHsggbsdjMapper.selectHsggbsdjById(id);
-        List<CoreSafetyBookHsggbsdjUser> coreSafetyBookHsggbsdjUsers = coreSafetyBookHsggbsdjUserMapper.selectList(new LambdaQueryWrapper<CoreSafetyBookHsggbsdjUser>().eq(CoreSafetyBookHsggbsdjUser::getHsggbsdjId, id));
-        if(coreSafetyBookHsggbsdjUsers!=null&&coreSafetyBookHsggbsdjUsers.size()>0) {
-            coreSafetyBookHsggbsdj.setUserIds(coreSafetyBookHsggbsdjUsers.stream().map(CoreSafetyBookHsggbsdjUser::getUserId).collect(Collectors.toList()));
-        }
+//        List<CoreSafetyBookHsggbsdjUser> coreSafetyBookHsggbsdjUsers = coreSafetyBookHsggbsdjUserMapper.selectList(new LambdaQueryWrapper<CoreSafetyBookHsggbsdjUser>().eq(CoreSafetyBookHsggbsdjUser::getHsggbsdjId, id));
+//        if(coreSafetyBookHsggbsdjUsers!=null&&coreSafetyBookHsggbsdjUsers.size()>0) {
+//            coreSafetyBookHsggbsdj.setUserIds(coreSafetyBookHsggbsdjUsers.stream().map(CoreSafetyBookHsggbsdjUser::getUserId).collect(Collectors.toList()));
+//        }
         coreSafetyBookHsggbsdj.setImages(coreSafetyBookBookFilesMapper.selecVotList(coreSafetyBookHsggbsdj.getId()));
         return coreSafetyBookHsggbsdj;
     }
@@ -105,10 +105,10 @@ public class CoreSafetyBookHsggbsdjServiceImpl extends ServiceImpl<CoreSafetyBoo
         coreSafetyBookHsggbsdj.setCreateTime(DateUtils.getNowDate());
         coreSafetyBookHsggbsdj.setCreateBy(SecurityUtils.getUserId().toString());
         coreSafetyBookHsggbsdjMapper.insert(coreSafetyBookHsggbsdj);
-        for (Long id :
-                coreSafetyBookHsggbsdj.getUserIds()) {
-            coreSafetyBookHsggbsdjUserMapper.insert(new CoreSafetyBookHsggbsdjUser(coreSafetyBookHsggbsdj.getId(), id));
-        }
+//        for (Long id :
+//                coreSafetyBookHsggbsdj.getUserIds()) {
+//            coreSafetyBookHsggbsdjUserMapper.insert(new CoreSafetyBookHsggbsdjUser(coreSafetyBookHsggbsdj.getId(), id));
+//        }
         for (CoreSafetyBookBookFilesVo file :
                 coreSafetyBookHsggbsdj.getImages()) {
             coreSafetyBookBookFilesMapper.insert(new CoreSafetyBookBookFiles(coreSafetyBookHsggbsdj.getId(), file.getName(), file.getUrl()));
@@ -126,11 +126,11 @@ public class CoreSafetyBookHsggbsdjServiceImpl extends ServiceImpl<CoreSafetyBoo
     public int updateCoreSafetyBookHsggbsdj(CoreSafetyBookHsggbsdj coreSafetyBookHsggbsdj) {
         coreSafetyBookHsggbsdj.setUpdateTime(DateUtils.getNowDate());
         coreSafetyBookHsggbsdj.setUpdateBy(SecurityUtils.getUserId().toString());
-        coreSafetyBookHsggbsdjUserMapper.delete(new LambdaQueryWrapper<CoreSafetyBookHsggbsdjUser>().eq(CoreSafetyBookHsggbsdjUser::getHsggbsdjId, coreSafetyBookHsggbsdj.getId()));
-        for (Long id :
-                coreSafetyBookHsggbsdj.getUserIds()) {
-            coreSafetyBookHsggbsdjUserMapper.insert(new CoreSafetyBookHsggbsdjUser(coreSafetyBookHsggbsdj.getId(), id));
-        }
+//        coreSafetyBookHsggbsdjUserMapper.delete(new LambdaQueryWrapper<CoreSafetyBookHsggbsdjUser>().eq(CoreSafetyBookHsggbsdjUser::getHsggbsdjId, coreSafetyBookHsggbsdj.getId()));
+//        for (Long id :
+//                coreSafetyBookHsggbsdj.getUserIds()) {
+//            coreSafetyBookHsggbsdjUserMapper.insert(new CoreSafetyBookHsggbsdjUser(coreSafetyBookHsggbsdj.getId(), id));
+//        }
         coreSafetyBookBookFilesMapper.delete(new LambdaQueryWrapper<CoreSafetyBookBookFiles>().eq(CoreSafetyBookBookFiles::getBookUserId, coreSafetyBookHsggbsdj.getId()));
         for (CoreSafetyBookBookFilesVo file :
                 coreSafetyBookHsggbsdj.getImages()) {
@@ -147,7 +147,7 @@ public class CoreSafetyBookHsggbsdjServiceImpl extends ServiceImpl<CoreSafetyBoo
      */
     @Override
     public int deleteCoreSafetyBookHsggbsdjByIds(Long[] ids) {
-        coreSafetyBookHsggbsdjUserMapper.delete(new LambdaQueryWrapper<CoreSafetyBookHsggbsdjUser>().in(CoreSafetyBookHsggbsdjUser::getHsggbsdjId, Arrays.asList(ids)));
+//        coreSafetyBookHsggbsdjUserMapper.delete(new LambdaQueryWrapper<CoreSafetyBookHsggbsdjUser>().in(CoreSafetyBookHsggbsdjUser::getHsggbsdjId, Arrays.asList(ids)));
         return coreSafetyBookHsggbsdjMapper.deleteBatchIds(Arrays.asList((ids)));
     }
 

soc-modules/soc-modules-core/src/main/resources/mapper/safetybook/CoreSafetyBookHsggbsdjMapper.xml

@@ -51,32 +51,32 @@
     </select>
     <select id="selectHsggbsdjPage" resultType="com.xunmei.core.safetybook.domain.CoreSafetyBookHsggbsdj">
         SELECT
-            h.id,
-            h.title,
-            h.date,
-            h.content,
-            h.create_time,
-            h.update_time,
-            h.create_by,
-            h.update_by,
-               h.join_names,
-               o.short_name as org_name,
-            group_concat( u.NAME ) AS userNames
+        h.id,
+        h.title,
+        h.date,
+        h.content,
+        h.create_time,
+        h.update_time,
+        h.create_by,
+        h.update_by,
+        h.join_names,
+        o.short_name as org_name,
+        group_concat( u.NAME ) AS userNames
         FROM
-            core_safety_book_hsggbsdj h
-                LEFT JOIN core_safety_book_hsggbsdj_user hu ON hu.hsggbsdj_id = h.id
-                LEFT JOIN sys_user u ON u.id = hu.user_id
+        core_safety_book_hsggbsdj h
+        LEFT JOIN core_safety_book_hsggbsdj_user hu ON hu.hsggbsdj_id = h.id
+        LEFT JOIN sys_user u ON u.id = hu.user_id
         left join sys_org o on o.id =h.org_id
 
         <where>
             <if test="hs.title != null  and hs.title != ''">
                 and h.title like concat(concat('%', #{hs.title}),'%')
             </if>
-<!--            <if test="hs.orgId != null ">-->
-<!--                and h.org_id = #{hs.orgId}-->
-<!--            </if>-->
+            <!--            <if test="hs.orgId != null ">-->
+            <!--                and h.org_id = #{hs.orgId}-->
+            <!--            </if>-->
             <if test="hs.range!=null and hs.range.size >1">
-                and  h.date <![CDATA[>=]]>  #{hs.range[0]} and h.date  <![CDATA[<=]]> #{hs.range[1]}
+                and h.date <![CDATA[>=]]>  #{hs.range[0]} and h.date  <![CDATA[<=]]> #{hs.range[1]}
             </if>
             <if test="hs.checkSub ==true">
                 and o.path like concat(#{hs.selectOrgPath},'%')
@@ -89,27 +89,25 @@
         h.id
     </select>
     <select id="selectHsggbsdjById" resultType="com.xunmei.core.safetybook.domain.CoreSafetyBookHsggbsdj">
-        SELECT
-        h.id,
-        h.title,
-        h.date,
-        h.content,
-        h.create_time,
-        h.update_time,
-        h.create_by,
-        h.update_by,
+        SELECT h.id,
+               h.title,
+               h.date,
+               h.content,
+               h.create_time,
+               h.update_time,
+               h.create_by,
+               h.update_by,
                h.join_names,
-        o.short_name as org_name,
+               o.short_name         as org_name,
                h.org_id,
-        group_concat( u.NAME ) AS userNames
-        FROM
-        core_safety_book_hsggbsdj h
-        LEFT JOIN core_safety_book_hsggbsdj_user hu ON hu.hsggbsdj_id = h.id
-        LEFT JOIN sys_user u ON u.id = hu.user_id
-        left join sys_org o on o.id =h.org_id
-        where h.id=#{id}
-        GROUP BY
-        h.id,h.create_time
+               h.role_id,
+               group_concat(u.NAME) AS userNames
+        FROM core_safety_book_hsggbsdj h
+                 LEFT JOIN core_safety_book_hsggbsdj_user hu ON hu.hsggbsdj_id = h.id
+                 LEFT JOIN sys_user u ON u.id = hu.user_id
+                 left join sys_org o on o.id = h.org_id
+        where h.id = #{id}
+        GROUP BY h.id, h.create_time
         order by h.create_time desc
 
     </select>

soc-modules/soc-modules-file/src/main/java/com/xunmei/file/service/LocalSysFileServiceImpl.java

@@ -294,10 +294,10 @@ public class LocalSysFileServiceImpl implements ISysFileService {
         final Font tableFont = pdfTableVo.getTableFont();
         Font font = new Font(fs, 9, Font.NORMAL);
 
-        PdfUtil.dealHeader(document, fs, data.getTaskTitle(), 14);
+        PdfUtil.dealHeader(document, fs, data.getTaskTitle()+"情况表", 14);
         //日期
         String orgName = "被查支行: " + data.getOrgName();
-        String checkUser = "检查人签名: " + data.getCheckUserInfo();
+        String checkUser = "检查人: " + data.getCheckUserInfo();
         String dateStr = data.getDateStr();
         PdfPCell orgCell = new PdfPCell(new Phrase(orgName, font));
         orgCell.setColspan(16);

soc-modules/soc-modules-file/src/main/java/com/xunmei/file/utils/PdfUtil.java

@@ -524,16 +524,18 @@ public class PdfUtil {
     public static void dealSafeCheckPBody(Document document, PdfPTable table, Font tableFont, Font tableTitleFont, List<CheckDataVo> data) throws DocumentException {
         PdfUtil.createPDFCell(tableTitleFont, table, "序号", Element.ALIGN_MIDDLE, 2, 0);
         PdfUtil.createPDFCell(tableTitleFont, table, "检查内容", Element.ALIGN_MIDDLE, 5, 0);
-        PdfUtil.createPDFCell(tableTitleFont, table, "主要指标描述情况", Element.ALIGN_MIDDLE, 19, 0);
+        PdfUtil.createPDFCell(tableTitleFont, table, "主要指标描述情况", Element.ALIGN_MIDDLE, 17, 0);
         PdfUtil.createPDFCell(tableTitleFont, table, "检查情况", Element.ALIGN_MIDDLE, 5, 0);
         PdfUtil.createPDFCell(tableTitleFont, table, "存在的问题及整改意见", Element.ALIGN_MIDDLE, 15, 0);
+        PdfUtil.createPDFCell(tableTitleFont, table, "整改期限", Element.ALIGN_MIDDLE, 2, 0);
 //        List<Object> dataList = (List<Object>) data.get("content");
         for (int i = 1; i <= data.size(); i++) {
             PdfUtil.createPDFCell(tableFont, table, String.valueOf(i), Element.ALIGN_MIDDLE, 2, 0, 10);
             PdfUtil.createPDFCell(tableFont, table, data.get(i - 1).getItemName(), Element.ALIGN_LEFT, 5, 0, 10);
-            PdfUtil.createPDFCell(tableFont, table, data.get(i - 1).getPointName(), Element.ALIGN_LEFT, 19, 0, 10);
+            PdfUtil.createPDFCell(tableFont, table, data.get(i - 1).getPointName(), Element.ALIGN_LEFT, 17, 0, 10);
             PdfUtil.createPDFCell(tableFont, table, StringUtils.isEmpty(data.get(i - 1).getResRemark()) ? "√" : "×", Element.ALIGN_MIDDLE, 5, 0, 10);
             PdfUtil.createPDFCell(tableFont, table, StringUtils.isEmpty(data.get(i - 1).getResRemark()) ? "" : data.get(i - 1).getResRemark(), Element.ALIGN_LEFT, 15, 0, 10);
+            PdfUtil.createPDFCell(tableFont, table, data.get(i - 1).getRectificationDeadline(), Element.ALIGN_MIDDLE, 2, 0, 25);
         }
         document.add(table);
     }

soc-modules/soc-modules-system/src/main/java/com/xunmei/system/controller/SysNfcBindController.java

@@ -5,6 +5,7 @@ import java.util.List;
 import com.xunmei.common.core.utils.StringUtils;
 import com.xunmei.system.api.domain.SysArea;
 import com.xunmei.system.domain.SysAreaCheck;
+import com.xunmei.system.dto.SysNfcBindDTO;
 import com.xunmei.system.service.ISysAreaCheckService;
 import com.xunmei.system.service.ISysAreaService;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -50,7 +51,7 @@ public class SysNfcBindController extends BaseController {
     @ApiOperation(value = "查询SysNfcBind列表")
     @RequiresPermissions("system:bind:list")
     @GetMapping("/list")
-    public TableDataInfo<SysNfcBind> list(SysNfcBind sysNfcBind) {
+    public TableDataInfo<SysNfcBind> list(SysNfcBindDTO sysNfcBind) {
         return sysNfcBindService.selectPage(sysNfcBind);
     }
 

soc-modules/soc-modules-system/src/main/java/com/xunmei/system/domain/SysWorkTimeSet.java

@@ -50,6 +50,8 @@ public class SysWorkTimeSet extends BaseEntity {
     private String workDay;
     @TableField(exist = false)
     private Integer timeCheck;
+    @TableField(exist = false)
+    private Long orgType;
     /**
      * 机构 ID
      */

soc-modules/soc-modules-system/src/main/java/com/xunmei/system/dto/SysNfcBindDTO.java

@@ -0,0 +1,15 @@
+package com.xunmei.system.dto;
+
+import com.xunmei.system.domain.SysNfcBind;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @author :LuoWei
+ * @date : 2023/12/5
+ */
+@Data
+public class SysNfcBindDTO extends SysNfcBind {
+    @ApiModelProperty(value = "机构类型")
+    private String orgType;
+}

soc-modules/soc-modules-system/src/main/java/com/xunmei/system/mapper/SysNfcBindMapper.java

@@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.xunmei.system.api.domain.SysUser;
 import com.xunmei.system.domain.SysNfcBind;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.xunmei.system.dto.SysNfcBindDTO;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
@@ -40,7 +41,7 @@ public interface SysNfcBindMapper extends BaseMapper<SysNfcBind> {
      * @param info
      * @return
      */
-    Page<SysNfcBind> selectNFCPage(Page<SysNfcBind> page, @Param("info") SysNfcBind info);
+    Page<SysNfcBind> selectNFCPage(Page<SysNfcBind> page, @Param("info") SysNfcBindDTO info);
 
     SysNfcBind selectSysNfcBindByCode(String code);
 

soc-modules/soc-modules-system/src/main/java/com/xunmei/system/mapper/SysWorkTimeSetMapper.java

@@ -3,8 +3,12 @@ package com.xunmei.system.mapper;
 import java.util.Date;
 import java.util.List;
 
+import com.baomidou.mybatisplus.core.conditions.Wrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.Constants;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.xunmei.common.core.domain.worktime.domain.SysWorkTime;
 import com.xunmei.system.domain.SysWorkTimeSet;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.MapKey;
@@ -69,4 +73,6 @@ public interface SysWorkTimeSetMapper extends BaseMapper<SysWorkTimeSet> {
      * @return 结果
      */
      int deleteSysWorkTimeSetByIds(Long[] ids);
+
+    Page<SysWorkTimeSet> selectWorkTimeSetPage(Page<SysWorkTimeSet> page, @Param(Constants.WRAPPER) Wrapper<SysWorkTimeSet> queryWrapper);
 }

soc-modules/soc-modules-system/src/main/java/com/xunmei/system/service/ISysNfcBindService.java

@@ -6,6 +6,7 @@ import com.xunmei.system.domain.SysNfcBind;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.xunmei.common.core.web.page.TableDataInfo;
+import com.xunmei.system.dto.SysNfcBindDTO;
 
 /**
  * 【NFC管理】Service接口
@@ -72,5 +73,5 @@ public interface ISysNfcBindService extends IService<SysNfcBind> {
      * @param sysNfcBind 查询条件对象
      * @return Page
      */
-    TableDataInfo<SysNfcBind> selectPage(SysNfcBind sysNfcBind);
+    TableDataInfo<SysNfcBind> selectPage(SysNfcBindDTO sysNfcBind);
 }

soc-modules/soc-modules-system/src/main/java/com/xunmei/system/service/impl/SysNfcBindServiceImpl.java

@@ -12,6 +12,7 @@ import com.xunmei.system.api.domain.SysArea;
 import com.xunmei.system.api.domain.SysOrg;
 import com.xunmei.system.domain.SysAreaCheck;
 
+import com.xunmei.system.dto.SysNfcBindDTO;
 import com.xunmei.system.service.ISysAreaCheckService;
 import com.xunmei.system.service.ISysAreaService;
 import com.xunmei.system.service.ISysNfcBindService;
@@ -52,7 +53,7 @@ public class SysNfcBindServiceImpl extends ServiceImpl<SysNfcBindMapper, SysNfcB
     private ISysAreaService sysAreaService;
 
     @Override
-    public TableDataInfo<SysNfcBind> selectPage(SysNfcBind sysNfcBind) {
+    public TableDataInfo<SysNfcBind> selectPage(SysNfcBindDTO sysNfcBind) {
         //未删除
         sysNfcBind.setDelFlag("0");
         Page<SysNfcBind> page;

soc-modules/soc-modules-system/src/main/java/com/xunmei/system/service/impl/SysWorkTimeServiceImpl.java

@@ -102,6 +102,9 @@ public class SysWorkTimeServiceImpl extends ServiceImpl<SysWorkTimeMapper, SysWo
         if (sysWorkTime.getModifiedName() != null) {
             query.eq("t.modified_name", sysWorkTime.getModifiedName());
         }
+        if (sysWorkTime.getOrgType() != null) {
+            query.eq("o.type", sysWorkTime.getOrgType());
+        }
         //下穿
         if (sysWorkTime.getCheckSub()) {
             query.like("o.path", sysWorkTime.getOrgId());
@@ -142,8 +145,8 @@ public class SysWorkTimeServiceImpl extends ServiceImpl<SysWorkTimeMapper, SysWo
             Map<Long, List<SysWorkTimeSet>> orgMap = list.stream().collect(Collectors.groupingBy(SysWorkTimeSet::getOrgId));
             //遍历orgMap
             StringBuffer sbf = new StringBuffer(1000);
-          //  for (Long key : orgMap.keySet()) {
-            for(Map.Entry<Long, List<SysWorkTimeSet>> setMap:orgMap.entrySet()){
+            //  for (Long key : orgMap.keySet()) {
+            for (Map.Entry<Long, List<SysWorkTimeSet>> setMap : orgMap.entrySet()) {
                 List<SysWorkTimeSet> wo = setMap.getValue();//orgMap.get(key);
                 //遍历wo
                 List<Date> dateList = new ArrayList<>();
@@ -459,7 +462,7 @@ public class SysWorkTimeServiceImpl extends ServiceImpl<SysWorkTimeMapper, SysWo
                 .select(SysWorkTime::getId,
                         SysWorkTime::getIsEnable,
                         SysWorkTime::getYmdDate,
-                        SysWorkTime::getOrgId,SysWorkTime::getOpenTime,
+                        SysWorkTime::getOrgId, SysWorkTime::getOpenTime,
                         SysWorkTime::getCloseTime,
                         SysWorkTime::getWorkTime,
                         SysWorkTime::getWorkOffTime,
@@ -475,7 +478,7 @@ public class SysWorkTimeServiceImpl extends ServiceImpl<SysWorkTimeMapper, SysWo
 
     @Override
     public SysWorkTime findWorkTimeByOrgIdAndYmd(Date ymdDate, Long orgId) {
-        return sysWorkTimeMapper.selectOne(new LambdaQueryWrapper<SysWorkTime>().eq(SysWorkTime::getYmdDate,ymdDate).eq(SysWorkTime::getOrgId,orgId));
+        return sysWorkTimeMapper.selectOne(new LambdaQueryWrapper<SysWorkTime>().eq(SysWorkTime::getYmdDate, ymdDate).eq(SysWorkTime::getOrgId, orgId));
     }
 
     @Override

soc-modules/soc-modules-system/src/main/java/com/xunmei/system/service/impl/SysWorkTimeSetServiceImpl.java

@@ -130,16 +130,19 @@ public class SysWorkTimeSetServiceImpl extends ServiceImpl<SysWorkTimeSetMapper,
             //清空前端传递的org_id
             sysWorkTimeSet.setOrgId(null);
             //添加in条件
-            query.in("org_id", ids);
+            query.in("t.org_id", ids);
+        }
+        if(sysWorkTimeSet.getOrgType()!=null){
+            query.eq("o.type", sysWorkTimeSet.getOrgType());
         }
         query.orderByDesc
-                ("effective_date");
+                ("t.effective_date");
         //时间范围查询
         if (sysWorkTimeSet.getParams().get("beginTime") != null && sysWorkTimeSet.getParams().get("endTime") != null) {
-            query.between("effective_date", extractDate(sysWorkTimeSet.getParams().get("beginTime").toString(), "yyyy-MM-dd HH:mm:ss"), extractDate(sysWorkTimeSet.getParams().get("endTime").toString(), "yyyy-MM-dd HH:mm:ss"));
+            query.between("t.effective_date", extractDate(sysWorkTimeSet.getParams().get("beginTime").toString(), "yyyy-MM-dd HH:mm:ss"), extractDate(sysWorkTimeSet.getParams().get("endTime").toString(), "yyyy-MM-dd HH:mm:ss"));
         }
         //获取数据
-        page = sysWorkTimeSetMapper.selectPage(page, query);
+        page = sysWorkTimeSetMapper.selectWorkTimeSetPage(page, query);
 
 
         List<SysWorkTimeSet> list = page.getRecords();

soc-modules/soc-modules-system/src/main/resources/mapper/system/SysNfcBindMapper.xml

@@ -111,6 +111,9 @@
         <if test="info.areaName != null  and info.areaName != ''">
             and a.area_name like concat("%",#{info.areaName},"%")
         </if>
+          <if test="info.orgType !=null and info.orgType !=''">
+              and b.type=#{info.orgType}
+          </if>
         <if test="info.code != null  and info.code != ''">
             and a.code like concat("%",#{info.code},"%")
         </if>

soc-modules/soc-modules-system/src/main/resources/mapper/system/SysWorkTimeSetMapper.xml

@@ -148,6 +148,14 @@ select  * from sys_work_time_set
 
 
     </select>
+    <select id="selectWorkTimeSetPage" resultType="com.xunmei.system.domain.SysWorkTimeSet">
+        SELECT
+            t.*
+        FROM
+            sys_work_time_set t
+                LEFT JOIN sys_org o ON t.org_id = o.id
+            ${ew.customSqlSegment}
+    </select>
 
 
     <insert id="insertSysWorkTimeSet" parameterType="com.xunmei.system.domain.SysWorkTimeSet"            useGeneratedKeys="true" keyProperty="id">