From 6de28f3d62a4f77267628eaba28fecaebec8cb27 Mon Sep 17 00:00:00 2001
From: xieb <vip_xiaobin810@163.com>
Date: Sun, 17 Mar 2024 16:36:30 +0800
Subject: [PATCH] 堤防普查
---
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/controller/TbDykeInvestigationController.java | 2 +-
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/mapper/TbResDykeMapper.xml | 6 +++++-
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/entity/TbResDyke.java | 2 +-
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/service/impl/TbResGeneralInvestigationServiceImpl.java | 44 ++++++++++++++++++++++----------------------
4 files changed, 29 insertions(+), 25 deletions(-)
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/controller/TbDykeInvestigationController.java b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/controller/TbDykeInvestigationController.java
index 36c468a..05ecde3 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/controller/TbDykeInvestigationController.java
+++ b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/controller/TbDykeInvestigationController.java
@@ -55,7 +55,7 @@
if (!StringUtil.isBlank(param.getDykeName()))
queryWrapper.like("\"dyke_name\"", param.getDykeName());
if (!StringUtil.isBlank(param.getDykeGuid()))
- queryWrapper.like("\"dyke_guid\"", param.getDykeGuid());
+ queryWrapper.eq("\"dyke_guid\"", param.getDykeGuid());
if (!StringUtil.isBlank(param.getCreateUser()))
queryWrapper.eq("\"create_user\"", param.getCreateUser());
if (null != param.getTbYear())
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/entity/TbResDyke.java b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/entity/TbResDyke.java
index b89f873..38ddb66 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/entity/TbResDyke.java
+++ b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/entity/TbResDyke.java
@@ -123,7 +123,7 @@
@JsonSerialize(using = ToStringSerializer.class)
@ApiModelProperty(value = "堤防长度")
@TableField("\"dyke_length\"")
- private String dyke_length;
+ private String dykeLength;
/**
* 管理单位名称
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/mapper/TbResDykeMapper.xml b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/mapper/TbResDykeMapper.xml
index 0f25ffb..6e4924b 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/mapper/TbResDykeMapper.xml
+++ b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/mapper/TbResDykeMapper.xml
@@ -14,6 +14,9 @@
<if test="vo.adCode != null and vo.adCode !=''">
trd."ad_code" = #{vo.adCode}
</if>
+ <if test="vo.name != null and vo.name !=''">
+ trd."name" LIKE CONCAT('%',#{vo.name},'%')
+ </if>
<if test="vo.startLocation != null and vo.startLocation !=''">
trd."start_location" LIKE CONCAT('%',#{vo.startLocation},'%')
</if>
@@ -58,7 +61,8 @@
<!-- 堤防普查列表 -->
<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
+ select DISTINCT a.*,b."check_state" AS tb_state,aa."p_ad_code" as pAdCode,
+ aa."p_ad_name" as pAdName 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"
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/service/impl/TbResGeneralInvestigationServiceImpl.java b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/service/impl/TbResGeneralInvestigationServiceImpl.java
index fb135ae..2e08dd3 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/service/impl/TbResGeneralInvestigationServiceImpl.java
+++ b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/service/impl/TbResGeneralInvestigationServiceImpl.java
@@ -93,31 +93,31 @@
state.setCheckState(tbResGeneralInvestigationParam.getCheckState());
tbResGeneralInvestigationStateService.saveOrUpdate(state);
- //先把数据移除
- QueryWrapper delete = new QueryWrapper();
- delete.eq("\"tb_state_id\"",state.getGuid());
- boolean remove = remove(delete);
+// //先把数据移除
+// QueryWrapper delete = new QueryWrapper();
+// delete.eq("\"tb_state_id\"",state.getGuid());
+// boolean remove = remove(delete);
+//
+// if (remove){
+//
+// }
- if (remove){
- for (int i = 0; i < list.size(); i++) {
- TbResGeneralInvestigation tbResGeneralInvestigation = list.get(i);
- //id清空方便批量新增
- tbResGeneralInvestigation.setGuid("");
+ for (int i = 0; i < list.size(); i++) {
+ TbResGeneralInvestigation tbResGeneralInvestigation = list.get(i);
+ //id清空方便批量新增
+// tbResGeneralInvestigation.setGuid("");
- if (tbResGeneralInvestigation.getCreateTime() == null){
- tbResGeneralInvestigation.setCreateTime(DateUtil.now());
- }
-
- if (tbResGeneralInvestigation.getCreateUser() == null){
- tbResGeneralInvestigation.setCreateUser(AuthUtil.getUserId().toString());
- }
-
- //设置状态表id
- tbResGeneralInvestigation.setTbStateId(state.getGuid());
+ if (tbResGeneralInvestigation.getCreateTime() == null){
+ tbResGeneralInvestigation.setCreateTime(DateUtil.now());
}
- return R.status(saveOrUpdateBatch(list));
- }
- return R.fail("操作失败");
+ if (tbResGeneralInvestigation.getCreateUser() == null){
+ tbResGeneralInvestigation.setCreateUser(AuthUtil.getUserId().toString());
+ }
+
+ //设置状态表id
+ tbResGeneralInvestigation.setTbStateId(state.getGuid());
+ }
+ return R.status(saveOrUpdateBatch(list));
}
}
--
Gitblit v1.9.3