From 1f86fc9a17c0f7b182b928c4543c8c2b7c4f3a90 Mon Sep 17 00:00:00 2001 From: ly19960718 <1622779752@qq.com> Date: Sat, 1 May 2021 17:47:41 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E7=B1=BB=E5=9E=8B=E5=AD=97?= =?UTF-8?q?=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mapper/institution/institution-mapper.xml | 55 +++++-------------- .../organization/organization-mapper.xml | 44 ++++++++++++--- .../pojo/bos/organization/OrganizationBO.java | 8 +++ .../dtos/organization/OrganizationDTO.java | 13 ++++- .../pojo/pos/organization/OrganizationPO.java | 8 +++ .../pojo/vos/organization/OrganizationVO.java | 8 +++ 6 files changed, 84 insertions(+), 52 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 ac236f0..30238c1 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 @@ -154,51 +154,24 @@ institution_name = #{institutionName}, - - institution_desc = #{institutionDesc}, - - - institution_image = #{institutionImage}, - - - institution_address = #{institutionAddress}, - - - institution_x = #{institutionX}, - - - institution_y = #{institutionY}, - - - institution_founding_time = #{institutionFoundingTime}, - - - institution_principal = #{institutionPrincipal}, - - - institution_contact = #{institutionContact}, - - - institution_region_province = #{institutionRegionProvince}, - - - institution_region_city = #{institutionRegionCity}, - - - institution_region_area = #{institutionRegionArea}, - - - institution_region_village = #{institutionRegionVillage}, - - - institution_region_street = #{institutionRegionStreet}, - institution_type = #{institutionType}, + institution_desc = #{institutionDesc}, + institution_image = #{institutionImage}, + institution_address = #{institutionAddress}, + institution_x = #{institutionX}, + institution_y = #{institutionY}, + institution_founding_time = #{institutionFoundingTime}, + institution_principal = #{institutionPrincipal}, + institution_contact = #{institutionContact}, + institution_region_province = #{institutionRegionProvince}, + institution_region_city = #{institutionRegionCity}, + institution_region_area = #{institutionRegionArea}, + institution_region_village = #{institutionRegionVillage}, + institution_region_street = #{institutionRegionStreet}, gmt_modified = #{gmtModified}, - modifier = #{modifier}, - institution_id = institution_id + modifier = #{modifier} WHERE institution_id = #{institutionId} diff --git a/module-organization-management/src/main/resources/mybatis/mapper/organization/organization-mapper.xml b/module-organization-management/src/main/resources/mybatis/mapper/organization/organization-mapper.xml index 82dc51c..01726b0 100644 --- a/module-organization-management/src/main/resources/mybatis/mapper/organization/organization-mapper.xml +++ b/module-organization-management/src/main/resources/mybatis/mapper/organization/organization-mapper.xml @@ -9,6 +9,7 @@ + @@ -20,6 +21,7 @@ + @@ -34,6 +36,7 @@ + @@ -50,6 +53,7 @@ organization_principal, organization_desc, organization_image, + organization_type, creator, gmt_create, modifier, @@ -62,6 +66,7 @@ #{organizationPrincipal}, #{organizationDesc}, #{organizationImage}, + #{organizationType}, #{creator}, #{gmtCreate}, #{modifier}, @@ -106,6 +111,9 @@ organization_principal = #{organizationPrincipal}, organization_desc = #{organizationDesc}, organization_image = #{organizationImage}, + + organization_type = #{organizationType}, + gmt_modified = #{gmtModified}, modifier = #{modifier} WHERE @@ -120,15 +128,16 @@ t1.organization_principal, t1.organization_desc, t1.organization_image, + t1.organization_type, t1.organization_id FROM m_organization t1 WHERE t1.is_delete = 0 - - AND + + AND t1.organization_id = #{organizationId} - + @@ -140,6 +149,7 @@ t1.organization_principal, t1.organization_desc, t1.organization_image, + t1.organization_type, t1.creator, t1.gmt_create, t1.modifier, @@ -149,10 +159,10 @@ m_organization t1 WHERE t1.is_delete = 0 - - AND + + AND t1.organization_id = #{organizationId} - + @@ -164,6 +174,7 @@ t1.organization_principal, t1.organization_desc, t1.organization_image, + t1.organization_type, t1.creator, t1.gmt_create, t1.modifier, @@ -173,10 +184,10 @@ m_organization t1 WHERE t1.is_delete = 0 - - AND + + AND t1.organization_id = #{organizationId} - + @@ -188,6 +199,7 @@ t1.organization_principal, t1.organization_desc, t1.organization_image, + t1.organization_type, t1.creator, t1.gmt_create FROM @@ -214,6 +226,10 @@ #{organizationIds[${index}]} + + + AND + t1.organization_type = #{organizationType} ORDER BY t1.gmt_create DESC @@ -227,6 +243,7 @@ t1.organization_principal, t1.organization_desc, t1.organization_image, + t1.organization_type, t1.creator, t1.gmt_create, t1.modifier, @@ -257,6 +274,10 @@ #{organizationIds[${index}]} + + AND + t1.organization_type = #{organizationType} + ORDER BY t1.gmt_create DESC @@ -269,6 +290,7 @@ t1.organization_principal, t1.organization_desc, t1.organization_image, + t1.organization_type, t1.creator, t1.gmt_create, t1.modifier, @@ -299,6 +321,10 @@ #{organizationIds[${index}]} + + AND + t1.organization_type = #{organizationType} + ORDER BY t1.gmt_create DESC diff --git a/pojo-organization-management/src/main/java/cn/com/tenlion/organizationmanagement/pojo/bos/organization/OrganizationBO.java b/pojo-organization-management/src/main/java/cn/com/tenlion/organizationmanagement/pojo/bos/organization/OrganizationBO.java index 82e793d..c895ada 100644 --- a/pojo-organization-management/src/main/java/cn/com/tenlion/organizationmanagement/pojo/bos/organization/OrganizationBO.java +++ b/pojo-organization-management/src/main/java/cn/com/tenlion/organizationmanagement/pojo/bos/organization/OrganizationBO.java @@ -16,6 +16,7 @@ public class OrganizationBO { private String organizationPrincipal; private String organizationDesc; private String organizationImage; + private String organizationType; private String creator; private String gmtCreate; private String modifier; @@ -111,4 +112,11 @@ public class OrganizationBO { } + public String getOrganizationType() { + return organizationType; + } + + public void setOrganizationType(String organizationType) { + this.organizationType = organizationType; + } } diff --git a/pojo-organization-management/src/main/java/cn/com/tenlion/organizationmanagement/pojo/dtos/organization/OrganizationDTO.java b/pojo-organization-management/src/main/java/cn/com/tenlion/organizationmanagement/pojo/dtos/organization/OrganizationDTO.java index ca5e1a8..593debf 100644 --- a/pojo-organization-management/src/main/java/cn/com/tenlion/organizationmanagement/pojo/dtos/organization/OrganizationDTO.java +++ b/pojo-organization-management/src/main/java/cn/com/tenlion/organizationmanagement/pojo/dtos/organization/OrganizationDTO.java @@ -26,9 +26,11 @@ public class OrganizationDTO { private String organizationDesc; @ApiModelProperty(name = "organizationImage", value = "组织图片") private String organizationImage; - @ApiModelProperty(name = "creator", value = "") + @ApiModelProperty(name = "organizationType", value = "组织类型") + private String organizationType; + @ApiModelProperty(name = "creator", value = "创建人") private String creator; - @ApiModelProperty(name = "gmtCreate", value = "") + @ApiModelProperty(name = "gmtCreate", value = "创建时间") private String gmtCreate; public String getOrganizationId() { @@ -96,4 +98,11 @@ public class OrganizationDTO { } + public String getOrganizationType() { + return organizationType; + } + + public void setOrganizationType(String organizationType) { + this.organizationType = organizationType; + } } diff --git a/pojo-organization-management/src/main/java/cn/com/tenlion/organizationmanagement/pojo/pos/organization/OrganizationPO.java b/pojo-organization-management/src/main/java/cn/com/tenlion/organizationmanagement/pojo/pos/organization/OrganizationPO.java index 83b751e..897df12 100644 --- a/pojo-organization-management/src/main/java/cn/com/tenlion/organizationmanagement/pojo/pos/organization/OrganizationPO.java +++ b/pojo-organization-management/src/main/java/cn/com/tenlion/organizationmanagement/pojo/pos/organization/OrganizationPO.java @@ -16,6 +16,7 @@ public class OrganizationPO { private String organizationPrincipal; private String organizationDesc; private String organizationImage; + private String organizationType; private String creator; private String gmtCreate; private String modifier; @@ -111,4 +112,11 @@ public class OrganizationPO { } + public String getOrganizationType() { + return organizationType; + } + + public void setOrganizationType(String organizationType) { + this.organizationType = organizationType; + } } diff --git a/pojo-organization-management/src/main/java/cn/com/tenlion/organizationmanagement/pojo/vos/organization/OrganizationVO.java b/pojo-organization-management/src/main/java/cn/com/tenlion/organizationmanagement/pojo/vos/organization/OrganizationVO.java index fc7ed06..4fec965 100644 --- a/pojo-organization-management/src/main/java/cn/com/tenlion/organizationmanagement/pojo/vos/organization/OrganizationVO.java +++ b/pojo-organization-management/src/main/java/cn/com/tenlion/organizationmanagement/pojo/vos/organization/OrganizationVO.java @@ -26,6 +26,8 @@ public class OrganizationVO { private String organizationDesc; @ApiModelProperty(name = "organizationImage", value = "组织图片") private String organizationImage; + @ApiModelProperty(name = "organizationType", value = "组织类型") + private String organizationType; public String getOrganizationName() { return organizationName == null ? "" : organizationName.trim(); @@ -67,5 +69,11 @@ public class OrganizationVO { this.organizationImage = organizationImage; } + public String getOrganizationType() { + return organizationType; + } + public void setOrganizationType(String organizationType) { + this.organizationType = organizationType; + } }