From d635fb4e5a2b03b7590449b5687fe873df9927c0 Mon Sep 17 00:00:00 2001 From: pengwei Date: Thu, 17 Jul 2025 10:37:22 +0800 Subject: [PATCH] =?UTF-8?q?fit:=E5=80=BC=E7=8F=AD=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/supRota/SupRotaController.java | 1 + .../mapper/ZhkshDutyScheduleDcMapper.java | 2 +- .../supervision/pojo/entity/SupRota.java | 4 ++-- .../supervision/service/SupRotaService.java | 21 +++++++++++++--- .../service/TaskManagementService.java | 24 ++++++++++--------- 5 files changed, 35 insertions(+), 17 deletions(-) diff --git a/src/main/java/com/biutag/supervision/controller/supRota/SupRotaController.java b/src/main/java/com/biutag/supervision/controller/supRota/SupRotaController.java index f94d953..56b5879 100644 --- a/src/main/java/com/biutag/supervision/controller/supRota/SupRotaController.java +++ b/src/main/java/com/biutag/supervision/controller/supRota/SupRotaController.java @@ -22,4 +22,5 @@ public class SupRotaController { return Result.success(jsonObject); } + } diff --git a/src/main/java/com/biutag/supervision/mapper/ZhkshDutyScheduleDcMapper.java b/src/main/java/com/biutag/supervision/mapper/ZhkshDutyScheduleDcMapper.java index 96f7fe9..16f473a 100644 --- a/src/main/java/com/biutag/supervision/mapper/ZhkshDutyScheduleDcMapper.java +++ b/src/main/java/com/biutag/supervision/mapper/ZhkshDutyScheduleDcMapper.java @@ -12,6 +12,6 @@ import java.util.List; public interface ZhkshDutyScheduleDcMapper extends BaseMapper { @Select(" SELECT * FROM V_ZHKSH_DUTY_SCHEDULE_DC " + " where start_time between #{startTime} and #{endTime} " + - " and PARENT_POST_CODE = 'zb' ") + " and PARENT_POST_CODE = 'ZB' ") List selectList(LocalDate startTime,LocalDate endTime); } diff --git a/src/main/java/com/biutag/supervision/pojo/entity/SupRota.java b/src/main/java/com/biutag/supervision/pojo/entity/SupRota.java index d9d21fc..7d3701c 100644 --- a/src/main/java/com/biutag/supervision/pojo/entity/SupRota.java +++ b/src/main/java/com/biutag/supervision/pojo/entity/SupRota.java @@ -46,6 +46,6 @@ public class SupRota { @TableField("phone") private String phone; - @TableField("schedule_id") - private String scheduleId; +// @TableField("schedule_id") +// private String scheduleId; } diff --git a/src/main/java/com/biutag/supervision/service/SupRotaService.java b/src/main/java/com/biutag/supervision/service/SupRotaService.java index 624f54e..93c9ef2 100644 --- a/src/main/java/com/biutag/supervision/service/SupRotaService.java +++ b/src/main/java/com/biutag/supervision/service/SupRotaService.java @@ -3,9 +3,13 @@ package com.biutag.supervision.service; import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.biutag.supervision.common.UserContextHolder; +import com.biutag.supervision.constants.AppConstants; +import com.biutag.supervision.constants.enums.RoleCodeEnum; import com.biutag.supervision.mapper.SupRotaMapper; import com.biutag.supervision.pojo.entity.SupDepart; import com.biutag.supervision.pojo.entity.SupRota; +import com.biutag.supervision.pojo.model.UserAuth; import com.biutag.supervision.pojo.param.SupRotaQueryParam; import com.biutag.supervision.pojo.vo.SupRotaVo; import lombok.RequiredArgsConstructor; @@ -19,13 +23,17 @@ import java.util.List; @Service public class SupRotaService extends ServiceImpl { - private SupDepartService departService; + private final SupDepartService departService; //展示数据的接口 public JSONObject getSupRotaTable(SupRotaQueryParam queryParam){ + UserAuth user = UserContextHolder.getCurrentUser(); + //判断传入的id是市局、还是分局 - SupDepart supDepart = departService.getById(queryParam.getDeptId()); + JSONObject jsonObject=new JSONObject(); - if(supDepart.getLevel() == 0){ + if (user.getRoleCodes().contains(RoleCodeEnum.FIRST_ADMIN.getCode()) || user.getRoleCodes().contains(RoleCodeEnum.ADMIN.getCode()) ) { + + SupDepart supDepart = departService.getById(AppConstants.ROOT_DEPART_ID); //市局的数据进行分类 //市局本身 List supRota = baseMapper.selectList(new LambdaQueryWrapper().eq(SupRota::getDeptCode,supDepart.getId()).eq(SupRota::getRotaTime,queryParam.getDate())); @@ -43,4 +51,11 @@ public class SupRotaService extends ServiceImpl { return jsonObject; } +// public JSONObject getSubofficeTable(SupRotaQueryParam queryParam){ +// JSONObject jsonObject =new JSONObject(); +// List supRotaList = baseMapper.getSupRotaList(queryParam.getDate(),queryParam.getDeptId()); +// jsonObject.fluentPut("supRotaList",supRotaList); +// return jsonObject; +// } + } diff --git a/src/main/java/com/biutag/supervision/service/TaskManagementService.java b/src/main/java/com/biutag/supervision/service/TaskManagementService.java index 4894f70..8888b05 100644 --- a/src/main/java/com/biutag/supervision/service/TaskManagementService.java +++ b/src/main/java/com/biutag/supervision/service/TaskManagementService.java @@ -79,20 +79,22 @@ public class TaskManagementService { task.setTaskType("testing_alcohol"); if (CollectionUtil.isNotEmpty(dto.getUserList())) { Set departIds = dto.getUserList().stream().map(SupTaskTestingAlcoholPeople::getDepartId).collect(Collectors.toSet()); - log.info("departIds：" + String.join(",", departIds)); - List departs = departService.listByIds(departIds); - if(CollectionUtil.isNotEmpty(departs)){ - log.info("departs的长度：" + departs.size()); - task.setSupDepartName(departs.stream().map(SupDepart::getShortName).collect(Collectors.joining("、"))); + if(CollectionUtil.isNotEmpty(departIds)){ + log.info("departIds：" + String.join(",", departIds)); + List departs = departService.listByIds(departIds); + if(CollectionUtil.isNotEmpty(departs)){ + log.info(departs.stream().map(SupDepart::getShortName).collect(Collectors.joining("、"))); + task.setSupDepartName(departs.stream().map(SupDepart::getShortName).collect(Collectors.joining("、"))); + } + }else{ + Set departList = dto.getUserList().stream().map(SupTaskTestingAlcoholPeople::getDepartName).collect(Collectors.toSet()); + if(CollectionUtil.isNotEmpty(departList)){ + task.setSupDepartName(departList.stream().collect(Collectors.joining("、"))); + } } } - if(CollectionUtil.isNotEmpty(dto.getUserList())){ - Set departList = dto.getUserList().stream().map(SupTaskTestingAlcoholPeople::getDepartName).collect(Collectors.toSet()); - if(CollectionUtil.isNotEmpty(departList)){ - task.setSupDepartName(departList.stream().collect(Collectors.joining("、"))); - } - } + } if("重点人员管控".equals(dto.getSpecialType())){