From 4e97c398243b00e05d8d68e850dcd69c42b0cc76 Mon Sep 17 00:00:00 2001
From: guoshilong <123456>
Date: Wed, 10 May 2023 10:30:10 +0800
Subject: [PATCH] 巡检任务增加水库名字段；添加查询水库详情的接口
---
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/service/impl/AttResBaseServiceImpl.java | 10
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/entity/AttResBase.java | 540 ++++++++++++++++++++++++------------------------
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/patrol/mapper/PatrolTaskMapper.xml | 7
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/patrol/vo/PatrolTaskVO.java | 4
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/mapper/AttResBaseMapper.xml | 12 +
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/controller/AttResBaseController.java | 21 +
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/mapper/AttResBaseMapper.java | 4
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/service/IAttResBaseService.java | 4
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/patrol/entity/PatrolTask.java | 6
9 files changed, 337 insertions(+), 271 deletions(-)
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/patrol/entity/PatrolTask.java b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/patrol/entity/PatrolTask.java
index 5ead2ed..67494ce 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/patrol/entity/PatrolTask.java
+++ b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/patrol/entity/PatrolTask.java
@@ -87,6 +87,12 @@
private String projectId;
/**
+ * 水库名
+ */
+ @ApiModelProperty(value = "水库名")
+ private String reservoirName;
+
+ /**
* 巡查项ID
*/
@ApiModelProperty(value = "巡查项ID(多个)")
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/patrol/mapper/PatrolTaskMapper.xml b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/patrol/mapper/PatrolTaskMapper.xml
index e4c769a..51fd8df 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/patrol/mapper/PatrolTaskMapper.xml
+++ b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/patrol/mapper/PatrolTaskMapper.xml
@@ -6,10 +6,12 @@
<select id="selectPatrolTask" resultType="cn.gistack.sm.patrol.vo.PatrolTaskVO">
SELECT
spt.*,spt2.name as patrolTypeName,
- route.ROUTE_COORDINATES routeRange
+ route.ROUTE_COORDINATES routeRange,
+ u.real_name toUserName
FROM sm_patrol_task spt
left join sm_patrol_type spt2 on spt.task_type = spt2.id
LEFT JOIN sm_patrol_route route ON route.id = spt.route_id
+ LEFT JOIN blade_user u ON u.id = spt.to_user_id
WHERE spt.is_deleted = 0
<if test="patrolTask.title !=null and patrolTask.title!=''">
AND spt.title LIKE CONCAT('%',#{patrolTask.title},'%')
@@ -23,6 +25,9 @@
<if test="patrolTask.projectId !=null and patrolTask.projectId !='' ">
AND spt.project_id = #{patrolTask.projectId}
</if>
+ <if test="patrolTask.reservoirName !=null and patrolTask.reservoirName !='' ">
+ AND spt.reservoir_name LIKE ('%',#{patrolTask.reservoirName},'%')
+ </if>
<if test="patrolTask.toUserId != null and patrolTask.toUserId !=''">
AND spt.to_user_id = #{patrolTask.toUserId}
</if>
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/patrol/vo/PatrolTaskVO.java b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/patrol/vo/PatrolTaskVO.java
index f6dffa5..713d318 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/patrol/vo/PatrolTaskVO.java
+++ b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/patrol/vo/PatrolTaskVO.java
@@ -11,6 +11,10 @@
*/
@Data
public class PatrolTaskVO extends PatrolTask {
+ /**
+ * 巡检人员名称
+ */
+ private String toUserName;
/**
* 任务类型名称
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/controller/AttResBaseController.java b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/controller/AttResBaseController.java
index 5bdf496..769d4ea 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/controller/AttResBaseController.java
+++ b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/controller/AttResBaseController.java
@@ -50,4 +50,25 @@
IPage<AttResBase> pageList = attResBaseService.selectAttResBasePage(Condition.getPage(query), attResBase);
return R.data(pageList);
}
+
+ @ApiOperation(value = "中台水库-查询该行政区下的水库", notes = "中台水库-查询该行政区下的水库")
+ @GetMapping(value = "/getListByRegion")
+ public R getListByRegion(@ApiIgnore @RequestParam Map<String, Object> obj,Query query) {
+ String code = obj.get("code").toString();
+ if (code.substring(0,4).indexOf("00") > -1) {
+ obj.put("code",code.substring(0,2));
+ } else if (code.substring(0,6).indexOf("00") > -1) {
+ obj.put("code",code.substring(0,4));
+ }
+// List<AttResBase> list = attResBaseService.getListByRegion(obj);
+ IPage<AttResBase> pageList = attResBaseService.getListByRegion(Condition.getPage(query),obj);
+ return R.data(pageList);
+ }
+
+ @ApiOperation(value = "中台水库-获取水库详情", notes = "中台水库-获取水库详情")
+ @GetMapping(value = "/getDetailByCode")
+ public R getDetailByCode(String code) {
+ AttResBase attResBase = attResBaseService.getDetailByCode(code);
+ return R.data(attResBase);
+ }
}
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/entity/AttResBase.java b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/entity/AttResBase.java
index 5b66575..5b12992 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/entity/AttResBase.java
+++ b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/entity/AttResBase.java
@@ -36,12 +36,12 @@
@TableField("\"code\"")
private String code;
- /**
- * 老库编码
- */
- @ApiModelProperty(value = "老库编码")
- @TableField("\"sk_code\"")
- private String skCode;
+// /**
+// * 老库编码
+// */
+// @ApiModelProperty(value = "老库编码")
+// @TableField("\"sk_code\"")
+// private String skCode;
/**
* 水库名称
@@ -50,124 +50,124 @@
@TableField("\"name\"")
private String name;
- /**
- * 曾用名
- */
- @ApiModelProperty(value = "曾用名")
- @TableField("\"alias_name\"")
- private String aliasName;
-
- /**
- * 注册登记码
- */
- @ApiModelProperty(value = "注册登记码")
- @TableField("\"res_reg_code\"")
- private String resRegCode;
-
- /**
- * 其他行业注册号
- */
- @ApiModelProperty(value = "其他行业注册号")
- @TableField("\"other_reg_code\"")
- private String otherRegCode;
-
- /**
- * 注册登记时间
- */
- @ApiModelProperty(value = "注册登记时间")
- @TableField("\"res_reg_date\"")
- private String resRegDate;
-
- /**
- * 水库类型
- */
- @ApiModelProperty(value = "水库类型")
- @TableField("\"res_type\"")
- private String resType;
-
- /**
- * 水库功能
- */
- @ApiModelProperty(value = "水库功能")
- @TableField("\"res_func\"")
- private String resFunc;
-
- /**
- * 水库类别
- */
- @ApiModelProperty(value = "水库类别")
- @TableField("\"res_category\"")
- private String resCategory;
-
- /**
- * 工程等别
- */
- @ApiModelProperty(value = "工程等别")
- @TableField("\"eng_grad\"")
- private String engGrad;
-
+// /**
+// * 曾用名
+// */
+// @ApiModelProperty(value = "曾用名")
+// @TableField("\"alias_name\"")
+// private String aliasName;
+//
+// /**
+// * 注册登记码
+// */
+// @ApiModelProperty(value = "注册登记码")
+// @TableField("\"res_reg_code\"")
+// private String resRegCode;
+//
+// /**
+// * 其他行业注册号
+// */
+// @ApiModelProperty(value = "其他行业注册号")
+// @TableField("\"other_reg_code\"")
+// private String otherRegCode;
+//
+// /**
+// * 注册登记时间
+// */
+// @ApiModelProperty(value = "注册登记时间")
+// @TableField("\"res_reg_date\"")
+// private String resRegDate;
+//
+// /**
+// * 水库类型
+// */
+// @ApiModelProperty(value = "水库类型")
+// @TableField("\"res_type\"")
+// private String resType;
+//
+// /**
+// * 水库功能
+// */
+// @ApiModelProperty(value = "水库功能")
+// @TableField("\"res_func\"")
+// private String resFunc;
+//
+// /**
+// * 水库类别
+// */
+// @ApiModelProperty(value = "水库类别")
+// @TableField("\"res_category\"")
+// private String resCategory;
+//
+// /**
+// * 工程等别
+// */
+// @ApiModelProperty(value = "工程等别")
+// @TableField("\"eng_grad\"")
+// private String engGrad;
+//
/**
* 工程规模
*/
@ApiModelProperty(value = "工程规模")
@TableField("\"eng_scal\"")
private String engScal;
-
- /**
- * 工程建设情况
- */
- @ApiModelProperty(value = "工程建设情况")
- @TableField("\"eng_stat\"")
- private String engStat;
-
- /**
- * 开工时间
- */
- @ApiModelProperty(value = "开工时间 ")
- @TableField("\"start_date\"")
- private String startDate;
-
- /**
- * 完工时间
- */
- @ApiModelProperty(value = "完工时间 ")
- @TableField("\"finish_date\"")
- private String finishDate;
-
- /**
- * 建成时间
- */
- @ApiModelProperty(value = "建成时间 ")
- @TableField("\"comp_date\"")
- private String compDate;
-
- /**
- * 河流guid
- */
- @ApiModelProperty(value = "河流guid")
- @TableField("\"rv_guid\"")
- private String rvGuid;
-
- /**
- * 河流名称
- */
- @ApiModelProperty(value = "河流名称 ")
- @TableField("\"rv_name\"")
- private String rvName;
-
- /**
- * 流域guid
- */
- @ApiModelProperty(value = "流域guid ")
- @TableField("\"bas_guid\"")
- private String basGuid;
-
- /**
- * 流域名称
- */
- @ApiModelProperty(value = "流域名称 ")
- @TableField("\"bas_name\"")
- private String basName;
+//
+// /**
+// * 工程建设情况
+// */
+// @ApiModelProperty(value = "工程建设情况")
+// @TableField("\"eng_stat\"")
+// private String engStat;
+//
+// /**
+// * 开工时间
+// */
+// @ApiModelProperty(value = "开工时间 ")
+// @TableField("\"start_date\"")
+// private String startDate;
+//
+// /**
+// * 完工时间
+// */
+// @ApiModelProperty(value = "完工时间 ")
+// @TableField("\"finish_date\"")
+// private String finishDate;
+//
+// /**
+// * 建成时间
+// */
+// @ApiModelProperty(value = "建成时间 ")
+// @TableField("\"comp_date\"")
+// private String compDate;
+//
+// /**
+// * 河流guid
+// */
+// @ApiModelProperty(value = "河流guid")
+// @TableField("\"rv_guid\"")
+// private String rvGuid;
+//
+// /**
+// * 河流名称
+// */
+// @ApiModelProperty(value = "河流名称 ")
+// @TableField("\"rv_name\"")
+// private String rvName;
+//
+// /**
+// * 流域guid
+// */
+// @ApiModelProperty(value = "流域guid ")
+// @TableField("\"bas_guid\"")
+// private String basGuid;
+//
+// /**
+// * 流域名称
+// */
+// @ApiModelProperty(value = "流域名称 ")
+// @TableField("\"bas_name\"")
+// private String basName;
/**
* 行政区划guid
@@ -175,160 +175,160 @@
@ApiModelProperty(value = "行政区划guid ")
@TableField("\"ad_guid\"")
private String adGuid;
+//
+// /**
+// * 主管部门行政区划guid
+// */
+// @ApiModelProperty(value = "主管部门行政区划guid ")
+// @TableField("\"mgr_ad_guid\"")
+// private String mgrAdGuid;
+//
+// /**
+// * 内部行政区划guid
+// */
+// @ApiModelProperty(value = "内部行政区划guid ")
+// @TableField("\"interior_ad_guid\"")
+// private String interiorAdGuid;
+//
+// /**
+// * 水库所在位置
+// */
+// @ApiModelProperty(value = "水库所在位置 ")
+// @TableField("\"res_loc\"")
+// private String resLoc;
+//
+// /**
+// * 中心点经度(度)
+// */
+// @ApiModelProperty(value = "中心点经度(度) ")
+// @TableField("\"center_long\"")
+// private String centerLong;
+//
+// /**
+// * 中心点纬度(度)
+// */
+// @ApiModelProperty(value = "中心点纬度(度) ")
+// @TableField("\"center_lat\"")
+// private String centerLat;
+//
+// /**
+// * 右上角经度(度)
+// */
+// @ApiModelProperty(value = "右上角经度(度) ")
+// @TableField("\"up_right_long\"")
+// private String upRightLong;
+//
+// /**
+// * 右上角纬度(度)
+// */
+// @ApiModelProperty(value = "右上角纬度(度) ")
+// @TableField("\"up_right_lat\"")
+// private String upRightLat;
+//
+// /**
+// * 左下角经度(度)
+// */
+// @ApiModelProperty(value = "左下角经度(度) ")
+// @TableField("\"low_left_long\"")
+// private String lowLeftLong;
+//
+// /**
+// * 左下角纬度(度)
+// */
+// @ApiModelProperty(value = "左下角纬度(度) ")
+// @TableField("\"low_left_lat\"")
+// private String lowLeftLat;
+//
+// /**
+// * 所属行业部门
+// */
+// @ApiModelProperty(value = "所属行业部门 ")
+// @TableField("\"industry_dept\"")
+// private String industryDept;
+//
+// /**
+// * 抗震设计烈度
+// */
+// @ApiModelProperty(value = "抗震设计烈度 ")
+// @TableField("\"base_eq_intensity\"")
+// private String baseEqIntensity;
+//
+// /**
+// * 地震基本烈度
+// */
+// @ApiModelProperty(value = "地震基本烈度 ")
+// @TableField("\"seismic_design_intensity\"")
+// private String seismicDesignIntensity;
+//
+// /**
+// * 地震动峰值加速度
+// */
+// @ApiModelProperty(value = "地震动峰值加速度 ")
+// @TableField("\"acceleration\"")
+// private String acceleration;
+//
+// /**
+// * 地震反应谱特征周期
+// */
+// @ApiModelProperty(value = "地震反应谱特征周期 ")
+// @TableField("\"characteristic_period\"")
+// private String characteristicPeriod;
+//
+// /**
+// * 主要建筑物级别
+// */
+// @ApiModelProperty(value = "主要建筑物级别 ")
+// @TableField("\"major_level\"")
+// private String majorLevel;
+//
+// /**
+// * 水库简介
+// */
+// @ApiModelProperty(value = "水库简介 ")
+// @TableField("\"summary\"")
+// private String summary;
+//
+// /**
+// * 备注
+// */
+// @ApiModelProperty(value = "备注 ")
+// @TableField("\"note\"")
+// private String note;
- /**
- * 主管部门行政区划guid
- */
- @ApiModelProperty(value = "主管部门行政区划guid ")
- @TableField("\"mgr_ad_guid\"")
- private String mgrAdGuid;
+// /**
+// * 是否失效
+// */
+// @ApiModelProperty(value = "是否失效 ")
+// @TableField("\"is_deleted\"")
+// private String isDeleted;
- /**
- * 内部行政区划guid
- */
- @ApiModelProperty(value = "内部行政区划guid ")
- @TableField("\"interior_ad_guid\"")
- private String interiorAdGuid;
-
- /**
- * 水库所在位置
- */
- @ApiModelProperty(value = "水库所在位置 ")
- @TableField("\"res_loc\"")
- private String resLoc;
-
- /**
- * 中心点经度(度)
- */
- @ApiModelProperty(value = "中心点经度(度) ")
- @TableField("\"center_long\"")
- private String centerLong;
-
- /**
- * 中心点纬度(度)
- */
- @ApiModelProperty(value = "中心点纬度(度) ")
- @TableField("\"center_lat\"")
- private String centerLat;
-
- /**
- * 右上角经度(度)
- */
- @ApiModelProperty(value = "右上角经度(度) ")
- @TableField("\"up_right_long\"")
- private String upRightLong;
-
- /**
- * 右上角纬度(度)
- */
- @ApiModelProperty(value = "右上角纬度(度) ")
- @TableField("\"up_right_lat\"")
- private String upRightLat;
-
- /**
- * 左下角经度(度)
- */
- @ApiModelProperty(value = "左下角经度(度) ")
- @TableField("\"low_left_long\"")
- private String lowLeftLong;
-
- /**
- * 左下角纬度(度)
- */
- @ApiModelProperty(value = "左下角纬度(度) ")
- @TableField("\"low_left_lat\"")
- private String lowLeftLat;
-
- /**
- * 所属行业部门
- */
- @ApiModelProperty(value = "所属行业部门 ")
- @TableField("\"industry_dept\"")
- private String industryDept;
-
- /**
- * 抗震设计烈度
- */
- @ApiModelProperty(value = "抗震设计烈度 ")
- @TableField("\"base_eq_intensity\"")
- private String baseEqIntensity;
-
- /**
- * 地震基本烈度
- */
- @ApiModelProperty(value = "地震基本烈度 ")
- @TableField("\"seismic_design_intensity\"")
- private String seismicDesignIntensity;
-
- /**
- * 地震动峰值加速度
- */
- @ApiModelProperty(value = "地震动峰值加速度 ")
- @TableField("\"acceleration\"")
- private String acceleration;
-
- /**
- * 地震反应谱特征周期
- */
- @ApiModelProperty(value = "地震反应谱特征周期 ")
- @TableField("\"characteristic_period\"")
- private String characteristicPeriod;
-
- /**
- * 主要建筑物级别
- */
- @ApiModelProperty(value = "主要建筑物级别 ")
- @TableField("\"major_level\"")
- private String majorLevel;
-
- /**
- * 水库简介
- */
- @ApiModelProperty(value = "水库简介 ")
- @TableField("\"summary\"")
- private String summary;
-
- /**
- * 备注
- */
- @ApiModelProperty(value = "备注 ")
- @TableField("\"note\"")
- private String note;
-
- /**
- * 是否失效
- */
- @ApiModelProperty(value = "是否失效 ")
- @TableField("\"is_deleted\"")
- private String isDeleted;
-
- /**
- * 创建时间
- */
- @ApiModelProperty(value = "创建时间 ")
- @TableField("\"create_time\"")
- private String createTime;
-
- /**
- * 更新时间
- */
- @ApiModelProperty(value = "更新时间 ")
- @TableField("\"update_time\"")
- private String updateTime;
-
- /**
- * 采集时间
- */
- @ApiModelProperty(value = "采集时间 ")
- @TableField("\"collect_time\"")
- private String collectTime;
-
- /**
- * 来源系统
- */
- @ApiModelProperty(value = "来源系统 ")
- @TableField("\"sys_resource\"")
- private String sysResource;
+// /**
+// * 创建时间
+// */
+// @ApiModelProperty(value = "创建时间 ")
+// @TableField("\"create_time\"")
+// private String createTime;
+//
+// /**
+// * 更新时间
+// */
+// @ApiModelProperty(value = "更新时间 ")
+// @TableField("\"update_time\"")
+// private String updateTime;
+//
+// /**
+// * 采集时间
+// */
+// @ApiModelProperty(value = "采集时间 ")
+// @TableField("\"collect_time\"")
+// private String collectTime;
+//
+// /**
+// * 来源系统
+// */
+// @ApiModelProperty(value = "来源系统 ")
+// @TableField("\"sys_resource\"")
+// private String sysResource;
}
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 5606ec7..cf79edd 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
@@ -17,4 +17,8 @@
List<AttResBase> selectAttResBasePage(IPage<AttResBase> page, @Param("attResBase") AttResBase attResBase);
+
+ List<AttResBase> getListByRegion(IPage<AttResBase> page,@Param("obj") Map<String, Object> obj);
+
+ AttResBase getDetailByCode(@Param("code") String code);
}
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/mapper/AttResBaseMapper.xml b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/mapper/AttResBaseMapper.xml
index effaa16..2ab8e16 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/mapper/AttResBaseMapper.xml
+++ b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/mapper/AttResBaseMapper.xml
@@ -10,4 +10,16 @@
AND "name" LIKE CONCAT('%',#{attResBase.name},'%')
</if>
</select>
+ <select id="getListByRegion" resultType="cn.gistack.sm.sjztmd.entity.AttResBase">
+ SELECT "code","name","ad_guid" FROM "att_res_base"
+ WHERE "is_deleted"=0
+ AND "ad_guid" LIKE CONCAT('%',#{obj.code},'%')
+ <if test="obj.name !=null and obj.name !=''">
+ AND "name" LIKE CONCAT('%',#{obj.name},'%')
+ </if>
+ </select>
+ <select id="getDetailByCode" resultType="cn.gistack.sm.sjztmd.entity.AttResBase">
+ SELECT "code","name","ad_guid" FROM "att_res_base"
+ WHERE "is_deleted"=0 and "code" = #{code}
+ </select>
</mapper>
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/service/IAttResBaseService.java b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/service/IAttResBaseService.java
index d1948ab..f33a5ce 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/service/IAttResBaseService.java
+++ b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/service/IAttResBaseService.java
@@ -19,4 +19,8 @@
public interface IAttResBaseService extends IService<AttResBase> {
IPage<AttResBase> selectAttResBasePage(IPage<AttResBase> page, AttResBase attResBase);
+
+ IPage<AttResBase> getListByRegion(IPage<AttResBase> page,Map<String, Object> obj);
+
+ AttResBase getDetailByCode(String code);
}
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/service/impl/AttResBaseServiceImpl.java b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/service/impl/AttResBaseServiceImpl.java
index 2111acf..54c3489 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/service/impl/AttResBaseServiceImpl.java
+++ b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/service/impl/AttResBaseServiceImpl.java
@@ -26,4 +26,14 @@
public IPage<AttResBase> selectAttResBasePage(IPage<AttResBase> page, AttResBase attResBase) {
return page.setRecords(baseMapper.selectAttResBasePage(page,attResBase));
}
+
+ @Override
+ public IPage<AttResBase> getListByRegion(IPage<AttResBase> page,Map<String, Object> obj) {
+ return page.setRecords(baseMapper.getListByRegion(page,obj));
+ }
+
+ @Override
+ public AttResBase getDetailByCode(String code) {
+ return baseMapper.getDetailByCode(code);
+ }
}
--
Gitblit v1.9.3