新怎表单部门编号字段

2021-10-11 18:17:21 +08:00 · 2021-10-11 18:17:21 +08:00 · 7c20e834e1
commit 7c20e834e1
parent 56b936ede3
9 changed files with 124 additions and 31 deletions
--- 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;
+    }
 }
--- 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\":\"")
--- a/basic-properties/src/main/java/ink/wgink/properties/cms/CmsProperties.java
+++ 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;
+
+}
--- 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\":\"")
--- 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 @@
        <result property="departmentCode" column="department_code"/>
        <result property="departmentNameEn" column="department_name_en"/>
        <result property="departmentNameOther" column="department_name_other"/>
+        <result property="departmentNo" column="department_no"/>
        <result property="departmentSummary" column="department_summary"/>
        <result property="departmentLogo" column="department_logo"/>
        <result property="departmentLogoHover" column="department_logo_hover"/>
@ -54,6 +55,7 @@
        <result property="departmentCode" column="department_code"/>
        <result property="departmentNameEn" column="department_name_en"/>
        <result property="departmentNameOther" column="department_name_other"/>
+        <result property="departmentNo" column="department_no"/>
        <result property="departmentSummary" column="department_summary"/>
        <result property="departmentLogo" column="department_logo"/>
        <result property="departmentLogoHover" column="department_logo_hover"/>
@ -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 @@
        <if test="departmentNameOther != null">
            department_name_other = #{departmentNameOther},
        </if>
+        <if test="departmentNo != null">
+            department_no = #{departmentNo},
+        </if>
        <if test="departmentSummary != null">
            department_summary = #{departmentSummary},
        </if>
@ -286,35 +294,35 @@
        <if test="departmentDuty != null">
            department_duty = #{departmentDuty},
        </if>
-        department_area1_id = #{departmentArea1Id},
+            department_area1_id = #{departmentArea1Id},
        <if test="departmentArea1Code != null">
            department_area1_code = #{departmentArea1Code},
        </if>
        <if test="departmentArea1Name != null">
            department_area1_name = #{departmentArea1Name},
        </if>
-        department_area2_id = #{departmentArea2Id},
+            department_area2_id = #{departmentArea2Id},
        <if test="departmentArea2Code != null">
            department_area2_code = #{departmentArea2Code},
        </if>
        <if test="departmentArea2Name != null">
            department_area2_name = #{departmentArea2Name},
        </if>
-        department_area3_id = #{departmentArea3Id},
+            department_area3_id = #{departmentArea3Id},
        <if test="departmentArea3Code != null">
            department_area3_code = #{departmentArea3Code},
        </if>
        <if test="departmentArea3Name != null">
            department_area3_name = #{departmentArea3Name},
        </if>
-        department_area4_id = #{departmentArea4Id},
+            department_area4_id = #{departmentArea4Id},
        <if test="departmentArea4Code != null">
            department_area4_code = #{departmentArea4Code},
        </if>
        <if test="departmentArea4Name != null">
            department_area4_name = #{departmentArea4Name},
        </if>
-        department_area5_id = #{departmentArea5Id},
+            department_area5_id = #{departmentArea5Id},
        <if test="departmentArea5Code != null">
            department_area5_code = #{departmentArea5Code},
        </if>
@ -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}, '%')
        </if>
+        <if test="departmentNo != null and departmentNo != ''">
+        AND
+            department_no LIKE CONCAT(#{departmentNo}, '%')
+        </if>
        <if test="departmentIds != null and departmentIds.size > 0">
        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}, '%')
        </if>
