zrj
2024-07-05 14ebb66c9f5805cc166a801b0e74d66ea1336f37
区县告警人员查询修改
4 files modified
68 ■■■■■ changed files
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/controller/AttResManagePersonController.java 5 ●●●●● patch | view | raw | blame | history
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/mapper/AttResManagePersonMapper.java 8 ●●●● patch | view | raw | blame | history
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/mapper/AttResManagePersonMapper.xml 45 ●●●●● patch | view | raw | blame | history
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/service/impl/AttResManagePersonServiceImpl.java 10 ●●●●● patch | view | raw | blame | history
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/controller/AttResManagePersonController.java
@@ -146,4 +146,9 @@
    }
    @GetMapping("/getCityCountyPersonListByResGuid")
    public R getCityCountyPersonListByResGuid(String resCd){
        return R.data(attResManagePersonService.getCityCountyPersonListByResGuid(resCd));
    }
}
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/mapper/AttResManagePersonMapper.java
@@ -55,13 +55,13 @@
    /**
     * 根据水库编号查询市县水利部人员姓名及联系方式
     * @param res_cd 水库编号
     * @param roleAlias 角色别名
     * @param countyCode 区县编号
     * @param cityCode 市州编号
     * @param type 人员类型
     * @return
     */
    List<PersonVO> getCityCountyPersonListByResGuid(@Param("adCode") String res_cd,
                                                         @Param("roleAlias") String roleAlias,
    List<PersonVO> getCityCountyPersonListByResGuid(@Param("countyCode") String countyCode,
                                                         @Param("cityCode") String cityCode,
                                                         @Param("type") String type);
    List<PatrolResponsiblePerson> getPatrolResponsiblePersonByResCdList(@Param("ids") List<String> reservoirList);
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/mapper/AttResManagePersonMapper.xml
@@ -200,22 +200,39 @@
        </choose>
    </select>
    <!--根据水库编号查询市县水利部人员姓名及联系方式-->
    <!--根据水库编号查询市县水利部人员姓名及联系方式(省市县预警短信发送人员)-->
    <select id="getCityCountyPersonListByResGuid" resultType="cn.gistack.sm.sjztmd.vo.PersonVO">
        select real_name as name,phone,#{type} as type from YWXT.blade_user bu
        left join YWXT.blade_dept bd on locate(bd.id,bu.dept_id)>0 and bd.is_deleted = 0
        left join YWXT.blade_role br on locate(br.id,bu.role_id)>0 and br.is_deleted = 0
        where bu.is_deleted = 0
        <if test="roleAlias != null and roleAlias == 'qxglywuser'">
            and (br.role_alias = #{roleAlias} or br.role_alias = 'qxswjgly')
        </if>
        <if test="roleAlias != null and roleAlias == 'sdglywuser'">
            and (br.role_alias = #{roleAlias} or br.role_alias = 'dsswjgly')
        </if>
        and bd.ad_code = #{adCode}
        and bu.TYPE is null order by role_name desc,name asc
        limit 1
        (
        select real_name as name, phone, '预警短信发送人员' as type
         from YWXT.blade_user bu
                  left join YWXT.blade_dept bd on locate(bd.id, bu.dept_id) > 0 and bd.is_deleted = 0
                  left join YWXT.blade_role br on locate(br.id, bu.role_id) > 0 and br.is_deleted = 0
         where bu.is_deleted = 0
           and br.role_alias = 'sltyjdxfsry'
           and bd.ad_code = '420000000000' limit 2
        )
        union
        (
            select real_name as name, phone, '预警短信发送人员' as type
            from YWXT.blade_user bu
                     left join YWXT.blade_dept bd on locate(bd.id, bu.dept_id) > 0 and bd.is_deleted = 0
                     left join YWXT.blade_role br on locate(br.id, bu.role_id) > 0 and br.is_deleted = 0
            where bu.is_deleted = 0
              and br.role_alias = 'sjyjdxfsry'
              and bd.ad_code = #{cityCode} limit 2
        )
        union
        (
            select real_name as name, phone, '预警短信发送人员' as type
            from YWXT.blade_user bu
                     left join YWXT.blade_dept bd on locate(bd.id, bu.dept_id) > 0 and bd.is_deleted = 0
                     left join YWXT.blade_role br on locate(br.id, bu.role_id) > 0 and br.is_deleted = 0
            where bu.is_deleted = 0
              and br.role_alias = 'xjyjdxfsry'
              and bd.ad_code = #{countyCode} limit 2
        )
    </select>
    <select id="getPatrolResponsiblePersonByResCdList"
            resultType="cn.gistack.sm.sjztmd.entity.PatrolResponsiblePerson">
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/service/impl/AttResManagePersonServiceImpl.java
@@ -160,13 +160,9 @@
        // 查询当前水库对应的市级编号和县区编号
        AttResBaseVO attResBaseVO = attResBaseService.getCityCountyCodeByResGuid(res_cd);
        if (null!= attResBaseVO) {
            // 通过编号查询对应的人员   先区县后市州
            List<PersonVO> countyPerson = baseMapper.getCityCountyPersonListByResGuid(attResBaseVO.getCountyCode(), "qxglywuser", "区县水库管理业务人员");
            List<PersonVO> cityPerson = baseMapper.getCityCountyPersonListByResGuid(attResBaseVO.getCityCode(), "sdglywuser", "市州水库管理业务人员");
            // 和
            personVOList.addAll(cityPerson);
            personVOList.addAll(countyPerson);
            // 通过编号查询对应的人员
            List<PersonVO> personListByResGuid = baseMapper.getCityCountyPersonListByResGuid(attResBaseVO.getCountyCode(), attResBaseVO.getCityCode(), "");
            personVOList.addAll(personListByResGuid);
        }
        // 返回
        return personVOList;