Merge branch 'V0.0.5' of http://10.87.21.221:8000/jzyd_yyds/soc into V0.0.5

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/board/dto/app/AppTaskRankingDto.java

@@ -11,7 +11,7 @@ import lombok.Data;
 @Data
 public class AppTaskRankingDto {
     @ApiModelProperty(value = "0：升序，1：降序")
-    private Integer desc = 1;
+    private Integer desc;
 
     @ApiModelProperty(value ="月份")
     private Date month;

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/board/service/impl/AppCockpitServiceImpl.java

@@ -63,6 +63,9 @@ public class AppCockpitServiceImpl implements AppCockpitService {
      */
     @Override
     public List<AppTaskRankingVo> taskRanking(AppTaskRankingDto dto) {
+        if(ObjectUtil.isNull(dto.getMonth())){
+            dto.setMonth(new Date());
+        }
         DateRange range = DateUtils.getStartAndEnd(dto.getMonth(), CycleCommonEnum.MONTHLY);
         SysOrg org = getLoginOrg(dto.getOrgId());
         String orgPath = org.getPath();
@@ -98,7 +101,7 @@ public class AppCockpitServiceImpl implements AppCockpitService {
         r.sort(new Comparator<AppTaskRankingVo>() {
             @Override
             public int compare(AppTaskRankingVo o1, AppTaskRankingVo o2) {
-                if (ObjectUtil.equal(dto.getDesc(), 1)) {
+                if (ObjectUtil.notEqual(dto.getDesc(), 0)) {
                     return (NumberUtil.compare(o1.getRate(), o2.getRate())) * -1;
                 } else {
                     return (NumberUtil.compare(o1.getRate(), o2.getRate()));

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

@@ -180,6 +180,9 @@ public class CoreEvaluateTaskServiceImpl extends ServiceImpl<CoreEvaluateTaskMap
 
     @Override
     public Map statistics(EvaluateTaskStatisticsDTO evaluateTaskStatisticsDTO) {
+        if (null==evaluateTaskStatisticsDTO.getPlanId()||null==evaluateTaskStatisticsDTO.getOrgId()){
+            return null;
+        }
         Map map = new HashMap();
         List<SysOrg> sysOrgs = remoteOrgService.selectSysOrgByParentId(evaluateTaskStatisticsDTO.getOrgId(), SecurityConstants.INNER);
         List<LinkedHashMap> rows = new ArrayList<>();

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/information/service/ICoreMessageCenterService.java

@@ -35,7 +35,7 @@ public interface ICoreMessageCenterService extends IService<CoreMessageCenter> {
 
 
     TableDataInfo selectByPage(CoreMessageCenterDTO coreMessageCenterDTO);
-    Boolean isRead();
+    Integer isRead();
     /**
      * 新增消息中心
      *

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/information/service/impl/CoreMessageCenterServiceImpl.java

@@ -92,7 +92,7 @@ public class CoreMessageCenterServiceImpl extends ServiceImpl<CoreMessageCenterM
     }
 
     @Override
-    public Boolean isRead() {
+    public Integer isRead() {
         Long userId = SecurityUtils.getUserId();
         Integer integer1 = baseMapper.selectNoRead(userId);
         //通知
@@ -111,12 +111,12 @@ public class CoreMessageCenterServiceImpl extends ServiceImpl<CoreMessageCenterM
         List<Long> collect1 = messageAppPageVos.stream().map(MessageAppPageVo::getId).collect(Collectors.toList());
         Integer i = 0;
         if (CollectionUtils.isNotEmpty(collect1) && CollectionUtils.isNotEmpty(longs) && longs.size() != collect1.size()) {
-            i = 1;
+            i = collect1.size() - longs.size();
         }
-        if (i + integer1 == 0) {
-            return false;
+        if (i + integer1 <= 0) {
+            return 0;
         }
-        return true;
+        return i + integer1;
     }
 
     /**

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

@@ -1,5 +1,6 @@
 package com.xunmei.core.question.dto;
 
+import com.alibaba.excel.annotation.ExcelIgnore;
 import com.alibaba.excel.annotation.ExcelProperty;
 import com.alibaba.excel.annotation.format.DateTimeFormat;
 import com.alibaba.excel.annotation.write.style.ColumnWidth;
@@ -80,6 +81,9 @@ public class QuestionExportDto {
     @DateTimeFormat("yyyy-MM-dd")
     private Date reformDeadline;
 
+    @ExcelIgnore
+    private Integer confirmStatus;
+
     /**
      * 确认状态
      */

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

@@ -85,14 +85,14 @@ public interface QuestionMapper extends BaseMapper<Question> {
      * @param param
      * @return
      */
-    List<QuestionExportDto> selectQuestionExportList(@Param("param")QuestionPageDto param);
+    List<QuestionExportDto> selectQuestionExportList(@Param("params")QuestionPageDto param,@Param("today") Date today);
 
     /**
      * 获取导出数据
      * @param param
      * @return
      */
-    List<QuestionExportDto> selectReformExportList(@Param("param") ReformPageDto param);
+    List<QuestionExportDto> selectReformExportList(@Param("params") ReformPageDto param,@Param("today") Date today);
 
     int saveQuestionExceptionData(@Param("startTime") Date startTime, @Param("endTime") Date endTime, @Param("orgIds") List<Long> orgIds);
 }

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

@@ -114,8 +114,7 @@ public class QuestionReformServiceImpl extends ServiceImpl<QuestionMapper, Quest
         //获取数据
         page = baseMapper.pageReform(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()))) {
+            if (isOverdue(r.getConfirmStatus(),r.getReformDeadline())) {
                 //任务未结束并且过了整改结束日期
                 r.setOverdueStatus(QuestionReformEnum.OverDue.getValue());
             }
@@ -125,6 +124,15 @@ public class QuestionReformServiceImpl extends ServiceImpl<QuestionMapper, Quest
         return TableDataInfo.build(page);
     }
 
+    private boolean isOverdue(Integer confirmStatus,Date reformDeadLine){
+        if (ObjectUtil.notEqual(confirmStatus, QuestionConfirmEnum.Closed.getValue()) &&
+                reformDeadLine.before(DateUtil.beginOfDay(new Date()))) {
+            //任务未结束并且过了整改结束日期
+            return true;
+        }else{
+            return  false;
+        }
+    }
 
     /**
      * 整改
@@ -188,10 +196,14 @@ public class QuestionReformServiceImpl extends ServiceImpl<QuestionMapper, Quest
             pageDto.setReformRange(nd);
         }
 
-        List<QuestionExportDto> list = baseMapper.selectReformExportList(pageDto);
+        List<QuestionExportDto> list = baseMapper.selectReformExportList(pageDto, DateUtil.beginOfDay(new Date()));
         Integer index = 1;
         for (QuestionExportDto questionExportDto : list) {
             questionExportDto.setIndex(index++);
+            if (isOverdue(questionExportDto.getConfirmStatus(),questionExportDto.getReformDeadline())) {
+                //任务未结束并且过了整改结束日期
+                questionExportDto.setReformStatusText("已逾期");
+            }
         }
         response.setContentType("application/vnd.ms-excel");
         // 调用EasyExcel的导出方法

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

@@ -141,8 +141,12 @@ public class QuestionServiceImpl extends ServiceImpl<QuestionMapper, Question> i
     }
 
     private boolean isOverdue(Question q){
-        if (ObjectUtil.notEqual(q.getConfirmStatus(), QuestionConfirmEnum.Closed.getValue()) &&
-                q.getReformDeadline().before(DateUtil.beginOfDay(new Date()))) {
+        return isOverdue(q.getConfirmStatus(),q.getReformDeadline());
+    }
+
+    private boolean isOverdue(Integer confirmStatus,Date reformDeadLine){
+        if (ObjectUtil.notEqual(confirmStatus, QuestionConfirmEnum.Closed.getValue()) &&
+                reformDeadLine.before(DateUtil.beginOfDay(new Date()))) {
             //任务未结束并且过了整改结束日期
             return true;
         }else{
@@ -306,9 +310,12 @@ public class QuestionServiceImpl extends ServiceImpl<QuestionMapper, Question> i
             nd[1] = DateUtil.endOfDay(pageDto.getSubmitRange()[1]);
             pageDto.setSubmitRange(nd);
         }
-        List<QuestionExportDto> list = baseMapper.selectQuestionExportList(pageDto);
+        List<QuestionExportDto> list = baseMapper.selectQuestionExportList(pageDto, DateUtil.beginOfDay(new Date()));
         Integer index = 1;
         for (QuestionExportDto questionExportDto : list) {
+            if(isOverdue(questionExportDto.getConfirmStatus(),questionExportDto.getReformDeadline())){
+                questionExportDto.setConfirmStatusText("已逾期");
+            }
             questionExportDto.setIndex(index++);
         }
         response.setContentType("application/vnd.ms-excel");

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/retrieval/service/impl/CoreMonitoringRetrievalTaskBuilderServiceImpl.java

@@ -8,11 +8,14 @@ import cn.hutool.core.util.ObjectUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.IdWorker;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.xunmei.common.core.constant.Constants;
 import com.xunmei.common.core.constant.ErrorMsgConstants;
 import com.xunmei.common.core.constant.SecurityConstants;
 import com.xunmei.common.core.domain.DateRange;
 import com.xunmei.common.core.domain.retrieval.domain.CoreMonitoringRetrievalTask;
 import com.xunmei.common.core.domain.retrieval.vo.*;
+import com.xunmei.common.core.domain.worktime.domain.SysWorkTime;
+import com.xunmei.common.core.domain.worktime.dto.WorkTimeDto;
 import com.xunmei.common.core.enums.OrgTypeEnum;
 import com.xunmei.common.core.enums.RetrievalTaskCycle;
 import com.xunmei.common.core.enums.edu.EduTrainingPlanCycleEnum;
@@ -20,6 +23,7 @@ import com.xunmei.common.core.event.WorkTimeChangeEvent;
 import com.xunmei.common.core.utils.DateUtils;
 import com.xunmei.common.core.utils.Ymd;
 import com.xunmei.common.security.utils.SecurityUtils;
+import com.xunmei.core.TaskCreatingServiceImplBase;
 import com.xunmei.core.access.domain.TMonitoringRetrievalPlan;
 import com.xunmei.core.access.mapper.CoreMonitoringTaskRegistrationMapper;
 import com.xunmei.core.access.service.ITMonitoringRetrievalPlanService;
@@ -407,14 +411,18 @@ public class CoreMonitoringRetrievalTaskBuilderServiceImpl extends ServiceImpl<C
             //周期任务获取计划时间
             dateRange = DateUtils.getStartAndEnd(dateTime, EduTrainingPlanCycleEnum.toCommonEnum(Integer.parseInt(plan.getPlanCycle())));
         }
-        Map<Integer, DateRange> dateRanges = DateUtils.splitDateRange(dateRange.getStartTime(), dateRange.getEndTime(), plan.getPlanFrequency().intValue());
+        List<SysOrg> orgList = new ArrayList<>();
+        orgList.add(sysOrg);
+        final List<SysWorkTime> workTimeList = getWorkTimeList(orgList, dateRange.getStartTime(), dateRange.getEndTime());
+        //Map<Integer, DateRange> dateRanges = DateUtils.splitDateRange(dateRange.getStartTime(), dateRange.getEndTime(), plan.getPlanFrequency().intValue());
+        Map<Short, DateRange> dateRanges = TaskCreatingServiceImplBase.splitTaskTime((short)plan.getPlanFrequency().intValue(), EduTrainingPlanCycleEnum.toCommonEnum(Integer.parseInt(plan.getPlanCycle())), dateRange.getStartTime(), dateRange.getEndTime(), workTimeList);
         //判断作息（无周期排开）
 //        if (!plan.getPlanCycle().equals(RetrievalTaskCycle.NOCYCLE.getCode().toString())) {
-        int idx = 1;
+/*        int idx = 1;
         Map<Integer, DateRange> workingDateRanges = new HashMap<>();
 
 
-        for (Map.Entry<Integer, DateRange> entry : dateRanges.entrySet()) {
+        for (Map.Entry<Short, DateRange> entry : dateRanges.entrySet()) {
             DateRange dateRange1 = entry.getValue();
             boolean flag = true;
             if (ObjectUtil.equal(sysOrg.getType(), OrgTypeEnum.YINGYE_WANGDIAN.getCode())) {
@@ -425,13 +433,13 @@ public class CoreMonitoringRetrievalTaskBuilderServiceImpl extends ServiceImpl<C
                 workingDateRanges.put(idx, dateRange1);
                 idx++;
             }
-        }
+        }*/
 
-        for (Map.Entry<Integer, DateRange> entry : workingDateRanges.entrySet()) {
-            Integer key = entry.getKey();
+        for (Map.Entry<Short, DateRange> entry : dateRanges.entrySet()) {
+            Integer key = entry.getKey().intValue();
             DateRange dateRange1 = entry.getValue();
             CoreMonitoringRetrievalTask task = this.buildCoreMonitoringRetrievalTask(batchNum, key, plan, sysOrg,
-                    dateRange1, ymd, workingDateRanges.size());
+                    dateRange1, ymd, dateRanges.size());
             taskList.add(task);
         }
         return taskList;
@@ -748,6 +756,18 @@ public class CoreMonitoringRetrievalTaskBuilderServiceImpl extends ServiceImpl<C
         }
     }
 
+    private List<SysWorkTime> getWorkTimeList(List<SysOrg> orgList, Date start, Date end) {
+        List<Long> orgIdList = orgList.stream().map(SysOrg::getId).collect(Collectors.toList());
+        String startTime = DateUtil.format(start, Constants.DAILY_FORMAT);
+        String endTime = DateUtil.format(end, Constants.DAILY_FORMAT);
+        WorkTimeDto workTimeDto = new WorkTimeDto();
+        workTimeDto.setOrgIdList(orgIdList);
+        workTimeDto.setStartTime(startTime);
+        workTimeDto.setEndTime(endTime);
+        return RemoteCallHandlerExecutor.executeRemoteCall(() ->
+                        workTimeService.findWorkTimeByRange(workTimeDto, SecurityConstants.FROM_SOURCE).getData(),
+                ErrorMsgConstants.QUERY_ORG_WORK_TIME_ERROR);
+    }
 //    private List<SysWorkTime> selectWorkTimeList(Date now, CycleCommonEnum cycle, WorkTimeChangeEvent event) {
 //        DateRange range = DateUtils.getStartAndEnd(now, cycle);
 //        String startTime = DateUtil.format(range.getStartTime(), Constants.DAILY_FORMAT);

soc-modules/soc-modules-core/src/main/resources/mapper/board/AppCockpitMapper.xml

@@ -163,7 +163,7 @@
                            (r.STATUS = 3, 1, 0)) AS completed,
                sum(r.exception_count)            AS exceptionCount
         FROM core_resumption r
-        INNER JOIN core_resumption_plan p ON r.plan_id = p.id
+        INNER JOIN core_resumption_plan p ON r.plan_id = p.id and p.plan_cycle < 5
         WHERE r.ymd_date BETWEEN #{startDate}
             AND #{endDate}
           AND r.org_path LIKE CONCAT(#{orgPath}, '%')
@@ -178,8 +178,18 @@
                sum(r.exception_count)            AS exceptionCount
         FROM core_safety_task r
                  INNER JOIN core_safecheck_plan p ON r.plan_id = p.id
-        WHERE r.ymd_date BETWEEN #{startDate}
-            AND #{endDate}
+        WHERE ((
+            #{startDate}   <![CDATA[<=]]> r.plan_start_time
+          and #{endDate} >= r.plan_start_time
+            )
+           or (
+            #{startDate}    <![CDATA[<=]]> r.plan_end_time
+          and #{endDate} >= r.plan_end_time
+            )
+           or (
+            #{startDate} >= r.plan_start_time
+          and #{endDate}  <![CDATA[<=]]> r.plan_end_time
+            ))
           AND r.org_path LIKE CONCAT(#{orgPath}, '%')
         GROUP BY p.check_type
     </select>
@@ -197,8 +207,18 @@
             SELECT count(0)                          AS total,
                    sum(r.STATUS = 3) AS completed
             FROM core_drill_task r
-            WHERE r.start_date BETWEEN #{startDate}
-                AND #{endDate}
+            WHERE ((
+                               #{startDate}   <![CDATA[<=]]> r.start_date
+                           and #{endDate} >= r.start_date
+                       )
+                or (
+                               #{startDate}    <![CDATA[<=]]> r.end_date
+                           and #{endDate} >= r.end_date
+                       )
+                or (
+                               #{startDate} >= r.start_date
+                           and #{endDate}  <![CDATA[<=]]> r.end_date
+                       ))
               AND r.org_path LIKE CONCAT(#{orgPath}, '%')
         </select>
     <select id="selectSyntheticQuestion" resultType="com.xunmei.core.board.dto.app.AppSyntheticQuestionDto">
@@ -217,10 +237,10 @@
                            (q.reform_status = 11, 1, 0))                             AS reformedCount,
                sum(
                        IF
-                           (q.src_type = 1 AND q.src_task_type != 6, 1, 0))          AS resumptionCount,
+                           (q.src_type = 1 AND (q.src_task_type = 1 or q.src_task_type = 2 or q.src_task_type = 3), 1, 0))          AS resumptionCount,
                sum(
                        IF
-                           (q.src_type = 1 AND q.src_task_type != 6 AND q.reform_status = 11, 1,
+                           (q.src_type = 1 AND (q.src_task_type = 1 or q.src_task_type = 2 or q.src_task_type = 3) AND q.reform_status = 11, 1,
                             0))                                                         resumptionReformedCount,
                sum(
                        IF
@@ -256,9 +276,10 @@
     </select>
     <select id="selectSyntheticEdu" resultType="com.xunmei.core.board.dto.app.AppSyntheticTaskCategoryDto">
         SELECT count(0) as total, sum(`status` = 2) as completed
-        from core_edu_training_task
-        where start_date BETWEEN #{startDate} and #{endDate}
-          AND org_path LIKE CONCAT(#{orgPath}, '%')
+        from core_edu_training_task t
+        inner join core_edu_training_plan p on t.plan_id =p.id and p.plan_cycle &lt; 4
+        where t.start_date BETWEEN #{startDate} and #{endDate}
+          AND t.org_path LIKE CONCAT(#{orgPath}, '%')
     </select>
     <select id="selectSyntheticInout" resultType="com.xunmei.core.board.vo.app.AppSyntheticInOutVo">
         SELECT COUNT(*)        as total,
@@ -273,9 +294,10 @@
           and o.path LIKE CONCAT(#{orgPath}, '%')
     </select>
     <select id="selectSyntheticMonitor" resultType="com.xunmei.core.board.dto.app.AppSyntheticTaskCategoryDto">
-        SELECT count(0) as total, sum(`status` = 2) as completed
-        from core_monitoring_retrieval_task
-        where ymd_date BETWEEN '2023-11-1' and '2023-11-30'
-          and org_path LIKE CONCAT(#{orgPath}, '%')
+        SELECT count(0) as total, sum(t.`status` = 2) as completed
+        from core_monitoring_retrieval_task t
+        inner join core_monitoring_retrieval_plan p on t.plan_id =p.id and p.plan_cycle &lt; 4
+        where t.ymd_date BETWEEN #{startDate} and #{endDate}
+          and t.org_path LIKE CONCAT(#{orgPath}, '%')
     </select>
 </mapper>

soc-modules/soc-modules-core/src/main/resources/mapper/board/CockpitMapper.xml

@@ -113,7 +113,6 @@
         #{startDate} >= r.start_date
         and #{endDate}  <![CDATA[<=]]> r.end_date
         ))
-
         and org_path like concat(#{orgPath},'%')
         GROUP BY
         org_id,org_path

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

@@ -277,10 +277,9 @@
 
     <select id="pageQuestion" 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}),"%")
+            and q.org_path like concat((select path from sys_org where id=#{params.orgId}),"%")
         </if>
         <if test="params.checkSub!=true">
             and q.org_id=#{params.orgId}
@@ -304,10 +303,9 @@
     </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}),"%")
+            and q.org_path like concat((select path from sys_org where id=#{params.orgId}),"%")
         </if>
         <if test="params.checkSub!=true">
             and q.org_id=#{params.orgId}
@@ -334,10 +332,10 @@
     </select>
     <select id="pageReform" resultType="com.xunmei.core.question.domain.Question">
         select * from core_question q
-        inner join sys_org o on q.org_id =o.id
+<!--        inner join sys_org o on q.org_id =o.id-->
         where q.confirm_status>=2 and q.reform_status is not null
         <if test="params.checkSub==true">
-            and o.path like concat((select path from sys_org where id=#{params.orgId}),"%")
+            and q.org_path like concat((select path from sys_org where id=#{params.orgId}),"%")
         </if>
         <if test="params.checkSub!=true">
             and q.org_id=#{params.orgId}
@@ -391,6 +389,7 @@
         q.question_desc,
         q.submitor_name,
         q.submit_time,
+        q.confirm_status,
         q.reform_deadline,
         case q.src_type when 1 then '确认' else ( case f1.execute_status when 0 then '确认' when 1 then '提出异议' else
         '未确认'
@@ -408,21 +407,26 @@
         left join core_question_flow f2 on q.id = f2.question_id and f2.execute_step = 2
         left join core_question_flow f3 on q.id = f3.question_id and f3.execute_step = 11
         where 1=1
-        <if test="param.checkSub==true">
-            and q.org_path like concat((select `path` from sys_org where id = #{param.orgId}),'%')
+        <if test="params.checkSub==true">
+            and q.org_path like concat((select path from sys_org where id=#{params.orgId}),"%")
         </if>
-        <if test="param.checkSub==false">
-            and q.org_id=#{param.orgId}
+        <if test="params.checkSub!=true">
+            and q.org_id=#{params.orgId}
         </if>
-        <if test="param.confirmStatus!=null">
-            and q.confirm_status=#{param.confirmStatus}
+        <if test="params.confirmStatus!=null">
+            <if test="params.confirmStatus==4">
+                and (q.confirm_status!=3) and q.reform_deadline &lt; #{today}
+            </if>
+            <if test="params.confirmStatus!=4">
+                and q.confirm_status=#{params.confirmStatus}
+            </if>
         </if>
-        <if test="param.searchKey!=null">
-            and (q.check_item like concat('%',#{param.searchKey},'%') or q.src_task_name like
-            concat('%',#{param.searchKey},'%'))
+        <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="param.submitRange!=null and param.submitRange.length==2">
-            and q.submit_time between #{param.submitRange[0]} and #{param.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.id desc
     </select>
@@ -434,6 +438,7 @@
         q.question_desc,
         q.submitor_name,
         q.submit_time,
+        q.confirm_status,
         q.reform_deadline,
         case q.src_type when 1 then '确认' else ( case f1.execute_status when 0 then '确认' when 1 then '提出异议' else
         '未确认'
@@ -450,25 +455,27 @@
         left join core_question_flow f1 on q.id = f1.question_id and f1.execute_step = 1
         left join core_question_flow f2 on q.id = f2.question_id and f2.execute_step = 2
         left join core_question_flow f3 on q.id = f3.question_id and f3.execute_step = 11
-        where 1=1
-        <if test="param.checkSub==true">
-            and q.org_path like concat((select `path` from sys_org where id = #{param.orgId}),'%')
-        </if>
-        <if test="param.checkSub==false">
-            and q.org_id=#{param.orgId}
+        where q.confirm_status>=2 and q.reform_status is not null
+        <if test="params.checkSub==true">
+            and q.org_path like concat((select path from sys_org where id=#{params.orgId}),"%")
         </if>
-        <if test="param.reformStatus==null">
-            and q.confirm_status>=2
+        <if test="params.checkSub!=true">
+            and q.org_id=#{params.orgId}
         </if>
-        <if test="param.reformStatus!=null">
-            and q.reform_status=#{param.reformStatus}
+        <if test="params.reformStatus!=null">
+            <if test="params.reformStatus==12">
+                and q.confirm_status!=3 and q.reform_deadline &lt; #{today}
+            </if>
+            <if test="params.reformStatus!=12">
+                and q.reform_status=#{params.reformStatus}
+            </if>
         </if>
-        <if test="param.searchKey!=null">
-            and (q.check_content like concat('%',#{param.searchKey},'%') or q.src_task_name like
-            concat('%',#{param.searchKey},'%'))
+        <if test="params.reformRange!=null and params.reformRange.length==2">
+            and q.reform_deadline between #{params.reformRange[0]} and #{params.reformRange[1]}
         </if>
-        <if test="param.reformRange!=null and param.reformRange.length==2">
-            and q.reform_deadline between #{param.reformRange[0]} and #{param.reformRange[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.id desc
     </select>

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

@@ -53,7 +53,6 @@ public class SysNfcBindController extends BaseController {
      * 获取【请填写功能名称】详细信息
      */
     @ApiOperation(value = "app获取SysNfcBind详细信息,传入code")
-    @RequiresPermissions("system:bind:query")
     @GetMapping(value = {"/appGetInfo/{code}"})
     public AjaxResult appGetInfo(@PathVariable String code) {
         AjaxResult ajax = AjaxResult.success();