purovps/jshERP
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

给部分表增加启用状态和排序字段

Browse Source
This commit is contained in:
季圣华
2022-08-26 00:14:31 +08:00
parent fb79e17427
commit 5a1d4bf562
25 changed files with 1406 additions and 872 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -10,7 +10,7 @@ Target Server Type : MYSQL
Target Server Version : 50704 Target Server Version : 50704
File Encoding : 65001 File Encoding : 65001
Date: 2021-12-12 23:29:17 Date: 2022-08-26 00:10:15
*/ */
SET FOREIGN_KEY_CHECKS=0; SET FOREIGN_KEY_CHECKS=0;
@@ -26,6 +26,8 @@ CREATE TABLE `jsh_account` (
`initial_amount` decimal(24,6) DEFAULT NULL COMMENT '期初金额', `initial_amount` decimal(24,6) DEFAULT NULL COMMENT '期初金额',
`current_amount` decimal(24,6) DEFAULT NULL COMMENT '当前余额', `current_amount` decimal(24,6) DEFAULT NULL COMMENT '当前余额',
`remark` varchar(100) 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 '是否默认', `is_default` bit(1) DEFAULT NULL COMMENT '是否默认',
`tenant_id` bigint(20) DEFAULT NULL COMMENT '租户id', `tenant_id` bigint(20) DEFAULT NULL COMMENT '租户id',
`delete_flag` varchar(1) DEFAULT '0' COMMENT '删除标记，0未删除，1删除', `delete_flag` varchar(1) DEFAULT '0' COMMENT '删除标记，0未删除，1删除',
@@ -35,8 +37,8 @@ CREATE TABLE `jsh_account` (
-- ---------------------------- -- ----------------------------
-- Records of 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 ('17', '账户1', 'zzz111', '100.000000', '829.000000', 'aabb', '', null, '', '63', '0');
INSERT INTO `jsh_account` VALUES ('18', '账户2', '1234131324', '200.000000', '-1681.000000', 'bbbb', '\0', '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 -- Table structure for jsh_account_head
@@ -121,6 +123,7 @@ CREATE TABLE `jsh_depot` (
`sort` varchar(10) DEFAULT NULL COMMENT '排序', `sort` varchar(10) DEFAULT NULL COMMENT '排序',
`remark` varchar(100) DEFAULT NULL COMMENT '描述', `remark` varchar(100) DEFAULT NULL COMMENT '描述',
`principal` bigint(20) DEFAULT NULL COMMENT '负责人', `principal` bigint(20) DEFAULT NULL COMMENT '负责人',
`enabled` bit(1) DEFAULT NULL COMMENT '启用',
`tenant_id` bigint(20) DEFAULT NULL COMMENT '租户id', `tenant_id` bigint(20) DEFAULT NULL COMMENT '租户id',
`delete_Flag` varchar(1) DEFAULT '0' COMMENT '删除标记，0未删除，1删除', `delete_Flag` varchar(1) DEFAULT '0' COMMENT '删除标记，0未删除，1删除',
`is_default` bit(1) DEFAULT NULL COMMENT '是否默认', `is_default` bit(1) DEFAULT NULL COMMENT '是否默认',
@@ -130,9 +133,9 @@ CREATE TABLE `jsh_depot` (
-- ---------------------------- -- ----------------------------
-- Records of 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 ('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 ('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 ('17', '仓库3', '123123', '123.000000', '123.000000', '0', '3', '123', '131', '', '63', '0', '\0');
-- ---------------------------- -- ----------------------------
-- Table structure for jsh_depot_head -- Table structure for jsh_depot_head
@@ -349,6 +352,8 @@ CREATE TABLE `jsh_in_out_item` (
`name` varchar(50) DEFAULT NULL COMMENT '名称', `name` varchar(50) DEFAULT NULL COMMENT '名称',
`type` varchar(20) DEFAULT NULL COMMENT '类型', `type` varchar(20) DEFAULT NULL COMMENT '类型',
`remark` varchar(100) 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', `tenant_id` bigint(20) DEFAULT NULL COMMENT '租户id',
`delete_flag` varchar(1) DEFAULT '0' COMMENT '删除标记，0未删除，1删除', `delete_flag` varchar(1) DEFAULT '0' COMMENT '删除标记，0未删除，1删除',
PRIMARY KEY (`id`) PRIMARY KEY (`id`)
@@ -357,9 +362,9 @@ CREATE TABLE `jsh_in_out_item` (
-- ---------------------------- -- ----------------------------
-- Records of 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 ('21', '快递费', '支出', '', '', null, '63', '0');
INSERT INTO `jsh_in_out_item` VALUES ('22', '房租收入', '收入', '', '63', '0'); INSERT INTO `jsh_in_out_item` VALUES ('22', '房租收入', '收入', '', '', null, '63', '0');
INSERT INTO `jsh_in_out_item` VALUES ('23', '利息收入', '收入', '收入', '63', '0'); INSERT INTO `jsh_in_out_item` VALUES ('23', '利息收入', '收入', '收入', '', null, '63', '0');
-- ---------------------------- -- ----------------------------
-- Table structure for jsh_log -- Table structure for jsh_log
@@ -667,6 +672,8 @@ CREATE TABLE `jsh_person` (
`id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT '主键', `id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT '主键',
`type` varchar(20) DEFAULT NULL COMMENT '类型', `type` varchar(20) DEFAULT NULL COMMENT '类型',
`name` varchar(50) 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', `tenant_id` bigint(20) DEFAULT NULL COMMENT '租户id',
`delete_flag` varchar(1) DEFAULT '0' COMMENT '删除标记，0未删除，1删除', `delete_flag` varchar(1) DEFAULT '0' COMMENT '删除标记，0未删除，1删除',
PRIMARY KEY (`id`) PRIMARY KEY (`id`)
@@ -675,10 +682,10 @@ CREATE TABLE `jsh_person` (
-- ---------------------------- -- ----------------------------
-- Records of jsh_person -- Records of jsh_person
-- ---------------------------- -- ----------------------------
INSERT INTO `jsh_person` VALUES ('14', '业务员', '小李', '63', '0'); INSERT INTO `jsh_person` VALUES ('14', '业务员', '小李', '', null, '63', '0');
INSERT INTO `jsh_person` VALUES ('15', '仓管员', '小军', '63', '0'); INSERT INTO `jsh_person` VALUES ('15', '仓管员', '小军', '', null, '63', '0');
INSERT INTO `jsh_person` VALUES ('16', '财务员', '小夏', '63', '0'); INSERT INTO `jsh_person` VALUES ('16', '财务员', '小夏', '', null, '63', '0');
INSERT INTO `jsh_person` VALUES ('17', '财务员', '小曹', '63', '0'); INSERT INTO `jsh_person` VALUES ('17', '财务员', '小曹', '', null, '63', '0');
-- ---------------------------- -- ----------------------------
-- Table structure for jsh_platform_config -- Table structure for jsh_platform_config
@@ -690,7 +697,7 @@ CREATE TABLE `jsh_platform_config` (
`platform_key_info` varchar(100) DEFAULT NULL COMMENT '关键词名称', `platform_key_info` varchar(100) DEFAULT NULL COMMENT '关键词名称',
`platform_value` varchar(200) DEFAULT NULL COMMENT '值', `platform_value` varchar(200) DEFAULT NULL COMMENT '值',
PRIMARY KEY (`id`) 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 -- Records of jsh_platform_config
@@ -714,6 +721,8 @@ CREATE TABLE `jsh_role` (
`type` varchar(50) DEFAULT NULL COMMENT '类型', `type` varchar(50) DEFAULT NULL COMMENT '类型',
`value` varchar(200) DEFAULT NULL COMMENT '值', `value` varchar(200) DEFAULT NULL COMMENT '值',
`description` varchar(100) 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', `tenant_id` bigint(20) DEFAULT NULL COMMENT '租户id',
`delete_flag` varchar(1) DEFAULT '0' COMMENT '删除标记，0未删除，1删除', `delete_flag` varchar(1) DEFAULT '0' COMMENT '删除标记，0未删除，1删除',
PRIMARY KEY (`id`) PRIMARY KEY (`id`)
@@ -722,10 +731,10 @@ CREATE TABLE `jsh_role` (
-- ---------------------------- -- ----------------------------
-- Records of jsh_role -- Records of jsh_role
-- ---------------------------- -- ----------------------------
INSERT INTO `jsh_role` VALUES ('4', '管理员', '全部数据', null, null, null, '0'); INSERT INTO `jsh_role` VALUES ('4', '管理员', '全部数据', null, null, '', null, null, '0');
INSERT INTO `jsh_role` VALUES ('10', '租户', '全部数据', null, '', null, '0'); INSERT INTO `jsh_role` VALUES ('10', '租户', '全部数据', null, '', '', null, null, '0');
INSERT INTO `jsh_role` VALUES ('16', '销售经理', '全部数据', null, 'ddd', '63', '0'); INSERT INTO `jsh_role` VALUES ('16', '销售经理', '全部数据', null, 'ddd', '', null, '63', '0');
INSERT INTO `jsh_role` VALUES ('17', '销售代表', '个人数据', null, 'rrr', '63', '0'); INSERT INTO `jsh_role` VALUES ('17', '销售代表', '个人数据', null, 'rrr', '', null, '63', '0');
-- ---------------------------- -- ----------------------------
-- Table structure for jsh_sequence -- Table structure for jsh_sequence
@@ -801,6 +810,7 @@ CREATE TABLE `jsh_supplier` (
`bank_name` varchar(50) DEFAULT NULL COMMENT '开户行', `bank_name` varchar(50) DEFAULT NULL COMMENT '开户行',
`account_number` varchar(50) DEFAULT NULL COMMENT '账号', `account_number` varchar(50) DEFAULT NULL COMMENT '账号',
`tax_rate` decimal(24,6) 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', `tenant_id` bigint(20) DEFAULT NULL COMMENT '租户id',
`delete_flag` varchar(1) DEFAULT '0' COMMENT '删除标记，0未删除，1删除', `delete_flag` varchar(1) DEFAULT '0' COMMENT '删除标记，0未删除，1删除',
PRIMARY KEY (`id`) PRIMARY KEY (`id`)
@@ -809,13 +819,13 @@ CREATE TABLE `jsh_supplier` (
-- ---------------------------- -- ----------------------------
-- Records of 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 ('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', '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, '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, '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', '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, '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', '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 -- Table structure for jsh_system_config
@@ -880,6 +890,7 @@ CREATE TABLE `jsh_unit` (
`ratio` int(11) DEFAULT NULL COMMENT '比例', `ratio` int(11) DEFAULT NULL COMMENT '比例',
`ratio_two` int(11) DEFAULT NULL COMMENT '比例2', `ratio_two` int(11) DEFAULT NULL COMMENT '比例2',
`ratio_three` int(11) DEFAULT NULL COMMENT '比例3', `ratio_three` int(11) DEFAULT NULL COMMENT '比例3',
`enabled` bit(1) DEFAULT NULL COMMENT '启用',
`tenant_id` bigint(20) DEFAULT NULL COMMENT '租户id', `tenant_id` bigint(20) DEFAULT NULL COMMENT '租户id',
`delete_flag` varchar(1) DEFAULT '0' COMMENT '删除标记，0未删除，1删除', `delete_flag` varchar(1) DEFAULT '0' COMMENT '删除标记，0未删除，1删除',
PRIMARY KEY (`id`) PRIMARY KEY (`id`)
@@ -888,10 +899,10 @@ CREATE TABLE `jsh_unit` (
-- ---------------------------- -- ----------------------------
-- Records of 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 ('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 ('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 ('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 ('21', '瓶/(箱=12瓶)', '瓶', '箱', null, null, '12', null, null, '', '63', '0');
-- ---------------------------- -- ----------------------------
-- Table structure for jsh_user -- Table structure for jsh_user

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

@@ -1369,4 +1369,27 @@ alter table jsh_depot_head add deposit decimal(24,6) DEFAULT NULL COMMENT '订
-- by jishenghua -- by jishenghua
-- 给平台参数表添加手机端激活码 -- 给平台参数表添加手机端激活码
-- -------------------------------------------------------- -- --------------------------------------------------------
INSERT INTO `jsh_platform_config` VALUES ('8', 'app_activation_code', '手机端激活码', ''); 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;

20
jshERP-boot/src/main/java/com/jsh/erp/datasource/entities/Account.java
View File

@@ -15,6 +15,10 @@ public class Account {
private String remark; private String remark;
private Boolean enabled;
private String sort;
private Boolean isDefault; private Boolean isDefault;
private Long tenantId; private Long tenantId;
@@ -69,6 +73,22 @@ public class Account {
this.remark = remark == null ? null : remark.trim(); 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() { public Boolean getIsDefault() {
return isDefault; return isDefault;
} }

130
jshERP-boot/src/main/java/com/jsh/erp/datasource/entities/AccountExample.java
View File

@@ -495,6 +495,136 @@ public class AccountExample {
return (Criteria) this; 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() { public Criteria andIsDefaultIsNull() {
addCriterion("is_default is null"); addCriterion("is_default is null");
return (Criteria) this; return (Criteria) this;

274
jshERP-boot/src/main/java/com/jsh/erp/datasource/entities/Depot.java
View File

@@ -3,386 +3,132 @@ package com.jsh.erp.datasource.entities;
import java.math.BigDecimal; import java.math.BigDecimal;
public class Depot { public class Depot {
/**
* This field was generated by MyBatis Generator.
* This field corresponds to the database column jsh_depot.id
*
* @mbggenerated
*/
private Long id; private Long id;
/**
* This field was generated by MyBatis Generator.
* This field corresponds to the database column jsh_depot.name
*
* @mbggenerated
*/
private String name; private String name;
/**
* This field was generated by MyBatis Generator.
* This field corresponds to the database column jsh_depot.address
*
* @mbggenerated
*/
private String address; private String address;
/**
* This field was generated by MyBatis Generator.
* This field corresponds to the database column jsh_depot.warehousing
*
* @mbggenerated
*/
private BigDecimal warehousing; private BigDecimal warehousing;
/**
* This field was generated by MyBatis Generator.
* This field corresponds to the database column jsh_depot.truckage
*
* @mbggenerated
*/
private BigDecimal truckage; private BigDecimal truckage;
/**
* This field was generated by MyBatis Generator.
* This field corresponds to the database column jsh_depot.type
*
* @mbggenerated
*/
private Integer type; private Integer type;
/**
* This field was generated by MyBatis Generator.
* This field corresponds to the database column jsh_depot.sort
*
* @mbggenerated
*/
private String sort; private String sort;
/**
* This field was generated by MyBatis Generator.
* This field corresponds to the database column jsh_depot.remark
*
* @mbggenerated
*/
private String remark; private String remark;
/**
* This field was generated by MyBatis Generator.
* This field corresponds to the database column jsh_depot.principal
*
* @mbggenerated
*/
private Long principal; private Long principal;
/** private Boolean enabled;
* This field was generated by MyBatis Generator.
* This field corresponds to the database column jsh_depot.tenant_id
*
* @mbggenerated
*/
private Long tenantId; 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; 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; 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() { public Long getId() {
return id; 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) { public void setId(Long id) {
this.id = 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() { public String getName() {
return name; 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) { public void setName(String name) {
this.name = name == null ? null : name.trim(); 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() { public String getAddress() {
return address; 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) { public void setAddress(String address) {
this.address = address == null ? null : address.trim(); 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() { public BigDecimal getWarehousing() {
return warehousing; 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) { public void setWarehousing(BigDecimal warehousing) {
this.warehousing = 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() { public BigDecimal getTruckage() {
return truckage; 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) { public void setTruckage(BigDecimal truckage) {
this.truckage = 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() { public Integer getType() {
return type; 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) { public void setType(Integer type) {
this.type = 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() { public String getSort() {
return sort; 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) { public void setSort(String sort) {
this.sort = sort == null ? null : sort.trim(); 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() { public String getRemark() {
return remark; 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) { public void setRemark(String remark) {
this.remark = remark == null ? null : remark.trim(); 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() { public Long getPrincipal() {
return principal; 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) { public void setPrincipal(Long principal) {
this.principal = principal; this.principal = principal;
} }
/** public Boolean getEnabled() {
* This method was generated by MyBatis Generator. return enabled;
* This method returns the value of the database column jsh_depot.tenant_id }
*
* @return the value of jsh_depot.tenant_id public void setEnabled(Boolean enabled) {
* this.enabled = enabled;
* @mbggenerated }
*/
public Long getTenantId() { public Long getTenantId() {
return tenantId; 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) { public void setTenantId(Long tenantId) {
this.tenantId = 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() { public String getDeleteFlag() {
return deleteFlag; 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) { public void setDeleteFlag(String deleteFlag) {
this.deleteFlag = deleteFlag == null ? null : deleteFlag.trim(); 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() { public Boolean getIsDefault() {
return isDefault; 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) { public void setIsDefault(Boolean isDefault) {
this.isDefault = isDefault; this.isDefault = isDefault;
} }

167
jshERP-boot/src/main/java/com/jsh/erp/datasource/entities/DepotExample.java
View File

@@ -5,118 +5,46 @@ import java.util.ArrayList;
import java.util.List; import java.util.List;
public class DepotExample { public class DepotExample {
/**
* This field was generated by MyBatis Generator.
* This field corresponds to the database table jsh_depot
*
* @mbggenerated
*/
protected String orderByClause; protected String orderByClause;
/**
* This field was generated by MyBatis Generator.
* This field corresponds to the database table jsh_depot
*
* @mbggenerated
*/
protected boolean distinct; protected boolean distinct;
/**
* This field was generated by MyBatis Generator.
* This field corresponds to the database table jsh_depot
*
* @mbggenerated
*/
protected List<Criteria> oredCriteria; protected List<Criteria> oredCriteria;
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table jsh_depot
*
* @mbggenerated
*/
public DepotExample() { 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) { public void setOrderByClause(String orderByClause) {
this.orderByClause = orderByClause; this.orderByClause = orderByClause;
} }
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table jsh_depot
*
* @mbggenerated
*/
public String getOrderByClause() { public String getOrderByClause() {
return orderByClause; return orderByClause;
} }
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table jsh_depot
*
* @mbggenerated
*/
public void setDistinct(boolean distinct) { public void setDistinct(boolean distinct) {
this.distinct = distinct; this.distinct = distinct;
} }
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table jsh_depot
*
* @mbggenerated
*/
public boolean isDistinct() { public boolean isDistinct() {
return distinct; return distinct;
} }
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table jsh_depot
*
* @mbggenerated
*/
public List<Criteria> getOredCriteria() { public List<Criteria> getOredCriteria() {
return oredCriteria; return oredCriteria;
} }
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table jsh_depot
*
* @mbggenerated
*/
public void or(Criteria criteria) { public void or(Criteria criteria) {
oredCriteria.add(criteria); oredCriteria.add(criteria);
} }
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table jsh_depot
*
* @mbggenerated
*/
public Criteria or() { public Criteria or() {
Criteria criteria = createCriteriaInternal(); Criteria criteria = createCriteriaInternal();
oredCriteria.add(criteria); oredCriteria.add(criteria);
return criteria; return criteria;
} }
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table jsh_depot
*
* @mbggenerated
*/
public Criteria createCriteria() { public Criteria createCriteria() {
Criteria criteria = createCriteriaInternal(); Criteria criteria = createCriteriaInternal();
if (oredCriteria.size() == 0) { if (oredCriteria.size() == 0) {
@@ -125,41 +53,23 @@ public class DepotExample {
return criteria; return criteria;
} }
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table jsh_depot
*
* @mbggenerated
*/
protected Criteria createCriteriaInternal() { protected Criteria createCriteriaInternal() {
Criteria criteria = new Criteria(); Criteria criteria = new Criteria();
return criteria; return criteria;
} }
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table jsh_depot
*
* @mbggenerated
*/
public void clear() { public void clear() {
oredCriteria.clear(); oredCriteria.clear();
orderByClause = null; orderByClause = null;
distinct = false; 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 abstract static class GeneratedCriteria {
protected List<Criterion> criteria; protected List<Criterion> criteria;
protected GeneratedCriteria() { protected GeneratedCriteria() {
super(); super();
criteria = new ArrayList<Criterion>(); criteria = new ArrayList<>();
} }
public boolean isValid() { public boolean isValid() {
@@ -775,6 +685,66 @@ public class DepotExample {
return (Criteria) this; 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() { public Criteria andTenantIdIsNull() {
addCriterion("tenant_id is null"); addCriterion("tenant_id is null");
return (Criteria) this; 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 { public static class Criteria extends GeneratedCriteria {
protected Criteria() { protected Criteria() {
super(); super();
} }
} }
/**
* This class was generated by MyBatis Generator.
* This class corresponds to the database table jsh_depot
*
* @mbggenerated
*/
public static class Criterion { public static class Criterion {
private String condition; private String condition;

20
jshERP-boot/src/main/java/com/jsh/erp/datasource/entities/InOutItem.java
View File

@@ -9,6 +9,10 @@ public class InOutItem {
private String remark; private String remark;
private Boolean enabled;
private String sort;
private Long tenantId; private Long tenantId;
private String deleteFlag; private String deleteFlag;
@@ -45,6 +49,22 @@ public class InOutItem {
this.remark = remark == null ? null : remark.trim(); 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() { public Long getTenantId() {
return tenantId; return tenantId;
} }

130
jshERP-boot/src/main/java/com/jsh/erp/datasource/entities/InOutItemExample.java
View File

@@ -374,6 +374,136 @@ public class InOutItemExample {
return (Criteria) this; 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() { public Criteria andTenantIdIsNull() {
addCriterion("tenant_id is null"); addCriterion("tenant_id is null");
return (Criteria) this; return (Criteria) this;

20
jshERP-boot/src/main/java/com/jsh/erp/datasource/entities/Person.java
View File

@@ -7,6 +7,10 @@ public class Person {
private String name; private String name;
private Boolean enabled;
private String sort;
private Long tenantId; private Long tenantId;
private String deleteFlag; private String deleteFlag;
@@ -35,6 +39,22 @@ public class Person {
this.name = name == null ? null : name.trim(); 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() { public Long getTenantId() {
return tenantId; return tenantId;
} }

130
jshERP-boot/src/main/java/com/jsh/erp/datasource/entities/PersonExample.java
View File

@@ -304,6 +304,136 @@ public class PersonExample {
return (Criteria) this; 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() { public Criteria andTenantIdIsNull() {
addCriterion("tenant_id is null"); addCriterion("tenant_id is null");
return (Criteria) this; return (Criteria) this;

20
jshERP-boot/src/main/java/com/jsh/erp/datasource/entities/Role.java
View File

@@ -11,6 +11,10 @@ public class Role {
private String description; private String description;
private Boolean enabled;
private String sort;
private Long tenantId; private Long tenantId;
private String deleteFlag; private String deleteFlag;
@@ -55,6 +59,22 @@ public class Role {
this.description = description == null ? null : description.trim(); 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() { public Long getTenantId() {
return tenantId; return tenantId;
} }

130
jshERP-boot/src/main/java/com/jsh/erp/datasource/entities/RoleExample.java
View File

@@ -444,6 +444,136 @@ public class RoleExample {
return (Criteria) this; 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() { public Criteria andTenantIdIsNull() {
addCriterion("tenant_id is null"); addCriterion("tenant_id is null");
return (Criteria) this; return (Criteria) this;

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

@@ -45,6 +45,8 @@ public class Supplier {
private BigDecimal taxRate; private BigDecimal taxRate;
private String sort;
private Long tenantId; private Long tenantId;
private String deleteFlag; private String deleteFlag;
@@ -217,6 +219,14 @@ public class Supplier {
this.taxRate = taxRate; this.taxRate = taxRate;
} }
public String getSort() {
return sort;
}
public void setSort(String sort) {
this.sort = sort == null ? null : sort.trim();
}
public Long getTenantId() { public Long getTenantId() {
return tenantId; return tenantId;
} }

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

@@ -1485,6 +1485,76 @@ public class SupplierExample {
return (Criteria) this; 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() { public Criteria andTenantIdIsNull() {
addCriterion("tenant_id is null"); addCriterion("tenant_id is null");
return (Criteria) this; return (Criteria) this;

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

@@ -19,6 +19,8 @@ public class Unit {
private Integer ratioThree; private Integer ratioThree;
private Boolean enabled;
private Long tenantId; private Long tenantId;
private String deleteFlag; private String deleteFlag;
@@ -95,6 +97,14 @@ public class Unit {
this.ratioThree = ratioThree; this.ratioThree = ratioThree;
} }
public Boolean getEnabled() {
return enabled;
}
public void setEnabled(Boolean enabled) {
this.enabled = enabled;
}
public Long getTenantId() { public Long getTenantId() {
return tenantId; return tenantId;
} }

60
jshERP-boot/src/main/java/com/jsh/erp/datasource/entities/UnitExample.java
View File

@@ -694,6 +694,66 @@ public class UnitExample {
return (Criteria) this; 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() { public Criteria andTenantIdIsNull() {
addCriterion("tenant_id is null"); addCriterion("tenant_id is null");
return (Criteria) this; return (Criteria) this;

68
jshERP-boot/src/main/java/com/jsh/erp/datasource/mappers/DepotMapper.java
View File

@@ -6,91 +6,25 @@ import java.util.List;
import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Param;
public interface DepotMapper { public interface DepotMapper {
/** long countByExample(DepotExample example);
* This method was generated by MyBatis Generator.
* This method corresponds to the database table jsh_depot
*
* @mbggenerated
*/
int countByExample(DepotExample example);
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table jsh_depot
*
* @mbggenerated
*/
int deleteByExample(DepotExample example); 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); 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); 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); 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); 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); 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); 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); 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); 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); int updateByPrimaryKey(Depot record);
} }

42
jshERP-boot/src/main/resources/mapper_xml/AccountMapper.xml
View File

@@ -8,6 +8,8 @@
<result column="initial_amount" jdbcType="DECIMAL" property="initialAmount" /> <result column="initial_amount" jdbcType="DECIMAL" property="initialAmount" />
<result column="current_amount" jdbcType="DECIMAL" property="currentAmount" /> <result column="current_amount" jdbcType="DECIMAL" property="currentAmount" />
<result column="remark" jdbcType="VARCHAR" property="remark" /> <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="is_default" jdbcType="BIT" property="isDefault" />
<result column="tenant_id" jdbcType="BIGINT" property="tenantId" /> <result column="tenant_id" jdbcType="BIGINT" property="tenantId" />
<result column="delete_flag" jdbcType="VARCHAR" property="deleteFlag" /> <result column="delete_flag" jdbcType="VARCHAR" property="deleteFlag" />
@@ -71,8 +73,8 @@
</where> </where>
</sql> </sql>
<sql id="Base_Column_List"> <sql id="Base_Column_List">
id, name, serial_no, initial_amount, current_amount, remark, is_default, tenant_id, id, name, serial_no, initial_amount, current_amount, remark, enabled, sort, is_default,
delete_flag tenant_id, delete_flag
</sql> </sql>
<select id="selectByExample" parameterType="com.jsh.erp.datasource.entities.AccountExample" resultMap="BaseResultMap"> <select id="selectByExample" parameterType="com.jsh.erp.datasource.entities.AccountExample" resultMap="BaseResultMap">
select select
@@ -107,12 +109,12 @@
<insert id="insert" parameterType="com.jsh.erp.datasource.entities.Account"> <insert id="insert" parameterType="com.jsh.erp.datasource.entities.Account">
insert into jsh_account (id, name, serial_no, insert into jsh_account (id, name, serial_no,
initial_amount, current_amount, remark, 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}, values (#{id,jdbcType=BIGINT}, #{name,jdbcType=VARCHAR}, #{serialNo,jdbcType=VARCHAR},
#{initialAmount,jdbcType=DECIMAL}, #{currentAmount,jdbcType=DECIMAL}, #{remark,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>
<insert id="insertSelective" parameterType="com.jsh.erp.datasource.entities.Account"> <insert id="insertSelective" parameterType="com.jsh.erp.datasource.entities.Account">
insert into jsh_account insert into jsh_account
@@ -135,6 +137,12 @@
<if test="remark != null"> <if test="remark != null">
remark, remark,
</if> </if>
<if test="enabled != null">
enabled,
</if>
<if test="sort != null">
sort,
</if>
<if test="isDefault != null"> <if test="isDefault != null">
is_default, is_default,
</if> </if>
@@ -164,6 +172,12 @@
<if test="remark != null"> <if test="remark != null">
#{remark,jdbcType=VARCHAR}, #{remark,jdbcType=VARCHAR},
</if> </if>
<if test="enabled != null">
#{enabled,jdbcType=BIT},
</if>
<if test="sort != null">
#{sort,jdbcType=VARCHAR},
</if>
<if test="isDefault != null"> <if test="isDefault != null">
#{isDefault,jdbcType=BIT}, #{isDefault,jdbcType=BIT},
</if> </if>
@@ -202,6 +216,12 @@
<if test="record.remark != null"> <if test="record.remark != null">
remark = #{record.remark,jdbcType=VARCHAR}, remark = #{record.remark,jdbcType=VARCHAR},
</if> </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"> <if test="record.isDefault != null">
is_default = #{record.isDefault,jdbcType=BIT}, is_default = #{record.isDefault,jdbcType=BIT},
</if> </if>
@@ -224,6 +244,8 @@
initial_amount = #{record.initialAmount,jdbcType=DECIMAL}, initial_amount = #{record.initialAmount,jdbcType=DECIMAL},
current_amount = #{record.currentAmount,jdbcType=DECIMAL}, current_amount = #{record.currentAmount,jdbcType=DECIMAL},
remark = #{record.remark,jdbcType=VARCHAR}, remark = #{record.remark,jdbcType=VARCHAR},
enabled = #{record.enabled,jdbcType=BIT},
sort = #{record.sort,jdbcType=VARCHAR},
is_default = #{record.isDefault,jdbcType=BIT}, is_default = #{record.isDefault,jdbcType=BIT},
tenant_id = #{record.tenantId,jdbcType=BIGINT}, tenant_id = #{record.tenantId,jdbcType=BIGINT},
delete_flag = #{record.deleteFlag,jdbcType=VARCHAR} delete_flag = #{record.deleteFlag,jdbcType=VARCHAR}
@@ -249,6 +271,12 @@
<if test="remark != null"> <if test="remark != null">
remark = #{remark,jdbcType=VARCHAR}, remark = #{remark,jdbcType=VARCHAR},
</if> </if>
<if test="enabled != null">
enabled = #{enabled,jdbcType=BIT},
</if>
<if test="sort != null">
sort = #{sort,jdbcType=VARCHAR},
</if>
<if test="isDefault != null"> <if test="isDefault != null">
is_default = #{isDefault,jdbcType=BIT}, is_default = #{isDefault,jdbcType=BIT},
</if> </if>
@@ -268,6 +296,8 @@
initial_amount = #{initialAmount,jdbcType=DECIMAL}, initial_amount = #{initialAmount,jdbcType=DECIMAL},
current_amount = #{currentAmount,jdbcType=DECIMAL}, current_amount = #{currentAmount,jdbcType=DECIMAL},
remark = #{remark,jdbcType=VARCHAR}, remark = #{remark,jdbcType=VARCHAR},
enabled = #{enabled,jdbcType=BIT},
sort = #{sort,jdbcType=VARCHAR},
is_default = #{isDefault,jdbcType=BIT}, is_default = #{isDefault,jdbcType=BIT},
tenant_id = #{tenantId,jdbcType=BIGINT}, tenant_id = #{tenantId,jdbcType=BIGINT},
delete_flag = #{deleteFlag,jdbcType=VARCHAR} delete_flag = #{deleteFlag,jdbcType=VARCHAR}

715
jshERP-boot/src/main/resources/mapper_xml/DepotMapper.xml
View File

@@ -1,383 +1,338 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> <!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"> <mapper namespace="com.jsh.erp.datasource.mappers.DepotMapper">
<resultMap id="BaseResultMap" type="com.jsh.erp.datasource.entities.Depot"> <resultMap id="BaseResultMap" type="com.jsh.erp.datasource.entities.Depot">
<!-- <id column="id" jdbcType="BIGINT" property="id" />
WARNING - @mbggenerated <result column="name" jdbcType="VARCHAR" property="name" />
This element is automatically generated by MyBatis Generator, do not modify. <result column="address" jdbcType="VARCHAR" property="address" />
--> <result column="warehousing" jdbcType="DECIMAL" property="warehousing" />
<id column="id" jdbcType="BIGINT" property="id" /> <result column="truckage" jdbcType="DECIMAL" property="truckage" />
<result column="name" jdbcType="VARCHAR" property="name" /> <result column="type" jdbcType="INTEGER" property="type" />
<result column="address" jdbcType="VARCHAR" property="address" /> <result column="sort" jdbcType="VARCHAR" property="sort" />
<result column="warehousing" jdbcType="DECIMAL" property="warehousing" /> <result column="remark" jdbcType="VARCHAR" property="remark" />
<result column="truckage" jdbcType="DECIMAL" property="truckage" /> <result column="principal" jdbcType="BIGINT" property="principal" />
<result column="type" jdbcType="INTEGER" property="type" /> <result column="enabled" jdbcType="BIT" property="enabled" />
<result column="sort" jdbcType="VARCHAR" property="sort" /> <result column="tenant_id" jdbcType="BIGINT" property="tenantId" />
<result column="remark" jdbcType="VARCHAR" property="remark" /> <result column="delete_Flag" jdbcType="VARCHAR" property="deleteFlag" />
<result column="principal" jdbcType="BIGINT" property="principal" /> <result column="is_default" jdbcType="BIT" property="isDefault" />
<result column="tenant_id" jdbcType="BIGINT" property="tenantId" /> </resultMap>
<result column="delete_Flag" jdbcType="VARCHAR" property="deleteFlag" /> <sql id="Example_Where_Clause">
<result column="is_default" jdbcType="BIT" property="isDefault" /> <where>
</resultMap> <foreach collection="oredCriteria" item="criteria" separator="or">
<sql id="Example_Where_Clause"> <if test="criteria.valid">
<!-- <trim prefix="(" prefixOverrides="and" suffix=")">
WARNING - @mbggenerated <foreach collection="criteria.criteria" item="criterion">
This element is automatically generated by MyBatis Generator, do not modify. <choose>
--> <when test="criterion.noValue">
<where> and ${criterion.condition}
<foreach collection="oredCriteria" item="criteria" separator="or"> </when>
<if test="criteria.valid"> <when test="criterion.singleValue">
<trim prefix="(" prefixOverrides="and" suffix=")"> and ${criterion.condition} #{criterion.value}
<foreach collection="criteria.criteria" item="criterion"> </when>
<choose> <when test="criterion.betweenValue">
<when test="criterion.noValue"> and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
and ${criterion.condition} </when>
</when> <when test="criterion.listValue">
<when test="criterion.singleValue"> and ${criterion.condition}
and ${criterion.condition} #{criterion.value} <foreach close=")" collection="criterion.value" item="listItem" open="(" separator=",">
</when> #{listItem}
<when test="criterion.betweenValue"> </foreach>
and ${criterion.condition} #{criterion.value} and #{criterion.secondValue} </when>
</when> </choose>
<when test="criterion.listValue"> </foreach>
and ${criterion.condition} </trim>
<foreach close=")" collection="criterion.value" item="listItem" open="(" separator=","> </if>
#{listItem} </foreach>
</foreach> </where>
</when> </sql>
</choose> <sql id="Update_By_Example_Where_Clause">
</foreach> <where>
</trim> <foreach collection="example.oredCriteria" item="criteria" separator="or">
</if> <if test="criteria.valid">
</foreach> <trim prefix="(" prefixOverrides="and" suffix=")">
</where> <foreach collection="criteria.criteria" item="criterion">
</sql> <choose>
<sql id="Update_By_Example_Where_Clause"> <when test="criterion.noValue">
<!-- and ${criterion.condition}
WARNING - @mbggenerated </when>
This element is automatically generated by MyBatis Generator, do not modify. <when test="criterion.singleValue">
--> and ${criterion.condition} #{criterion.value}
<where> </when>
<foreach collection="example.oredCriteria" item="criteria" separator="or"> <when test="criterion.betweenValue">
<if test="criteria.valid"> and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
<trim prefix="(" prefixOverrides="and" suffix=")"> </when>
<foreach collection="criteria.criteria" item="criterion"> <when test="criterion.listValue">
<choose> and ${criterion.condition}
<when test="criterion.noValue"> <foreach close=")" collection="criterion.value" item="listItem" open="(" separator=",">
and ${criterion.condition} #{listItem}
</when> </foreach>
<when test="criterion.singleValue"> </when>
and ${criterion.condition} #{criterion.value} </choose>
</when> </foreach>
<when test="criterion.betweenValue"> </trim>
and ${criterion.condition} #{criterion.value} and #{criterion.secondValue} </if>
</when> </foreach>
<when test="criterion.listValue"> </where>
and ${criterion.condition} </sql>
<foreach close=")" collection="criterion.value" item="listItem" open="(" separator=","> <sql id="Base_Column_List">
#{listItem} id, name, address, warehousing, truckage, type, sort, remark, principal, enabled,
</foreach> tenant_id, delete_Flag, is_default
</when> </sql>
</choose> <select id="selectByExample" parameterType="com.jsh.erp.datasource.entities.DepotExample" resultMap="BaseResultMap">
</foreach> select
</trim> <if test="distinct">
</if> distinct
</foreach> </if>
</where> <include refid="Base_Column_List" />
</sql> from jsh_depot
<sql id="Base_Column_List"> <if test="_parameter != null">
<!-- <include refid="Example_Where_Clause" />
WARNING - @mbggenerated </if>
This element is automatically generated by MyBatis Generator, do not modify. <if test="orderByClause != null">
--> order by ${orderByClause}
id, name, address, warehousing, truckage, type, sort, remark, principal, tenant_id, </if>
delete_Flag, is_default </select>
</sql> <select id="selectByPrimaryKey" parameterType="java.lang.Long" resultMap="BaseResultMap">
<select id="selectByExample" parameterType="com.jsh.erp.datasource.entities.DepotExample" resultMap="BaseResultMap"> select
<!-- <include refid="Base_Column_List" />
WARNING - @mbggenerated from jsh_depot
This element is automatically generated by MyBatis Generator, do not modify. where id = #{id,jdbcType=BIGINT}
--> </select>
select <delete id="deleteByPrimaryKey" parameterType="java.lang.Long">
<if test="distinct"> delete from jsh_depot
distinct where id = #{id,jdbcType=BIGINT}
</if> </delete>
<include refid="Base_Column_List" /> <delete id="deleteByExample" parameterType="com.jsh.erp.datasource.entities.DepotExample">
from jsh_depot delete from jsh_depot
<if test="_parameter != null"> <if test="_parameter != null">
<include refid="Example_Where_Clause" /> <include refid="Example_Where_Clause" />
</if> </if>
<if test="orderByClause != null"> </delete>
order by ${orderByClause} <insert id="insert" parameterType="com.jsh.erp.datasource.entities.Depot">
</if> insert into jsh_depot (id, name, address,
</select> warehousing, truckage, type,
<select id="selectByPrimaryKey" parameterType="java.lang.Long" resultMap="BaseResultMap"> sort, remark, principal,
<!-- enabled, tenant_id, delete_Flag,
WARNING - @mbggenerated is_default)
This element is automatically generated by MyBatis Generator, do not modify. values (#{id,jdbcType=BIGINT}, #{name,jdbcType=VARCHAR}, #{address,jdbcType=VARCHAR},
--> #{warehousing,jdbcType=DECIMAL}, #{truckage,jdbcType=DECIMAL}, #{type,jdbcType=INTEGER},
select #{sort,jdbcType=VARCHAR}, #{remark,jdbcType=VARCHAR}, #{principal,jdbcType=BIGINT},
<include refid="Base_Column_List" /> #{enabled,jdbcType=BIT}, #{tenantId,jdbcType=BIGINT}, #{deleteFlag,jdbcType=VARCHAR},
from jsh_depot #{isDefault,jdbcType=BIT})
where id = #{id,jdbcType=BIGINT} </insert>
</select> <insert id="insertSelective" parameterType="com.jsh.erp.datasource.entities.Depot">
<delete id="deleteByPrimaryKey" parameterType="java.lang.Long"> insert into jsh_depot
<!-- <trim prefix="(" suffix=")" suffixOverrides=",">
WARNING - @mbggenerated <if test="id != null">
This element is automatically generated by MyBatis Generator, do not modify. id,
--> </if>
delete from jsh_depot <if test="name != null">
where id = #{id,jdbcType=BIGINT} name,
</delete> </if>
<delete id="deleteByExample" parameterType="com.jsh.erp.datasource.entities.DepotExample"> <if test="address != null">
<!-- address,
WARNING - @mbggenerated </if>
This element is automatically generated by MyBatis Generator, do not modify. <if test="warehousing != null">
--> warehousing,
delete from jsh_depot </if>
<if test="_parameter != null"> <if test="truckage != null">
<include refid="Example_Where_Clause" /> truckage,
</if> </if>
</delete> <if test="type != null">
<insert id="insert" parameterType="com.jsh.erp.datasource.entities.Depot"> type,
<!-- </if>
WARNING - @mbggenerated <if test="sort != null">
This element is automatically generated by MyBatis Generator, do not modify. sort,
--> </if>
insert into jsh_depot (id, name, address, <if test="remark != null">
warehousing, truckage, type, remark,
sort, remark, principal, </if>
tenant_id, delete_Flag, is_default <if test="principal != null">
) principal,
values (#{id,jdbcType=BIGINT}, #{name,jdbcType=VARCHAR}, #{address,jdbcType=VARCHAR}, </if>
#{warehousing,jdbcType=DECIMAL}, #{truckage,jdbcType=DECIMAL}, #{type,jdbcType=INTEGER}, <if test="enabled != null">
#{sort,jdbcType=VARCHAR}, #{remark,jdbcType=VARCHAR}, #{principal,jdbcType=BIGINT}, enabled,
#{tenantId,jdbcType=BIGINT}, #{deleteFlag,jdbcType=VARCHAR}, #{isDefault,jdbcType=BIT} </if>
) <if test="tenantId != null">
</insert> tenant_id,
<insert id="insertSelective" parameterType="com.jsh.erp.datasource.entities.Depot"> </if>
<!-- <if test="deleteFlag != null">
WARNING - @mbggenerated delete_Flag,
This element is automatically generated by MyBatis Generator, do not modify. </if>
--> <if test="isDefault != null">
insert into jsh_depot is_default,
<trim prefix="(" suffix=")" suffixOverrides=","> </if>
<if test="id != null"> </trim>
id, <trim prefix="values (" suffix=")" suffixOverrides=",">
</if> <if test="id != null">
<if test="name != null"> #{id,jdbcType=BIGINT},
name, </if>
</if> <if test="name != null">
<if test="address != null"> #{name,jdbcType=VARCHAR},
address, </if>
</if> <if test="address != null">
<if test="warehousing != null"> #{address,jdbcType=VARCHAR},
warehousing, </if>
</if> <if test="warehousing != null">
<if test="truckage != null"> #{warehousing,jdbcType=DECIMAL},
truckage, </if>
</if> <if test="truckage != null">
<if test="type != null"> #{truckage,jdbcType=DECIMAL},
type, </if>
</if> <if test="type != null">
<if test="sort != null"> #{type,jdbcType=INTEGER},
sort, </if>
</if> <if test="sort != null">
<if test="remark != null"> #{sort,jdbcType=VARCHAR},
remark, </if>
</if> <if test="remark != null">
<if test="principal != null"> #{remark,jdbcType=VARCHAR},
principal, </if>
</if> <if test="principal != null">
<if test="tenantId != null"> #{principal,jdbcType=BIGINT},
tenant_id, </if>
</if> <if test="enabled != null">
<if test="deleteFlag != null"> #{enabled,jdbcType=BIT},
delete_Flag, </if>
</if> <if test="tenantId != null">
<if test="isDefault != null"> #{tenantId,jdbcType=BIGINT},
is_default, </if>
</if> <if test="deleteFlag != null">
</trim> #{deleteFlag,jdbcType=VARCHAR},
<trim prefix="values (" suffix=")" suffixOverrides=","> </if>
<if test="id != null"> <if test="isDefault != null">
#{id,jdbcType=BIGINT}, #{isDefault,jdbcType=BIT},
</if> </if>
<if test="name != null"> </trim>
#{name,jdbcType=VARCHAR}, </insert>
</if> <select id="countByExample" parameterType="com.jsh.erp.datasource.entities.DepotExample" resultType="java.lang.Long">
<if test="address != null"> select count(*) from jsh_depot
#{address,jdbcType=VARCHAR}, <if test="_parameter != null">
</if> <include refid="Example_Where_Clause" />
<if test="warehousing != null"> </if>
#{warehousing,jdbcType=DECIMAL}, </select>
</if> <update id="updateByExampleSelective" parameterType="map">
<if test="truckage != null"> update jsh_depot
#{truckage,jdbcType=DECIMAL}, <set>
</if> <if test="record.id != null">
<if test="type != null"> id = #{record.id,jdbcType=BIGINT},
#{type,jdbcType=INTEGER}, </if>
</if> <if test="record.name != null">
<if test="sort != null"> name = #{record.name,jdbcType=VARCHAR},
#{sort,jdbcType=VARCHAR}, </if>
</if> <if test="record.address != null">
<if test="remark != null"> address = #{record.address,jdbcType=VARCHAR},
#{remark,jdbcType=VARCHAR}, </if>
</if> <if test="record.warehousing != null">
<if test="principal != null"> warehousing = #{record.warehousing,jdbcType=DECIMAL},
#{principal,jdbcType=BIGINT}, </if>
</if> <if test="record.truckage != null">
<if test="tenantId != null"> truckage = #{record.truckage,jdbcType=DECIMAL},
#{tenantId,jdbcType=BIGINT}, </if>
</if> <if test="record.type != null">
<if test="deleteFlag != null"> type = #{record.type,jdbcType=INTEGER},
#{deleteFlag,jdbcType=VARCHAR}, </if>
</if> <if test="record.sort != null">
<if test="isDefault != null"> sort = #{record.sort,jdbcType=VARCHAR},
#{isDefault,jdbcType=BIT}, </if>
</if> <if test="record.remark != null">
</trim> remark = #{record.remark,jdbcType=VARCHAR},
</insert> </if>
<select id="countByExample" parameterType="com.jsh.erp.datasource.entities.DepotExample" resultType="java.lang.Integer"> <if test="record.principal != null">
<!-- principal = #{record.principal,jdbcType=BIGINT},
WARNING - @mbggenerated </if>
This element is automatically generated by MyBatis Generator, do not modify. <if test="record.enabled != null">
--> enabled = #{record.enabled,jdbcType=BIT},
select count(*) from jsh_depot </if>
<if test="_parameter != null"> <if test="record.tenantId != null">
<include refid="Example_Where_Clause" /> tenant_id = #{record.tenantId,jdbcType=BIGINT},
</if> </if>
</select> <if test="record.deleteFlag != null">
<update id="updateByExampleSelective" parameterType="map"> delete_Flag = #{record.deleteFlag,jdbcType=VARCHAR},
<!-- </if>
WARNING - @mbggenerated <if test="record.isDefault != null">
This element is automatically generated by MyBatis Generator, do not modify. is_default = #{record.isDefault,jdbcType=BIT},
--> </if>
update jsh_depot </set>
<set> <if test="_parameter != null">
<if test="record.id != null"> <include refid="Update_By_Example_Where_Clause" />
id = #{record.id,jdbcType=BIGINT}, </if>
</if> </update>
<if test="record.name != null"> <update id="updateByExample" parameterType="map">
name = #{record.name,jdbcType=VARCHAR}, update jsh_depot
</if> set id = #{record.id,jdbcType=BIGINT},
<if test="record.address != null"> name = #{record.name,jdbcType=VARCHAR},
address = #{record.address,jdbcType=VARCHAR}, address = #{record.address,jdbcType=VARCHAR},
</if> warehousing = #{record.warehousing,jdbcType=DECIMAL},
<if test="record.warehousing != null"> truckage = #{record.truckage,jdbcType=DECIMAL},
warehousing = #{record.warehousing,jdbcType=DECIMAL}, type = #{record.type,jdbcType=INTEGER},
</if> sort = #{record.sort,jdbcType=VARCHAR},
<if test="record.truckage != null"> remark = #{record.remark,jdbcType=VARCHAR},
truckage = #{record.truckage,jdbcType=DECIMAL}, principal = #{record.principal,jdbcType=BIGINT},
</if> enabled = #{record.enabled,jdbcType=BIT},
<if test="record.type != null"> tenant_id = #{record.tenantId,jdbcType=BIGINT},
type = #{record.type,jdbcType=INTEGER}, delete_Flag = #{record.deleteFlag,jdbcType=VARCHAR},
</if> is_default = #{record.isDefault,jdbcType=BIT}
<if test="record.sort != null"> <if test="_parameter != null">
sort = #{record.sort,jdbcType=VARCHAR}, <include refid="Update_By_Example_Where_Clause" />
</if> </if>
<if test="record.remark != null"> </update>
remark = #{record.remark,jdbcType=VARCHAR}, <update id="updateByPrimaryKeySelective" parameterType="com.jsh.erp.datasource.entities.Depot">
</if> update jsh_depot
<if test="record.principal != null"> <set>
principal = #{record.principal,jdbcType=BIGINT}, <if test="name != null">
</if> name = #{name,jdbcType=VARCHAR},
<if test="record.tenantId != null"> </if>
tenant_id = #{record.tenantId,jdbcType=BIGINT}, <if test="address != null">
</if> address = #{address,jdbcType=VARCHAR},
<if test="record.deleteFlag != null"> </if>
delete_Flag = #{record.deleteFlag,jdbcType=VARCHAR}, <if test="warehousing != null">
</if> warehousing = #{warehousing,jdbcType=DECIMAL},
<if test="record.isDefault != null"> </if>
is_default = #{record.isDefault,jdbcType=BIT}, <if test="truckage != null">
</if> truckage = #{truckage,jdbcType=DECIMAL},
</set> </if>
<if test="_parameter != null"> <if test="type != null">
<include refid="Update_By_Example_Where_Clause" /> type = #{type,jdbcType=INTEGER},
</if> </if>
</update> <if test="sort != null">
<update id="updateByExample" parameterType="map"> sort = #{sort,jdbcType=VARCHAR},
<!-- </if>
WARNING - @mbggenerated <if test="remark != null">
This element is automatically generated by MyBatis Generator, do not modify. remark = #{remark,jdbcType=VARCHAR},
--> </if>
update jsh_depot <if test="principal != null">
set id = #{record.id,jdbcType=BIGINT}, principal = #{principal,jdbcType=BIGINT},
name = #{record.name,jdbcType=VARCHAR}, </if>
address = #{record.address,jdbcType=VARCHAR}, <if test="enabled != null">
warehousing = #{record.warehousing,jdbcType=DECIMAL}, enabled = #{enabled,jdbcType=BIT},
truckage = #{record.truckage,jdbcType=DECIMAL}, </if>
type = #{record.type,jdbcType=INTEGER}, <if test="tenantId != null">
sort = #{record.sort,jdbcType=VARCHAR}, tenant_id = #{tenantId,jdbcType=BIGINT},
remark = #{record.remark,jdbcType=VARCHAR}, </if>
principal = #{record.principal,jdbcType=BIGINT}, <if test="deleteFlag != null">
tenant_id = #{record.tenantId,jdbcType=BIGINT}, delete_Flag = #{deleteFlag,jdbcType=VARCHAR},
delete_Flag = #{record.deleteFlag,jdbcType=VARCHAR}, </if>
is_default = #{record.isDefault,jdbcType=BIT} <if test="isDefault != null">
<if test="_parameter != null"> is_default = #{isDefault,jdbcType=BIT},
<include refid="Update_By_Example_Where_Clause" /> </if>
</if> </set>
</update> where id = #{id,jdbcType=BIGINT}
<update id="updateByPrimaryKeySelective" parameterType="com.jsh.erp.datasource.entities.Depot"> </update>
<!-- <update id="updateByPrimaryKey" parameterType="com.jsh.erp.datasource.entities.Depot">
WARNING - @mbggenerated update jsh_depot
This element is automatically generated by MyBatis Generator, do not modify. set name = #{name,jdbcType=VARCHAR},
--> address = #{address,jdbcType=VARCHAR},
update jsh_depot warehousing = #{warehousing,jdbcType=DECIMAL},
<set> truckage = #{truckage,jdbcType=DECIMAL},
<if test="name != null"> type = #{type,jdbcType=INTEGER},
name = #{name,jdbcType=VARCHAR}, sort = #{sort,jdbcType=VARCHAR},
</if> remark = #{remark,jdbcType=VARCHAR},
<if test="address != null"> principal = #{principal,jdbcType=BIGINT},
address = #{address,jdbcType=VARCHAR}, enabled = #{enabled,jdbcType=BIT},
</if> tenant_id = #{tenantId,jdbcType=BIGINT},
<if test="warehousing != null"> delete_Flag = #{deleteFlag,jdbcType=VARCHAR},
warehousing = #{warehousing,jdbcType=DECIMAL}, is_default = #{isDefault,jdbcType=BIT}
</if> where id = #{id,jdbcType=BIGINT}
<if test="truckage != null"> </update>
truckage = #{truckage,jdbcType=DECIMAL},
</if>
<if test="type != null">
type = #{type,jdbcType=INTEGER},
</if>
<if test="sort != null">
sort = #{sort,jdbcType=VARCHAR},
</if>
<if test="remark != null">
remark = #{remark,jdbcType=VARCHAR},
</if>
<if test="principal != null">
principal = #{principal,jdbcType=BIGINT},
</if>
<if test="tenantId != null">
tenant_id = #{tenantId,jdbcType=BIGINT},
</if>
<if test="deleteFlag != null">
delete_Flag = #{deleteFlag,jdbcType=VARCHAR},
</if>
<if test="isDefault != null">
is_default = #{isDefault,jdbcType=BIT},
</if>
</set>
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},
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>
</mapper> </mapper>

40
jshERP-boot/src/main/resources/mapper_xml/InOutItemMapper.xml
View File

@@ -6,6 +6,8 @@
<result column="name" jdbcType="VARCHAR" property="name" /> <result column="name" jdbcType="VARCHAR" property="name" />
<result column="type" jdbcType="VARCHAR" property="type" /> <result column="type" jdbcType="VARCHAR" property="type" />
<result column="remark" jdbcType="VARCHAR" property="remark" /> <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="tenant_id" jdbcType="BIGINT" property="tenantId" />
<result column="delete_flag" jdbcType="VARCHAR" property="deleteFlag" /> <result column="delete_flag" jdbcType="VARCHAR" property="deleteFlag" />
</resultMap> </resultMap>
@@ -68,7 +70,7 @@
</where> </where>
</sql> </sql>
<sql id="Base_Column_List"> <sql id="Base_Column_List">
id, name, type, remark, tenant_id, delete_flag id, name, type, remark, enabled, sort, tenant_id, delete_flag
</sql> </sql>
<select id="selectByExample" parameterType="com.jsh.erp.datasource.entities.InOutItemExample" resultMap="BaseResultMap"> <select id="selectByExample" parameterType="com.jsh.erp.datasource.entities.InOutItemExample" resultMap="BaseResultMap">
select select
@@ -102,11 +104,11 @@
</delete> </delete>
<insert id="insert" parameterType="com.jsh.erp.datasource.entities.InOutItem"> <insert id="insert" parameterType="com.jsh.erp.datasource.entities.InOutItem">
insert into jsh_in_out_item (id, name, type, insert into jsh_in_out_item (id, name, type,
remark, tenant_id, delete_flag remark, enabled, sort,
) tenant_id, delete_flag)
values (#{id,jdbcType=BIGINT}, #{name,jdbcType=VARCHAR}, #{type,jdbcType=VARCHAR}, values (#{id,jdbcType=BIGINT}, #{name,jdbcType=VARCHAR}, #{type,jdbcType=VARCHAR},
#{remark,jdbcType=VARCHAR}, #{tenantId,jdbcType=BIGINT}, #{deleteFlag,jdbcType=VARCHAR} #{remark,jdbcType=VARCHAR}, #{enabled,jdbcType=BIT}, #{sort,jdbcType=VARCHAR},
) #{tenantId,jdbcType=BIGINT}, #{deleteFlag,jdbcType=VARCHAR})
</insert> </insert>
<insert id="insertSelective" parameterType="com.jsh.erp.datasource.entities.InOutItem"> <insert id="insertSelective" parameterType="com.jsh.erp.datasource.entities.InOutItem">
insert into jsh_in_out_item insert into jsh_in_out_item
@@ -123,6 +125,12 @@
<if test="remark != null"> <if test="remark != null">
remark, remark,
</if> </if>
<if test="enabled != null">
enabled,
</if>
<if test="sort != null">
sort,
</if>
<if test="tenantId != null"> <if test="tenantId != null">
tenant_id, tenant_id,
</if> </if>
@@ -143,6 +151,12 @@
<if test="remark != null"> <if test="remark != null">
#{remark,jdbcType=VARCHAR}, #{remark,jdbcType=VARCHAR},
</if> </if>
<if test="enabled != null">
#{enabled,jdbcType=BIT},
</if>
<if test="sort != null">
#{sort,jdbcType=VARCHAR},
</if>
<if test="tenantId != null"> <if test="tenantId != null">
#{tenantId,jdbcType=BIGINT}, #{tenantId,jdbcType=BIGINT},
</if> </if>
@@ -172,6 +186,12 @@
<if test="record.remark != null"> <if test="record.remark != null">
remark = #{record.remark,jdbcType=VARCHAR}, remark = #{record.remark,jdbcType=VARCHAR},
</if> </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"> <if test="record.tenantId != null">
tenant_id = #{record.tenantId,jdbcType=BIGINT}, tenant_id = #{record.tenantId,jdbcType=BIGINT},
</if> </if>
@@ -189,6 +209,8 @@
name = #{record.name,jdbcType=VARCHAR}, name = #{record.name,jdbcType=VARCHAR},
type = #{record.type,jdbcType=VARCHAR}, type = #{record.type,jdbcType=VARCHAR},
remark = #{record.remark,jdbcType=VARCHAR}, remark = #{record.remark,jdbcType=VARCHAR},
enabled = #{record.enabled,jdbcType=BIT},
sort = #{record.sort,jdbcType=VARCHAR},
tenant_id = #{record.tenantId,jdbcType=BIGINT}, tenant_id = #{record.tenantId,jdbcType=BIGINT},
delete_flag = #{record.deleteFlag,jdbcType=VARCHAR} delete_flag = #{record.deleteFlag,jdbcType=VARCHAR}
<if test="_parameter != null"> <if test="_parameter != null">
@@ -207,6 +229,12 @@
<if test="remark != null"> <if test="remark != null">
remark = #{remark,jdbcType=VARCHAR}, remark = #{remark,jdbcType=VARCHAR},
</if> </if>
<if test="enabled != null">
enabled = #{enabled,jdbcType=BIT},
</if>
<if test="sort != null">
sort = #{sort,jdbcType=VARCHAR},
</if>
<if test="tenantId != null"> <if test="tenantId != null">
tenant_id = #{tenantId,jdbcType=BIGINT}, tenant_id = #{tenantId,jdbcType=BIGINT},
</if> </if>
@@ -221,6 +249,8 @@
set name = #{name,jdbcType=VARCHAR}, set name = #{name,jdbcType=VARCHAR},
type = #{type,jdbcType=VARCHAR}, type = #{type,jdbcType=VARCHAR},
remark = #{remark,jdbcType=VARCHAR}, remark = #{remark,jdbcType=VARCHAR},
enabled = #{enabled,jdbcType=BIT},
sort = #{sort,jdbcType=VARCHAR},
tenant_id = #{tenantId,jdbcType=BIGINT}, tenant_id = #{tenantId,jdbcType=BIGINT},
delete_flag = #{deleteFlag,jdbcType=VARCHAR} delete_flag = #{deleteFlag,jdbcType=VARCHAR}
where id = #{id,jdbcType=BIGINT} where id = #{id,jdbcType=BIGINT}

38
jshERP-boot/src/main/resources/mapper_xml/PersonMapper.xml
View File

@@ -5,6 +5,8 @@
<id column="id" jdbcType="BIGINT" property="id" /> <id column="id" jdbcType="BIGINT" property="id" />
<result column="type" jdbcType="VARCHAR" property="type" /> <result column="type" jdbcType="VARCHAR" property="type" />
<result column="name" jdbcType="VARCHAR" property="name" /> <result column="name" jdbcType="VARCHAR" property="name" />
<result column="enabled" jdbcType="BIT" property="enabled" />
<result column="sort" jdbcType="VARCHAR" property="sort" />
<result column="tenant_id" jdbcType="BIGINT" property="tenantId" /> <result column="tenant_id" jdbcType="BIGINT" property="tenantId" />
<result column="delete_flag" jdbcType="VARCHAR" property="deleteFlag" /> <result column="delete_flag" jdbcType="VARCHAR" property="deleteFlag" />
</resultMap> </resultMap>
@@ -67,7 +69,7 @@
</where> </where>
</sql> </sql>
<sql id="Base_Column_List"> <sql id="Base_Column_List">
id, type, name, tenant_id, delete_flag id, type, name, enabled, sort, tenant_id, delete_flag
</sql> </sql>
<select id="selectByExample" parameterType="com.jsh.erp.datasource.entities.PersonExample" resultMap="BaseResultMap"> <select id="selectByExample" parameterType="com.jsh.erp.datasource.entities.PersonExample" resultMap="BaseResultMap">
select select
@@ -101,9 +103,11 @@
</delete> </delete>
<insert id="insert" parameterType="com.jsh.erp.datasource.entities.Person"> <insert id="insert" parameterType="com.jsh.erp.datasource.entities.Person">
insert into jsh_person (id, type, name, 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}, 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> </insert>
<insert id="insertSelective" parameterType="com.jsh.erp.datasource.entities.Person"> <insert id="insertSelective" parameterType="com.jsh.erp.datasource.entities.Person">
insert into jsh_person insert into jsh_person
@@ -117,6 +121,12 @@
<if test="name != null"> <if test="name != null">
name, name,
</if> </if>
<if test="enabled != null">
enabled,
</if>
<if test="sort != null">
sort,
</if>
<if test="tenantId != null"> <if test="tenantId != null">
tenant_id, tenant_id,
</if> </if>
@@ -134,6 +144,12 @@
<if test="name != null"> <if test="name != null">
#{name,jdbcType=VARCHAR}, #{name,jdbcType=VARCHAR},
</if> </if>
<if test="enabled != null">
#{enabled,jdbcType=BIT},
</if>
<if test="sort != null">
#{sort,jdbcType=VARCHAR},
</if>
<if test="tenantId != null"> <if test="tenantId != null">
#{tenantId,jdbcType=BIGINT}, #{tenantId,jdbcType=BIGINT},
</if> </if>
@@ -160,6 +176,12 @@
<if test="record.name != null"> <if test="record.name != null">
name = #{record.name,jdbcType=VARCHAR}, name = #{record.name,jdbcType=VARCHAR},
</if> </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"> <if test="record.tenantId != null">
tenant_id = #{record.tenantId,jdbcType=BIGINT}, tenant_id = #{record.tenantId,jdbcType=BIGINT},
</if> </if>
@@ -176,6 +198,8 @@
set id = #{record.id,jdbcType=BIGINT}, set id = #{record.id,jdbcType=BIGINT},
type = #{record.type,jdbcType=VARCHAR}, type = #{record.type,jdbcType=VARCHAR},
name = #{record.name,jdbcType=VARCHAR}, name = #{record.name,jdbcType=VARCHAR},
enabled = #{record.enabled,jdbcType=BIT},
sort = #{record.sort,jdbcType=VARCHAR},
tenant_id = #{record.tenantId,jdbcType=BIGINT}, tenant_id = #{record.tenantId,jdbcType=BIGINT},
delete_flag = #{record.deleteFlag,jdbcType=VARCHAR} delete_flag = #{record.deleteFlag,jdbcType=VARCHAR}
<if test="_parameter != null"> <if test="_parameter != null">
@@ -191,6 +215,12 @@
<if test="name != null"> <if test="name != null">
name = #{name,jdbcType=VARCHAR}, name = #{name,jdbcType=VARCHAR},
</if> </if>
<if test="enabled != null">
enabled = #{enabled,jdbcType=BIT},
</if>
<if test="sort != null">
sort = #{sort,jdbcType=VARCHAR},
</if>
<if test="tenantId != null"> <if test="tenantId != null">
tenant_id = #{tenantId,jdbcType=BIGINT}, tenant_id = #{tenantId,jdbcType=BIGINT},
</if> </if>
@@ -204,6 +234,8 @@
update jsh_person update jsh_person
set type = #{type,jdbcType=VARCHAR}, set type = #{type,jdbcType=VARCHAR},
name = #{name,jdbcType=VARCHAR}, name = #{name,jdbcType=VARCHAR},
enabled = #{enabled,jdbcType=BIT},
sort = #{sort,jdbcType=VARCHAR},
tenant_id = #{tenantId,jdbcType=BIGINT}, tenant_id = #{tenantId,jdbcType=BIGINT},
delete_flag = #{deleteFlag,jdbcType=VARCHAR} delete_flag = #{deleteFlag,jdbcType=VARCHAR}
where id = #{id,jdbcType=BIGINT} where id = #{id,jdbcType=BIGINT}

42
jshERP-boot/src/main/resources/mapper_xml/RoleMapper.xml
View File

@@ -7,6 +7,8 @@
<result column="type" jdbcType="VARCHAR" property="type" /> <result column="type" jdbcType="VARCHAR" property="type" />
<result column="value" jdbcType="VARCHAR" property="value" /> <result column="value" jdbcType="VARCHAR" property="value" />
<result column="description" jdbcType="VARCHAR" property="description" /> <result column="description" jdbcType="VARCHAR" property="description" />
<result column="enabled" jdbcType="BIT" property="enabled" />
<result column="sort" jdbcType="VARCHAR" property="sort" />
<result column="tenant_id" jdbcType="BIGINT" property="tenantId" /> <result column="tenant_id" jdbcType="BIGINT" property="tenantId" />
<result column="delete_flag" jdbcType="VARCHAR" property="deleteFlag" /> <result column="delete_flag" jdbcType="VARCHAR" property="deleteFlag" />
</resultMap> </resultMap>
@@ -69,7 +71,7 @@
</where> </where>
</sql> </sql>
<sql id="Base_Column_List"> <sql id="Base_Column_List">
id, name, type, value, description, tenant_id, delete_flag id, name, type, value, description, enabled, sort, tenant_id, delete_flag
</sql> </sql>
<select id="selectByExample" parameterType="com.jsh.erp.datasource.entities.RoleExample" resultMap="BaseResultMap"> <select id="selectByExample" parameterType="com.jsh.erp.datasource.entities.RoleExample" resultMap="BaseResultMap">
select select
@@ -103,11 +105,13 @@
</delete> </delete>
<insert id="insert" parameterType="com.jsh.erp.datasource.entities.Role"> <insert id="insert" parameterType="com.jsh.erp.datasource.entities.Role">
insert into jsh_role (id, name, type, insert into jsh_role (id, name, type,
value, description, tenant_id, value, description, enabled,
delete_flag) sort, tenant_id, delete_flag
)
values (#{id,jdbcType=BIGINT}, #{name,jdbcType=VARCHAR}, #{type,jdbcType=VARCHAR}, values (#{id,jdbcType=BIGINT}, #{name,jdbcType=VARCHAR}, #{type,jdbcType=VARCHAR},
#{value,jdbcType=VARCHAR}, #{description,jdbcType=VARCHAR}, #{tenantId,jdbcType=BIGINT}, #{value,jdbcType=VARCHAR}, #{description,jdbcType=VARCHAR}, #{enabled,jdbcType=BIT},
#{deleteFlag,jdbcType=VARCHAR}) #{sort,jdbcType=VARCHAR}, #{tenantId,jdbcType=BIGINT}, #{deleteFlag,jdbcType=VARCHAR}
)
</insert> </insert>
<insert id="insertSelective" parameterType="com.jsh.erp.datasource.entities.Role"> <insert id="insertSelective" parameterType="com.jsh.erp.datasource.entities.Role">
insert into jsh_role insert into jsh_role
@@ -127,6 +131,12 @@
<if test="description != null"> <if test="description != null">
description, description,
</if> </if>
<if test="enabled != null">
enabled,
</if>
<if test="sort != null">
sort,
</if>
<if test="tenantId != null"> <if test="tenantId != null">
tenant_id, tenant_id,
</if> </if>
@@ -150,6 +160,12 @@
<if test="description != null"> <if test="description != null">
#{description,jdbcType=VARCHAR}, #{description,jdbcType=VARCHAR},
</if> </if>
<if test="enabled != null">
#{enabled,jdbcType=BIT},
</if>
<if test="sort != null">
#{sort,jdbcType=VARCHAR},
</if>
<if test="tenantId != null"> <if test="tenantId != null">
#{tenantId,jdbcType=BIGINT}, #{tenantId,jdbcType=BIGINT},
</if> </if>
@@ -182,6 +198,12 @@
<if test="record.description != null"> <if test="record.description != null">
description = #{record.description,jdbcType=VARCHAR}, description = #{record.description,jdbcType=VARCHAR},
</if> </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"> <if test="record.tenantId != null">
tenant_id = #{record.tenantId,jdbcType=BIGINT}, tenant_id = #{record.tenantId,jdbcType=BIGINT},
</if> </if>
@@ -200,6 +222,8 @@
type = #{record.type,jdbcType=VARCHAR}, type = #{record.type,jdbcType=VARCHAR},
value = #{record.value,jdbcType=VARCHAR}, value = #{record.value,jdbcType=VARCHAR},
description = #{record.description,jdbcType=VARCHAR}, description = #{record.description,jdbcType=VARCHAR},
enabled = #{record.enabled,jdbcType=BIT},
sort = #{record.sort,jdbcType=VARCHAR},
tenant_id = #{record.tenantId,jdbcType=BIGINT}, tenant_id = #{record.tenantId,jdbcType=BIGINT},
delete_flag = #{record.deleteFlag,jdbcType=VARCHAR} delete_flag = #{record.deleteFlag,jdbcType=VARCHAR}
<if test="_parameter != null"> <if test="_parameter != null">
@@ -221,6 +245,12 @@
<if test="description != null"> <if test="description != null">
description = #{description,jdbcType=VARCHAR}, description = #{description,jdbcType=VARCHAR},
</if> </if>
<if test="enabled != null">
enabled = #{enabled,jdbcType=BIT},
</if>
<if test="sort != null">
sort = #{sort,jdbcType=VARCHAR},
</if>
<if test="tenantId != null"> <if test="tenantId != null">
tenant_id = #{tenantId,jdbcType=BIGINT}, tenant_id = #{tenantId,jdbcType=BIGINT},
</if> </if>
@@ -236,6 +266,8 @@
type = #{type,jdbcType=VARCHAR}, type = #{type,jdbcType=VARCHAR},
value = #{value,jdbcType=VARCHAR}, value = #{value,jdbcType=VARCHAR},
description = #{description,jdbcType=VARCHAR}, description = #{description,jdbcType=VARCHAR},
enabled = #{enabled,jdbcType=BIT},
sort = #{sort,jdbcType=VARCHAR},
tenant_id = #{tenantId,jdbcType=BIGINT}, tenant_id = #{tenantId,jdbcType=BIGINT},
delete_flag = #{deleteFlag,jdbcType=VARCHAR} delete_flag = #{deleteFlag,jdbcType=VARCHAR}
where id = #{id,jdbcType=BIGINT} where id = #{id,jdbcType=BIGINT}

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

@@ -23,6 +23,7 @@
<result column="bank_name" jdbcType="VARCHAR" property="bankName" /> <result column="bank_name" jdbcType="VARCHAR" property="bankName" />
<result column="account_number" jdbcType="VARCHAR" property="accountNumber" /> <result column="account_number" jdbcType="VARCHAR" property="accountNumber" />
<result column="tax_rate" jdbcType="DECIMAL" property="taxRate" /> <result column="tax_rate" jdbcType="DECIMAL" property="taxRate" />
<result column="sort" jdbcType="VARCHAR" property="sort" />
<result column="tenant_id" jdbcType="BIGINT" property="tenantId" /> <result column="tenant_id" jdbcType="BIGINT" property="tenantId" />
<result column="delete_flag" jdbcType="VARCHAR" property="deleteFlag" /> <result column="delete_flag" jdbcType="VARCHAR" property="deleteFlag" />
</resultMap> </resultMap>
@@ -87,7 +88,7 @@
<sql id="Base_Column_List"> <sql id="Base_Column_List">
id, supplier, contacts, phone_num, email, description, isystem, type, enabled, advance_in, id, supplier, contacts, phone_num, email, description, isystem, type, enabled, advance_in,
begin_need_get, begin_need_pay, all_need_get, all_need_pay, fax, telephone, address, begin_need_get, begin_need_pay, all_need_get, all_need_pay, fax, telephone, address,
tax_num, bank_name, account_number, tax_rate, tenant_id, delete_flag tax_num, bank_name, account_number, tax_rate, sort, tenant_id, delete_flag
</sql> </sql>
<select id="selectByExample" parameterType="com.jsh.erp.datasource.entities.SupplierExample" resultMap="BaseResultMap"> <select id="selectByExample" parameterType="com.jsh.erp.datasource.entities.SupplierExample" resultMap="BaseResultMap">
select select
@@ -127,7 +128,8 @@
all_need_get, all_need_pay, fax, all_need_get, all_need_pay, fax,
telephone, address, tax_num, telephone, address, tax_num,
bank_name, account_number, tax_rate, 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}, values (#{id,jdbcType=BIGINT}, #{supplier,jdbcType=VARCHAR}, #{contacts,jdbcType=VARCHAR},
#{phoneNum,jdbcType=VARCHAR}, #{email,jdbcType=VARCHAR}, #{description,jdbcType=VARCHAR}, #{phoneNum,jdbcType=VARCHAR}, #{email,jdbcType=VARCHAR}, #{description,jdbcType=VARCHAR},
#{isystem,jdbcType=TINYINT}, #{type,jdbcType=VARCHAR}, #{enabled,jdbcType=BIT}, #{isystem,jdbcType=TINYINT}, #{type,jdbcType=VARCHAR}, #{enabled,jdbcType=BIT},
@@ -135,7 +137,8 @@
#{allNeedGet,jdbcType=DECIMAL}, #{allNeedPay,jdbcType=DECIMAL}, #{fax,jdbcType=VARCHAR}, #{allNeedGet,jdbcType=DECIMAL}, #{allNeedPay,jdbcType=DECIMAL}, #{fax,jdbcType=VARCHAR},
#{telephone,jdbcType=VARCHAR}, #{address,jdbcType=VARCHAR}, #{taxNum,jdbcType=VARCHAR}, #{telephone,jdbcType=VARCHAR}, #{address,jdbcType=VARCHAR}, #{taxNum,jdbcType=VARCHAR},
#{bankName,jdbcType=VARCHAR}, #{accountNumber,jdbcType=VARCHAR}, #{taxRate,jdbcType=DECIMAL}, #{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> </insert>
<insert id="insertSelective" parameterType="com.jsh.erp.datasource.entities.Supplier"> <insert id="insertSelective" parameterType="com.jsh.erp.datasource.entities.Supplier">
insert into jsh_supplier insert into jsh_supplier
@@ -203,6 +206,9 @@
<if test="taxRate != null"> <if test="taxRate != null">
tax_rate, tax_rate,
</if> </if>
<if test="sort != null">
sort,
</if>
<if test="tenantId != null"> <if test="tenantId != null">
tenant_id, tenant_id,
</if> </if>
@@ -274,6 +280,9 @@
<if test="taxRate != null"> <if test="taxRate != null">
#{taxRate,jdbcType=DECIMAL}, #{taxRate,jdbcType=DECIMAL},
</if> </if>
<if test="sort != null">
#{sort,jdbcType=VARCHAR},
</if>
<if test="tenantId != null"> <if test="tenantId != null">
#{tenantId,jdbcType=BIGINT}, #{tenantId,jdbcType=BIGINT},
</if> </if>
@@ -354,6 +363,9 @@
<if test="record.taxRate != null"> <if test="record.taxRate != null">
tax_rate = #{record.taxRate,jdbcType=DECIMAL}, tax_rate = #{record.taxRate,jdbcType=DECIMAL},
</if> </if>
<if test="record.sort != null">
sort = #{record.sort,jdbcType=VARCHAR},
</if>
<if test="record.tenantId != null"> <if test="record.tenantId != null">
tenant_id = #{record.tenantId,jdbcType=BIGINT}, tenant_id = #{record.tenantId,jdbcType=BIGINT},
</if> </if>
@@ -388,6 +400,7 @@
bank_name = #{record.bankName,jdbcType=VARCHAR}, bank_name = #{record.bankName,jdbcType=VARCHAR},
account_number = #{record.accountNumber,jdbcType=VARCHAR}, account_number = #{record.accountNumber,jdbcType=VARCHAR},
tax_rate = #{record.taxRate,jdbcType=DECIMAL}, tax_rate = #{record.taxRate,jdbcType=DECIMAL},
sort = #{record.sort,jdbcType=VARCHAR},
tenant_id = #{record.tenantId,jdbcType=BIGINT}, tenant_id = #{record.tenantId,jdbcType=BIGINT},
delete_flag = #{record.deleteFlag,jdbcType=VARCHAR} delete_flag = #{record.deleteFlag,jdbcType=VARCHAR}
<if test="_parameter != null"> <if test="_parameter != null">
@@ -457,6 +470,9 @@
<if test="taxRate != null"> <if test="taxRate != null">
tax_rate = #{taxRate,jdbcType=DECIMAL}, tax_rate = #{taxRate,jdbcType=DECIMAL},
</if> </if>
<if test="sort != null">
sort = #{sort,jdbcType=VARCHAR},
</if>
<if test="tenantId != null"> <if test="tenantId != null">
tenant_id = #{tenantId,jdbcType=BIGINT}, tenant_id = #{tenantId,jdbcType=BIGINT},
</if> </if>
@@ -488,6 +504,7 @@
bank_name = #{bankName,jdbcType=VARCHAR}, bank_name = #{bankName,jdbcType=VARCHAR},
account_number = #{accountNumber,jdbcType=VARCHAR}, account_number = #{accountNumber,jdbcType=VARCHAR},
tax_rate = #{taxRate,jdbcType=DECIMAL}, tax_rate = #{taxRate,jdbcType=DECIMAL},
sort = #{sort,jdbcType=VARCHAR},
tenant_id = #{tenantId,jdbcType=BIGINT}, tenant_id = #{tenantId,jdbcType=BIGINT},
delete_flag = #{deleteFlag,jdbcType=VARCHAR} delete_flag = #{deleteFlag,jdbcType=VARCHAR}
where id = #{id,jdbcType=BIGINT} where id = #{id,jdbcType=BIGINT}

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

@@ -11,6 +11,7 @@
<result column="ratio" jdbcType="INTEGER" property="ratio" /> <result column="ratio" jdbcType="INTEGER" property="ratio" />
<result column="ratio_two" jdbcType="INTEGER" property="ratioTwo" /> <result column="ratio_two" jdbcType="INTEGER" property="ratioTwo" />
<result column="ratio_three" jdbcType="INTEGER" property="ratioThree" /> <result column="ratio_three" jdbcType="INTEGER" property="ratioThree" />
<result column="enabled" jdbcType="BIT" property="enabled" />
<result column="tenant_id" jdbcType="BIGINT" property="tenantId" /> <result column="tenant_id" jdbcType="BIGINT" property="tenantId" />
<result column="delete_flag" jdbcType="VARCHAR" property="deleteFlag" /> <result column="delete_flag" jdbcType="VARCHAR" property="deleteFlag" />
</resultMap> </resultMap>
@@ -74,7 +75,7 @@
</sql> </sql>
<sql id="Base_Column_List"> <sql id="Base_Column_List">
id, name, basic_unit, other_unit, other_unit_two, other_unit_three, ratio, ratio_two, 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
</sql> </sql>
<select id="selectByExample" parameterType="com.jsh.erp.datasource.entities.UnitExample" resultMap="BaseResultMap"> <select id="selectByExample" parameterType="com.jsh.erp.datasource.entities.UnitExample" resultMap="BaseResultMap">
select select
@@ -110,11 +111,13 @@
insert into jsh_unit (id, name, basic_unit, insert into jsh_unit (id, name, basic_unit,
other_unit, other_unit_two, other_unit_three, other_unit, other_unit_two, other_unit_three,
ratio, ratio_two, ratio_three, ratio, ratio_two, ratio_three,
tenant_id, delete_flag) enabled, tenant_id, delete_flag
)
values (#{id,jdbcType=BIGINT}, #{name,jdbcType=VARCHAR}, #{basicUnit,jdbcType=VARCHAR}, values (#{id,jdbcType=BIGINT}, #{name,jdbcType=VARCHAR}, #{basicUnit,jdbcType=VARCHAR},
#{otherUnit,jdbcType=VARCHAR}, #{otherUnitTwo,jdbcType=VARCHAR}, #{otherUnitThree,jdbcType=VARCHAR}, #{otherUnit,jdbcType=VARCHAR}, #{otherUnitTwo,jdbcType=VARCHAR}, #{otherUnitThree,jdbcType=VARCHAR},
#{ratio,jdbcType=INTEGER}, #{ratioTwo,jdbcType=INTEGER}, #{ratioThree,jdbcType=INTEGER}, #{ratio,jdbcType=INTEGER}, #{ratioTwo,jdbcType=INTEGER}, #{ratioThree,jdbcType=INTEGER},
#{tenantId,jdbcType=BIGINT}, #{deleteFlag,jdbcType=VARCHAR}) #{enabled,jdbcType=BIT}, #{tenantId,jdbcType=BIGINT}, #{deleteFlag,jdbcType=VARCHAR}
)
</insert> </insert>
<insert id="insertSelective" parameterType="com.jsh.erp.datasource.entities.Unit"> <insert id="insertSelective" parameterType="com.jsh.erp.datasource.entities.Unit">
insert into jsh_unit insert into jsh_unit
@@ -146,6 +149,9 @@
<if test="ratioThree != null"> <if test="ratioThree != null">
ratio_three, ratio_three,
</if> </if>
<if test="enabled != null">
enabled,
</if>
<if test="tenantId != null"> <if test="tenantId != null">
tenant_id, tenant_id,
</if> </if>
@@ -181,6 +187,9 @@
<if test="ratioThree != null"> <if test="ratioThree != null">
#{ratioThree,jdbcType=INTEGER}, #{ratioThree,jdbcType=INTEGER},
</if> </if>
<if test="enabled != null">
#{enabled,jdbcType=BIT},
</if>
<if test="tenantId != null"> <if test="tenantId != null">
#{tenantId,jdbcType=BIGINT}, #{tenantId,jdbcType=BIGINT},
</if> </if>
@@ -225,6 +234,9 @@
<if test="record.ratioThree != null"> <if test="record.ratioThree != null">
ratio_three = #{record.ratioThree,jdbcType=INTEGER}, ratio_three = #{record.ratioThree,jdbcType=INTEGER},
</if> </if>
<if test="record.enabled != null">
enabled = #{record.enabled,jdbcType=BIT},
</if>
<if test="record.tenantId != null"> <if test="record.tenantId != null">
tenant_id = #{record.tenantId,jdbcType=BIGINT}, tenant_id = #{record.tenantId,jdbcType=BIGINT},
</if> </if>
@@ -247,6 +259,7 @@
ratio = #{record.ratio,jdbcType=INTEGER}, ratio = #{record.ratio,jdbcType=INTEGER},
ratio_two = #{record.ratioTwo,jdbcType=INTEGER}, ratio_two = #{record.ratioTwo,jdbcType=INTEGER},
ratio_three = #{record.ratioThree,jdbcType=INTEGER}, ratio_three = #{record.ratioThree,jdbcType=INTEGER},
enabled = #{record.enabled,jdbcType=BIT},
tenant_id = #{record.tenantId,jdbcType=BIGINT}, tenant_id = #{record.tenantId,jdbcType=BIGINT},
delete_flag = #{record.deleteFlag,jdbcType=VARCHAR} delete_flag = #{record.deleteFlag,jdbcType=VARCHAR}
<if test="_parameter != null"> <if test="_parameter != null">
@@ -280,6 +293,9 @@
<if test="ratioThree != null"> <if test="ratioThree != null">
ratio_three = #{ratioThree,jdbcType=INTEGER}, ratio_three = #{ratioThree,jdbcType=INTEGER},
</if> </if>
<if test="enabled != null">
enabled = #{enabled,jdbcType=BIT},
</if>
<if test="tenantId != null"> <if test="tenantId != null">
tenant_id = #{tenantId,jdbcType=BIGINT}, tenant_id = #{tenantId,jdbcType=BIGINT},
</if> </if>
@@ -299,6 +315,7 @@
ratio = #{ratio,jdbcType=INTEGER}, ratio = #{ratio,jdbcType=INTEGER},
ratio_two = #{ratioTwo,jdbcType=INTEGER}, ratio_two = #{ratioTwo,jdbcType=INTEGER},
ratio_three = #{ratioThree,jdbcType=INTEGER}, ratio_three = #{ratioThree,jdbcType=INTEGER},
enabled = #{enabled,jdbcType=BIT},
tenant_id = #{tenantId,jdbcType=BIGINT}, tenant_id = #{tenantId,jdbcType=BIGINT},
delete_flag = #{deleteFlag,jdbcType=VARCHAR} delete_flag = #{deleteFlag,jdbcType=VARCHAR}
where id = #{id,jdbcType=BIGINT} where id = #{id,jdbcType=BIGINT}

2
jshERP-boot/src/test/resources/generatorConfig.xml
View File

@@ -48,7 +48,7 @@
<table tableName="jsh_depot_head" domainObjectName="DepotHead"></table> <table tableName="jsh_depot_head" domainObjectName="DepotHead"></table>
<table tableName="jsh_depot_item" domainObjectName="DepotItem"></table> <table tableName="jsh_depot_item" domainObjectName="DepotItem"></table>
<table tableName="jsh_function" domainObjectName="Function"></table> <table tableName="jsh_function" domainObjectName="Function"></table>
<table tableName="jsh_inoutitem" domainObjectName="InOutItem"></table> <table tableName="jsh_in_out_item" domainObjectName="InOutItem"></table>
<table tableName="jsh_log" domainObjectName="Log"></table> <table tableName="jsh_log" domainObjectName="Log"></table>
<table tableName="jsh_material" domainObjectName="Material"></table> <table tableName="jsh_material" domainObjectName="Material"></table>
<table tableName="jsh_material_attribute" domainObjectName="MaterialAttribute"></table> <table tableName="jsh_material_attribute" domainObjectName="MaterialAttribute"></table>