增加类型字段

module-institution-management/src/main/resources/mybatis/mapper/institution/institution-mapper.xml

@@ -154,51 +154,24 @@
         <if test="institutionName != null and institutionName != ''">
             institution_name = #{institutionName},
         </if>
-        <if test="institutionDesc != null and institutionDesc != ''">
-            institution_desc = #{institutionDesc},
-        </if>
-        <if test="institutionImage != null and institutionImage != ''">
-            institution_image = #{institutionImage},
-        </if>
-        <if test="institutionAddress != null and institutionAddress != ''">
-            institution_address = #{institutionAddress},
-        </if>
-        <if test="institutionX != null and institutionX != ''">
-            institution_x = #{institutionX},
-        </if>
-        <if test="institutionY != null and institutionY != ''">
-            institution_y = #{institutionY},
-        </if>
-        <if test="institutionFoundingTime != null and institutionFoundingTime != ''">
-            institution_founding_time = #{institutionFoundingTime},
-        </if>
-        <if test="institutionPrincipal != null and institutionPrincipal != ''">
-            institution_principal = #{institutionPrincipal},
-        </if>
-        <if test="institutionContact != null and institutionContact != ''">
-            institution_contact = #{institutionContact},
-        </if>
-        <if test="institutionRegionProvince != null and institutionRegionProvince != ''">
-            institution_region_province = #{institutionRegionProvince},
-        </if>
-        <if test="institutionRegionCity != null and institutionRegionCity != ''">
-            institution_region_city = #{institutionRegionCity},
-        </if>
-        <if test="institutionRegionArea != null and institutionRegionArea != ''">
-            institution_region_area = #{institutionRegionArea},
-        </if>
-        <if test="institutionRegionVillage != null and institutionRegionVillage != ''">
-            institution_region_village = #{institutionRegionVillage},
-        </if>
-        <if test="institutionRegionStreet != null and institutionRegionStreet != ''">
-            institution_region_street = #{institutionRegionStreet},
-        </if>
         <if test="institutionType != null and institutionType != ''">
             institution_type = #{institutionType},
         </if>
+            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},
+            modifier = #{modifier}
-            institution_id = institution_id
         WHERE
             institution_id = #{institutionId}
     </update>

module-organization-management/src/main/resources/mybatis/mapper/organization/organization-mapper.xml

@@ -9,6 +9,7 @@
         <result column="organization_principal" property="organizationPrincipal"/>
         <result column="organization_desc" property="organizationDesc"/>
         <result column="organization_image" property="organizationImage"/>
+        <result column="organization_type" property="organizationType"/>
         <result column="creator" property="creator"/>
         <result column="gmt_create" property="gmtCreate"/>
     </resultMap>
@@ -20,6 +21,7 @@
         <result column="organization_principal" property="organizationPrincipal"/>
         <result column="organization_desc" property="organizationDesc"/>
         <result column="organization_image" property="organizationImage"/>
+        <result column="organization_type" property="organizationType"/>
         <result column="creator" property="creator"/>
         <result column="gmt_create" property="gmtCreate"/>
         <result column="modifier" property="modifier"/>
@@ -34,6 +36,7 @@
         <result column="organization_principal" property="organizationPrincipal"/>
         <result column="organization_desc" property="organizationDesc"/>
         <result column="organization_image" property="organizationImage"/>
+        <result column="organization_type" property="organizationType"/>
         <result column="creator" property="creator"/>
         <result column="gmt_create" property="gmtCreate"/>
         <result column="modifier" property="modifier"/>
@@ -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},
+            <if test="organizationType != null and organizationType != ''">
+                organization_type = #{organizationType},
+            </if>
             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
-            <if test="organizationId != null and organizationId != ''">
+        <if test="organizationId != null and organizationId != ''">
-        AND
+            AND
             t1.organization_id = #{organizationId}
-            </if>
+        </if>
     </select>
 
     <!-- 组织管理详情 -->
@@ -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
-            <if test="organizationId != null and organizationId != ''">
+        <if test="organizationId != null and organizationId != ''">
-        AND
+            AND
             t1.organization_id = #{organizationId}
-            </if>
+        </if>
     </select>
 
     <!-- 组织管理详情 -->
@@ -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
-            <if test="organizationId != null and organizationId != ''">
+        <if test="organizationId != null and organizationId != ''">
-        AND
+            AND
             t1.organization_id = #{organizationId}
-            </if>
+        </if>
     </select>
 
     <!-- 组织管理列表 -->
@@ -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 @@
             <foreach collection="organizationIds" index="index" open="(" separator="," close=")">
                 #{organizationIds[${index}]}
             </foreach>
+        </if>
+         <if test="organizationType != null and organizationType != ''">
+             AND
+             t1.organization_type = #{organizationType}
         </if>
         ORDER BY t1.gmt_create DESC
     </select>
@@ -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}]}
             </foreach>
         </if>
+        <if test="organizationType != null and organizationType != ''">
+            AND
+            t1.organization_type = #{organizationType}
+        </if>
         ORDER BY t1.gmt_create DESC
     </select>
 
@@ -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}]}
             </foreach>
         </if>
+        <if test="organizationType != null and organizationType != ''">
+            AND
+            t1.organization_type = #{organizationType}
+        </if>
         ORDER BY t1.gmt_create DESC
     </select>
 

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;
+    }
 }

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;
+    }
 }

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;
+    }
 }

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;
+    }
 }