From 2db8190b5ba204461a19181b43848ce7877426f7 Mon Sep 17 00:00:00 2001 From: wangbing <1919101440@qq.com> Date: Wed, 1 Jan 2020 22:44:29 +0800 Subject: [PATCH] =?UTF-8?q?1=E3=80=812323?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Former-commit-id: 94398d70fb6fd5a80f66de8658b8b16b5394cf0a --- .../java/module/system/ent/Dept.java | 8 +- .../module/system/req/DeptCreateRequest.java | 8 +- .../module/system/req/DeptFindRequest.java | 4 +- .../module/system/req/DeptUpdateRequest.java | 8 +- .../dbtool/system/MySQL_ALL_TABLE.sql | 4 +- .../SpringBoot/resources/dbtool/wadmin.xml | 4 +- .../templates/screen/module/system/dept.ftl | 328 ++++++++++-------- .../templates/screen/module/system/user.ftl | 94 +++-- .../SpringBoot/test/system/DeptTest.java | 24 +- 9 files changed, 281 insertions(+), 201 deletions(-) diff --git a/src/main/resources/modules/SpringBoot/java/module/system/ent/Dept.java b/src/main/resources/modules/SpringBoot/java/module/system/ent/Dept.java index 24ab046d..5b5b6468 100644 --- a/src/main/resources/modules/SpringBoot/java/module/system/ent/Dept.java +++ b/src/main/resources/modules/SpringBoot/java/module/system/ent/Dept.java @@ -34,15 +34,15 @@ public class Dept extends BaseEntity { @ColumnDescription("") private String deptAlias; /** - * SUP_CODE - 父部门代码 + * SUP_CODE - 上级代码 */ - @ColumnName("父部门代码") + @ColumnName("上级代码") @ColumnDescription("") private String supCode; /** - * SUP_NAME - 父部门名称 + * SUP_NAME - 上级名称 */ - @ColumnName("父部门名称") + @ColumnName("上级名称") @ColumnDescription("") private String supName; /** diff --git a/src/main/resources/modules/SpringBoot/java/module/system/req/DeptCreateRequest.java b/src/main/resources/modules/SpringBoot/java/module/system/req/DeptCreateRequest.java index d70cf3bd..7babe42a 100644 --- a/src/main/resources/modules/SpringBoot/java/module/system/req/DeptCreateRequest.java +++ b/src/main/resources/modules/SpringBoot/java/module/system/req/DeptCreateRequest.java @@ -35,15 +35,15 @@ public class DeptCreateRequest extends BaseRequest { private String deptAlias; /** - * 父部门代码 + * 上级代码 */ - @Length(min = 0, max = 50, message = "[supCode]父部门代码长度不合法(0-50)") + @Length(min = 0, max = 50, message = "[supCode]上级代码长度不合法(0-50)") private String supCode; /** - * 父部门名称 + * 上级名称 */ - @Length(min = 0, max = 100, message = "[supName]父部门名称长度不合法(0-100)") + @Length(min = 0, max = 100, message = "[supName]上级名称长度不合法(0-100)") private String supName; /** diff --git a/src/main/resources/modules/SpringBoot/java/module/system/req/DeptFindRequest.java b/src/main/resources/modules/SpringBoot/java/module/system/req/DeptFindRequest.java index 211d7105..c1a8f8aa 100644 --- a/src/main/resources/modules/SpringBoot/java/module/system/req/DeptFindRequest.java +++ b/src/main/resources/modules/SpringBoot/java/module/system/req/DeptFindRequest.java @@ -27,12 +27,12 @@ public class DeptFindRequest extends BaseFindRequest { private String deptAlias; /** - * 父部门代码 + * 上级代码 */ private String supCode; /** - * 父部门名称 + * 上级名称 */ private String supName; diff --git a/src/main/resources/modules/SpringBoot/java/module/system/req/DeptUpdateRequest.java b/src/main/resources/modules/SpringBoot/java/module/system/req/DeptUpdateRequest.java index e984518d..280deb9b 100644 --- a/src/main/resources/modules/SpringBoot/java/module/system/req/DeptUpdateRequest.java +++ b/src/main/resources/modules/SpringBoot/java/module/system/req/DeptUpdateRequest.java @@ -41,15 +41,15 @@ public class DeptUpdateRequest extends BaseUpdateRequest { private String deptAlias; /** - * 父部门代码 + * 上级代码 */ - @Length(min = 0, max = 50, message = "[supCode]父部门代码长度不合法(0-50)") + @Length(min = 0, max = 50, message = "[supCode]上级代码长度不合法(0-50)") private String supCode; /** - * 父部门名称 + * 上级名称 */ - @Length(min = 0, max = 100, message = "[supName]父部门名称长度不合法(0-100)") + @Length(min = 0, max = 100, message = "[supName]上级名称长度不合法(0-100)") private String supName; /** diff --git a/src/main/resources/modules/SpringBoot/resources/dbtool/system/MySQL_ALL_TABLE.sql b/src/main/resources/modules/SpringBoot/resources/dbtool/system/MySQL_ALL_TABLE.sql index 5e2d000a..dcc97cdd 100644 --- a/src/main/resources/modules/SpringBoot/resources/dbtool/system/MySQL_ALL_TABLE.sql +++ b/src/main/resources/modules/SpringBoot/resources/dbtool/system/MySQL_ALL_TABLE.sql @@ -99,8 +99,8 @@ CREATE TABLE `SYS_DEPT` ( `DEPT_CODE` VARCHAR(50) NOT NULL COMMENT '部门代码', `DEPT_NAME` VARCHAR(100) NOT NULL COMMENT '部门名称', `DEPT_ALIAS` VARCHAR(50) COMMENT '部门别名', - `SUP_CODE` VARCHAR(50) COMMENT '父部门代码', - `SUP_NAME` VARCHAR(100) COMMENT '父部门名称', + `SUP_CODE` VARCHAR(50) COMMENT '上级代码', + `SUP_NAME` VARCHAR(100) COMMENT '上级名称', `VALID` TINYINT(1) NOT NULL COMMENT '是否有效', `ROW_VERSION` BIGINT(20) NOT NULL DEFAULT 0 COMMENT '行版本', `IS_DELETED` TINYINT(1) NOT NULL DEFAULT 0 COMMENT '是否已删除', diff --git a/src/main/resources/modules/SpringBoot/resources/dbtool/wadmin.xml b/src/main/resources/modules/SpringBoot/resources/dbtool/wadmin.xml index 2df94e6a..f5f44b7a 100644 --- a/src/main/resources/modules/SpringBoot/resources/dbtool/wadmin.xml +++ b/src/main/resources/modules/SpringBoot/resources/dbtool/wadmin.xml @@ -84,8 +84,8 @@ - - + + diff --git a/src/main/resources/modules/SpringBoot/resources/templates/screen/module/system/dept.ftl b/src/main/resources/modules/SpringBoot/resources/templates/screen/module/system/dept.ftl index e64b7739..13f2a39c 100644 --- a/src/main/resources/modules/SpringBoot/resources/templates/screen/module/system/dept.ftl +++ b/src/main/resources/modules/SpringBoot/resources/templates/screen/module/system/dept.ftl @@ -1,145 +1,199 @@ <#-- since 2017-01-01-->
- - - - - - - - - - - - - - - - - - - 是 - 否 - - - - 搜索 - 重置 - - - + + + 列表展示 - - - - 新增 + + + + + + + + + + + + + + + + + + + 是 + 否 + + + + 搜索 + 重置 + + + + + + + + 新增 + + 导出 + + + + + + + + + + + - 导出 - + + + - - - - - + + + + + + - - - + + + + + + + + + + + + + + + + + + + + + + + - - - + + + + + 树状展示 - - - - - - + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - + + + + + + - - + +
+ {{ data.comment }}[{{data.code}}] + + + + + + +
+ + + @@ -154,11 +208,11 @@ - - + + - - + + @@ -218,10 +272,10 @@ {min: 1, max: 50, message: '部门别名长度在 1 到 50 个字符', trigger: 'blur'} ], supCode: [ - {min: 1, max: 50, message: '父部门代码长度在 1 到 50 个字符', trigger: 'blur'} + {min: 1, max: 50, message: '上级代码长度在 1 到 50 个字符', trigger: 'blur'} ], supName: [ - {min: 1, max: 100, message: '父部门名称长度在 1 到 100 个字符', trigger: 'blur'} + {min: 1, max: 100, message: '上级名称长度在 1 到 100 个字符', trigger: 'blur'} ], valid: [ {required: true, message: '是否有效不能为空', trigger: 'blur'}, diff --git a/src/main/resources/modules/SpringBoot/resources/templates/screen/module/system/user.ftl b/src/main/resources/modules/SpringBoot/resources/templates/screen/module/system/user.ftl index 9f761284..e3a36071 100644 --- a/src/main/resources/modules/SpringBoot/resources/templates/screen/module/system/user.ftl +++ b/src/main/resources/modules/SpringBoot/resources/templates/screen/module/system/user.ftl @@ -12,7 +12,7 @@ - + @@ -155,36 +155,33 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + 取 消 保存 - +
diff --git a/src/main/resources/modules/SpringBoot/test/system/DeptTest.java b/src/main/resources/modules/SpringBoot/test/system/DeptTest.java index 5f102886..56d550d0 100644 --- a/src/main/resources/modules/SpringBoot/test/system/DeptTest.java +++ b/src/main/resources/modules/SpringBoot/test/system/DeptTest.java @@ -38,8 +38,8 @@ public class DeptTest { request.setDeptCode("部门代码"); request.setDeptName("部门名称"); request.setDeptAlias("部门别名"); - request.setSupCode("父部门代码"); - request.setSupName("父部门名称"); + request.setSupCode("上级代码"); + request.setSupName("上级名称"); request.setValid(true); DeptCreateResponse response = deptManager.create(request,token); @@ -55,8 +55,8 @@ public class DeptTest { createRequest.setDeptCode("部门代码"); createRequest.setDeptName("部门名称"); createRequest.setDeptAlias("部门别名"); - createRequest.setSupCode("父部门代码"); - createRequest.setSupName("父部门名称"); + createRequest.setSupCode("上级代码"); + createRequest.setSupName("上级名称"); createRequest.setValid(true); DeptCreateResponse createResponse = deptManager.create(createRequest,token); @@ -78,8 +78,8 @@ public class DeptTest { createRequest.setDeptCode("部门代码"); createRequest.setDeptName("部门名称"); createRequest.setDeptAlias("部门别名"); - createRequest.setSupCode("父部门代码"); - createRequest.setSupName("父部门名称"); + createRequest.setSupCode("上级代码"); + createRequest.setSupName("上级名称"); createRequest.setValid(true); DeptCreateResponse createResponse = deptManager.create(createRequest, token); @@ -92,8 +92,8 @@ public class DeptTest { request.setDeptCode("部门代码"); request.setDeptName("部门名称"); request.setDeptAlias("部门别名"); - request.setSupCode("父部门代码"); - request.setSupName("父部门名称"); + request.setSupCode("上级代码"); + request.setSupName("上级名称"); request.setValid(true); DeptUpdateResponse response = deptManager.update(request,token); @@ -107,8 +107,8 @@ public class DeptTest { request.setDeptCode("部门代码"); request.setDeptName("部门名称"); request.setDeptAlias("部门别名"); - request.setSupCode("父部门代码"); - request.setSupName("父部门名称"); + request.setSupCode("上级代码"); + request.setSupName("上级名称"); request.setValid(true); DeptFindResponse response = deptManager.find(request,token); @@ -123,8 +123,8 @@ public class DeptTest { createRequest.setDeptCode("部门代码"); createRequest.setDeptName("部门名称"); createRequest.setDeptAlias("部门别名"); - createRequest.setSupCode("父部门代码"); - createRequest.setSupName("父部门名称"); + createRequest.setSupCode("上级代码"); + createRequest.setSupName("上级名称"); createRequest.setValid(true); DeptCreateResponse createResponse = deptManager.create(createRequest, token);