From 46092e1864b5c8a70be943a9033122bfff4cc514 Mon Sep 17 00:00:00 2001 From: ly19960718 <1622779752@qq.com> Date: Sat, 1 May 2021 15:19:34 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9C=BA=E6=9E=84=E5=A2=9E=E5=8A=A0=E6=9C=BA?= =?UTF-8?q?=E6=9E=84=E7=B1=BB=E5=9E=8B=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mapper/institution/institution-mapper.xml | 25 +++++++++++++++++++ .../pojo/bos/institution/InstitutionBO.java | 8 ++++++ .../pojo/dtos/institution/InstitutionDTO.java | 12 +++++++-- .../pojo/pos/institution/InstitutionPO.java | 8 ++++++ .../pojo/vos/institution/InstitutionVO.java | 8 ++++++ 5 files changed, 59 insertions(+), 2 deletions(-) diff --git a/module-institution-management/src/main/resources/mybatis/mapper/institution/institution-mapper.xml b/module-institution-management/src/main/resources/mybatis/mapper/institution/institution-mapper.xml index 128b975..48790d3 100644 --- a/module-institution-management/src/main/resources/mybatis/mapper/institution/institution-mapper.xml +++ b/module-institution-management/src/main/resources/mybatis/mapper/institution/institution-mapper.xml @@ -18,6 +18,7 @@ + @@ -38,6 +39,7 @@ + @@ -61,6 +63,7 @@ + @@ -86,6 +89,7 @@ institution_region_area, institution_region_village, institution_region_street, + institution_type, creator, gmt_create, modifier, @@ -107,6 +111,7 @@ #{institutionRegionArea}, #{institutionRegionVillage}, #{institutionRegionStreet}, + #{institutionType} #{creator}, #{gmtCreate}, #{modifier}, @@ -187,6 +192,9 @@ institution_region_street = #{institutionRegionStreet}, + + + institution_type = #{institutionType}, gmt_modified = #{gmtModified}, modifier = #{modifier}, @@ -212,6 +220,7 @@ t1.institution_region_area, t1.institution_region_village, t1.institution_region_street, + t1.institution_type, t1.institution_id FROM m_institution t1 @@ -241,6 +250,7 @@ t1.institution_region_area, t1.institution_region_village, t1.institution_region_street, + t1.institution_type, t1.creator, t1.gmt_create, t1.modifier, @@ -274,6 +284,7 @@ t1.institution_region_area, t1.institution_region_village, t1.institution_region_street, + t1.institution_type, t1.creator, t1.gmt_create, t1.modifier, @@ -307,6 +318,7 @@ t1.institution_region_area, t1.institution_region_village, t1.institution_region_street, + t1.institution_type, t1.creator, t1.gmt_create FROM @@ -334,6 +346,10 @@ #{institutionIds[${index}]} + + AND + t1.institution_type = #{institutionType} + ORDER BY t1.gmt_create DESC @@ -355,6 +371,7 @@ t1.institution_region_area, t1.institution_region_village, t1.institution_region_street, + t1.institution_type, t1.creator, t1.gmt_create, t1.modifier, @@ -385,6 +402,10 @@ #{institutionIds[${index}]} + + AND + t1.institution_type = #{institutionType} + ORDER BY t1.gmt_create DESC @@ -436,6 +457,10 @@ #{institutionIds[${index}]} + + AND + t1.institution_type = #{institutionType} + ORDER BY t1.gmt_create DESC diff --git a/pojo-institution-management/src/main/java/cn/com/tenlion/institutionmanagement/pojo/bos/institution/InstitutionBO.java b/pojo-institution-management/src/main/java/cn/com/tenlion/institutionmanagement/pojo/bos/institution/InstitutionBO.java index efeeb71..f64a5b2 100644 --- a/pojo-institution-management/src/main/java/cn/com/tenlion/institutionmanagement/pojo/bos/institution/InstitutionBO.java +++ b/pojo-institution-management/src/main/java/cn/com/tenlion/institutionmanagement/pojo/bos/institution/InstitutionBO.java @@ -25,6 +25,7 @@ public class InstitutionBO { private String institutionRegionArea; private String institutionRegionVillage; private String institutionRegionStreet; + private String institutionType; private String creator; private String gmtCreate; private String modifier; @@ -192,4 +193,11 @@ public class InstitutionBO { } + public String getInstitutionType() { + return institutionType; + } + + public void setInstitutionType(String institutionType) { + this.institutionType = institutionType; + } } diff --git a/pojo-institution-management/src/main/java/cn/com/tenlion/institutionmanagement/pojo/dtos/institution/InstitutionDTO.java b/pojo-institution-management/src/main/java/cn/com/tenlion/institutionmanagement/pojo/dtos/institution/InstitutionDTO.java index 141c49e..1d4cb6d 100644 --- a/pojo-institution-management/src/main/java/cn/com/tenlion/institutionmanagement/pojo/dtos/institution/InstitutionDTO.java +++ b/pojo-institution-management/src/main/java/cn/com/tenlion/institutionmanagement/pojo/dtos/institution/InstitutionDTO.java @@ -44,9 +44,11 @@ public class InstitutionDTO { private String institutionRegionVillage; @ApiModelProperty(name = "institutionRegionStreet", value = "行政区化-街") private String institutionRegionStreet; - @ApiModelProperty(name = "creator", value = "") + @ApiModelProperty(name = "institutionType", value = "机构类型") + private String institutionType; + @ApiModelProperty(name = "creator", value = "创建人") private String creator; - @ApiModelProperty(name = "gmtCreate", value = "") + @ApiModelProperty(name = "gmtCreate", value = "创建时间") private String gmtCreate; public String getInstitutionId() { @@ -185,5 +187,11 @@ public class InstitutionDTO { this.gmtCreate = gmtCreate; } + public String getInstitutionType() { + return institutionType; + } + public void setInstitutionType(String institutionType) { + this.institutionType = institutionType; + } } diff --git a/pojo-institution-management/src/main/java/cn/com/tenlion/institutionmanagement/pojo/pos/institution/InstitutionPO.java b/pojo-institution-management/src/main/java/cn/com/tenlion/institutionmanagement/pojo/pos/institution/InstitutionPO.java index 8ed15b3..b1399af 100644 --- a/pojo-institution-management/src/main/java/cn/com/tenlion/institutionmanagement/pojo/pos/institution/InstitutionPO.java +++ b/pojo-institution-management/src/main/java/cn/com/tenlion/institutionmanagement/pojo/pos/institution/InstitutionPO.java @@ -25,6 +25,7 @@ public class InstitutionPO { private String institutionRegionArea; private String institutionRegionVillage; private String institutionRegionStreet; + private String institutionType; private String creator; private String gmtCreate; private String modifier; @@ -192,4 +193,11 @@ public class InstitutionPO { } + public String getInstitutionType() { + return institutionType; + } + + public void setInstitutionType(String institutionType) { + this.institutionType = institutionType; + } } diff --git a/pojo-institution-management/src/main/java/cn/com/tenlion/institutionmanagement/pojo/vos/institution/InstitutionVO.java b/pojo-institution-management/src/main/java/cn/com/tenlion/institutionmanagement/pojo/vos/institution/InstitutionVO.java index 5d0e4d1..ce3747d 100644 --- a/pojo-institution-management/src/main/java/cn/com/tenlion/institutionmanagement/pojo/vos/institution/InstitutionVO.java +++ b/pojo-institution-management/src/main/java/cn/com/tenlion/institutionmanagement/pojo/vos/institution/InstitutionVO.java @@ -44,6 +44,8 @@ public class InstitutionVO { private String institutionRegionVillage; @ApiModelProperty(name = "institutionRegionStreet", value = "行政区化-街") private String institutionRegionStreet; + @ApiModelProperty(name = "institutionType", value = "机构类型") + private String institutionType; public String getInstitutionName() { return institutionName == null ? "" : institutionName.trim(); @@ -157,5 +159,11 @@ public class InstitutionVO { this.institutionRegionStreet = institutionRegionStreet; } + public String getInstitutionType() { + return institutionType; + } + public void setInstitutionType(String institutionType) { + this.institutionType = institutionType; + } }