From 5a1d4bf5626896c1a9d7fdfe049cca82784b66b6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AD=A3=E5=9C=A3=E5=8D=8E?= <752718920@qq.com> Date: Fri, 26 Aug 2022 00:14:31 +0800 Subject: [PATCH] =?UTF-8?q?=E7=BB=99=E9=83=A8=E5=88=86=E8=A1=A8=E5=A2=9E?= =?UTF-8?q?=E5=8A=A0=E5=90=AF=E7=94=A8=E7=8A=B6=E6=80=81=E5=92=8C=E6=8E=92?= =?UTF-8?q?=E5=BA=8F=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- jshERP-boot/docs/jsh_erp.sql | 69 +- .../docs/数据库更新记录-首次安装请勿使用.txt | 25 +- .../jsh/erp/datasource/entities/Account.java | 20 + .../datasource/entities/AccountExample.java | 130 ++++ .../jsh/erp/datasource/entities/Depot.java | 274 +------ .../erp/datasource/entities/DepotExample.java | 167 ++-- .../erp/datasource/entities/InOutItem.java | 20 + .../datasource/entities/InOutItemExample.java | 130 ++++ .../jsh/erp/datasource/entities/Person.java | 20 + .../datasource/entities/PersonExample.java | 130 ++++ .../com/jsh/erp/datasource/entities/Role.java | 20 + .../erp/datasource/entities/RoleExample.java | 130 ++++ .../jsh/erp/datasource/entities/Supplier.java | 10 + .../datasource/entities/SupplierExample.java | 70 ++ .../com/jsh/erp/datasource/entities/Unit.java | 10 + .../erp/datasource/entities/UnitExample.java | 60 ++ .../erp/datasource/mappers/DepotMapper.java | 68 +- .../resources/mapper_xml/AccountMapper.xml | 42 +- .../main/resources/mapper_xml/DepotMapper.xml | 715 ++++++++---------- .../resources/mapper_xml/InOutItemMapper.xml | 40 +- .../resources/mapper_xml/PersonMapper.xml | 38 +- .../main/resources/mapper_xml/RoleMapper.xml | 42 +- .../resources/mapper_xml/SupplierMapper.xml | 23 +- .../main/resources/mapper_xml/UnitMapper.xml | 23 +- .../src/test/resources/generatorConfig.xml | 2 +- 25 files changed, 1406 insertions(+), 872 deletions(-) diff --git a/jshERP-boot/docs/jsh_erp.sql b/jshERP-boot/docs/jsh_erp.sql index 3002e44b..89e69651 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: 2021-12-12 23:29:17 +Date: 2022-08-26 00:10:15 */ 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 diff --git a/jshERP-boot/docs/数据库更新记录-首次安装请勿使用.txt b/jshERP-boot/docs/数据库更新记录-首次安装请勿使用.txt index 19559cbf..021ad9a9 100644 --- a/jshERP-boot/docs/数据库更新记录-首次安装请勿使用.txt +++ b/jshERP-boot/docs/数据库更新记录-首次安装请勿使用.txt @@ -1369,4 +1369,27 @@ alter table jsh_depot_head add deposit decimal(24,6) DEFAULT NULL COMMENT '订 -- by jishenghua -- 给平台参数表添加手机端激活码 -- -------------------------------------------------------- -INSERT INTO `jsh_platform_config` VALUES ('8', 'app_activation_code', '手机端激活码', ''); \ No newline at end of file +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 diff --git a/jshERP-boot/src/main/java/com/jsh/erp/datasource/entities/Account.java b/jshERP-boot/src/main/java/com/jsh/erp/datasource/entities/Account.java index 8327926c..8e20e156 100644 --- a/jshERP-boot/src/main/java/com/jsh/erp/datasource/entities/Account.java +++ b/jshERP-boot/src/main/java/com/jsh/erp/datasource/entities/Account.java @@ -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; } diff --git a/jshERP-boot/src/main/java/com/jsh/erp/datasource/entities/AccountExample.java b/jshERP-boot/src/main/java/com/jsh/erp/datasource/entities/AccountExample.java index 9f751540..7acec2a2 100644 --- a/jshERP-boot/src/main/java/com/jsh/erp/datasource/entities/AccountExample.java +++ b/jshERP-boot/src/main/java/com/jsh/erp/datasource/entities/AccountExample.java @@ -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 values) { + addCriterion("enabled in", values, "enabled"); + return (Criteria) this; + } + + public Criteria andEnabledNotIn(List 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 values) { + addCriterion("sort in", values, "sort"); + return (Criteria) this; + } + + public Criteria andSortNotIn(List 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; diff --git a/jshERP-boot/src/main/java/com/jsh/erp/datasource/entities/Depot.java b/jshERP-boot/src/main/java/com/jsh/erp/datasource/entities/Depot.java index 9001dff2..0db83929 100644 --- a/jshERP-boot/src/main/java/com/jsh/erp/datasource/entities/Depot.java +++ b/jshERP-boot/src/main/java/com/jsh/erp/datasource/entities/Depot.java @@ -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; } diff --git a/jshERP-boot/src/main/java/com/jsh/erp/datasource/entities/DepotExample.java b/jshERP-boot/src/main/java/com/jsh/erp/datasource/entities/DepotExample.java index 0c542e82..fc73019a 100644 --- a/jshERP-boot/src/main/java/com/jsh/erp/datasource/entities/DepotExample.java +++ b/jshERP-boot/src/main/java/com/jsh/erp/datasource/entities/DepotExample.java @@ -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 oredCriteria; - /** - * This method was generated by MyBatis Generator. - * This method corresponds to the database table jsh_depot - * - * @mbggenerated - */ public DepotExample() { - oredCriteria = new ArrayList(); + 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 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 criteria; protected GeneratedCriteria() { super(); - criteria = new ArrayList(); + 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 values) { + addCriterion("enabled in", values, "enabled"); + return (Criteria) this; + } + + public Criteria andEnabledNotIn(List 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; diff --git a/jshERP-boot/src/main/java/com/jsh/erp/datasource/entities/InOutItem.java b/jshERP-boot/src/main/java/com/jsh/erp/datasource/entities/InOutItem.java index 9c49c3fa..2d9eae6a 100644 --- a/jshERP-boot/src/main/java/com/jsh/erp/datasource/entities/InOutItem.java +++ b/jshERP-boot/src/main/java/com/jsh/erp/datasource/entities/InOutItem.java @@ -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; } diff --git a/jshERP-boot/src/main/java/com/jsh/erp/datasource/entities/InOutItemExample.java b/jshERP-boot/src/main/java/com/jsh/erp/datasource/entities/InOutItemExample.java index be8659c2..2a769b09 100644 --- a/jshERP-boot/src/main/java/com/jsh/erp/datasource/entities/InOutItemExample.java +++ b/jshERP-boot/src/main/java/com/jsh/erp/datasource/entities/InOutItemExample.java @@ -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 values) { + addCriterion("enabled in", values, "enabled"); + return (Criteria) this; + } + + public Criteria andEnabledNotIn(List 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 values) { + addCriterion("sort in", values, "sort"); + return (Criteria) this; + } + + public Criteria andSortNotIn(List 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; diff --git a/jshERP-boot/src/main/java/com/jsh/erp/datasource/entities/Person.java b/jshERP-boot/src/main/java/com/jsh/erp/datasource/entities/Person.java index 9ebbc88f..2b13a7ba 100644 --- a/jshERP-boot/src/main/java/com/jsh/erp/datasource/entities/Person.java +++ b/jshERP-boot/src/main/java/com/jsh/erp/datasource/entities/Person.java @@ -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; } diff --git a/jshERP-boot/src/main/java/com/jsh/erp/datasource/entities/PersonExample.java b/jshERP-boot/src/main/java/com/jsh/erp/datasource/entities/PersonExample.java index 91c3136f..4ef09008 100644 --- a/jshERP-boot/src/main/java/com/jsh/erp/datasource/entities/PersonExample.java +++ b/jshERP-boot/src/main/java/com/jsh/erp/datasource/entities/PersonExample.java @@ -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 values) { + addCriterion("enabled in", values, "enabled"); + return (Criteria) this; + } + + public Criteria andEnabledNotIn(List 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 values) { + addCriterion("sort in", values, "sort"); + return (Criteria) this; + } + + public Criteria andSortNotIn(List 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; diff --git a/jshERP-boot/src/main/java/com/jsh/erp/datasource/entities/Role.java b/jshERP-boot/src/main/java/com/jsh/erp/datasource/entities/Role.java index a68474be..346fa26b 100644 --- a/jshERP-boot/src/main/java/com/jsh/erp/datasource/entities/Role.java +++ b/jshERP-boot/src/main/java/com/jsh/erp/datasource/entities/Role.java @@ -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; } diff --git a/jshERP-boot/src/main/java/com/jsh/erp/datasource/entities/RoleExample.java b/jshERP-boot/src/main/java/com/jsh/erp/datasource/entities/RoleExample.java index 2cb98cca..47bbd308 100644 --- a/jshERP-boot/src/main/java/com/jsh/erp/datasource/entities/RoleExample.java +++ b/jshERP-boot/src/main/java/com/jsh/erp/datasource/entities/RoleExample.java @@ -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 values) { + addCriterion("enabled in", values, "enabled"); + return (Criteria) this; + } + + public Criteria andEnabledNotIn(List 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 values) { + addCriterion("sort in", values, "sort"); + return (Criteria) this; + } + + public Criteria andSortNotIn(List 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; diff --git a/jshERP-boot/src/main/java/com/jsh/erp/datasource/entities/Supplier.java b/jshERP-boot/src/main/java/com/jsh/erp/datasource/entities/Supplier.java index 975457a7..45191b6b 100644 --- a/jshERP-boot/src/main/java/com/jsh/erp/datasource/entities/Supplier.java +++ b/jshERP-boot/src/main/java/com/jsh/erp/datasource/entities/Supplier.java @@ -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; } diff --git a/jshERP-boot/src/main/java/com/jsh/erp/datasource/entities/SupplierExample.java b/jshERP-boot/src/main/java/com/jsh/erp/datasource/entities/SupplierExample.java index 1d771e05..dd1379d8 100644 --- a/jshERP-boot/src/main/java/com/jsh/erp/datasource/entities/SupplierExample.java +++ b/jshERP-boot/src/main/java/com/jsh/erp/datasource/entities/SupplierExample.java @@ -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 values) { + addCriterion("sort in", values, "sort"); + return (Criteria) this; + } + + public Criteria andSortNotIn(List 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; diff --git a/jshERP-boot/src/main/java/com/jsh/erp/datasource/entities/Unit.java b/jshERP-boot/src/main/java/com/jsh/erp/datasource/entities/Unit.java index e5284b5f..c91b6eee 100644 --- a/jshERP-boot/src/main/java/com/jsh/erp/datasource/entities/Unit.java +++ b/jshERP-boot/src/main/java/com/jsh/erp/datasource/entities/Unit.java @@ -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; } diff --git a/jshERP-boot/src/main/java/com/jsh/erp/datasource/entities/UnitExample.java b/jshERP-boot/src/main/java/com/jsh/erp/datasource/entities/UnitExample.java index 503ae7a8..39875b86 100644 --- a/jshERP-boot/src/main/java/com/jsh/erp/datasource/entities/UnitExample.java +++ b/jshERP-boot/src/main/java/com/jsh/erp/datasource/entities/UnitExample.java @@ -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 values) { + addCriterion("enabled in", values, "enabled"); + return (Criteria) this; + } + + public Criteria andEnabledNotIn(List 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; diff --git a/jshERP-boot/src/main/java/com/jsh/erp/datasource/mappers/DepotMapper.java b/jshERP-boot/src/main/java/com/jsh/erp/datasource/mappers/DepotMapper.java index f42e0049..899c64ca 100644 --- a/jshERP-boot/src/main/java/com/jsh/erp/datasource/mappers/DepotMapper.java +++ b/jshERP-boot/src/main/java/com/jsh/erp/datasource/mappers/DepotMapper.java @@ -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 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 diff --git a/jshERP-boot/src/main/resources/mapper_xml/AccountMapper.xml b/jshERP-boot/src/main/resources/mapper_xml/AccountMapper.xml index ce6e500a..bbe7a6df 100644 --- a/jshERP-boot/src/main/resources/mapper_xml/AccountMapper.xml +++ b/jshERP-boot/src/main/resources/mapper_xml/AccountMapper.xml @@ -8,6 +8,8 @@ + + @@ -71,8 +73,8 @@ - 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 - - select - - distinct - - - from jsh_depot - - - - - order by ${orderByClause} - - - - - - delete from jsh_depot - where id = #{id,jdbcType=BIGINT} - - - - delete from jsh_depot - - - - - - - insert into jsh_depot (id, name, address, - warehousing, truckage, type, - sort, remark, principal, - 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} - ) - - - - insert into jsh_depot - - - id, - - - name, - - - address, - - - warehousing, - - - truckage, - - - type, - - - sort, - - - remark, - - - principal, - - - tenant_id, - - - delete_Flag, - - - is_default, - - - - - #{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}, - - - - - - - update jsh_depot - - - id = #{record.id,jdbcType=BIGINT}, - - - name = #{record.name,jdbcType=VARCHAR}, - - - address = #{record.address,jdbcType=VARCHAR}, - - - warehousing = #{record.warehousing,jdbcType=DECIMAL}, - - - truckage = #{record.truckage,jdbcType=DECIMAL}, - - - type = #{record.type,jdbcType=INTEGER}, - - - sort = #{record.sort,jdbcType=VARCHAR}, - - - remark = #{record.remark,jdbcType=VARCHAR}, - - - principal = #{record.principal,jdbcType=BIGINT}, - - - tenant_id = #{record.tenantId,jdbcType=BIGINT}, - - - delete_Flag = #{record.deleteFlag,jdbcType=VARCHAR}, - - - is_default = #{record.isDefault,jdbcType=BIT}, - - - - - - - - - update jsh_depot - set id = #{record.id,jdbcType=BIGINT}, - name = #{record.name,jdbcType=VARCHAR}, - address = #{record.address,jdbcType=VARCHAR}, - warehousing = #{record.warehousing,jdbcType=DECIMAL}, - truckage = #{record.truckage,jdbcType=DECIMAL}, - type = #{record.type,jdbcType=INTEGER}, - sort = #{record.sort,jdbcType=VARCHAR}, - remark = #{record.remark,jdbcType=VARCHAR}, - principal = #{record.principal,jdbcType=BIGINT}, - tenant_id = #{record.tenantId,jdbcType=BIGINT}, - delete_Flag = #{record.deleteFlag,jdbcType=VARCHAR}, - is_default = #{record.isDefault,jdbcType=BIT} - - - - - - - update jsh_depot - - - name = #{name,jdbcType=VARCHAR}, - - - address = #{address,jdbcType=VARCHAR}, - - - warehousing = #{warehousing,jdbcType=DECIMAL}, - - - truckage = #{truckage,jdbcType=DECIMAL}, - - - type = #{type,jdbcType=INTEGER}, - - - sort = #{sort,jdbcType=VARCHAR}, - - - remark = #{remark,jdbcType=VARCHAR}, - - - principal = #{principal,jdbcType=BIGINT}, - - - tenant_id = #{tenantId,jdbcType=BIGINT}, - - - delete_Flag = #{deleteFlag,jdbcType=VARCHAR}, - - - is_default = #{isDefault,jdbcType=BIT}, - - - where id = #{id,jdbcType=BIGINT} - - - - update jsh_depot - set name = #{name,jdbcType=VARCHAR}, - address = #{address,jdbcType=VARCHAR}, - warehousing = #{warehousing,jdbcType=DECIMAL}, - truckage = #{truckage,jdbcType=DECIMAL}, - type = #{type,jdbcType=INTEGER}, - sort = #{sort,jdbcType=VARCHAR}, - remark = #{remark,jdbcType=VARCHAR}, - principal = #{principal,jdbcType=BIGINT}, - tenant_id = #{tenantId,jdbcType=BIGINT}, - delete_Flag = #{deleteFlag,jdbcType=VARCHAR}, - is_default = #{isDefault,jdbcType=BIT} - where id = #{id,jdbcType=BIGINT} - + + + + + + + + + + + + + + + + + + + + + + + + + and ${criterion.condition} + + + and ${criterion.condition} #{criterion.value} + + + and ${criterion.condition} #{criterion.value} and #{criterion.secondValue} + + + and ${criterion.condition} + + #{listItem} + + + + + + + + + + + + + + + + + + and ${criterion.condition} + + + and ${criterion.condition} #{criterion.value} + + + and ${criterion.condition} #{criterion.value} and #{criterion.secondValue} + + + and ${criterion.condition} + + #{listItem} + + + + + + + + + + + id, name, address, warehousing, truckage, type, sort, remark, principal, enabled, + tenant_id, delete_Flag, is_default + + + + + delete from jsh_depot + where id = #{id,jdbcType=BIGINT} + + + delete from jsh_depot + + + + + + insert into jsh_depot (id, name, address, + warehousing, truckage, type, + sort, remark, principal, + 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}, + #{enabled,jdbcType=BIT}, #{tenantId,jdbcType=BIGINT}, #{deleteFlag,jdbcType=VARCHAR}, + #{isDefault,jdbcType=BIT}) + + + insert into jsh_depot + + + id, + + + name, + + + address, + + + warehousing, + + + truckage, + + + type, + + + sort, + + + remark, + + + principal, + + + enabled, + + + tenant_id, + + + delete_Flag, + + + is_default, + + + + + #{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}, + + + #{enabled,jdbcType=BIT}, + + + #{tenantId,jdbcType=BIGINT}, + + + #{deleteFlag,jdbcType=VARCHAR}, + + + #{isDefault,jdbcType=BIT}, + + + + + + update jsh_depot + + + id = #{record.id,jdbcType=BIGINT}, + + + name = #{record.name,jdbcType=VARCHAR}, + + + address = #{record.address,jdbcType=VARCHAR}, + + + warehousing = #{record.warehousing,jdbcType=DECIMAL}, + + + truckage = #{record.truckage,jdbcType=DECIMAL}, + + + type = #{record.type,jdbcType=INTEGER}, + + + 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}, + + + + + + + + update jsh_depot + set id = #{record.id,jdbcType=BIGINT}, + name = #{record.name,jdbcType=VARCHAR}, + address = #{record.address,jdbcType=VARCHAR}, + warehousing = #{record.warehousing,jdbcType=DECIMAL}, + truckage = #{record.truckage,jdbcType=DECIMAL}, + type = #{record.type,jdbcType=INTEGER}, + 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} + + + + + + update jsh_depot + + + name = #{name,jdbcType=VARCHAR}, + + + address = #{address,jdbcType=VARCHAR}, + + + warehousing = #{warehousing,jdbcType=DECIMAL}, + + + truckage = #{truckage,jdbcType=DECIMAL}, + + + type = #{type,jdbcType=INTEGER}, + + + 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}, + + + where id = #{id,jdbcType=BIGINT} + + + update jsh_depot + set name = #{name,jdbcType=VARCHAR}, + address = #{address,jdbcType=VARCHAR}, + warehousing = #{warehousing,jdbcType=DECIMAL}, + truckage = #{truckage,jdbcType=DECIMAL}, + type = #{type,jdbcType=INTEGER}, + 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} + where id = #{id,jdbcType=BIGINT} + \ No newline at end of file diff --git a/jshERP-boot/src/main/resources/mapper_xml/InOutItemMapper.xml b/jshERP-boot/src/main/resources/mapper_xml/InOutItemMapper.xml index 50c2d949..4405511e 100644 --- a/jshERP-boot/src/main/resources/mapper_xml/InOutItemMapper.xml +++ b/jshERP-boot/src/main/resources/mapper_xml/InOutItemMapper.xml @@ -6,6 +6,8 @@ + + @@ -68,7 +70,7 @@ - id, name, type, remark, tenant_id, delete_flag + id, name, type, remark, enabled, sort, tenant_id, delete_flag select @@ -101,9 +103,11 @@ insert into jsh_person (id, type, name, - tenant_id, delete_flag) + enabled, sort, tenant_id, + delete_flag) values (#{id,jdbcType=BIGINT}, #{type,jdbcType=VARCHAR}, #{name,jdbcType=VARCHAR}, - #{tenantId,jdbcType=BIGINT}, #{deleteFlag,jdbcType=VARCHAR}) + #{enabled,jdbcType=BIT}, #{sort,jdbcType=VARCHAR}, #{tenantId,jdbcType=BIGINT}, + #{deleteFlag,jdbcType=VARCHAR}) insert into jsh_person @@ -117,6 +121,12 @@ name, + + enabled, + + + sort, + tenant_id, @@ -134,6 +144,12 @@ #{name,jdbcType=VARCHAR}, + + #{enabled,jdbcType=BIT}, + + + #{sort,jdbcType=VARCHAR}, + #{tenantId,jdbcType=BIGINT}, @@ -160,6 +176,12 @@ name = #{record.name,jdbcType=VARCHAR}, + + enabled = #{record.enabled,jdbcType=BIT}, + + + sort = #{record.sort,jdbcType=VARCHAR}, + tenant_id = #{record.tenantId,jdbcType=BIGINT}, @@ -176,6 +198,8 @@ set id = #{record.id,jdbcType=BIGINT}, type = #{record.type,jdbcType=VARCHAR}, name = #{record.name,jdbcType=VARCHAR}, + enabled = #{record.enabled,jdbcType=BIT}, + sort = #{record.sort,jdbcType=VARCHAR}, tenant_id = #{record.tenantId,jdbcType=BIGINT}, delete_flag = #{record.deleteFlag,jdbcType=VARCHAR} @@ -191,6 +215,12 @@ name = #{name,jdbcType=VARCHAR}, + + enabled = #{enabled,jdbcType=BIT}, + + + sort = #{sort,jdbcType=VARCHAR}, + tenant_id = #{tenantId,jdbcType=BIGINT}, @@ -204,6 +234,8 @@ update jsh_person set type = #{type,jdbcType=VARCHAR}, name = #{name,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} diff --git a/jshERP-boot/src/main/resources/mapper_xml/RoleMapper.xml b/jshERP-boot/src/main/resources/mapper_xml/RoleMapper.xml index 24ec93cb..e95f1105 100644 --- a/jshERP-boot/src/main/resources/mapper_xml/RoleMapper.xml +++ b/jshERP-boot/src/main/resources/mapper_xml/RoleMapper.xml @@ -7,6 +7,8 @@ + + @@ -69,7 +71,7 @@ - id, name, type, value, description, tenant_id, delete_flag + id, name, type, value, description, enabled, sort, tenant_id, delete_flag select @@ -127,7 +128,8 @@ all_need_get, all_need_pay, fax, telephone, address, tax_num, bank_name, account_number, tax_rate, - tenant_id, delete_flag) + sort, tenant_id, delete_flag + ) values (#{id,jdbcType=BIGINT}, #{supplier,jdbcType=VARCHAR}, #{contacts,jdbcType=VARCHAR}, #{phoneNum,jdbcType=VARCHAR}, #{email,jdbcType=VARCHAR}, #{description,jdbcType=VARCHAR}, #{isystem,jdbcType=TINYINT}, #{type,jdbcType=VARCHAR}, #{enabled,jdbcType=BIT}, @@ -135,7 +137,8 @@ #{allNeedGet,jdbcType=DECIMAL}, #{allNeedPay,jdbcType=DECIMAL}, #{fax,jdbcType=VARCHAR}, #{telephone,jdbcType=VARCHAR}, #{address,jdbcType=VARCHAR}, #{taxNum,jdbcType=VARCHAR}, #{bankName,jdbcType=VARCHAR}, #{accountNumber,jdbcType=VARCHAR}, #{taxRate,jdbcType=DECIMAL}, - #{tenantId,jdbcType=BIGINT}, #{deleteFlag,jdbcType=VARCHAR}) + #{sort,jdbcType=VARCHAR}, #{tenantId,jdbcType=BIGINT}, #{deleteFlag,jdbcType=VARCHAR} + ) insert into jsh_supplier @@ -203,6 +206,9 @@ tax_rate, + + sort, + tenant_id, @@ -274,6 +280,9 @@ #{taxRate,jdbcType=DECIMAL}, + + #{sort,jdbcType=VARCHAR}, + #{tenantId,jdbcType=BIGINT}, @@ -354,6 +363,9 @@ tax_rate = #{record.taxRate,jdbcType=DECIMAL}, + + sort = #{record.sort,jdbcType=VARCHAR}, + tenant_id = #{record.tenantId,jdbcType=BIGINT}, @@ -388,6 +400,7 @@ bank_name = #{record.bankName,jdbcType=VARCHAR}, account_number = #{record.accountNumber,jdbcType=VARCHAR}, tax_rate = #{record.taxRate,jdbcType=DECIMAL}, + sort = #{record.sort,jdbcType=VARCHAR}, tenant_id = #{record.tenantId,jdbcType=BIGINT}, delete_flag = #{record.deleteFlag,jdbcType=VARCHAR} @@ -457,6 +470,9 @@ tax_rate = #{taxRate,jdbcType=DECIMAL}, + + sort = #{sort,jdbcType=VARCHAR}, + tenant_id = #{tenantId,jdbcType=BIGINT}, @@ -488,6 +504,7 @@ bank_name = #{bankName,jdbcType=VARCHAR}, account_number = #{accountNumber,jdbcType=VARCHAR}, tax_rate = #{taxRate,jdbcType=DECIMAL}, + sort = #{sort,jdbcType=VARCHAR}, tenant_id = #{tenantId,jdbcType=BIGINT}, delete_flag = #{deleteFlag,jdbcType=VARCHAR} where id = #{id,jdbcType=BIGINT} diff --git a/jshERP-boot/src/main/resources/mapper_xml/UnitMapper.xml b/jshERP-boot/src/main/resources/mapper_xml/UnitMapper.xml index 508ddc97..3bfa4b17 100644 --- a/jshERP-boot/src/main/resources/mapper_xml/UnitMapper.xml +++ b/jshERP-boot/src/main/resources/mapper_xml/UnitMapper.xml @@ -11,6 +11,7 @@ + @@ -74,7 +75,7 @@ id, name, basic_unit, other_unit, other_unit_two, other_unit_three, ratio, ratio_two, - ratio_three, tenant_id, delete_flag + ratio_three, enabled, tenant_id, delete_flag