diff --git a/jshERP-boot/docs/jsh_erp.sql b/jshERP-boot/docs/jsh_erp.sql index 20ebf0d3..820f0174 100644 --- a/jshERP-boot/docs/jsh_erp.sql +++ b/jshERP-boot/docs/jsh_erp.sql @@ -10,7 +10,7 @@ Target Server Type : MYSQL Target Server Version : 50704 File Encoding : 65001 -Date: 2022-10-02 16:27:25 +Date: 2023-02-20 00:10:15 */ SET FOREIGN_KEY_CHECKS=0; @@ -845,6 +845,7 @@ CREATE TABLE `jsh_system_config` ( `customer_flag` varchar(1) DEFAULT '0' COMMENT '客户启用标记,0未启用,1启用', `minus_stock_flag` varchar(1) DEFAULT '0' COMMENT '负库存启用标记,0未启用,1启用', `purchase_by_sale_flag` varchar(1) DEFAULT '0' COMMENT '以销定购启用标记,0未启用,1启用', + `multi_level_approval_flag` varchar(1) DEFAULT '0' COMMENT '多级审核启用标记,0未启用,1启用', `tenant_id` bigint(20) DEFAULT NULL COMMENT '租户id', `delete_flag` varchar(1) DEFAULT '0' COMMENT '删除标记,0未删除,1删除', PRIMARY KEY (`id`) @@ -853,7 +854,7 @@ CREATE TABLE `jsh_system_config` ( -- ---------------------------- -- Records of jsh_system_config -- ---------------------------- -INSERT INTO `jsh_system_config` VALUES ('11', '公司test', '小李', '地址1', '12345678', null, null, '注:本单为我公司与客户约定账期内结款的依据,由客户或其单位员工签字生效,并承担法律责任。', '0', '0', '1', '0', '63', '0'); +INSERT INTO `jsh_system_config` VALUES ('11', '公司test', '小李', '地址1', '12345678', null, null, '注:本单为我公司与客户约定账期内结款的依据,由客户或其单位员工签字生效,并承担法律责任。', '0', '0', '1', '0', '0', '63', '0'); -- ---------------------------- -- Table structure for jsh_tenant @@ -914,6 +915,7 @@ CREATE TABLE `jsh_user` ( `username` varchar(255) NOT NULL COMMENT '用户姓名--例如张三', `login_name` varchar(255) NOT NULL COMMENT '登录用户名', `password` varchar(50) DEFAULT NULL COMMENT '登陆密码', + `leader_flag` varchar(1) DEFAULT '0' COMMENT '是否经理,0否,1是', `position` varchar(200) DEFAULT NULL COMMENT '职位', `department` varchar(255) DEFAULT NULL COMMENT '所属部门', `email` varchar(100) DEFAULT NULL COMMENT '电子邮箱', @@ -930,9 +932,9 @@ CREATE TABLE `jsh_user` ( -- ---------------------------- -- Records of jsh_user -- ---------------------------- -INSERT INTO `jsh_user` VALUES ('63', '测试用户', 'jsh', 'e10adc3949ba59abbe56e057f20f883e', '主管', null, '666666@qq.com', '1123123123132', '1', '1', '0', '', null, '63'); -INSERT INTO `jsh_user` VALUES ('120', '管理员', 'admin', 'e10adc3949ba59abbe56e057f20f883e', null, null, null, null, '1', '0', '0', null, null, '0'); -INSERT INTO `jsh_user` VALUES ('131', 'test123', 'test123', 'e10adc3949ba59abbe56e057f20f883e', '总监', null, '7777777@qq.com', '', '1', '0', '0', '', null, '63'); +INSERT INTO `jsh_user` VALUES ('63', '测试用户', 'jsh', 'e10adc3949ba59abbe56e057f20f883e', '0', '主管', null, '666666@qq.com', '1123123123132', '1', '1', '0', '', null, '63'); +INSERT INTO `jsh_user` VALUES ('120', '管理员', 'admin', 'e10adc3949ba59abbe56e057f20f883e', '0', null, null, null, null, '1', '0', '0', null, null, '0'); +INSERT INTO `jsh_user` VALUES ('131', 'test123', 'test123', 'e10adc3949ba59abbe56e057f20f883e', '0', '总监', null, '7777777@qq.com', '', '1', '0', '0', '', null, '63'); -- ---------------------------- -- Table structure for jsh_user_business diff --git a/jshERP-boot/docs/华夏ERP数据库设计汇总.xlsx b/jshERP-boot/docs/华夏ERP数据库设计汇总.xlsx index b5da8a75..0b9f292a 100644 Binary files a/jshERP-boot/docs/华夏ERP数据库设计汇总.xlsx and b/jshERP-boot/docs/华夏ERP数据库设计汇总.xlsx differ diff --git a/jshERP-boot/docs/数据库更新记录-首次安装请勿使用.txt b/jshERP-boot/docs/数据库更新记录-首次安装请勿使用.txt index a09d1016..a94599d1 100644 --- a/jshERP-boot/docs/数据库更新记录-首次安装请勿使用.txt +++ b/jshERP-boot/docs/数据库更新记录-首次安装请勿使用.txt @@ -1421,4 +1421,13 @@ alter table jsh_depot_item add purchase_unit_price decimal(24,6) DEFAULT NULL CO -- by jishenghua -- 给角色表增加价格屏蔽字段 -- -------------------------------------------------------- -alter table jsh_role add price_limit varchar(50) DEFAULT NULL COMMENT '价格屏蔽 1-屏蔽采购价 2-屏蔽零售价 3-屏蔽销售价' after type; \ No newline at end of file +alter table jsh_role add price_limit varchar(50) DEFAULT NULL COMMENT '价格屏蔽 1-屏蔽采购价 2-屏蔽零售价 3-屏蔽销售价' after type; + +-- -------------------------------------------------------- +-- 时间 2023年02月19日 +-- by jishenghua +-- 给系统参数表增加多级审核开关字段 +-- 给用户表增加是否经理字段,默认为否 +-- -------------------------------------------------------- +alter table jsh_system_config add multi_level_approval_flag varchar(1) DEFAULT '0' COMMENT '多级审核启用标记,0未启用,1启用' after purchase_by_sale_flag; +alter table jsh_user add leader_flag varchar(1) DEFAULT '0' COMMENT '是否经理,0否,1是' after password; \ No newline at end of file diff --git a/jshERP-boot/src/main/java/com/jsh/erp/datasource/entities/SystemConfig.java b/jshERP-boot/src/main/java/com/jsh/erp/datasource/entities/SystemConfig.java index 3d2b1d90..0911f78f 100644 --- a/jshERP-boot/src/main/java/com/jsh/erp/datasource/entities/SystemConfig.java +++ b/jshERP-boot/src/main/java/com/jsh/erp/datasource/entities/SystemConfig.java @@ -25,6 +25,8 @@ public class SystemConfig { private String purchaseBySaleFlag; + private String multiLevelApprovalFlag; + private Long tenantId; private String deleteFlag; @@ -125,6 +127,14 @@ public class SystemConfig { this.purchaseBySaleFlag = purchaseBySaleFlag == null ? null : purchaseBySaleFlag.trim(); } + public String getMultiLevelApprovalFlag() { + return multiLevelApprovalFlag; + } + + public void setMultiLevelApprovalFlag(String multiLevelApprovalFlag) { + this.multiLevelApprovalFlag = multiLevelApprovalFlag == null ? null : multiLevelApprovalFlag.trim(); + } + public Long getTenantId() { return tenantId; } diff --git a/jshERP-boot/src/main/java/com/jsh/erp/datasource/entities/SystemConfigExample.java b/jshERP-boot/src/main/java/com/jsh/erp/datasource/entities/SystemConfigExample.java index b3db4141..10997321 100644 --- a/jshERP-boot/src/main/java/com/jsh/erp/datasource/entities/SystemConfigExample.java +++ b/jshERP-boot/src/main/java/com/jsh/erp/datasource/entities/SystemConfigExample.java @@ -934,6 +934,76 @@ public class SystemConfigExample { return (Criteria) this; } + public Criteria andMultiLevelApprovalFlagIsNull() { + addCriterion("multi_level_approval_flag is null"); + return (Criteria) this; + } + + public Criteria andMultiLevelApprovalFlagIsNotNull() { + addCriterion("multi_level_approval_flag is not null"); + return (Criteria) this; + } + + public Criteria andMultiLevelApprovalFlagEqualTo(String value) { + addCriterion("multi_level_approval_flag =", value, "multiLevelApprovalFlag"); + return (Criteria) this; + } + + public Criteria andMultiLevelApprovalFlagNotEqualTo(String value) { + addCriterion("multi_level_approval_flag <>", value, "multiLevelApprovalFlag"); + return (Criteria) this; + } + + public Criteria andMultiLevelApprovalFlagGreaterThan(String value) { + addCriterion("multi_level_approval_flag >", value, "multiLevelApprovalFlag"); + return (Criteria) this; + } + + public Criteria andMultiLevelApprovalFlagGreaterThanOrEqualTo(String value) { + addCriterion("multi_level_approval_flag >=", value, "multiLevelApprovalFlag"); + return (Criteria) this; + } + + public Criteria andMultiLevelApprovalFlagLessThan(String value) { + addCriterion("multi_level_approval_flag <", value, "multiLevelApprovalFlag"); + return (Criteria) this; + } + + public Criteria andMultiLevelApprovalFlagLessThanOrEqualTo(String value) { + addCriterion("multi_level_approval_flag <=", value, "multiLevelApprovalFlag"); + return (Criteria) this; + } + + public Criteria andMultiLevelApprovalFlagLike(String value) { + addCriterion("multi_level_approval_flag like", value, "multiLevelApprovalFlag"); + return (Criteria) this; + } + + public Criteria andMultiLevelApprovalFlagNotLike(String value) { + addCriterion("multi_level_approval_flag not like", value, "multiLevelApprovalFlag"); + return (Criteria) this; + } + + public Criteria andMultiLevelApprovalFlagIn(List values) { + addCriterion("multi_level_approval_flag in", values, "multiLevelApprovalFlag"); + return (Criteria) this; + } + + public Criteria andMultiLevelApprovalFlagNotIn(List values) { + addCriterion("multi_level_approval_flag not in", values, "multiLevelApprovalFlag"); + return (Criteria) this; + } + + public Criteria andMultiLevelApprovalFlagBetween(String value1, String value2) { + addCriterion("multi_level_approval_flag between", value1, value2, "multiLevelApprovalFlag"); + return (Criteria) this; + } + + public Criteria andMultiLevelApprovalFlagNotBetween(String value1, String value2) { + addCriterion("multi_level_approval_flag not between", value1, value2, "multiLevelApprovalFlag"); + return (Criteria) this; + } + public Criteria andTenantIdIsNull() { addCriterion("tenant_id is null"); return (Criteria) this; diff --git a/jshERP-boot/src/main/java/com/jsh/erp/datasource/entities/User.java b/jshERP-boot/src/main/java/com/jsh/erp/datasource/entities/User.java index 9b31979a..bf2dceaf 100644 --- a/jshERP-boot/src/main/java/com/jsh/erp/datasource/entities/User.java +++ b/jshERP-boot/src/main/java/com/jsh/erp/datasource/entities/User.java @@ -9,6 +9,8 @@ public class User { private String password; + private String leaderFlag; + private String position; private String department; @@ -61,6 +63,14 @@ public class User { this.password = password == null ? null : password.trim(); } + public String getLeaderFlag() { + return leaderFlag; + } + + public void setLeaderFlag(String leaderFlag) { + this.leaderFlag = leaderFlag == null ? null : leaderFlag.trim(); + } + public String getPosition() { return position; } diff --git a/jshERP-boot/src/main/java/com/jsh/erp/datasource/entities/UserExample.java b/jshERP-boot/src/main/java/com/jsh/erp/datasource/entities/UserExample.java index c7acb7cc..71a1fbaf 100644 --- a/jshERP-boot/src/main/java/com/jsh/erp/datasource/entities/UserExample.java +++ b/jshERP-boot/src/main/java/com/jsh/erp/datasource/entities/UserExample.java @@ -374,6 +374,76 @@ public class UserExample { return (Criteria) this; } + public Criteria andLeaderFlagIsNull() { + addCriterion("leader_flag is null"); + return (Criteria) this; + } + + public Criteria andLeaderFlagIsNotNull() { + addCriterion("leader_flag is not null"); + return (Criteria) this; + } + + public Criteria andLeaderFlagEqualTo(String value) { + addCriterion("leader_flag =", value, "leaderFlag"); + return (Criteria) this; + } + + public Criteria andLeaderFlagNotEqualTo(String value) { + addCriterion("leader_flag <>", value, "leaderFlag"); + return (Criteria) this; + } + + public Criteria andLeaderFlagGreaterThan(String value) { + addCriterion("leader_flag >", value, "leaderFlag"); + return (Criteria) this; + } + + public Criteria andLeaderFlagGreaterThanOrEqualTo(String value) { + addCriterion("leader_flag >=", value, "leaderFlag"); + return (Criteria) this; + } + + public Criteria andLeaderFlagLessThan(String value) { + addCriterion("leader_flag <", value, "leaderFlag"); + return (Criteria) this; + } + + public Criteria andLeaderFlagLessThanOrEqualTo(String value) { + addCriterion("leader_flag <=", value, "leaderFlag"); + return (Criteria) this; + } + + public Criteria andLeaderFlagLike(String value) { + addCriterion("leader_flag like", value, "leaderFlag"); + return (Criteria) this; + } + + public Criteria andLeaderFlagNotLike(String value) { + addCriterion("leader_flag not like", value, "leaderFlag"); + return (Criteria) this; + } + + public Criteria andLeaderFlagIn(List values) { + addCriterion("leader_flag in", values, "leaderFlag"); + return (Criteria) this; + } + + public Criteria andLeaderFlagNotIn(List values) { + addCriterion("leader_flag not in", values, "leaderFlag"); + return (Criteria) this; + } + + public Criteria andLeaderFlagBetween(String value1, String value2) { + addCriterion("leader_flag between", value1, value2, "leaderFlag"); + return (Criteria) this; + } + + public Criteria andLeaderFlagNotBetween(String value1, String value2) { + addCriterion("leader_flag not between", value1, value2, "leaderFlag"); + return (Criteria) this; + } + public Criteria andPositionIsNull() { addCriterion("position is null"); return (Criteria) this; diff --git a/jshERP-boot/src/main/resources/mapper_xml/SystemConfigMapper.xml b/jshERP-boot/src/main/resources/mapper_xml/SystemConfigMapper.xml index f1ab1245..90f044b5 100644 --- a/jshERP-boot/src/main/resources/mapper_xml/SystemConfigMapper.xml +++ b/jshERP-boot/src/main/resources/mapper_xml/SystemConfigMapper.xml @@ -14,6 +14,7 @@ + @@ -78,7 +79,7 @@ id, company_name, company_contacts, company_address, company_tel, company_fax, company_post_code, sale_agreement, depot_flag, customer_flag, minus_stock_flag, purchase_by_sale_flag, - tenant_id, delete_flag + multi_level_approval_flag, tenant_id, delete_flag select @@ -111,15 +112,17 @@ insert into jsh_user (id, username, login_name, - password, position, department, - email, phonenum, ismanager, - isystem, Status, description, - remark, tenant_id) + password, leader_flag, position, + department, email, phonenum, + ismanager, isystem, Status, + description, remark, tenant_id + ) values (#{id,jdbcType=BIGINT}, #{username,jdbcType=VARCHAR}, #{loginName,jdbcType=VARCHAR}, - #{password,jdbcType=VARCHAR}, #{position,jdbcType=VARCHAR}, #{department,jdbcType=VARCHAR}, - #{email,jdbcType=VARCHAR}, #{phonenum,jdbcType=VARCHAR}, #{ismanager,jdbcType=TINYINT}, - #{isystem,jdbcType=TINYINT}, #{status,jdbcType=TINYINT}, #{description,jdbcType=VARCHAR}, - #{remark,jdbcType=VARCHAR}, #{tenantId,jdbcType=BIGINT}) + #{password,jdbcType=VARCHAR}, #{leaderFlag,jdbcType=VARCHAR}, #{position,jdbcType=VARCHAR}, + #{department,jdbcType=VARCHAR}, #{email,jdbcType=VARCHAR}, #{phonenum,jdbcType=VARCHAR}, + #{ismanager,jdbcType=TINYINT}, #{isystem,jdbcType=TINYINT}, #{status,jdbcType=TINYINT}, + #{description,jdbcType=VARCHAR}, #{remark,jdbcType=VARCHAR}, #{tenantId,jdbcType=BIGINT} + ) insert into jsh_user @@ -136,6 +139,9 @@ password, + + leader_flag, + position, @@ -180,6 +186,9 @@ #{password,jdbcType=VARCHAR}, + + #{leaderFlag,jdbcType=VARCHAR}, + #{position,jdbcType=VARCHAR}, @@ -233,6 +242,9 @@ password = #{record.password,jdbcType=VARCHAR}, + + leader_flag = #{record.leaderFlag,jdbcType=VARCHAR}, + position = #{record.position,jdbcType=VARCHAR}, @@ -274,6 +286,7 @@ username = #{record.username,jdbcType=VARCHAR}, login_name = #{record.loginName,jdbcType=VARCHAR}, password = #{record.password,jdbcType=VARCHAR}, + leader_flag = #{record.leaderFlag,jdbcType=VARCHAR}, position = #{record.position,jdbcType=VARCHAR}, department = #{record.department,jdbcType=VARCHAR}, email = #{record.email,jdbcType=VARCHAR}, @@ -300,6 +313,9 @@ password = #{password,jdbcType=VARCHAR}, + + leader_flag = #{leaderFlag,jdbcType=VARCHAR}, + position = #{position,jdbcType=VARCHAR}, @@ -338,6 +354,7 @@ set username = #{username,jdbcType=VARCHAR}, login_name = #{loginName,jdbcType=VARCHAR}, password = #{password,jdbcType=VARCHAR}, + leader_flag = #{leaderFlag,jdbcType=VARCHAR}, position = #{position,jdbcType=VARCHAR}, department = #{department,jdbcType=VARCHAR}, email = #{email,jdbcType=VARCHAR},