diff --git a/erp_web/pages/manage/serialNumber.html b/erp_web/pages/manage/serialNumber.html index caaca1fa..d6f903bb 100644 --- a/erp_web/pages/manage/serialNumber.html +++ b/erp_web/pages/manage/serialNumber.html @@ -314,8 +314,11 @@ if (r) { $.ajax({ type: "post", - url: "/serialNumber/" + id + "/delete", + url: "/serialNumber/batchDeleteSerialNumberByIds", dataType: "json", + data: ({ + ids: id + }), success: function (res) { if(res && res.code == 200) { $("#searchBtn").click(); @@ -353,7 +356,7 @@ } $.ajax({ type: "post", - url: "/serialNumber/batchDelete", + url: "/serialNumber/batchDeleteSerialNumberByIds", dataType: "json", async: false, data: ({ diff --git a/sql/jsh_erp.sql b/sql/jsh_erp.sql index ae33a533..e6ab82cc 100644 --- a/sql/jsh_erp.sql +++ b/sql/jsh_erp.sql @@ -1501,4 +1501,52 @@ alter table jsh_serial_number add tenant_id bigint(20) DEFAULT null COMMENT '租 alter table jsh_supplier add tenant_id bigint(20) DEFAULT null COMMENT '租户id'; alter table jsh_systemconfig add tenant_id bigint(20) DEFAULT null COMMENT '租户id'; alter table jsh_unit add tenant_id bigint(20) DEFAULT null COMMENT '租户id'; -alter table jsh_user add tenant_id bigint(20) DEFAULT null COMMENT '租户id'; \ No newline at end of file +alter table jsh_user add tenant_id bigint(20) DEFAULT null COMMENT '租户id'; + +-- ---------------------------- +-- 时间：2019年3月27日 +-- version：1.0.12 +-- 此次更新 +-- 添加删除标记，将物理删除修改为逻辑删除 +-- 特别提醒：之后的sql都是在之前基础上迭代，可以对已存在的系统进行数据保留更新 +-- ---------------------------- +-- 角色表 jsh_role +alter table jsh_role add delete_Flag varchar(1) DEFAULT '0' COMMENT '删除标记，0未删除，1删除'; +-- 用户 角色 模块关系表 jsh_userbusiness +alter table jsh_userbusiness add delete_Flag varchar(1) DEFAULT '0' COMMENT '删除标记，0未删除，1删除'; +-- 功能模块表 jsh_functions +alter table jsh_functions add delete_Flag varchar(1) DEFAULT '0' COMMENT '删除标记，0未删除，1删除'; +-- 应用表 jsh_app +alter table jsh_app add delete_Flag varchar(1) DEFAULT '0' COMMENT '删除标记，0未删除，1删除'; +-- 产品表 jsh_material +alter table jsh_material add delete_Flag varchar(1) DEFAULT '0' COMMENT '删除标记，0未删除，1删除'; +-- 产品扩展字段表 jsh_materialproperty +alter table jsh_materialproperty add delete_Flag varchar(1) DEFAULT '0' COMMENT '删除标记，0未删除，1删除'; +-- 经手人表 jsh_person +alter table jsh_person add delete_Flag varchar(1) DEFAULT '0' COMMENT '删除标记，0未删除，1删除'; +-- 供应商 客户信息表 jsh_supplier +alter table jsh_supplier add delete_Flag varchar(1) DEFAULT '0' COMMENT '删除标记，0未删除，1删除'; +-- 系统参数表 jsh_systemconfig +alter table jsh_systemconfig add delete_Flag varchar(1) DEFAULT '0' COMMENT '删除标记，0未删除，1删除'; +-- 多单位表 jsh_unit +alter table jsh_unit add delete_Flag varchar(1) DEFAULT '0' COMMENT '删除标记，0未删除，1删除'; +-- 仓库表 jsh_depot +alter table jsh_depot add delete_Flag varchar(1) DEFAULT '0' COMMENT '删除标记，0未删除，1删除'; +-- 账户信息表 jsh_account +alter table jsh_account add delete_Flag varchar(1) DEFAULT '0' COMMENT '删除标记，0未删除，1删除'; +-- 财务主表 jsh_accounthead +alter table jsh_accounthead add delete_Flag varchar(1) DEFAULT '0' COMMENT '删除标记，0未删除，1删除'; +-- 财务子表 jsh_accountitem +alter table jsh_accountitem add delete_Flag varchar(1) DEFAULT '0' COMMENT '删除标记，0未删除，1删除'; +-- 资产记录表 jsh_asset +alter table jsh_asset add delete_Flag varchar(1) DEFAULT '0' COMMENT '删除标记，0未删除，1删除'; +-- 资产类型表 jsh_assetcategory +alter table jsh_assetcategory add delete_Flag varchar(1) DEFAULT '0' COMMENT '删除标记，0未删除，1删除'; +-- 资产信息表 jsh_assetname +alter table jsh_assetname add delete_Flag varchar(1) DEFAULT '0' COMMENT '删除标记，0未删除，1删除'; +-- 单据主表 jsh_depothead +alter table jsh_depothead add delete_Flag varchar(1) DEFAULT '0' COMMENT '删除标记，0未删除，1删除'; +-- 单据子表 jsh_depotitem +alter table jsh_depotitem add delete_Flag varchar(1) DEFAULT '0' COMMENT '删除标记，0未删除，1删除'; +-- 收支项目表 jsh_inoutitem +alter table jsh_inoutitem add delete_Flag varchar(1) DEFAULT '0' COMMENT '删除标记，0未删除，1删除'; \ No newline at end of file diff --git a/sql/华夏ERP数据库设计汇总.xlsx b/sql/华夏ERP数据库设计汇总.xlsx index 276d4fe4..5913f39c 100644 Binary files a/sql/华夏ERP数据库设计汇总.xlsx and b/sql/华夏ERP数据库设计汇总.xlsx differ diff --git a/src/main/java/com/jsh/erp/constants/ExceptionConstants.java b/src/main/java/com/jsh/erp/constants/ExceptionConstants.java index 771a9e43..5fe743c9 100644 --- a/src/main/java/com/jsh/erp/constants/ExceptionConstants.java +++ b/src/main/java/com/jsh/erp/constants/ExceptionConstants.java @@ -101,6 +101,9 @@ public class ExceptionConstants { /**商品%s下序列号不充足，请补充后重试*/ public static final int MATERIAL_SERIAL_NUMBERE_NOT_ENOUGH_CODE = 10500002; public static final String MATERIAL_SERIAL_NUMBERE_NOT_ENOUGH_MSG = "商品:%s下序列号不充足，请补充后重试"; + /**删序列号信息失败*/ + public static final int SERIAL_NUMBERE_DELETE_FAILED_CODE = 10500003; + public static final String SERIAL_NUMBERE_DELETE_FAILED_MSG = "删序列号信息失败"; /** * 机构 * type = 110 diff --git a/src/main/java/com/jsh/erp/controller/RoleController.java b/src/main/java/com/jsh/erp/controller/RoleController.java index b204e995..0c4c04c5 100644 --- a/src/main/java/com/jsh/erp/controller/RoleController.java +++ b/src/main/java/com/jsh/erp/controller/RoleController.java @@ -76,4 +76,5 @@ public class RoleController { public List list(HttpServletRequest request) { return roleService.getRole(); } + } diff --git a/src/main/java/com/jsh/erp/controller/SerialNumberController.java b/src/main/java/com/jsh/erp/controller/SerialNumberController.java index f47a6210..01776cbb 100644 --- a/src/main/java/com/jsh/erp/controller/SerialNumberController.java +++ b/src/main/java/com/jsh/erp/controller/SerialNumberController.java @@ -5,14 +5,12 @@ import com.alibaba.fastjson.JSONObject; import com.jsh.erp.constants.ExceptionConstants; import com.jsh.erp.datasource.entities.SerialNumberEx; import com.jsh.erp.exception.BusinessParamCheckingException; +import com.jsh.erp.exception.BusinessRunTimeException; import com.jsh.erp.service.serialNumber.SerialNumberService; import com.jsh.erp.utils.StringUtil; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestParam; -import org.springframework.web.bind.annotation.ResponseBody; -import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; import javax.servlet.http.HttpServletRequest; @@ -109,19 +107,26 @@ public class SerialNumberController { return result; } - - - - - - - - - - - - - - + /** + * create by: qiankunpingtai + * website：http://39.105.146.63/symphony/ + * description: + * 逻辑删除序列号信息 + * create time: 2019/3/27 17:43 + * @Param: ids + * @return java.lang.Object + */ + @RequestMapping(value = "/serialNumber/batchDeleteSerialNumberByIds") + public Object batchDeleteSerialNumberByIds(@RequestParam("ids") String ids) throws Exception { + JSONObject result = ExceptionConstants.standardSuccess(); + int i= serialNumberService.batchDeleteSerialNumberByIds(ids); + if(i<1){ + logger.error("异常码[{}],异常提示[{}],参数,ids[{}]", + ExceptionConstants.SERIAL_NUMBERE_DELETE_FAILED_CODE,ExceptionConstants.SERIAL_NUMBERE_DELETE_FAILED_MSG,ids); + throw new BusinessRunTimeException(ExceptionConstants.SERIAL_NUMBERE_DELETE_FAILED_CODE, + ExceptionConstants.SERIAL_NUMBERE_DELETE_FAILED_MSG); + } + return result; + } } diff --git a/src/main/java/com/jsh/erp/datasource/entities/Account.java b/src/main/java/com/jsh/erp/datasource/entities/Account.java index 67351b85..dba8548c 100644 --- a/src/main/java/com/jsh/erp/datasource/entities/Account.java +++ b/src/main/java/com/jsh/erp/datasource/entities/Account.java @@ -67,6 +67,14 @@ public class Account { */ private Long tenantId; + /** + * This field was generated by MyBatis Generator. + * This field corresponds to the database column jsh_account.delete_Flag + * + * @mbggenerated + */ + private String deleteFlag; + /** * This method was generated by MyBatis Generator. * This method returns the value of the database column jsh_account.Id @@ -258,4 +266,28 @@ public class Account { public void setTenantId(Long tenantId) { this.tenantId = tenantId; } + + /** + * This method was generated by MyBatis Generator. + * This method returns the value of the database column jsh_account.delete_Flag + * + * @return the value of jsh_account.delete_Flag + * + * @mbggenerated + */ + public String getDeleteFlag() { + return deleteFlag; + } + + /** + * This method was generated by MyBatis Generator. + * This method sets the value of the database column jsh_account.delete_Flag + * + * @param deleteFlag the value for jsh_account.delete_Flag + * + * @mbggenerated + */ + public void setDeleteFlag(String deleteFlag) { + this.deleteFlag = deleteFlag == null ? null : deleteFlag.trim(); + } } \ No newline at end of file diff --git a/src/main/java/com/jsh/erp/datasource/entities/AccountExample.java b/src/main/java/com/jsh/erp/datasource/entities/AccountExample.java index f3a1a819..f2e93bfb 100644 --- a/src/main/java/com/jsh/erp/datasource/entities/AccountExample.java +++ b/src/main/java/com/jsh/erp/datasource/entities/AccountExample.java @@ -704,6 +704,76 @@ public class AccountExample { addCriterion("tenant_id not between", value1, value2, "tenantId"); return (Criteria) this; } + + public Criteria andDeleteFlagIsNull() { + addCriterion("delete_Flag is null"); + return (Criteria) this; + } + + public Criteria andDeleteFlagIsNotNull() { + addCriterion("delete_Flag is not null"); + return (Criteria) this; + } + + public Criteria andDeleteFlagEqualTo(String value) { + addCriterion("delete_Flag =", value, "deleteFlag"); + return (Criteria) this; + } + + public Criteria andDeleteFlagNotEqualTo(String value) { + addCriterion("delete_Flag <>", value, "deleteFlag"); + return (Criteria) this; + } + + public Criteria andDeleteFlagGreaterThan(String value) { + addCriterion("delete_Flag >", value, "deleteFlag"); + return (Criteria) this; + } + + public Criteria andDeleteFlagGreaterThanOrEqualTo(String value) { + addCriterion("delete_Flag >=", value, "deleteFlag"); + return (Criteria) this; + } + + public Criteria andDeleteFlagLessThan(String value) { + addCriterion("delete_Flag <", value, "deleteFlag"); + return (Criteria) this; + } + + public Criteria andDeleteFlagLessThanOrEqualTo(String value) { + addCriterion("delete_Flag <=", value, "deleteFlag"); + return (Criteria) this; + } + + public Criteria andDeleteFlagLike(String value) { + addCriterion("delete_Flag like", value, "deleteFlag"); + return (Criteria) this; + } + + public Criteria andDeleteFlagNotLike(String value) { + addCriterion("delete_Flag not like", value, "deleteFlag"); + return (Criteria) this; + } + + public Criteria andDeleteFlagIn(List values) { + addCriterion("delete_Flag in", values, "deleteFlag"); + return (Criteria) this; + } + + public Criteria andDeleteFlagNotIn(List values) { + addCriterion("delete_Flag not in", values, "deleteFlag"); + return (Criteria) this; + } + + public Criteria andDeleteFlagBetween(String value1, String value2) { + addCriterion("delete_Flag between", value1, value2, "deleteFlag"); + return (Criteria) this; + } + + public Criteria andDeleteFlagNotBetween(String value1, String value2) { + addCriterion("delete_Flag not between", value1, value2, "deleteFlag"); + return (Criteria) this; + } } /** diff --git a/src/main/java/com/jsh/erp/datasource/entities/AccountHead.java b/src/main/java/com/jsh/erp/datasource/entities/AccountHead.java index c8a9b7f8..0bd1fe11 100644 --- a/src/main/java/com/jsh/erp/datasource/entities/AccountHead.java +++ b/src/main/java/com/jsh/erp/datasource/entities/AccountHead.java @@ -92,6 +92,14 @@ public class AccountHead { */ private Long tenantId; + /** + * This field was generated by MyBatis Generator. + * This field corresponds to the database column jsh_accounthead.delete_Flag + * + * @mbggenerated + */ + private String deleteFlag; + /** * This method was generated by MyBatis Generator. * This method returns the value of the database column jsh_accounthead.Id @@ -355,4 +363,28 @@ public class AccountHead { public void setTenantId(Long tenantId) { this.tenantId = tenantId; } + + /** + * This method was generated by MyBatis Generator. + * This method returns the value of the database column jsh_accounthead.delete_Flag + * + * @return the value of jsh_accounthead.delete_Flag + * + * @mbggenerated + */ + public String getDeleteFlag() { + return deleteFlag; + } + + /** + * This method was generated by MyBatis Generator. + * This method sets the value of the database column jsh_accounthead.delete_Flag + * + * @param deleteFlag the value for jsh_accounthead.delete_Flag + * + * @mbggenerated + */ + public void setDeleteFlag(String deleteFlag) { + this.deleteFlag = deleteFlag == null ? null : deleteFlag.trim(); + } } \ No newline at end of file diff --git a/src/main/java/com/jsh/erp/datasource/entities/AccountHeadExample.java b/src/main/java/com/jsh/erp/datasource/entities/AccountHeadExample.java index 95a3c29b..5cbd4000 100644 --- a/src/main/java/com/jsh/erp/datasource/entities/AccountHeadExample.java +++ b/src/main/java/com/jsh/erp/datasource/entities/AccountHeadExample.java @@ -885,6 +885,76 @@ public class AccountHeadExample { addCriterion("tenant_id not between", value1, value2, "tenantId"); return (Criteria) this; } + + public Criteria andDeleteFlagIsNull() { + addCriterion("delete_Flag is null"); + return (Criteria) this; + } + + public Criteria andDeleteFlagIsNotNull() { + addCriterion("delete_Flag is not null"); + return (Criteria) this; + } + + public Criteria andDeleteFlagEqualTo(String value) { + addCriterion("delete_Flag =", value, "deleteFlag"); + return (Criteria) this; + } + + public Criteria andDeleteFlagNotEqualTo(String value) { + addCriterion("delete_Flag <>", value, "deleteFlag"); + return (Criteria) this; + } + + public Criteria andDeleteFlagGreaterThan(String value) { + addCriterion("delete_Flag >", value, "deleteFlag"); + return (Criteria) this; + } + + public Criteria andDeleteFlagGreaterThanOrEqualTo(String value) { + addCriterion("delete_Flag >=", value, "deleteFlag"); + return (Criteria) this; + } + + public Criteria andDeleteFlagLessThan(String value) { + addCriterion("delete_Flag <", value, "deleteFlag"); + return (Criteria) this; + } + + public Criteria andDeleteFlagLessThanOrEqualTo(String value) { + addCriterion("delete_Flag <=", value, "deleteFlag"); + return (Criteria) this; + } + + public Criteria andDeleteFlagLike(String value) { + addCriterion("delete_Flag like", value, "deleteFlag"); + return (Criteria) this; + } + + public Criteria andDeleteFlagNotLike(String value) { + addCriterion("delete_Flag not like", value, "deleteFlag"); + return (Criteria) this; + } + + public Criteria andDeleteFlagIn(List values) { + addCriterion("delete_Flag in", values, "deleteFlag"); + return (Criteria) this; + } + + public Criteria andDeleteFlagNotIn(List values) { + addCriterion("delete_Flag not in", values, "deleteFlag"); + return (Criteria) this; + } + + public Criteria andDeleteFlagBetween(String value1, String value2) { + addCriterion("delete_Flag between", value1, value2, "deleteFlag"); + return (Criteria) this; + } + + public Criteria andDeleteFlagNotBetween(String value1, String value2) { + addCriterion("delete_Flag not between", value1, value2, "deleteFlag"); + return (Criteria) this; + } } /** diff --git a/src/main/java/com/jsh/erp/datasource/entities/AccountItem.java b/src/main/java/com/jsh/erp/datasource/entities/AccountItem.java index c499740e..4cb479f5 100644 --- a/src/main/java/com/jsh/erp/datasource/entities/AccountItem.java +++ b/src/main/java/com/jsh/erp/datasource/entities/AccountItem.java @@ -59,6 +59,14 @@ public class AccountItem { */ private Long tenantId; + /** + * This field was generated by MyBatis Generator. + * This field corresponds to the database column jsh_accountitem.delete_Flag + * + * @mbggenerated + */ + private String deleteFlag; + /** * This method was generated by MyBatis Generator. * This method returns the value of the database column jsh_accountitem.Id @@ -226,4 +234,28 @@ public class AccountItem { public void setTenantId(Long tenantId) { this.tenantId = tenantId; } + + /** + * This method was generated by MyBatis Generator. + * This method returns the value of the database column jsh_accountitem.delete_Flag + * + * @return the value of jsh_accountitem.delete_Flag + * + * @mbggenerated + */ + public String getDeleteFlag() { + return deleteFlag; + } + + /** + * This method was generated by MyBatis Generator. + * This method sets the value of the database column jsh_accountitem.delete_Flag + * + * @param deleteFlag the value for jsh_accountitem.delete_Flag + * + * @mbggenerated + */ + public void setDeleteFlag(String deleteFlag) { + this.deleteFlag = deleteFlag == null ? null : deleteFlag.trim(); + } } \ No newline at end of file diff --git a/src/main/java/com/jsh/erp/datasource/entities/AccountItemExample.java b/src/main/java/com/jsh/erp/datasource/entities/AccountItemExample.java index 737013d7..ac817266 100644 --- a/src/main/java/com/jsh/erp/datasource/entities/AccountItemExample.java +++ b/src/main/java/com/jsh/erp/datasource/entities/AccountItemExample.java @@ -624,6 +624,76 @@ public class AccountItemExample { addCriterion("tenant_id not between", value1, value2, "tenantId"); return (Criteria) this; } + + public Criteria andDeleteFlagIsNull() { + addCriterion("delete_Flag is null"); + return (Criteria) this; + } + + public Criteria andDeleteFlagIsNotNull() { + addCriterion("delete_Flag is not null"); + return (Criteria) this; + } + + public Criteria andDeleteFlagEqualTo(String value) { + addCriterion("delete_Flag =", value, "deleteFlag"); + return (Criteria) this; + } + + public Criteria andDeleteFlagNotEqualTo(String value) { + addCriterion("delete_Flag <>", value, "deleteFlag"); + return (Criteria) this; + } + + public Criteria andDeleteFlagGreaterThan(String value) { + addCriterion("delete_Flag >", value, "deleteFlag"); + return (Criteria) this; + } + + public Criteria andDeleteFlagGreaterThanOrEqualTo(String value) { + addCriterion("delete_Flag >=", value, "deleteFlag"); + return (Criteria) this; + } + + public Criteria andDeleteFlagLessThan(String value) { + addCriterion("delete_Flag <", value, "deleteFlag"); + return (Criteria) this; + } + + public Criteria andDeleteFlagLessThanOrEqualTo(String value) { + addCriterion("delete_Flag <=", value, "deleteFlag"); + return (Criteria) this; + } + + public Criteria andDeleteFlagLike(String value) { + addCriterion("delete_Flag like", value, "deleteFlag"); + return (Criteria) this; + } + + public Criteria andDeleteFlagNotLike(String value) { + addCriterion("delete_Flag not like", value, "deleteFlag"); + return (Criteria) this; + } + + public Criteria andDeleteFlagIn(List values) { + addCriterion("delete_Flag in", values, "deleteFlag"); + return (Criteria) this; + } + + public Criteria andDeleteFlagNotIn(List values) { + addCriterion("delete_Flag not in", values, "deleteFlag"); + return (Criteria) this; + } + + public Criteria andDeleteFlagBetween(String value1, String value2) { + addCriterion("delete_Flag between", value1, value2, "deleteFlag"); + return (Criteria) this; + } + + public Criteria andDeleteFlagNotBetween(String value1, String value2) { + addCriterion("delete_Flag not between", value1, value2, "deleteFlag"); + return (Criteria) this; + } } /** diff --git a/src/main/java/com/jsh/erp/datasource/entities/App.java b/src/main/java/com/jsh/erp/datasource/entities/App.java index 279c8d39..c5d30bf6 100644 --- a/src/main/java/com/jsh/erp/datasource/entities/App.java +++ b/src/main/java/com/jsh/erp/datasource/entities/App.java @@ -121,6 +121,14 @@ public class App { */ private Boolean enabled; + /** + * This field was generated by MyBatis Generator. + * This field corresponds to the database column jsh_app.delete_Flag + * + * @mbggenerated + */ + private String deleteFlag; + /** * This method was generated by MyBatis Generator. * This method returns the value of the database column jsh_app.Id @@ -480,4 +488,28 @@ public class App { public void setEnabled(Boolean enabled) { this.enabled = enabled; } + + /** + * This method was generated by MyBatis Generator. + * This method returns the value of the database column jsh_app.delete_Flag + * + * @return the value of jsh_app.delete_Flag + * + * @mbggenerated + */ + public String getDeleteFlag() { + return deleteFlag; + } + + /** + * This method was generated by MyBatis Generator. + * This method sets the value of the database column jsh_app.delete_Flag + * + * @param deleteFlag the value for jsh_app.delete_Flag + * + * @mbggenerated + */ + public void setDeleteFlag(String deleteFlag) { + this.deleteFlag = deleteFlag == null ? null : deleteFlag.trim(); + } } \ No newline at end of file diff --git a/src/main/java/com/jsh/erp/datasource/entities/AppExample.java b/src/main/java/com/jsh/erp/datasource/entities/AppExample.java index d2075307..ed21763a 100644 --- a/src/main/java/com/jsh/erp/datasource/entities/AppExample.java +++ b/src/main/java/com/jsh/erp/datasource/entities/AppExample.java @@ -1193,6 +1193,76 @@ public class AppExample { addCriterion("Enabled not between", value1, value2, "enabled"); return (Criteria) this; } + + public Criteria andDeleteFlagIsNull() { + addCriterion("delete_Flag is null"); + return (Criteria) this; + } + + public Criteria andDeleteFlagIsNotNull() { + addCriterion("delete_Flag is not null"); + return (Criteria) this; + } + + public Criteria andDeleteFlagEqualTo(String value) { + addCriterion("delete_Flag =", value, "deleteFlag"); + return (Criteria) this; + } + + public Criteria andDeleteFlagNotEqualTo(String value) { + addCriterion("delete_Flag <>", value, "deleteFlag"); + return (Criteria) this; + } + + public Criteria andDeleteFlagGreaterThan(String value) { + addCriterion("delete_Flag >", value, "deleteFlag"); + return (Criteria) this; + } + + public Criteria andDeleteFlagGreaterThanOrEqualTo(String value) { + addCriterion("delete_Flag >=", value, "deleteFlag"); + return (Criteria) this; + } + + public Criteria andDeleteFlagLessThan(String value) { + addCriterion("delete_Flag <", value, "deleteFlag"); + return (Criteria) this; + } + + public Criteria andDeleteFlagLessThanOrEqualTo(String value) { + addCriterion("delete_Flag <=", value, "deleteFlag"); + return (Criteria) this; + } + + public Criteria andDeleteFlagLike(String value) { + addCriterion("delete_Flag like", value, "deleteFlag"); + return (Criteria) this; + } + + public Criteria andDeleteFlagNotLike(String value) { + addCriterion("delete_Flag not like", value, "deleteFlag"); + return (Criteria) this; + } + + public Criteria andDeleteFlagIn(List values) { + addCriterion("delete_Flag in", values, "deleteFlag"); + return (Criteria) this; + } + + public Criteria andDeleteFlagNotIn(List values) { + addCriterion("delete_Flag not in", values, "deleteFlag"); + return (Criteria) this; + } + + public Criteria andDeleteFlagBetween(String value1, String value2) { + addCriterion("delete_Flag between", value1, value2, "deleteFlag"); + return (Criteria) this; + } + + public Criteria andDeleteFlagNotBetween(String value1, String value2) { + addCriterion("delete_Flag not between", value1, value2, "deleteFlag"); + return (Criteria) this; + } } /** diff --git a/src/main/java/com/jsh/erp/datasource/entities/Asset.java b/src/main/java/com/jsh/erp/datasource/entities/Asset.java index b519f846..218582ff 100644 --- a/src/main/java/com/jsh/erp/datasource/entities/Asset.java +++ b/src/main/java/com/jsh/erp/datasource/entities/Asset.java @@ -148,6 +148,14 @@ public class Asset { */ private Long tenantId; + /** + * This field was generated by MyBatis Generator. + * This field corresponds to the database column jsh_asset.delete_Flag + * + * @mbggenerated + */ + private String deleteFlag; + /** * This field was generated by MyBatis Generator. * This field corresponds to the database column jsh_asset.description @@ -596,6 +604,30 @@ public class Asset { this.tenantId = tenantId; } + /** + * This method was generated by MyBatis Generator. + * This method returns the value of the database column jsh_asset.delete_Flag + * + * @return the value of jsh_asset.delete_Flag + * + * @mbggenerated + */ + public String getDeleteFlag() { + return deleteFlag; + } + + /** + * This method was generated by MyBatis Generator. + * This method sets the value of the database column jsh_asset.delete_Flag + * + * @param deleteFlag the value for jsh_asset.delete_Flag + * + * @mbggenerated + */ + public void setDeleteFlag(String deleteFlag) { + this.deleteFlag = deleteFlag == null ? null : deleteFlag.trim(); + } + /** * This method was generated by MyBatis Generator. * This method returns the value of the database column jsh_asset.description diff --git a/src/main/java/com/jsh/erp/datasource/entities/AssetCategory.java b/src/main/java/com/jsh/erp/datasource/entities/AssetCategory.java index 7cbcb62d..cd8c8b32 100644 --- a/src/main/java/com/jsh/erp/datasource/entities/AssetCategory.java +++ b/src/main/java/com/jsh/erp/datasource/entities/AssetCategory.java @@ -41,6 +41,14 @@ public class AssetCategory { */ private Long tenantId; + /** + * This field was generated by MyBatis Generator. + * This field corresponds to the database column jsh_assetcategory.delete_Flag + * + * @mbggenerated + */ + private String deleteFlag; + /** * This method was generated by MyBatis Generator. * This method returns the value of the database column jsh_assetcategory.id @@ -160,4 +168,28 @@ public class AssetCategory { public void setTenantId(Long tenantId) { this.tenantId = tenantId; } + + /** + * This method was generated by MyBatis Generator. + * This method returns the value of the database column jsh_assetcategory.delete_Flag + * + * @return the value of jsh_assetcategory.delete_Flag + * + * @mbggenerated + */ + public String getDeleteFlag() { + return deleteFlag; + } + + /** + * This method was generated by MyBatis Generator. + * This method sets the value of the database column jsh_assetcategory.delete_Flag + * + * @param deleteFlag the value for jsh_assetcategory.delete_Flag + * + * @mbggenerated + */ + public void setDeleteFlag(String deleteFlag) { + this.deleteFlag = deleteFlag == null ? null : deleteFlag.trim(); + } } \ No newline at end of file diff --git a/src/main/java/com/jsh/erp/datasource/entities/AssetCategoryExample.java b/src/main/java/com/jsh/erp/datasource/entities/AssetCategoryExample.java index 09be54f2..ee1e40e6 100644 --- a/src/main/java/com/jsh/erp/datasource/entities/AssetCategoryExample.java +++ b/src/main/java/com/jsh/erp/datasource/entities/AssetCategoryExample.java @@ -513,6 +513,76 @@ public class AssetCategoryExample { addCriterion("tenant_id not between", value1, value2, "tenantId"); return (Criteria) this; } + + public Criteria andDeleteFlagIsNull() { + addCriterion("delete_Flag is null"); + return (Criteria) this; + } + + public Criteria andDeleteFlagIsNotNull() { + addCriterion("delete_Flag is not null"); + return (Criteria) this; + } + + public Criteria andDeleteFlagEqualTo(String value) { + addCriterion("delete_Flag =", value, "deleteFlag"); + return (Criteria) this; + } + + public Criteria andDeleteFlagNotEqualTo(String value) { + addCriterion("delete_Flag <>", value, "deleteFlag"); + return (Criteria) this; + } + + public Criteria andDeleteFlagGreaterThan(String value) { + addCriterion("delete_Flag >", value, "deleteFlag"); + return (Criteria) this; + } + + public Criteria andDeleteFlagGreaterThanOrEqualTo(String value) { + addCriterion("delete_Flag >=", value, "deleteFlag"); + return (Criteria) this; + } + + public Criteria andDeleteFlagLessThan(String value) { + addCriterion("delete_Flag <", value, "deleteFlag"); + return (Criteria) this; + } + + public Criteria andDeleteFlagLessThanOrEqualTo(String value) { + addCriterion("delete_Flag <=", value, "deleteFlag"); + return (Criteria) this; + } + + public Criteria andDeleteFlagLike(String value) { + addCriterion("delete_Flag like", value, "deleteFlag"); + return (Criteria) this; + } + + public Criteria andDeleteFlagNotLike(String value) { + addCriterion("delete_Flag not like", value, "deleteFlag"); + return (Criteria) this; + } + + public Criteria andDeleteFlagIn(List values) { + addCriterion("delete_Flag in", values, "deleteFlag"); + return (Criteria) this; + } + + public Criteria andDeleteFlagNotIn(List values) { + addCriterion("delete_Flag not in", values, "deleteFlag"); + return (Criteria) this; + } + + public Criteria andDeleteFlagBetween(String value1, String value2) { + addCriterion("delete_Flag between", value1, value2, "deleteFlag"); + return (Criteria) this; + } + + public Criteria andDeleteFlagNotBetween(String value1, String value2) { + addCriterion("delete_Flag not between", value1, value2, "deleteFlag"); + return (Criteria) this; + } } /** diff --git a/src/main/java/com/jsh/erp/datasource/entities/AssetExample.java b/src/main/java/com/jsh/erp/datasource/entities/AssetExample.java index b0ee6882..595ca001 100644 --- a/src/main/java/com/jsh/erp/datasource/entities/AssetExample.java +++ b/src/main/java/com/jsh/erp/datasource/entities/AssetExample.java @@ -1315,6 +1315,76 @@ public class AssetExample { addCriterion("tenant_id not between", value1, value2, "tenantId"); return (Criteria) this; } + + public Criteria andDeleteFlagIsNull() { + addCriterion("delete_Flag is null"); + return (Criteria) this; + } + + public Criteria andDeleteFlagIsNotNull() { + addCriterion("delete_Flag is not null"); + return (Criteria) this; + } + + public Criteria andDeleteFlagEqualTo(String value) { + addCriterion("delete_Flag =", value, "deleteFlag"); + return (Criteria) this; + } + + public Criteria andDeleteFlagNotEqualTo(String value) { + addCriterion("delete_Flag <>", value, "deleteFlag"); + return (Criteria) this; + } + + public Criteria andDeleteFlagGreaterThan(String value) { + addCriterion("delete_Flag >", value, "deleteFlag"); + return (Criteria) this; + } + + public Criteria andDeleteFlagGreaterThanOrEqualTo(String value) { + addCriterion("delete_Flag >=", value, "deleteFlag"); + return (Criteria) this; + } + + public Criteria andDeleteFlagLessThan(String value) { + addCriterion("delete_Flag <", value, "deleteFlag"); + return (Criteria) this; + } + + public Criteria andDeleteFlagLessThanOrEqualTo(String value) { + addCriterion("delete_Flag <=", value, "deleteFlag"); + return (Criteria) this; + } + + public Criteria andDeleteFlagLike(String value) { + addCriterion("delete_Flag like", value, "deleteFlag"); + return (Criteria) this; + } + + public Criteria andDeleteFlagNotLike(String value) { + addCriterion("delete_Flag not like", value, "deleteFlag"); + return (Criteria) this; + } + + public Criteria andDeleteFlagIn(List values) { + addCriterion("delete_Flag in", values, "deleteFlag"); + return (Criteria) this; + } + + public Criteria andDeleteFlagNotIn(List values) { + addCriterion("delete_Flag not in", values, "deleteFlag"); + return (Criteria) this; + } + + public Criteria andDeleteFlagBetween(String value1, String value2) { + addCriterion("delete_Flag between", value1, value2, "deleteFlag"); + return (Criteria) this; + } + + public Criteria andDeleteFlagNotBetween(String value1, String value2) { + addCriterion("delete_Flag not between", value1, value2, "deleteFlag"); + return (Criteria) this; + } } /** diff --git a/src/main/java/com/jsh/erp/datasource/entities/AssetName.java b/src/main/java/com/jsh/erp/datasource/entities/AssetName.java index 62848d5a..30693f44 100644 --- a/src/main/java/com/jsh/erp/datasource/entities/AssetName.java +++ b/src/main/java/com/jsh/erp/datasource/entities/AssetName.java @@ -49,6 +49,14 @@ public class AssetName { */ private Long tenantId; + /** + * This field was generated by MyBatis Generator. + * This field corresponds to the database column jsh_assetname.delete_Flag + * + * @mbggenerated + */ + private String deleteFlag; + /** * This field was generated by MyBatis Generator. * This field corresponds to the database column jsh_assetname.description @@ -201,6 +209,30 @@ public class AssetName { this.tenantId = tenantId; } + /** + * This method was generated by MyBatis Generator. + * This method returns the value of the database column jsh_assetname.delete_Flag + * + * @return the value of jsh_assetname.delete_Flag + * + * @mbggenerated + */ + public String getDeleteFlag() { + return deleteFlag; + } + + /** + * This method was generated by MyBatis Generator. + * This method sets the value of the database column jsh_assetname.delete_Flag + * + * @param deleteFlag the value for jsh_assetname.delete_Flag + * + * @mbggenerated + */ + public void setDeleteFlag(String deleteFlag) { + this.deleteFlag = deleteFlag == null ? null : deleteFlag.trim(); + } + /** * This method was generated by MyBatis Generator. * This method returns the value of the database column jsh_assetname.description diff --git a/src/main/java/com/jsh/erp/datasource/entities/AssetNameExample.java b/src/main/java/com/jsh/erp/datasource/entities/AssetNameExample.java index b1160673..4590b7d4 100644 --- a/src/main/java/com/jsh/erp/datasource/entities/AssetNameExample.java +++ b/src/main/java/com/jsh/erp/datasource/entities/AssetNameExample.java @@ -563,6 +563,76 @@ public class AssetNameExample { addCriterion("tenant_id not between", value1, value2, "tenantId"); return (Criteria) this; } + + public Criteria andDeleteFlagIsNull() { + addCriterion("delete_Flag is null"); + return (Criteria) this; + } + + public Criteria andDeleteFlagIsNotNull() { + addCriterion("delete_Flag is not null"); + return (Criteria) this; + } + + public Criteria andDeleteFlagEqualTo(String value) { + addCriterion("delete_Flag =", value, "deleteFlag"); + return (Criteria) this; + } + + public Criteria andDeleteFlagNotEqualTo(String value) { + addCriterion("delete_Flag <>", value, "deleteFlag"); + return (Criteria) this; + } + + public Criteria andDeleteFlagGreaterThan(String value) { + addCriterion("delete_Flag >", value, "deleteFlag"); + return (Criteria) this; + } + + public Criteria andDeleteFlagGreaterThanOrEqualTo(String value) { + addCriterion("delete_Flag >=", value, "deleteFlag"); + return (Criteria) this; + } + + public Criteria andDeleteFlagLessThan(String value) { + addCriterion("delete_Flag <", value, "deleteFlag"); + return (Criteria) this; + } + + public Criteria andDeleteFlagLessThanOrEqualTo(String value) { + addCriterion("delete_Flag <=", value, "deleteFlag"); + return (Criteria) this; + } + + public Criteria andDeleteFlagLike(String value) { + addCriterion("delete_Flag like", value, "deleteFlag"); + return (Criteria) this; + } + + public Criteria andDeleteFlagNotLike(String value) { + addCriterion("delete_Flag not like", value, "deleteFlag"); + return (Criteria) this; + } + + public Criteria andDeleteFlagIn(List values) { + addCriterion("delete_Flag in", values, "deleteFlag"); + return (Criteria) this; + } + + public Criteria andDeleteFlagNotIn(List values) { + addCriterion("delete_Flag not in", values, "deleteFlag"); + return (Criteria) this; + } + + public Criteria andDeleteFlagBetween(String value1, String value2) { + addCriterion("delete_Flag between", value1, value2, "deleteFlag"); + return (Criteria) this; + } + + public Criteria andDeleteFlagNotBetween(String value1, String value2) { + addCriterion("delete_Flag not between", value1, value2, "deleteFlag"); + return (Criteria) this; + } } /** diff --git a/src/main/java/com/jsh/erp/datasource/entities/Depot.java b/src/main/java/com/jsh/erp/datasource/entities/Depot.java index 38d6df1b..53081140 100644 --- a/src/main/java/com/jsh/erp/datasource/entities/Depot.java +++ b/src/main/java/com/jsh/erp/datasource/entities/Depot.java @@ -83,6 +83,14 @@ public class Depot { */ private Long tenantId; + /** + * This field was generated by MyBatis Generator. + * This field corresponds to the database column jsh_depot.delete_Flag + * + * @mbggenerated + */ + private String deleteFlag; + /** * This method was generated by MyBatis Generator. * This method returns the value of the database column jsh_depot.id @@ -322,4 +330,28 @@ public class Depot { public void setTenantId(Long tenantId) { this.tenantId = tenantId; } + + /** + * This method was generated by MyBatis Generator. + * This method returns the value of the database column jsh_depot.delete_Flag + * + * @return the value of jsh_depot.delete_Flag + * + * @mbggenerated + */ + public String getDeleteFlag() { + return deleteFlag; + } + + /** + * This method was generated by MyBatis Generator. + * This method sets the value of the database column jsh_depot.delete_Flag + * + * @param deleteFlag the value for jsh_depot.delete_Flag + * + * @mbggenerated + */ + public void setDeleteFlag(String deleteFlag) { + this.deleteFlag = deleteFlag == null ? null : deleteFlag.trim(); + } } \ No newline at end of file diff --git a/src/main/java/com/jsh/erp/datasource/entities/DepotExample.java b/src/main/java/com/jsh/erp/datasource/entities/DepotExample.java index 8f049f68..dcc624ae 100644 --- a/src/main/java/com/jsh/erp/datasource/entities/DepotExample.java +++ b/src/main/java/com/jsh/erp/datasource/entities/DepotExample.java @@ -834,6 +834,76 @@ public class DepotExample { addCriterion("tenant_id not between", value1, value2, "tenantId"); return (Criteria) this; } + + public Criteria andDeleteFlagIsNull() { + addCriterion("delete_Flag is null"); + return (Criteria) this; + } + + public Criteria andDeleteFlagIsNotNull() { + addCriterion("delete_Flag is not null"); + return (Criteria) this; + } + + public Criteria andDeleteFlagEqualTo(String value) { + addCriterion("delete_Flag =", value, "deleteFlag"); + return (Criteria) this; + } + + public Criteria andDeleteFlagNotEqualTo(String value) { + addCriterion("delete_Flag <>", value, "deleteFlag"); + return (Criteria) this; + } + + public Criteria andDeleteFlagGreaterThan(String value) { + addCriterion("delete_Flag >", value, "deleteFlag"); + return (Criteria) this; + } + + public Criteria andDeleteFlagGreaterThanOrEqualTo(String value) { + addCriterion("delete_Flag >=", value, "deleteFlag"); + return (Criteria) this; + } + + public Criteria andDeleteFlagLessThan(String value) { + addCriterion("delete_Flag <", value, "deleteFlag"); + return (Criteria) this; + } + + public Criteria andDeleteFlagLessThanOrEqualTo(String value) { + addCriterion("delete_Flag <=", value, "deleteFlag"); + return (Criteria) this; + } + + public Criteria andDeleteFlagLike(String value) { + addCriterion("delete_Flag like", value, "deleteFlag"); + return (Criteria) this; + } + + public Criteria andDeleteFlagNotLike(String value) { + addCriterion("delete_Flag not like", value, "deleteFlag"); + return (Criteria) this; + } + + public Criteria andDeleteFlagIn(List values) { + addCriterion("delete_Flag in", values, "deleteFlag"); + return (Criteria) this; + } + + public Criteria andDeleteFlagNotIn(List values) { + addCriterion("delete_Flag not in", values, "deleteFlag"); + return (Criteria) this; + } + + public Criteria andDeleteFlagBetween(String value1, String value2) { + addCriterion("delete_Flag between", value1, value2, "deleteFlag"); + return (Criteria) this; + } + + public Criteria andDeleteFlagNotBetween(String value1, String value2) { + addCriterion("delete_Flag not between", value1, value2, "deleteFlag"); + return (Criteria) this; + } } /** diff --git a/src/main/java/com/jsh/erp/datasource/entities/DepotHead.java b/src/main/java/com/jsh/erp/datasource/entities/DepotHead.java index de128a2a..be2b19bd 100644 --- a/src/main/java/com/jsh/erp/datasource/entities/DepotHead.java +++ b/src/main/java/com/jsh/erp/datasource/entities/DepotHead.java @@ -244,6 +244,14 @@ public class DepotHead { */ private Long tenantId; + /** + * This field was generated by MyBatis Generator. + * This field corresponds to the database column jsh_depothead.delete_Flag + * + * @mbggenerated + */ + private String deleteFlag; + /** * This method was generated by MyBatis Generator. * This method returns the value of the database column jsh_depothead.Id @@ -963,4 +971,28 @@ public class DepotHead { public void setTenantId(Long tenantId) { this.tenantId = tenantId; } + + /** + * This method was generated by MyBatis Generator. + * This method returns the value of the database column jsh_depothead.delete_Flag + * + * @return the value of jsh_depothead.delete_Flag + * + * @mbggenerated + */ + public String getDeleteFlag() { + return deleteFlag; + } + + /** + * This method was generated by MyBatis Generator. + * This method sets the value of the database column jsh_depothead.delete_Flag + * + * @param deleteFlag the value for jsh_depothead.delete_Flag + * + * @mbggenerated + */ + public void setDeleteFlag(String deleteFlag) { + this.deleteFlag = deleteFlag == null ? null : deleteFlag.trim(); + } } \ No newline at end of file diff --git a/src/main/java/com/jsh/erp/datasource/entities/DepotHeadExample.java b/src/main/java/com/jsh/erp/datasource/entities/DepotHeadExample.java index ace4ed7c..799810e9 100644 --- a/src/main/java/com/jsh/erp/datasource/entities/DepotHeadExample.java +++ b/src/main/java/com/jsh/erp/datasource/entities/DepotHeadExample.java @@ -2135,6 +2135,76 @@ public class DepotHeadExample { addCriterion("tenant_id not between", value1, value2, "tenantId"); return (Criteria) this; } + + public Criteria andDeleteFlagIsNull() { + addCriterion("delete_Flag is null"); + return (Criteria) this; + } + + public Criteria andDeleteFlagIsNotNull() { + addCriterion("delete_Flag is not null"); + return (Criteria) this; + } + + public Criteria andDeleteFlagEqualTo(String value) { + addCriterion("delete_Flag =", value, "deleteFlag"); + return (Criteria) this; + } + + public Criteria andDeleteFlagNotEqualTo(String value) { + addCriterion("delete_Flag <>", value, "deleteFlag"); + return (Criteria) this; + } + + public Criteria andDeleteFlagGreaterThan(String value) { + addCriterion("delete_Flag >", value, "deleteFlag"); + return (Criteria) this; + } + + public Criteria andDeleteFlagGreaterThanOrEqualTo(String value) { + addCriterion("delete_Flag >=", value, "deleteFlag"); + return (Criteria) this; + } + + public Criteria andDeleteFlagLessThan(String value) { + addCriterion("delete_Flag <", value, "deleteFlag"); + return (Criteria) this; + } + + public Criteria andDeleteFlagLessThanOrEqualTo(String value) { + addCriterion("delete_Flag <=", value, "deleteFlag"); + return (Criteria) this; + } + + public Criteria andDeleteFlagLike(String value) { + addCriterion("delete_Flag like", value, "deleteFlag"); + return (Criteria) this; + } + + public Criteria andDeleteFlagNotLike(String value) { + addCriterion("delete_Flag not like", value, "deleteFlag"); + return (Criteria) this; + } + + public Criteria andDeleteFlagIn(List values) { + addCriterion("delete_Flag in", values, "deleteFlag"); + return (Criteria) this; + } + + public Criteria andDeleteFlagNotIn(List values) { + addCriterion("delete_Flag not in", values, "deleteFlag"); + return (Criteria) this; + } + + public Criteria andDeleteFlagBetween(String value1, String value2) { + addCriterion("delete_Flag between", value1, value2, "deleteFlag"); + return (Criteria) this; + } + + public Criteria andDeleteFlagNotBetween(String value1, String value2) { + addCriterion("delete_Flag not between", value1, value2, "deleteFlag"); + return (Criteria) this; + } } /** diff --git a/src/main/java/com/jsh/erp/datasource/entities/DepotItem.java b/src/main/java/com/jsh/erp/datasource/entities/DepotItem.java index c7b39912..6daaa3b6 100644 --- a/src/main/java/com/jsh/erp/datasource/entities/DepotItem.java +++ b/src/main/java/com/jsh/erp/datasource/entities/DepotItem.java @@ -195,6 +195,14 @@ public class DepotItem { */ private Long tenantId; + /** + * This field was generated by MyBatis Generator. + * This field corresponds to the database column jsh_depotitem.delete_Flag + * + * @mbggenerated + */ + private String deleteFlag; + /** * This method was generated by MyBatis Generator. * This method returns the value of the database column jsh_depotitem.Id @@ -770,4 +778,28 @@ public class DepotItem { public void setTenantId(Long tenantId) { this.tenantId = tenantId; } + + /** + * This method was generated by MyBatis Generator. + * This method returns the value of the database column jsh_depotitem.delete_Flag + * + * @return the value of jsh_depotitem.delete_Flag + * + * @mbggenerated + */ + public String getDeleteFlag() { + return deleteFlag; + } + + /** + * This method was generated by MyBatis Generator. + * This method sets the value of the database column jsh_depotitem.delete_Flag + * + * @param deleteFlag the value for jsh_depotitem.delete_Flag + * + * @mbggenerated + */ + public void setDeleteFlag(String deleteFlag) { + this.deleteFlag = deleteFlag == null ? null : deleteFlag.trim(); + } } \ No newline at end of file diff --git a/src/main/java/com/jsh/erp/datasource/entities/DepotItemExample.java b/src/main/java/com/jsh/erp/datasource/entities/DepotItemExample.java index 5c9eb182..61aa4090 100644 --- a/src/main/java/com/jsh/erp/datasource/entities/DepotItemExample.java +++ b/src/main/java/com/jsh/erp/datasource/entities/DepotItemExample.java @@ -1724,6 +1724,76 @@ public class DepotItemExample { addCriterion("tenant_id not between", value1, value2, "tenantId"); return (Criteria) this; } + + public Criteria andDeleteFlagIsNull() { + addCriterion("delete_Flag is null"); + return (Criteria) this; + } + + public Criteria andDeleteFlagIsNotNull() { + addCriterion("delete_Flag is not null"); + return (Criteria) this; + } + + public Criteria andDeleteFlagEqualTo(String value) { + addCriterion("delete_Flag =", value, "deleteFlag"); + return (Criteria) this; + } + + public Criteria andDeleteFlagNotEqualTo(String value) { + addCriterion("delete_Flag <>", value, "deleteFlag"); + return (Criteria) this; + } + + public Criteria andDeleteFlagGreaterThan(String value) { + addCriterion("delete_Flag >", value, "deleteFlag"); + return (Criteria) this; + } + + public Criteria andDeleteFlagGreaterThanOrEqualTo(String value) { + addCriterion("delete_Flag >=", value, "deleteFlag"); + return (Criteria) this; + } + + public Criteria andDeleteFlagLessThan(String value) { + addCriterion("delete_Flag <", value, "deleteFlag"); + return (Criteria) this; + } + + public Criteria andDeleteFlagLessThanOrEqualTo(String value) { + addCriterion("delete_Flag <=", value, "deleteFlag"); + return (Criteria) this; + } + + public Criteria andDeleteFlagLike(String value) { + addCriterion("delete_Flag like", value, "deleteFlag"); + return (Criteria) this; + } + + public Criteria andDeleteFlagNotLike(String value) { + addCriterion("delete_Flag not like", value, "deleteFlag"); + return (Criteria) this; + } + + public Criteria andDeleteFlagIn(List values) { + addCriterion("delete_Flag in", values, "deleteFlag"); + return (Criteria) this; + } + + public Criteria andDeleteFlagNotIn(List values) { + addCriterion("delete_Flag not in", values, "deleteFlag"); + return (Criteria) this; + } + + public Criteria andDeleteFlagBetween(String value1, String value2) { + addCriterion("delete_Flag between", value1, value2, "deleteFlag"); + return (Criteria) this; + } + + public Criteria andDeleteFlagNotBetween(String value1, String value2) { + addCriterion("delete_Flag not between", value1, value2, "deleteFlag"); + return (Criteria) this; + } } /** diff --git a/src/main/java/com/jsh/erp/datasource/entities/Functions.java b/src/main/java/com/jsh/erp/datasource/entities/Functions.java index 0bc861c7..272e166d 100644 --- a/src/main/java/com/jsh/erp/datasource/entities/Functions.java +++ b/src/main/java/com/jsh/erp/datasource/entities/Functions.java @@ -81,6 +81,14 @@ public class Functions { */ private String pushbtn; + /** + * This field was generated by MyBatis Generator. + * This field corresponds to the database column jsh_functions.delete_Flag + * + * @mbggenerated + */ + private String deleteFlag; + /** * This method was generated by MyBatis Generator. * This method returns the value of the database column jsh_functions.Id @@ -320,4 +328,28 @@ public class Functions { public void setPushbtn(String pushbtn) { this.pushbtn = pushbtn == null ? null : pushbtn.trim(); } + + /** + * This method was generated by MyBatis Generator. + * This method returns the value of the database column jsh_functions.delete_Flag + * + * @return the value of jsh_functions.delete_Flag + * + * @mbggenerated + */ + public String getDeleteFlag() { + return deleteFlag; + } + + /** + * This method was generated by MyBatis Generator. + * This method sets the value of the database column jsh_functions.delete_Flag + * + * @param deleteFlag the value for jsh_functions.delete_Flag + * + * @mbggenerated + */ + public void setDeleteFlag(String deleteFlag) { + this.deleteFlag = deleteFlag == null ? null : deleteFlag.trim(); + } } \ No newline at end of file diff --git a/src/main/java/com/jsh/erp/datasource/entities/FunctionsExample.java b/src/main/java/com/jsh/erp/datasource/entities/FunctionsExample.java index 19e46683..099cdf54 100644 --- a/src/main/java/com/jsh/erp/datasource/entities/FunctionsExample.java +++ b/src/main/java/com/jsh/erp/datasource/entities/FunctionsExample.java @@ -863,6 +863,76 @@ public class FunctionsExample { addCriterion("PushBtn not between", value1, value2, "pushbtn"); return (Criteria) this; } + + public Criteria andDeleteFlagIsNull() { + addCriterion("delete_Flag is null"); + return (Criteria) this; + } + + public Criteria andDeleteFlagIsNotNull() { + addCriterion("delete_Flag is not null"); + return (Criteria) this; + } + + public Criteria andDeleteFlagEqualTo(String value) { + addCriterion("delete_Flag =", value, "deleteFlag"); + return (Criteria) this; + } + + public Criteria andDeleteFlagNotEqualTo(String value) { + addCriterion("delete_Flag <>", value, "deleteFlag"); + return (Criteria) this; + } + + public Criteria andDeleteFlagGreaterThan(String value) { + addCriterion("delete_Flag >", value, "deleteFlag"); + return (Criteria) this; + } + + public Criteria andDeleteFlagGreaterThanOrEqualTo(String value) { + addCriterion("delete_Flag >=", value, "deleteFlag"); + return (Criteria) this; + } + + public Criteria andDeleteFlagLessThan(String value) { + addCriterion("delete_Flag <", value, "deleteFlag"); + return (Criteria) this; + } + + public Criteria andDeleteFlagLessThanOrEqualTo(String value) { + addCriterion("delete_Flag <=", value, "deleteFlag"); + return (Criteria) this; + } + + public Criteria andDeleteFlagLike(String value) { + addCriterion("delete_Flag like", value, "deleteFlag"); + return (Criteria) this; + } + + public Criteria andDeleteFlagNotLike(String value) { + addCriterion("delete_Flag not like", value, "deleteFlag"); + return (Criteria) this; + } + + public Criteria andDeleteFlagIn(List values) { + addCriterion("delete_Flag in", values, "deleteFlag"); + return (Criteria) this; + } + + public Criteria andDeleteFlagNotIn(List values) { + addCriterion("delete_Flag not in", values, "deleteFlag"); + return (Criteria) this; + } + + public Criteria andDeleteFlagBetween(String value1, String value2) { + addCriterion("delete_Flag between", value1, value2, "deleteFlag"); + return (Criteria) this; + } + + public Criteria andDeleteFlagNotBetween(String value1, String value2) { + addCriterion("delete_Flag not between", value1, value2, "deleteFlag"); + return (Criteria) this; + } } /** diff --git a/src/main/java/com/jsh/erp/datasource/entities/InOutItem.java b/src/main/java/com/jsh/erp/datasource/entities/InOutItem.java index 9a1c3cee..95bdf2e4 100644 --- a/src/main/java/com/jsh/erp/datasource/entities/InOutItem.java +++ b/src/main/java/com/jsh/erp/datasource/entities/InOutItem.java @@ -41,6 +41,14 @@ public class InOutItem { */ private Long tenantId; + /** + * This field was generated by MyBatis Generator. + * This field corresponds to the database column jsh_inoutitem.delete_Flag + * + * @mbggenerated + */ + private String deleteFlag; + /** * This method was generated by MyBatis Generator. * This method returns the value of the database column jsh_inoutitem.Id @@ -160,4 +168,28 @@ public class InOutItem { public void setTenantId(Long tenantId) { this.tenantId = tenantId; } + + /** + * This method was generated by MyBatis Generator. + * This method returns the value of the database column jsh_inoutitem.delete_Flag + * + * @return the value of jsh_inoutitem.delete_Flag + * + * @mbggenerated + */ + public String getDeleteFlag() { + return deleteFlag; + } + + /** + * This method was generated by MyBatis Generator. + * This method sets the value of the database column jsh_inoutitem.delete_Flag + * + * @param deleteFlag the value for jsh_inoutitem.delete_Flag + * + * @mbggenerated + */ + public void setDeleteFlag(String deleteFlag) { + this.deleteFlag = deleteFlag == null ? null : deleteFlag.trim(); + } } \ No newline at end of file diff --git a/src/main/java/com/jsh/erp/datasource/entities/InOutItemExample.java b/src/main/java/com/jsh/erp/datasource/entities/InOutItemExample.java index b58f79d2..af0998d5 100644 --- a/src/main/java/com/jsh/erp/datasource/entities/InOutItemExample.java +++ b/src/main/java/com/jsh/erp/datasource/entities/InOutItemExample.java @@ -523,6 +523,76 @@ public class InOutItemExample { addCriterion("tenant_id not between", value1, value2, "tenantId"); return (Criteria) this; } + + public Criteria andDeleteFlagIsNull() { + addCriterion("delete_Flag is null"); + return (Criteria) this; + } + + public Criteria andDeleteFlagIsNotNull() { + addCriterion("delete_Flag is not null"); + return (Criteria) this; + } + + public Criteria andDeleteFlagEqualTo(String value) { + addCriterion("delete_Flag =", value, "deleteFlag"); + return (Criteria) this; + } + + public Criteria andDeleteFlagNotEqualTo(String value) { + addCriterion("delete_Flag <>", value, "deleteFlag"); + return (Criteria) this; + } + + public Criteria andDeleteFlagGreaterThan(String value) { + addCriterion("delete_Flag >", value, "deleteFlag"); + return (Criteria) this; + } + + public Criteria andDeleteFlagGreaterThanOrEqualTo(String value) { + addCriterion("delete_Flag >=", value, "deleteFlag"); + return (Criteria) this; + } + + public Criteria andDeleteFlagLessThan(String value) { + addCriterion("delete_Flag <", value, "deleteFlag"); + return (Criteria) this; + } + + public Criteria andDeleteFlagLessThanOrEqualTo(String value) { + addCriterion("delete_Flag <=", value, "deleteFlag"); + return (Criteria) this; + } + + public Criteria andDeleteFlagLike(String value) { + addCriterion("delete_Flag like", value, "deleteFlag"); + return (Criteria) this; + } + + public Criteria andDeleteFlagNotLike(String value) { + addCriterion("delete_Flag not like", value, "deleteFlag"); + return (Criteria) this; + } + + public Criteria andDeleteFlagIn(List values) { + addCriterion("delete_Flag in", values, "deleteFlag"); + return (Criteria) this; + } + + public Criteria andDeleteFlagNotIn(List values) { + addCriterion("delete_Flag not in", values, "deleteFlag"); + return (Criteria) this; + } + + public Criteria andDeleteFlagBetween(String value1, String value2) { + addCriterion("delete_Flag between", value1, value2, "deleteFlag"); + return (Criteria) this; + } + + public Criteria andDeleteFlagNotBetween(String value1, String value2) { + addCriterion("delete_Flag not between", value1, value2, "deleteFlag"); + return (Criteria) this; + } } /** diff --git a/src/main/java/com/jsh/erp/datasource/entities/Material.java b/src/main/java/com/jsh/erp/datasource/entities/Material.java index 1531ec88..8c119684 100644 --- a/src/main/java/com/jsh/erp/datasource/entities/Material.java +++ b/src/main/java/com/jsh/erp/datasource/entities/Material.java @@ -203,6 +203,14 @@ public class Material { */ private Long tenantId; + /** + * This field was generated by MyBatis Generator. + * This field corresponds to the database column jsh_material.delete_Flag + * + * @mbggenerated + */ + private String deleteFlag; + /** * This method was generated by MyBatis Generator. * This method returns the value of the database column jsh_material.Id @@ -802,4 +810,28 @@ public class Material { public void setTenantId(Long tenantId) { this.tenantId = tenantId; } + + /** + * This method was generated by MyBatis Generator. + * This method returns the value of the database column jsh_material.delete_Flag + * + * @return the value of jsh_material.delete_Flag + * + * @mbggenerated + */ + public String getDeleteFlag() { + return deleteFlag; + } + + /** + * This method was generated by MyBatis Generator. + * This method sets the value of the database column jsh_material.delete_Flag + * + * @param deleteFlag the value for jsh_material.delete_Flag + * + * @mbggenerated + */ + public void setDeleteFlag(String deleteFlag) { + this.deleteFlag = deleteFlag == null ? null : deleteFlag.trim(); + } } \ No newline at end of file diff --git a/src/main/java/com/jsh/erp/datasource/entities/MaterialExample.java b/src/main/java/com/jsh/erp/datasource/entities/MaterialExample.java index 10983cd5..777a49ba 100644 --- a/src/main/java/com/jsh/erp/datasource/entities/MaterialExample.java +++ b/src/main/java/com/jsh/erp/datasource/entities/MaterialExample.java @@ -1834,6 +1834,76 @@ public class MaterialExample { addCriterion("tenant_id not between", value1, value2, "tenantId"); return (Criteria) this; } + + public Criteria andDeleteFlagIsNull() { + addCriterion("delete_Flag is null"); + return (Criteria) this; + } + + public Criteria andDeleteFlagIsNotNull() { + addCriterion("delete_Flag is not null"); + return (Criteria) this; + } + + public Criteria andDeleteFlagEqualTo(String value) { + addCriterion("delete_Flag =", value, "deleteFlag"); + return (Criteria) this; + } + + public Criteria andDeleteFlagNotEqualTo(String value) { + addCriterion("delete_Flag <>", value, "deleteFlag"); + return (Criteria) this; + } + + public Criteria andDeleteFlagGreaterThan(String value) { + addCriterion("delete_Flag >", value, "deleteFlag"); + return (Criteria) this; + } + + public Criteria andDeleteFlagGreaterThanOrEqualTo(String value) { + addCriterion("delete_Flag >=", value, "deleteFlag"); + return (Criteria) this; + } + + public Criteria andDeleteFlagLessThan(String value) { + addCriterion("delete_Flag <", value, "deleteFlag"); + return (Criteria) this; + } + + public Criteria andDeleteFlagLessThanOrEqualTo(String value) { + addCriterion("delete_Flag <=", value, "deleteFlag"); + return (Criteria) this; + } + + public Criteria andDeleteFlagLike(String value) { + addCriterion("delete_Flag like", value, "deleteFlag"); + return (Criteria) this; + } + + public Criteria andDeleteFlagNotLike(String value) { + addCriterion("delete_Flag not like", value, "deleteFlag"); + return (Criteria) this; + } + + public Criteria andDeleteFlagIn(List values) { + addCriterion("delete_Flag in", values, "deleteFlag"); + return (Criteria) this; + } + + public Criteria andDeleteFlagNotIn(List values) { + addCriterion("delete_Flag not in", values, "deleteFlag"); + return (Criteria) this; + } + + public Criteria andDeleteFlagBetween(String value1, String value2) { + addCriterion("delete_Flag between", value1, value2, "deleteFlag"); + return (Criteria) this; + } + + public Criteria andDeleteFlagNotBetween(String value1, String value2) { + addCriterion("delete_Flag not between", value1, value2, "deleteFlag"); + return (Criteria) this; + } } /** diff --git a/src/main/java/com/jsh/erp/datasource/entities/MaterialProperty.java b/src/main/java/com/jsh/erp/datasource/entities/MaterialProperty.java index dc075f26..4ad6a4da 100644 --- a/src/main/java/com/jsh/erp/datasource/entities/MaterialProperty.java +++ b/src/main/java/com/jsh/erp/datasource/entities/MaterialProperty.java @@ -41,6 +41,14 @@ public class MaterialProperty { */ private String anothername; + /** + * This field was generated by MyBatis Generator. + * This field corresponds to the database column jsh_materialproperty.delete_Flag + * + * @mbggenerated + */ + private String deleteFlag; + /** * This method was generated by MyBatis Generator. * This method returns the value of the database column jsh_materialproperty.id @@ -160,4 +168,28 @@ public class MaterialProperty { public void setAnothername(String anothername) { this.anothername = anothername == null ? null : anothername.trim(); } + + /** + * This method was generated by MyBatis Generator. + * This method returns the value of the database column jsh_materialproperty.delete_Flag + * + * @return the value of jsh_materialproperty.delete_Flag + * + * @mbggenerated + */ + public String getDeleteFlag() { + return deleteFlag; + } + + /** + * This method was generated by MyBatis Generator. + * This method sets the value of the database column jsh_materialproperty.delete_Flag + * + * @param deleteFlag the value for jsh_materialproperty.delete_Flag + * + * @mbggenerated + */ + public void setDeleteFlag(String deleteFlag) { + this.deleteFlag = deleteFlag == null ? null : deleteFlag.trim(); + } } \ No newline at end of file diff --git a/src/main/java/com/jsh/erp/datasource/entities/MaterialPropertyExample.java b/src/main/java/com/jsh/erp/datasource/entities/MaterialPropertyExample.java index 298e6516..64b3e60d 100644 --- a/src/main/java/com/jsh/erp/datasource/entities/MaterialPropertyExample.java +++ b/src/main/java/com/jsh/erp/datasource/entities/MaterialPropertyExample.java @@ -523,6 +523,76 @@ public class MaterialPropertyExample { addCriterion("anotherName not between", value1, value2, "anothername"); return (Criteria) this; } + + public Criteria andDeleteFlagIsNull() { + addCriterion("delete_Flag is null"); + return (Criteria) this; + } + + public Criteria andDeleteFlagIsNotNull() { + addCriterion("delete_Flag is not null"); + return (Criteria) this; + } + + public Criteria andDeleteFlagEqualTo(String value) { + addCriterion("delete_Flag =", value, "deleteFlag"); + return (Criteria) this; + } + + public Criteria andDeleteFlagNotEqualTo(String value) { + addCriterion("delete_Flag <>", value, "deleteFlag"); + return (Criteria) this; + } + + public Criteria andDeleteFlagGreaterThan(String value) { + addCriterion("delete_Flag >", value, "deleteFlag"); + return (Criteria) this; + } + + public Criteria andDeleteFlagGreaterThanOrEqualTo(String value) { + addCriterion("delete_Flag >=", value, "deleteFlag"); + return (Criteria) this; + } + + public Criteria andDeleteFlagLessThan(String value) { + addCriterion("delete_Flag <", value, "deleteFlag"); + return (Criteria) this; + } + + public Criteria andDeleteFlagLessThanOrEqualTo(String value) { + addCriterion("delete_Flag <=", value, "deleteFlag"); + return (Criteria) this; + } + + public Criteria andDeleteFlagLike(String value) { + addCriterion("delete_Flag like", value, "deleteFlag"); + return (Criteria) this; + } + + public Criteria andDeleteFlagNotLike(String value) { + addCriterion("delete_Flag not like", value, "deleteFlag"); + return (Criteria) this; + } + + public Criteria andDeleteFlagIn(List values) { + addCriterion("delete_Flag in", values, "deleteFlag"); + return (Criteria) this; + } + + public Criteria andDeleteFlagNotIn(List values) { + addCriterion("delete_Flag not in", values, "deleteFlag"); + return (Criteria) this; + } + + public Criteria andDeleteFlagBetween(String value1, String value2) { + addCriterion("delete_Flag between", value1, value2, "deleteFlag"); + return (Criteria) this; + } + + public Criteria andDeleteFlagNotBetween(String value1, String value2) { + addCriterion("delete_Flag not between", value1, value2, "deleteFlag"); + return (Criteria) this; + } } /** diff --git a/src/main/java/com/jsh/erp/datasource/entities/Person.java b/src/main/java/com/jsh/erp/datasource/entities/Person.java index 7c37a5e9..1ade5650 100644 --- a/src/main/java/com/jsh/erp/datasource/entities/Person.java +++ b/src/main/java/com/jsh/erp/datasource/entities/Person.java @@ -33,6 +33,14 @@ public class Person { */ private Long tenantId; + /** + * This field was generated by MyBatis Generator. + * This field corresponds to the database column jsh_person.delete_Flag + * + * @mbggenerated + */ + private String deleteFlag; + /** * This method was generated by MyBatis Generator. * This method returns the value of the database column jsh_person.Id @@ -128,4 +136,28 @@ public class Person { public void setTenantId(Long tenantId) { this.tenantId = tenantId; } + + /** + * This method was generated by MyBatis Generator. + * This method returns the value of the database column jsh_person.delete_Flag + * + * @return the value of jsh_person.delete_Flag + * + * @mbggenerated + */ + public String getDeleteFlag() { + return deleteFlag; + } + + /** + * This method was generated by MyBatis Generator. + * This method sets the value of the database column jsh_person.delete_Flag + * + * @param deleteFlag the value for jsh_person.delete_Flag + * + * @mbggenerated + */ + public void setDeleteFlag(String deleteFlag) { + this.deleteFlag = deleteFlag == null ? null : deleteFlag.trim(); + } } \ No newline at end of file diff --git a/src/main/java/com/jsh/erp/datasource/entities/PersonExample.java b/src/main/java/com/jsh/erp/datasource/entities/PersonExample.java index 909d6620..ca31f8cc 100644 --- a/src/main/java/com/jsh/erp/datasource/entities/PersonExample.java +++ b/src/main/java/com/jsh/erp/datasource/entities/PersonExample.java @@ -453,6 +453,76 @@ public class PersonExample { addCriterion("tenant_id not between", value1, value2, "tenantId"); return (Criteria) this; } + + public Criteria andDeleteFlagIsNull() { + addCriterion("delete_Flag is null"); + return (Criteria) this; + } + + public Criteria andDeleteFlagIsNotNull() { + addCriterion("delete_Flag is not null"); + return (Criteria) this; + } + + public Criteria andDeleteFlagEqualTo(String value) { + addCriterion("delete_Flag =", value, "deleteFlag"); + return (Criteria) this; + } + + public Criteria andDeleteFlagNotEqualTo(String value) { + addCriterion("delete_Flag <>", value, "deleteFlag"); + return (Criteria) this; + } + + public Criteria andDeleteFlagGreaterThan(String value) { + addCriterion("delete_Flag >", value, "deleteFlag"); + return (Criteria) this; + } + + public Criteria andDeleteFlagGreaterThanOrEqualTo(String value) { + addCriterion("delete_Flag >=", value, "deleteFlag"); + return (Criteria) this; + } + + public Criteria andDeleteFlagLessThan(String value) { + addCriterion("delete_Flag <", value, "deleteFlag"); + return (Criteria) this; + } + + public Criteria andDeleteFlagLessThanOrEqualTo(String value) { + addCriterion("delete_Flag <=", value, "deleteFlag"); + return (Criteria) this; + } + + public Criteria andDeleteFlagLike(String value) { + addCriterion("delete_Flag like", value, "deleteFlag"); + return (Criteria) this; + } + + public Criteria andDeleteFlagNotLike(String value) { + addCriterion("delete_Flag not like", value, "deleteFlag"); + return (Criteria) this; + } + + public Criteria andDeleteFlagIn(List values) { + addCriterion("delete_Flag in", values, "deleteFlag"); + return (Criteria) this; + } + + public Criteria andDeleteFlagNotIn(List values) { + addCriterion("delete_Flag not in", values, "deleteFlag"); + return (Criteria) this; + } + + public Criteria andDeleteFlagBetween(String value1, String value2) { + addCriterion("delete_Flag between", value1, value2, "deleteFlag"); + return (Criteria) this; + } + + public Criteria andDeleteFlagNotBetween(String value1, String value2) { + addCriterion("delete_Flag not between", value1, value2, "deleteFlag"); + return (Criteria) this; + } } /** diff --git a/src/main/java/com/jsh/erp/datasource/entities/Role.java b/src/main/java/com/jsh/erp/datasource/entities/Role.java index 9fba4150..98daf777 100644 --- a/src/main/java/com/jsh/erp/datasource/entities/Role.java +++ b/src/main/java/com/jsh/erp/datasource/entities/Role.java @@ -49,6 +49,14 @@ public class Role { */ private Long tenantId; + /** + * This field was generated by MyBatis Generator. + * This field corresponds to the database column jsh_role.delete_Flag + * + * @mbggenerated + */ + private String deleteFlag; + /** * This method was generated by MyBatis Generator. * This method returns the value of the database column jsh_role.Id @@ -192,4 +200,28 @@ public class Role { public void setTenantId(Long tenantId) { this.tenantId = tenantId; } + + /** + * This method was generated by MyBatis Generator. + * This method returns the value of the database column jsh_role.delete_Flag + * + * @return the value of jsh_role.delete_Flag + * + * @mbggenerated + */ + public String getDeleteFlag() { + return deleteFlag; + } + + /** + * This method was generated by MyBatis Generator. + * This method sets the value of the database column jsh_role.delete_Flag + * + * @param deleteFlag the value for jsh_role.delete_Flag + * + * @mbggenerated + */ + public void setDeleteFlag(String deleteFlag) { + this.deleteFlag = deleteFlag == null ? null : deleteFlag.trim(); + } } \ No newline at end of file diff --git a/src/main/java/com/jsh/erp/datasource/entities/RoleExample.java b/src/main/java/com/jsh/erp/datasource/entities/RoleExample.java index 2bd9ae24..47a2faff 100644 --- a/src/main/java/com/jsh/erp/datasource/entities/RoleExample.java +++ b/src/main/java/com/jsh/erp/datasource/entities/RoleExample.java @@ -593,6 +593,76 @@ public class RoleExample { addCriterion("tenant_id not between", value1, value2, "tenantId"); return (Criteria) this; } + + public Criteria andDeleteFlagIsNull() { + addCriterion("delete_Flag is null"); + return (Criteria) this; + } + + public Criteria andDeleteFlagIsNotNull() { + addCriterion("delete_Flag is not null"); + return (Criteria) this; + } + + public Criteria andDeleteFlagEqualTo(String value) { + addCriterion("delete_Flag =", value, "deleteFlag"); + return (Criteria) this; + } + + public Criteria andDeleteFlagNotEqualTo(String value) { + addCriterion("delete_Flag <>", value, "deleteFlag"); + return (Criteria) this; + } + + public Criteria andDeleteFlagGreaterThan(String value) { + addCriterion("delete_Flag >", value, "deleteFlag"); + return (Criteria) this; + } + + public Criteria andDeleteFlagGreaterThanOrEqualTo(String value) { + addCriterion("delete_Flag >=", value, "deleteFlag"); + return (Criteria) this; + } + + public Criteria andDeleteFlagLessThan(String value) { + addCriterion("delete_Flag <", value, "deleteFlag"); + return (Criteria) this; + } + + public Criteria andDeleteFlagLessThanOrEqualTo(String value) { + addCriterion("delete_Flag <=", value, "deleteFlag"); + return (Criteria) this; + } + + public Criteria andDeleteFlagLike(String value) { + addCriterion("delete_Flag like", value, "deleteFlag"); + return (Criteria) this; + } + + public Criteria andDeleteFlagNotLike(String value) { + addCriterion("delete_Flag not like", value, "deleteFlag"); + return (Criteria) this; + } + + public Criteria andDeleteFlagIn(List values) { + addCriterion("delete_Flag in", values, "deleteFlag"); + return (Criteria) this; + } + + public Criteria andDeleteFlagNotIn(List values) { + addCriterion("delete_Flag not in", values, "deleteFlag"); + return (Criteria) this; + } + + public Criteria andDeleteFlagBetween(String value1, String value2) { + addCriterion("delete_Flag between", value1, value2, "deleteFlag"); + return (Criteria) this; + } + + public Criteria andDeleteFlagNotBetween(String value1, String value2) { + addCriterion("delete_Flag not between", value1, value2, "deleteFlag"); + return (Criteria) this; + } } /** diff --git a/src/main/java/com/jsh/erp/datasource/entities/Supplier.java b/src/main/java/com/jsh/erp/datasource/entities/Supplier.java index 0c0921de..fbfa0663 100644 --- a/src/main/java/com/jsh/erp/datasource/entities/Supplier.java +++ b/src/main/java/com/jsh/erp/datasource/entities/Supplier.java @@ -179,6 +179,14 @@ public class Supplier { */ private Long tenantId; + /** + * This field was generated by MyBatis Generator. + * This field corresponds to the database column jsh_supplier.delete_Flag + * + * @mbggenerated + */ + private String deleteFlag; + /** * This method was generated by MyBatis Generator. * This method returns the value of the database column jsh_supplier.id @@ -706,4 +714,28 @@ public class Supplier { public void setTenantId(Long tenantId) { this.tenantId = tenantId; } + + /** + * This method was generated by MyBatis Generator. + * This method returns the value of the database column jsh_supplier.delete_Flag + * + * @return the value of jsh_supplier.delete_Flag + * + * @mbggenerated + */ + public String getDeleteFlag() { + return deleteFlag; + } + + /** + * This method was generated by MyBatis Generator. + * This method sets the value of the database column jsh_supplier.delete_Flag + * + * @param deleteFlag the value for jsh_supplier.delete_Flag + * + * @mbggenerated + */ + public void setDeleteFlag(String deleteFlag) { + this.deleteFlag = deleteFlag == null ? null : deleteFlag.trim(); + } } \ No newline at end of file diff --git a/src/main/java/com/jsh/erp/datasource/entities/SupplierExample.java b/src/main/java/com/jsh/erp/datasource/entities/SupplierExample.java index f632f079..5f783a61 100644 --- a/src/main/java/com/jsh/erp/datasource/entities/SupplierExample.java +++ b/src/main/java/com/jsh/erp/datasource/entities/SupplierExample.java @@ -1634,6 +1634,76 @@ public class SupplierExample { addCriterion("tenant_id not between", value1, value2, "tenantId"); return (Criteria) this; } + + public Criteria andDeleteFlagIsNull() { + addCriterion("delete_Flag is null"); + return (Criteria) this; + } + + public Criteria andDeleteFlagIsNotNull() { + addCriterion("delete_Flag is not null"); + return (Criteria) this; + } + + public Criteria andDeleteFlagEqualTo(String value) { + addCriterion("delete_Flag =", value, "deleteFlag"); + return (Criteria) this; + } + + public Criteria andDeleteFlagNotEqualTo(String value) { + addCriterion("delete_Flag <>", value, "deleteFlag"); + return (Criteria) this; + } + + public Criteria andDeleteFlagGreaterThan(String value) { + addCriterion("delete_Flag >", value, "deleteFlag"); + return (Criteria) this; + } + + public Criteria andDeleteFlagGreaterThanOrEqualTo(String value) { + addCriterion("delete_Flag >=", value, "deleteFlag"); + return (Criteria) this; + } + + public Criteria andDeleteFlagLessThan(String value) { + addCriterion("delete_Flag <", value, "deleteFlag"); + return (Criteria) this; + } + + public Criteria andDeleteFlagLessThanOrEqualTo(String value) { + addCriterion("delete_Flag <=", value, "deleteFlag"); + return (Criteria) this; + } + + public Criteria andDeleteFlagLike(String value) { + addCriterion("delete_Flag like", value, "deleteFlag"); + return (Criteria) this; + } + + public Criteria andDeleteFlagNotLike(String value) { + addCriterion("delete_Flag not like", value, "deleteFlag"); + return (Criteria) this; + } + + public Criteria andDeleteFlagIn(List values) { + addCriterion("delete_Flag in", values, "deleteFlag"); + return (Criteria) this; + } + + public Criteria andDeleteFlagNotIn(List values) { + addCriterion("delete_Flag not in", values, "deleteFlag"); + return (Criteria) this; + } + + public Criteria andDeleteFlagBetween(String value1, String value2) { + addCriterion("delete_Flag between", value1, value2, "deleteFlag"); + return (Criteria) this; + } + + public Criteria andDeleteFlagNotBetween(String value1, String value2) { + addCriterion("delete_Flag not between", value1, value2, "deleteFlag"); + return (Criteria) this; + } } /** diff --git a/src/main/java/com/jsh/erp/datasource/entities/SystemConfig.java b/src/main/java/com/jsh/erp/datasource/entities/SystemConfig.java index 84848cf2..31e21734 100644 --- a/src/main/java/com/jsh/erp/datasource/entities/SystemConfig.java +++ b/src/main/java/com/jsh/erp/datasource/entities/SystemConfig.java @@ -65,6 +65,14 @@ public class SystemConfig { */ private Long tenantId; + /** + * This field was generated by MyBatis Generator. + * This field corresponds to the database column jsh_systemconfig.delete_Flag + * + * @mbggenerated + */ + private String deleteFlag; + /** * This method was generated by MyBatis Generator. * This method returns the value of the database column jsh_systemconfig.id @@ -256,4 +264,28 @@ public class SystemConfig { public void setTenantId(Long tenantId) { this.tenantId = tenantId; } + + /** + * This method was generated by MyBatis Generator. + * This method returns the value of the database column jsh_systemconfig.delete_Flag + * + * @return the value of jsh_systemconfig.delete_Flag + * + * @mbggenerated + */ + public String getDeleteFlag() { + return deleteFlag; + } + + /** + * This method was generated by MyBatis Generator. + * This method sets the value of the database column jsh_systemconfig.delete_Flag + * + * @param deleteFlag the value for jsh_systemconfig.delete_Flag + * + * @mbggenerated + */ + public void setDeleteFlag(String deleteFlag) { + this.deleteFlag = deleteFlag == null ? null : deleteFlag.trim(); + } } \ No newline at end of file diff --git a/src/main/java/com/jsh/erp/datasource/entities/SystemConfigExample.java b/src/main/java/com/jsh/erp/datasource/entities/SystemConfigExample.java index 1ef4739a..f3ef9eaf 100644 --- a/src/main/java/com/jsh/erp/datasource/entities/SystemConfigExample.java +++ b/src/main/java/com/jsh/erp/datasource/entities/SystemConfigExample.java @@ -733,6 +733,76 @@ public class SystemConfigExample { addCriterion("tenant_id not between", value1, value2, "tenantId"); return (Criteria) this; } + + public Criteria andDeleteFlagIsNull() { + addCriterion("delete_Flag is null"); + return (Criteria) this; + } + + public Criteria andDeleteFlagIsNotNull() { + addCriterion("delete_Flag is not null"); + return (Criteria) this; + } + + public Criteria andDeleteFlagEqualTo(String value) { + addCriterion("delete_Flag =", value, "deleteFlag"); + return (Criteria) this; + } + + public Criteria andDeleteFlagNotEqualTo(String value) { + addCriterion("delete_Flag <>", value, "deleteFlag"); + return (Criteria) this; + } + + public Criteria andDeleteFlagGreaterThan(String value) { + addCriterion("delete_Flag >", value, "deleteFlag"); + return (Criteria) this; + } + + public Criteria andDeleteFlagGreaterThanOrEqualTo(String value) { + addCriterion("delete_Flag >=", value, "deleteFlag"); + return (Criteria) this; + } + + public Criteria andDeleteFlagLessThan(String value) { + addCriterion("delete_Flag <", value, "deleteFlag"); + return (Criteria) this; + } + + public Criteria andDeleteFlagLessThanOrEqualTo(String value) { + addCriterion("delete_Flag <=", value, "deleteFlag"); + return (Criteria) this; + } + + public Criteria andDeleteFlagLike(String value) { + addCriterion("delete_Flag like", value, "deleteFlag"); + return (Criteria) this; + } + + public Criteria andDeleteFlagNotLike(String value) { + addCriterion("delete_Flag not like", value, "deleteFlag"); + return (Criteria) this; + } + + public Criteria andDeleteFlagIn(List values) { + addCriterion("delete_Flag in", values, "deleteFlag"); + return (Criteria) this; + } + + public Criteria andDeleteFlagNotIn(List values) { + addCriterion("delete_Flag not in", values, "deleteFlag"); + return (Criteria) this; + } + + public Criteria andDeleteFlagBetween(String value1, String value2) { + addCriterion("delete_Flag between", value1, value2, "deleteFlag"); + return (Criteria) this; + } + + public Criteria andDeleteFlagNotBetween(String value1, String value2) { + addCriterion("delete_Flag not between", value1, value2, "deleteFlag"); + return (Criteria) this; + } } /** diff --git a/src/main/java/com/jsh/erp/datasource/entities/Unit.java b/src/main/java/com/jsh/erp/datasource/entities/Unit.java index 815b0f0c..25cce1c7 100644 --- a/src/main/java/com/jsh/erp/datasource/entities/Unit.java +++ b/src/main/java/com/jsh/erp/datasource/entities/Unit.java @@ -25,6 +25,14 @@ public class Unit { */ private Long tenantId; + /** + * This field was generated by MyBatis Generator. + * This field corresponds to the database column jsh_unit.delete_Flag + * + * @mbggenerated + */ + private String deleteFlag; + /** * This method was generated by MyBatis Generator. * This method returns the value of the database column jsh_unit.id @@ -96,4 +104,28 @@ public class Unit { public void setTenantId(Long tenantId) { this.tenantId = tenantId; } + + /** + * This method was generated by MyBatis Generator. + * This method returns the value of the database column jsh_unit.delete_Flag + * + * @return the value of jsh_unit.delete_Flag + * + * @mbggenerated + */ + public String getDeleteFlag() { + return deleteFlag; + } + + /** + * This method was generated by MyBatis Generator. + * This method sets the value of the database column jsh_unit.delete_Flag + * + * @param deleteFlag the value for jsh_unit.delete_Flag + * + * @mbggenerated + */ + public void setDeleteFlag(String deleteFlag) { + this.deleteFlag = deleteFlag == null ? null : deleteFlag.trim(); + } } \ No newline at end of file diff --git a/src/main/java/com/jsh/erp/datasource/entities/UnitExample.java b/src/main/java/com/jsh/erp/datasource/entities/UnitExample.java index 0f5c2042..89a0c0b0 100644 --- a/src/main/java/com/jsh/erp/datasource/entities/UnitExample.java +++ b/src/main/java/com/jsh/erp/datasource/entities/UnitExample.java @@ -383,6 +383,76 @@ public class UnitExample { addCriterion("tenant_id not between", value1, value2, "tenantId"); return (Criteria) this; } + + public Criteria andDeleteFlagIsNull() { + addCriterion("delete_Flag is null"); + return (Criteria) this; + } + + public Criteria andDeleteFlagIsNotNull() { + addCriterion("delete_Flag is not null"); + return (Criteria) this; + } + + public Criteria andDeleteFlagEqualTo(String value) { + addCriterion("delete_Flag =", value, "deleteFlag"); + return (Criteria) this; + } + + public Criteria andDeleteFlagNotEqualTo(String value) { + addCriterion("delete_Flag <>", value, "deleteFlag"); + return (Criteria) this; + } + + public Criteria andDeleteFlagGreaterThan(String value) { + addCriterion("delete_Flag >", value, "deleteFlag"); + return (Criteria) this; + } + + public Criteria andDeleteFlagGreaterThanOrEqualTo(String value) { + addCriterion("delete_Flag >=", value, "deleteFlag"); + return (Criteria) this; + } + + public Criteria andDeleteFlagLessThan(String value) { + addCriterion("delete_Flag <", value, "deleteFlag"); + return (Criteria) this; + } + + public Criteria andDeleteFlagLessThanOrEqualTo(String value) { + addCriterion("delete_Flag <=", value, "deleteFlag"); + return (Criteria) this; + } + + public Criteria andDeleteFlagLike(String value) { + addCriterion("delete_Flag like", value, "deleteFlag"); + return (Criteria) this; + } + + public Criteria andDeleteFlagNotLike(String value) { + addCriterion("delete_Flag not like", value, "deleteFlag"); + return (Criteria) this; + } + + public Criteria andDeleteFlagIn(List values) { + addCriterion("delete_Flag in", values, "deleteFlag"); + return (Criteria) this; + } + + public Criteria andDeleteFlagNotIn(List values) { + addCriterion("delete_Flag not in", values, "deleteFlag"); + return (Criteria) this; + } + + public Criteria andDeleteFlagBetween(String value1, String value2) { + addCriterion("delete_Flag between", value1, value2, "deleteFlag"); + return (Criteria) this; + } + + public Criteria andDeleteFlagNotBetween(String value1, String value2) { + addCriterion("delete_Flag not between", value1, value2, "deleteFlag"); + return (Criteria) this; + } } /** diff --git a/src/main/java/com/jsh/erp/datasource/entities/UserBusiness.java b/src/main/java/com/jsh/erp/datasource/entities/UserBusiness.java index efc031ee..2f6fe048 100644 --- a/src/main/java/com/jsh/erp/datasource/entities/UserBusiness.java +++ b/src/main/java/com/jsh/erp/datasource/entities/UserBusiness.java @@ -41,6 +41,14 @@ public class UserBusiness { */ private String btnstr; + /** + * This field was generated by MyBatis Generator. + * This field corresponds to the database column jsh_userbusiness.delete_Flag + * + * @mbggenerated + */ + private String deleteFlag; + /** * This method was generated by MyBatis Generator. * This method returns the value of the database column jsh_userbusiness.Id @@ -160,4 +168,28 @@ public class UserBusiness { public void setBtnstr(String btnstr) { this.btnstr = btnstr == null ? null : btnstr.trim(); } + + /** + * This method was generated by MyBatis Generator. + * This method returns the value of the database column jsh_userbusiness.delete_Flag + * + * @return the value of jsh_userbusiness.delete_Flag + * + * @mbggenerated + */ + public String getDeleteFlag() { + return deleteFlag; + } + + /** + * This method was generated by MyBatis Generator. + * This method sets the value of the database column jsh_userbusiness.delete_Flag + * + * @param deleteFlag the value for jsh_userbusiness.delete_Flag + * + * @mbggenerated + */ + public void setDeleteFlag(String deleteFlag) { + this.deleteFlag = deleteFlag == null ? null : deleteFlag.trim(); + } } \ No newline at end of file diff --git a/src/main/java/com/jsh/erp/datasource/entities/UserBusinessExample.java b/src/main/java/com/jsh/erp/datasource/entities/UserBusinessExample.java index 535b5251..615c5c70 100644 --- a/src/main/java/com/jsh/erp/datasource/entities/UserBusinessExample.java +++ b/src/main/java/com/jsh/erp/datasource/entities/UserBusinessExample.java @@ -533,6 +533,76 @@ public class UserBusinessExample { addCriterion("BtnStr not between", value1, value2, "btnstr"); return (Criteria) this; } + + public Criteria andDeleteFlagIsNull() { + addCriterion("delete_Flag is null"); + return (Criteria) this; + } + + public Criteria andDeleteFlagIsNotNull() { + addCriterion("delete_Flag is not null"); + return (Criteria) this; + } + + public Criteria andDeleteFlagEqualTo(String value) { + addCriterion("delete_Flag =", value, "deleteFlag"); + return (Criteria) this; + } + + public Criteria andDeleteFlagNotEqualTo(String value) { + addCriterion("delete_Flag <>", value, "deleteFlag"); + return (Criteria) this; + } + + public Criteria andDeleteFlagGreaterThan(String value) { + addCriterion("delete_Flag >", value, "deleteFlag"); + return (Criteria) this; + } + + public Criteria andDeleteFlagGreaterThanOrEqualTo(String value) { + addCriterion("delete_Flag >=", value, "deleteFlag"); + return (Criteria) this; + } + + public Criteria andDeleteFlagLessThan(String value) { + addCriterion("delete_Flag <", value, "deleteFlag"); + return (Criteria) this; + } + + public Criteria andDeleteFlagLessThanOrEqualTo(String value) { + addCriterion("delete_Flag <=", value, "deleteFlag"); + return (Criteria) this; + } + + public Criteria andDeleteFlagLike(String value) { + addCriterion("delete_Flag like", value, "deleteFlag"); + return (Criteria) this; + } + + public Criteria andDeleteFlagNotLike(String value) { + addCriterion("delete_Flag not like", value, "deleteFlag"); + return (Criteria) this; + } + + public Criteria andDeleteFlagIn(List values) { + addCriterion("delete_Flag in", values, "deleteFlag"); + return (Criteria) this; + } + + public Criteria andDeleteFlagNotIn(List values) { + addCriterion("delete_Flag not in", values, "deleteFlag"); + return (Criteria) this; + } + + public Criteria andDeleteFlagBetween(String value1, String value2) { + addCriterion("delete_Flag between", value1, value2, "deleteFlag"); + return (Criteria) this; + } + + public Criteria andDeleteFlagNotBetween(String value1, String value2) { + addCriterion("delete_Flag not between", value1, value2, "deleteFlag"); + return (Criteria) this; + } } /** diff --git a/src/main/java/com/jsh/erp/datasource/mappers/SerialNumberMapperEx.java b/src/main/java/com/jsh/erp/datasource/mappers/SerialNumberMapperEx.java index 7bd5906d..d934ec7c 100644 --- a/src/main/java/com/jsh/erp/datasource/mappers/SerialNumberMapperEx.java +++ b/src/main/java/com/jsh/erp/datasource/mappers/SerialNumberMapperEx.java @@ -60,4 +60,6 @@ public interface SerialNumberMapperEx { * 批量添加序列号 * */ int batAddSerialNumber(@Param("list") List list); + + int batchDeleteSerialNumberByIds(@Param("updateTime") Date updateTime, @Param("updater") Long updater, @Param("ids") String ids[]); } diff --git a/src/main/java/com/jsh/erp/service/serialNumber/SerialNumberService.java b/src/main/java/com/jsh/erp/service/serialNumber/SerialNumberService.java index 7f1f450d..12b61615 100644 --- a/src/main/java/com/jsh/erp/service/serialNumber/SerialNumberService.java +++ b/src/main/java/com/jsh/erp/service/serialNumber/SerialNumberService.java @@ -391,4 +391,23 @@ public class SerialNumberService { }while(batAddTotal>0); } } + /** + * create by: qiankunpingtai + * website：http://39.105.146.63/symphony/ + * description: + * 逻辑删除序列号信息 + * create time: 2019/3/27 17:43 + * @Param: ids + * @return + */ + @Transactional(value = "transactionManager", rollbackFor = Exception.class) + public int batchDeleteSerialNumberByIds(String ids) { + logService.insertLog(BusinessConstants.LOG_INTERFACE_NAME_SERIAL_NUMBER, + new StringBuffer(BusinessConstants.LOG_OPERATION_TYPE_DELETE).append(ids).toString(), + ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest()); + User userInfo=userService.getCurrentUser(); + String [] idArray=ids.split(","); + return serialNumberMapperEx.batchDeleteSerialNumberByIds(new Date(),userInfo==null?null:userInfo.getId(),idArray); + + } } diff --git a/src/main/java/com/jsh/erp/service/user/UserService.java b/src/main/java/com/jsh/erp/service/user/UserService.java index e9289dd7..7e99aa3f 100644 --- a/src/main/java/com/jsh/erp/service/user/UserService.java +++ b/src/main/java/com/jsh/erp/service/user/UserService.java @@ -112,7 +112,7 @@ public class UserService { */ @Transactional(value = "transactionManager", rollbackFor = Exception.class) public int updateUserByObj(User user) { - logService.insertLog(BusinessConstants.LOG_MODULE_NAME_USER, + logService.insertLog(BusinessConstants.LOG_INTERFACE_NAME_USER, new StringBuffer(BusinessConstants.LOG_OPERATION_TYPE_EDIT).append(user.getId()).toString(), ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest()); return userMapper.updateByPrimaryKeySelective(user); @@ -128,7 +128,7 @@ public class UserService { */ @Transactional(value = "transactionManager", rollbackFor = Exception.class) public int resetPwd(String md5Pwd, Long id) { - logService.insertLog(BusinessConstants.LOG_MODULE_NAME_USER, + logService.insertLog(BusinessConstants.LOG_INTERFACE_NAME_USER, new StringBuffer(BusinessConstants.LOG_OPERATION_TYPE_EDIT).append(id).toString(), ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest()); User user = new User(); @@ -217,7 +217,7 @@ public class UserService { } @Transactional(value = "transactionManager", rollbackFor = Exception.class) public void addUserAndOrgUserRel(UserEx ue) throws Exception{ - logService.insertLog(BusinessConstants.LOG_MODULE_NAME_USER, + logService.insertLog(BusinessConstants.LOG_INTERFACE_NAME_USER, BusinessConstants.LOG_OPERATION_TYPE_ADD, ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest()); //检查用户名和登录名 @@ -274,7 +274,7 @@ public class UserService { } @Transactional(value = "transactionManager", rollbackFor = Exception.class) public void updateUserAndOrgUserRel(UserEx ue) throws Exception{ - logService.insertLog(BusinessConstants.LOG_MODULE_NAME_USER, + logService.insertLog(BusinessConstants.LOG_INTERFACE_NAME_USER, new StringBuffer(BusinessConstants.LOG_OPERATION_TYPE_EDIT).append(ue.getId()).toString(), ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest()); //检查用户名和登录名 @@ -405,7 +405,7 @@ public class UserService { * */ @Transactional(value = "transactionManager", rollbackFor = Exception.class) public void batDeleteUser(String ids) { - logService.insertLog(BusinessConstants.LOG_MODULE_NAME_USER, + logService.insertLog(BusinessConstants.LOG_INTERFACE_NAME_USER, new StringBuffer(BusinessConstants.LOG_OPERATION_TYPE_DELETE).append(ids).toString(), ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest()); String idsArray[]=ids.split(","); diff --git a/src/main/resources/mapper_xml/AccountHeadMapper.xml b/src/main/resources/mapper_xml/AccountHeadMapper.xml index f914ffee..c0b0c978 100644 --- a/src/main/resources/mapper_xml/AccountHeadMapper.xml +++ b/src/main/resources/mapper_xml/AccountHeadMapper.xml @@ -17,6 +17,7 @@ + Id, Type, OrganId, HandsPersonId, ChangeAmount, TotalPrice, AccountId, BillNo, BillTime, - Remark, tenant_id + Remark, tenant_id, delete_Flag insert into jsh_accountitem (Id, HeaderId, AccountId, InOutItemId, EachAmount, Remark, - tenant_id) + tenant_id, delete_Flag) values (#{id,jdbcType=BIGINT}, #{headerid,jdbcType=BIGINT}, #{accountid,jdbcType=BIGINT}, #{inoutitemid,jdbcType=BIGINT}, #{eachamount,jdbcType=DECIMAL}, #{remark,jdbcType=VARCHAR}, - #{tenantId,jdbcType=BIGINT}) + #{tenantId,jdbcType=BIGINT}, #{deleteFlag,jdbcType=VARCHAR}) - Id, Name, SerialNo, InitialAmount, CurrentAmount, Remark, IsDefault, tenant_id + Id, Name, SerialNo, InitialAmount, CurrentAmount, Remark, IsDefault, tenant_id, delete_Flag - id, assetname, isystem, description, tenant_id + id, assetname, isystem, description, tenant_id, delete_Flag - id, name, address, warehousing, truckage, type, sort, remark, principal, tenant_id + id, name, address, warehousing, truckage, type, sort, remark, principal, tenant_id, + delete_Flag insert into jsh_functions (Id, Number, Name, PNumber, URL, State, Sort, - Enabled, Type, PushBtn) + Enabled, Type, PushBtn, + delete_Flag) values (#{id,jdbcType=BIGINT}, #{number,jdbcType=VARCHAR}, #{name,jdbcType=VARCHAR}, #{pnumber,jdbcType=VARCHAR}, #{url,jdbcType=VARCHAR}, #{state,jdbcType=BIT}, #{sort,jdbcType=VARCHAR}, - #{enabled,jdbcType=BIT}, #{type,jdbcType=VARCHAR}, #{pushbtn,jdbcType=VARCHAR}) + #{enabled,jdbcType=BIT}, #{type,jdbcType=VARCHAR}, #{pushbtn,jdbcType=VARCHAR}, + #{deleteFlag,jdbcType=VARCHAR}) - Id, Name, Type, Remark, tenant_id + Id, Name, Type, Remark, tenant_id, delete_Flag insert into jsh_materialproperty (id, nativeName, enabled, - sort, anotherName) + sort, anotherName, delete_Flag + ) values (#{id,jdbcType=BIGINT}, #{nativename,jdbcType=VARCHAR}, #{enabled,jdbcType=BIT}, - #{sort,jdbcType=VARCHAR}, #{anothername,jdbcType=VARCHAR}) + #{sort,jdbcType=VARCHAR}, #{anothername,jdbcType=VARCHAR}, #{deleteFlag,jdbcType=VARCHAR} + ) - Id, Type, Name, tenant_id + Id, Type, Name, tenant_id, delete_Flag insert into jsh_role (Id, Name, type, - value, description, tenant_id - ) + value, description, tenant_id, + delete_Flag) 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}, #{tenantId,jdbcType=BIGINT}, + #{deleteFlag,jdbcType=VARCHAR}) id, supplier, contacts, phonenum, email, description, isystem, type, enabled, AdvanceIn, BeginNeedGet, BeginNeedPay, AllNeedGet, AllNeedPay, fax, telephone, address, taxNum, - bankName, accountNumber, taxRate, tenant_id + bankName, accountNumber, taxRate, tenant_id, delete_Flag insert into jsh_systemconfig (id, company_name, company_contacts, company_address, company_tel, company_fax, - company_post_code, tenant_id) + company_post_code, tenant_id, delete_Flag + ) values (#{id,jdbcType=BIGINT}, #{companyName,jdbcType=VARCHAR}, #{companyContacts,jdbcType=VARCHAR}, #{companyAddress,jdbcType=VARCHAR}, #{companyTel,jdbcType=VARCHAR}, #{companyFax,jdbcType=VARCHAR}, - #{companyPostCode,jdbcType=VARCHAR}, #{tenantId,jdbcType=BIGINT}) + #{companyPostCode,jdbcType=VARCHAR}, #{tenantId,jdbcType=BIGINT}, #{deleteFlag,jdbcType=VARCHAR} + ) - id, UName, tenant_id + id, UName, tenant_id, delete_Flag insert into jsh_userbusiness (Id, Type, KeyId, - Value, BtnStr) + Value, BtnStr, delete_Flag + ) values (#{id,jdbcType=BIGINT}, #{type,jdbcType=VARCHAR}, #{keyid,jdbcType=VARCHAR}, - #{value,jdbcType=VARCHAR}, #{btnstr,jdbcType=VARCHAR}) + #{value,jdbcType=VARCHAR}, #{btnstr,jdbcType=VARCHAR}, #{deleteFlag,jdbcType=VARCHAR} + )