gyzz/openerp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

给系统参数表增加多级审核开关字段，给用户表增加是否经理字段，默认为否

Browse Source
This commit is contained in:
季圣华 2023-02-20 00:14:34 +08:00
parent 5df9d972ce
commit 8b6afb1759
9 changed files with 224 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
jshERP-boot/docs/jsh_erp.sql
View File

@ -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

BIN
jshERP-boot/docs/华夏ERP数据库设计汇总.xlsx
View File

Binary file not shown.

11
jshERP-boot/docs/数据库更新记录-首次安装请勿使用.txt
View File

@ -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;
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;

10
jshERP-boot/src/main/java/com/jsh/erp/datasource/entities/SystemConfig.java
View File

@ -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;
}

70
jshERP-boot/src/main/java/com/jsh/erp/datasource/entities/SystemConfigExample.java
View File

@ -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<String> values) {
addCriterion("multi_level_approval_flag in", values, "multiLevelApprovalFlag");
return (Criteria) this;
}
public Criteria andMultiLevelApprovalFlagNotIn(List<String> 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;

10
jshERP-boot/src/main/java/com/jsh/erp/datasource/entities/User.java
View File

@ -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;
}

70
jshERP-boot/src/main/java/com/jsh/erp/datasource/entities/UserExample.java
View File

@ -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<String> values) {
addCriterion("leader_flag in", values, "leaderFlag");
return (Criteria) this;
}
public Criteria andLeaderFlagNotIn(List<String> 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;

23
jshERP-boot/src/main/resources/mapper_xml/SystemConfigMapper.xml
View File

@ -14,6 +14,7 @@
<result column="customer_flag" jdbcType="VARCHAR" property="customerFlag" />
<result column="minus_stock_flag" jdbcType="VARCHAR" property="minusStockFlag" />
<result column="purchase_by_sale_flag" jdbcType="VARCHAR" property="purchaseBySaleFlag" />
<result column="multi_level_approval_flag" jdbcType="VARCHAR" property="multiLevelApprovalFlag" />
<result column="tenant_id" jdbcType="BIGINT" property="tenantId" />
<result column="delete_flag" jdbcType="VARCHAR" property="deleteFlag" />
</resultMap>
@ -78,7 +79,7 @@
<sql id="Base_Column_List">
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
</sql>
<select id="selectByExample" parameterType="com.jsh.erp.datasource.entities.SystemConfigExample" resultMap="BaseResultMap">
select
@ -115,12 +116,14 @@
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
)
values (#{id,jdbcType=BIGINT}, #{companyName,jdbcType=VARCHAR}, #{companyContacts,jdbcType=VARCHAR},
#{companyAddress,jdbcType=VARCHAR}, #{companyTel,jdbcType=VARCHAR}, #{companyFax,jdbcType=VARCHAR},
#{companyPostCode,jdbcType=VARCHAR}, #{saleAgreement,jdbcType=VARCHAR}, #{depotFlag,jdbcType=VARCHAR},
#{customerFlag,jdbcType=VARCHAR}, #{minusStockFlag,jdbcType=VARCHAR}, #{purchaseBySaleFlag,jdbcType=VARCHAR},
#{tenantId,jdbcType=BIGINT}, #{deleteFlag,jdbcType=VARCHAR})
#{multiLevelApprovalFlag,jdbcType=VARCHAR}, #{tenantId,jdbcType=BIGINT}, #{deleteFlag,jdbcType=VARCHAR}
)
</insert>
<insert id="insertSelective" parameterType="com.jsh.erp.datasource.entities.SystemConfig">
insert into jsh_system_config
@ -161,6 +164,9 @@
<if test="purchaseBySaleFlag != null">
purchase_by_sale_flag,
</if>
<if test="multiLevelApprovalFlag != null">
multi_level_approval_flag,
</if>
<if test="tenantId != null">
tenant_id,
</if>
@ -205,6 +211,9 @@
<if test="purchaseBySaleFlag != null">
#{purchaseBySaleFlag,jdbcType=VARCHAR},
</if>
<if test="multiLevelApprovalFlag != null">
#{multiLevelApprovalFlag,jdbcType=VARCHAR},
</if>
<if test="tenantId != null">
#{tenantId,jdbcType=BIGINT},
</if>
@ -258,6 +267,9 @@
<if test="record.purchaseBySaleFlag != null">
purchase_by_sale_flag = #{record.purchaseBySaleFlag,jdbcType=VARCHAR},
</if>
<if test="record.multiLevelApprovalFlag != null">
multi_level_approval_flag = #{record.multiLevelApprovalFlag,jdbcType=VARCHAR},
</if>
<if test="record.tenantId != null">
tenant_id = #{record.tenantId,jdbcType=BIGINT},
</if>
@ -283,6 +295,7 @@
customer_flag = #{record.customerFlag,jdbcType=VARCHAR},
minus_stock_flag = #{record.minusStockFlag,jdbcType=VARCHAR},
purchase_by_sale_flag = #{record.purchaseBySaleFlag,jdbcType=VARCHAR},
multi_level_approval_flag = #{record.multiLevelApprovalFlag,jdbcType=VARCHAR},
tenant_id = #{record.tenantId,jdbcType=BIGINT},
delete_flag = #{record.deleteFlag,jdbcType=VARCHAR}
<if test="_parameter != null">
@ -325,6 +338,9 @@
<if test="purchaseBySaleFlag != null">
purchase_by_sale_flag = #{purchaseBySaleFlag,jdbcType=VARCHAR},
</if>
<if test="multiLevelApprovalFlag != null">
multi_level_approval_flag = #{multiLevelApprovalFlag,jdbcType=VARCHAR},
</if>
<if test="tenantId != null">
tenant_id = #{tenantId,jdbcType=BIGINT},
</if>
@ -347,6 +363,7 @@
customer_flag = #{customerFlag,jdbcType=VARCHAR},
minus_stock_flag = #{minusStockFlag,jdbcType=VARCHAR},
purchase_by_sale_flag = #{purchaseBySaleFlag,jdbcType=VARCHAR},
multi_level_approval_flag = #{multiLevelApprovalFlag,jdbcType=VARCHAR},
tenant_id = #{tenantId,jdbcType=BIGINT},
delete_flag = #{deleteFlag,jdbcType=VARCHAR}
where id = #{id,jdbcType=BIGINT}