+        <if test="departmentNo != null and departmentNo != ''">
+        AND
+            department_no LIKE CONCAT(#{departmentNo}, '%')
+        </if>
        <if test="departmentIds != null and departmentIds.size > 0">
        AND
            department_id IN
@ -800,6 +820,10 @@
        AND
            department_name = #{departmentName}
        </if>
+        <if test="departmentNo != null and departmentNo != ''">
+        AND
+            department_no LIKE CONCAT(#{departmentNo}, '%')
+        </if>
        <if test="noDepartmentId != null and noDepartmentId != ''">
        AND
            department_id != #{noDepartmentId}
--- 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 @@
 <body>
 <div class="layui-fluid layui-anim layui-anim-fadein">
    <div class="layui-row layui-col-space15">
-        <div class="layui-col-md2 layui-col-sm2 layui-col-xs2">
+        <div class="layui-col-md2 layui-col-sm2 layui-col-xs2" style="padding-right: 0px;">
            <div class="layui-card">
                <div class="layui-card-body left-tree-wrap">
                    <div id="leftTreeWrap">
@ -24,7 +24,7 @@
                </div>
            </div>
        </div>
-        <div class="layui-col-md10 layui-col-sm10 layui-col-xs10">
+        <div class="layui-col-md10 layui-col-sm10 layui-col-xs10" style="padding-left: 0px;">
            <div class="layui-card">
                <div id="listContentWrap" class="layui-card-body">
                    <iframe id="listContent" frameborder="0" class="layadmin-iframe"></iframe>
--- 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;
--- a/service-department/src/main/resources/templates/department/save.html
+++ b/service-department/src/main/resources/templates/department/save.html
@ -45,7 +45,7 @@
                    </div>
                </div>
                <div class="layui-row">
-                    <div class="layui-col-md6 layui-col-sm6 layui-col-xs12">
+                    <div class="layui-col-md4 layui-col-sm4 layui-col-xs12">
                        <div class="layui-form-item">
                            <label class="layui-form-label">名称(英文)</label>
                            <div class="layui-input-block">
@ -53,7 +53,7 @@
                            </div>
                        </div>
                    </div>
-                    <div class="layui-col-md6 layui-col-sm6 layui-col-xs12">
+                    <div class="layui-col-md4 layui-col-sm4 layui-col-xs12">
                        <div class="layui-form-item">
                            <label class="layui-form-label">名称(其他)</label>
                            <div class="layui-input-block">
@ -61,6 +61,14 @@
                            </div>
                        </div>
                    </div>
+                    <div class="layui-col-md4 layui-col-sm4 layui-col-xs12">
+                        <div class="layui-form-item">
+                            <label class="layui-form-label">编号</label>
+                            <div class="layui-input-block">
+                                <input id="departmentNo" type="text" name="departmentNo" lay-verify="required" placeholder="请输入组织编号" class="layui-input" maxlength="50">
+                            </div>
+                        </div>
+                    </div>
                </div>
                <div class="layui-row">
                    <div class="layui-col-md12 layui-col-sm12 layui-col-xs12">
@ -83,16 +91,16 @@
                                </select>
                            </div>
                        </div>
-                        <div class="layui-col-md6 layui-col-sm6 layui-col-xs12">
-                            <div class="layui-form-item">
-                                <label class="layui-form-label">组织状态 *</label>
-                                <div class="layui-input-block">
-                                    <select name="departmentState" lay-verify="required">
-                                        <option value="1" selected>正常</option>
-                                        <option value="2">异常</option>
-                                        <option value="3">停用</option>
-                                    </select>
-                                </div>
+                    </div>
+                    <div class="layui-col-md6 layui-col-sm6 layui-col-xs12">
+                        <div class="layui-form-item">
+                            <label class="layui-form-label">组织状态 *</label>
+                            <div class="layui-input-block">
+                                <select name="departmentState" lay-verify="required">
+                                    <option value="1" selected>正常</option>
+                                    <option value="2">异常</option>
+                                    <option value="3">停用</option>
+                                </select>
                            </div>
                        </div>
                    </div>
--- a/service-department/src/main/resources/templates/department/update.html
+++ b/service-department/src/main/resources/templates/department/update.html
@ -45,7 +45,7 @@
                    </div>
                </div>
                <div class="layui-row">
-                    <div class="layui-col-md6 layui-col-sm6 layui-col-xs12">
+                    <div class="layui-col-md4 layui-col-sm4 layui-col-xs12">
                        <div class="layui-form-item">
                            <label class="layui-form-label">名称(英文)</label>
                            <div class="layui-input-block">
@ -53,7 +53,7 @@
                            </div>
                        </div>
                    </div>
-                    <div class="layui-col-md6 layui-col-sm6 layui-col-xs12">
+                    <div class="layui-col-md4 layui-col-sm4 layui-col-xs12">
                        <div class="layui-form-item">
                            <label class="layui-form-label">名称(其他)</label>
                            <div class="layui-input-block">
@ -61,6 +61,14 @@
                            </div>
                        </div>
                    </div>
+                    <div class="layui-col-md4 layui-col-sm4 layui-col-xs12">
+                        <div class="layui-form-item">
+                            <label class="layui-form-label">编号</label>
+                            <div class="layui-input-block">
+                                <input id="departmentNo" type="text" name="departmentNo" lay-verify="required" placeholder="请输入组织编号" class="layui-input" maxlength="50">
+                            </div>
+                        </div>
+                    </div>
                </div>
                <div class="layui-row">
                    <div class="layui-col-md12 layui-col-sm12 layui-col-xs12">
@ -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 +'',