xieb
2024-01-06 66797b34167669595dd28c93d41334a7a18fe474
白蚁普查相关
7 files modified
70 ■■■■ changed files
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/controller/TbResGeneralInvestigationController.java 11 ●●●●● patch | view | raw | blame | history
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/mapper/AttResBaseMapper.java 4 ●●●● patch | view | raw | blame | history
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/mapper/AttResBaseMapper.xml 29 ●●●●● patch | view | raw | blame | history
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/service/IAttResBaseService.java 3 ●●●●● patch | view | raw | blame | history
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/service/impl/AttResBaseServiceImpl.java 6 ●●●●● patch | view | raw | blame | history
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/vo/AttResBaseGeneralInvestigationVO.java 2 ●●● patch | view | raw | blame | history
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/wrapper/AttResBaseWrapper.java 15 ●●●●● patch | view | raw | blame | history
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/controller/TbResGeneralInvestigationController.java
@@ -4,6 +4,7 @@
import cn.gistack.sm.sjztmd.entity.TbResGeneralInvestigation;
import cn.gistack.sm.sjztmd.service.IAttResBaseService;
import cn.gistack.sm.sjztmd.service.ITbResGeneralInvestigationService;
import cn.gistack.sm.sjztmd.vo.AttResBaseGeneralInvestigationVO;
import cn.gistack.sm.sjztmd.wrapper.AttResBaseWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -39,10 +40,10 @@
    private IAttResBaseService attResBaseService;
    @ApiOperation(value = "中台水库-分页列表查询", notes = "中台水库-分页列表查询")
    @GetMapping(value = "/resList")
    public R queryPageList(AttResBase attResBase, Query query) {
        IPage<AttResBase> pageList = attResBaseService.selectAttResBasePage(Condition.getPage(query), attResBase);
        return R.data(AttResBaseWrapper.build().pageVO(pageList));
    @GetMapping(value = "/queryPageResList")
    public R queryPageResList(AttResBaseGeneralInvestigationVO attResBase, Query query) {
        IPage<AttResBaseGeneralInvestigationVO> pageList = attResBaseService.selectAttResBaseGeneralInvestigation(Condition.getPage(query), attResBase);
        return R.data(pageList);
    }
    @GetMapping("/list")
@@ -53,6 +54,8 @@
            queryWrapper.eq("\"check_state\"", param.getCheckState());
        if (!StringUtil.isBlank(param.getResName()))
            queryWrapper.like("\"res_name\"", param.getResName());
        if (!StringUtil.isBlank(param.getResGuid()))
            queryWrapper.like("\"res_guid\"", param.getResGuid());
        return R.data(tbResGeneralInvestigationService.page(Condition.getPage(query), queryWrapper));
    }
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/mapper/AttResBaseMapper.java
@@ -3,6 +3,7 @@
import cn.gistack.sm.sjztmd.dto.AttResBaseUserDTO;
import cn.gistack.sm.sjztmd.entity.AttResBase;
import cn.gistack.sm.sjztmd.vo.AttResAdVO;
import cn.gistack.sm.sjztmd.vo.AttResBaseGeneralInvestigationVO;
import cn.gistack.sm.sjztmd.vo.AttResBaseVO;
import cn.gistack.sm.sjztmd.vo.ManagePersonVO;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
@@ -21,6 +22,8 @@
    List<AttResBase> selectAttResBasePage(IPage<AttResBase> page, @Param("attResBase") AttResBase attResBase);
    List<AttResBaseGeneralInvestigationVO> selectAttResBaseGeneralInvestigation(IPage<AttResBaseGeneralInvestigationVO> page, @Param("attResBase")  AttResBaseGeneralInvestigationVO attResBase);
    List<AttResBase> getListByRegion(IPage<AttResBase> page,@Param("obj") Map<String, Object> obj);
