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

# Conflicts:
#	soc-modules/soc-modules-file/src/main/java/com/xunmei/file/service/LocalSysFileServiceImpl.java
#	soc-modules/soc-modules-file/src/main/java/com/xunmei/file/utils/PdfUtil.java

project_data/sql/0.0.5/soc/soc.sql

@@ -126,4 +126,15 @@ INSERT INTO `sys_menu` (`id`, `menu_name`, `parent_id`, `order_num`, `path`, `co
 VALUES (01719892877586239490, '外包履职评价统计表', 1719287834364436482, 2, 'evaluateTable', 'evaluateTable/index', NULL, 1, 1, 'C', '0', '0', 'core:evaluateTask:statistics', '1', 'chart', NULL, '超级管理员', '2023-09-21 10:37:52', '超级管理员', '2023-09-22 09:42:43', '');
 
 
-UPDATE sys_menu set menu_type='C',perms='appquestion:list' WHERE platform_type=0 and menu_name='隐患问题清单';
+UPDATE sys_menu set menu_type='C',perms='appquestion:list' WHERE platform_type=0 and menu_name='隐患问题清单';
+
+DELETE from `sys_dict_type`  WHERE `dict_type`='app_question_status';
+DELETE from `sys_dict_data`  WHERE `dict_type`='app_question_status';
+
+INSERT INTO `sys_dict_type` ( `dict_name`, `dict_type`, `status`, `create_by`, `create_time`, `update_by`, `update_time`, `remark`) VALUES ( 'APP隐患问题状态', 'app_question_status', '0', '超级管理员', '2023-12-19 15:40:55', '', 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, '待确认', '0', 'app_question_status', NULL, 'default', 'N', '0', '超级管理员', '2023-12-19 15:42:47', '', 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 ( 1, '提出异议', '1', 'app_question_status', NULL, 'default', 'N', '0', '超级管理员', '2023-12-19 15:42:59', '', 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 ( 3, '已关闭', '3', 'app_question_status', NULL, 'default', 'N', '0', '超级管理员', '2023-12-19 15:43:23', '超级管理员', '2023-12-19 15:43:30', 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 ( 10, '待整改', '10', 'app_question_status', NULL, 'default', 'N', '0', '超级管理员', '2023-12-19 15:43:55', '', 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 ( 11, '已整改', '11', 'app_question_status', NULL, 'default', 'N', '0', '超级管理员', '2023-12-19 15:44:07', '超级管理员', '2023-12-19 15:44:31', 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 ( 12, '已逾期', '12', 'app_question_status', NULL, 'default', 'N', '0', '超级管理员', '2023-12-19 15:44:18', '', NULL, NULL);

soc-common/soc-common-core/src/main/java/com/xunmei/common/core/domain/letter/vo/CoreOutInRecordVo.java

@@ -132,5 +132,9 @@ public class CoreOutInRecordVo{
 
     private String pdfUrl;
 
+    @ApiModelProperty(value = "登记人员")
+    private String createBy;
+
+
 
 }

soc-common/soc-common-core/src/main/java/com/xunmei/common/core/domain/retrieval/domain/CoreMonitoringRetrievalTask.java

@@ -1,6 +1,7 @@
 package com.xunmei.common.core.domain.retrieval.domain;
 
 import java.util.Date;
+
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
@@ -24,186 +25,236 @@ import com.xunmei.common.core.web.domain.BaseEntity;
 @EqualsAndHashCode(callSuper = false)
 @Accessors(chain = true)
 @TableName("core_monitoring_retrieval_task")
-@ApiModel(value = "CoreMonitoringRetrievalTask对象" , description = "监控调阅任务")
-public class CoreMonitoringRetrievalTask extends BaseEntity
-        {
-private static final long serialVersionUID=1L;
+@ApiModel(value = "CoreMonitoringRetrievalTask对象", description = "监控调阅任务")
+public class CoreMonitoringRetrievalTask extends BaseEntity {
+    private static final long serialVersionUID = 1L;
 
-    /** 主键 */
+    /**
+     * 主键
+     */
     @JsonSerialize(using = ToStringSerializer.class)
     private Long id;
 
-    /** 计划id */
+    /**
+     * 计划id
+     */
     @JsonSerialize(using = ToStringSerializer.class)
     private Long planId;
 
-    /** 任务名称 */
-            @ApiModelProperty(value = "任务名称")
+    /**
+     * 任务名称
+     */
+    @ApiModelProperty(value = "任务名称")
     private String taskName;
 
-    /** 调阅机构 */
+    /**
+     * 调阅机构
+     */
     @JsonSerialize(using = ToStringSerializer.class)
     private Long orgId;
 
-    /** 调阅机构 */
+    /**
+     * 调阅机构
+     */
     private String orgPath;
 
-    /** 调阅机构 */
-            @ApiModelProperty(value = "调阅机构")
+    /**
+     * 调阅机构
+     */
+    @ApiModelProperty(value = "调阅机构")
     private String orgName;
 
-    /** 年月日 */
+    /**
+     * 年月日
+     */
     private Date ymdDate;
 
-    /** 年 */
+    /**
+     * 年
+     */
     private Integer ymdYear;
 
-    /** 半年 */
+    /**
+     * 半年
+     */
     private Integer ymdHalfyear;
 
-    /** 季度 */
+    /**
+     * 季度
+     */
     private Integer ymdQuarter;
 
-    /** 月 */
+    /**
+     * 月
+     */
     private Integer ymdMonth;
 
-    /** 周 */
+    /**
+     * 周
+     */
     private Integer ymdWeek;
 
-    /** 日 */
+    /**
+     * 日
+     */
     private Integer ymdDay;
 
-    /** 周期无周期、每日、每周、每月、每季度、每半年、每年（0-6） */
+    /**
+     * 周期无周期、每日、每周、每月、每季度、每半年、每年（0-6）
+     */
     private String cycle;
 
-    /** 开始时间 */
-            @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
-            @ApiModelProperty(value = "开始时间")
+    /**
+     * 开始时间
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    @ApiModelProperty(value = "开始时间")
     private Date planStartTime;
 
-    /** 结束时间 */
-            @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
-            @ApiModelProperty(value = "结束时间")
+    /**
+     * 结束时间
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    @ApiModelProperty(value = "结束时间")
     private Date planEndTime;
 
-    /** 调阅开始时间 */
-            @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
-            @ApiModelProperty(value = "调阅开始时间")
+    /**
+     * 调阅开始时间
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    @ApiModelProperty(value = "调阅开始时间")
     private Date startTime;
 
-    /** 调阅结束时间 */
-            @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
-            @ApiModelProperty(value = "调阅结束时间")
+    /**
+     * 调阅结束时间
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    @ApiModelProperty(value = "调阅结束时间")
     private Date endTime;
 
-    /** 状态 */
-            @ApiModelProperty(value = "状态")
+    /**
+     * 状态
+     */
+    @ApiModelProperty(value = "状态")
     private String status;
 
-    /** 角色id */
+    /**
+     * 角色id
+     */
     @JsonSerialize(using = ToStringSerializer.class)
     private Long roleId;
 
-    /** 调阅人 */
+    /**
+     * 调阅人
+     */
     @JsonSerialize(using = ToStringSerializer.class)
     private Long retrievalUser;
 
-    /** 第几次调阅（根据计划的频次计算的来） */
+    /**
+     * 第几次调阅（根据计划的频次计算的来）
+     */
     @JsonSerialize(using = ToStringSerializer.class)
     private Integer orderNum;
 
-    /** 批次号（同一计划多频次为一个批次号） */
+    /**
+     * 批次号（同一计划多频次为一个批次号）
+     */
     @JsonSerialize(using = ToStringSerializer.class)
     private Long batchNum;
 
-    /** 提交时间 */
+    /**
+     * 提交时间
+     */
     private Date submitTime;
 
-    /** 异常数 */
+    /**
+     * 异常数
+     */
     @ApiModelProperty(value = "异常数")
     private Integer exceptionCount;
     @ApiModelProperty(value = "0正常，1删除")
     private Integer isDeleted;
 
-      private String pdfUrl;
-@Override
-public String toString(){
-        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+    private String pdfUrl;
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)
 
 
-                .append("id" ,getId())
+                .append("id", getId())
 
 
-                .append("planId" ,getPlanId())
+                .append("planId", getPlanId())
 
 
-                .append("taskName" ,getTaskName())
+                .append("taskName", getTaskName())
 
 
-                .append("orgId" ,getOrgId())
+                .append("orgId", getOrgId())
 
 
-                .append("orgPath" ,getOrgPath())
+                .append("orgPath", getOrgPath())
 
 
-                .append("orgName" ,getOrgName())
+                .append("orgName", getOrgName())
 
 
-                .append("ymdDate" ,getYmdDate())
+                .append("ymdDate", getYmdDate())
 
 
-                .append("ymdYear" ,getYmdYear())
+                .append("ymdYear", getYmdYear())
 
 
-                .append("ymdHalfyear" ,getYmdHalfyear())
+                .append("ymdHalfyear", getYmdHalfyear())
 
 
-                .append("ymdQuarter" ,getYmdQuarter())
+                .append("ymdQuarter", getYmdQuarter())
 
 
-                .append("ymdMonth" ,getYmdMonth())
+                .append("ymdMonth", getYmdMonth())
 
 
-                .append("ymdWeek" ,getYmdWeek())
+                .append("ymdWeek", getYmdWeek())
 
 
-                .append("ymdDay" ,getYmdDay())
+                .append("ymdDay", getYmdDay())
 
 
-                .append("cycle" ,getCycle())
+                .append("cycle", getCycle())
 
 
-                .append("planStartTime" ,getPlanStartTime())
+                .append("planStartTime", getPlanStartTime())
 
 
-                .append("planEndTime" ,getPlanEndTime())
+                .append("planEndTime", getPlanEndTime())
 
 
-                .append("startTime" ,getStartTime())
+                .append("startTime", getStartTime())
 
 
-                .append("endTime" ,getEndTime())
+                .append("endTime", getEndTime())
 
 
-                .append("status" ,getStatus())
+                .append("status", getStatus())
 
 
-                .append("roleId" ,getRoleId())
+                .append("roleId", getRoleId())
 
 
-                .append("retrievalUser" ,getRetrievalUser())
+                .append("retrievalUser", getRetrievalUser())
 
 
-                .append("orderNum" ,getOrderNum())
+                .append("orderNum", getOrderNum())
 
 
-                .append("batchNum" ,getBatchNum())
+                .append("batchNum", getBatchNum())
 
 
-                .append("submitTime" ,getSubmitTime())
+                .append("submitTime", getSubmitTime())
 
 
-                .append("exceptionCount" ,getExceptionCount())
-        .toString();
-        }
-        }
+                .append("exceptionCount", getExceptionCount())
+                .toString();
+    }
+}

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/access/service/impl/TMonitoringRetrievalPlanServiceImpl.java

@@ -54,10 +54,7 @@ import java.io.File;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
 import java.time.LocalDate;
-import java.util.ArrayList;
-import java.util.Calendar;
-import java.util.Date;
-import java.util.List;
+import java.util.*;
 
 import java.util.stream.Collectors;
 
@@ -924,8 +921,9 @@ private CoreMonitoringRetrievalTaskMapper coreMonitoringRetrievalTaskMapper;
     public AccessPdf buildSafetyCheckRegisterBookData(AccessPdfVO accessPdfVO) {
         AccessPdf accessPdf = new AccessPdf();
         accessPdf.setTaskTitle("标题");
-        final SimpleDateFormat format = new SimpleDateFormat("yyyy年MM月dd日");
-        String dateStr = format.format(accessPdfVO.getTaskStartTime());
+        final SimpleDateFormat format = new SimpleDateFormat("yyyy年MM月dd日 HH时mm分");
+       Calendar calendar=Calendar.getInstance();
+        String dateStr = format.format(accessPdfVO.getTaskStartTime())+"-"+calendar.get(Calendar.HOUR_OF_DAY)+"时"+calendar.get(Calendar.MINUTE)+"分";
         accessPdf.setTaskStartTime(dateStr);
         accessPdf.setCheckUser(accessPdfVO.getCheckUser());
         accessPdf.setOrgId(accessPdfVO.getOrgId());

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/letter/service/impl/CoreOutInRecordServiceImpl.java

@@ -321,6 +321,11 @@ public class CoreOutInRecordServiceImpl extends ServiceImpl<CoreOutInRecordMappe
         } else {
             data.put("checkImage", getFileRealPath(Arrays.asList(checkImage.split(",")), prefixPath, staticsPath));
         }
+        //登记人员
+        data.put("createBy", record.getCreateBy());
+        //陪同人员人员
+        data.put("accompanyingPerson", record.getAccompanyingPerson());
+
         return data;
     }
 

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/question/controller/AppQuestionController.java

@@ -0,0 +1,96 @@
+package com.xunmei.core.question.controller;
+
+import com.xunmei.common.core.web.controller.BaseController;
+import com.xunmei.common.core.web.domain.AjaxResult;
+import com.xunmei.common.core.web.page.TableDataInfo;
+import com.xunmei.common.security.annotation.RequiresPermissions;
+import com.xunmei.core.question.domain.Question;
+import com.xunmei.core.question.dto.AppQuestionPageDto;
+import com.xunmei.core.question.dto.QuestionConfirmDto;
+import com.xunmei.core.question.dto.QuestionPageDto;
+import com.xunmei.core.question.dto.QuestionReformDto;
+import com.xunmei.core.question.service.IAppQuestionService;
+import com.xunmei.core.question.service.IQuestionReformService;
+import com.xunmei.core.question.service.IQuestionService;
+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.servlet.http.HttpServletResponse;
+
+/**
+ * 隐患问题清单Controller
+ *
+ * @author xunmei
+ * @date 2023-09-12
+ */
+@Api(tags = {"隐患问题清单"})
+@RestController
+@RequestMapping("/appquestion")
+public class AppQuestionController extends BaseController {
+    @Autowired
+    private IQuestionService questionService;
+
+    @Autowired
+    private IQuestionReformService questionReformService;
+
+    @Autowired
+    private IAppQuestionService appQuestionService;
+    /**
+     * 查询隐患问题清单列表
+     */
+    @ApiOperation(value = "查询列表")
+    @RequiresPermissions("appquestion:list")
+    @GetMapping("/list")
+    public TableDataInfo<Question> questionPage(AppQuestionPageDto query) {
+        return appQuestionService.selectPage(query);
+    }
+
+    /**
+     * 获取隐患问题清单详细信息
+     */
+    @ApiOperation(value = "获取详细信息")
+    @RequiresPermissions("appquestion:list")
+    @GetMapping(value = "/info/{id}")
+    public AjaxResult getInfo(@PathVariable("id") Long id) {
+        return success(questionService.selectQuestionById(id));
+    }
+
+    /**
+     * 确认
+     *
+     * @return
+     */
+    @ApiOperation(value = "隐患确认")
+    @PutMapping("/confirm/{id}")
+    @RequiresPermissions("appquestion:list")
+    public AjaxResult confirm(@RequestBody QuestionConfirmDto confirmDto, @PathVariable Long id) {
+        return AjaxResult.success(questionService.confirm(confirmDto));
+    }
+
+    /**
+     * 确认
+     *
+     * @return
+     */
+    @ApiOperation(value = "异议审批")
+    @RequiresPermissions("appquestion:list")
+    @PutMapping("/confirmDissent/{id}")
+    public AjaxResult confirmDissent(@RequestBody QuestionConfirmDto confirmDto, @PathVariable Long id) {
+        return AjaxResult.success(questionService.confirmDissent(confirmDto));
+    }
+
+    /**
+     * 整改
+     *
+     * @param reformDto
+     * @return
+     */
+    @ApiOperation(value = "整改")
+    @RequiresPermissions("appquestion:list")
+    @PutMapping("/reform/{id}")
+    public AjaxResult reform(@RequestBody QuestionReformDto reformDto, @PathVariable Long id) {
+        return AjaxResult.success(questionReformService.reform(reformDto));
+    }
+}

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/question/dto/AppQuestionPageDto.java

@@ -0,0 +1,24 @@
+package com.xunmei.core.question.dto;
+
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import com.xunmei.common.core.web.domain.PageDto;
+import com.xunmei.core.question.vo.QuestionPageVo;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.Date;
+
+@Data
+public class AppQuestionPageDto extends PageDto<QuestionPageVo> {
+    @ApiModelProperty(value ="搜索关键字" )
+    private String searchKey;
+
+    @ApiModelProperty(value ="确认状态" )
+    private Integer status;
+
+    @ApiModelProperty(value = "整改日期")
+    private Date reformDate;
+
+    @JsonIgnore
+    private Date reformDateEnd;
+}

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/question/dto/QuestionPageDto.java

@@ -23,7 +23,4 @@ public class QuestionPageDto extends PageDto<QuestionPageVo> {
 
     @ApiModelProperty(value = "提交日期范围")
     private Date[] submitRange;
-
-    @ApiModelProperty(value = "整改日期")
-    private Date reformDate;
 }

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/question/mapper/QuestionMapper.java

@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.xunmei.common.core.domain.safetyindex.domain.CoreSafetyExceptionData;
 import com.xunmei.core.question.domain.Question;
+import com.xunmei.core.question.dto.AppQuestionPageDto;
 import com.xunmei.core.question.dto.QuestionExportDto;
 import com.xunmei.core.question.dto.QuestionPageDto;
 import com.xunmei.core.question.dto.ReformPageDto;
@@ -26,6 +27,9 @@ public interface QuestionMapper extends BaseMapper<Question> {
     Page<Question> pageQuestion(@Param("page") Page<Question> page,@Param("params") QuestionPageDto query ,@Param("today") Date today);
 
     Page<Question> pageReform(@Param("page") Page<Question> page,@Param("params") ReformPageDto query ,@Param("today") Date today);
+
+    Page<Question> pageApp(@Param("page") Page<Question> page, @Param("params") AppQuestionPageDto query , @Param("today") Date today);
+
     /**
      * 查询隐患问题清单
      *

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/question/service/IAppQuestionService.java

@@ -0,0 +1,33 @@
+package com.xunmei.core.question.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.xunmei.common.core.domain.panel.dto.PanelListDto;
+import com.xunmei.common.core.domain.panel.vo.PanelListVo;
+import com.xunmei.common.core.domain.panel.vo.WebPanelResult;
+import com.xunmei.common.core.web.page.TableDataInfo;
+import com.xunmei.core.question.QuestionSrcType;
+import com.xunmei.core.question.domain.Question;
+import com.xunmei.core.question.dto.AppQuestionPageDto;
+import com.xunmei.core.question.dto.QuestionConfirmDto;
+import com.xunmei.core.question.dto.QuestionPageDto;
+import com.xunmei.core.question.vo.QuestionVo;
+
+import javax.servlet.http.HttpServletResponse;
+import java.util.Date;
+import java.util.List;
+
+/**
+ * 隐患问题清单Service接口
+ *
+ * @author xunmei
+ * @date 2023-09-12
+ */
+public interface IAppQuestionService extends IService<Question> {
+    /**
+     * 查询隐患问题清单分页数据
+     *
+     * @param query  查询条件对象
+     * @return Page
+     */
+    TableDataInfo<Question> selectPage(AppQuestionPageDto query);
+}

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/question/service/impl/AppQuestionServiceImpl.java

@@ -0,0 +1,98 @@
+package com.xunmei.core.question.service.impl;
+
+import cn.hutool.core.date.DateUtil;
+import cn.hutool.core.util.ObjectUtil;
+import com.alibaba.excel.EasyExcel;
+import com.alibaba.excel.util.CollectionUtils;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.xunmei.common.core.constant.DictConstants;
+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.domain.panel.vo.WebPanelResult;
+import com.xunmei.common.core.exception.ServiceException;
+import com.xunmei.common.core.web.page.TableDataInfo;
+import com.xunmei.common.security.utils.DictUtils;
+import com.xunmei.common.security.utils.SecurityUtils;
+import com.xunmei.core.question.QuestionConfirmEnum;
+import com.xunmei.core.question.QuestionReformEnum;
+import com.xunmei.core.question.QuestionSrcType;
+import com.xunmei.core.question.QuestionStepEnum;
+import com.xunmei.core.question.domain.Question;
+import com.xunmei.core.question.domain.QuestionFlow;
+import com.xunmei.core.question.dto.AppQuestionPageDto;
+import com.xunmei.core.question.dto.QuestionConfirmDto;
+import com.xunmei.core.question.dto.QuestionExportDto;
+import com.xunmei.core.question.dto.QuestionPageDto;
+import com.xunmei.core.question.mapper.QuestionFlowMapper;
+import com.xunmei.core.question.mapper.QuestionMapper;
+import com.xunmei.core.question.service.IAppQuestionService;
+import com.xunmei.core.question.service.IQuestionService;
+import com.xunmei.core.question.vo.QuestionFlowVo;
+import com.xunmei.core.question.vo.QuestionVo;
+import com.xunmei.core.resumption.service.IAppResumptionDataRemarkimgService;
+import com.xunmei.core.safetyCheck.domain.CoreSafetyTaskDataRemarkimg;
+import com.xunmei.core.safetyCheck.service.ICoreSafetyTaskDataRemarkimgService;
+import com.xunmei.system.api.RemoteOrgService;
+import com.xunmei.system.api.RemoteUserService;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.BeanUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Propagation;
+import org.springframework.transaction.annotation.Transactional;
+
+import javax.servlet.http.HttpServletResponse;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+import java.util.stream.Collectors;
+
+/**
+ * 隐患问题清单Service业务层处理
+ *
+ * @author xunmei
+ * @date 2023-09-12
+ */
+@Service
+@Slf4j
+public class AppQuestionServiceImpl extends ServiceImpl<QuestionMapper, Question> implements IAppQuestionService {
+    @Autowired
+    private QuestionFlowMapper questionFlowMapper;
+    @Autowired
+    private RemoteOrgService orgService;
+
+    @Autowired
+    RemoteUserService remoteUserService;
+
+    @Autowired
+    private IAppResumptionDataRemarkimgService appResumptionDataRemarkimgService;
+
+    @Autowired
+    private ICoreSafetyTaskDataRemarkimgService iCoreSafetyTaskDataRemarkimgService;
+
+    @Override
+    public TableDataInfo<Question> selectPage(AppQuestionPageDto query) {
+        //未删除
+        Page<Question> page = query.toPage();
+        if(ObjectUtil.isNotNull(query.getReformDate())){
+            query.setReformDateEnd(DateUtil.endOfDay(query.getReformDate()));
+        }
+        //获取数据
+        page = baseMapper.pageApp(page, query, DateUtil.beginOfDay(new Date()));
+        page.getRecords().forEach(r -> {
+            if (ObjectUtil.notEqual(r.getConfirmStatus(), QuestionConfirmEnum.Closed.getValue()) &&
+                    r.getReformDeadline().before(DateUtil.beginOfDay(new Date()))) {
+                //任务未结束并且过了整改结束日期
+                r.setOverdueStatus(QuestionConfirmEnum.OverDue.getValue());
+            }
+        });
+//        Page<QuestionPageDto> r =page.
+        //抓换为TableDataInfo适配前端
+        return TableDataInfo.build(page);
+    }
+}

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/question/service/impl/QuestionServiceImpl.java

@@ -84,58 +84,12 @@ public class QuestionServiceImpl extends ServiceImpl<QuestionMapper, Question> i
         //未删除
         Page<Question> page = query.toPage();
 
-        //查询条件
-//        LambdaQueryWrapper<Question> wrapper = new LambdaQueryWrapper<>();
-//        //下穿
-//        if (query.getCheckSub()) {
-//            List<Long> ids = orgService.selectCheckSubOrgIdList(query.getOrgId(), SecurityConstants.INNER);
-//            //添加in条件
-//            wrapper.in(Question::getOrgId, ids);
-//        } else {
-//            wrapper.eq(Question::getOrgId, query.getOrgId());
-//        }
-//
-//        if (ObjectUtil.isNotEmpty(query.getConfirmStatus())) {
-//            if (ObjectUtil.equal(query.getConfirmStatus(), QuestionConfirmEnum.OverDue.getValue())) {
-//                wrapper.ne(Question::getConfirmStatus, QuestionConfirmEnum.Closed.getValue());
-//                wrapper.lt(Question::getReformDeadline, DateUtil.beginOfDay(new Date()));
-//            } else {
-//                wrapper.eq(Question::getConfirmStatus, query.getConfirmStatus());
-//            }
-//        }
-//
-//
-        if (ObjectUtil.isNotNull(query.getReformDate())) {
-            query.setSubmitRange(new Date[2]);
-            Date submitTime = DateUtil.endOfDay(query.getReformDate());
-            query.getSubmitRange()[0] = submitTime;
-
-            Date reformDeadLine = DateUtil.beginOfDay(query.getReformDate());
-            query.getSubmitRange()[1] = reformDeadLine;
-
-
-//            if (ObjectUtil.isNotEmpty(query.getSearchKey())) {
-//                wrapper.and(w ->
-//                        w.like(Question::getQuestionDesc, query.getSearchKey())
-//                );
-//            }
-        } else {
-            //时间范围查询
-            if (ObjectUtil.isNotEmpty(query.getSubmitRange()) && query.getSubmitRange().length == 2) {
-                query.getSubmitRange()[0] = DateUtil.beginOfDay(query.getSubmitRange()[0]);
-                query.getSubmitRange()[1] = DateUtil.endOfDay(query.getSubmitRange()[1]);
-
-//                wrapper.between(Question::getSubmitTime, start, end);
-            }
-
-//            if (ObjectUtil.isNotEmpty(query.getSearchKey())) {
-//                wrapper.and(w ->
-//                        w.like(Question::getCheckContent, query.getSearchKey()).or().like(Question::getQuestionDesc, query.getSearchKey())
-//                );
-//            }
+        //时间范围查询
+        if (ObjectUtil.isNotEmpty(query.getSubmitRange()) && query.getSubmitRange().length == 2) {
+            query.getSubmitRange()[0] = DateUtil.beginOfDay(query.getSubmitRange()[0]);
+            query.getSubmitRange()[1] = DateUtil.endOfDay(query.getSubmitRange()[1]);
         }
-//
-//        wrapper.orderByDesc(Question::getId);
+
         //获取数据
         page = baseMapper.pageQuestion(page, query, DateUtil.beginOfDay(new Date()));
         page.getRecords().forEach(r -> {

soc-modules/soc-modules-core/src/main/resources/mapper/access/TMonitoringRetrievalPlanMapper.xml

@@ -130,7 +130,7 @@
         SELECT
             e.device_name AS hostName,
             d.device_name AS videoChannelName,
-            c.project AS project,
+            f.dict_label AS project,
             IF
                 ( c.situation = 0, '正常', '异常' ) AS situation,
             c.abnormal_illustrate AS abnormalIllustrate
@@ -140,8 +140,11 @@
                 LEFT JOIN core_monitoring_task_monitor_info c ON c.task_monitor_id = b.id
                 LEFT JOIN sys_device d ON b.video_channel = d.id
                 LEFT JOIN sys_device e ON e.id = d.host_id
+                LEFT JOIN sys_dict_data f ON f.dict_value = c.project
+                AND f.dict_type = 'core_registration_project'
         WHERE
             c.project IS NOT NULL
+          AND c.situation = 1
           AND a.task_id = #{taskId}
     </select>
     <select id="selectTask" resultType="com.xunmei.core.access.vo.AccessPdfVO">
@@ -152,7 +155,8 @@
             cycle AS cycle,
             plan_start_time AS startTime,
             plan_end_time AS endTime,
-            b.task_start_time AS taskStartTime
+            b.task_start_time AS taskStartTime,
+            b.create_by AS checkUser
         FROM
             core_monitoring_retrieval_task a
                 LEFT JOIN core_monitoring_task_registration b ON a.id = b.task_id

soc-modules/soc-modules-core/src/main/resources/mapper/question/QuestionMapper.xml

@@ -293,22 +293,43 @@
                 and q.confirm_status=#{params.confirmStatus}
             </if>
         </if>
-        <if test="params.reformDate!=null">
-            and q.submit_time &lt;=#{params.submitRange[0]}
-            and q.reform_deadline>=#{params.submitRange[1]}
-            <if test="params.searchKey!=null">
-                and q.question_desc like concat('%',#{params.searchKey},'%')
-            </if>
+        <if test="params.submitRange!=null and params.submitRange.length==2">
+            and q.submit_time between #{params.submitRange[0]} and #{params.submitRange[1]}
         </if>
-        <if test="params.reformDate==null">
-            <if test="params.submitRange!=null and params.submitRange.length==2">
-                and q.submit_time between #{params.submitRange[0]} and #{params.submitRange[1]}
+        <if test="params.searchKey!=null">
+            and (q.question_desc like concat('%',#{params.searchKey},'%') or q.check_content like
+            concat('%',#{params.searchKey},'%'))
+        </if>
+        order by q.submit_time desc,q.id desc
+    </select>
+    <select id="pageApp" resultType="com.xunmei.core.question.domain.Question">
+        select * from core_question q
+        inner join sys_org o on q.org_id =o.id
+        where 1=1
+        <if test="params.checkSub==true">
+            and o.path like concat((select path from sys_org where id=#{params.orgId}),"%")
+        </if>
+        <if test="params.checkSub!=true">
+            and q.org_id=#{params.orgId}
+        </if>
+        <if test="params.status!=null">
+            <if test="params.status==12">
+                and (q.confirm_status!=3) and q.reform_deadline &lt; #{today}
+            </if>
+            <if test="params.status>=10 and params.status &lt;12">
+                and q.reform_status=#{params.status}
             </if>
-            <if test="params.searchKey!=null">
-                and (q.question_desc like concat('%',#{params.searchKey},'%') or q.check_content like
-                concat('%',#{params.searchKey},'%'))
+            <if test="params.status &lt; 10">
+                and q.confirm_status=#{params.status}
             </if>
         </if>
+        <if test="params.reformDate!=null">
+            and q.reform_deadline>= #{params.reformDate} and q.submit_time&lt;=#{params.reformDateEnd}
+        </if>
+        <if test="params.searchKey!=null">
+            and (q.question_desc like concat('%',#{params.searchKey},'%') or q.check_content like
+            concat('%',#{params.searchKey},'%'))
+        </if>
         order by q.submit_time desc,q.id desc
     </select>
     <select id="pageReform" resultType="com.xunmei.core.question.domain.Question">

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

@@ -341,31 +341,67 @@ public class LocalSysFileServiceImpl implements ISysFileService {
         final BaseFont fs = pdfTableVo.getFs();
         final Font tableFont = pdfTableVo.getTableFont();
         Font font = new Font(fs, 9, Font.NORMAL);
-        PdfUtil.dealHeader(document, fs, data.getOrgName()+data.getPlanCycle()+"("+data.getStartTime()+"~"+data.getEndTime()+")", 14);
-        String checkTime =  data.getTaskStartTime();
-        String checkUser = "检查人: " + data.getCheckUser();
-   /*     PdfPCell orgCell = new PdfPCell(new Phrase(orgName, font));
-        orgCell.setColspan(16);
+        PdfUtil.dealHeader(document, fs, "监控点阅情况登记簿", 14);
+        String checkTime = data.getTaskStartTime();
+        String checkUser = data.getCheckUser();
+
+        PdfPCell orgCell = new PdfPCell(new Phrase("调阅单位", font));
+        orgCell.setColspan(8);
         orgCell.setRowspan(1);
         orgCell.setBorder(Rectangle.NO_BORDER);
-        orgCell.setHorizontalAlignment(Element.ALIGN_LEFT);*/
-        PdfPCell checkUserCell1 = new PdfPCell(new Phrase(checkUser, font));
-        checkUserCell1.setColspan(15);
-        PdfPCell checkUserCell = new PdfPCell(new Phrase(checkUser, font));
-        checkUserCell.setColspan(20);
-        checkUserCell.setRowspan(1);
-        checkUserCell.setBorder(Rectangle.NO_BORDER);
-        checkUserCell.setHorizontalAlignment(Element.ALIGN_CENTER);
-
-        PdfPCell dateStrCell = new PdfPCell(new Phrase(checkTime, font));
-        dateStrCell.setColspan(10);
-        dateStrCell.setRowspan(1);
-        dateStrCell.setBorder(Rectangle.NO_BORDER);
-        dateStrCell.setHorizontalAlignment(Element.ALIGN_RIGHT);
-      //  table.addCell(orgCell);
-        table.addCell(checkUserCell);
-        table.addCell(dateStrCell);
+        orgCell.setHorizontalAlignment(Element.ALIGN_CENTER);
+
+        PdfPCell orgNameCell = new PdfPCell(new Phrase(data.getOrgName(), font));
+        orgNameCell.setColspan(15);
+        orgNameCell.setRowspan(1);
+        orgNameCell.setBorder(Rectangle.NO_BORDER);
+        orgNameCell.setHorizontalAlignment(Element.ALIGN_CENTER);
+
+        PdfPCell userCell = new PdfPCell(new Phrase("调阅人", font));
+        userCell.setColspan(8);
+        userCell.setRowspan(1);
+        userCell.setBorder(Rectangle.NO_BORDER);
+        userCell.setHorizontalAlignment(Element.ALIGN_RIGHT);
+
+        PdfPCell userNameCell = new PdfPCell(new Phrase(checkUser, font));
+        userNameCell.setColspan(15);
+        userNameCell.setRowspan(1);
+        userNameCell.setBorder(Rectangle.NO_BORDER);
+        userNameCell.setHorizontalAlignment(Element.ALIGN_RIGHT);
+
+        PdfPCell timeNameCell = new PdfPCell(new Phrase("调阅时间", font));
+        timeNameCell.setColspan(9);
+        timeNameCell.setRowspan(1);
+        timeNameCell.setBorder(Rectangle.NO_BORDER);
+        timeNameCell.setHorizontalAlignment(Element.ALIGN_RIGHT);
+
+        PdfPCell timeCell = new PdfPCell(new Phrase(checkTime, font));
+        timeCell.setColspan(37);
+        timeCell.setRowspan(1);
+        timeCell.setBorder(Rectangle.NO_BORDER);
+        timeCell.setHorizontalAlignment(Element.ALIGN_RIGHT);
+
+      /*  PdfPCell findCell = new PdfPCell(new Phrase("发现问题情况", font));
+        findCell.setColspan(46);
+        findCell.setRowspan(1);
+        findCell.setBorder(Rectangle.NO_BORDER);
+        findCell.setHorizontalAlignment(Element.ALIGN_RIGHT);*/
+
+/*        table.addCell(orgCell);
+        table.addCell(orgNameCell);
+        table.addCell(userCell);
+        table.addCell(userNameCell);
+        table.addCell(timeNameCell);
+        table.addCell(timeCell);*/
+        //    table.addCell(findCell);
         Font titleFont = new Font(fs, 8, Font.NORMAL);
+        PdfUtil.createPDFCell(titleFont, table, "调阅单位", Element.ALIGN_MIDDLE, 8, 0);
+        PdfUtil.createPDFCell(titleFont, table, data.getOrgName(), Element.ALIGN_MIDDLE, 15, 0);
+        PdfUtil.createPDFCell(titleFont, table, "调阅人", Element.ALIGN_MIDDLE, 8, 0);
+        PdfUtil.createPDFCell(titleFont, table, checkUser, Element.ALIGN_MIDDLE, 15, 0);
+        PdfUtil.createPDFCell(titleFont, table, "调阅时间", Element.ALIGN_MIDDLE, 9, 0);
+        PdfUtil.createPDFCell(titleFont, table, checkTime, Element.ALIGN_MIDDLE, 37, 0);
+        PdfUtil.createPDFCell(titleFont, table, "发现问题情况", Element.ALIGN_MIDDLE, 46, 0);
         PdfUtil.dealAccessPBody(document, table, tableFont, titleFont, data.getDataVos());
         document.close();
         writer.close();

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

@@ -280,11 +280,17 @@ public class PdfUtil {
         createPDFCell(tableFont, table, data.get("inTime").toString(), Element.ALIGN_CENTER, 2, 1);
         createPDFCell(tableFont, table, "离开时间", Element.ALIGN_CENTER, 1, 1);
         createPDFCell(tableFont, table, data.get("outTime").toString(), Element.ALIGN_CENTER, 2, 1);
+
+        //第六行
+        createPDFCell(tableFont, table, "陪同人员", Element.ALIGN_CENTER, 1, 1);
+        createPDFCell(tableFont, table, data.get("accompanyingPerson").toString(), Element.ALIGN_CENTER, 2, 1);
+        createPDFCell(tableFont, table, "登记人员", Element.ALIGN_CENTER, 1, 1);
+        createPDFCell(tableFont, table, data.get("createBy").toString(), Element.ALIGN_CENTER, 2, 1);
 //           /statics/2023/12/05/20231205183106A001.png
         //证件图片
-        createPDFCell(tableFont, table, "证件图片", Element.ALIGN_CENTER, 1, 70);
-        //演练情况 图片填充
-        final PdfPTable imageTable1 = getImage((List<String>) data.get("imageFile"), 4, 150, 130, 2);
+        createPDFCell(tableFont, table, "证件图片", Element.ALIGN_CENTER, 1, 60);
+        //证件图片 图片填充
+        final PdfPTable imageTable1 = getImage((List<String>) data.get("imageFile"), 2, 150, 150, 2);
         final PdfPCell cell1 = new PdfPCell();
         cell1.setNoWrap(false);
         cell1.setPaddingLeft(8f);
@@ -292,11 +298,11 @@ public class PdfUtil {
         cell1.setPaddingBottom(8f);
         cell1.setPaddingTop(8f);
         cell1.setColspan(5);
-        cell1.setRowspan(70);
+        cell1.setRowspan(60);
         //cell1.setBorder(Rectangle.LEFT | Rectangle.RIGHT | Rectangle.BOTTOM);
         cell1.addElement(imageTable1);
         table.addCell(cell1);
-        createPDFCell(tableFont, table, "介绍信附件", Element.ALIGN_CENTER, 1, 70);
+        createPDFCell(tableFont, table, "介绍信附件", Element.ALIGN_CENTER, 1, 60);
         final PdfPTable imageTable2 = getImage((List<String>) data.get("file"), 2, 150, 150, 2);
         final PdfPCell cell2 = new PdfPCell();
         cell2.setNoWrap(false);
@@ -305,11 +311,11 @@ public class PdfUtil {
         cell2.setPaddingBottom(8f);
         cell2.setPaddingTop(8f);
         cell2.setColspan(5);
-        cell2.setRowspan(70);
+        cell2.setRowspan(60);
         //cell1.setBorder(Rectangle.LEFT | Rectangle.RIGHT | Rectangle.BOTTOM);
         cell2.addElement(imageTable2);
         table.addCell(cell2);
-        createPDFCell(tableFont, table, "身份核验材料", Element.ALIGN_CENTER, 1, 70);
+        createPDFCell(tableFont, table, "身份核验材料", Element.ALIGN_CENTER, 1, 60);
         final PdfPTable imageTable3 = getImage((List<String>) data.get("checkImage"), 2, 150, 150, 2);
         final PdfPCell cell3 = new PdfPCell();
         cell3.setNoWrap(false);
@@ -318,7 +324,7 @@ public class PdfUtil {
         cell3.setPaddingBottom(8f);
         cell3.setPaddingTop(8f);
         cell3.setColspan(5);
-        cell3.setRowspan(70);
+        cell3.setRowspan(60);
         //cell1.setBorder(Rectangle.LEFT | Rectangle.RIGHT | Rectangle.BOTTOM);
         cell3.addElement(imageTable3);
         table.addCell(cell3);
@@ -506,19 +512,19 @@ public class PdfUtil {
     }
 
     public static void dealAccessPBody(Document document, PdfPTable table, Font tableFont, Font tableTitleFont, List<AccessDataVo> 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, 5, 0);
-        PdfUtil.createPDFCell(tableTitleFont, table, "项目", Element.ALIGN_MIDDLE, 5, 0);
-        PdfUtil.createPDFCell(tableTitleFont, table, "检查情况", Element.ALIGN_MIDDLE, 2, 0);
-        PdfUtil.createPDFCell(tableTitleFont, table, "说明", Element.ALIGN_MIDDLE, 17, 0);
+
+        PdfUtil.createPDFCell(tableTitleFont, table, "序号", Element.ALIGN_MIDDLE, 3, 0);
+        PdfUtil.createPDFCell(tableTitleFont, table, "硬盘录像机", Element.ALIGN_MIDDLE, 16, 0);
+        PdfUtil.createPDFCell(tableTitleFont, table, "通道名称", Element.ALIGN_MIDDLE, 9, 0);
+        PdfUtil.createPDFCell(tableTitleFont, table, "检查项目", Element.ALIGN_MIDDLE, 9, 0);
+        PdfUtil.createPDFCell(tableTitleFont, table, "存在问题", Element.ALIGN_MIDDLE, 9, 0);
         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).getHostName(), Element.ALIGN_MIDDLE, 5, 0, 10);
-            PdfUtil.createPDFCell(tableFont, table, data.get(i - 1).getVideoChannelName(), Element.ALIGN_MIDDLE, 5, 0, 10);
-            PdfUtil.createPDFCell(tableFont, table, data.get(i - 1).getProject(), Element.ALIGN_MIDDLE, 5, 0, 10);
-            PdfUtil.createPDFCell(tableFont, table, data.get(i - 1).getSituation().equals("0") ? "正常" : "异常", Element.ALIGN_MIDDLE, 2, 0, 10);
-            PdfUtil.createPDFCell(tableFont, table, data.get(i - 1).getAbnormalIllustrate(), Element.ALIGN_MIDDLE, 17, 0, 10);
+            PdfUtil.createPDFCell(tableFont, table, String.valueOf(i), Element.ALIGN_MIDDLE, 3, 0, 10);
+            PdfUtil.createPDFCell(tableFont, table, data.get(i - 1).getHostName(), Element.ALIGN_MIDDLE, 16, 0, 10);
+            PdfUtil.createPDFCell(tableFont, table, data.get(i - 1).getVideoChannelName(), Element.ALIGN_MIDDLE, 9, 0, 10);
+            PdfUtil.createPDFCell(tableFont, table, data.get(i - 1).getProject(), Element.ALIGN_MIDDLE, 9, 0, 10);
+         //   PdfUtil.createPDFCell(tableFont, table, data.get(i - 1).getSituation().equals("0") ? "正常" : "异常", Element.ALIGN_MIDDLE, 2, 0, 10);
+            PdfUtil.createPDFCell(tableFont, table, data.get(i - 1).getAbnormalIllustrate(), Element.ALIGN_MIDDLE, 9, 0, 10);
         }
         document.add(table);
     }
@@ -530,7 +536,6 @@ public class PdfUtil {
         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_MIDDLE, 5, 0, 10);

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

@@ -121,7 +121,7 @@ public class SysAreaCheckController extends BaseController {
     }
 
     @ApiOperation(value = "获取SysNfcBind通过机构id")
-    @RequiresPermissions("system:bind:query")
+
     @GetMapping(value = "/getAreaCheckInfoByOrg/{orgId}")
     public AjaxResult getAreaCheckInfoByOrg(@PathVariable(value = "orgId", required = false) Long orgId) {
         AjaxResult ajax = AjaxResult.success();

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

@@ -63,7 +63,7 @@ public class SysAreaController extends BaseController {
      * 获取【请填写功能名称】详细信息
      */
     @ApiOperation(value = "根据机构获取区域")
-    @RequiresPermissions("system:area:query")
+
     @GetMapping("/getAreaByOrg/{orgId}")
     public AjaxResult getAreaByOrg(@PathVariable("orgId") Long orgId) {
  /*       SysOrg sysOrg = sysOrgMapper.selectSysOrgById(orgId);