37
jshERP-boot/src/main/resources/mapper_xml/UserMapper.xml
View File

@ -6,6 +6,7 @@
<result column="username" jdbcType="VARCHAR" property="username" />
<result column="login_name" jdbcType="VARCHAR" property="loginName" />
<result column="password" jdbcType="VARCHAR" property="password" />
<result column="leader_flag" jdbcType="VARCHAR" property="leaderFlag" />
<result column="position" jdbcType="VARCHAR" property="position" />
<result column="department" jdbcType="VARCHAR" property="department" />
<result column="email" jdbcType="VARCHAR" property="email" />
@ -76,8 +77,8 @@
</where>
</sql>
<sql id="Base_Column_List">
id, username, login_name, password, position, department, email, phonenum, ismanager,
isystem, Status, description, remark, tenant_id
id, username, login_name, password, leader_flag, position, department, email, phonenum,
ismanager, isystem, Status, description, remark, tenant_id
</sql>
<select id="selectByExample" parameterType="com.jsh.erp.datasource.entities.UserExample" resultMap="BaseResultMap">
select
@ -111,15 +112,17 @@
</delete>
<insert id="insert" parameterType="com.jsh.erp.datasource.entities.User">
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>
<insert id="insertSelective" parameterType="com.jsh.erp.datasource.entities.User">
insert into jsh_user
@ -136,6 +139,9 @@
<if test="password != null">
password,
</if>
<if test="leaderFlag != null">
leader_flag,
</if>
<if test="position != null">
position,
</if>
@ -180,6 +186,9 @@
<if test="password != null">
#{password,jdbcType=VARCHAR},
</if>
<if test="leaderFlag != null">
#{leaderFlag,jdbcType=VARCHAR},
</if>
<if test="position != null">
#{position,jdbcType=VARCHAR},
</if>
@ -233,6 +242,9 @@
<if test="record.password != null">
password = #{record.password,jdbcType=VARCHAR},
</if>
<if test="record.leaderFlag != null">
leader_flag = #{record.leaderFlag,jdbcType=VARCHAR},
</if>
<if test="record.position != null">
position = #{record.position,jdbcType=VARCHAR},
</if>
@ -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 @@
<if test="password != null">
password = #{password,jdbcType=VARCHAR},
</if>
<if test="leaderFlag != null">
leader_flag = #{leaderFlag,jdbcType=VARCHAR},
</if>
<if test="position != null">
position = #{position,jdbcType=VARCHAR},
</if>
@ -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},