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