skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/controller/TbDykeInvestigationController.java
@@ -30,7 +30,7 @@ * @DATE: 2024/1/3 14:39 */ @Slf4j @Api(tags = "白蚁普查") @Api(tags = "堤防普查") @RestController @RequestMapping("/sjztmd/tbDykeInvestigation") @AllArgsConstructor skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/controller/TbResDykeController.java
@@ -81,5 +81,12 @@ return R.data(list); } @ApiOperation(value = "堤防普查-列表查询", notes = "堤防普查-分页列表查询") @GetMapping(value = "/findTbResDykePcBy") public R findTbResDykePcBy(TbResDykeVO tbResDykeVO, Query query) { Object list = tbResDykeService.findTbResDykePcBy(Condition.getPage(query), tbResDykeVO); return R.data(list); } } skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/mapper/AttResBaseMapper.xml
@@ -35,7 +35,10 @@ <if test="attResBase.resRegCode !=null and attResBase.resRegCode !=''"> AND a."res_reg_code" LIKE CONCAT('%',#{attResBase.resRegCode},'%') </if> <if test="attResBase.tbState !=null and attResBase.tbState !=''"> <if test="attResBase.tbState !=null and attResBase.tbState !='' and attResBase.tbState == -1"> AND (b."check_state" is null or b."check_state" = #{attResBase.tbState}) </if> <if test="attResBase.tbState !=null and attResBase.tbState !='' and attResBase.tbState != -1"> AND b."check_state" = #{attResBase.tbState} </if> <if test="attResBase.adCode != null and attResBase.adCode != '' "> skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/mapper/TbResDykeMapper.java
@@ -1,6 +1,7 @@ package cn.gistack.sm.sjztmd.mapper; import cn.gistack.sm.sjztmd.entity.TbResDyke; import cn.gistack.sm.sjztmd.vo.AttResBaseGeneralInvestigationVO; import cn.gistack.sm.sjztmd.vo.TbResDykeVO; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.metadata.IPage; @@ -12,4 +13,12 @@ List<TbResDykeVO> getPage(IPage<TbResDykeVO> page, @Param("vo") TbResDykeVO tbResDykeVO); TbResDykeVO getDetail(@Param("vo") TbResDyke resDyke); /** * 堤防普查列表 * @param page * @param tbResDykeVO * @return */ List<TbResDykeVO> findTbResDykePcBy(IPage<TbResDykeVO> page, @Param("vo") TbResDykeVO tbResDykeVO); } skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/mapper/TbResDykeMapper.xml
@@ -54,4 +54,30 @@ LEFT JOIN SJZT_MD."att_ad_base" aab ON aab."guid" = trd."ad_code" where trd."guid" = #{vo.guid} </select> <!-- 堤防普查列表 --> <select id="findTbResDykePcBy" resultType="cn.gistack.sm.sjztmd.vo.TbResDykeVO"> select a.*,b."check_state" AS tb_state from sjzt_md."tb_res_dyke" a left join "SJZT_MD"."tb_dyke_investigation_state" b on a."guid" = b."dyke_guid" left join "SJZT_MD"."att_ad_base" aa on aa."guid" = a."ad_code" left join "SJZT_MD"."att_ad_base" ab on ab."p_ad_code" = aa."ad_code" left join "SJZT_MD"."att_ad_base" ac on ac."p_ad_code" = ab."ad_code" left join "SJZT_MD"."att_ad_base" ad on ad."p_ad_code" = ac."ad_code" <where> <if test="vo.name !=null and vo.name !=''"> AND a."name" LIKE CONCAT('%',#{vo.name},'%') </if> <if test="vo.tbState !=null and vo.tbState !='' and vo.tbState == -1"> AND (b."check_state" is null or b."check_state" = #{vo.tbState}) </if> <if test="vo.tbState !=null and vo.tbState !='' and vo.tbState != -1"> AND b."check_state" = #{vo.tbState} </if> <if test="vo.adCode != null and vo.adCode != '' "> and (aa."ad_code" = #{vo.adCode} or ab."ad_code" = #{vo.adCode} or ac."ad_code" = #{vo.adCode} or ad."ad_code" = #{vo.adCode}) </if> </where> </select> </mapper> skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/service/ITbResDykeService.java
@@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.service.IService; import org.apache.ibatis.annotations.Param; import java.util.List; @@ -14,4 +15,12 @@ Object getList(IPage<TbResDykeVO> page,TbResDykeVO tbResDykeVO); /** * 堤防普查列表 * @param page * @param tbResDykeVO * @return */ IPage<TbResDykeVO> findTbResDykePcBy(IPage<TbResDykeVO> page, TbResDykeVO tbResDykeVO); } skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/service/impl/TbResDykeServiceImpl.java
@@ -28,4 +28,9 @@ return baseMapper.getPage(null,tbResDykeVO); } } @Override public IPage<TbResDykeVO> findTbResDykePcBy(IPage<TbResDykeVO> page, TbResDykeVO tbResDykeVO) { return page.setRecords(baseMapper.findTbResDykePcBy(page,tbResDykeVO)); } } skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/vo/TbResDykeVO.java
@@ -12,5 +12,7 @@ private Boolean isPage; private String tbState;//填报状态 }
