From fb7a51163c62ef7e4487170862f8e21a7502d2fc Mon Sep 17 00:00:00 2001 From: cwchen <1048842385@qq.com> Date: Fri, 30 Aug 2024 17:54:38 +0800 Subject: [PATCH] =?UTF-8?q?=E7=8F=AD=E7=BB=84=E4=B8=8B=E6=8B=89=E9=80=89?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/bonus/system/service/ISelectService.java | 2 +- .../java/com/bonus/system/service/impl/SelectServiceImpl.java | 2 +- .../src/main/resources/mapper/system/SelectMapper.xml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/bonus-modules/bonus-system/src/main/java/com/bonus/system/service/ISelectService.java b/bonus-modules/bonus-system/src/main/java/com/bonus/system/service/ISelectService.java index 7e813b4..7492693 100644 --- a/bonus-modules/bonus-system/src/main/java/com/bonus/system/service/ISelectService.java +++ b/bonus-modules/bonus-system/src/main/java/com/bonus/system/service/ISelectService.java @@ -67,7 +67,7 @@ public interface ISelectService { AjaxResult getTeamPeople(SysParamsDto dto); /** - * 根据杆塔ID获取领用吊装预警设备的班组 + * 根据杆塔ID获取领用吊装预警设备的班组/近电预警设备的班组 * @param dto * @return AjaxResult * @author cwchen diff --git a/bonus-modules/bonus-system/src/main/java/com/bonus/system/service/impl/SelectServiceImpl.java b/bonus-modules/bonus-system/src/main/java/com/bonus/system/service/impl/SelectServiceImpl.java index 48d361d..209574e 100644 --- a/bonus-modules/bonus-system/src/main/java/com/bonus/system/service/impl/SelectServiceImpl.java +++ b/bonus-modules/bonus-system/src/main/java/com/bonus/system/service/impl/SelectServiceImpl.java @@ -105,7 +105,7 @@ public class SelectServiceImpl implements ISelectService { @Override public AjaxResult getTeamListsByDzDevice(SysParamsDto dto) { try { - dto.setDevTypeCode(BusinessConstants.DZYJ); +// dto.setDevTypeCode(BusinessConstants.DZYJ); List list = mapper.getTeamListsByDzDevice(dto); return AjaxResult.success(list); } catch (Exception e) { diff --git a/bonus-modules/bonus-system/src/main/resources/mapper/system/SelectMapper.xml b/bonus-modules/bonus-system/src/main/resources/mapper/system/SelectMapper.xml index 94eb0a8..9e2f606 100644 --- a/bonus-modules/bonus-system/src/main/resources/mapper/system/SelectMapper.xml +++ b/bonus-modules/bonus-system/src/main/resources/mapper/system/SelectMapper.xml @@ -68,7 +68,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" FROM tb_device td LEFT JOIN tb_dev_ly tdl ON td.id = tdl.dev_id LEFT JOIN t_work_team twt ON tdl.team_id = twt.team_id AND twt.del_flag = 0 - WHERE tdl.gt_id = #{towerId} AND td.dev_type = #{devTypeCode} AND td.del_flag = 0 + WHERE tdl.gt_id = #{towerId} AND td.dev_type IN('lift_warn','elec_induction') AND td.del_flag = 0