Merge remote-tracking branch 'origin/jtdev' into jtdev

ke

2024-07-19 08a962d2925baa255207fdf979e6fee794f1773b

1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
package cn.gistack.sm.sjztmd.service.impl;
 
import cn.gistack.sm.sjztmd.entity.TbResDyke;
import cn.gistack.sm.sjztmd.mapper.TbResDykeMapper;
import cn.gistack.sm.sjztmd.service.ITbResDykeService;
import cn.gistack.sm.sjztmd.vo.TbResDykeVO;
import com.baomidou.dynamic.datasource.annotation.DS;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import lombok.Data;
import org.springblade.core.tool.utils.StringUtil;
import org.springframework.stereotype.Service;
 
import java.util.List;
 
@Data
@Service
@DS("zt")
public class TbResDykeServiceImpl extends ServiceImpl<TbResDykeMapper, TbResDyke> implements ITbResDykeService {
    @Override
    public TbResDykeVO getDetail(TbResDyke resDyke) {
        return baseMapper.getDetail(resDyke);
    }
 
    @Override
    public Object getList(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 (tbResDykeVO.getIsPage()){
            return page.setRecords(baseMapper.getPage(page,tbResDykeVO));
        }else {
            return baseMapper.getPage(null,tbResDykeVO);
        }
    }
 
    @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 (tbResDykeVO.getIsPage()){
            return page.setRecords(baseMapper.findTbResDykePcBy(page,tbResDykeVO));
        }else {
            return page.setRecords(baseMapper.findTbResDykePcBy(null,tbResDykeVO));
        }
    }
}