Compare commits

..

No commits in common. "6c396bfbbd677172a91e30dae5dcfcad8ed3913b" and "32f55301df906da839e259ea9bd7f74b9f8404b9" have entirely different histories.

4 changed files with 4 additions and 23 deletions

View File

@ -8,7 +8,6 @@ import cn.iocoder.yudao.framework.common.util.number.MoneyUtils;
import cn.iocoder.yudao.framework.common.util.object.BeanUtils; import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
import cn.iocoder.yudao.framework.security.core.LoginUser; import cn.iocoder.yudao.framework.security.core.LoginUser;
import cn.iocoder.yudao.framework.security.core.util.SecurityFrameworkUtils; import cn.iocoder.yudao.framework.security.core.util.SecurityFrameworkUtils;
import cn.iocoder.yudao.framework.tenant.core.context.TenantContextHolder;
import cn.iocoder.yudao.module.base.entity.RepairWorker; import cn.iocoder.yudao.module.base.entity.RepairWorker;
import cn.iocoder.yudao.module.base.service.RepairRecordsService; import cn.iocoder.yudao.module.base.service.RepairRecordsService;
import cn.iocoder.yudao.module.base.service.RepairWorkerService; import cn.iocoder.yudao.module.base.service.RepairWorkerService;
@ -1247,11 +1246,7 @@ public class DlRepairTicketsServiceImpl extends ServiceImpl<DlRepairTicketsMappe
repairTicketsReqVO.setSelectType("special"); repairTicketsReqVO.setSelectType("special");
// 维修服务顾问 // 维修服务顾问
if (userRoleCode.equals(RepairRoleEnum.ADVISOR.getCode())) { if (userRoleCode.equals(RepairRoleEnum.ADVISOR.getCode())) {
// 查所有的服务顾问 repairTicketsReqVO.setNowRepairId(loginUserId);
List<UserDTO> userDTOS = roleApi.selectUserListByRoleCode(TenantContextHolder.getRequiredTenantId(), RepairRoleEnum.ADVISOR.getCode());
List<Long> ids = userDTOS.stream().map(UserDTO::getId).collect(Collectors.toList());
repairTicketsReqVO.setNowRepairIds(ids);
// repairTicketsReqVO.setNowRepairId(loginUserId);
// 因为完成状态需要在交车之后所以注掉这个 // 因为完成状态需要在交车之后所以注掉这个
// repairTicketsReqVO.setIsFinish("1"); // repairTicketsReqVO.setIsFinish("1");
} else if (userRoleCode.equals(RepairRoleEnum.INSPECTION.getCode())) { } else if (userRoleCode.equals(RepairRoleEnum.INSPECTION.getCode())) {

View File

@ -2,7 +2,6 @@ package cn.iocoder.yudao.module.tickets.service.impl;
import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.bean.BeanUtil;
import cn.hutool.core.collection.CollectionUtil; import cn.hutool.core.collection.CollectionUtil;
import cn.hutool.core.util.ObjectUtil;
import cn.iocoder.yudao.common.RecordTypeEnum; import cn.iocoder.yudao.common.RecordTypeEnum;
import cn.iocoder.yudao.common.RepairRoleEnum; import cn.iocoder.yudao.common.RepairRoleEnum;
import cn.iocoder.yudao.common.SoStatusEnum; import cn.iocoder.yudao.common.SoStatusEnum;

View File

@ -36,7 +36,4 @@ public class DlRepairTicketsReqVO extends DlRepairTickets {
/** 图片路径 */ /** 图片路径 */
private String image; private String image;
/** 当前操作人包含集合,主要用在服务顾问那儿 */
private List<Long> nowRepairIds;
} }

View File

@ -235,23 +235,13 @@
</if> </if>
<choose> <choose>
<when test="map.selectType=='special'"> <when test="map.selectType=='special'">
-- 小李用的逻辑--isFinish不需要了 -- -- 小李用的逻辑 --
<!-- <if test="map.isFinish != null and map.isFinish != ''"> <if test="map.isFinish != null and map.isFinish != ''">
AND ( drt.is_finish = #{map.isFinish}) AND ( drt.is_finish = #{map.isFinish})
</if> --> </if>
-- 总检查待处理还是用这个 --
<if test="map.nowRepairId != null and map.nowRepairId != ''"> <if test="map.nowRepairId != null and map.nowRepairId != ''">
AND ( drt.now_repair_id = #{map.nowRepairId}) AND ( drt.now_repair_id = #{map.nowRepairId})
</if> </if>
-- 服务顾问查待处理(服务顾问之间可以相互查) --
<if test="map.nowRepairIds != null and map.nowRepairIds.size > 0">
AND (
drt.now_repair_id in
<foreach collection="map.nowRepairIds" item="id" open="(" separator="," close=")">
#{id}
</foreach>
)
</if>
</when> </when>
<otherwise> <otherwise>
-- 正常查询用的逻辑 -- -- 正常查询用的逻辑 --