班组问题修复

lift-business-service/src/main/java/cn/com/ty/lift/business/maintenance/dao/mapper/MaintenanceRecordMapper.java

@@ -70,6 +70,9 @@ public interface MaintenanceRecordMapper extends BaseMapper<MaintenanceRecord> {
 
     IPage<MtRecordResponse> pageByLift(IPage<MtRecordResponse> page, @Param("cond") MtRecordRequest request);
 
+    @Select("SELECT value FROM global_set WHERE code = 'workLift' AND company_id = #{mtCompanyId}")
+    String getGlobalSet(Long mtCompanyId);
+
     @Select("SELECT id FROM maintenance_record WHERE mt_plan_id = #{planId}")
     Long getRecordIdByPlanId(Long planId);
 }

lift-business-service/src/main/java/cn/com/ty/lift/business/project/service/ProjectAppService.java

@@ -23,13 +23,11 @@ import cn.com.ty.lift.business.project.dao.entity.model.response.ProjectLiftResp
 import cn.com.ty.lift.business.project.dao.entity.model.response.ProjectUserResponse;
 import cn.com.ty.lift.business.project.dao.mapper.ProjectMapper;
 import cn.com.ty.lift.business.project.dao.mapper.ProjectUserMapper;
-import cn.com.ty.lift.common.constants.ApiConstants;
 import cn.com.xwy.boot.web.dto.RestResponse;
 import cn.hutool.core.collection.CollUtil;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import lombok.extern.slf4j.Slf4j;
-import org.springframework.data.redis.core.RedisTemplate;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.transaction.interceptor.TransactionAspectSupport;
@@ -78,9 +76,6 @@ public class ProjectAppService extends ServiceImpl<ProjectMapper, Project> {
     @Resource
     private MaintenanceService maintenanceService;
 
-    @Resource
-    private RedisTemplate redisTemplate;
-
     /**
      * @param request 公司id
      * @return RestResponse 项目列表
@@ -181,9 +176,10 @@ public class ProjectAppService extends ServiceImpl<ProjectMapper, Project> {
     public List<MaintenanceCount> count(MaintenanceRecordRequest request) {
         request.setEndTime(request.getBeginTime().with(TemporalAdjusters.lastDayOfMonth()));
         if (DefaultRole.MTWORK.getCode().equals(request.getCurrentRoleCode())) {
-            Object obj = redisTemplate.opsForHash().get(request.getMtCompanyId() + "_globalSet", ApiConstants.GlobalSetConstants.WORK_LIFT);
+            String globalSet = maintenanceRecordMapper.getGlobalSet(request.getMtCompanyId());
+            if (Objects.isNull(globalSet)) globalSet = "0";
             //维保工不能查看到项目组其他维保工的任务
-            if (Objects.equals("0", obj)) {
+            if (Objects.equals("0", globalSet)) {
                 request.setLook("0");
             } else {
                 request.setLook("1");
@@ -230,10 +226,12 @@ public class ProjectAppService extends ServiceImpl<ProjectMapper, Project> {
         if (Objects.nonNull(request.getBeginTime())) {
             request.setEndTime(request.getBeginTime().with(TemporalAdjusters.lastDayOfMonth()));
         }
+        log.info("角色名称：" + request.getCurrentRoleCode());
         if (DefaultRole.MTWORK.getCode().equals(request.getCurrentRoleCode())) {
-            Object obj = redisTemplate.opsForHash().get(request.getMtCompanyId() + "_globalSet", ApiConstants.GlobalSetConstants.WORK_LIFT);
+            String globalSet = maintenanceRecordMapper.getGlobalSet(request.getMtCompanyId());
+            if (Objects.isNull(globalSet)) globalSet = "0";
             //维保工不能查看到项目组其他维保工的任务
-            if (Objects.equals("0", obj)) {
+            if (Objects.equals("0", globalSet)) {
                 request.setLook("0");
             } else {
                 request.setLook("1");
@@ -276,17 +274,19 @@ public class ProjectAppService extends ServiceImpl<ProjectMapper, Project> {
     /**
      * @param request 用户id和维保状态
      * @return RestResponse 保养任务列表
-     * @description 根据用户id和z维保状态查询保养任务列表
+     * @description 根据用户id和维保状态查询保养任务列表
      * @date 2020/4/24 5:03 下午
      */
     public IPage<MaintenanceAppResponse> recordTask(MaintenanceRecordRequest request) {
         if (Objects.nonNull(request.getBeginTime())) {
             request.setEndTime(request.getBeginTime().with(TemporalAdjusters.lastDayOfMonth()));
         }
+        log.info("角色名称：" + request.getCurrentRoleCode());
         if (DefaultRole.MTWORK.getCode().equals(request.getCurrentRoleCode())) {
-            Object obj = redisTemplate.opsForHash().get(request.getMtCompanyId() + "_globalSet", ApiConstants.GlobalSetConstants.WORK_LIFT);
+            String globalSet = maintenanceRecordMapper.getGlobalSet(request.getMtCompanyId());
+            if (Objects.isNull(globalSet)) globalSet = "0";
             //维保工不能查看到项目组其他维保工的任务
-            if (Objects.equals("0", obj)) {
+            if (Objects.equals("0", globalSet)) {
                 request.setLook("0");
             } else {
                 request.setLook("1");