Tenlion/tenlion-module
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

机构增加机构类型字段

Browse Source
This commit is contained in:
ly19960718 2021-05-01 15:19:34 +08:00
parent e8c3742e36
commit 46092e1864
5 changed files with 59 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -18,6 +18,7 @@
<result column="institution_region_area" property="institutionRegionArea"/>
<result column="institution_region_village" property="institutionRegionVillage"/>
<result column="institution_region_street" property="institutionRegionStreet"/>
<result column="institution_type" property="institutionType"/>
<result column="creator" property="creator"/>
<result column="gmt_create" property="gmtCreate"/>
</resultMap>
@ -38,6 +39,7 @@
<result column="institution_region_area" property="institutionRegionArea"/>
<result column="institution_region_village" property="institutionRegionVillage"/>
<result column="institution_region_street" property="institutionRegionStreet"/>
<result column="institution_type" property="institutionType"/>
<result column="creator" property="creator"/>
<result column="gmt_create" property="gmtCreate"/>
<result column="modifier" property="modifier"/>
@ -61,6 +63,7 @@
<result column="institution_region_area" property="institutionRegionArea"/>
<result column="institution_region_village" property="institutionRegionVillage"/>
<result column="institution_region_street" property="institutionRegionStreet"/>
<result column="institution_type" property="institutionType"/>
<result column="creator" property="creator"/>
<result column="gmt_create" property="gmtCreate"/>
<result column="modifier" property="modifier"/>
@ -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 @@
</if>
<if test="institutionRegionStreet != null and institutionRegionStreet != ''">
institution_region_street = #{institutionRegionStreet},
</if>
<if test="institutionType != null and institutionType != ''">
institution_type = #{institutionType},
</if>
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}]}
</foreach>
</if>
<if test="institutionType != null and institutionType != ''">
AND
t1.institution_type = #{institutionType}
</if>
ORDER BY t1.gmt_create DESC
</select>
@ -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}]}
</foreach>
</if>
<if test="institutionType != null and institutionType != ''">
AND
t1.institution_type = #{institutionType}
</if>
ORDER BY t1.gmt_create DESC
</select>
@ -436,6 +457,10 @@
#{institutionIds[${index}]}
</foreach>
</if>
<if test="institutionType != null and institutionType != ''">
AND
t1.institution_type = #{institutionType}
</if>
ORDER BY t1.gmt_create DESC
</select>

8
pojo-institution-management/src/main/java/cn/com/tenlion/institutionmanagement/pojo/bos/institution/InstitutionBO.java
View File

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

14
pojo-institution-management/src/main/java/cn/com/tenlion/institutionmanagement/pojo/dtos/institution/InstitutionDTO.java
View File

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

8
pojo-institution-management/src/main/java/cn/com/tenlion/institutionmanagement/pojo/pos/institution/InstitutionPO.java
View File

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

10
pojo-institution-management/src/main/java/cn/com/tenlion/institutionmanagement/pojo/vos/institution/InstitutionVO.java
View File

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