aix
2024-07-04 7e2007c0cc602047823c003e8a4276b00fc58f4b
行政区划筛选
2 files modified
40 ■■■■ changed files
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/mapper/TbResDykeMapper.xml 2 ●●● patch | view | raw | blame | history
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/service/impl/TbResDykeServiceImpl.java 38 ●●●● patch | view | raw | blame | history
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/mapper/TbResDykeMapper.xml
@@ -133,7 +133,7 @@
            )
        </if>
        <if test="vo.adCode != null and vo.adCode != '' ">
            and trd."ad_code" LIKE #{vo.adCode}
            and concat(aa."ad_code",ab."ad_code",ac."ad_code",ad."ad_code") LIKE concat('%',#{vo.adCode},'%')
        </if>
) base where 1=1
        <if test="vo.hasDanger != null and vo.hasDanger != '' ">
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/service/impl/TbResDykeServiceImpl.java
@@ -55,26 +55,24 @@
    @Override
    public IPage<TbResDykeVO> findTbResDykePcBy(IPage<TbResDykeVO> page, TbResDykeVO tbResDykeVO) {
        if (StringUtil.isNotBlank(tbResDykeVO.getAdCode())){
            //若行政区划不为空
            String adCode =tbResDykeVO.getAdCode();
            if (adCode.substring(0,4).indexOf("00") > -1) {
                //前四位包含00说明是湖北省      4200/00000000
                adCode =StringUtil.format("%{}%",adCode.substring(0,2));
            } else if (adCode.substring(0,6).indexOf("00") > -1) {
                //前六位包含00说明是市级    420100/000000
//                adCode = paramAd.substring(0,4);
                adCode =StringUtil.format("%{}%",adCode.substring(0,4));
            }else if (adCode.substring(0,8).indexOf("00") > -1){
                //前8位包含00 说明是区级     42011700/0000
//                adCode = paramAd.substring(0,6);
                adCode =StringUtil.format("%{}%",adCode.substring(0,6));
            }
            tbResDykeVO.setAdCode(adCode);
        }
//        if (StringUtil.isNotBlank(tbResDykeVO.getAdCode())){
//            //若行政区划不为空
//            String adCode =tbResDykeVO.getAdCode();
//
//            if (adCode.substring(0,4).indexOf("00") > -1) {
//                //前四位包含00说明是湖北省      4200/00000000
//                adCode =StringUtil.format("%{}%",adCode.substring(0,2));
//            } else if (adCode.substring(0,6).indexOf("00") > -1) {
//                //前六位包含00说明是市级    420100/000000
////                adCode = paramAd.substring(0,4);
//                adCode =StringUtil.format("%{}%",adCode.substring(0,4));
//            }else if (adCode.substring(0,8).indexOf("00") > -1){
//                //前8位包含00 说明是区级     42011700/0000
////                adCode = paramAd.substring(0,6);
//                adCode =StringUtil.format("%{}%",adCode.substring(0,6));
//            }
//            tbResDykeVO.setAdCode(adCode);
//        }
        if (tbResDykeVO.getIsPage()){
            return page.setRecords(baseMapper.findTbResDykePcBy(page,tbResDykeVO));