@@ -65,4 +68,5 @@
     * @return
     */
    int getDimResInfoACount();
}
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/mapper/AttResBaseMapper.xml
@@ -10,6 +10,35 @@
            AND "name" LIKE CONCAT('%',#{attResBase.name},'%')
        </if>
    </select>
    <select id="selectAttResBaseGeneralInvestigation" resultType="cn.gistack.sm.sjztmd.vo.AttResBaseGeneralInvestigationVO">
        select * from (
            select *,
            case
            when (select count(*) from sjzt_md."tb_res_general_investigation" b where a."guid" = b."res_guid" and b."check_state" = 2) > 0 THEN  '2'
            when (select count(*) from sjzt_md."tb_res_general_investigation" b where a."guid" = b."res_guid" and b."check_state" = 1) > 0 THEN  '1'
            when (select count(*) from sjzt_md."tb_res_general_investigation" b where a."guid" = b."res_guid" and b."check_state" = 0) > 0 THEN  '0'
            ELSE '-1'
            END AS tb_state
            from sjzt_md."att_res_base" a
        ) a WHERE "is_deleted"=0
        <if test="attResBase.name !=null and attResBase.name !=''">
            AND "name" LIKE CONCAT('%',#{attResBase.name},'%')
        </if>
        <if test="attResBase.code !=null and attResBase.code !=''">
            AND "code" LIKE CONCAT('%',#{attResBase.code},'%')
        </if>
        <if test="attResBase.resRegCode !=null and attResBase.resRegCode !=''">
            AND "res_reg_code" LIKE CONCAT('%',#{attResBase.resRegCode},'%')
        </if>
        <if test="attResBase.tbState !=null and attResBase.tbState !=''">
            AND tb_state = #{attResBase.tbState}
        </if>
    </select>
    <select id="getListByRegion" resultType="cn.gistack.sm.sjztmd.entity.AttResBase">
        SELECT arb."guid",arb."code",arb."name",arb."ad_guid",arb."eng_scal",arb."res_loc" FROM "att_res_base" arb
        left join "att_ad_base" aab on aab."guid" = arb."interior_ad_guid"
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/service/IAttResBaseService.java
@@ -5,6 +5,7 @@
import cn.gistack.sm.sjztmd.entity.AttResBase;
import cn.gistack.sm.sjztmd.vo.AttAdBaseVO;
import cn.gistack.sm.sjztmd.vo.AttResAdVO;
import cn.gistack.sm.sjztmd.vo.AttResBaseGeneralInvestigationVO;
import cn.gistack.sm.sjztmd.vo.AttResBaseVO;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.service.IService;
@@ -23,6 +24,8 @@
    IPage<AttResBase> selectAttResBasePage(IPage<AttResBase> page, AttResBase attResBase);
    IPage<AttResBaseGeneralInvestigationVO> selectAttResBaseGeneralInvestigation(IPage<AttResBaseGeneralInvestigationVO> page, AttResBaseGeneralInvestigationVO attResBase);
    IPage<AttResBase> getListByRegion(IPage<AttResBase> page,Map<String, Object> obj);
    AttResBase getDetailByCode(String code);
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/service/impl/AttResBaseServiceImpl.java
@@ -6,6 +6,7 @@
import cn.gistack.sm.sjztmd.mapper.AttResBaseMapper;
import cn.gistack.sm.sjztmd.service.IAttResBaseService;
import cn.gistack.sm.sjztmd.vo.AttResAdVO;
import cn.gistack.sm.sjztmd.vo.AttResBaseGeneralInvestigationVO;
import cn.gistack.sm.sjztmd.vo.AttResBaseVO;
import cn.gistack.sm.sjztmd.vo.ManagePersonVO;
import com.baomidou.dynamic.datasource.annotation.DS;
@@ -40,6 +41,11 @@
    }
    @Override
    public IPage<AttResBaseGeneralInvestigationVO> selectAttResBaseGeneralInvestigation(IPage<AttResBaseGeneralInvestigationVO> page, AttResBaseGeneralInvestigationVO attResBase) {
        return page.setRecords(baseMapper.selectAttResBaseGeneralInvestigation(page,attResBase));
    }
    @Override
    public IPage<AttResBase> getListByRegion(IPage<AttResBase> page,Map<String, Object> obj) {
        return page.setRecords(baseMapper.getListByRegion(page,obj));
    }
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/vo/AttResBaseGeneralInvestigationVO.java
@@ -13,5 +13,5 @@
public class AttResBaseGeneralInvestigationVO extends AttResBase {
    private static final long serialVersionUID = 1L;
    private Boolean isSb;//是否上报
    private String tbState;//填报状态
}
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/wrapper/AttResBaseWrapper.java
@@ -37,19 +37,4 @@
        return vo;
    }
    public IPage<AttResBaseGeneralInvestigationVO> pageVO(IPage<AttResBase> pages) {
        List<AttResBaseGeneralInvestigationVO> records = listVO(pages.getRecords());
        for (AttResBaseGeneralInvestigationVO vo:records) {
            QueryWrapper queryWrapper = new QueryWrapper();
            queryWrapper.eq("\"res_guid\"",vo.getGuid());
            queryWrapper.ne("\"check_state\"", 0);
            long tbCount = tbResGeneralInvestigationService.count(queryWrapper);
            vo.setIsSb(tbCount > 0);
        }
        IPage<AttResBaseGeneralInvestigationVO> pageVo = new Page<>(pages.getCurrent(), pages.getSize(), pages.getTotal());
        pageVo.setRecords(records);
        return pageVo;
    }
}