From 08a962d2925baa255207fdf979e6fee794f1773b Mon Sep 17 00:00:00 2001
From: ke <893754509@qq.com>
Date: Fri, 19 Jul 2024 12:25:19 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/jtdev' into jtdev
---
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/mapper/AttResBaseMapper.java | 26 +++++++++++++++++++++++++-
1 files changed, 25 insertions(+), 1 deletions(-)
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/mapper/AttResBaseMapper.java b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/mapper/AttResBaseMapper.java
index 6aab487..aacab16 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/mapper/AttResBaseMapper.java
+++ b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/mapper/AttResBaseMapper.java
@@ -1,15 +1,19 @@
package cn.gistack.sm.sjztmd.mapper;
import cn.gistack.sm.sjztmd.dto.AttResBaseUserDTO;
+import cn.gistack.sm.sjztmd.entity.AttAdBase;
import cn.gistack.sm.sjztmd.entity.AttResBase;
+import cn.gistack.sm.sjztmd.excel.AttResBaseUserExcel;
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;
import com.baomidou.mybatisplus.core.metadata.IPage;
+import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
+import java.util.HashMap;
import java.util.List;
import java.util.Map;
@@ -18,6 +22,8 @@
*
* @author Chill
*/
+
+@Mapper
public interface AttResBaseMapper extends BaseMapper<AttResBase> {
@@ -25,7 +31,7 @@
List<AttResBaseGeneralInvestigationVO> selectAttResBaseGeneralInvestigation(IPage<AttResBaseGeneralInvestigationVO> page, @Param("attResBase") AttResBaseGeneralInvestigationVO attResBase);
- List<AttResBase> getListByRegion(IPage<AttResBase> page,@Param("obj") Map<String, Object> obj);
+ List<AttResBaseVO> getListByRegion(IPage<AttResBaseVO> page,@Param("obj") Map<String, Object> obj);
AttResBase getDetailByCode(@Param("code") String code);
@@ -39,6 +45,9 @@
*/
List<AttResBaseUserDTO> getAttResBaseUserPage(IPage<AttResBaseUserDTO> page,
@Param("params") Map<String, Object> params);
+
+
+ List<AttResBaseUserExcel> getAttResBaseUserExcel(@Param("params") Map<String, Object> params);
/**
* 查询各类型责任人
@@ -78,4 +87,19 @@
* @return
*/
Integer getWaterCountByResNameAndCountyName(@Param("resName") String resName,@Param("countyCode") String countyCode);
+
+ AttResAdVO getResAd(@Param("resId") String resId);
+
+ AttAdBase getYwxtResInfo(@Param("cityName") String cityName,@Param("countyName") String countyName);
+
+ Boolean updateRsvr(@Param("attResBase") AttResBase attResBase);
+
+ /**
+ * 获取操作记录
+ * @param guid
+ * @return
+ */
+ String getUpdateLog(@Param("resGuid") String guid);
+
+ int updateRelResUpdateLoc(@Param("resGuid") String guid,@Param("updateLog") String updateLog);
}
--
Gitblit v1.9.3