Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
jinli gu
JSH ERP
Commits
5a1d4bf5
"jetbrains:/idea/checkout/git" did not exist on "0a255015b2826ce69e40d5190f0cf039b7986bbb"
Commit
5a1d4bf5
authored
Aug 26, 2022
by
季圣华
Browse files
给部分表增加启用状态和排序字段
parent
fb79e174
Changes
25
Show whitespace changes
Inline
Side-by-side
jshERP-boot/docs/jsh_erp.sql
View file @
5a1d4bf5
...
...
@@ -10,7 +10,7 @@ Target Server Type : MYSQL
Target Server Version : 50704
File Encoding : 65001
Date: 202
1-12-12 23:29
:1
7
Date: 202
2-08-26 00:10
:1
5
*/
SET
FOREIGN_KEY_CHECKS
=
0
;
...
...
@@ -26,6 +26,8 @@ CREATE TABLE `jsh_account` (
`initial_amount`
decimal
(
24
,
6
)
DEFAULT
NULL
COMMENT
'期初金额'
,
`current_amount`
decimal
(
24
,
6
)
DEFAULT
NULL
COMMENT
'当前余额'
,
`remark`
varchar
(
100
)
DEFAULT
NULL
COMMENT
'备注'
,
`enabled`
bit
(
1
)
DEFAULT
NULL
COMMENT
'启用'
,
`sort`
varchar
(
10
)
DEFAULT
NULL
COMMENT
'排序'
,
`is_default`
bit
(
1
)
DEFAULT
NULL
COMMENT
'是否默认'
,
`tenant_id`
bigint
(
20
)
DEFAULT
NULL
COMMENT
'租户id'
,
`delete_flag`
varchar
(
1
)
DEFAULT
'0'
COMMENT
'删除标记,0未删除,1删除'
,
...
...
@@ -35,8 +37,8 @@ CREATE TABLE `jsh_account` (
-- ----------------------------
-- Records of jsh_account
-- ----------------------------
INSERT
INTO
`jsh_account`
VALUES
(
'17'
,
'账户1'
,
'zzz111'
,
'100.000000'
,
'829.000000'
,
'aabb'
,
''
,
'63'
,
'0'
);
INSERT
INTO
`jsh_account`
VALUES
(
'18'
,
'账户2'
,
'1234131324'
,
'200.000000'
,
'-1681.000000'
,
'bbbb'
,
'
\0
'
,
'63'
,
'0'
);
INSERT
INTO
`jsh_account`
VALUES
(
'17'
,
'账户1'
,
'zzz111'
,
'100.000000'
,
'829.000000'
,
'aabb'
,
''
,
null
,
''
,
'63'
,
'0'
);
INSERT
INTO
`jsh_account`
VALUES
(
'18'
,
'账户2'
,
'1234131324'
,
'200.000000'
,
'-1681.000000'
,
'bbbb'
,
''
,
null
,
'
\0
'
,
'63'
,
'0'
);
-- ----------------------------
-- Table structure for jsh_account_head
...
...
@@ -121,6 +123,7 @@ CREATE TABLE `jsh_depot` (
`sort`
varchar
(
10
)
DEFAULT
NULL
COMMENT
'排序'
,
`remark`
varchar
(
100
)
DEFAULT
NULL
COMMENT
'描述'
,
`principal`
bigint
(
20
)
DEFAULT
NULL
COMMENT
'负责人'
,
`enabled`
bit
(
1
)
DEFAULT
NULL
COMMENT
'启用'
,
`tenant_id`
bigint
(
20
)
DEFAULT
NULL
COMMENT
'租户id'
,
`delete_Flag`
varchar
(
1
)
DEFAULT
'0'
COMMENT
'删除标记,0未删除,1删除'
,
`is_default`
bit
(
1
)
DEFAULT
NULL
COMMENT
'是否默认'
,
...
...
@@ -130,9 +133,9 @@ CREATE TABLE `jsh_depot` (
-- ----------------------------
-- Records of jsh_depot
-- ----------------------------
INSERT
INTO
`jsh_depot`
VALUES
(
'14'
,
'仓库1'
,
'dizhi'
,
'12.000000'
,
'12.000000'
,
'0'
,
'1'
,
'描述'
,
'131'
,
'63'
,
'0'
,
''
);
INSERT
INTO
`jsh_depot`
VALUES
(
'15'
,
'仓库2'
,
'地址100'
,
'555.000000'
,
'666.000000'
,
'0'
,
'2'
,
'dfdf'
,
'131'
,
'63'
,
'0'
,
'
\0
'
);
INSERT
INTO
`jsh_depot`
VALUES
(
'17'
,
'仓库3'
,
'123123'
,
'123.000000'
,
'123.000000'
,
'0'
,
'3'
,
'123'
,
'131'
,
'63'
,
'0'
,
'
\0
'
);
INSERT
INTO
`jsh_depot`
VALUES
(
'14'
,
'仓库1'
,
'dizhi'
,
'12.000000'
,
'12.000000'
,
'0'
,
'1'
,
'描述'
,
'131'
,
''
,
'63'
,
'0'
,
''
);
INSERT
INTO
`jsh_depot`
VALUES
(
'15'
,
'仓库2'
,
'地址100'
,
'555.000000'
,
'666.000000'
,
'0'
,
'2'
,
'dfdf'
,
'131'
,
''
,
'63'
,
'0'
,
'
\0
'
);
INSERT
INTO
`jsh_depot`
VALUES
(
'17'
,
'仓库3'
,
'123123'
,
'123.000000'
,
'123.000000'
,
'0'
,
'3'
,
'123'
,
'131'
,
''
,
'63'
,
'0'
,
'
\0
'
);
-- ----------------------------
-- Table structure for jsh_depot_head
...
...
@@ -349,6 +352,8 @@ CREATE TABLE `jsh_in_out_item` (
`name`
varchar
(
50
)
DEFAULT
NULL
COMMENT
'名称'
,
`type`
varchar
(
20
)
DEFAULT
NULL
COMMENT
'类型'
,
`remark`
varchar
(
100
)
DEFAULT
NULL
COMMENT
'备注'
,
`enabled`
bit
(
1
)
DEFAULT
NULL
COMMENT
'启用'
,
`sort`
varchar
(
10
)
DEFAULT
NULL
COMMENT
'排序'
,
`tenant_id`
bigint
(
20
)
DEFAULT
NULL
COMMENT
'租户id'
,
`delete_flag`
varchar
(
1
)
DEFAULT
'0'
COMMENT
'删除标记,0未删除,1删除'
,
PRIMARY
KEY
(
`id`
)
...
...
@@ -357,9 +362,9 @@ CREATE TABLE `jsh_in_out_item` (
-- ----------------------------
-- Records of jsh_in_out_item
-- ----------------------------
INSERT
INTO
`jsh_in_out_item`
VALUES
(
'21'
,
'快递费'
,
'支出'
,
''
,
'63'
,
'0'
);
INSERT
INTO
`jsh_in_out_item`
VALUES
(
'22'
,
'房租收入'
,
'收入'
,
''
,
'63'
,
'0'
);
INSERT
INTO
`jsh_in_out_item`
VALUES
(
'23'
,
'利息收入'
,
'收入'
,
'收入'
,
'63'
,
'0'
);
INSERT
INTO
`jsh_in_out_item`
VALUES
(
'21'
,
'快递费'
,
'支出'
,
''
,
''
,
null
,
'63'
,
'0'
);
INSERT
INTO
`jsh_in_out_item`
VALUES
(
'22'
,
'房租收入'
,
'收入'
,
''
,
''
,
null
,
'63'
,
'0'
);
INSERT
INTO
`jsh_in_out_item`
VALUES
(
'23'
,
'利息收入'
,
'收入'
,
'收入'
,
''
,
null
,
'63'
,
'0'
);
-- ----------------------------
-- Table structure for jsh_log
...
...
@@ -667,6 +672,8 @@ CREATE TABLE `jsh_person` (
`id`
bigint
(
20
)
NOT
NULL
AUTO_INCREMENT
COMMENT
'主键'
,
`type`
varchar
(
20
)
DEFAULT
NULL
COMMENT
'类型'
,
`name`
varchar
(
50
)
DEFAULT
NULL
COMMENT
'姓名'
,
`enabled`
bit
(
1
)
DEFAULT
NULL
COMMENT
'启用'
,
`sort`
varchar
(
10
)
DEFAULT
NULL
COMMENT
'排序'
,
`tenant_id`
bigint
(
20
)
DEFAULT
NULL
COMMENT
'租户id'
,
`delete_flag`
varchar
(
1
)
DEFAULT
'0'
COMMENT
'删除标记,0未删除,1删除'
,
PRIMARY
KEY
(
`id`
)
...
...
@@ -675,10 +682,10 @@ CREATE TABLE `jsh_person` (
-- ----------------------------
-- Records of jsh_person
-- ----------------------------
INSERT
INTO
`jsh_person`
VALUES
(
'14'
,
'业务员'
,
'小李'
,
'63'
,
'0'
);
INSERT
INTO
`jsh_person`
VALUES
(
'15'
,
'仓管员'
,
'小军'
,
'63'
,
'0'
);
INSERT
INTO
`jsh_person`
VALUES
(
'16'
,
'财务员'
,
'小夏'
,
'63'
,
'0'
);
INSERT
INTO
`jsh_person`
VALUES
(
'17'
,
'财务员'
,
'小曹'
,
'63'
,
'0'
);
INSERT
INTO
`jsh_person`
VALUES
(
'14'
,
'业务员'
,
'小李'
,
''
,
null
,
'63'
,
'0'
);
INSERT
INTO
`jsh_person`
VALUES
(
'15'
,
'仓管员'
,
'小军'
,
''
,
null
,
'63'
,
'0'
);
INSERT
INTO
`jsh_person`
VALUES
(
'16'
,
'财务员'
,
'小夏'
,
''
,
null
,
'63'
,
'0'
);
INSERT
INTO
`jsh_person`
VALUES
(
'17'
,
'财务员'
,
'小曹'
,
''
,
null
,
'63'
,
'0'
);
-- ----------------------------
-- Table structure for jsh_platform_config
...
...
@@ -690,7 +697,7 @@ CREATE TABLE `jsh_platform_config` (
`platform_key_info`
varchar
(
100
)
DEFAULT
NULL
COMMENT
'关键词名称'
,
`platform_value`
varchar
(
200
)
DEFAULT
NULL
COMMENT
'值'
,
PRIMARY
KEY
(
`id`
)
)
ENGINE
=
InnoDB
AUTO_INCREMENT
=
8
DEFAULT
CHARSET
=
utf8
COMMENT
=
'平台参数'
;
)
ENGINE
=
InnoDB
AUTO_INCREMENT
=
9
DEFAULT
CHARSET
=
utf8
COMMENT
=
'平台参数'
;
-- ----------------------------
-- Records of jsh_platform_config
...
...
@@ -714,6 +721,8 @@ CREATE TABLE `jsh_role` (
`type`
varchar
(
50
)
DEFAULT
NULL
COMMENT
'类型'
,
`value`
varchar
(
200
)
DEFAULT
NULL
COMMENT
'值'
,
`description`
varchar
(
100
)
DEFAULT
NULL
COMMENT
'描述'
,
`enabled`
bit
(
1
)
DEFAULT
NULL
COMMENT
'启用'
,
`sort`
varchar
(
10
)
DEFAULT
NULL
COMMENT
'排序'
,
`tenant_id`
bigint
(
20
)
DEFAULT
NULL
COMMENT
'租户id'
,
`delete_flag`
varchar
(
1
)
DEFAULT
'0'
COMMENT
'删除标记,0未删除,1删除'
,
PRIMARY
KEY
(
`id`
)
...
...
@@ -722,10 +731,10 @@ CREATE TABLE `jsh_role` (
-- ----------------------------
-- Records of jsh_role
-- ----------------------------
INSERT
INTO
`jsh_role`
VALUES
(
'4'
,
'管理员'
,
'全部数据'
,
null
,
null
,
null
,
'0'
);
INSERT
INTO
`jsh_role`
VALUES
(
'10'
,
'租户'
,
'全部数据'
,
null
,
''
,
null
,
'0'
);
INSERT
INTO
`jsh_role`
VALUES
(
'16'
,
'销售经理'
,
'全部数据'
,
null
,
'ddd'
,
'63'
,
'0'
);
INSERT
INTO
`jsh_role`
VALUES
(
'17'
,
'销售代表'
,
'个人数据'
,
null
,
'rrr'
,
'63'
,
'0'
);
INSERT
INTO
`jsh_role`
VALUES
(
'4'
,
'管理员'
,
'全部数据'
,
null
,
null
,
''
,
null
,
null
,
'0'
);
INSERT
INTO
`jsh_role`
VALUES
(
'10'
,
'租户'
,
'全部数据'
,
null
,
''
,
''
,
null
,
null
,
'0'
);
INSERT
INTO
`jsh_role`
VALUES
(
'16'
,
'销售经理'
,
'全部数据'
,
null
,
'ddd'
,
''
,
null
,
'63'
,
'0'
);
INSERT
INTO
`jsh_role`
VALUES
(
'17'
,
'销售代表'
,
'个人数据'
,
null
,
'rrr'
,
''
,
null
,
'63'
,
'0'
);
-- ----------------------------
-- Table structure for jsh_sequence
...
...
@@ -801,6 +810,7 @@ CREATE TABLE `jsh_supplier` (
`bank_name`
varchar
(
50
)
DEFAULT
NULL
COMMENT
'开户行'
,
`account_number`
varchar
(
50
)
DEFAULT
NULL
COMMENT
'账号'
,
`tax_rate`
decimal
(
24
,
6
)
DEFAULT
NULL
COMMENT
'税率'
,
`sort`
varchar
(
10
)
DEFAULT
NULL
COMMENT
'排序'
,
`tenant_id`
bigint
(
20
)
DEFAULT
NULL
COMMENT
'租户id'
,
`delete_flag`
varchar
(
1
)
DEFAULT
'0'
COMMENT
'删除标记,0未删除,1删除'
,
PRIMARY
KEY
(
`id`
)
...
...
@@ -809,13 +819,13 @@ CREATE TABLE `jsh_supplier` (
-- ----------------------------
-- Records of jsh_supplier
-- ----------------------------
INSERT
INTO
`jsh_supplier`
VALUES
(
'57'
,
'供应商1'
,
'小军'
,
'12345678'
,
''
,
''
,
null
,
'供应商'
,
''
,
'0.000000'
,
'0.000000'
,
'0.000000'
,
'0.000000'
,
'4.000000'
,
''
,
'15000000000'
,
'地址1'
,
''
,
''
,
''
,
'12.000000'
,
'63'
,
'0'
);
INSERT
INTO
`jsh_supplier`
VALUES
(
'58'
,
'客户1'
,
'小李'
,
'12345678'
,
''
,
''
,
null
,
'客户'
,
''
,
'0.000000'
,
'0.000000'
,
'0.000000'
,
'-100.000000'
,
null
,
''
,
''
,
''
,
''
,
''
,
''
,
'12.000000'
,
'63'
,
'0'
);
INSERT
INTO
`jsh_supplier`
VALUES
(
'59'
,
'客户2'
,
'小陈'
,
''
,
''
,
''
,
null
,
'客户'
,
''
,
'0.000000'
,
'0.000000'
,
'0.000000'
,
'0.000000'
,
null
,
''
,
''
,
''
,
''
,
''
,
''
,
null
,
'63'
,
'0'
);
INSERT
INTO
`jsh_supplier`
VALUES
(
'60'
,
'12312666'
,
'小曹'
,
''
,
''
,
''
,
null
,
'会员'
,
''
,
'970.000000'
,
'0.000000'
,
'0.000000'
,
null
,
null
,
''
,
'13000000000'
,
''
,
''
,
''
,
''
,
null
,
'63'
,
'0'
);
INSERT
INTO
`jsh_supplier`
VALUES
(
'68'
,
'供应商3'
,
'晓丽'
,
'12345678'
,
''
,
'fasdfadf'
,
null
,
'供应商'
,
''
,
'0.000000'
,
'0.000000'
,
'0.000000'
,
'0.000000'
,
'-35.000000'
,
''
,
'13000000000'
,
'aaaa'
,
'1341324'
,
''
,
''
,
'13.000000'
,
'63'
,
'0'
);
INSERT
INTO
`jsh_supplier`
VALUES
(
'71'
,
'客户3'
,
'小周'
,
''
,
''
,
''
,
null
,
'客户'
,
''
,
'0.000000'
,
'0.000000'
,
'0.000000'
,
'0.000000'
,
null
,
''
,
''
,
''
,
''
,
''
,
''
,
null
,
'63'
,
'0'
);
INSERT
INTO
`jsh_supplier`
VALUES
(
'74'
,
'供应商5'
,
'小季'
,
'77779999'
,
''
,
''
,
null
,
'供应商'
,
''
,
'0.000000'
,
'0.000000'
,
'5.000000'
,
'0.000000'
,
'5.000000'
,
''
,
'15806283912'
,
''
,
''
,
''
,
''
,
'3.000000'
,
'63'
,
'0'
);
INSERT
INTO
`jsh_supplier`
VALUES
(
'57'
,
'供应商1'
,
'小军'
,
'12345678'
,
''
,
''
,
null
,
'供应商'
,
''
,
'0.000000'
,
'0.000000'
,
'0.000000'
,
'0.000000'
,
'4.000000'
,
''
,
'15000000000'
,
'地址1'
,
''
,
''
,
''
,
'12.000000'
,
null
,
'63'
,
'0'
);
INSERT
INTO
`jsh_supplier`
VALUES
(
'58'
,
'客户1'
,
'小李'
,
'12345678'
,
''
,
''
,
null
,
'客户'
,
''
,
'0.000000'
,
'0.000000'
,
'0.000000'
,
'-100.000000'
,
null
,
''
,
''
,
''
,
''
,
''
,
''
,
'12.000000'
,
null
,
'63'
,
'0'
);
INSERT
INTO
`jsh_supplier`
VALUES
(
'59'
,
'客户2'
,
'小陈'
,
''
,
''
,
''
,
null
,
'客户'
,
''
,
'0.000000'
,
'0.000000'
,
'0.000000'
,
'0.000000'
,
null
,
''
,
''
,
''
,
''
,
''
,
''
,
null
,
null
,
'63'
,
'0'
);
INSERT
INTO
`jsh_supplier`
VALUES
(
'60'
,
'12312666'
,
'小曹'
,
''
,
''
,
''
,
null
,
'会员'
,
''
,
'970.000000'
,
'0.000000'
,
'0.000000'
,
null
,
null
,
''
,
'13000000000'
,
''
,
''
,
''
,
''
,
null
,
null
,
'63'
,
'0'
);
INSERT
INTO
`jsh_supplier`
VALUES
(
'68'
,
'供应商3'
,
'晓丽'
,
'12345678'
,
''
,
'fasdfadf'
,
null
,
'供应商'
,
''
,
'0.000000'
,
'0.000000'
,
'0.000000'
,
'0.000000'
,
'-35.000000'
,
''
,
'13000000000'
,
'aaaa'
,
'1341324'
,
''
,
''
,
'13.000000'
,
null
,
'63'
,
'0'
);
INSERT
INTO
`jsh_supplier`
VALUES
(
'71'
,
'客户3'
,
'小周'
,
''
,
''
,
''
,
null
,
'客户'
,
''
,
'0.000000'
,
'0.000000'
,
'0.000000'
,
'0.000000'
,
null
,
''
,
''
,
''
,
''
,
''
,
''
,
null
,
null
,
'63'
,
'0'
);
INSERT
INTO
`jsh_supplier`
VALUES
(
'74'
,
'供应商5'
,
'小季'
,
'77779999'
,
''
,
''
,
null
,
'供应商'
,
''
,
'0.000000'
,
'0.000000'
,
'5.000000'
,
'0.000000'
,
'5.000000'
,
''
,
'15806283912'
,
''
,
''
,
''
,
''
,
'3.000000'
,
null
,
'63'
,
'0'
);
-- ----------------------------
-- Table structure for jsh_system_config
...
...
@@ -880,6 +890,7 @@ CREATE TABLE `jsh_unit` (
`ratio`
int
(
11
)
DEFAULT
NULL
COMMENT
'比例'
,
`ratio_two`
int
(
11
)
DEFAULT
NULL
COMMENT
'比例2'
,
`ratio_three`
int
(
11
)
DEFAULT
NULL
COMMENT
'比例3'
,
`enabled`
bit
(
1
)
DEFAULT
NULL
COMMENT
'启用'
,
`tenant_id`
bigint
(
20
)
DEFAULT
NULL
COMMENT
'租户id'
,
`delete_flag`
varchar
(
1
)
DEFAULT
'0'
COMMENT
'删除标记,0未删除,1删除'
,
PRIMARY
KEY
(
`id`
)
...
...
@@ -888,10 +899,10 @@ CREATE TABLE `jsh_unit` (
-- ----------------------------
-- Records of jsh_unit
-- ----------------------------
INSERT
INTO
`jsh_unit`
VALUES
(
'15'
,
'个/(箱=12个)'
,
'个'
,
'箱'
,
null
,
null
,
'12'
,
null
,
null
,
'63'
,
'0'
);
INSERT
INTO
`jsh_unit`
VALUES
(
'19'
,
'个/(盒=15个)'
,
'个'
,
'盒'
,
null
,
null
,
'15'
,
null
,
null
,
'63'
,
'0'
);
INSERT
INTO
`jsh_unit`
VALUES
(
'20'
,
'盒/(箱=8盒)'
,
'盒'
,
'箱'
,
null
,
null
,
'8'
,
null
,
null
,
'63'
,
'0'
);
INSERT
INTO
`jsh_unit`
VALUES
(
'21'
,
'瓶/(箱=12瓶)'
,
'瓶'
,
'箱'
,
null
,
null
,
'12'
,
null
,
null
,
'63'
,
'0'
);
INSERT
INTO
`jsh_unit`
VALUES
(
'15'
,
'个/(箱=12个)'
,
'个'
,
'箱'
,
null
,
null
,
'12'
,
null
,
null
,
''
,
'63'
,
'0'
);
INSERT
INTO
`jsh_unit`
VALUES
(
'19'
,
'个/(盒=15个)'
,
'个'
,
'盒'
,
null
,
null
,
'15'
,
null
,
null
,
''
,
'63'
,
'0'
);
INSERT
INTO
`jsh_unit`
VALUES
(
'20'
,
'盒/(箱=8盒)'
,
'盒'
,
'箱'
,
null
,
null
,
'8'
,
null
,
null
,
''
,
'63'
,
'0'
);
INSERT
INTO
`jsh_unit`
VALUES
(
'21'
,
'瓶/(箱=12瓶)'
,
'瓶'
,
'箱'
,
null
,
null
,
'12'
,
null
,
null
,
''
,
'63'
,
'0'
);
-- ----------------------------
-- Table structure for jsh_user
...
...
jshERP-boot/docs/数据库更新记录-首次安装请勿使用.txt
View file @
5a1d4bf5
...
...
@@ -1370,3 +1370,26 @@ alter table jsh_depot_head add deposit decimal(24,6) DEFAULT NULL COMMENT '订
-- 给平台参数表添加手机端激活码
-- --------------------------------------------------------
INSERT INTO `jsh_platform_config` VALUES ('8', 'app_activation_code', '手机端激活码', '');
-- --------------------------------------------------------
-- 时间 2022年08月25日
-- by jishenghua
-- 给部分表增加启用状态和排序字段
-- --------------------------------------------------------
alter table jsh_unit add enabled bit(1) DEFAULT NULL COMMENT '启用' after ratio_three;
update jsh_unit set enabled=1;
alter table jsh_supplier add sort varchar(10) DEFAULT NULL COMMENT '排序' after tax_rate;
alter table jsh_depot add enabled bit(1) DEFAULT NULL COMMENT '启用' after principal;
update jsh_depot set enabled=1;
alter table jsh_in_out_item add enabled bit(1) DEFAULT NULL COMMENT '启用' after remark;
alter table jsh_in_out_item add sort varchar(10) DEFAULT NULL COMMENT '排序' after enabled;
update jsh_in_out_item set enabled=1;
alter table jsh_account add enabled bit(1) DEFAULT NULL COMMENT '启用' after remark;
alter table jsh_account add sort varchar(10) DEFAULT NULL COMMENT '排序' after enabled;
update jsh_account set enabled=1;
alter table jsh_person add enabled bit(1) DEFAULT NULL COMMENT '启用' after name;
alter table jsh_person add sort varchar(10) DEFAULT NULL COMMENT '排序' after enabled;
update jsh_person set enabled=1;
alter table jsh_role add enabled bit(1) DEFAULT NULL COMMENT '启用' after description;
alter table jsh_role add sort varchar(10) DEFAULT NULL COMMENT '排序' after enabled;
update jsh_role set enabled=1;
\ No newline at end of file
jshERP-boot/src/main/java/com/jsh/erp/datasource/entities/Account.java
View file @
5a1d4bf5
...
...
@@ -15,6 +15,10 @@ public class Account {
private
String
remark
;
private
Boolean
enabled
;
private
String
sort
;
private
Boolean
isDefault
;
private
Long
tenantId
;
...
...
@@ -69,6 +73,22 @@ public class Account {
this
.
remark
=
remark
==
null
?
null
:
remark
.
trim
();
}
public
Boolean
getEnabled
()
{
return
enabled
;
}
public
void
setEnabled
(
Boolean
enabled
)
{
this
.
enabled
=
enabled
;
}
public
String
getSort
()
{
return
sort
;
}
public
void
setSort
(
String
sort
)
{
this
.
sort
=
sort
==
null
?
null
:
sort
.
trim
();
}
public
Boolean
getIsDefault
()
{
return
isDefault
;
}
...
...
jshERP-boot/src/main/java/com/jsh/erp/datasource/entities/AccountExample.java
View file @
5a1d4bf5
...
...
@@ -495,6 +495,136 @@ public class AccountExample {
return
(
Criteria
)
this
;
}
public
Criteria
andEnabledIsNull
()
{
addCriterion
(
"enabled is null"
);
return
(
Criteria
)
this
;
}
public
Criteria
andEnabledIsNotNull
()
{
addCriterion
(
"enabled is not null"
);
return
(
Criteria
)
this
;
}
public
Criteria
andEnabledEqualTo
(
Boolean
value
)
{
addCriterion
(
"enabled ="
,
value
,
"enabled"
);
return
(
Criteria
)
this
;
}
public
Criteria
andEnabledNotEqualTo
(
Boolean
value
)
{
addCriterion
(
"enabled <>"
,
value
,
"enabled"
);
return
(
Criteria
)
this
;
}
public
Criteria
andEnabledGreaterThan
(
Boolean
value
)
{
addCriterion
(
"enabled >"
,
value
,
"enabled"
);
return
(
Criteria
)
this
;
}
public
Criteria
andEnabledGreaterThanOrEqualTo
(
Boolean
value
)
{
addCriterion
(
"enabled >="
,
value
,
"enabled"
);
return
(
Criteria
)
this
;
}
public
Criteria
andEnabledLessThan
(
Boolean
value
)
{
addCriterion
(
"enabled <"
,
value
,
"enabled"
);
return
(
Criteria
)
this
;
}
public
Criteria
andEnabledLessThanOrEqualTo
(
Boolean
value
)
{
addCriterion
(
"enabled <="
,
value
,
"enabled"
);
return
(
Criteria
)
this
;
}
public
Criteria
andEnabledIn
(
List
<
Boolean
>
values
)
{
addCriterion
(
"enabled in"
,
values
,
"enabled"
);
return
(
Criteria
)
this
;
}
public
Criteria
andEnabledNotIn
(
List
<
Boolean
>
values
)
{
addCriterion
(
"enabled not in"
,
values
,
"enabled"
);
return
(
Criteria
)
this
;
}
public
Criteria
andEnabledBetween
(
Boolean
value1
,
Boolean
value2
)
{
addCriterion
(
"enabled between"
,
value1
,
value2
,
"enabled"
);
return
(
Criteria
)
this
;
}
public
Criteria
andEnabledNotBetween
(
Boolean
value1
,
Boolean
value2
)
{
addCriterion
(
"enabled not between"
,
value1
,
value2
,
"enabled"
);
return
(
Criteria
)
this
;
}
public
Criteria
andSortIsNull
()
{
addCriterion
(
"sort is null"
);
return
(
Criteria
)
this
;
}
public
Criteria
andSortIsNotNull
()
{
addCriterion
(
"sort is not null"
);
return
(
Criteria
)
this
;
}
public
Criteria
andSortEqualTo
(
String
value
)
{
addCriterion
(
"sort ="
,
value
,
"sort"
);
return
(
Criteria
)
this
;
}
public
Criteria
andSortNotEqualTo
(
String
value
)
{
addCriterion
(
"sort <>"
,
value
,
"sort"
);
return
(
Criteria
)
this
;
}
public
Criteria
andSortGreaterThan
(
String
value
)
{
addCriterion
(
"sort >"
,
value
,
"sort"
);
return
(
Criteria
)
this
;
}
public
Criteria
andSortGreaterThanOrEqualTo
(
String
value
)
{
addCriterion
(
"sort >="
,
value
,
"sort"
);
return
(
Criteria
)
this
;
}
public
Criteria
andSortLessThan
(
String
value
)
{
addCriterion
(
"sort <"
,
value
,
"sort"
);
return
(
Criteria
)
this
;
}
public
Criteria
andSortLessThanOrEqualTo
(
String
value
)
{
addCriterion
(
"sort <="
,
value
,
"sort"
);
return
(
Criteria
)
this
;
}
public
Criteria
andSortLike
(
String
value
)
{
addCriterion
(
"sort like"
,
value
,
"sort"
);
return
(
Criteria
)
this
;
}
public
Criteria
andSortNotLike
(
String
value
)
{
addCriterion
(
"sort not like"
,
value
,
"sort"
);
return
(
Criteria
)
this
;
}
public
Criteria
andSortIn
(
List
<
String
>
values
)
{
addCriterion
(
"sort in"
,
values
,
"sort"
);
return
(
Criteria
)
this
;
}
public
Criteria
andSortNotIn
(
List
<
String
>
values
)
{
addCriterion
(
"sort not in"
,
values
,
"sort"
);
return
(
Criteria
)
this
;
}
public
Criteria
andSortBetween
(
String
value1
,
String
value2
)
{
addCriterion
(
"sort between"
,
value1
,
value2
,
"sort"
);
return
(
Criteria
)
this
;
}
public
Criteria
andSortNotBetween
(
String
value1
,
String
value2
)
{
addCriterion
(
"sort not between"
,
value1
,
value2
,
"sort"
);
return
(
Criteria
)
this
;
}
public
Criteria
andIsDefaultIsNull
()
{
addCriterion
(
"is_default is null"
);
return
(
Criteria
)
this
;
...
...
jshERP-boot/src/main/java/com/jsh/erp/datasource/entities/Depot.java
View file @
5a1d4bf5
...
...
@@ -3,386 +3,132 @@ package com.jsh.erp.datasource.entities;
import
java.math.BigDecimal
;
public
class
Depot
{
/**
* This field was generated by MyBatis Generator.
* This field corresponds to the database column jsh_depot.id
*
* @mbggenerated
*/
private
Long
id
;
/**
* This field was generated by MyBatis Generator.
* This field corresponds to the database column jsh_depot.name
*
* @mbggenerated
*/
private
String
name
;
/**
* This field was generated by MyBatis Generator.
* This field corresponds to the database column jsh_depot.address
*
* @mbggenerated
*/
private
String
address
;
/**
* This field was generated by MyBatis Generator.
* This field corresponds to the database column jsh_depot.warehousing
*
* @mbggenerated
*/
private
BigDecimal
warehousing
;
/**
* This field was generated by MyBatis Generator.
* This field corresponds to the database column jsh_depot.truckage
*
* @mbggenerated
*/
private
BigDecimal
truckage
;
/**
* This field was generated by MyBatis Generator.
* This field corresponds to the database column jsh_depot.type
*
* @mbggenerated
*/
private
Integer
type
;
/**
* This field was generated by MyBatis Generator.
* This field corresponds to the database column jsh_depot.sort
*
* @mbggenerated
*/
private
String
sort
;
/**
* This field was generated by MyBatis Generator.
* This field corresponds to the database column jsh_depot.remark
*
* @mbggenerated
*/
private
String
remark
;
/**
* This field was generated by MyBatis Generator.
* This field corresponds to the database column jsh_depot.principal
*
* @mbggenerated
*/
private
Long
principal
;
/**
* This field was generated by MyBatis Generator.
* This field corresponds to the database column jsh_depot.tenant_id
*
* @mbggenerated
*/
private
Boolean
enabled
;
private
Long
tenantId
;
/**
* This field was generated by MyBatis Generator.
* This field corresponds to the database column jsh_depot.delete_Flag
*
* @mbggenerated
*/
private
String
deleteFlag
;
/**
* This field was generated by MyBatis Generator.
* This field corresponds to the database column jsh_depot.is_default
*
* @mbggenerated
*/
private
Boolean
isDefault
;
/**
* This method was generated by MyBatis Generator.
* This method returns the value of the database column jsh_depot.id
*
* @return the value of jsh_depot.id
*
* @mbggenerated
*/
public
Long
getId
()
{
return
id
;
}
/**
* This method was generated by MyBatis Generator.
* This method sets the value of the database column jsh_depot.id
*
* @param id the value for jsh_depot.id
*
* @mbggenerated
*/
public
void
setId
(
Long
id
)
{
this
.
id
=
id
;
}
/**
* This method was generated by MyBatis Generator.
* This method returns the value of the database column jsh_depot.name
*
* @return the value of jsh_depot.name
*
* @mbggenerated
*/
public
String
getName
()
{
return
name
;
}
/**
* This method was generated by MyBatis Generator.
* This method sets the value of the database column jsh_depot.name
*
* @param name the value for jsh_depot.name
*
* @mbggenerated
*/
public
void
setName
(
String
name
)
{
this
.
name
=
name
==
null
?
null
:
name
.
trim
();
}
/**
* This method was generated by MyBatis Generator.
* This method returns the value of the database column jsh_depot.address
*
* @return the value of jsh_depot.address
*
* @mbggenerated
*/
public
String
getAddress
()
{
return
address
;
}
/**
* This method was generated by MyBatis Generator.
* This method sets the value of the database column jsh_depot.address
*
* @param address the value for jsh_depot.address
*
* @mbggenerated
*/
public
void
setAddress
(
String
address
)
{
this
.
address
=
address
==
null
?
null
:
address
.
trim
();
}
/**
* This method was generated by MyBatis Generator.
* This method returns the value of the database column jsh_depot.warehousing
*
* @return the value of jsh_depot.warehousing
*
* @mbggenerated
*/
public
BigDecimal
getWarehousing
()
{
return
warehousing
;
}
/**
* This method was generated by MyBatis Generator.
* This method sets the value of the database column jsh_depot.warehousing
*
* @param warehousing the value for jsh_depot.warehousing
*
* @mbggenerated
*/
public
void
setWarehousing
(
BigDecimal
warehousing
)
{
this
.
warehousing
=
warehousing
;
}
/**
* This method was generated by MyBatis Generator.
* This method returns the value of the database column jsh_depot.truckage
*
* @return the value of jsh_depot.truckage
*
* @mbggenerated
*/
public
BigDecimal
getTruckage
()
{
return
truckage
;
}
/**
* This method was generated by MyBatis Generator.
* This method sets the value of the database column jsh_depot.truckage
*
* @param truckage the value for jsh_depot.truckage
*
* @mbggenerated
*/
public
void
setTruckage
(
BigDecimal
truckage
)
{
this
.
truckage
=
truckage
;
}
/**
* This method was generated by MyBatis Generator.
* This method returns the value of the database column jsh_depot.type
*
* @return the value of jsh_depot.type
*
* @mbggenerated
*/
public
Integer
getType
()
{
return
type
;
}
/**
* This method was generated by MyBatis Generator.
* This method sets the value of the database column jsh_depot.type
*
* @param type the value for jsh_depot.type
*
* @mbggenerated
*/
public
void
setType
(
Integer
type
)
{
this
.
type
=
type
;
}
/**
* This method was generated by MyBatis Generator.
* This method returns the value of the database column jsh_depot.sort
*
* @return the value of jsh_depot.sort
*
* @mbggenerated
*/
public
String
getSort
()
{
return
sort
;
}
/**
* This method was generated by MyBatis Generator.
* This method sets the value of the database column jsh_depot.sort
*
* @param sort the value for jsh_depot.sort
*
* @mbggenerated
*/
public
void
setSort
(
String
sort
)
{
this
.
sort
=
sort
==
null
?
null
:
sort
.
trim
();
}
/**
* This method was generated by MyBatis Generator.
* This method returns the value of the database column jsh_depot.remark
*
* @return the value of jsh_depot.remark
*
* @mbggenerated
*/
public
String
getRemark
()
{
return
remark
;
}
/**
* This method was generated by MyBatis Generator.
* This method sets the value of the database column jsh_depot.remark
*
* @param remark the value for jsh_depot.remark
*
* @mbggenerated
*/
public
void
setRemark
(
String
remark
)
{
this
.
remark
=
remark
==
null
?
null
:
remark
.
trim
();
}
/**
* This method was generated by MyBatis Generator.
* This method returns the value of the database column jsh_depot.principal
*
* @return the value of jsh_depot.principal
*
* @mbggenerated
*/
public
Long
getPrincipal
()
{
return
principal
;
}
/**
* This method was generated by MyBatis Generator.
* This method sets the value of the database column jsh_depot.principal
*
* @param principal the value for jsh_depot.principal
*
* @mbggenerated
*/
public
void
setPrincipal
(
Long
principal
)
{
this
.
principal
=
principal
;
}
/**
* This method was generated by MyBatis Generator.
* This method returns the value of the database column jsh_depot.tenant_id
*
* @return the value of jsh_depot.tenant_id
*
* @mbggenerated
*/
public
Boolean
getEnabled
()
{
return
enabled
;
}
public
void
setEnabled
(
Boolean
enabled
)
{
this
.
enabled
=
enabled
;
}
public
Long
getTenantId
()
{
return
tenantId
;
}
/**
* This method was generated by MyBatis Generator.
* This method sets the value of the database column jsh_depot.tenant_id
*
* @param tenantId the value for jsh_depot.tenant_id
*
* @mbggenerated
*/
public
void
setTenantId
(
Long
tenantId
)
{
this
.
tenantId
=
tenantId
;
}
/**
* This method was generated by MyBatis Generator.
* This method returns the value of the database column jsh_depot.delete_Flag
*
* @return the value of jsh_depot.delete_Flag
*
* @mbggenerated
*/
public
String
getDeleteFlag
()
{
return
deleteFlag
;
}
/**
* This method was generated by MyBatis Generator.
* This method sets the value of the database column jsh_depot.delete_Flag
*
* @param deleteFlag the value for jsh_depot.delete_Flag
*
* @mbggenerated
*/
public
void
setDeleteFlag
(
String
deleteFlag
)
{
this
.
deleteFlag
=
deleteFlag
==
null
?
null
:
deleteFlag
.
trim
();
}
/**
* This method was generated by MyBatis Generator.
* This method returns the value of the database column jsh_depot.is_default
*
* @return the value of jsh_depot.is_default
*
* @mbggenerated
*/
public
Boolean
getIsDefault
()
{
return
isDefault
;
}
/**
* This method was generated by MyBatis Generator.
* This method sets the value of the database column jsh_depot.is_default
*
* @param isDefault the value for jsh_depot.is_default
*
* @mbggenerated
*/
public
void
setIsDefault
(
Boolean
isDefault
)
{
this
.
isDefault
=
isDefault
;
}
...
...
jshERP-boot/src/main/java/com/jsh/erp/datasource/entities/DepotExample.java
View file @
5a1d4bf5
...
...
@@ -5,118 +5,46 @@ import java.util.ArrayList;
import
java.util.List
;
public
class
DepotExample
{
/**
* This field was generated by MyBatis Generator.
* This field corresponds to the database table jsh_depot
*
* @mbggenerated
*/
protected
String
orderByClause
;
/**
* This field was generated by MyBatis Generator.
* This field corresponds to the database table jsh_depot
*
* @mbggenerated
*/
protected
boolean
distinct
;
/**
* This field was generated by MyBatis Generator.
* This field corresponds to the database table jsh_depot
*
* @mbggenerated
*/
protected
List
<
Criteria
>
oredCriteria
;
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table jsh_depot
*
* @mbggenerated
*/
public
DepotExample
()
{
oredCriteria
=
new
ArrayList
<
Criteria
>();
oredCriteria
=
new
ArrayList
<>();
}
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table jsh_depot
*
* @mbggenerated
*/
public
void
setOrderByClause
(
String
orderByClause
)
{
this
.
orderByClause
=
orderByClause
;
}
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table jsh_depot
*
* @mbggenerated
*/
public
String
getOrderByClause
()
{
return
orderByClause
;
}
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table jsh_depot
*
* @mbggenerated
*/
public
void
setDistinct
(
boolean
distinct
)
{
this
.
distinct
=
distinct
;
}
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table jsh_depot
*
* @mbggenerated
*/
public
boolean
isDistinct
()
{
return
distinct
;
}
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table jsh_depot
*
* @mbggenerated
*/
public
List
<
Criteria
>
getOredCriteria
()
{
return
oredCriteria
;
}
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table jsh_depot
*
* @mbggenerated
*/
public
void
or
(
Criteria
criteria
)
{
oredCriteria
.
add
(
criteria
);
}
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table jsh_depot
*
* @mbggenerated
*/
public
Criteria
or
()
{
Criteria
criteria
=
createCriteriaInternal
();
oredCriteria
.
add
(
criteria
);
return
criteria
;
}
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table jsh_depot
*
* @mbggenerated
*/
public
Criteria
createCriteria
()
{
Criteria
criteria
=
createCriteriaInternal
();
if
(
oredCriteria
.
size
()
==
0
)
{
...
...
@@ -125,41 +53,23 @@ public class DepotExample {
return
criteria
;
}
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table jsh_depot
*
* @mbggenerated
*/
protected
Criteria
createCriteriaInternal
()
{
Criteria
criteria
=
new
Criteria
();
return
criteria
;
}
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table jsh_depot
*
* @mbggenerated
*/
public
void
clear
()
{
oredCriteria
.
clear
();
orderByClause
=
null
;
distinct
=
false
;
}
/**
* This class was generated by MyBatis Generator.
* This class corresponds to the database table jsh_depot
*
* @mbggenerated
*/
protected
abstract
static
class
GeneratedCriteria
{
protected
List
<
Criterion
>
criteria
;
protected
GeneratedCriteria
()
{
super
();
criteria
=
new
ArrayList
<
Criterion
>();
criteria
=
new
ArrayList
<>();
}
public
boolean
isValid
()
{
...
...
@@ -775,6 +685,66 @@ public class DepotExample {
return
(
Criteria
)
this
;
}
public
Criteria
andEnabledIsNull
()
{
addCriterion
(
"enabled is null"
);
return
(
Criteria
)
this
;
}
public
Criteria
andEnabledIsNotNull
()
{
addCriterion
(
"enabled is not null"
);
return
(
Criteria
)
this
;
}
public
Criteria
andEnabledEqualTo
(
Boolean
value
)
{
addCriterion
(
"enabled ="
,
value
,
"enabled"
);
return
(
Criteria
)
this
;
}
public
Criteria
andEnabledNotEqualTo
(
Boolean
value
)
{
addCriterion
(
"enabled <>"
,
value
,
"enabled"
);
return
(
Criteria
)
this
;
}
public
Criteria
andEnabledGreaterThan
(
Boolean
value
)
{
addCriterion
(
"enabled >"
,
value
,
"enabled"
);
return
(
Criteria
)
this
;
}
public
Criteria
andEnabledGreaterThanOrEqualTo
(
Boolean
value
)
{
addCriterion
(
"enabled >="
,
value
,
"enabled"
);
return
(
Criteria
)
this
;
}
public
Criteria
andEnabledLessThan
(
Boolean
value
)
{
addCriterion
(
"enabled <"
,
value
,
"enabled"
);
return
(
Criteria
)
this
;
}
public
Criteria
andEnabledLessThanOrEqualTo
(
Boolean
value
)
{
addCriterion
(
"enabled <="
,
value
,
"enabled"
);
return
(
Criteria
)
this
;
}
public
Criteria
andEnabledIn
(
List
<
Boolean
>
values
)
{
addCriterion
(
"enabled in"
,
values
,
"enabled"
);
return
(
Criteria
)
this
;
}
public
Criteria
andEnabledNotIn
(
List
<
Boolean
>
values
)
{
addCriterion
(
"enabled not in"
,
values
,
"enabled"
);
return
(
Criteria
)
this
;
}
public
Criteria
andEnabledBetween
(
Boolean
value1
,
Boolean
value2
)
{
addCriterion
(
"enabled between"
,
value1
,
value2
,
"enabled"
);
return
(
Criteria
)
this
;
}
public
Criteria
andEnabledNotBetween
(
Boolean
value1
,
Boolean
value2
)
{
addCriterion
(
"enabled not between"
,
value1
,
value2
,
"enabled"
);
return
(
Criteria
)
this
;
}
public
Criteria
andTenantIdIsNull
()
{
addCriterion
(
"tenant_id is null"
);
return
(
Criteria
)
this
;
...
...
@@ -966,25 +936,12 @@ public class DepotExample {
}
}
/**
* This class was generated by MyBatis Generator.
* This class corresponds to the database table jsh_depot
*
* @mbggenerated do_not_delete_during_merge
*/
public
static
class
Criteria
extends
GeneratedCriteria
{
protected
Criteria
()
{
super
();
}
}
/**
* This class was generated by MyBatis Generator.
* This class corresponds to the database table jsh_depot
*
* @mbggenerated
*/
public
static
class
Criterion
{
private
String
condition
;
...
...
jshERP-boot/src/main/java/com/jsh/erp/datasource/entities/InOutItem.java
View file @
5a1d4bf5
...
...
@@ -9,6 +9,10 @@ public class InOutItem {
private
String
remark
;
private
Boolean
enabled
;
private
String
sort
;
private
Long
tenantId
;
private
String
deleteFlag
;
...
...
@@ -45,6 +49,22 @@ public class InOutItem {
this
.
remark
=
remark
==
null
?
null
:
remark
.
trim
();
}
public
Boolean
getEnabled
()
{
return
enabled
;
}
public
void
setEnabled
(
Boolean
enabled
)
{
this
.
enabled
=
enabled
;
}
public
String
getSort
()
{
return
sort
;
}
public
void
setSort
(
String
sort
)
{
this
.
sort
=
sort
==
null
?
null
:
sort
.
trim
();
}
public
Long
getTenantId
()
{
return
tenantId
;
}
...
...
jshERP-boot/src/main/java/com/jsh/erp/datasource/entities/InOutItemExample.java
View file @
5a1d4bf5
...
...
@@ -374,6 +374,136 @@ public class InOutItemExample {
return
(
Criteria
)
this
;
}
public
Criteria
andEnabledIsNull
()
{
addCriterion
(
"enabled is null"
);
return
(
Criteria
)
this
;
}
public
Criteria
andEnabledIsNotNull
()
{
addCriterion
(
"enabled is not null"
);
return
(
Criteria
)
this
;
}
public
Criteria
andEnabledEqualTo
(
Boolean
value
)
{
addCriterion
(
"enabled ="
,
value
,
"enabled"
);
return
(
Criteria
)
this
;
}
public
Criteria
andEnabledNotEqualTo
(
Boolean
value
)
{
addCriterion
(
"enabled <>"
,
value
,
"enabled"
);
return
(
Criteria
)
this
;
}
public
Criteria
andEnabledGreaterThan
(
Boolean
value
)
{
addCriterion
(
"enabled >"
,
value
,
"enabled"
);
return
(
Criteria
)
this
;
}
public
Criteria
andEnabledGreaterThanOrEqualTo
(
Boolean
value
)
{
addCriterion
(
"enabled >="
,
value
,
"enabled"
);
return
(
Criteria
)
this
;
}
public
Criteria
andEnabledLessThan
(
Boolean
value
)
{
addCriterion
(
"enabled <"
,
value
,
"enabled"
);
return
(
Criteria
)
this
;
}
public
Criteria
andEnabledLessThanOrEqualTo
(
Boolean
value
)
{
addCriterion
(
"enabled <="
,
value
,
"enabled"
);
return
(
Criteria
)
this
;
}
public
Criteria
andEnabledIn
(
List
<
Boolean
>
values
)
{
addCriterion
(
"enabled in"
,
values
,
"enabled"
);
return
(
Criteria
)
this
;
}
public
Criteria
andEnabledNotIn
(
List
<
Boolean
>
values
)
{
addCriterion
(
"enabled not in"
,
values
,
"enabled"
);
return
(
Criteria
)
this
;
}
public
Criteria
andEnabledBetween
(
Boolean
value1
,
Boolean
value2
)
{
addCriterion
(
"enabled between"
,
value1
,
value2
,
"enabled"
);
return
(
Criteria
)
this
;
}
public
Criteria
andEnabledNotBetween
(
Boolean
value1
,
Boolean
value2
)
{
addCriterion
(
"enabled not between"
,
value1
,
value2
,
"enabled"
);
return
(
Criteria
)
this
;
}
public
Criteria
andSortIsNull
()
{
addCriterion
(
"sort is null"
);
return
(
Criteria
)
this
;
}
public
Criteria
andSortIsNotNull
()
{
addCriterion
(
"sort is not null"
);
return
(
Criteria
)
this
;
}
public
Criteria
andSortEqualTo
(
String
value
)
{
addCriterion
(
"sort ="
,
value
,
"sort"
);
return
(
Criteria
)
this
;
}
public
Criteria
andSortNotEqualTo
(
String
value
)
{
addCriterion
(
"sort <>"
,
value
,
"sort"
);
return
(
Criteria
)
this
;
}
public
Criteria
andSortGreaterThan
(
String
value
)
{
addCriterion
(
"sort >"
,
value
,
"sort"
);
return
(
Criteria
)
this
;
}
public
Criteria
andSortGreaterThanOrEqualTo
(
String
value
)
{
addCriterion
(
"sort >="
,
value
,
"sort"
);
return
(
Criteria
)
this
;
}
public
Criteria
andSortLessThan
(
String
value
)
{
addCriterion
(
"sort <"
,
value
,
"sort"
);
return
(
Criteria
)
this
;
}
public
Criteria
andSortLessThanOrEqualTo
(
String
value
)
{
addCriterion
(
"sort <="
,
value
,
"sort"
);
return
(
Criteria
)
this
;
}
public
Criteria
andSortLike
(
String
value
)
{
addCriterion
(
"sort like"
,
value
,
"sort"
);
return
(
Criteria
)
this
;
}
public
Criteria
andSortNotLike
(
String
value
)
{
addCriterion
(
"sort not like"
,
value
,
"sort"
);
return
(
Criteria
)
this
;
}
public
Criteria
andSortIn
(
List
<
String
>
values
)
{
addCriterion
(
"sort in"
,
values
,
"sort"
);
return
(
Criteria
)
this
;
}
public
Criteria
andSortNotIn
(
List
<
String
>
values
)
{
addCriterion
(
"sort not in"
,
values
,
"sort"
);
return
(
Criteria
)
this
;
}
public
Criteria
andSortBetween
(
String
value1
,
String
value2
)
{
addCriterion
(
"sort between"
,
value1
,
value2
,
"sort"
);
return
(
Criteria
)
this
;
}
public
Criteria
andSortNotBetween
(
String
value1
,
String
value2
)
{
addCriterion
(
"sort not between"
,
value1
,
value2
,
"sort"
);
return
(
Criteria
)
this
;
}
public
Criteria
andTenantIdIsNull
()
{
addCriterion
(
"tenant_id is null"
);
return
(
Criteria
)
this
;
...
...
jshERP-boot/src/main/java/com/jsh/erp/datasource/entities/Person.java
View file @
5a1d4bf5
...
...
@@ -7,6 +7,10 @@ public class Person {
private
String
name
;
private
Boolean
enabled
;
private
String
sort
;
private
Long
tenantId
;
private
String
deleteFlag
;
...
...
@@ -35,6 +39,22 @@ public class Person {
this
.
name
=
name
==
null
?
null
:
name
.
trim
();
}
public
Boolean
getEnabled
()
{
return
enabled
;
}
public
void
setEnabled
(
Boolean
enabled
)
{
this
.
enabled
=
enabled
;
}
public
String
getSort
()
{
return
sort
;
}
public
void
setSort
(
String
sort
)
{
this
.
sort
=
sort
==
null
?
null
:
sort
.
trim
();
}
public
Long
getTenantId
()
{
return
tenantId
;
}
...
...
jshERP-boot/src/main/java/com/jsh/erp/datasource/entities/PersonExample.java
View file @
5a1d4bf5
...
...
@@ -304,6 +304,136 @@ public class PersonExample {
return
(
Criteria
)
this
;
}
public
Criteria
andEnabledIsNull
()
{
addCriterion
(
"enabled is null"
);
return
(
Criteria
)
this
;
}
public
Criteria
andEnabledIsNotNull
()
{
addCriterion
(
"enabled is not null"
);
return
(
Criteria
)
this
;
}
public
Criteria
andEnabledEqualTo
(
Boolean
value
)
{
addCriterion
(
"enabled ="
,
value
,
"enabled"
);
return
(
Criteria
)
this
;
}
public
Criteria
andEnabledNotEqualTo
(
Boolean
value
)
{
addCriterion
(
"enabled <>"
,
value
,
"enabled"
);
return
(
Criteria
)
this
;
}
public
Criteria
andEnabledGreaterThan
(
Boolean
value
)
{
addCriterion
(
"enabled >"
,
value
,
"enabled"
);
return
(
Criteria
)
this
;
}
public
Criteria
andEnabledGreaterThanOrEqualTo
(
Boolean
value
)
{
addCriterion
(
"enabled >="
,
value
,
"enabled"
);
return
(
Criteria
)
this
;
}
public
Criteria
andEnabledLessThan
(
Boolean
value
)
{
addCriterion
(
"enabled <"
,
value
,
"enabled"
);
return
(
Criteria
)
this
;
}
public
Criteria
andEnabledLessThanOrEqualTo
(
Boolean
value
)
{
addCriterion
(
"enabled <="
,
value
,
"enabled"
);
return
(
Criteria
)
this
;
}
public
Criteria
andEnabledIn
(
List
<
Boolean
>
values
)
{
addCriterion
(
"enabled in"
,
values
,
"enabled"
);
return
(
Criteria
)
this
;
}
public
Criteria
andEnabledNotIn
(
List
<
Boolean
>
values
)
{
addCriterion
(
"enabled not in"
,
values
,
"enabled"
);
return
(
Criteria
)
this
;
}
public
Criteria
andEnabledBetween
(
Boolean
value1
,
Boolean
value2
)
{
addCriterion
(
"enabled between"
,
value1
,
value2
,
"enabled"
);
return
(
Criteria
)
this
;
}
public
Criteria
andEnabledNotBetween
(
Boolean
value1
,
Boolean
value2
)
{
addCriterion
(
"enabled not between"
,
value1
,
value2
,
"enabled"
);
return
(
Criteria
)
this
;
}
public
Criteria
andSortIsNull
()
{
addCriterion
(
"sort is null"
);
return
(
Criteria
)
this
;
}
public
Criteria
andSortIsNotNull
()
{
addCriterion
(
"sort is not null"
);
return
(
Criteria
)
this
;
}
public
Criteria
andSortEqualTo
(
String
value
)
{
addCriterion
(
"sort ="
,
value
,
"sort"
);
return
(
Criteria
)
this
;
}
public
Criteria
andSortNotEqualTo
(
String
value
)
{
addCriterion
(
"sort <>"
,
value
,
"sort"
);
return
(
Criteria
)
this
;
}
public
Criteria
andSortGreaterThan
(
String
value
)
{
addCriterion
(
"sort >"
,
value
,
"sort"
);
return
(
Criteria
)
this
;
}
public
Criteria
andSortGreaterThanOrEqualTo
(
String
value
)
{
addCriterion
(
"sort >="
,
value
,
"sort"
);
return
(
Criteria
)
this
;
}
public
Criteria
andSortLessThan
(
String
value
)
{
addCriterion
(
"sort <"
,
value
,
"sort"
);
return
(
Criteria
)
this
;
}
public
Criteria
andSortLessThanOrEqualTo
(
String
value
)
{
addCriterion
(
"sort <="
,
value
,
"sort"
);
return
(
Criteria
)
this
;
}
public
Criteria
andSortLike
(
String
value
)
{
addCriterion
(
"sort like"
,
value
,
"sort"
);
return
(
Criteria
)
this
;
}
public
Criteria
andSortNotLike
(
String
value
)
{
addCriterion
(
"sort not like"
,
value
,
"sort"
);
return
(
Criteria
)
this
;
}
public
Criteria
andSortIn
(
List
<
String
>
values
)
{
addCriterion
(
"sort in"
,
values
,
"sort"
);
return
(
Criteria
)
this
;
}
public
Criteria
andSortNotIn
(
List
<
String
>
values
)
{
addCriterion
(
"sort not in"
,
values
,
"sort"
);
return
(
Criteria
)
this
;
}
public
Criteria
andSortBetween
(
String
value1
,
String
value2
)
{
addCriterion
(
"sort between"
,
value1
,
value2
,
"sort"
);
return
(
Criteria
)
this
;
}
public
Criteria
andSortNotBetween
(
String
value1
,
String
value2
)
{
addCriterion
(
"sort not between"
,
value1
,
value2
,
"sort"
);
return
(
Criteria
)
this
;
}
public
Criteria
andTenantIdIsNull
()
{
addCriterion
(
"tenant_id is null"
);
return
(
Criteria
)
this
;
...
...
jshERP-boot/src/main/java/com/jsh/erp/datasource/entities/Role.java
View file @
5a1d4bf5
...
...
@@ -11,6 +11,10 @@ public class Role {
private
String
description
;
private
Boolean
enabled
;
private
String
sort
;
private
Long
tenantId
;
private
String
deleteFlag
;
...
...
@@ -55,6 +59,22 @@ public class Role {
this
.
description
=
description
==
null
?
null
:
description
.
trim
();
}
public
Boolean
getEnabled
()
{
return
enabled
;
}
public
void
setEnabled
(
Boolean
enabled
)
{
this
.
enabled
=
enabled
;
}
public
String
getSort
()
{
return
sort
;
}
public
void
setSort
(
String
sort
)
{
this
.
sort
=
sort
==
null
?
null
:
sort
.
trim
();
}
public
Long
getTenantId
()
{
return
tenantId
;
}
...
...
jshERP-boot/src/main/java/com/jsh/erp/datasource/entities/RoleExample.java
View file @
5a1d4bf5
...
...
@@ -444,6 +444,136 @@ public class RoleExample {
return
(
Criteria
)
this
;
}
public
Criteria
andEnabledIsNull
()
{
addCriterion
(
"enabled is null"
);
return
(
Criteria
)
this
;
}
public
Criteria
andEnabledIsNotNull
()
{
addCriterion
(
"enabled is not null"
);
return
(
Criteria
)
this
;
}
public
Criteria
andEnabledEqualTo
(
Boolean
value
)
{
addCriterion
(
"enabled ="
,
value
,
"enabled"
);
return
(
Criteria
)
this
;
}
public
Criteria
andEnabledNotEqualTo
(
Boolean
value
)
{
addCriterion
(
"enabled <>"
,
value
,
"enabled"
);
return
(
Criteria
)
this
;
}
public
Criteria
andEnabledGreaterThan
(
Boolean
value
)
{
addCriterion
(
"enabled >"
,
value
,
"enabled"
);
return
(
Criteria
)
this
;
}
public
Criteria
andEnabledGreaterThanOrEqualTo
(
Boolean
value
)
{
addCriterion
(
"enabled >="
,
value
,
"enabled"
);
return
(
Criteria
)
this
;
}
public
Criteria
andEnabledLessThan
(
Boolean
value
)
{
addCriterion
(
"enabled <"
,
value
,
"enabled"
);
return
(
Criteria
)
this
;
}
public
Criteria
andEnabledLessThanOrEqualTo
(
Boolean
value
)
{
addCriterion
(
"enabled <="
,
value
,
"enabled"
);
return
(
Criteria
)
this
;
}
public
Criteria
andEnabledIn
(
List
<
Boolean
>
values
)
{
addCriterion
(
"enabled in"
,
values
,
"enabled"
);
return
(
Criteria
)
this
;
}
public
Criteria
andEnabledNotIn
(
List
<
Boolean
>
values
)
{
addCriterion
(
"enabled not in"
,
values
,
"enabled"
);
return
(
Criteria
)
this
;
}
public
Criteria
andEnabledBetween
(
Boolean
value1
,
Boolean
value2
)
{
addCriterion
(
"enabled between"
,
value1
,
value2
,
"enabled"
);
return
(
Criteria
)
this
;
}
public
Criteria
andEnabledNotBetween
(
Boolean
value1
,
Boolean
value2
)
{
addCriterion
(
"enabled not between"
,
value1
,
value2
,
"enabled"
);
return
(
Criteria
)
this
;
}
public
Criteria
andSortIsNull
()
{
addCriterion
(
"sort is null"
);
return
(
Criteria
)
this
;
}
public
Criteria
andSortIsNotNull
()
{
addCriterion
(
"sort is not null"
);
return
(
Criteria
)
this
;
}
public
Criteria
andSortEqualTo
(
String
value
)
{
addCriterion
(
"sort ="
,
value
,
"sort"
);
return
(
Criteria
)
this
;
}
public
Criteria
andSortNotEqualTo
(
String
value
)
{
addCriterion
(
"sort <>"
,
value
,
"sort"
);
return
(
Criteria
)
this
;
}
public
Criteria
andSortGreaterThan
(
String
value
)
{
addCriterion
(
"sort >"
,
value
,
"sort"
);
return
(
Criteria
)
this
;
}
public
Criteria
andSortGreaterThanOrEqualTo
(
String
value
)
{
addCriterion
(
"sort >="
,
value
,
"sort"
);
return
(
Criteria
)
this
;
}
public
Criteria
andSortLessThan
(
String
value
)
{
addCriterion
(
"sort <"
,
value
,
"sort"
);
return
(
Criteria
)
this
;
}
public
Criteria
andSortLessThanOrEqualTo
(
String
value
)
{
addCriterion
(
"sort <="
,
value
,
"sort"
);
return
(
Criteria
)
this
;
}
public
Criteria
andSortLike
(
String
value
)
{
addCriterion
(
"sort like"
,
value
,
"sort"
);
return
(
Criteria
)
this
;
}
public
Criteria
andSortNotLike
(
String
value
)
{
addCriterion
(
"sort not like"
,
value
,
"sort"
);
return
(
Criteria
)
this
;
}
public
Criteria
andSortIn
(
List
<
String
>
values
)
{
addCriterion
(
"sort in"
,
values
,
"sort"
);
return
(
Criteria
)
this
;
}
public
Criteria
andSortNotIn
(
List
<
String
>
values
)
{
addCriterion
(
"sort not in"
,
values
,
"sort"
);
return
(
Criteria
)
this
;
}
public
Criteria
andSortBetween
(
String
value1
,
String
value2
)
{
addCriterion
(
"sort between"
,
value1
,
value2
,
"sort"
);
return
(
Criteria
)
this
;
}
public
Criteria
andSortNotBetween
(
String
value1
,
String
value2
)
{
addCriterion
(
"sort not between"
,
value1
,
value2
,
"sort"
);
return
(
Criteria
)
this
;
}
public
Criteria
andTenantIdIsNull
()
{
addCriterion
(
"tenant_id is null"
);
return
(
Criteria
)
this
;
...
...
jshERP-boot/src/main/java/com/jsh/erp/datasource/entities/Supplier.java
View file @
5a1d4bf5
...
...
@@ -45,6 +45,8 @@ public class Supplier {
private
BigDecimal
taxRate
;
private
String
sort
;
private
Long
tenantId
;
private
String
deleteFlag
;
...
...
@@ -217,6 +219,14 @@ public class Supplier {
this
.
taxRate
=
taxRate
;
}
public
String
getSort
()
{
return
sort
;
}
public
void
setSort
(
String
sort
)
{
this
.
sort
=
sort
==
null
?
null
:
sort
.
trim
();
}
public
Long
getTenantId
()
{
return
tenantId
;
}
...
...
jshERP-boot/src/main/java/com/jsh/erp/datasource/entities/SupplierExample.java
View file @
5a1d4bf5
...
...
@@ -1485,6 +1485,76 @@ public class SupplierExample {
return
(
Criteria
)
this
;
}
public
Criteria
andSortIsNull
()
{
addCriterion
(
"sort is null"
);
return
(
Criteria
)
this
;
}
public
Criteria
andSortIsNotNull
()
{
addCriterion
(
"sort is not null"
);
return
(
Criteria
)
this
;
}
public
Criteria
andSortEqualTo
(
String
value
)
{
addCriterion
(
"sort ="
,
value
,
"sort"
);
return
(
Criteria
)
this
;
}
public
Criteria
andSortNotEqualTo
(
String
value
)
{
addCriterion
(
"sort <>"
,
value
,
"sort"
);
return
(
Criteria
)
this
;
}
public
Criteria
andSortGreaterThan
(
String
value
)
{
addCriterion
(
"sort >"
,
value
,
"sort"
);
return
(
Criteria
)
this
;
}
public
Criteria
andSortGreaterThanOrEqualTo
(
String
value
)
{
addCriterion
(
"sort >="
,
value
,
"sort"
);
return
(
Criteria
)
this
;
}
public
Criteria
andSortLessThan
(
String
value
)
{
addCriterion
(
"sort <"
,
value
,
"sort"
);
return
(
Criteria
)
this
;
}
public
Criteria
andSortLessThanOrEqualTo
(
String
value
)
{
addCriterion
(
"sort <="
,
value
,
"sort"
);
return
(
Criteria
)
this
;
}
public
Criteria
andSortLike
(
String
value
)
{
addCriterion
(
"sort like"
,
value
,
"sort"
);
return
(
Criteria
)
this
;
}
public
Criteria
andSortNotLike
(
String
value
)
{
addCriterion
(
"sort not like"
,
value
,
"sort"
);
return
(
Criteria
)
this
;
}
public
Criteria
andSortIn
(
List
<
String
>
values
)
{
addCriterion
(
"sort in"
,
values
,
"sort"
);
return
(
Criteria
)
this
;
}
public
Criteria
andSortNotIn
(
List
<
String
>
values
)
{
addCriterion
(
"sort not in"
,
values
,
"sort"
);
return
(
Criteria
)
this
;
}
public
Criteria
andSortBetween
(
String
value1
,
String
value2
)
{
addCriterion
(
"sort between"
,
value1
,
value2
,
"sort"
);
return
(
Criteria
)
this
;
}
public
Criteria
andSortNotBetween
(
String
value1
,
String
value2
)
{
addCriterion
(
"sort not between"
,
value1
,
value2
,
"sort"
);
return
(
Criteria
)
this
;
}
public
Criteria
andTenantIdIsNull
()
{
addCriterion
(
"tenant_id is null"
);
return
(
Criteria
)
this
;
...
...
jshERP-boot/src/main/java/com/jsh/erp/datasource/entities/Unit.java
View file @
5a1d4bf5
...
...
@@ -19,6 +19,8 @@ public class Unit {
private
Integer
ratioThree
;
private
Boolean
enabled
;
private
Long
tenantId
;
private
String
deleteFlag
;
...
...
@@ -95,6 +97,14 @@ public class Unit {
this
.
ratioThree
=
ratioThree
;
}
public
Boolean
getEnabled
()
{
return
enabled
;
}
public
void
setEnabled
(
Boolean
enabled
)
{
this
.
enabled
=
enabled
;
}
public
Long
getTenantId
()
{
return
tenantId
;
}
...
...
jshERP-boot/src/main/java/com/jsh/erp/datasource/entities/UnitExample.java
View file @
5a1d4bf5
...
...
@@ -694,6 +694,66 @@ public class UnitExample {
return
(
Criteria
)
this
;
}
public
Criteria
andEnabledIsNull
()
{
addCriterion
(
"enabled is null"
);
return
(
Criteria
)
this
;
}
public
Criteria
andEnabledIsNotNull
()
{
addCriterion
(
"enabled is not null"
);
return
(
Criteria
)
this
;
}
public
Criteria
andEnabledEqualTo
(
Boolean
value
)
{
addCriterion
(
"enabled ="
,
value
,
"enabled"
);
return
(
Criteria
)
this
;
}
public
Criteria
andEnabledNotEqualTo
(
Boolean
value
)
{
addCriterion
(
"enabled <>"
,
value
,
"enabled"
);
return
(
Criteria
)
this
;
}
public
Criteria
andEnabledGreaterThan
(
Boolean
value
)
{
addCriterion
(
"enabled >"
,
value
,
"enabled"
);
return
(
Criteria
)
this
;
}
public
Criteria
andEnabledGreaterThanOrEqualTo
(
Boolean
value
)
{
addCriterion
(
"enabled >="
,
value
,
"enabled"
);
return
(
Criteria
)
this
;
}
public
Criteria
andEnabledLessThan
(
Boolean
value
)
{
addCriterion
(
"enabled <"
,
value
,
"enabled"
);
return
(
Criteria
)
this
;
}
public
Criteria
andEnabledLessThanOrEqualTo
(
Boolean
value
)
{
addCriterion
(
"enabled <="
,
value
,
"enabled"
);
return
(
Criteria
)
this
;
}
public
Criteria
andEnabledIn
(
List
<
Boolean
>
values
)
{
addCriterion
(
"enabled in"
,
values
,
"enabled"
);
return
(
Criteria
)
this
;
}
public
Criteria
andEnabledNotIn
(
List
<
Boolean
>
values
)
{
addCriterion
(
"enabled not in"
,
values
,
"enabled"
);
return
(
Criteria
)
this
;
}
public
Criteria
andEnabledBetween
(
Boolean
value1
,
Boolean
value2
)
{
addCriterion
(
"enabled between"
,
value1
,
value2
,
"enabled"
);
return
(
Criteria
)
this
;
}
public
Criteria
andEnabledNotBetween
(
Boolean
value1
,
Boolean
value2
)
{
addCriterion
(
"enabled not between"
,
value1
,
value2
,
"enabled"
);
return
(
Criteria
)
this
;
}
public
Criteria
andTenantIdIsNull
()
{
addCriterion
(
"tenant_id is null"
);
return
(
Criteria
)
this
;
...
...
jshERP-boot/src/main/java/com/jsh/erp/datasource/mappers/DepotMapper.java
View file @
5a1d4bf5
...
...
@@ -6,91 +6,25 @@ import java.util.List;
import
org.apache.ibatis.annotations.Param
;
public
interface
DepotMapper
{
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table jsh_depot
*
* @mbggenerated
*/
int
countByExample
(
DepotExample
example
);
long
countByExample
(
DepotExample
example
);
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table jsh_depot
*
* @mbggenerated
*/
int
deleteByExample
(
DepotExample
example
);
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table jsh_depot
*
* @mbggenerated
*/
int
deleteByPrimaryKey
(
Long
id
);
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table jsh_depot
*
* @mbggenerated
*/
int
insert
(
Depot
record
);
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table jsh_depot
*
* @mbggenerated
*/
int
insertSelective
(
Depot
record
);
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table jsh_depot
*
* @mbggenerated
*/
List
<
Depot
>
selectByExample
(
DepotExample
example
);
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table jsh_depot
*
* @mbggenerated
*/
Depot
selectByPrimaryKey
(
Long
id
);
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table jsh_depot
*
* @mbggenerated
*/
int
updateByExampleSelective
(
@Param
(
"record"
)
Depot
record
,
@Param
(
"example"
)
DepotExample
example
);
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table jsh_depot
*
* @mbggenerated
*/
int
updateByExample
(
@Param
(
"record"
)
Depot
record
,
@Param
(
"example"
)
DepotExample
example
);
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table jsh_depot
*
* @mbggenerated
*/
int
updateByPrimaryKeySelective
(
Depot
record
);
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table jsh_depot
*
* @mbggenerated
*/
int
updateByPrimaryKey
(
Depot
record
);
}
\ No newline at end of file
jshERP-boot/src/main/resources/mapper_xml/AccountMapper.xml
View file @
5a1d4bf5
...
...
@@ -8,6 +8,8 @@
<result
column=
"initial_amount"
jdbcType=
"DECIMAL"
property=
"initialAmount"
/>
<result
column=
"current_amount"
jdbcType=
"DECIMAL"
property=
"currentAmount"
/>
<result
column=
"remark"
jdbcType=
"VARCHAR"
property=
"remark"
/>
<result
column=
"enabled"
jdbcType=
"BIT"
property=
"enabled"
/>
<result
column=
"sort"
jdbcType=
"VARCHAR"
property=
"sort"
/>
<result
column=
"is_default"
jdbcType=
"BIT"
property=
"isDefault"
/>
<result
column=
"tenant_id"
jdbcType=
"BIGINT"
property=
"tenantId"
/>
<result
column=
"delete_flag"
jdbcType=
"VARCHAR"
property=
"deleteFlag"
/>
...
...
@@ -71,8 +73,8 @@
</where>
</sql>
<sql
id=
"Base_Column_List"
>
id, name, serial_no, initial_amount, current_amount, remark,
is_default, tenant_id
,
delete_flag
id, name, serial_no, initial_amount, current_amount, remark,
enabled, sort, is_default
,
tenant_id,
delete_flag
</sql>
<select
id=
"selectByExample"
parameterType=
"com.jsh.erp.datasource.entities.AccountExample"
resultMap=
"BaseResultMap"
>
select
...
...
@@ -107,12 +109,12 @@
<insert
id=
"insert"
parameterType=
"com.jsh.erp.datasource.entities.Account"
>
insert into jsh_account (id, name, serial_no,
initial_amount, current_amount, remark,
is_default, tenant_id,
delete_flag
)
enabled, sort,
is_default, tenant_id,
delete_flag
)
values (#{id,jdbcType=BIGINT}, #{name,jdbcType=VARCHAR}, #{serialNo,jdbcType=VARCHAR},
#{initialAmount,jdbcType=DECIMAL}, #{currentAmount,jdbcType=DECIMAL}, #{remark,jdbcType=VARCHAR},
#{isDefault,jdbcType=BIT}, #{tenantId,jdbcType=BIGINT},
#{deleteFlag,jdbcType=VARCHAR}
)
#{enabled,jdbcType=BIT}, #{sort,jdbcType=VARCHAR},
#{isDefault,jdbcType=BIT}, #{tenantId,jdbcType=BIGINT},
#{deleteFlag,jdbcType=VARCHAR}
)
</insert>
<insert
id=
"insertSelective"
parameterType=
"com.jsh.erp.datasource.entities.Account"
>
insert into jsh_account
...
...
@@ -135,6 +137,12 @@
<if
test=
"remark != null"
>
remark,
</if>
<if
test=
"enabled != null"
>
enabled,
</if>
<if
test=
"sort != null"
>
sort,
</if>
<if
test=
"isDefault != null"
>
is_default,
</if>
...
...
@@ -164,6 +172,12 @@
<if
test=
"remark != null"
>
#{remark,jdbcType=VARCHAR},
</if>
<if
test=
"enabled != null"
>
#{enabled,jdbcType=BIT},
</if>
<if
test=
"sort != null"
>
#{sort,jdbcType=VARCHAR},
</if>
<if
test=
"isDefault != null"
>
#{isDefault,jdbcType=BIT},
</if>
...
...
@@ -202,6 +216,12 @@
<if
test=
"record.remark != null"
>
remark = #{record.remark,jdbcType=VARCHAR},
</if>
<if
test=
"record.enabled != null"
>
enabled = #{record.enabled,jdbcType=BIT},
</if>
<if
test=
"record.sort != null"
>
sort = #{record.sort,jdbcType=VARCHAR},
</if>
<if
test=
"record.isDefault != null"
>
is_default = #{record.isDefault,jdbcType=BIT},
</if>
...
...
@@ -224,6 +244,8 @@
initial_amount = #{record.initialAmount,jdbcType=DECIMAL},
current_amount = #{record.currentAmount,jdbcType=DECIMAL},
remark = #{record.remark,jdbcType=VARCHAR},
enabled = #{record.enabled,jdbcType=BIT},
sort = #{record.sort,jdbcType=VARCHAR},
is_default = #{record.isDefault,jdbcType=BIT},
tenant_id = #{record.tenantId,jdbcType=BIGINT},
delete_flag = #{record.deleteFlag,jdbcType=VARCHAR}
...
...
@@ -249,6 +271,12 @@
<if
test=
"remark != null"
>
remark = #{remark,jdbcType=VARCHAR},
</if>
<if
test=
"enabled != null"
>
enabled = #{enabled,jdbcType=BIT},
</if>
<if
test=
"sort != null"
>
sort = #{sort,jdbcType=VARCHAR},
</if>
<if
test=
"isDefault != null"
>
is_default = #{isDefault,jdbcType=BIT},
</if>
...
...
@@ -268,6 +296,8 @@
initial_amount = #{initialAmount,jdbcType=DECIMAL},
current_amount = #{currentAmount,jdbcType=DECIMAL},
remark = #{remark,jdbcType=VARCHAR},
enabled = #{enabled,jdbcType=BIT},
sort = #{sort,jdbcType=VARCHAR},
is_default = #{isDefault,jdbcType=BIT},
tenant_id = #{tenantId,jdbcType=BIGINT},
delete_flag = #{deleteFlag,jdbcType=VARCHAR}
...
...
jshERP-boot/src/main/resources/mapper_xml/DepotMapper.xml
View file @
5a1d4bf5
...
...
@@ -2,10 +2,6 @@
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper
namespace=
"com.jsh.erp.datasource.mappers.DepotMapper"
>
<resultMap
id=
"BaseResultMap"
type=
"com.jsh.erp.datasource.entities.Depot"
>
<!--
WARNING - @mbggenerated
This element is automatically generated by MyBatis Generator, do not modify.
-->
<id
column=
"id"
jdbcType=
"BIGINT"
property=
"id"
/>
<result
column=
"name"
jdbcType=
"VARCHAR"
property=
"name"
/>
<result
column=
"address"
jdbcType=
"VARCHAR"
property=
"address"
/>
...
...
@@ -15,15 +11,12 @@
<result
column=
"sort"
jdbcType=
"VARCHAR"
property=
"sort"
/>
<result
column=
"remark"
jdbcType=
"VARCHAR"
property=
"remark"
/>
<result
column=
"principal"
jdbcType=
"BIGINT"
property=
"principal"
/>
<result
column=
"enabled"
jdbcType=
"BIT"
property=
"enabled"
/>
<result
column=
"tenant_id"
jdbcType=
"BIGINT"
property=
"tenantId"
/>
<result
column=
"delete_Flag"
jdbcType=
"VARCHAR"
property=
"deleteFlag"
/>
<result
column=
"is_default"
jdbcType=
"BIT"
property=
"isDefault"
/>
</resultMap>
<sql
id=
"Example_Where_Clause"
>
<!--
WARNING - @mbggenerated
This element is automatically generated by MyBatis Generator, do not modify.
-->
<where>
<foreach
collection=
"oredCriteria"
item=
"criteria"
separator=
"or"
>
<if
test=
"criteria.valid"
>
...
...
@@ -53,10 +46,6 @@
</where>
</sql>
<sql
id=
"Update_By_Example_Where_Clause"
>
<!--
WARNING - @mbggenerated
This element is automatically generated by MyBatis Generator, do not modify.
-->
<where>
<foreach
collection=
"example.oredCriteria"
item=
"criteria"
separator=
"or"
>
<if
test=
"criteria.valid"
>
...
...
@@ -86,18 +75,10 @@
</where>
</sql>
<sql
id=
"Base_Column_List"
>
<!--
WARNING - @mbggenerated
This element is automatically generated by MyBatis Generator, do not modify.
-->
id, name, address, warehousing, truckage, type, sort, remark, principal, tenant_id,
delete_Flag, is_default
id, name, address, warehousing, truckage, type, sort, remark, principal, enabled,
tenant_id, delete_Flag, is_default
</sql>
<select
id=
"selectByExample"
parameterType=
"com.jsh.erp.datasource.entities.DepotExample"
resultMap=
"BaseResultMap"
>
<!--
WARNING - @mbggenerated
This element is automatically generated by MyBatis Generator, do not modify.
-->
select
<if
test=
"distinct"
>
distinct
...
...
@@ -112,54 +93,34 @@
</if>
</select>
<select
id=
"selectByPrimaryKey"
parameterType=
"java.lang.Long"
resultMap=
"BaseResultMap"
>
<!--
WARNING - @mbggenerated
This element is automatically generated by MyBatis Generator, do not modify.
-->
select
<include
refid=
"Base_Column_List"
/>
from jsh_depot
where id = #{id,jdbcType=BIGINT}
</select>
<delete
id=
"deleteByPrimaryKey"
parameterType=
"java.lang.Long"
>
<!--
WARNING - @mbggenerated
This element is automatically generated by MyBatis Generator, do not modify.
-->
delete from jsh_depot
where id = #{id,jdbcType=BIGINT}
</delete>
<delete
id=
"deleteByExample"
parameterType=
"com.jsh.erp.datasource.entities.DepotExample"
>
<!--
WARNING - @mbggenerated
This element is automatically generated by MyBatis Generator, do not modify.
-->
delete from jsh_depot
<if
test=
"_parameter != null"
>
<include
refid=
"Example_Where_Clause"
/>
</if>
</delete>
<insert
id=
"insert"
parameterType=
"com.jsh.erp.datasource.entities.Depot"
>
<!--
WARNING - @mbggenerated
This element is automatically generated by MyBatis Generator, do not modify.
-->
insert into jsh_depot (id, name, address,
warehousing, truckage, type,
sort, remark, principal,
tenant_id, delete_Flag,
is_default
)
enabled,
tenant_id, delete_Flag,
is_default)
values (#{id,jdbcType=BIGINT}, #{name,jdbcType=VARCHAR}, #{address,jdbcType=VARCHAR},
#{warehousing,jdbcType=DECIMAL}, #{truckage,jdbcType=DECIMAL}, #{type,jdbcType=INTEGER},
#{sort,jdbcType=VARCHAR}, #{remark,jdbcType=VARCHAR}, #{principal,jdbcType=BIGINT},
#{tenantId,jdbcType=BIGINT}, #{deleteFlag,jdbcType=VARCHAR},
#{isDefault,jdbcType=BIT}
)
#{enabled,jdbcType=BIT},
#{tenantId,jdbcType=BIGINT}, #{deleteFlag,jdbcType=VARCHAR},
#{isDefault,jdbcType=BIT})
</insert>
<insert
id=
"insertSelective"
parameterType=
"com.jsh.erp.datasource.entities.Depot"
>
<!--
WARNING - @mbggenerated
This element is automatically generated by MyBatis Generator, do not modify.
-->
insert into jsh_depot
<trim
prefix=
"("
suffix=
")"
suffixOverrides=
","
>
<if
test=
"id != null"
>
...
...
@@ -189,6 +150,9 @@
<if
test=
"principal != null"
>
principal,
</if>
<if
test=
"enabled != null"
>
enabled,
</if>
<if
test=
"tenantId != null"
>
tenant_id,
</if>
...
...
@@ -227,6 +191,9 @@
<if
test=
"principal != null"
>
#{principal,jdbcType=BIGINT},
</if>
<if
test=
"enabled != null"
>
#{enabled,jdbcType=BIT},
</if>
<if
test=
"tenantId != null"
>
#{tenantId,jdbcType=BIGINT},
</if>
...
...
@@ -238,21 +205,13 @@
</if>
</trim>
</insert>
<select
id=
"countByExample"
parameterType=
"com.jsh.erp.datasource.entities.DepotExample"
resultType=
"java.lang.Integer"
>
<!--
WARNING - @mbggenerated
This element is automatically generated by MyBatis Generator, do not modify.
-->
<select
id=
"countByExample"
parameterType=
"com.jsh.erp.datasource.entities.DepotExample"
resultType=
"java.lang.Long"
>
select count(*) from jsh_depot
<if
test=
"_parameter != null"
>
<include
refid=
"Example_Where_Clause"
/>
</if>
</select>
<update
id=
"updateByExampleSelective"
parameterType=
"map"
>
<!--
WARNING - @mbggenerated
This element is automatically generated by MyBatis Generator, do not modify.
-->
update jsh_depot
<set>
<if
test=
"record.id != null"
>
...
...
@@ -282,6 +241,9 @@
<if
test=
"record.principal != null"
>
principal = #{record.principal,jdbcType=BIGINT},
</if>
<if
test=
"record.enabled != null"
>
enabled = #{record.enabled,jdbcType=BIT},
</if>
<if
test=
"record.tenantId != null"
>
tenant_id = #{record.tenantId,jdbcType=BIGINT},
</if>
...
...
@@ -297,10 +259,6 @@
</if>
</update>
<update
id=
"updateByExample"
parameterType=
"map"
>
<!--
WARNING - @mbggenerated
This element is automatically generated by MyBatis Generator, do not modify.
-->
update jsh_depot
set id = #{record.id,jdbcType=BIGINT},
name = #{record.name,jdbcType=VARCHAR},
...
...
@@ -311,6 +269,7 @@
sort = #{record.sort,jdbcType=VARCHAR},
remark = #{record.remark,jdbcType=VARCHAR},
principal = #{record.principal,jdbcType=BIGINT},
enabled = #{record.enabled,jdbcType=BIT},
tenant_id = #{record.tenantId,jdbcType=BIGINT},
delete_Flag = #{record.deleteFlag,jdbcType=VARCHAR},
is_default = #{record.isDefault,jdbcType=BIT}
...
...
@@ -319,10 +278,6 @@
</if>
</update>
<update
id=
"updateByPrimaryKeySelective"
parameterType=
"com.jsh.erp.datasource.entities.Depot"
>
<!--
WARNING - @mbggenerated
This element is automatically generated by MyBatis Generator, do not modify.
-->
update jsh_depot
<set>
<if
test=
"name != null"
>
...
...
@@ -349,6 +304,9 @@
<if
test=
"principal != null"
>
principal = #{principal,jdbcType=BIGINT},
</if>
<if
test=
"enabled != null"
>
enabled = #{enabled,jdbcType=BIT},
</if>
<if
test=
"tenantId != null"
>
tenant_id = #{tenantId,jdbcType=BIGINT},
</if>
...
...
@@ -362,10 +320,6 @@
where id = #{id,jdbcType=BIGINT}
</update>
<update
id=
"updateByPrimaryKey"
parameterType=
"com.jsh.erp.datasource.entities.Depot"
>
<!--
WARNING - @mbggenerated
This element is automatically generated by MyBatis Generator, do not modify.
-->
update jsh_depot
set name = #{name,jdbcType=VARCHAR},
address = #{address,jdbcType=VARCHAR},
...
...
@@ -375,6 +329,7 @@
sort = #{sort,jdbcType=VARCHAR},
remark = #{remark,jdbcType=VARCHAR},
principal = #{principal,jdbcType=BIGINT},
enabled = #{enabled,jdbcType=BIT},
tenant_id = #{tenantId,jdbcType=BIGINT},
delete_Flag = #{deleteFlag,jdbcType=VARCHAR},
is_default = #{isDefault,jdbcType=BIT}
...
...
jshERP-boot/src/main/resources/mapper_xml/InOutItemMapper.xml
View file @
5a1d4bf5
...
...
@@ -6,6 +6,8 @@
<result
column=
"name"
jdbcType=
"VARCHAR"
property=
"name"
/>
<result
column=
"type"
jdbcType=
"VARCHAR"
property=
"type"
/>
<result
column=
"remark"
jdbcType=
"VARCHAR"
property=
"remark"
/>
<result
column=
"enabled"
jdbcType=
"BIT"
property=
"enabled"
/>
<result
column=
"sort"
jdbcType=
"VARCHAR"
property=
"sort"
/>
<result
column=
"tenant_id"
jdbcType=
"BIGINT"
property=
"tenantId"
/>
<result
column=
"delete_flag"
jdbcType=
"VARCHAR"
property=
"deleteFlag"
/>
</resultMap>
...
...
@@ -68,7 +70,7 @@
</where>
</sql>
<sql
id=
"Base_Column_List"
>
id, name, type, remark, tenant_id, delete_flag
id, name, type, remark,
enabled, sort,
tenant_id, delete_flag
</sql>
<select
id=
"selectByExample"
parameterType=
"com.jsh.erp.datasource.entities.InOutItemExample"
resultMap=
"BaseResultMap"
>
select
...
...
@@ -102,11 +104,11 @@
</delete>
<insert
id=
"insert"
parameterType=
"com.jsh.erp.datasource.entities.InOutItem"
>
insert into jsh_in_out_item (id, name, type,
remark,
t
ena
nt_id, delete_flag
)
remark, ena
bled, sort,
tenant_id, delete_flag
)
values (#{id,jdbcType=BIGINT}, #{name,jdbcType=VARCHAR}, #{type,jdbcType=VARCHAR},
#{remark,jdbcType=VARCHAR}, #{
t
ena
ntI
d,jdbcType=BI
GIN
T}, #{
deleteFlag
,jdbcType=VARCHAR}
)
#{remark,jdbcType=VARCHAR}, #{ena
ble
d,jdbcType=BIT}, #{
sort
,jdbcType=VARCHAR}
,
#{tenantId,jdbcType=BIGINT}, #{deleteFlag,jdbcType=VARCHAR}
)
</insert>
<insert
id=
"insertSelective"
parameterType=
"com.jsh.erp.datasource.entities.InOutItem"
>
insert into jsh_in_out_item
...
...
@@ -123,6 +125,12 @@
<if
test=
"remark != null"
>
remark,
</if>
<if
test=
"enabled != null"
>
enabled,
</if>
<if
test=
"sort != null"
>
sort,
</if>
<if
test=
"tenantId != null"
>
tenant_id,
</if>
...
...
@@ -143,6 +151,12 @@
<if
test=
"remark != null"
>
#{remark,jdbcType=VARCHAR},
</if>
<if
test=
"enabled != null"
>
#{enabled,jdbcType=BIT},
</if>
<if
test=
"sort != null"
>
#{sort,jdbcType=VARCHAR},
</if>
<if
test=
"tenantId != null"
>
#{tenantId,jdbcType=BIGINT},
</if>
...
...
@@ -172,6 +186,12 @@
<if
test=
"record.remark != null"
>
remark = #{record.remark,jdbcType=VARCHAR},
</if>
<if
test=
"record.enabled != null"
>
enabled = #{record.enabled,jdbcType=BIT},
</if>
<if
test=
"record.sort != null"
>
sort = #{record.sort,jdbcType=VARCHAR},
</if>
<if
test=
"record.tenantId != null"
>
tenant_id = #{record.tenantId,jdbcType=BIGINT},
</if>
...
...
@@ -189,6 +209,8 @@
name = #{record.name,jdbcType=VARCHAR},
type = #{record.type,jdbcType=VARCHAR},
remark = #{record.remark,jdbcType=VARCHAR},
enabled = #{record.enabled,jdbcType=BIT},
sort = #{record.sort,jdbcType=VARCHAR},
tenant_id = #{record.tenantId,jdbcType=BIGINT},
delete_flag = #{record.deleteFlag,jdbcType=VARCHAR}
<if
test=
"_parameter != null"
>
...
...
@@ -207,6 +229,12 @@
<if
test=
"remark != null"
>
remark = #{remark,jdbcType=VARCHAR},
</if>
<if
test=
"enabled != null"
>
enabled = #{enabled,jdbcType=BIT},
</if>
<if
test=
"sort != null"
>
sort = #{sort,jdbcType=VARCHAR},
</if>
<if
test=
"tenantId != null"
>
tenant_id = #{tenantId,jdbcType=BIGINT},
</if>
...
...
@@ -221,6 +249,8 @@
set name = #{name,jdbcType=VARCHAR},
type = #{type,jdbcType=VARCHAR},
remark = #{remark,jdbcType=VARCHAR},
enabled = #{enabled,jdbcType=BIT},
sort = #{sort,jdbcType=VARCHAR},
tenant_id = #{tenantId,jdbcType=BIGINT},
delete_flag = #{deleteFlag,jdbcType=VARCHAR}
where id = #{id,jdbcType=BIGINT}
...
...
Prev
1
2
Next
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment