-
-
+
From 8667b7151f8dc53b0d346dd1a67a0b911a754620 Mon Sep 17 00:00:00 2001
From: Renpc-kilig <308442850@qq.com>
Date: Fri, 18 Dec 2020 11:06:58 +0800
Subject: [PATCH 2/3] =?UTF-8?q?=E5=A4=A7=E6=95=B0=E6=8D=AE=E9=A1=B5?=
=?UTF-8?q?=E9=9D=A2bug=E4=BF=AE=E6=94=B9=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../partyorganize/PartyOrganizeResourceController.java | 3 +--
.../mybatis/mapper/partyorganize/partyorganize-mapper.xml | 4 ++++
2 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/cm/partybuilding/controller/resources/partyorganize/PartyOrganizeResourceController.java b/src/main/java/com/cm/partybuilding/controller/resources/partyorganize/PartyOrganizeResourceController.java
index c7aecfb..7cfc6be 100644
--- a/src/main/java/com/cm/partybuilding/controller/resources/partyorganize/PartyOrganizeResourceController.java
+++ b/src/main/java/com/cm/partybuilding/controller/resources/partyorganize/PartyOrganizeResourceController.java
@@ -156,9 +156,8 @@ public class PartyOrganizeResourceController extends AbstractController {
})
@ApiResponses({@ApiResponse(code = 400, message = "请求失败", response = ErrorResult.class)})
@GetMapping("bigdata" + ISystemConstant.APP_RELEASE_SUFFIX)
- SuccessResultData
> bigData(@RequestParam("belongLevel") String belongLevel) throws SearchException {
+ SuccessResultData> bigData() throws SearchException {
Map params = requestParams();
- params.put("belongLevel", belongLevel);
return partyOrganizeService.bigData(params);
}
diff --git a/src/main/resources/mybatis/mapper/partyorganize/partyorganize-mapper.xml b/src/main/resources/mybatis/mapper/partyorganize/partyorganize-mapper.xml
index 718f0ba..aba34d6 100644
--- a/src/main/resources/mybatis/mapper/partyorganize/partyorganize-mapper.xml
+++ b/src/main/resources/mybatis/mapper/partyorganize/partyorganize-mapper.xml
@@ -436,6 +436,10 @@
AND t1.belong_level = #{belongLevel}
+
+ AND
+ t1.party_organize_id = #{partyOrganizeId}
+
From dfa8c45e727e5e21a0035a1373f6cb5663e63e3b Mon Sep 17 00:00:00 2001
From: Renpc-kilig <308442850@qq.com>
Date: Thu, 31 Dec 2020 10:41:23 +0800
Subject: [PATCH 3/3] =?UTF-8?q?=E5=85=9A=E7=BB=84=E7=BB=87=E7=AE=A1?=
=?UTF-8?q?=E7=90=86=E6=96=B0=E5=A2=9E=E5=AD=97=E6=AE=B5=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../dtos/partyorganize/PartyOrganizeDTO.java | 18 ++++++++++++++++++
.../vos/partyorganize/PartyOrganizeVO.java | 18 ++++++++++++++++++
.../partyorganize/partyorganize-mapper.xml | 18 ++++++++++++++++++
.../partyorganize/save-partyorganize.html | 12 ++++++++++++
.../partyorganize/update-partyorganize.html | 12 ++++++++++++
5 files changed, 78 insertions(+)
diff --git a/src/main/java/com/cm/partybuilding/pojo/dtos/partyorganize/PartyOrganizeDTO.java b/src/main/java/com/cm/partybuilding/pojo/dtos/partyorganize/PartyOrganizeDTO.java
index 4e2196e..9bf9471 100644
--- a/src/main/java/com/cm/partybuilding/pojo/dtos/partyorganize/PartyOrganizeDTO.java
+++ b/src/main/java/com/cm/partybuilding/pojo/dtos/partyorganize/PartyOrganizeDTO.java
@@ -82,6 +82,10 @@ public class PartyOrganizeDTO {
private String creatTime;
@ApiModelProperty(name = "remake", value = "备注")
private String remake;
+ @ApiModelProperty(name = "belongStreet", value = "所属街镇村ID")
+ private String belongStreet;
+ @ApiModelProperty(name = "belongStreetName", value = "所属街镇村名称")
+ private String belongStreetName;
public String getPartyOrganizeId() {
return partyOrganizeId == null ? "" : partyOrganizeId.trim();
@@ -351,5 +355,19 @@ public class PartyOrganizeDTO {
this.remake = remake;
}
+ public String getBelongStreet() {
+ return belongStreet == null ? "" : belongStreet;
+ }
+ public void setBelongStreet(String belongStreet) {
+ this.belongStreet = belongStreet;
+ }
+
+ public String getBelongStreetName() {
+ return belongStreetName == null ? "" : belongStreetName;
+ }
+
+ public void setBelongStreetName(String belongStreetName) {
+ this.belongStreetName = belongStreetName;
+ }
}
diff --git a/src/main/java/com/cm/partybuilding/pojo/vos/partyorganize/PartyOrganizeVO.java b/src/main/java/com/cm/partybuilding/pojo/vos/partyorganize/PartyOrganizeVO.java
index 7c3389f..3eeaa69 100644
--- a/src/main/java/com/cm/partybuilding/pojo/vos/partyorganize/PartyOrganizeVO.java
+++ b/src/main/java/com/cm/partybuilding/pojo/vos/partyorganize/PartyOrganizeVO.java
@@ -77,6 +77,10 @@ public class PartyOrganizeVO {
private String creatTime;
@ApiModelProperty(name = "remake", value = "备注")
private String remake;
+ @ApiModelProperty(name = "belongStreet", value = "所属街镇村ID")
+ private String belongStreet;
+ @ApiModelProperty(name = "belongStreetName", value = "所属街镇村名称")
+ private String belongStreetName;
public String getIntroduction() {
return introduction == null ? "" : introduction.trim();
@@ -310,5 +314,19 @@ public class PartyOrganizeVO {
this.remake = remake;
}
+ public String getBelongStreet() {
+ return belongStreet == null ? "" : belongStreet;
+ }
+ public void setBelongStreet(String belongStreet) {
+ this.belongStreet = belongStreet;
+ }
+
+ public String getBelongStreetName() {
+ return belongStreetName == null ? "" : belongStreetName;
+ }
+
+ public void setBelongStreetName(String belongStreetName) {
+ this.belongStreetName = belongStreetName;
+ }
}
diff --git a/src/main/resources/mybatis/mapper/partyorganize/partyorganize-mapper.xml b/src/main/resources/mybatis/mapper/partyorganize/partyorganize-mapper.xml
index aba34d6..bda6f03 100644
--- a/src/main/resources/mybatis/mapper/partyorganize/partyorganize-mapper.xml
+++ b/src/main/resources/mybatis/mapper/partyorganize/partyorganize-mapper.xml
@@ -37,6 +37,8 @@
+
+
@@ -72,6 +74,8 @@
position,
creat_time,
remake,
+ belong_street,
+ belong_street_name,
creator,
gmt_create,
modifier,
@@ -108,6 +112,8 @@
#{position},
#{creatTime},
#{remake},
+ #{belongStreet},
+ #{belongStreetName},
#{creator},
#{gmtCreate},
#{modifier},
@@ -233,6 +239,12 @@
remake = #{remake},
+
+
+ belong_street = #{belongStreet},
+
+
+ belong_street_name = #{belongStreetName},
modifier = #{modifier},
gmt_modified = #{gmtModified}
@@ -272,6 +284,8 @@
t1.position,
t1.creat_time,
t1.remake,
+ t1.belong_street,
+ t1.belong_street_name,
t1.party_organize_id
FROM
gen_party_organize t1
@@ -318,6 +332,8 @@
t1.position,
t1.creat_time,
t1.remake,
+ t1.belong_street,
+ t1.belong_street_name,
t1.party_organize_id
FROM
gen_party_organize t1
@@ -428,6 +444,8 @@
t1.position,
t1.creat_time,
t1.remake,
+ t1.belong_street,
+ t1.belong_street_name,
t1.party_organize_id
FROM
gen_party_organize t1
diff --git a/src/main/resources/static/route/partyorganize/save-partyorganize.html b/src/main/resources/static/route/partyorganize/save-partyorganize.html
index 81ab064..738e33e 100644
--- a/src/main/resources/static/route/partyorganize/save-partyorganize.html
+++ b/src/main/resources/static/route/partyorganize/save-partyorganize.html
@@ -84,6 +84,17 @@