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

guoshilong

2024-01-11 a331dacaa853a79efb78937dd49e5f6cca22ba69

 skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/service/impl/AttResBaseServiceImpl.java

@@ -5,6 +5,8 @@
import cn.gistack.sm.sjztmd.entity.AttResBase;
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;
@@ -36,6 +38,11 @@
   @Override
   public IPage<AttResBase> selectAttResBasePage(IPage<AttResBase> page, AttResBase attResBase) {
      return page.setRecords(baseMapper.selectAttResBasePage(page,attResBase));
   }

   @Override
   public IPage<AttResBaseGeneralInvestigationVO> selectAttResBaseGeneralInvestigation(IPage<AttResBaseGeneralInvestigationVO> page, AttResBaseGeneralInvestigationVO attResBase) {
      return page.setRecords(baseMapper.selectAttResBaseGeneralInvestigation(page,attResBase));
   }

   @Override
@@ -82,4 +89,19 @@
   public AttResBaseVO getCityCountyCodeByResGuid(String res_cd) {
      return baseMapper.getCityCountyCodeByResGuid(res_cd);
   }

   /**
    * 根据水库编码获取行政区数据
    * @param guid
    * @return
    */
   @Override
   public AttResAdVO getWaterRegionInfoByResGuid(String guid) {
      return baseMapper.getWaterRegionInfoByResGuid(guid);
   }

   @Override
   public int getDimResInfoACount() {
      return baseMapper.getDimResInfoACount();
   }
}