wulin/wl_management
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'version_performance_2.0' of http://gitlab.ldxinyong.com/enterpriseManagement/lz_management into version_performance_2.0

Browse Source
This commit is contained in:
杜建超 2020-10-16 11:23:17 +08:00
commit 17b6952507
14 changed files with 109 additions and 88 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
src/main/java/com/lz/modules/flow/req/EvaluationGroupReq.java
View File

@ -11,7 +11,7 @@ import java.util.Date;
* 菜单权限表
* </p>*考评组表
* @author quyixiao
* @since 2020-10-15
* @since 2020-10-16
*/
@ -19,10 +19,10 @@ import java.util.Date;
@ApiModel(value = "考评组表")
public class EvaluationGroupReq implements java.io.Serializable {
@ApiModelProperty(value = "page", name = "当前页码")
private int page = 1;
@ApiModelProperty(value = "rows", name = "每页返回条数")
private int rows = 10;
@ApiModelProperty(value = "currPage", name = "当前页码")
private int currPage = 1;
@ApiModelProperty(value = "pageSize", name = "每页返回条数")
private int pageSize = 10;
@ApiModelProperty(value = "sort", name = "类型")
private String sort;
@ApiModelProperty(value = "order", name = "排序")
@ -50,9 +50,6 @@ public class EvaluationGroupReq implements java.io.Serializable {
//参与考核员工staff_id，逗号隔开
@ApiModelProperty(value = "参与考核员工staff_id，逗号隔开", name = "staffIds")
private Long staffIds;
//0部门，1人员
@ApiModelProperty(value = "0部门，1人员", name = "inType")
private Integer inType;
//排除人员ids，逗号隔开
@ApiModelProperty(value = "排除人员ids，逗号隔开", name = "outIds")
private Long outIds;
@ -176,21 +173,6 @@ public class EvaluationGroupReq implements java.io.Serializable {
this.staffIds = staffIds;
}
/**
* 0部门，1人员
* @return
*/
public Integer getInType() {
return inType;
}
/**
* 0部门，1人员
* @param inType
*/
public void setInType(Integer inType) {
this.inType = inType;
}
/**
* 排除人员ids，逗号隔开
* @return
@ -217,7 +199,6 @@ public class EvaluationGroupReq implements java.io.Serializable {
",managerIds=" + managerIds +
",depIds=" + depIds +
",staffIds=" + staffIds +
",inType=" + inType +
",outIds=" + outIds +
"}";
}

10
src/main/java/com/lz/modules/flow/req/EvaluationStartStaffReq.java
View File

@ -11,7 +11,7 @@ import java.util.Date;
* 菜单权限表
* </p>*发起考核考，核组人员对应关系表
* @author quyixiao
* @since 2020-10-13
* @since 2020-10-16
*/
@ -19,9 +19,13 @@ import java.util.Date;
@ApiModel(value = "发起考核考，核组人员对应关系表")
public class EvaluationStartStaffReq implements java.io.Serializable {
private int page = 1;
private int rows = 10;
@ApiModelProperty(value = "currPage", name = "当前页码")
private int currPage = 1;
@ApiModelProperty(value = "pageSize", name = "每页返回条数")
private int pageSize = 10;
@ApiModelProperty(value = "sort", name = "类型")
private String sort;
@ApiModelProperty(value = "order", name = "排序")
private String order;
//
private Long id;

10
src/main/java/com/lz/modules/flow/req/FlowApprovalRoleReq.java
View File

@ -11,7 +11,7 @@ import java.util.Date;
* 菜单权限表
* </p>*流程审批表
* @author quyixiao
* @since 2020-10-15
* @since 2020-10-16
*/
@ -19,10 +19,10 @@ import java.util.Date;
@ApiModel(value = "流程审批表")
public class FlowApprovalRoleReq implements java.io.Serializable {
@ApiModelProperty(value = "page", name = "当前页码")
private int page = 1;
@ApiModelProperty(value = "rows", name = "每页返回条数")
private int rows = 10;
@ApiModelProperty(value = "currPage", name = "当前页码")
private int currPage = 1;
@ApiModelProperty(value = "pageSize", name = "每页返回条数")
private int pageSize = 10;
@ApiModelProperty(value = "sort", name = "类型")
private String sort;
@ApiModelProperty(value = "order", name = "排序")

10
src/main/java/com/lz/modules/flow/req/FlowChangeReq.java
View File

@ -11,7 +11,7 @@ import java.util.Date;
* 菜单权限表
* </p>*变动记录表
* @author quyixiao
* @since 2020-10-13
* @since 2020-10-16
*/
@ -19,9 +19,13 @@ import java.util.Date;
@ApiModel(value = "变动记录表")
public class FlowChangeReq implements java.io.Serializable {
private int page = 1;
private int rows = 10;
@ApiModelProperty(value = "currPage", name = "当前页码")
private int currPage = 1;
@ApiModelProperty(value = "pageSize", name = "每页返回条数")
private int pageSize = 10;
@ApiModelProperty(value = "sort", name = "类型")
private String sort;
@ApiModelProperty(value = "order", name = "排序")
private String order;
//
private Long id;

14
src/main/java/com/lz/modules/flow/req/FlowChartReq.java
View File

@ -11,7 +11,7 @@ import java.util.Date;
* 菜单权限表
* </p>*流程图，lz_flow的父
* @author quyixiao
* @since 2020-10-14
* @since 2020-10-16
*/
@ -19,9 +19,13 @@ import java.util.Date;
@ApiModel(value = "流程图，lz_flow的父")
public class FlowChartReq implements java.io.Serializable {
private int page = 1;
private int rows = 10;
@ApiModelProperty(value = "currPage", name = "当前页码")
private int currPage = 1;
@ApiModelProperty(value = "pageSize", name = "每页返回条数")
private int pageSize = 10;
@ApiModelProperty(value = "sort", name = "类型")
private String sort;
@ApiModelProperty(value = "order", name = "排序")
private String order;
//
private Long id;
@ -140,14 +144,14 @@ public class FlowChartReq implements java.io.Serializable {
}
/**
* 0启用，1不启用
* 是否可允许不启用节点 0不可，1可以
* @return
*/
public Integer getStatus() {
return status;
}
/**
* 0启用，1不启用
* 是否可允许不启用节点 0不可，1可以
* @param status
*/
public void setStatus(Integer status) {

26
src/main/java/com/lz/modules/flow/req/FlowChartRoleReq.java
View File

@ -11,7 +11,7 @@ import java.util.Date;
* 菜单权限表
* </p>*流程节点权限对应关系表
* @author quyixiao
* @since 2020-10-14
* @since 2020-10-16
*/
@ -19,9 +19,13 @@ import java.util.Date;
@ApiModel(value = "流程节点权限对应关系表")
public class FlowChartRoleReq implements java.io.Serializable {
private int page = 1;
private int rows = 10;
@ApiModelProperty(value = "currPage", name = "当前页码")
private int currPage = 1;
@ApiModelProperty(value = "pageSize", name = "每页返回条数")
private int pageSize = 10;
@ApiModelProperty(value = "sort", name = "类型")
private String sort;
@ApiModelProperty(value = "order", name = "排序")
private String order;
//
private Long id;
@ -37,11 +41,11 @@ public class FlowChartRoleReq implements java.io.Serializable {
//flow_chart表中id
@ApiModelProperty(value = "flow_chart表中id", name = "chartId")
private Long chartId;
//必须授权角色id
@ApiModelProperty(value = "必须授权角色id", name = "roleId")
//角色id
@ApiModelProperty(value = "角色id", name = "roleId")
private Long roleId;
//1默认权限，必带权限，0可选权限
@ApiModelProperty(value = "1默认权限，必带权限，0可选权限", name = "type")
//1默认权限，必带权限，不可修改权限，0可选权限
@ApiModelProperty(value = "1默认权限，必带权限，不可修改权限，0可选权限", name = "type")
private Integer type;
/**
*
@ -119,14 +123,14 @@ public class FlowChartRoleReq implements java.io.Serializable {
}
/**
* 必须授权角色id
* 角色id
* @return
*/
public Long getRoleId() {
return roleId;
}
/**
* 必须授权角色id
* 角色id
* @param roleId
*/
public void setRoleId(Long roleId) {
@ -134,14 +138,14 @@ public class FlowChartRoleReq implements java.io.Serializable {
}
/**
* 1默认权限，必带权限，0可选权限
* 1默认权限，必带权限，不可修改权限，0可选权限
* @return
*/
public Integer getType() {
return type;
}
/**
* 1默认权限，必带权限，0可选权限
* 1默认权限，必带权限，不可修改权限，0可选权限
* @param type
*/
public void setType(Integer type) {

10
src/main/java/com/lz/modules/flow/req/FlowStartReq.java
View File

@ -11,7 +11,7 @@ import java.util.Date;
* 菜单权限表
* </p>*发起考核表
* @author quyixiao
* @since 2020-10-13
* @since 2020-10-16
*/
@ -19,9 +19,13 @@ import java.util.Date;
@ApiModel(value = "发起考核表")
public class FlowStartReq implements java.io.Serializable {
private int page = 1;
private int rows = 10;
@ApiModelProperty(value = "currPage", name = "当前页码")
private int currPage = 1;
@ApiModelProperty(value = "pageSize", name = "每页返回条数")
private int pageSize = 10;
@ApiModelProperty(value = "sort", name = "类型")
private String sort;
@ApiModelProperty(value = "order", name = "排序")
private String order;
//
private Long id;

18
src/main/java/com/lz/modules/flow/req/ResultCalculateReq.java
View File

@ -11,7 +11,7 @@ import java.util.Date;
* 菜单权限表
* </p>*模板计算公式
* @author quyixiao
* @since 2020-10-14
* @since 2020-10-16
*/
@ -19,9 +19,13 @@ import java.util.Date;
@ApiModel(value = "模板计算公式")
public class ResultCalculateReq implements java.io.Serializable {
private int page = 1;
private int rows = 10;
@ApiModelProperty(value = "currPage", name = "当前页码")
private int currPage = 1;
@ApiModelProperty(value = "pageSize", name = "每页返回条数")
private int pageSize = 10;
@ApiModelProperty(value = "sort", name = "类型")
private String sort;
@ApiModelProperty(value = "order", name = "排序")
private String order;
//
private Long id;
@ -43,8 +47,8 @@ public class ResultCalculateReq implements java.io.Serializable {
//备注说明
@ApiModelProperty(value = "备注说明", name = "remark")
private String remark;
//业务id，用域区分公式使用地方
@ApiModelProperty(value = "业务id，用域区分公式使用地方", name = "businessId")
//业务id，用于区分公式使用地方
@ApiModelProperty(value = "业务id，用于区分公式使用地方", name = "businessId")
private Long businessId;
/**
*
@ -152,14 +156,14 @@ public class ResultCalculateReq implements java.io.Serializable {
}
/**
* 业务id，用域区分公式使用地方
* 业务id，用于区分公式使用地方
* @return
*/
public Long getBusinessId() {
return businessId;
}
/**
* 业务id，用域区分公式使用地方
* 业务id，用于区分公式使用地方
* @param businessId
*/
public void setBusinessId(Long businessId) {

10
src/main/java/com/lz/modules/flow/req/ResultDimensionReq.java
View File

@ -11,7 +11,7 @@ import java.util.Date;
* 菜单权限表
* </p>*考核维度表
* @author quyixiao
* @since 2020-10-14
* @since 2020-10-16
*/
@ -19,9 +19,13 @@ import java.util.Date;
@ApiModel(value = "考核维度表")
public class ResultDimensionReq implements java.io.Serializable {
private int page = 1;
private int rows = 10;
@ApiModelProperty(value = "currPage", name = "当前页码")
private int currPage = 1;
@ApiModelProperty(value = "pageSize", name = "每页返回条数")
private int pageSize = 10;
@ApiModelProperty(value = "sort", name = "类型")
private String sort;
@ApiModelProperty(value = "order", name = "排序")
private String order;
//
private Long id;

10
src/main/java/com/lz/modules/flow/req/ResultGradeReq.java
View File

@ -13,7 +13,7 @@ import java.util.Date;
* 菜单权限表
* </p>*等级表
* @author quyixiao
* @since 2020-10-14
* @since 2020-10-16
*/
@ -21,9 +21,13 @@ import java.util.Date;
@ApiModel(value = "等级表")
public class ResultGradeReq implements java.io.Serializable {
private int page = 1;
private int rows = 10;
@ApiModelProperty(value = "currPage", name = "当前页码")
private int currPage = 1;
@ApiModelProperty(value = "pageSize", name = "每页返回条数")
private int pageSize = 10;
@ApiModelProperty(value = "sort", name = "类型")
private String sort;
@ApiModelProperty(value = "order", name = "排序")
private String order;
//
private Long id;

10
src/main/java/com/lz/modules/flow/req/ResultModelReq.java
View File

@ -13,7 +13,7 @@ import java.util.Date;
* 菜单权限表
* </p>*考核模板表
* @author quyixiao
* @since 2020-10-14
* @since 2020-10-16
*/
@ -21,9 +21,13 @@ import java.util.Date;
@ApiModel(value = "考核模板表")
public class ResultModelReq implements java.io.Serializable {
private int page = 1;
private int rows = 10;
@ApiModelProperty(value = "currPage", name = "当前页码")
private int currPage = 1;
@ApiModelProperty(value = "pageSize", name = "每页返回条数")
private int pageSize = 10;
@ApiModelProperty(value = "sort", name = "类型")
private String sort;
@ApiModelProperty(value = "order", name = "排序")
private String order;
//
private Long id;

10
src/main/java/com/lz/modules/flow/req/ResultScoreReq.java
View File

@ -13,7 +13,7 @@ import java.util.Date;
* 菜单权限表
* </p>*业绩详情评分表
* @author quyixiao
* @since 2020-10-13
* @since 2020-10-16
*/
@ -21,9 +21,13 @@ import java.util.Date;
@ApiModel(value = "业绩详情评分表")
public class ResultScoreReq implements java.io.Serializable {
private int page = 1;
private int rows = 10;
@ApiModelProperty(value = "currPage", name = "当前页码")
private int currPage = 1;
@ApiModelProperty(value = "pageSize", name = "每页返回条数")
private int pageSize = 10;
@ApiModelProperty(value = "sort", name = "类型")
private String sort;
@ApiModelProperty(value = "order", name = "排序")
private String order;
//
private Long id;

22
src/test/java/com/lz/mysql/MysqlMain.java
View File

@ -44,7 +44,7 @@ public class MysqlMain {
public static String mysql_username = "ldd_biz";
public static String mysql_password = "Hello1234";
public static String dto_exclude = ",is_delete,gmt_create,gmt_modified,";//生成dto时排除字段，前后都要加英文逗号
public static String req_exclude = "";//生成Req时排除字段，前后都要加英文逗号
public static String req_exclude = ",,";//生成Req时排除字段，前后都要加英文逗号
/**
* @param args
@ -66,17 +66,17 @@ public class MysqlMain {
List<TablesBean> list = new ArrayList<TablesBean>();
list.add(new TablesBean("lz_evaluation_group"));
//list.add(new TablesBean("lz_evaluation_start_staff"));
list.add(new TablesBean("lz_evaluation_start_staff"));
list.add(new TablesBean("lz_flow_approval_role"));
//list.add(new TablesBean("lz_flow_change"));
//list.add(new TablesBean("lz_flow_chart"));
//list.add(new TablesBean("lz_flow_chart_role"));
//list.add(new TablesBean("lz_flow_start"));
//list.add(new TablesBean("lz_result_calculate"));
//list.add(new TablesBean("lz_result_dimension"));
//list.add(new TablesBean("lz_result_grade"));
//list.add(new TablesBean("lz_result_model"));
//list.add(new TablesBean("lz_result_score"));
list.add(new TablesBean("lz_flow_change"));
list.add(new TablesBean("lz_flow_chart"));
list.add(new TablesBean("lz_flow_chart_role"));
list.add(new TablesBean("lz_flow_start"));
list.add(new TablesBean("lz_result_calculate"));
list.add(new TablesBean("lz_result_dimension"));
list.add(new TablesBean("lz_result_grade"));
list.add(new TablesBean("lz_result_model"));
list.add(new TablesBean("lz_result_score"));
List<TablesBean> list2 = new ArrayList<TablesBean>();
Map<String, String> map = MysqlUtil2ShowCreateTable.getComments();

8
src/test/java/com/lz/mysql/MysqlUtilTable2Bean.java
View File

@ -31,11 +31,11 @@ public class MysqlUtilTable2Bean {
int i = 0;
bf.append(" \n");
bf.append(" @ApiModelProperty(value = \"page\", name = \"当前页码\")\n");
bf.append(" private int page = 1;\n");
bf.append(" @ApiModelProperty(value = \"currPage\", name = \"当前页码\")\n");
bf.append(" private int currPage = 1;\n");
bf.append(" @ApiModelProperty(value = \"rows\", name = \"每页返回条数\")\n");
bf.append(" private int rows = 10;\n");
bf.append(" @ApiModelProperty(value = \"pageSize\", name = \"每页返回条数\")\n");
bf.append(" private int pageSize = 10;\n");
bf.append(" @ApiModelProperty(value = \"sort\", name = \"类型\")\n");
bf.append(" private String sort;\n");