xiug

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

@@ -224,7 +224,7 @@ public class CoreEvaluateTaskServiceImpl extends ServiceImpl<CoreEvaluateTaskMap
     @Override
     public CoreEvaluateTaskVO selectCoreEvaluateTaskById(Long id) {
         String s = remoteRoleService.selectRoleNameByUserId(SecurityUtils.getUserId(), SecurityConstants.INNER);
-        boolean admin = false;
+/*        boolean admin = false;
         if (StringUtils.isNotEmpty(s)) {
             int i = s.indexOf(",");
             if (i >= 0) {
@@ -245,7 +245,7 @@ public class CoreEvaluateTaskServiceImpl extends ServiceImpl<CoreEvaluateTaskMap
         }
         if (!admin) {
             throw new RuntimeException("该角色没有查看权限");
-        }
+        }*/
         CoreEvaluateTaskVO coreEvaluateTaskVO = new CoreEvaluateTaskVO();
         CoreEvaluateTask coreEvaluateTask = coreEvaluateTaskMapper.selectById(id);
         BeanUtils.copyProperties(coreEvaluateTask, coreEvaluateTaskVO);

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

@@ -1,5 +1,7 @@
 package com.xunmei.core.reportForms.monitor.service.impl;
 
+import cn.hutool.core.date.DateTime;
+import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.util.ObjectUtil;
 import com.alibaba.excel.EasyExcel;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -167,7 +169,7 @@ public class MonitorAccessReportServiceImpl implements MonitorAccessReportServic
             monitoringAccessDTO.setOrgId(SecurityUtils.getLoginUser().getOrgId());
         }
         SysOrg sysOrg = remoteOrgService.selectSysOrgById(monitoringAccessDTO.getOrgId(), SecurityConstants.INNER);
-        String title = sysOrg.getShortName() + "监控调阅情况表" + "(" + monitoringAccessDTO.getStartDate() + "~" + monitoringAccessDTO.getEndDate() + ")";
+        String title = sysOrg.getShortName() + "监控调阅情况表" + "(" + monitoringAccessDTO.getStartDate().split(" ")[0] + "~" + monitoringAccessDTO.getEndDate().split(" ")[0] + ")";
         return title;
     }
 

soc-modules/soc-modules-core/src/main/resources/mapper/retrieval/CoreMonitoringRetrievalTaskMapper.xml

@@ -156,10 +156,8 @@
             and a.status =#{request.status}
         </if>
         <if test="request.moth !=null">
-
-            AND #{request.planStartTime} BETWEEN a.plan_start_time
-            AND a.plan_end_time
-            OR #{request.planEndTime} BETWEEN a.plan_start_time 	AND a.plan_end_time
+            AND( (a.plan_start_time &lt;= #{request.planStartTime} OR a.plan_end_time>=#{request.planStartTime})
+            OR (a.plan_start_time &lt;= #{request.planEndTime} OR a.plan_end_time>=#{request.planEndTime}))
         </if>
         AND a.role_id IN (SELECT role_id FROM sys_user_role WHERE user_id=#{request.retrievalUser})
         GROUP BY