diff --git a/basic-pojo/src/main/java/ink/wgink/pojo/dtos/department/DepartmentSimpleDTO.java b/basic-pojo/src/main/java/ink/wgink/pojo/dtos/department/DepartmentSimpleDTO.java index 49d26349..1492a0d2 100644 --- a/basic-pojo/src/main/java/ink/wgink/pojo/dtos/department/DepartmentSimpleDTO.java +++ b/basic-pojo/src/main/java/ink/wgink/pojo/dtos/department/DepartmentSimpleDTO.java @@ -16,6 +16,7 @@ public class DepartmentSimpleDTO implements Serializable { private String departmentParentId; private String departmentName; private String departmentCode; + private String departmentNo; public String getDepartmentId() { return departmentId == null ? "" : departmentId.trim(); @@ -48,4 +49,12 @@ public class DepartmentSimpleDTO implements Serializable { public void setDepartmentCode(String departmentCode) { this.departmentCode = departmentCode; } + + public String getDepartmentNo() { + return departmentNo == null ? "" : departmentNo.trim(); + } + + public void setDepartmentNo(String departmentNo) { + this.departmentNo = departmentNo; + } } diff --git a/basic-pojo/src/main/java/ink/wgink/pojo/pos/DepartmentPO.java b/basic-pojo/src/main/java/ink/wgink/pojo/pos/DepartmentPO.java index 95e1d17f..b01055d2 100644 --- a/basic-pojo/src/main/java/ink/wgink/pojo/pos/DepartmentPO.java +++ b/basic-pojo/src/main/java/ink/wgink/pojo/pos/DepartmentPO.java @@ -29,6 +29,8 @@ public class DepartmentPO implements Serializable { private String departmentName; @ApiModelProperty(name = "departmentNameEn", value = "组织部门名称（英文）") private String departmentNameEn; + @ApiModelProperty(name = "departmentNo", value = "组织编号") + private String departmentNo; @ApiModelProperty(name = "departmentNameOther", value = "组织部门名称（其他类型）") private String departmentNameOther; @ApiModelProperty(name = "departmentCode", value = "组织部门编码") @@ -148,6 +150,14 @@ public class DepartmentPO implements Serializable { this.departmentNameOther = departmentNameOther; } + public String getDepartmentNo() { + return departmentNo == null ? "" : departmentNo.trim(); + } + + public void setDepartmentNo(String departmentNo) { + this.departmentNo = departmentNo; + } + public String getDepartmentCode() { return departmentCode == null ? "" : departmentCode; } @@ -403,6 +413,8 @@ public class DepartmentPO implements Serializable { .append(departmentName).append('\"'); sb.append(",\"departmentNameEn\":\"") .append(departmentNameEn).append('\"'); + sb.append(",\"departmentNo\":\"") + .append(departmentNo).append('\"'); sb.append(",\"departmentNameOther\":\"") .append(departmentNameOther).append('\"'); sb.append(",\"departmentCode\":\"") diff --git a/basic-properties/src/main/java/ink/wgink/properties/cms/CmsProperties.java b/basic-properties/src/main/java/ink/wgink/properties/cms/CmsProperties.java new file mode 100644 index 00000000..507edc8c --- /dev/null +++ b/basic-properties/src/main/java/ink/wgink/properties/cms/CmsProperties.java @@ -0,0 +1,18 @@ +package ink.wgink.properties.cms; + +/** + * @ClassName: CmsProperties + * @Description: 内容管理 + * @Author: wanggeng + * @Date: 2021/9/30 2:56 下午 + * @Version: 1.0 + */ +public class CmsProperties { + + /** + * 静态地址 + */ + private String staticPath; + private String containerPath; + +} diff --git a/service-department/src/main/java/ink/wgink/service/department/pojo/vos/DepartmentVO.java b/service-department/src/main/java/ink/wgink/service/department/pojo/vos/DepartmentVO.java index 6436ee99..617c3889 100644 --- a/service-department/src/main/java/ink/wgink/service/department/pojo/vos/DepartmentVO.java +++ b/service-department/src/main/java/ink/wgink/service/department/pojo/vos/DepartmentVO.java @@ -25,6 +25,8 @@ public class DepartmentVO { private String departmentNameEn; @ApiModelProperty(name = "departmentNameOther", value = "组织部门名称（其他类型）") private String departmentNameOther; + @ApiModelProperty(name = "departmentNo", value = "组织部门编号") + private String departmentNo; @ApiModelProperty(name = "departmentType", value = "组织部门类型,1:机构,2:部门") @CheckNumberAnnotation(name = "组织部门类型", types = {"1", "2"}) private Integer departmentType; @@ -93,6 +95,14 @@ public class DepartmentVO { this.departmentNameOther = departmentNameOther; } + public String getDepartmentNo() { + return departmentNo == null ? "" : departmentNo.trim(); + } + + public void setDepartmentNo(String departmentNo) { + this.departmentNo = departmentNo; + } + public Integer getDepartmentType() { return departmentType; } @@ -232,6 +242,8 @@ public class DepartmentVO { .append(departmentNameEn).append('\"'); sb.append(",\"departmentNameOther\":\"") .append(departmentNameOther).append('\"'); + sb.append(",\"departmentNo\":\"") + .append(departmentNo).append('\"'); sb.append(",\"departmentType\":") .append(departmentType); sb.append(",\"departmentState\":") @@ -248,16 +260,16 @@ public class DepartmentVO { .append(departmentMaster).append('\"'); sb.append(",\"departmentDuty\":\"") .append(departmentDuty).append('\"'); - sb.append(",\"departmentArea1Id\":\"") - .append(departmentArea1Id).append('\"'); - sb.append(",\"departmentArea2Id\":\"") - .append(departmentArea2Id).append('\"'); - sb.append(",\"departmentArea3Id\":\"") - .append(departmentArea3Id).append('\"'); - sb.append(",\"departmentArea4Id\":\"") - .append(departmentArea4Id).append('\"'); - sb.append(",\"departmentArea5Id\":\"") - .append(departmentArea5Id).append('\"'); + sb.append(",\"departmentArea1Id\":") + .append(departmentArea1Id); + sb.append(",\"departmentArea2Id\":") + .append(departmentArea2Id); + sb.append(",\"departmentArea3Id\":") + .append(departmentArea3Id); + sb.append(",\"departmentArea4Id\":") + .append(departmentArea4Id); + sb.append(",\"departmentArea5Id\":") + .append(departmentArea5Id); sb.append(",\"departmentLongitude\":\"") .append(departmentLongitude).append('\"'); sb.append(",\"departmentLatitude\":\"") diff --git a/service-department/src/main/resources/mybatis/mapper/department-mapper.xml b/service-department/src/main/resources/mybatis/mapper/department-mapper.xml index 9bfc437e..792ccc26 100644 --- a/service-department/src/main/resources/mybatis/mapper/department-mapper.xml +++ b/service-department/src/main/resources/mybatis/mapper/department-mapper.xml @@ -13,6 +13,7 @@ + @@ -54,6 +55,7 @@ + @@ -100,6 +102,7 @@ `department_name` varchar(255) DEFAULT NULL COMMENT '机构名称', `department_name_en` varchar(255) DEFAULT NULL COMMENT '部门名称(英文)', `department_name_other` varchar(255) DEFAULT NULL COMMENT '部门名称(其他)', + `department_no` varchar(255) DEFAULT NULL COMMENT '部门编号', `department_summary` text COMMENT '部门简介', `department_code` varchar(255) DEFAULT NULL COMMENT '部门编码', `department_logo` char(36) DEFAULT NULL COMMENT '部门logo', @@ -147,6 +150,7 @@ department_name, department_name_en, department_name_other, + department_no, department_summary, department_code, department_logo, @@ -187,6 +191,7 @@ #{departmentName}, #{departmentNameEn}, #{departmentNameOther}, + #{departmentNo}, #{departmentSummary}, #{departmentCode}, #{departmentLogo}, @@ -253,6 +258,9 @@ department_name_other = #{departmentNameOther}, + + department_no = #{departmentNo}, + department_summary = #{departmentSummary}, @@ -286,35 +294,35 @@ department_duty = #{departmentDuty}, - department_area1_id = #{departmentArea1Id}, + department_area1_id = #{departmentArea1Id}, department_area1_code = #{departmentArea1Code}, department_area1_name = #{departmentArea1Name}, - department_area2_id = #{departmentArea2Id}, + department_area2_id = #{departmentArea2Id}, department_area2_code = #{departmentArea2Code}, department_area2_name = #{departmentArea2Name}, - department_area3_id = #{departmentArea3Id}, + department_area3_id = #{departmentArea3Id}, department_area3_code = #{departmentArea3Code}, department_area3_name = #{departmentArea3Name}, - department_area4_id = #{departmentArea4Id}, + department_area4_id = #{departmentArea4Id}, department_area4_code = #{departmentArea4Code}, department_area4_name = #{departmentArea4Name}, - department_area5_id = #{departmentArea5Id}, + department_area5_id = #{departmentArea5Id}, department_area5_code = #{departmentArea5Code}, @@ -387,6 +395,7 @@ department_name, department_name_en, department_name_other, + department_no, department_summary, department_code, department_logo, @@ -428,6 +437,7 @@ department_name, department_name_en, department_name_other, + department_no, department_summary, department_code, department_logo, @@ -474,6 +484,10 @@ AND department_code LIKE CONCAT(#{departmentCode}, '%') + + AND + department_no LIKE CONCAT(#{departmentNo}, '%') + AND department_id IN @@ -646,6 +660,7 @@ department_name, department_name_en, department_name_other, + department_no, department_summary, department_code, department_logo, @@ -698,6 +713,7 @@ department_name, department_name_en, department_name_other, + department_no, department_summary, department_code, department_logo, @@ -739,6 +755,10 @@ AND department_code LIKE CONCAT(#{departmentCode}, '%') + + AND + department_no LIKE CONCAT(#{departmentNo}, '%') + AND department_id IN @@ -800,6 +820,10 @@ AND department_name = #{departmentName} + + AND + department_no LIKE CONCAT(#{departmentNo}, '%') + AND department_id != #{noDepartmentId} diff --git a/service-department/src/main/resources/templates/department/list-tree.html b/service-department/src/main/resources/templates/department/list-tree.html index f278217d..c1d1eabf 100644 --- a/service-department/src/main/resources/templates/department/list-tree.html +++ b/service-department/src/main/resources/templates/department/list-tree.html @@ -15,7 +15,7 @@
-
+
@@ -24,7 +24,7 @@
-
+
diff --git a/service-department/src/main/resources/templates/department/list.html b/service-department/src/main/resources/templates/department/list.html index 84412806..d99d4757 100644 --- a/service-department/src/main/resources/templates/department/list.html +++ b/service-department/src/main/resources/templates/department/list.html @@ -97,6 +97,7 @@ {field:'departmentName', width:180, title: '组织机构名称', align:'center',}, {field:'departmentSummary', width:180, title: '组织说明', align:'center',}, {field:'departmentCode', width:100, title: '组织编码', align:'center',}, + {field:'departmentCode', width:100, title: '组织编号', align:'center',}, {field:'departmentType', width:100, title: '组织类型', align:'center', templet: function(item) { var value; diff --git a/service-department/src/main/resources/templates/department/save.html b/service-department/src/main/resources/templates/department/save.html index 38298e89..d5d45ed5 100644 --- a/service-department/src/main/resources/templates/department/save.html +++ b/service-department/src/main/resources/templates/department/save.html @@ -45,7 +45,7 @@
-
+
@@ -53,7 +53,7 @@
-
+
@@ -61,6 +61,14 @@
+
+
+ +
+ +
+
+
@@ -83,16 +91,16 @@
-
-
- -
- -
+
+
+
+ +
+
diff --git a/service-department/src/main/resources/templates/department/update.html b/service-department/src/main/resources/templates/department/update.html index dd3b3078..c94137d1 100644 --- a/service-department/src/main/resources/templates/department/update.html +++ b/service-department/src/main/resources/templates/department/update.html @@ -45,7 +45,7 @@
-
+
@@ -53,7 +53,7 @@
-
+
@@ -61,6 +61,14 @@
+
+
+ +
+ +
+
+
@@ -373,6 +381,7 @@ departmentName: data.departmentName, departmentNameEn: data.departmentNameEn, departmentNameOther: data.departmentNameOther, + departmentNo: data.departmentNo, departmentSummary: data.departmentSummary, departmentCode: data.departmentCode, departmentType: data.departmentType +'',