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

优化表结构

Browse Source
This commit is contained in:
季圣华
2020-07-21 01:36:26 +08:00
parent 1393244160
commit 70f0dae473
104 changed files with 5005 additions and 9006 deletions
Download Patch File Download Diff File Expand all files Collapse all files

897
docs/jsh_erp.sql
View File

File diff suppressed because it is too large Load Diff

82
docs/数据库更新记录-方便升级.txt
View File

@@ -821,3 +821,85 @@ ROW_FORMAT=COMPACT
-- -------------------------------------------------------- -- --------------------------------------------------------
alter table jsh_material_stock rename to jsh_material_initial_stock; alter table jsh_material_stock rename to jsh_material_initial_stock;
alter table jsh_material_initial_stock change delete_fag delete_flag varchar(1) NULL DEFAULT '0' COMMENT '删除标记，0未删除，1删除'; alter table jsh_material_initial_stock change delete_fag delete_flag varchar(1) NULL DEFAULT '0' COMMENT '删除标记，0未删除，1删除';
-- --------------------------------------------------------
-- 时间 2020年07月20日
-- by jishenghua
-- 优化表和字段的格式
-- --------------------------------------------------------
alter table jsh_log change userID user_id bigint(20) DEFAULT NULL COMMENT '用户id';
alter table jsh_log change clientIP client_ip varchar(50) DEFAULT NULL COMMENT '客户端IP';
alter table jsh_log change createtime create_time datetime DEFAULT NULL COMMENT '创建时间';
alter table jsh_log change contentdetails content varchar(1000) DEFAULT NULL COMMENT '详情';
alter table jsh_log drop column remark;
alter table jsh_materialcategory rename to jsh_material_category;
alter table jsh_material_category change Id id bigint(20) NOT NULL AUTO_INCREMENT COMMENT '主键';
alter table jsh_material_category change Name name varchar(50) DEFAULT NULL COMMENT '名称';
alter table jsh_material_category change CategoryLevel category_level smallint(6) DEFAULT NULL COMMENT '等级';
alter table jsh_material_category change ParentId parent_id bigint(20) DEFAULT NULL COMMENT '上级id';
alter table jsh_materialproperty rename to jsh_material_property;
alter table jsh_material_property change nativeName native_name varchar(50) DEFAULT NULL COMMENT '原始名称';
alter table jsh_material_property change anotherName another_name varchar(50) DEFAULT NULL COMMENT '别名';
alter table jsh_material_property change delete_Flag delete_flag varchar(1) DEFAULT '0' COMMENT '删除标记，0未删除，1删除';
alter table jsh_role change Id id bigint(20) NOT NULL AUTO_INCREMENT COMMENT '主键';
alter table jsh_role change Name name varchar(50) DEFAULT NULL COMMENT '名称';
alter table jsh_role change delete_Flag delete_flag varchar(1) DEFAULT '0' COMMENT '删除标记，0未删除，1删除';
alter table jsh_person change Id id bigint(20) NOT NULL AUTO_INCREMENT COMMENT '主键';
alter table jsh_person change Type type varchar(20) DEFAULT NULL COMMENT '类型';
alter table jsh_person change Name name varchar(50) DEFAULT NULL COMMENT '姓名';
alter table jsh_person change delete_Flag delete_flag varchar(1) DEFAULT '0' COMMENT '删除标记，0未删除，1删除';
alter table jsh_systemconfig rename to jsh_system_config;
alter table jsh_system_config change delete_Flag delete_flag varchar(1) DEFAULT '0' COMMENT '删除标记，0未删除，1删除';
alter table jsh_account change Id id bigint(20) NOT NULL AUTO_INCREMENT COMMENT '主键';
alter table jsh_account change Name name varchar(50) DEFAULT NULL COMMENT '名称';
alter table jsh_account change SerialNo serial_no varchar(50) DEFAULT NULL COMMENT '编号';
alter table jsh_account change InitialAmount initial_amount decimal(24,6) DEFAULT NULL COMMENT '期初金额';
alter table jsh_account change CurrentAmount current_amount decimal(24,6) DEFAULT NULL COMMENT '当前余额';
alter table jsh_account change Remark remark varchar(100) DEFAULT NULL COMMENT '备注';
alter table jsh_account change IsDefault is_default bit(1) DEFAULT NULL COMMENT '是否默认';
alter table jsh_account change delete_Flag delete_flag varchar(1) DEFAULT '0' COMMENT '删除标记，0未删除，1删除';
alter table jsh_functions rename to jsh_function;
alter table jsh_function change Id id bigint(20) NOT NULL AUTO_INCREMENT COMMENT '主键';
alter table jsh_function change Number number varchar(50) DEFAULT NULL COMMENT '编号';
alter table jsh_function change Name name varchar(50) DEFAULT NULL COMMENT '名称';
alter table jsh_function change PNumber parent_number varchar(50) DEFAULT NULL COMMENT '上级编号';
alter table jsh_function change URL url varchar(100) DEFAULT NULL COMMENT '链接';
alter table jsh_function change State state bit(1) DEFAULT NULL COMMENT '收缩';
alter table jsh_function change Sort sort varchar(50) DEFAULT NULL COMMENT '排序';
alter table jsh_function change Enabled enabled bit(1) DEFAULT NULL COMMENT '启用';
alter table jsh_function change Type type varchar(50) DEFAULT NULL COMMENT '类型';
alter table jsh_function change PushBtn push_btn varchar(50) DEFAULT NULL COMMENT '功能按钮';
alter table jsh_function change delete_Flag delete_flag varchar(1) DEFAULT '0' COMMENT '删除标记，0未删除，1删除';
alter table jsh_userbusiness rename to jsh_user_business;
alter table jsh_user_business change Id id bigint(20) NOT NULL AUTO_INCREMENT COMMENT '主键';
alter table jsh_user_business change Type type varchar(50) DEFAULT NULL COMMENT '类别';
alter table jsh_user_business change KeyId key_id varchar(50) DEFAULT NULL COMMENT '主id';
alter table jsh_user_business change Value value varchar(10000) DEFAULT NULL COMMENT '值';
alter table jsh_user_business change BtnStr btn_str varchar(2000) DEFAULT NULL COMMENT '按钮权限';
alter table jsh_user_business change delete_Flag delete_flag varchar(1) DEFAULT '0' COMMENT '删除标记，0未删除，1删除';
alter table jsh_unit change UName name varchar(50) DEFAULT NULL COMMENT '名称，支持多单位';
alter table jsh_unit change delete_Flag delete_flag varchar(1) DEFAULT '0' COMMENT '删除标记，0未删除，1删除';
alter table jsh_inoutitem rename to jsh_in_out_item;
alter table jsh_in_out_item change Id id bigint(20) NOT NULL AUTO_INCREMENT COMMENT '主键';
alter table jsh_in_out_item change Name name varchar(50) DEFAULT NULL COMMENT '名称';
alter table jsh_in_out_item change Type type varchar(20) DEFAULT NULL COMMENT '类型';
alter table jsh_in_out_item change Remark remark varchar(100) DEFAULT NULL COMMENT '备注';
alter table jsh_in_out_item change delete_Flag delete_flag varchar(1) DEFAULT '0' COMMENT '删除标记，0未删除，1删除';
alter table jsh_serial_number change material_Id material_id bigint(20) DEFAULT NULL COMMENT '产品表id';
alter table jsh_serial_number change serial_Number serial_number varchar(64) DEFAULT NULL COMMENT '序列号';
alter table jsh_serial_number change is_Sell is_sell varchar(1) DEFAULT '0' COMMENT '是否卖出，0未卖出，1卖出';
alter table jsh_serial_number change delete_Flag delete_flag varchar(1) DEFAULT '0' COMMENT '删除标记，0未删除，1删除';
alter table jsh_serial_number change create_Time create_time datetime DEFAULT NULL COMMENT '创建时间';
alter table jsh_serial_number change update_Time update_time datetime DEFAULT NULL COMMENT '更新时间';
alter table jsh_serial_number change depothead_Id depot_head_id bigint(20) DEFAULT NULL COMMENT '单据主表id，用于跟踪序列号流向';

6
erp_web/js/modules/sys/menu.js
View File

@@ -42,7 +42,7 @@ function initSelectInfo(lei) {
} }
//按钮权限列表 //按钮权限列表
else if (lei == 3) { else if (lei == 3) {
var btnStr = userBusinessList[0].btnstr; var btnStr = userBusinessList[0].btnStr;
if (btnStr != null) { if (btnStr != null) {
var btnObj = JSON.parse(btnStr); var btnObj = JSON.parse(btnStr);
for (var j = 0; j < btnObj.length; j++) { for (var j = 0; j < btnObj.length; j++) {
@@ -71,10 +71,10 @@ if (btnStrList.length > 0) {
} }
$.ajax({ $.ajax({
type: "post", type: "post",
url: "/functions/findMenu", url: "/function/findMenu",
data: ({ data: ({
pNumber: 0, pNumber: 0,
hasFunctions: functions hasFunction: functions
}), }),
dataType: "json", dataType: "json",
async: false, async: false,

4
erp_web/js/pages/materials/in_out.js
View File

@@ -312,8 +312,8 @@
options += "<option value='many' class='many' data-manyAmount=''>多账户</option>"; options += "<option value='many' class='many' data-manyAmount=''>多账户</option>";
for(var i = 0 ;i < accountList.length;i++) { for(var i = 0 ;i < accountList.length;i++) {
var account = accountList[i]; var account = accountList[i];
options += '<option value="' + account.id + '" data-currentAmount="' + account.currentamount + '">' + account.name + '</option>'; options += '<option value="' + account.id + '" data-currentAmount="' + account.currentAmount + '">' + account.name + '</option>';
if(account.isdefault) { if(account.isDefault) {
defaultAccountId = account.id; //给账户赋值默认id defaultAccountId = account.id; //给账户赋值默认id
} }
} }

25
erp_web/pages/manage/account.html
View File

@@ -124,13 +124,13 @@
columns: [[ columns: [[
{field: 'id', width: 35, align: "center", checkbox: true}, {field: 'id', width: 35, align: "center", checkbox: true},
{title: '名称', field: 'name', width: 100}, {title: '名称', field: 'name', width: 100},
{title: '编号', field: 'serialno', width: 150, align: "center"}, {title: '编号', field: 'serialNo', width: 150, align: "center"},
{title: '期初金额', field: 'initialamount', width: 100, align: "center"}, {title: '期初金额', field: 'initialAmount', width: 100, align: "center"},
{title: '当前余额', field: 'currentamount', width: 100, align: "center"}, {title: '当前余额', field: 'currentAmount', width: 100, align: "center"},
{ {
title: '是否默认', field: 'isdefault', width: 100, align: "center", title: '是否默认', field: 'isDefault', width: 100, align: "center",
formatter: function (value, rec) { formatter: function (value, rec) {
if (rec.isdefault) { if (rec.isDefault) {
return "<span style='color:green'>是</span>"; return "<span style='color:green'>是</span>";
} }
else { else {
@@ -456,17 +456,14 @@
//编辑结算账户 //编辑结算账户
function editAccount(index) { function editAccount(index) {
var rowsdata = $("#tableData").datagrid("getRows")[index]; var rowsdata = $("#tableData").datagrid("getRows")[index];
var row = { $("#name").textbox("setValue", rowsdata.name);
name: rowsdata.name, $("#serialNo").textbox("setValue", rowsdata.serialNo);
serialNo: rowsdata.serialno, $("#initialAmount").textbox("setValue", rowsdata.initialAmount);
initialAmount: rowsdata.initialamount, $("#currentAmount").textbox("setValue", rowsdata.currentAmount);
currentAmount: rowsdata.currentamount, $("#remark").textbox("setValue", rowsdata.remark);
remark: rowsdata.remark
};
oldAccount = rowsdata.name; oldAccount = rowsdata.name;
$('#accountDlg').dialog('open').dialog('setTitle', '<img src="/js/easyui/themes/icons/pencil.png"/>&nbsp;编辑结算账户'); $('#accountDlg').dialog('open').dialog('setTitle', '<img src="/js/easyui/themes/icons/pencil.png"/>&nbsp;编辑结算账户');
$(".window-mask").css({width: webW, height: webH}); $(".window-mask").css({width: webW, height: webH});
$('#accountFM').form('load', row);
accountID = rowsdata.id; accountID = rowsdata.id;
url = '/account/update?id=' + rowsdata.id; url = '/account/update?id=' + rowsdata.id;
} }
@@ -558,7 +555,7 @@
function showAccountInOutList(index) { function showAccountInOutList(index) {
var rowsdata = $("#tableData").datagrid("getRows")[index]; var rowsdata = $("#tableData").datagrid("getRows")[index];
var accountId = rowsdata.id; var accountId = rowsdata.id;
var initialAmount = rowsdata.initialamount; var initialAmount = rowsdata.initialAmount;
$('#accountDetailListDlg').dialog('open').dialog('setTitle', '<img src="/js/easyui/themes/icons/pencil.png"/>&nbsp;查看账户流水'); $('#accountDetailListDlg').dialog('open').dialog('setTitle', '<img src="/js/easyui/themes/icons/pencil.png"/>&nbsp;查看账户流水');
$(".window-mask").css({width: webW, height: webH}); $(".window-mask").css({width: webW, height: webH});
initAccountDetailData(accountId); initAccountDetailData(accountId);

8
erp_web/pages/manage/depot.html
View File

@@ -172,10 +172,10 @@
}, },
{title: '仓库名称', field: 'name', width: 200}, {title: '仓库名称', field: 'name', width: 200},
{title: '仓库地址', field: 'address', width: 200}, {title: '仓库地址', field: 'address', width: 200},
{title: '仓储费', field: 'warehousing', width: 60}, {title: '仓储费', field: 'warehousing', width: 100},
{title: '搬运费', field: 'truckage', width: 60}, {title: '搬运费', field: 'truckage', width: 100},
{title: '负责人', field: 'principalName', width: 60}, {title: '负责人', field: 'principalName', width: 100},
{title: '排序', field: 'sort', width: 60}, {title: '排序', field: 'sort', width: 80},
{ {
title: '是否默认', field: 'isDefault', width: 100, align: "center", title: '是否默认', field: 'isDefault', width: 100, align: "center",
formatter: function (value, rec) { formatter: function (value, rec) {

20
erp_web/pages/manage/functions.html
View File

@@ -153,7 +153,7 @@
{field: 'id', width: 35, align: "center", checkbox: true}, {field: 'id', width: 35, align: "center", checkbox: true},
{title: '编号 ', field: 'number', width: 80}, {title: '编号 ', field: 'number', width: 80},
{title: '名称', field: 'name', width: 100}, {title: '名称', field: 'name', width: 100},
{title: '上级编号', field: 'pnumber', width: 80}, {title: '上级编号', field: 'parentNumber', width: 80},
{title: '链接', field: 'url', width: 250}, {title: '链接', field: 'url', width: 250},
{title: '排序', field: 'sort', width: 60}, {title: '排序', field: 'sort', width: 60},
{ {
@@ -257,7 +257,7 @@
if (r) { if (r) {
$.ajax({ $.ajax({
type: "post", type: "post",
url: "/functions/batchDeleteFunctionsByIds", url: "/function/batchDeleteFunctionsByIds",
dataType: "json", dataType: "json",
data: ({ data: ({
ids: functionsID ids: functionsID
@@ -299,7 +299,7 @@
} }
$.ajax({ $.ajax({
type: "post", type: "post",
url: "/functions/batchDeleteFunctionsByIds", url: "/function/batchDeleteFunctionsByIds",
dataType: "json", dataType: "json",
async: false, async: false,
data: ({ data: ({
@@ -339,7 +339,7 @@
iconBtnFun(); iconBtnFun();
oldFunctions = ""; oldFunctions = "";
functionsID = 0; functionsID = 0;
url = '/functions/add'; url = '/function/add';
} }
//保存信息 //保存信息
@@ -380,7 +380,7 @@
var rowsdata = $("#tableData").datagrid("getRows")[index]; var rowsdata = $("#tableData").datagrid("getRows")[index];
$("#Number").textbox("setValue", rowsdata.number); $("#Number").textbox("setValue", rowsdata.number);
$("#Name").focus().textbox("setValue", rowsdata.name); $("#Name").focus().textbox("setValue", rowsdata.name);
$("#PNumber").textbox("setValue", rowsdata.pnumber); $("#PNumber").textbox("setValue", rowsdata.parentNumber);
$("#URL").textbox("setValue", rowsdata.url); $("#URL").textbox("setValue", rowsdata.url);
$("#State").attr("checked", rowsdata.state); $("#State").attr("checked", rowsdata.state);
$("#Sort").textbox("setValue", rowsdata.sort); $("#Sort").textbox("setValue", rowsdata.sort);
@@ -389,8 +389,8 @@
$("#Type").textbox("setValue", rowsdata.type); $("#Type").textbox("setValue", rowsdata.type);
//点击icon图标弹出页面 //点击icon图标弹出页面
iconBtnFun(); iconBtnFun();
if (rowsdata.pushbtn) { if (rowsdata.pushBtn) {
var arr = rowsdata.pushbtn.split(","); var arr = rowsdata.pushBtn.split(",");
var pushBtnArray = []; var pushBtnArray = [];
for (var i = 0; i < arr.length; i++) { for (var i = 0; i < arr.length; i++) {
if (arr[i]) { if (arr[i]) {
@@ -411,7 +411,7 @@
functionsID = rowsdata.id; functionsID = rowsdata.id;
//焦点在名称输入框==定焦在输入文字后面 //焦点在名称输入框==定焦在输入文字后面
$("#Name").val("").focus().val(rowsdata.name); $("#Name").val("").focus().val(rowsdata.name);
url = '/functions/update?id=' + rowsdata.id; url = '/function/update?id=' + rowsdata.id;
} }
//点击icon图标弹出页面 //点击icon图标弹出页面
@@ -432,7 +432,7 @@
if (name.length > 0 && (oldFunctions.length == 0 || name != oldFunctions)) { if (name.length > 0 && (oldFunctions.length == 0 || name != oldFunctions)) {
$.ajax({ $.ajax({
type: "get", type: "get",
url: "/functions/checkIsNameExist", url: "/function/checkIsNameExist",
dataType: "json", dataType: "json",
async: false, async: false,
data: ({ data: ({
@@ -480,7 +480,7 @@
var type = $.trim($("#searchType").val()); var type = $.trim($("#searchType").val());
$.ajax({ $.ajax({
type: "get", type: "get",
url: "/functions/list", url: "/function/list",
dataType: "json", dataType: "json",
data: ({ data: ({
search: JSON.stringify({ search: JSON.stringify({

24
erp_web/pages/manage/log.html
View File

@@ -114,12 +114,12 @@
pageList: initPageNum, pageList: initPageNum,
columns: [[ columns: [[
{title: '操作模块', field: 'operation', width: 120}, {title: '操作模块', field: 'operation', width: 120},
{title: '操作详情', field: 'contentdetails', width: 350}, {title: '操作详情', field: 'content', width: 350},
{title: '操作人员', field: 'username', width: 100, align: "center"}, {title: '操作人员', field: 'userName', width: 100, align: "center"},
{title: '操作状态',field: 'status',width:80,align:"center",formatter:function(value){ {title: '操作状态',field: 'status',width:80,align:"center",formatter:function(value){
return value? "失败":"成功"; return value? "失败":"成功";
}}, }},
{title: '操作IP', field: 'clientip', width: 100, align: "center"}, {title: '操作IP', field: 'clientIp', width: 100, align: "center"},
{title: '操作时间', field: 'createTimeStr', width: 150, align: "center"} {title: '操作时间', field: 'createTimeStr', width: 150, align: "center"}
]], ]],
onLoadError: function () { onLoadError: function () {
@@ -222,25 +222,25 @@
function showLogDetails(pageNo, pageSize) { function showLogDetails(pageNo, pageSize) {
var operation = $.trim($("#searchOperation").val()); var operation = $.trim($("#searchOperation").val());
var usernameID = $.trim($("#searchUsernameID").val()); var userId = $.trim($("#searchUsernameID").val());
var clientIp = $.trim($("#searchIP").val()); var clientIp = $.trim($("#searchIP").val());
var status = $.trim($("#searchStatus").val()); var status = $.trim($("#searchStatus").val());
var beginTime = $.trim($("#searchBeginTime").datebox("getValue")); var beginTime = $.trim($("#searchBeginTime").datebox("getValue"));
var endTime = $.trim($("#searchEndTime").datebox("getValue")); var endTime = $.trim($("#searchEndTime").datebox("getValue"));
var contentdetails = $.trim($("#searchDesc").val()); var content = $.trim($("#searchDesc").val());
$.ajax({ $.ajax({
type: "get", type: "get",
url: "/log/list", url: "/log/list",
dataType: "json", dataType: "json",
data: ({ data: ({
search: JSON.stringify({ search: JSON.stringify({
operation: operation, operation: operation,
usernameID: usernameID, userId: userId,
clientIp: clientIp, clientIp: clientIp,
status: status, status: status,
beginTime: beginTime, beginTime: beginTime,
endTime: endTime, endTime: endTime,
contentdetails: contentdetails content: content
}), }),
currentPage: pageNo, currentPage: pageNo,
pageSize: pageSize pageSize: pageSize

2
erp_web/pages/manage/roleFunctions.html
View File

@@ -64,7 +64,7 @@
$(function () { $(function () {
$('#tt').tree({ $('#tt').tree({
url: '/functions/findRoleFunctions?UBType=' + type + '&UBKeyId=' + url_id, url: '/function/findRoleFunction?UBType=' + type + '&UBKeyId=' + url_id,
animate: true, animate: true,
checkbox: true checkbox: true
}); });

2
erp_web/pages/manage/rolePushBtn.html
View File

@@ -145,7 +145,7 @@
var arr = getValue.split("]["); var arr = getValue.split("][");
arr = arr.toString(); arr = arr.toString();
$.ajax({ $.ajax({
url: "/functions/findByIds", url: "/function/findByIds",
type: "get", type: "get",
data: { data: {
functionsIds: arr functionsIds: arr

4
erp_web/pages/manage/unit.html
View File

@@ -118,7 +118,7 @@
return str; return str;
} }
}, },
{title: '计量单位', field: 'uname', width: 200} {title: '计量单位', field: 'name', width: 200}
]], ]],
toolbar: [ toolbar: [
{ {
@@ -356,7 +356,7 @@
dataType: "json", dataType: "json",
data: ({ data: ({
info: JSON.stringify({ info: JSON.stringify({
uname: name, name: name,
basicUnit: basicName, basicUnit: basicName,
otherUnit: otherName, otherUnit: otherName,
ratio: otherNum ratio: otherNum

26
erp_web/pages/materials/material.html
View File

@@ -115,7 +115,7 @@
<input name="parentName" id="parentName" class="easyui-textbox" style="width: 180px;" readonly="readonly"/> <input name="parentName" id="parentName" class="easyui-textbox" style="width: 180px;" readonly="readonly"/>
<a href="javascript:void(0)" class="l-btn l-btn-plain" group="" id="lookForMaterialCategory"> <a href="javascript:void(0)" class="l-btn l-btn-plain" group="" id="lookForMaterialCategory">
<span class="l-btn-left"><span class="l-btn-text icon-search l-btn-icon-left" style="height: 20px;"></span></span></a> <span class="l-btn-left"><span class="l-btn-text icon-search l-btn-icon-left" style="height: 20px;"></span></span></a>
<input name="parentid" id="parentid" type="hidden"/> <input name="parentId" id="parentId" type="hidden"/>
</td> </td>
<td style="text-align: left;"></td> <td style="text-align: left;"></td>
</tr> </tr>
@@ -362,7 +362,7 @@
var thisRows = res.data.page.rows; //属性列表 var thisRows = res.data.page.rows; //属性列表
for (var i = 0; i < thisRows.length; i++) { for (var i = 0; i < thisRows.length; i++) {
if (thisRows[i].enabled) { if (thisRows[i].enabled) {
mPropertyListShort += thisRows[i].nativename + ","; mPropertyListShort += thisRows[i].nativeName + ",";
} }
} }
if (mPropertyListShort) { if (mPropertyListShort) {
@@ -906,9 +906,9 @@
//表格模板变更 //表格模板变更
$(".tb-other-info").html(""); $(".tb-other-info").html("");
for (var i = 0; i < mPropertyList.length; i++) { for (var i = 0; i < mPropertyList.length; i++) {
if (mPropertyList[i].nativename === "制造商") { if (mPropertyList[i].nativeName === "制造商") {
$(".tb-other-info").append(trMfrs); $(".tb-other-info").append(trMfrs);
$(".tr-mfrs td").first().text(mPropertyList[i].anothername); $(".tr-mfrs td").first().text(mPropertyList[i].anotherName);
if (mPropertyList[i].enabled) { if (mPropertyList[i].enabled) {
$(".tr-mfrs").show(); $(".tr-mfrs").show();
} }
@@ -916,9 +916,9 @@
$(".tr-mfrs").hide(); $(".tr-mfrs").hide();
} }
} }
if (mPropertyList[i].nativename === "自定义1") { if (mPropertyList[i].nativeName === "自定义1") {
$(".tb-other-info").append(trOtherField1); $(".tb-other-info").append(trOtherField1);
$(".tr-otherField1 td").first().text(mPropertyList[i].anothername); $(".tr-otherField1 td").first().text(mPropertyList[i].anotherName);
if (mPropertyList[i].enabled) { if (mPropertyList[i].enabled) {
$(".tr-otherField1").show(); $(".tr-otherField1").show();
} }
@@ -926,9 +926,9 @@
$(".tr-otherField1").hide(); $(".tr-otherField1").hide();
} }
} }
if (mPropertyList[i].nativename === "自定义2") { if (mPropertyList[i].nativeName === "自定义2") {
$(".tb-other-info").append(trOtherField2); $(".tb-other-info").append(trOtherField2);
$(".tr-otherField2 td").first().text(mPropertyList[i].anothername); $(".tr-otherField2 td").first().text(mPropertyList[i].anotherName);
if (mPropertyList[i].enabled) { if (mPropertyList[i].enabled) {
$(".tr-otherField2").show(); $(".tr-otherField2").show();
} }
@@ -936,9 +936,9 @@
$(".tr-otherField2").hide(); $(".tr-otherField2").hide();
} }
} }
if (mPropertyList[i].nativename === "自定义3") { if (mPropertyList[i].nativeName === "自定义3") {
$(".tb-other-info").append(trOtherField3); $(".tb-other-info").append(trOtherField3);
$(".tr-otherField3 td").first().text(mPropertyList[i].anothername); $(".tr-otherField3 td").first().text(mPropertyList[i].anotherName);
if (mPropertyList[i].enabled) { if (mPropertyList[i].enabled) {
$(".tr-otherField3").show(); $(".tr-otherField3").show();
} }
@@ -1156,7 +1156,7 @@
} }
var objInfo = $("#materialFM").serializeObject(); var objInfo = $("#materialFM").serializeObject();
objInfo.UnitId = $("#manyUnit").val(); objInfo.UnitId = $("#manyUnit").val();
objInfo.CategoryId =$("#parentid").val(); objInfo.CategoryId =$("#parentId").val();
//初始库存信息 //初始库存信息
var stockArr = []; var stockArr = [];
$("#initDepot input").each(function () { $("#initDepot input").each(function () {
@@ -1221,7 +1221,7 @@
$("#Name").focus().textbox("setValue", rowsdata.name); $("#Name").focus().textbox("setValue", rowsdata.name);
$("#EnableSerialNumber").val(rowsdata.enableserialnumber=='1'?'1':'0'); $("#EnableSerialNumber").val(rowsdata.enableserialnumber=='1'?'1':'0');
//商品类别id //商品类别id
$("#parentid").val(rowsdata.categoryid); $("#parentId").val(rowsdata.categoryid);
//商品类别名称 //商品类别名称
$("#parentName").textbox("setValue", rowsdata.categoryName); $("#parentName").textbox("setValue", rowsdata.categoryName);
mId = rowsdata.categoryid; mId = rowsdata.categoryid;
@@ -1397,7 +1397,7 @@
console.log(res.length); console.log(res.length);
if (res.length) { if (res.length) {
for (var i = 0; i < res.length; i++) { for (var i = 0; i < res.length; i++) {
options += '<option value="' + res[i].id + '">' + res[i].uname + '</option>'; options += '<option value="' + res[i].id + '">' + res[i].name + '</option>';
} }
$("#manyUnit").empty().append('<option value="">(空)</option>').append(options); $("#manyUnit").empty().append('<option value="">(空)</option>').append(options);
//下拉框事件 //下拉框事件

8
erp_web/pages/materials/materialProperty.html
View File

@@ -111,7 +111,7 @@
//loadFilter: pagerFilter, //loadFilter: pagerFilter,
columns: [[ columns: [[
{field: 'id', width: 10, align: "center", hidden: true}, {field: 'id', width: 10, align: "center", hidden: true},
{title: '名称', field: 'nativename', width: 100}, {title: '名称', field: 'nativeName', width: 100},
{ {
title: '是否启用', field: 'enabled', width: 100, formatter: function (value, rec) { title: '是否启用', field: 'enabled', width: 100, formatter: function (value, rec) {
if (rec.enabled) { if (rec.enabled) {
@@ -123,7 +123,7 @@
} }
}, },
{title: '排序', field: 'sort', width: 100}, {title: '排序', field: 'sort', width: 100},
{title: '别名', field: 'anothername', width: 100}, {title: '别名', field: 'anotherName', width: 100},
{ {
title: '操作', field: 'op', align: "center", width: 80, formatter: function (value, rec, index) { title: '操作', field: 'op', align: "center", width: 80, formatter: function (value, rec, index) {
var str = ''; var str = '';
@@ -213,10 +213,10 @@
//编辑信息 //编辑信息
function editMaterialProperty(index) { function editMaterialProperty(index) {
var rowsdata = $("#tableData").datagrid("getRows")[index]; var rowsdata = $("#tableData").datagrid("getRows")[index];
$("#nativeName").text(rowsdata.nativename); $("#nativeName").text(rowsdata.nativeName);
$("#enabled").attr("checked", rowsdata.enabled == true ? true : false); $("#enabled").attr("checked", rowsdata.enabled == true ? true : false);
$("#sort").textbox("setValue", rowsdata.sort); $("#sort").textbox("setValue", rowsdata.sort);
$("#anotherName").textbox("setValue", rowsdata.anothername); $("#anotherName").textbox("setValue", rowsdata.anotherName);
$('#materialPropertyDlg').dialog('open').dialog('setTitle', '<img src="/js/easyui/themes/icons/pencil.png"/>&nbsp;编辑商品属性'); $('#materialPropertyDlg').dialog('open').dialog('setTitle', '<img src="/js/easyui/themes/icons/pencil.png"/>&nbsp;编辑商品属性');
$(".window-mask").css({width: webW, height: webH}); $(".window-mask").css({width: webW, height: webH});
//焦点在名称输入框==定焦在输入文字后面 //焦点在名称输入框==定焦在输入文字后面

10
erp_web/pages/materials/materialcategory.html
View File

@@ -36,13 +36,13 @@
<input name="parentName" id="parentName" class="easyui-textbox" style="width: 200px;" readonly="readonly"/> <input name="parentName" id="parentName" class="easyui-textbox" style="width: 200px;" readonly="readonly"/>
<a href="javascript:void(0)" class="l-btn l-btn-plain" group="" id="lookForSelectMaterialCategory"> <a href="javascript:void(0)" class="l-btn l-btn-plain" group="" id="lookForSelectMaterialCategory">
<span class="l-btn-left"><span class="l-btn-text icon-search l-btn-icon-left" style="height: 20px;"></span></span></a> <span class="l-btn-left"><span class="l-btn-text icon-search l-btn-icon-left" style="height: 20px;"></span></span></a>
<input name="parentid" id="parentid" type="hidden"/> <input name="parentId" id="parentId" type="hidden"/>
</td> </td>
</tr> </tr>
<tr> <tr>
<td>名称</td> <td>名称</td>
<td style="padding:5px"> <td style="padding:5px">
<input name="Name" id="Name" class="easyui-textbox" <input name="name" id="name" class="easyui-textbox"
data-options="required:true,validType:'length[2,30]'" style="width: 200px;"/> data-options="required:true,validType:'length[2,30]'" style="width: 200px;"/>
<input name="id" id="id" type="hidden"/> <input name="id" id="id" type="hidden"/>
</td> </td>
@@ -145,9 +145,9 @@
$('#materialCategoryFM').form('clear'); $('#materialCategoryFM').form('clear');
$('#materialCategoryDlg').dialog('open').dialog('setTitle', '<img src="/js/easyui/themes/icons/edit_add.png"/>&nbsp;修改商品类别信息'); $('#materialCategoryDlg').dialog('open').dialog('setTitle', '<img src="/js/easyui/themes/icons/edit_add.png"/>&nbsp;修改商品类别信息');
$(".window-mask").css({width: webW, height: webH}); $(".window-mask").css({width: webW, height: webH});
$("#Name").textbox("setValue", res.data.name).focus(); $("#name").textbox("setValue", res.data.name).focus();
$("#parentName").textbox("setValue", res.data.parentName); $("#parentName").textbox("setValue", res.data.parentName);
$("#parentid").val(res.data.parentId); $("#parentId").val(res.data.parentId);
$("#serialNo").textbox("setValue", res.data.serialNo); $("#serialNo").textbox("setValue", res.data.serialNo);
$("#sort").textbox("setValue", res.data.sort); $("#sort").textbox("setValue", res.data.sort);
$("#remark").textbox("setValue", res.data.remark); $("#remark").textbox("setValue", res.data.remark);
@@ -250,7 +250,7 @@
//保存信息 //保存信息
$("#saveMaterialCategory").off("click").on("click", function () { $("#saveMaterialCategory").off("click").on("click", function () {
if (!$("#Name").val()) { if (!$("#name").val()) {
$.messager.alert('提示', '商品类别名称不能为空！', 'warning'); $.messager.alert('提示', '商品类别名称不能为空！', 'warning');
return; return;
} }

4
erp_web/pages/materials/materialcategory_forselect.html
View File

@@ -56,12 +56,12 @@
initMCData(node.id); initMCData(node.id);
} else if(clickType == "editBtn") { } else if(clickType == "editBtn") {
$("#parentName").textbox("setValue", node.text); $("#parentName").textbox("setValue", node.text);
$("#parentid").val(node.id); $("#parentId").val(node.id);
} }
} }
else { else {
$("#parentName").textbox("setValue", node.text); $("#parentName").textbox("setValue", node.text);
$("#parentid").val(node.id); $("#parentId").val(node.id);
} }
$('#forSelectMaterialCategoryDlg').dialog('close'); $('#forSelectMaterialCategoryDlg').dialog('close');
} }

10
erp_web/pages/reports/account_report.html
View File

@@ -88,14 +88,14 @@
pageList: initPageNum, pageList: initPageNum,
columns: [[ columns: [[
{title: '名称', field: 'name', width: 100}, {title: '名称', field: 'name', width: 100},
{title: '编号', field: 'serialno', width: 150, align: "center"}, {title: '编号', field: 'serialNo', width: 150, align: "center"},
{title: '期初金额', field: 'initialamount', width: 100, align: "center"}, {title: '期初金额', field: 'initialAmount', width: 100, align: "center"},
{title: '本月发生额', field: 'thismonthamount', width: 100, align: "center"}, {title: '本月发生额', field: 'thisMonthAmount', width: 100, align: "center"},
{title: '当前余额', field: 'currentamount', width: 100, align: "center"}, {title: '当前余额', field: 'currentAmount', width: 100, align: "center"},
{ {
title: '操作', field: 'op', width: 100, align: "center", formatter: function (value, rec) { title: '操作', field: 'op', width: 100, align: "center", formatter: function (value, rec) {
var str = ''; var str = '';
var rowInfo = rec.id + 'AaBb' + rec.name + 'AaBb' + rec.serialno + 'AaBb' + rec.initialamount + 'AaBb' + rec.currentamount; var rowInfo = rec.id + 'AaBb' + rec.name + 'AaBb' + rec.serialNo + 'AaBb' + rec.initialAmount + 'AaBb' + rec.currentAmount;
str += '<img src="/js/easyui/themes/icons/list.png" style="cursor: pointer;" onclick="showAccountInOutList(\'' + rowInfo + '\');"/>&nbsp;<a onclick="showAccountInOutList(\'' + rowInfo + '\');" style="text-decoration:none;color:black;" href="javascript:void(0)">流水</a>&nbsp;&nbsp;'; str += '<img src="/js/easyui/themes/icons/list.png" style="cursor: pointer;" onclick="showAccountInOutList(\'' + rowInfo + '\');"/>&nbsp;<a onclick="showAccountInOutList(\'' + rowInfo + '\');" style="text-decoration:none;color:black;" href="javascript:void(0)">流水</a>&nbsp;&nbsp;';
return str; return str;
} }

4
erp_web/pages/reports/buy_in_report.html
View File

@@ -84,6 +84,8 @@
type: "get", type: "get",
url: "/materialProperty/list", url: "/materialProperty/list",
dataType: "json", dataType: "json",
//设置为同步
async: false,
data: ({ data: ({
search: JSON.stringify({ search: JSON.stringify({
name: "" name: ""
@@ -96,7 +98,7 @@
var thisRows = res.data.page.rows; var thisRows = res.data.page.rows;
for (var i = 0; i < thisRows.length; i++) { for (var i = 0; i < thisRows.length; i++) {
if (thisRows[i].enabled) { if (thisRows[i].enabled) {
mPropertyList += thisRows[i].nativename + ","; mPropertyList += thisRows[i].nativeName + ",";
} }
} }
if (mPropertyList) { if (mPropertyList) {

4
erp_web/pages/reports/in_out_stock_report.html
View File

@@ -187,6 +187,8 @@
type: "get", type: "get",
url: "/materialProperty/list", url: "/materialProperty/list",
dataType: "json", dataType: "json",
//设置为同步
async: false,
data: ({ data: ({
search: JSON.stringify({ search: JSON.stringify({
name: "" name: ""
@@ -199,7 +201,7 @@
var thisRows = res.data.page.rows; var thisRows = res.data.page.rows;
for (var i = 0; i < thisRows.length; i++) { for (var i = 0; i < thisRows.length; i++) {
if (thisRows[i].enabled) { if (thisRows[i].enabled) {
mPropertyList += thisRows[i].nativename + ","; mPropertyList += thisRows[i].nativeName + ",";
} }
} }
if (mPropertyList) { if (mPropertyList) {

4
erp_web/pages/reports/sale_out_report.html
View File

@@ -88,6 +88,8 @@
type: "get", type: "get",
url: "/materialProperty/list", url: "/materialProperty/list",
dataType: "json", dataType: "json",
//设置为同步
async: false,
data: ({ data: ({
search: JSON.stringify({ search: JSON.stringify({
name: "" name: ""
@@ -100,7 +102,7 @@
var thisRows = res.data.page.rows; var thisRows = res.data.page.rows;
for (var i = 0; i < thisRows.length; i++) { for (var i = 0; i < thisRows.length; i++) {
if (thisRows[i].enabled) { if (thisRows[i].enabled) {
mPropertyList += thisRows[i].nativename + ","; mPropertyList += thisRows[i].nativeName + ",";
} }
} }
if (mPropertyList) { if (mPropertyList) {

4
erp_web/pages/reports/stock_warning_report.html
View File

@@ -155,6 +155,8 @@
type: "get", type: "get",
url: "/materialProperty/list", url: "/materialProperty/list",
dataType: "json", dataType: "json",
//设置为同步
async: false,
data: ({ data: ({
search: JSON.stringify({ search: JSON.stringify({
name: "" name: ""
@@ -167,7 +169,7 @@
var thisRows = res.data.page.rows; var thisRows = res.data.page.rows;
for (var i = 0; i < thisRows.length; i++) { for (var i = 0; i < thisRows.length; i++) {
if (thisRows[i].enabled) { if (thisRows[i].enabled) {
mPropertyList += thisRows[i].nativename + ","; mPropertyList += thisRows[i].nativeName + ",";
} }
} }
if (mPropertyList) { if (mPropertyList) {

4
src/main/java/com/jsh/erp/config/TenantConfig.java
View File

@@ -61,8 +61,8 @@ public class TenantConfig {
return true; return true;
} else { } else {
// 这里可以判断是否过滤表 // 这里可以判断是否过滤表
if ("jsh_materialproperty".equals(tableName) || "jsh_sequence".equals(tableName) if ("jsh_material_property".equals(tableName) || "jsh_sequence".equals(tableName)
|| "jsh_userbusiness".equals(tableName) || "jsh_functions".equals(tableName) || "jsh_user_business".equals(tableName) || "jsh_function".equals(tableName)
|| "jsh_tenant".equals(tableName)) { || "jsh_tenant".equals(tableName)) {
return true; return true;
} else { } else {

10
src/main/java/com/jsh/erp/controller/DepotItemController.java
View File

@@ -174,7 +174,7 @@ public class DepotItemController {
if (diEx.getUnitId() == null || diEx.getUnitId().equals("")) { if (diEx.getUnitId() == null || diEx.getUnitId().equals("")) {
ratio = ""; ratio = "";
} else { } else {
ratio = diEx.getUName(); ratio = diEx.getUnitName();
ratio = ratio.substring(ratio.indexOf("(")); ratio = ratio.substring(ratio.indexOf("("));
} }
//名称/型号/扩展信息/包装 //名称/型号/扩展信息/包装
@@ -182,7 +182,7 @@ public class DepotItemController {
+ ((diEx.getMStandard() == null || diEx.getMStandard().equals("")) ? "" : "(" + diEx.getMStandard() + ")") + ((diEx.getMStandard() == null || diEx.getMStandard().equals("")) ? "" : "(" + diEx.getMStandard() + ")")
+ ((diEx.getMModel() == null || diEx.getMModel().equals("")) ? "" : "(" + diEx.getMModel() + ")"); + ((diEx.getMModel() == null || diEx.getMModel().equals("")) ? "" : "(" + diEx.getMModel() + ")");
String materialOther = getOtherInfo(mpArr, diEx); String materialOther = getOtherInfo(mpArr, diEx);
MaterialName = MaterialName + materialOther + ((diEx.getUName() == null || diEx.getUName().equals("")) ? "" : "(" + diEx.getUName() + ")") + ratio; MaterialName = MaterialName + materialOther + ((diEx.getUnitName() == null || diEx.getUnitName().equals("")) ? "" : "(" + diEx.getUnitName() + ")") + ratio;
item.put("MaterialName", MaterialName == null ? "" : MaterialName); item.put("MaterialName", MaterialName == null ? "" : MaterialName);
BigDecimal stock = depotItemService.getStockByParam(diEx.getDepotid(),diEx.getMaterialid(),null,null,tenantId); BigDecimal stock = depotItemService.getStockByParam(diEx.getDepotid(),diEx.getMaterialid(),null,null,tenantId);
item.put("Stock", stock); item.put("Stock", stock);
@@ -298,7 +298,7 @@ public class DepotItemController {
String materialOther = getOtherInfo(mpArr, diEx); String materialOther = getOtherInfo(mpArr, diEx);
item.put("MaterialOther", materialOther); item.put("MaterialOther", materialOther);
item.put("MaterialColor", diEx.getMColor()); item.put("MaterialColor", diEx.getMColor());
item.put("unitName", getUName(diEx.getMaterialUnit(), diEx.getUName())); item.put("unitName", getUName(diEx.getMaterialUnit(), diEx.getUnitName()));
item.put("prevSum", depotItemService.getStockByParam(depotId,mId,null,timeA,tenantId)); item.put("prevSum", depotItemService.getStockByParam(depotId,mId,null,timeA,tenantId));
item.put("InSum", depotItemService.getInNumByParam(depotId,mId,timeA,timeB,tenantId)); item.put("InSum", depotItemService.getInNumByParam(depotId,mId,timeA,timeB,tenantId));
@@ -468,7 +468,7 @@ public class DepotItemController {
item.put("MaterialOther", materialOther); item.put("MaterialOther", materialOther);
item.put("MaterialColor", diEx.getMColor()); item.put("MaterialColor", diEx.getMColor());
item.put("MaterialUnit", diEx.getMaterialUnit()); item.put("MaterialUnit", diEx.getMaterialUnit());
item.put("UName", diEx.getUName()); item.put("UName", diEx.getUnitName());
item.put("InSum", InSum); item.put("InSum", InSum);
item.put("OutSum", OutSum); item.put("OutSum", OutSum);
item.put("InSumPrice", InSumPrice); item.put("InSumPrice", InSumPrice);
@@ -536,7 +536,7 @@ public class DepotItemController {
item.put("MaterialOther", materialOther); item.put("MaterialOther", materialOther);
item.put("MaterialColor", diEx.getMColor()); item.put("MaterialColor", diEx.getMColor());
item.put("MaterialUnit", diEx.getMaterialUnit()); item.put("MaterialUnit", diEx.getMaterialUnit());
item.put("UName", diEx.getUName()); item.put("UName", diEx.getUnitName());
item.put("OutSum", OutSumRetail.add(OutSum)); item.put("OutSum", OutSumRetail.add(OutSum));
item.put("InSum", InSumRetail.add(InSum)); item.put("InSum", InSumRetail.add(InSum));
item.put("OutSumPrice", OutSumRetailPrice.add(OutSumPrice)); item.put("OutSumPrice", OutSumRetailPrice.add(OutSumPrice));

74
src/main/java/com/jsh/erp/controller/FunctionsController.java → src/main/java/com/jsh/erp/controller/FunctionController.java
View File

@@ -3,21 +3,19 @@ package com.jsh.erp.controller;
import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson.JSONObject;
import com.jsh.erp.constants.ExceptionConstants; import com.jsh.erp.constants.ExceptionConstants;
import com.jsh.erp.datasource.entities.Functions; import com.jsh.erp.datasource.entities.Function;
import com.jsh.erp.datasource.entities.User; import com.jsh.erp.datasource.entities.User;
import com.jsh.erp.exception.BusinessRunTimeException; import com.jsh.erp.exception.BusinessRunTimeException;
import com.jsh.erp.service.functions.FunctionsService; import com.jsh.erp.service.functions.FunctionService;
import com.jsh.erp.service.userBusiness.UserBusinessService; import com.jsh.erp.service.userBusiness.UserBusinessService;
import com.jsh.erp.utils.BaseResponseInfo; import com.jsh.erp.utils.BaseResponseInfo;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.dao.DataAccessException; import org.springframework.dao.DataAccessException;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource; import javax.annotation.Resource;
import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletRequest;
import java.io.IOException;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
@@ -25,26 +23,26 @@ import java.util.List;
* @author ji-sheng-hua jshERP * @author ji-sheng-hua jshERP
*/ */
@RestController @RestController
@RequestMapping(value = "/functions") @RequestMapping(value = "/function")
public class FunctionsController { public class FunctionController {
private Logger logger = LoggerFactory.getLogger(FunctionsController.class); private Logger logger = LoggerFactory.getLogger(FunctionController.class);
@Resource @Resource
private FunctionsService functionsService; private FunctionService functionService;
@Resource @Resource
private UserBusinessService userBusinessService; private UserBusinessService userBusinessService;
@PostMapping(value = "/findMenu") @PostMapping(value = "/findMenu")
public JSONArray findMenu(@RequestParam(value="pNumber") String pNumber, public JSONArray findMenu(@RequestParam(value="pNumber") String pNumber,
@RequestParam(value="hasFunctions") String hasFunctions, @RequestParam(value="hasFunction") String hasFunction,
HttpServletRequest request)throws Exception { HttpServletRequest request)throws Exception {
//存放数据json数组 //存放数据json数组
JSONArray dataArray = new JSONArray(); JSONArray dataArray = new JSONArray();
try { try {
//当前用户所拥有的功能列表，格式如：[1][2][5] //当前用户所拥有的功能列表，格式如：[1][2][5]
String fc = hasFunctions; String fc = hasFunction;
List<Functions> dataList = functionsService.getRoleFunctions(pNumber); List<Function> dataList = functionService.getRoleFunction(pNumber);
if (dataList.size() != 0) { if (dataList.size() != 0) {
dataArray = getMenuByFunction(dataList, fc); dataArray = getMenuByFunction(dataList, fc);
} }
@@ -54,14 +52,14 @@ public class FunctionsController {
return dataArray; return dataArray;
} }
public JSONArray getMenuByFunction(List<Functions> dataList, String fc) throws Exception { public JSONArray getMenuByFunction(List<Function> dataList, String fc) throws Exception {
JSONArray dataArray = new JSONArray(); JSONArray dataArray = new JSONArray();
for (Functions functions : dataList) { for (Function function : dataList) {
JSONObject item = new JSONObject(); JSONObject item = new JSONObject();
List<Functions> newList = functionsService.getRoleFunctions(functions.getNumber()); List<Function> newList = functionService.getRoleFunction(function.getNumber());
item.put("id", functions.getId()); item.put("id", function.getId());
item.put("text", functions.getName()); item.put("text", function.getName());
item.put("icon", functions.getIcon()); item.put("icon", function.getIcon());
if (newList.size()>0) { if (newList.size()>0) {
JSONArray childrenArr = getMenuByFunction(newList, fc); JSONArray childrenArr = getMenuByFunction(newList, fc);
if(childrenArr.size()>0) { if(childrenArr.size()>0) {
@@ -69,8 +67,8 @@ public class FunctionsController {
dataArray.add(item); dataArray.add(item);
} }
} else { } else {
item.put("url", functions.getUrl()); item.put("url", function.getUrl());
if (fc.indexOf("[" + functions.getId().toString() + "]") != -1) { if (fc.indexOf("[" + function.getId().toString() + "]") != -1) {
dataArray.add(item); dataArray.add(item);
} }
} }
@@ -83,12 +81,12 @@ public class FunctionsController {
* @param request * @param request
* @return * @return
*/ */
@PostMapping(value = "/findRoleFunctions") @PostMapping(value = "/findRoleFunction")
public JSONArray findRoleFunctions(@RequestParam("UBType") String type, @RequestParam("UBKeyId") String keyId, public JSONArray findRoleFunction(@RequestParam("UBType") String type, @RequestParam("UBKeyId") String keyId,
HttpServletRequest request)throws Exception { HttpServletRequest request)throws Exception {
JSONArray arr = new JSONArray(); JSONArray arr = new JSONArray();
try { try {
List<Functions> dataListFun = functionsService.findRoleFunctions("0"); List<Function> dataListFun = functionService.findRoleFunction("0");
//开始拼接json数据 //开始拼接json数据
JSONObject outer = new JSONObject(); JSONObject outer = new JSONObject();
outer.put("id", 1); outer.put("id", 1);
@@ -98,8 +96,8 @@ public class FunctionsController {
JSONArray dataArray = new JSONArray(); JSONArray dataArray = new JSONArray();
if (null != dataListFun) { if (null != dataListFun) {
//根据条件从列表里面移除"系统管理" //根据条件从列表里面移除"系统管理"
List<Functions> dataList = new ArrayList<Functions>(); List<Function> dataList = new ArrayList<Function>();
for (Functions fun : dataListFun) { for (Function fun : dataListFun) {
//从session中获取租户id //从session中获取租户id
String loginName = null; String loginName = null;
Object userInfo = request.getSession().getAttribute("user"); Object userInfo = request.getSession().getAttribute("user");
@@ -125,23 +123,23 @@ public class FunctionsController {
return arr; return arr;
} }
public JSONArray getFunctionList(List<Functions> dataList, String type, String keyId) throws Exception { public JSONArray getFunctionList(List<Function> dataList, String type, String keyId) throws Exception {
JSONArray dataArray = new JSONArray(); JSONArray dataArray = new JSONArray();
if (null != dataList) { if (null != dataList) {
for (Functions functions : dataList) { for (Function function : dataList) {
JSONObject item = new JSONObject(); JSONObject item = new JSONObject();
item.put("id", functions.getId()); item.put("id", function.getId());
item.put("text", functions.getName()); item.put("text", function.getName());
Boolean flag = false; Boolean flag = false;
try { try {
flag = userBusinessService.checkIsUserBusinessExist(type, keyId, "[" + functions.getId().toString() + "]"); flag = userBusinessService.checkIsUserBusinessExist(type, keyId, "[" + function.getId().toString() + "]");
} catch (Exception e) { } catch (Exception e) {
logger.error(">>>>>>>>>>>>>>>>>设置角色对应的功能：类型" + type + " KeyId为： " + keyId + " 存在异常！"); logger.error(">>>>>>>>>>>>>>>>>设置角色对应的功能：类型" + type + " KeyId为： " + keyId + " 存在异常！");
} }
if (flag == true) { if (flag == true) {
item.put("checked", true); item.put("checked", true);
} }
List<Functions> funList = functionsService.findRoleFunctions(functions.getNumber()); List<Function> funList = functionService.findRoleFunction(function.getNumber());
if(funList.size()>0) { if(funList.size()>0) {
JSONArray funArr = getFunctionList(funList, type, keyId); JSONArray funArr = getFunctionList(funList, type, keyId);
item.put("children", funArr); item.put("children", funArr);
@@ -165,17 +163,17 @@ public class FunctionsController {
HttpServletRequest request)throws Exception { HttpServletRequest request)throws Exception {
BaseResponseInfo res = new BaseResponseInfo(); BaseResponseInfo res = new BaseResponseInfo();
try { try {
List<Functions> dataList = functionsService.findByIds(functionsIds); List<Function> dataList = functionService.findByIds(functionsIds);
JSONObject outer = new JSONObject(); JSONObject outer = new JSONObject();
outer.put("total", dataList.size()); outer.put("total", dataList.size());
//存放数据json数组 //存放数据json数组
JSONArray dataArray = new JSONArray(); JSONArray dataArray = new JSONArray();
if (null != dataList) { if (null != dataList) {
for (Functions functions : dataList) { for (Function function : dataList) {
JSONObject item = new JSONObject(); JSONObject item = new JSONObject();
item.put("Id", functions.getId()); item.put("Id", function.getId());
item.put("Name", functions.getName()); item.put("Name", function.getName());
item.put("PushBtn", functions.getPushbtn()); item.put("PushBtn", function.getPushBtn());
item.put("op", 1); item.put("op", 1);
dataArray.add(item); dataArray.add(item);
} }
@@ -199,10 +197,10 @@ public class FunctionsController {
* @Param: ids * @Param: ids
* @return java.lang.Object * @return java.lang.Object
*/ */
@RequestMapping(value = "/batchDeleteFunctionsByIds") @RequestMapping(value = "/batchDeleteFunctionByIds")
public Object batchDeleteFunctionsByIds(@RequestParam("ids") String ids) throws Exception { public Object batchDeleteFunctionByIds(@RequestParam("ids") String ids) throws Exception {
JSONObject result = ExceptionConstants.standardSuccess(); JSONObject result = ExceptionConstants.standardSuccess();
int i= functionsService.batchDeleteFunctionsByIds(ids); int i= functionService.batchDeleteFunctionByIds(ids);
if(i<1){ if(i<1){
logger.error("异常码[{}],异常提示[{}],参数,ids[{}]", logger.error("异常码[{}],异常提示[{}],参数,ids[{}]",
ExceptionConstants.FUNCTIONS_DELETE_FAILED_CODE,ExceptionConstants.FUNCTIONS_DELETE_FAILED_MSG,ids); ExceptionConstants.FUNCTIONS_DELETE_FAILED_CODE,ExceptionConstants.FUNCTIONS_DELETE_FAILED_MSG,ids);

4
src/main/java/com/jsh/erp/controller/MaterialCategoryController.java
View File

@@ -64,8 +64,8 @@ public class MaterialCategoryController {
for (MaterialCategory mc : dataList) { for (MaterialCategory mc : dataList) {
outer.put("id", mc.getId()); outer.put("id", mc.getId());
outer.put("name", mc.getName()); outer.put("name", mc.getName());
outer.put("parentId", mc.getParentid()); outer.put("parentId", mc.getParentId());
List<MaterialCategory> dataParentList = materialCategoryService.findById(mc.getParentid()); List<MaterialCategory> dataParentList = materialCategoryService.findById(mc.getParentId());
if(dataParentList!=null&&dataParentList.size()>0){ if(dataParentList!=null&&dataParentList.size()>0){
outer.put("parentName", dataParentList.get(0).getName()); outer.put("parentName", dataParentList.get(0).getName());
} }

238
src/main/java/com/jsh/erp/datasource/entities/Account.java
View File

@@ -3,290 +3,92 @@ package com.jsh.erp.datasource.entities;
import java.math.BigDecimal; import java.math.BigDecimal;
public class Account { public class Account {
/**
* This field was generated by MyBatis Generator.
* This field corresponds to the database column jsh_account.Id
*
* @mbggenerated
*/
private Long id; private Long id;
/**
* This field was generated by MyBatis Generator.
* This field corresponds to the database column jsh_account.Name
*
* @mbggenerated
*/
private String name; private String name;
/** private String serialNo;
* This field was generated by MyBatis Generator.
* This field corresponds to the database column jsh_account.SerialNo
*
* @mbggenerated
*/
private String serialno;
/** private BigDecimal initialAmount;
* This field was generated by MyBatis Generator.
* This field corresponds to the database column jsh_account.InitialAmount
*
* @mbggenerated
*/
private BigDecimal initialamount;
/** private BigDecimal currentAmount;
* This field was generated by MyBatis Generator.
* This field corresponds to the database column jsh_account.CurrentAmount
*
* @mbggenerated
*/
private BigDecimal currentamount;
/**
* This field was generated by MyBatis Generator.
* This field corresponds to the database column jsh_account.Remark
*
* @mbggenerated
*/
private String remark; private String remark;
/** private Boolean isDefault;
* This field was generated by MyBatis Generator.
* This field corresponds to the database column jsh_account.IsDefault
*
* @mbggenerated
*/
private Boolean isdefault;
/**
* This field was generated by MyBatis Generator.
* This field corresponds to the database column jsh_account.tenant_id
*
* @mbggenerated
*/
private Long tenantId; 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; private String deleteFlag;
/**
* This method was generated by MyBatis Generator.
* This method returns the value of the database column jsh_account.Id
*
* @return the value of jsh_account.Id
*
* @mbggenerated
*/
public Long getId() { public Long getId() {
return id; return id;
} }
/**
* This method was generated by MyBatis Generator.
* This method sets the value of the database column jsh_account.Id
*
* @param id the value for jsh_account.Id
*
* @mbggenerated
*/
public void setId(Long id) { public void setId(Long id) {
this.id = id; this.id = id;
} }
/**
* This method was generated by MyBatis Generator.
* This method returns the value of the database column jsh_account.Name
*
* @return the value of jsh_account.Name
*
* @mbggenerated
*/
public String getName() { public String getName() {
return name; return name;
} }
/**
* This method was generated by MyBatis Generator.
* This method sets the value of the database column jsh_account.Name
*
* @param name the value for jsh_account.Name
*
* @mbggenerated
*/
public void setName(String name) { public void setName(String name) {
this.name = name == null ? null : name.trim(); this.name = name == null ? null : name.trim();
} }
/** public String getSerialNo() {
* This method was generated by MyBatis Generator. return serialNo;
* This method returns the value of the database column jsh_account.SerialNo
*
* @return the value of jsh_account.SerialNo
*
* @mbggenerated
*/
public String getSerialno() {
return serialno;
} }
/** public void setSerialNo(String serialNo) {
* This method was generated by MyBatis Generator. this.serialNo = serialNo == null ? null : serialNo.trim();
* This method sets the value of the database column jsh_account.SerialNo
*
* @param serialno the value for jsh_account.SerialNo
*
* @mbggenerated
*/
public void setSerialno(String serialno) {
this.serialno = serialno == null ? null : serialno.trim();
} }
/** public BigDecimal getInitialAmount() {
* This method was generated by MyBatis Generator. return initialAmount;
* This method returns the value of the database column jsh_account.InitialAmount
*
* @return the value of jsh_account.InitialAmount
*
* @mbggenerated
*/
public BigDecimal getInitialamount() {
return initialamount;
} }
/** public void setInitialAmount(BigDecimal initialAmount) {
* This method was generated by MyBatis Generator. this.initialAmount = initialAmount;
* This method sets the value of the database column jsh_account.InitialAmount
*
* @param initialamount the value for jsh_account.InitialAmount
*
* @mbggenerated
*/
public void setInitialamount(BigDecimal initialamount) {
this.initialamount = initialamount;
} }
/** public BigDecimal getCurrentAmount() {
* This method was generated by MyBatis Generator. return currentAmount;
* This method returns the value of the database column jsh_account.CurrentAmount
*
* @return the value of jsh_account.CurrentAmount
*
* @mbggenerated
*/
public BigDecimal getCurrentamount() {
return currentamount;
} }
/** public void setCurrentAmount(BigDecimal currentAmount) {
* This method was generated by MyBatis Generator. this.currentAmount = currentAmount;
* This method sets the value of the database column jsh_account.CurrentAmount
*
* @param currentamount the value for jsh_account.CurrentAmount
*
* @mbggenerated
*/
public void setCurrentamount(BigDecimal currentamount) {
this.currentamount = currentamount;
} }
/**
* This method was generated by MyBatis Generator.
* This method returns the value of the database column jsh_account.Remark
*
* @return the value of jsh_account.Remark
*
* @mbggenerated
*/
public String getRemark() { public String getRemark() {
return remark; return remark;
} }
/**
* This method was generated by MyBatis Generator.
* This method sets the value of the database column jsh_account.Remark
*
* @param remark the value for jsh_account.Remark
*
* @mbggenerated
*/
public void setRemark(String remark) { public void setRemark(String remark) {
this.remark = remark == null ? null : remark.trim(); this.remark = remark == null ? null : remark.trim();
} }
/** public Boolean getIsDefault() {
* This method was generated by MyBatis Generator. return isDefault;
* This method returns the value of the database column jsh_account.IsDefault
*
* @return the value of jsh_account.IsDefault
*
* @mbggenerated
*/
public Boolean getIsdefault() {
return isdefault;
} }
/** public void setIsDefault(Boolean isDefault) {
* This method was generated by MyBatis Generator. this.isDefault = isDefault;
* This method sets the value of the database column jsh_account.IsDefault
*
* @param isdefault the value for jsh_account.IsDefault
*
* @mbggenerated
*/
public void setIsdefault(Boolean isdefault) {
this.isdefault = isdefault;
} }
/**
* This method was generated by MyBatis Generator.
* This method returns the value of the database column jsh_account.tenant_id
*
* @return the value of jsh_account.tenant_id
*
* @mbggenerated
*/
public Long getTenantId() { public Long getTenantId() {
return tenantId; return tenantId;
} }
/**
* This method was generated by MyBatis Generator.
* This method sets the value of the database column jsh_account.tenant_id
*
* @param tenantId the value for jsh_account.tenant_id
*
* @mbggenerated
*/
public void setTenantId(Long tenantId) { public void setTenantId(Long tenantId) {
this.tenantId = tenantId; this.tenantId = tenantId;
} }
/**
* This method was generated by MyBatis Generator.
* This method returns the value of the database column jsh_account.delete_Flag
*
* @return the value of jsh_account.delete_Flag
*
* @mbggenerated
*/
public String getDeleteFlag() { public String getDeleteFlag() {
return deleteFlag; return deleteFlag;
} }
/**
* This method was generated by MyBatis Generator.
* This method sets the value of the database column jsh_account.delete_Flag
*
* @param deleteFlag the value for jsh_account.delete_Flag
*
* @mbggenerated
*/
public void setDeleteFlag(String deleteFlag) { public void setDeleteFlag(String deleteFlag) {
this.deleteFlag = deleteFlag == null ? null : deleteFlag.trim(); this.deleteFlag = deleteFlag == null ? null : deleteFlag.trim();
} }

415
src/main/java/com/jsh/erp/datasource/entities/AccountExample.java
View File

@@ -5,118 +5,46 @@ import java.util.ArrayList;
import java.util.List; import java.util.List;
public class AccountExample { public class AccountExample {
/**
* This field was generated by MyBatis Generator.
* This field corresponds to the database table jsh_account
*
* @mbggenerated
*/
protected String orderByClause; protected String orderByClause;
/**
* This field was generated by MyBatis Generator.
* This field corresponds to the database table jsh_account
*
* @mbggenerated
*/
protected boolean distinct; protected boolean distinct;
/**
* This field was generated by MyBatis Generator.
* This field corresponds to the database table jsh_account
*
* @mbggenerated
*/
protected List<Criteria> oredCriteria; protected List<Criteria> oredCriteria;
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table jsh_account
*
* @mbggenerated
*/
public AccountExample() { public AccountExample() {
oredCriteria = new ArrayList<Criteria>(); oredCriteria = new ArrayList<>();
} }
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table jsh_account
*
* @mbggenerated
*/
public void setOrderByClause(String orderByClause) { public void setOrderByClause(String orderByClause) {
this.orderByClause = orderByClause; this.orderByClause = orderByClause;
} }
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table jsh_account
*
* @mbggenerated
*/
public String getOrderByClause() { public String getOrderByClause() {
return orderByClause; return orderByClause;
} }
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table jsh_account
*
* @mbggenerated
*/
public void setDistinct(boolean distinct) { public void setDistinct(boolean distinct) {
this.distinct = distinct; this.distinct = distinct;
} }
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table jsh_account
*
* @mbggenerated
*/
public boolean isDistinct() { public boolean isDistinct() {
return distinct; return distinct;
} }
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table jsh_account
*
* @mbggenerated
*/
public List<Criteria> getOredCriteria() { public List<Criteria> getOredCriteria() {
return oredCriteria; return oredCriteria;
} }
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table jsh_account
*
* @mbggenerated
*/
public void or(Criteria criteria) { public void or(Criteria criteria) {
oredCriteria.add(criteria); oredCriteria.add(criteria);
} }
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table jsh_account
*
* @mbggenerated
*/
public Criteria or() { public Criteria or() {
Criteria criteria = createCriteriaInternal(); Criteria criteria = createCriteriaInternal();
oredCriteria.add(criteria); oredCriteria.add(criteria);
return criteria; return criteria;
} }
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table jsh_account
*
* @mbggenerated
*/
public Criteria createCriteria() { public Criteria createCriteria() {
Criteria criteria = createCriteriaInternal(); Criteria criteria = createCriteriaInternal();
if (oredCriteria.size() == 0) { if (oredCriteria.size() == 0) {
@@ -125,41 +53,23 @@ public class AccountExample {
return criteria; return criteria;
} }
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table jsh_account
*
* @mbggenerated
*/
protected Criteria createCriteriaInternal() { protected Criteria createCriteriaInternal() {
Criteria criteria = new Criteria(); Criteria criteria = new Criteria();
return criteria; return criteria;
} }
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table jsh_account
*
* @mbggenerated
*/
public void clear() { public void clear() {
oredCriteria.clear(); oredCriteria.clear();
orderByClause = null; orderByClause = null;
distinct = false; distinct = false;
} }
/**
* This class was generated by MyBatis Generator.
* This class corresponds to the database table jsh_account
*
* @mbggenerated
*/
protected abstract static class GeneratedCriteria { protected abstract static class GeneratedCriteria {
protected List<Criterion> criteria; protected List<Criterion> criteria;
protected GeneratedCriteria() { protected GeneratedCriteria() {
super(); super();
criteria = new ArrayList<Criterion>(); criteria = new ArrayList<>();
} }
public boolean isValid() { public boolean isValid() {
@@ -196,452 +106,452 @@ public class AccountExample {
} }
public Criteria andIdIsNull() { public Criteria andIdIsNull() {
addCriterion("Id is null"); addCriterion("id is null");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andIdIsNotNull() { public Criteria andIdIsNotNull() {
addCriterion("Id is not null"); addCriterion("id is not null");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andIdEqualTo(Long value) { public Criteria andIdEqualTo(Long value) {
addCriterion("Id =", value, "id"); addCriterion("id =", value, "id");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andIdNotEqualTo(Long value) { public Criteria andIdNotEqualTo(Long value) {
addCriterion("Id <>", value, "id"); addCriterion("id <>", value, "id");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andIdGreaterThan(Long value) { public Criteria andIdGreaterThan(Long value) {
addCriterion("Id >", value, "id"); addCriterion("id >", value, "id");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andIdGreaterThanOrEqualTo(Long value) { public Criteria andIdGreaterThanOrEqualTo(Long value) {
addCriterion("Id >=", value, "id"); addCriterion("id >=", value, "id");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andIdLessThan(Long value) { public Criteria andIdLessThan(Long value) {
addCriterion("Id <", value, "id"); addCriterion("id <", value, "id");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andIdLessThanOrEqualTo(Long value) { public Criteria andIdLessThanOrEqualTo(Long value) {
addCriterion("Id <=", value, "id"); addCriterion("id <=", value, "id");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andIdIn(List<Long> values) { public Criteria andIdIn(List<Long> values) {
addCriterion("Id in", values, "id"); addCriterion("id in", values, "id");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andIdNotIn(List<Long> values) { public Criteria andIdNotIn(List<Long> values) {
addCriterion("Id not in", values, "id"); addCriterion("id not in", values, "id");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andIdBetween(Long value1, Long value2) { public Criteria andIdBetween(Long value1, Long value2) {
addCriterion("Id between", value1, value2, "id"); addCriterion("id between", value1, value2, "id");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andIdNotBetween(Long value1, Long value2) { public Criteria andIdNotBetween(Long value1, Long value2) {
addCriterion("Id not between", value1, value2, "id"); addCriterion("id not between", value1, value2, "id");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andNameIsNull() { public Criteria andNameIsNull() {
addCriterion("Name is null"); addCriterion("name is null");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andNameIsNotNull() { public Criteria andNameIsNotNull() {
addCriterion("Name is not null"); addCriterion("name is not null");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andNameEqualTo(String value) { public Criteria andNameEqualTo(String value) {
addCriterion("Name =", value, "name"); addCriterion("name =", value, "name");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andNameNotEqualTo(String value) { public Criteria andNameNotEqualTo(String value) {
addCriterion("Name <>", value, "name"); addCriterion("name <>", value, "name");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andNameGreaterThan(String value) { public Criteria andNameGreaterThan(String value) {
addCriterion("Name >", value, "name"); addCriterion("name >", value, "name");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andNameGreaterThanOrEqualTo(String value) { public Criteria andNameGreaterThanOrEqualTo(String value) {
addCriterion("Name >=", value, "name"); addCriterion("name >=", value, "name");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andNameLessThan(String value) { public Criteria andNameLessThan(String value) {
addCriterion("Name <", value, "name"); addCriterion("name <", value, "name");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andNameLessThanOrEqualTo(String value) { public Criteria andNameLessThanOrEqualTo(String value) {
addCriterion("Name <=", value, "name"); addCriterion("name <=", value, "name");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andNameLike(String value) { public Criteria andNameLike(String value) {
addCriterion("Name like", value, "name"); addCriterion("name like", value, "name");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andNameNotLike(String value) { public Criteria andNameNotLike(String value) {
addCriterion("Name not like", value, "name"); addCriterion("name not like", value, "name");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andNameIn(List<String> values) { public Criteria andNameIn(List<String> values) {
addCriterion("Name in", values, "name"); addCriterion("name in", values, "name");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andNameNotIn(List<String> values) { public Criteria andNameNotIn(List<String> values) {
addCriterion("Name not in", values, "name"); addCriterion("name not in", values, "name");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andNameBetween(String value1, String value2) { public Criteria andNameBetween(String value1, String value2) {
addCriterion("Name between", value1, value2, "name"); addCriterion("name between", value1, value2, "name");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andNameNotBetween(String value1, String value2) { public Criteria andNameNotBetween(String value1, String value2) {
addCriterion("Name not between", value1, value2, "name"); addCriterion("name not between", value1, value2, "name");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andSerialnoIsNull() { public Criteria andSerialNoIsNull() {
addCriterion("SerialNo is null"); addCriterion("serial_no is null");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andSerialnoIsNotNull() { public Criteria andSerialNoIsNotNull() {
addCriterion("SerialNo is not null"); addCriterion("serial_no is not null");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andSerialnoEqualTo(String value) { public Criteria andSerialNoEqualTo(String value) {
addCriterion("SerialNo =", value, "serialno"); addCriterion("serial_no =", value, "serialNo");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andSerialnoNotEqualTo(String value) { public Criteria andSerialNoNotEqualTo(String value) {
addCriterion("SerialNo <>", value, "serialno"); addCriterion("serial_no <>", value, "serialNo");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andSerialnoGreaterThan(String value) { public Criteria andSerialNoGreaterThan(String value) {
addCriterion("SerialNo >", value, "serialno"); addCriterion("serial_no >", value, "serialNo");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andSerialnoGreaterThanOrEqualTo(String value) { public Criteria andSerialNoGreaterThanOrEqualTo(String value) {
addCriterion("SerialNo >=", value, "serialno"); addCriterion("serial_no >=", value, "serialNo");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andSerialnoLessThan(String value) { public Criteria andSerialNoLessThan(String value) {
addCriterion("SerialNo <", value, "serialno"); addCriterion("serial_no <", value, "serialNo");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andSerialnoLessThanOrEqualTo(String value) { public Criteria andSerialNoLessThanOrEqualTo(String value) {
addCriterion("SerialNo <=", value, "serialno"); addCriterion("serial_no <=", value, "serialNo");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andSerialnoLike(String value) { public Criteria andSerialNoLike(String value) {
addCriterion("SerialNo like", value, "serialno"); addCriterion("serial_no like", value, "serialNo");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andSerialnoNotLike(String value) { public Criteria andSerialNoNotLike(String value) {
addCriterion("SerialNo not like", value, "serialno"); addCriterion("serial_no not like", value, "serialNo");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andSerialnoIn(List<String> values) { public Criteria andSerialNoIn(List<String> values) {
addCriterion("SerialNo in", values, "serialno"); addCriterion("serial_no in", values, "serialNo");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andSerialnoNotIn(List<String> values) { public Criteria andSerialNoNotIn(List<String> values) {
addCriterion("SerialNo not in", values, "serialno"); addCriterion("serial_no not in", values, "serialNo");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andSerialnoBetween(String value1, String value2) { public Criteria andSerialNoBetween(String value1, String value2) {
addCriterion("SerialNo between", value1, value2, "serialno"); addCriterion("serial_no between", value1, value2, "serialNo");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andSerialnoNotBetween(String value1, String value2) { public Criteria andSerialNoNotBetween(String value1, String value2) {
addCriterion("SerialNo not between", value1, value2, "serialno"); addCriterion("serial_no not between", value1, value2, "serialNo");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andInitialamountIsNull() { public Criteria andInitialAmountIsNull() {
addCriterion("InitialAmount is null"); addCriterion("initial_amount is null");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andInitialamountIsNotNull() { public Criteria andInitialAmountIsNotNull() {
addCriterion("InitialAmount is not null"); addCriterion("initial_amount is not null");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andInitialamountEqualTo(BigDecimal value) { public Criteria andInitialAmountEqualTo(BigDecimal value) {
addCriterion("InitialAmount =", value, "initialamount"); addCriterion("initial_amount =", value, "initialAmount");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andInitialamountNotEqualTo(BigDecimal value) { public Criteria andInitialAmountNotEqualTo(BigDecimal value) {
addCriterion("InitialAmount <>", value, "initialamount"); addCriterion("initial_amount <>", value, "initialAmount");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andInitialamountGreaterThan(BigDecimal value) { public Criteria andInitialAmountGreaterThan(BigDecimal value) {
addCriterion("InitialAmount >", value, "initialamount"); addCriterion("initial_amount >", value, "initialAmount");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andInitialamountGreaterThanOrEqualTo(BigDecimal value) { public Criteria andInitialAmountGreaterThanOrEqualTo(BigDecimal value) {
addCriterion("InitialAmount >=", value, "initialamount"); addCriterion("initial_amount >=", value, "initialAmount");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andInitialamountLessThan(BigDecimal value) { public Criteria andInitialAmountLessThan(BigDecimal value) {
addCriterion("InitialAmount <", value, "initialamount"); addCriterion("initial_amount <", value, "initialAmount");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andInitialamountLessThanOrEqualTo(BigDecimal value) { public Criteria andInitialAmountLessThanOrEqualTo(BigDecimal value) {
addCriterion("InitialAmount <=", value, "initialamount"); addCriterion("initial_amount <=", value, "initialAmount");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andInitialamountIn(List<BigDecimal> values) { public Criteria andInitialAmountIn(List<BigDecimal> values) {
addCriterion("InitialAmount in", values, "initialamount"); addCriterion("initial_amount in", values, "initialAmount");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andInitialamountNotIn(List<BigDecimal> values) { public Criteria andInitialAmountNotIn(List<BigDecimal> values) {
addCriterion("InitialAmount not in", values, "initialamount"); addCriterion("initial_amount not in", values, "initialAmount");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andInitialamountBetween(BigDecimal value1, BigDecimal value2) { public Criteria andInitialAmountBetween(BigDecimal value1, BigDecimal value2) {
addCriterion("InitialAmount between", value1, value2, "initialamount"); addCriterion("initial_amount between", value1, value2, "initialAmount");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andInitialamountNotBetween(BigDecimal value1, BigDecimal value2) { public Criteria andInitialAmountNotBetween(BigDecimal value1, BigDecimal value2) {
addCriterion("InitialAmount not between", value1, value2, "initialamount"); addCriterion("initial_amount not between", value1, value2, "initialAmount");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andCurrentamountIsNull() { public Criteria andCurrentAmountIsNull() {
addCriterion("CurrentAmount is null"); addCriterion("current_amount is null");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andCurrentamountIsNotNull() { public Criteria andCurrentAmountIsNotNull() {
addCriterion("CurrentAmount is not null"); addCriterion("current_amount is not null");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andCurrentamountEqualTo(BigDecimal value) { public Criteria andCurrentAmountEqualTo(BigDecimal value) {
addCriterion("CurrentAmount =", value, "currentamount"); addCriterion("current_amount =", value, "currentAmount");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andCurrentamountNotEqualTo(BigDecimal value) { public Criteria andCurrentAmountNotEqualTo(BigDecimal value) {
addCriterion("CurrentAmount <>", value, "currentamount"); addCriterion("current_amount <>", value, "currentAmount");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andCurrentamountGreaterThan(BigDecimal value) { public Criteria andCurrentAmountGreaterThan(BigDecimal value) {
addCriterion("CurrentAmount >", value, "currentamount"); addCriterion("current_amount >", value, "currentAmount");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andCurrentamountGreaterThanOrEqualTo(BigDecimal value) { public Criteria andCurrentAmountGreaterThanOrEqualTo(BigDecimal value) {
addCriterion("CurrentAmount >=", value, "currentamount"); addCriterion("current_amount >=", value, "currentAmount");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andCurrentamountLessThan(BigDecimal value) { public Criteria andCurrentAmountLessThan(BigDecimal value) {
addCriterion("CurrentAmount <", value, "currentamount"); addCriterion("current_amount <", value, "currentAmount");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andCurrentamountLessThanOrEqualTo(BigDecimal value) { public Criteria andCurrentAmountLessThanOrEqualTo(BigDecimal value) {
addCriterion("CurrentAmount <=", value, "currentamount"); addCriterion("current_amount <=", value, "currentAmount");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andCurrentamountIn(List<BigDecimal> values) { public Criteria andCurrentAmountIn(List<BigDecimal> values) {
addCriterion("CurrentAmount in", values, "currentamount"); addCriterion("current_amount in", values, "currentAmount");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andCurrentamountNotIn(List<BigDecimal> values) { public Criteria andCurrentAmountNotIn(List<BigDecimal> values) {
addCriterion("CurrentAmount not in", values, "currentamount"); addCriterion("current_amount not in", values, "currentAmount");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andCurrentamountBetween(BigDecimal value1, BigDecimal value2) { public Criteria andCurrentAmountBetween(BigDecimal value1, BigDecimal value2) {
addCriterion("CurrentAmount between", value1, value2, "currentamount"); addCriterion("current_amount between", value1, value2, "currentAmount");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andCurrentamountNotBetween(BigDecimal value1, BigDecimal value2) { public Criteria andCurrentAmountNotBetween(BigDecimal value1, BigDecimal value2) {
addCriterion("CurrentAmount not between", value1, value2, "currentamount"); addCriterion("current_amount not between", value1, value2, "currentAmount");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andRemarkIsNull() { public Criteria andRemarkIsNull() {
addCriterion("Remark is null"); addCriterion("remark is null");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andRemarkIsNotNull() { public Criteria andRemarkIsNotNull() {
addCriterion("Remark is not null"); addCriterion("remark is not null");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andRemarkEqualTo(String value) { public Criteria andRemarkEqualTo(String value) {
addCriterion("Remark =", value, "remark"); addCriterion("remark =", value, "remark");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andRemarkNotEqualTo(String value) { public Criteria andRemarkNotEqualTo(String value) {
addCriterion("Remark <>", value, "remark"); addCriterion("remark <>", value, "remark");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andRemarkGreaterThan(String value) { public Criteria andRemarkGreaterThan(String value) {
addCriterion("Remark >", value, "remark"); addCriterion("remark >", value, "remark");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andRemarkGreaterThanOrEqualTo(String value) { public Criteria andRemarkGreaterThanOrEqualTo(String value) {
addCriterion("Remark >=", value, "remark"); addCriterion("remark >=", value, "remark");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andRemarkLessThan(String value) { public Criteria andRemarkLessThan(String value) {
addCriterion("Remark <", value, "remark"); addCriterion("remark <", value, "remark");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andRemarkLessThanOrEqualTo(String value) { public Criteria andRemarkLessThanOrEqualTo(String value) {
addCriterion("Remark <=", value, "remark"); addCriterion("remark <=", value, "remark");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andRemarkLike(String value) { public Criteria andRemarkLike(String value) {
addCriterion("Remark like", value, "remark"); addCriterion("remark like", value, "remark");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andRemarkNotLike(String value) { public Criteria andRemarkNotLike(String value) {
addCriterion("Remark not like", value, "remark"); addCriterion("remark not like", value, "remark");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andRemarkIn(List<String> values) { public Criteria andRemarkIn(List<String> values) {
addCriterion("Remark in", values, "remark"); addCriterion("remark in", values, "remark");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andRemarkNotIn(List<String> values) { public Criteria andRemarkNotIn(List<String> values) {
addCriterion("Remark not in", values, "remark"); addCriterion("remark not in", values, "remark");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andRemarkBetween(String value1, String value2) { public Criteria andRemarkBetween(String value1, String value2) {
addCriterion("Remark between", value1, value2, "remark"); addCriterion("remark between", value1, value2, "remark");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andRemarkNotBetween(String value1, String value2) { public Criteria andRemarkNotBetween(String value1, String value2) {
addCriterion("Remark not between", value1, value2, "remark"); addCriterion("remark not between", value1, value2, "remark");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andIsdefaultIsNull() { public Criteria andIsDefaultIsNull() {
addCriterion("IsDefault is null"); addCriterion("is_default is null");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andIsdefaultIsNotNull() { public Criteria andIsDefaultIsNotNull() {
addCriterion("IsDefault is not null"); addCriterion("is_default is not null");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andIsdefaultEqualTo(Boolean value) { public Criteria andIsDefaultEqualTo(Boolean value) {
addCriterion("IsDefault =", value, "isdefault"); addCriterion("is_default =", value, "isDefault");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andIsdefaultNotEqualTo(Boolean value) { public Criteria andIsDefaultNotEqualTo(Boolean value) {
addCriterion("IsDefault <>", value, "isdefault"); addCriterion("is_default <>", value, "isDefault");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andIsdefaultGreaterThan(Boolean value) { public Criteria andIsDefaultGreaterThan(Boolean value) {
addCriterion("IsDefault >", value, "isdefault"); addCriterion("is_default >", value, "isDefault");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andIsdefaultGreaterThanOrEqualTo(Boolean value) { public Criteria andIsDefaultGreaterThanOrEqualTo(Boolean value) {
addCriterion("IsDefault >=", value, "isdefault"); addCriterion("is_default >=", value, "isDefault");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andIsdefaultLessThan(Boolean value) { public Criteria andIsDefaultLessThan(Boolean value) {
addCriterion("IsDefault <", value, "isdefault"); addCriterion("is_default <", value, "isDefault");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andIsdefaultLessThanOrEqualTo(Boolean value) { public Criteria andIsDefaultLessThanOrEqualTo(Boolean value) {
addCriterion("IsDefault <=", value, "isdefault"); addCriterion("is_default <=", value, "isDefault");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andIsdefaultIn(List<Boolean> values) { public Criteria andIsDefaultIn(List<Boolean> values) {
addCriterion("IsDefault in", values, "isdefault"); addCriterion("is_default in", values, "isDefault");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andIsdefaultNotIn(List<Boolean> values) { public Criteria andIsDefaultNotIn(List<Boolean> values) {
addCriterion("IsDefault not in", values, "isdefault"); addCriterion("is_default not in", values, "isDefault");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andIsdefaultBetween(Boolean value1, Boolean value2) { public Criteria andIsDefaultBetween(Boolean value1, Boolean value2) {
addCriterion("IsDefault between", value1, value2, "isdefault"); addCriterion("is_default between", value1, value2, "isDefault");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andIsdefaultNotBetween(Boolean value1, Boolean value2) { public Criteria andIsDefaultNotBetween(Boolean value1, Boolean value2) {
addCriterion("IsDefault not between", value1, value2, "isdefault"); addCriterion("is_default not between", value1, value2, "isDefault");
return (Criteria) this; return (Criteria) this;
} }
@@ -706,95 +616,82 @@ public class AccountExample {
} }
public Criteria andDeleteFlagIsNull() { public Criteria andDeleteFlagIsNull() {
addCriterion("delete_Flag is null"); addCriterion("delete_flag is null");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andDeleteFlagIsNotNull() { public Criteria andDeleteFlagIsNotNull() {
addCriterion("delete_Flag is not null"); addCriterion("delete_flag is not null");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andDeleteFlagEqualTo(String value) { public Criteria andDeleteFlagEqualTo(String value) {
addCriterion("delete_Flag =", value, "deleteFlag"); addCriterion("delete_flag =", value, "deleteFlag");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andDeleteFlagNotEqualTo(String value) { public Criteria andDeleteFlagNotEqualTo(String value) {
addCriterion("delete_Flag <>", value, "deleteFlag"); addCriterion("delete_flag <>", value, "deleteFlag");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andDeleteFlagGreaterThan(String value) { public Criteria andDeleteFlagGreaterThan(String value) {
addCriterion("delete_Flag >", value, "deleteFlag"); addCriterion("delete_flag >", value, "deleteFlag");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andDeleteFlagGreaterThanOrEqualTo(String value) { public Criteria andDeleteFlagGreaterThanOrEqualTo(String value) {
addCriterion("delete_Flag >=", value, "deleteFlag"); addCriterion("delete_flag >=", value, "deleteFlag");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andDeleteFlagLessThan(String value) { public Criteria andDeleteFlagLessThan(String value) {
addCriterion("delete_Flag <", value, "deleteFlag"); addCriterion("delete_flag <", value, "deleteFlag");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andDeleteFlagLessThanOrEqualTo(String value) { public Criteria andDeleteFlagLessThanOrEqualTo(String value) {
addCriterion("delete_Flag <=", value, "deleteFlag"); addCriterion("delete_flag <=", value, "deleteFlag");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andDeleteFlagLike(String value) { public Criteria andDeleteFlagLike(String value) {
addCriterion("delete_Flag like", value, "deleteFlag"); addCriterion("delete_flag like", value, "deleteFlag");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andDeleteFlagNotLike(String value) { public Criteria andDeleteFlagNotLike(String value) {
addCriterion("delete_Flag not like", value, "deleteFlag"); addCriterion("delete_flag not like", value, "deleteFlag");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andDeleteFlagIn(List<String> values) { public Criteria andDeleteFlagIn(List<String> values) {
addCriterion("delete_Flag in", values, "deleteFlag"); addCriterion("delete_flag in", values, "deleteFlag");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andDeleteFlagNotIn(List<String> values) { public Criteria andDeleteFlagNotIn(List<String> values) {
addCriterion("delete_Flag not in", values, "deleteFlag"); addCriterion("delete_flag not in", values, "deleteFlag");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andDeleteFlagBetween(String value1, String value2) { public Criteria andDeleteFlagBetween(String value1, String value2) {
addCriterion("delete_Flag between", value1, value2, "deleteFlag"); addCriterion("delete_flag between", value1, value2, "deleteFlag");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andDeleteFlagNotBetween(String value1, String value2) { public Criteria andDeleteFlagNotBetween(String value1, String value2) {
addCriterion("delete_Flag not between", value1, value2, "deleteFlag"); addCriterion("delete_flag not between", value1, value2, "deleteFlag");
return (Criteria) this; return (Criteria) this;
} }
} }
/**
* This class was generated by MyBatis Generator.
* This class corresponds to the database table jsh_account
*
* @mbggenerated do_not_delete_during_merge
*/
public static class Criteria extends GeneratedCriteria { public static class Criteria extends GeneratedCriteria {
protected Criteria() { protected Criteria() {
super(); super();
} }
} }
/**
* This class was generated by MyBatis Generator.
* This class corresponds to the database table jsh_account
*
* @mbggenerated
*/
public static class Criterion { public static class Criterion {
private String condition; private String condition;

10
src/main/java/com/jsh/erp/datasource/entities/DepotItemVo4WithInfoEx.java
View File

@@ -30,7 +30,7 @@ public class DepotItemVo4WithInfoEx extends DepotItem{
private Long UnitId; private Long UnitId;
private String UName; private String unitName;
private BigDecimal presetPriceOne; private BigDecimal presetPriceOne;
@@ -144,12 +144,12 @@ public class DepotItemVo4WithInfoEx extends DepotItem{
UnitId = unitId; UnitId = unitId;
} }
public String getUName() { public String getUnitName() {
return UName; return unitName;
} }
public void setUName(String UName) { public void setUnitName(String unitName) {
this.UName = UName; this.unitName = unitName;
} }
public BigDecimal getPresetPriceOne() { public BigDecimal getPresetPriceOne() {

123
src/main/java/com/jsh/erp/datasource/entities/Function.java Normal file
View File

@@ -0,0 +1,123 @@
package com.jsh.erp.datasource.entities;
public class Function {
private Long id;
private String number;
private String name;
private String parentNumber;
private String url;
private Boolean state;
private String sort;
private Boolean enabled;
private String type;
private String pushBtn;
private String icon;
private String deleteFlag;
public Long getId() {
return id;
}
public void setId(Long id) {
this.id = id;
}
public String getNumber() {
return number;
}
public void setNumber(String number) {
this.number = number == null ? null : number.trim();
}
public String getName() {
return name;
}
public void setName(String name) {
this.name = name == null ? null : name.trim();
}
public String getParentNumber() {
return parentNumber;
}
public void setParentNumber(String parentNumber) {
this.parentNumber = parentNumber == null ? null : parentNumber.trim();
}
public String getUrl() {
return url;
}
public void setUrl(String url) {
this.url = url == null ? null : url.trim();
}
public Boolean getState() {
return state;
}
public void setState(Boolean state) {
this.state = state;
}
public String getSort() {
return sort;
}
public void setSort(String sort) {
this.sort = sort == null ? null : sort.trim();
}
public Boolean getEnabled() {
return enabled;
}
public void setEnabled(Boolean enabled) {
this.enabled = enabled;
}
public String getType() {
return type;
}
public void setType(String type) {
this.type = type == null ? null : type.trim();
}
public String getPushBtn() {
return pushBtn;
}
public void setPushBtn(String pushBtn) {
this.pushBtn = pushBtn == null ? null : pushBtn.trim();
}
public String getIcon() {
return icon;
}
public void setIcon(String icon) {
this.icon = icon == null ? null : icon.trim();
}
public String getDeleteFlag() {
return deleteFlag;
}
public void setDeleteFlag(String deleteFlag) {
this.deleteFlag = deleteFlag == null ? null : deleteFlag.trim();
}
}

463
src/main/java/com/jsh/erp/datasource/entities/FunctionsExample.java → src/main/java/com/jsh/erp/datasource/entities/FunctionExample.java
View File

File diff suppressed because it is too large Load Diff

387
src/main/java/com/jsh/erp/datasource/entities/Functions.java
View File

@@ -1,387 +0,0 @@
package com.jsh.erp.datasource.entities;
public class Functions {
/**
* This field was generated by MyBatis Generator.
* This field corresponds to the database column jsh_functions.Id
*
* @mbggenerated
*/
private Long id;
/**
* This field was generated by MyBatis Generator.
* This field corresponds to the database column jsh_functions.Number
*
* @mbggenerated
*/
private String number;
/**
* This field was generated by MyBatis Generator.
* This field corresponds to the database column jsh_functions.Name
*
* @mbggenerated
*/
private String name;
/**
* This field was generated by MyBatis Generator.
* This field corresponds to the database column jsh_functions.PNumber
*
* @mbggenerated
*/
private String pnumber;
/**
* This field was generated by MyBatis Generator.
* This field corresponds to the database column jsh_functions.URL
*
* @mbggenerated
*/
private String url;
/**
* This field was generated by MyBatis Generator.
* This field corresponds to the database column jsh_functions.State
*
* @mbggenerated
*/
private Boolean state;
/**
* This field was generated by MyBatis Generator.
* This field corresponds to the database column jsh_functions.Sort
*
* @mbggenerated
*/
private String sort;
/**
* This field was generated by MyBatis Generator.
* This field corresponds to the database column jsh_functions.Enabled
*
* @mbggenerated
*/
private Boolean enabled;
/**
* This field was generated by MyBatis Generator.
* This field corresponds to the database column jsh_functions.Type
*
* @mbggenerated
*/
private String type;
/**
* This field was generated by MyBatis Generator.
* This field corresponds to the database column jsh_functions.PushBtn
*
* @mbggenerated
*/
private String pushbtn;
/**
* This field was generated by MyBatis Generator.
* This field corresponds to the database column jsh_functions.icon
*
* @mbggenerated
*/
private String icon;
/**
* 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
*
* @return the value of jsh_functions.Id
*
* @mbggenerated
*/
public Long getId() {
return id;
}
/**
* This method was generated by MyBatis Generator.
* This method sets the value of the database column jsh_functions.Id
*
* @param id the value for jsh_functions.Id
*
* @mbggenerated
*/
public void setId(Long id) {
this.id = id;
}
/**
* This method was generated by MyBatis Generator.
* This method returns the value of the database column jsh_functions.Number
*
* @return the value of jsh_functions.Number
*
* @mbggenerated
*/
public String getNumber() {
return number;
}
/**
* This method was generated by MyBatis Generator.
* This method sets the value of the database column jsh_functions.Number
*
* @param number the value for jsh_functions.Number
*
* @mbggenerated
*/
public void setNumber(String number) {
this.number = number == null ? null : number.trim();
}
/**
* This method was generated by MyBatis Generator.
* This method returns the value of the database column jsh_functions.Name
*
* @return the value of jsh_functions.Name
*
* @mbggenerated
*/
public String getName() {
return name;
}
/**
* This method was generated by MyBatis Generator.
* This method sets the value of the database column jsh_functions.Name
*
* @param name the value for jsh_functions.Name
*
* @mbggenerated
*/
public void setName(String name) {
this.name = name == null ? null : name.trim();
}
/**
* This method was generated by MyBatis Generator.
* This method returns the value of the database column jsh_functions.PNumber
*
* @return the value of jsh_functions.PNumber
*
* @mbggenerated
*/
public String getPnumber() {
return pnumber;
}
/**
* This method was generated by MyBatis Generator.
* This method sets the value of the database column jsh_functions.PNumber
*
* @param pnumber the value for jsh_functions.PNumber
*
* @mbggenerated
*/
public void setPnumber(String pnumber) {
this.pnumber = pnumber == null ? null : pnumber.trim();
}
/**
* This method was generated by MyBatis Generator.
* This method returns the value of the database column jsh_functions.URL
*
* @return the value of jsh_functions.URL
*
* @mbggenerated
*/
public String getUrl() {
return url;
}
/**
* This method was generated by MyBatis Generator.
* This method sets the value of the database column jsh_functions.URL
*
* @param url the value for jsh_functions.URL
*
* @mbggenerated
*/
public void setUrl(String url) {
this.url = url == null ? null : url.trim();
}
/**
* This method was generated by MyBatis Generator.
* This method returns the value of the database column jsh_functions.State
*
* @return the value of jsh_functions.State
*
* @mbggenerated
*/
public Boolean getState() {
return state;
}
/**
* This method was generated by MyBatis Generator.
* This method sets the value of the database column jsh_functions.State
*
* @param state the value for jsh_functions.State
*
* @mbggenerated
*/
public void setState(Boolean state) {
this.state = state;
}
/**
* This method was generated by MyBatis Generator.
* This method returns the value of the database column jsh_functions.Sort
*
* @return the value of jsh_functions.Sort
*
* @mbggenerated
*/
public String getSort() {
return sort;
}
/**
* This method was generated by MyBatis Generator.
* This method sets the value of the database column jsh_functions.Sort
*
* @param sort the value for jsh_functions.Sort
*
* @mbggenerated
*/
public void setSort(String sort) {
this.sort = sort == null ? null : sort.trim();
}
/**
* This method was generated by MyBatis Generator.
* This method returns the value of the database column jsh_functions.Enabled
*
* @return the value of jsh_functions.Enabled
*
* @mbggenerated
*/
public Boolean getEnabled() {
return enabled;
}
/**
* This method was generated by MyBatis Generator.
* This method sets the value of the database column jsh_functions.Enabled
*
* @param enabled the value for jsh_functions.Enabled
*
* @mbggenerated
*/
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_functions.Type
*
* @return the value of jsh_functions.Type
*
* @mbggenerated
*/
public String getType() {
return type;
}
/**
* This method was generated by MyBatis Generator.
* This method sets the value of the database column jsh_functions.Type
*
* @param type the value for jsh_functions.Type
*
* @mbggenerated
*/
public void setType(String type) {
this.type = type == null ? null : type.trim();
}
/**
* This method was generated by MyBatis Generator.
* This method returns the value of the database column jsh_functions.PushBtn
*
* @return the value of jsh_functions.PushBtn
*
* @mbggenerated
*/
public String getPushbtn() {
return pushbtn;
}
/**
* This method was generated by MyBatis Generator.
* This method sets the value of the database column jsh_functions.PushBtn
*
* @param pushbtn the value for jsh_functions.PushBtn
*
* @mbggenerated
*/
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.icon
*
* @return the value of jsh_functions.icon
*
* @mbggenerated
*/
public String getIcon() {
return icon;
}
/**
* This method was generated by MyBatis Generator.
* This method sets the value of the database column jsh_functions.icon
*
* @param icon the value for jsh_functions.icon
*
* @mbggenerated
*/
public void setIcon(String icon) {
this.icon = icon == null ? null : icon.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();
}
}

132
src/main/java/com/jsh/erp/datasource/entities/InOutItem.java
View File

@@ -1,194 +1,62 @@
package com.jsh.erp.datasource.entities; package com.jsh.erp.datasource.entities;
public class InOutItem { public class InOutItem {
/**
* This field was generated by MyBatis Generator.
* This field corresponds to the database column jsh_inoutitem.Id
*
* @mbggenerated
*/
private Long id; private Long id;
/**
* This field was generated by MyBatis Generator.
* This field corresponds to the database column jsh_inoutitem.Name
*
* @mbggenerated
*/
private String name; private String name;
/**
* This field was generated by MyBatis Generator.
* This field corresponds to the database column jsh_inoutitem.Type
*
* @mbggenerated
*/
private String type; private String type;
/**
* This field was generated by MyBatis Generator.
* This field corresponds to the database column jsh_inoutitem.Remark
*
* @mbggenerated
*/
private String remark; private String remark;
/**
* This field was generated by MyBatis Generator.
* This field corresponds to the database column jsh_inoutitem.tenant_id
*
* @mbggenerated
*/
private Long tenantId; 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; private String deleteFlag;
/**
* This method was generated by MyBatis Generator.
* This method returns the value of the database column jsh_inoutitem.Id
*
* @return the value of jsh_inoutitem.Id
*
* @mbggenerated
*/
public Long getId() { public Long getId() {
return id; return id;
} }
/**
* This method was generated by MyBatis Generator.
* This method sets the value of the database column jsh_inoutitem.Id
*
* @param id the value for jsh_inoutitem.Id
*
* @mbggenerated
*/
public void setId(Long id) { public void setId(Long id) {
this.id = id; this.id = id;
} }
/**
* This method was generated by MyBatis Generator.
* This method returns the value of the database column jsh_inoutitem.Name
*
* @return the value of jsh_inoutitem.Name
*
* @mbggenerated
*/
public String getName() { public String getName() {
return name; return name;
} }
/**
* This method was generated by MyBatis Generator.
* This method sets the value of the database column jsh_inoutitem.Name
*
* @param name the value for jsh_inoutitem.Name
*
* @mbggenerated
*/
public void setName(String name) { public void setName(String name) {
this.name = name == null ? null : name.trim(); this.name = name == null ? null : name.trim();
} }
/**
* This method was generated by MyBatis Generator.
* This method returns the value of the database column jsh_inoutitem.Type
*
* @return the value of jsh_inoutitem.Type
*
* @mbggenerated
*/
public String getType() { public String getType() {
return type; return type;
} }
/**
* This method was generated by MyBatis Generator.
* This method sets the value of the database column jsh_inoutitem.Type
*
* @param type the value for jsh_inoutitem.Type
*
* @mbggenerated
*/
public void setType(String type) { public void setType(String type) {
this.type = type == null ? null : type.trim(); this.type = type == null ? null : type.trim();
} }
/**
* This method was generated by MyBatis Generator.
* This method returns the value of the database column jsh_inoutitem.Remark
*
* @return the value of jsh_inoutitem.Remark
*
* @mbggenerated
*/
public String getRemark() { public String getRemark() {
return remark; return remark;
} }
/**
* This method was generated by MyBatis Generator.
* This method sets the value of the database column jsh_inoutitem.Remark
*
* @param remark the value for jsh_inoutitem.Remark
*
* @mbggenerated
*/
public void setRemark(String remark) { public void setRemark(String remark) {
this.remark = remark == null ? null : remark.trim(); this.remark = remark == null ? null : remark.trim();
} }
/**
* This method was generated by MyBatis Generator.
* This method returns the value of the database column jsh_inoutitem.tenant_id
*
* @return the value of jsh_inoutitem.tenant_id
*
* @mbggenerated
*/
public Long getTenantId() { public Long getTenantId() {
return tenantId; return tenantId;
} }
/**
* This method was generated by MyBatis Generator.
* This method sets the value of the database column jsh_inoutitem.tenant_id
*
* @param tenantId the value for jsh_inoutitem.tenant_id
*
* @mbggenerated
*/
public void setTenantId(Long tenantId) { public void setTenantId(Long tenantId) {
this.tenantId = tenantId; this.tenantId = tenantId;
} }
/**
* This method was generated by MyBatis Generator.
* This method returns the value of the database column jsh_inoutitem.delete_Flag
*
* @return the value of jsh_inoutitem.delete_Flag
*
* @mbggenerated
*/
public String getDeleteFlag() { public String getDeleteFlag() {
return deleteFlag; return deleteFlag;
} }
/**
* This method was generated by MyBatis Generator.
* This method sets the value of the database column jsh_inoutitem.delete_Flag
*
* @param deleteFlag the value for jsh_inoutitem.delete_Flag
*
* @mbggenerated
*/
public void setDeleteFlag(String deleteFlag) { public void setDeleteFlag(String deleteFlag) {
this.deleteFlag = deleteFlag == null ? null : deleteFlag.trim(); this.deleteFlag = deleteFlag == null ? null : deleteFlag.trim();
} }

243
src/main/java/com/jsh/erp/datasource/entities/InOutItemExample.java
View File

@@ -4,118 +4,46 @@ import java.util.ArrayList;
import java.util.List; import java.util.List;
public class InOutItemExample { public class InOutItemExample {
/**
* This field was generated by MyBatis Generator.
* This field corresponds to the database table jsh_inoutitem
*
* @mbggenerated
*/
protected String orderByClause; protected String orderByClause;
/**
* This field was generated by MyBatis Generator.
* This field corresponds to the database table jsh_inoutitem
*
* @mbggenerated
*/
protected boolean distinct; protected boolean distinct;
/**
* This field was generated by MyBatis Generator.
* This field corresponds to the database table jsh_inoutitem
*
* @mbggenerated
*/
protected List<Criteria> oredCriteria; protected List<Criteria> oredCriteria;
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table jsh_inoutitem
*
* @mbggenerated
*/
public InOutItemExample() { public InOutItemExample() {
oredCriteria = new ArrayList<Criteria>(); oredCriteria = new ArrayList<>();
} }
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table jsh_inoutitem
*
* @mbggenerated
*/
public void setOrderByClause(String orderByClause) { public void setOrderByClause(String orderByClause) {
this.orderByClause = orderByClause; this.orderByClause = orderByClause;
} }
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table jsh_inoutitem
*
* @mbggenerated
*/
public String getOrderByClause() { public String getOrderByClause() {
return orderByClause; return orderByClause;
} }
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table jsh_inoutitem
*
* @mbggenerated
*/
public void setDistinct(boolean distinct) { public void setDistinct(boolean distinct) {
this.distinct = distinct; this.distinct = distinct;
} }
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table jsh_inoutitem
*
* @mbggenerated
*/
public boolean isDistinct() { public boolean isDistinct() {
return distinct; return distinct;
} }
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table jsh_inoutitem
*
* @mbggenerated
*/
public List<Criteria> getOredCriteria() { public List<Criteria> getOredCriteria() {
return oredCriteria; return oredCriteria;
} }
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table jsh_inoutitem
*
* @mbggenerated
*/
public void or(Criteria criteria) { public void or(Criteria criteria) {
oredCriteria.add(criteria); oredCriteria.add(criteria);
} }
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table jsh_inoutitem
*
* @mbggenerated
*/
public Criteria or() { public Criteria or() {
Criteria criteria = createCriteriaInternal(); Criteria criteria = createCriteriaInternal();
oredCriteria.add(criteria); oredCriteria.add(criteria);
return criteria; return criteria;
} }
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table jsh_inoutitem
*
* @mbggenerated
*/
public Criteria createCriteria() { public Criteria createCriteria() {
Criteria criteria = createCriteriaInternal(); Criteria criteria = createCriteriaInternal();
if (oredCriteria.size() == 0) { if (oredCriteria.size() == 0) {
@@ -124,41 +52,23 @@ public class InOutItemExample {
return criteria; return criteria;
} }
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table jsh_inoutitem
*
* @mbggenerated
*/
protected Criteria createCriteriaInternal() { protected Criteria createCriteriaInternal() {
Criteria criteria = new Criteria(); Criteria criteria = new Criteria();
return criteria; return criteria;
} }
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table jsh_inoutitem
*
* @mbggenerated
*/
public void clear() { public void clear() {
oredCriteria.clear(); oredCriteria.clear();
orderByClause = null; orderByClause = null;
distinct = false; distinct = false;
} }
/**
* This class was generated by MyBatis Generator.
* This class corresponds to the database table jsh_inoutitem
*
* @mbggenerated
*/
protected abstract static class GeneratedCriteria { protected abstract static class GeneratedCriteria {
protected List<Criterion> criteria; protected List<Criterion> criteria;
protected GeneratedCriteria() { protected GeneratedCriteria() {
super(); super();
criteria = new ArrayList<Criterion>(); criteria = new ArrayList<>();
} }
public boolean isValid() { public boolean isValid() {
@@ -195,272 +105,272 @@ public class InOutItemExample {
} }
public Criteria andIdIsNull() { public Criteria andIdIsNull() {
addCriterion("Id is null"); addCriterion("id is null");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andIdIsNotNull() { public Criteria andIdIsNotNull() {
addCriterion("Id is not null"); addCriterion("id is not null");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andIdEqualTo(Long value) { public Criteria andIdEqualTo(Long value) {
addCriterion("Id =", value, "id"); addCriterion("id =", value, "id");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andIdNotEqualTo(Long value) { public Criteria andIdNotEqualTo(Long value) {
addCriterion("Id <>", value, "id"); addCriterion("id <>", value, "id");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andIdGreaterThan(Long value) { public Criteria andIdGreaterThan(Long value) {
addCriterion("Id >", value, "id"); addCriterion("id >", value, "id");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andIdGreaterThanOrEqualTo(Long value) { public Criteria andIdGreaterThanOrEqualTo(Long value) {
addCriterion("Id >=", value, "id"); addCriterion("id >=", value, "id");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andIdLessThan(Long value) { public Criteria andIdLessThan(Long value) {
addCriterion("Id <", value, "id"); addCriterion("id <", value, "id");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andIdLessThanOrEqualTo(Long value) { public Criteria andIdLessThanOrEqualTo(Long value) {
addCriterion("Id <=", value, "id"); addCriterion("id <=", value, "id");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andIdIn(List<Long> values) { public Criteria andIdIn(List<Long> values) {
addCriterion("Id in", values, "id"); addCriterion("id in", values, "id");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andIdNotIn(List<Long> values) { public Criteria andIdNotIn(List<Long> values) {
addCriterion("Id not in", values, "id"); addCriterion("id not in", values, "id");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andIdBetween(Long value1, Long value2) { public Criteria andIdBetween(Long value1, Long value2) {
addCriterion("Id between", value1, value2, "id"); addCriterion("id between", value1, value2, "id");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andIdNotBetween(Long value1, Long value2) { public Criteria andIdNotBetween(Long value1, Long value2) {
addCriterion("Id not between", value1, value2, "id"); addCriterion("id not between", value1, value2, "id");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andNameIsNull() { public Criteria andNameIsNull() {
addCriterion("Name is null"); addCriterion("name is null");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andNameIsNotNull() { public Criteria andNameIsNotNull() {
addCriterion("Name is not null"); addCriterion("name is not null");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andNameEqualTo(String value) { public Criteria andNameEqualTo(String value) {
addCriterion("Name =", value, "name"); addCriterion("name =", value, "name");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andNameNotEqualTo(String value) { public Criteria andNameNotEqualTo(String value) {
addCriterion("Name <>", value, "name"); addCriterion("name <>", value, "name");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andNameGreaterThan(String value) { public Criteria andNameGreaterThan(String value) {
addCriterion("Name >", value, "name"); addCriterion("name >", value, "name");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andNameGreaterThanOrEqualTo(String value) { public Criteria andNameGreaterThanOrEqualTo(String value) {
addCriterion("Name >=", value, "name"); addCriterion("name >=", value, "name");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andNameLessThan(String value) { public Criteria andNameLessThan(String value) {
addCriterion("Name <", value, "name"); addCriterion("name <", value, "name");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andNameLessThanOrEqualTo(String value) { public Criteria andNameLessThanOrEqualTo(String value) {
addCriterion("Name <=", value, "name"); addCriterion("name <=", value, "name");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andNameLike(String value) { public Criteria andNameLike(String value) {
addCriterion("Name like", value, "name"); addCriterion("name like", value, "name");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andNameNotLike(String value) { public Criteria andNameNotLike(String value) {
addCriterion("Name not like", value, "name"); addCriterion("name not like", value, "name");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andNameIn(List<String> values) { public Criteria andNameIn(List<String> values) {
addCriterion("Name in", values, "name"); addCriterion("name in", values, "name");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andNameNotIn(List<String> values) { public Criteria andNameNotIn(List<String> values) {
addCriterion("Name not in", values, "name"); addCriterion("name not in", values, "name");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andNameBetween(String value1, String value2) { public Criteria andNameBetween(String value1, String value2) {
addCriterion("Name between", value1, value2, "name"); addCriterion("name between", value1, value2, "name");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andNameNotBetween(String value1, String value2) { public Criteria andNameNotBetween(String value1, String value2) {
addCriterion("Name not between", value1, value2, "name"); addCriterion("name not between", value1, value2, "name");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andTypeIsNull() { public Criteria andTypeIsNull() {
addCriterion("Type is null"); addCriterion("type is null");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andTypeIsNotNull() { public Criteria andTypeIsNotNull() {
addCriterion("Type is not null"); addCriterion("type is not null");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andTypeEqualTo(String value) { public Criteria andTypeEqualTo(String value) {
addCriterion("Type =", value, "type"); addCriterion("type =", value, "type");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andTypeNotEqualTo(String value) { public Criteria andTypeNotEqualTo(String value) {
addCriterion("Type <>", value, "type"); addCriterion("type <>", value, "type");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andTypeGreaterThan(String value) { public Criteria andTypeGreaterThan(String value) {
addCriterion("Type >", value, "type"); addCriterion("type >", value, "type");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andTypeGreaterThanOrEqualTo(String value) { public Criteria andTypeGreaterThanOrEqualTo(String value) {
addCriterion("Type >=", value, "type"); addCriterion("type >=", value, "type");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andTypeLessThan(String value) { public Criteria andTypeLessThan(String value) {
addCriterion("Type <", value, "type"); addCriterion("type <", value, "type");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andTypeLessThanOrEqualTo(String value) { public Criteria andTypeLessThanOrEqualTo(String value) {
addCriterion("Type <=", value, "type"); addCriterion("type <=", value, "type");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andTypeLike(String value) { public Criteria andTypeLike(String value) {
addCriterion("Type like", value, "type"); addCriterion("type like", value, "type");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andTypeNotLike(String value) { public Criteria andTypeNotLike(String value) {
addCriterion("Type not like", value, "type"); addCriterion("type not like", value, "type");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andTypeIn(List<String> values) { public Criteria andTypeIn(List<String> values) {
addCriterion("Type in", values, "type"); addCriterion("type in", values, "type");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andTypeNotIn(List<String> values) { public Criteria andTypeNotIn(List<String> values) {
addCriterion("Type not in", values, "type"); addCriterion("type not in", values, "type");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andTypeBetween(String value1, String value2) { public Criteria andTypeBetween(String value1, String value2) {
addCriterion("Type between", value1, value2, "type"); addCriterion("type between", value1, value2, "type");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andTypeNotBetween(String value1, String value2) { public Criteria andTypeNotBetween(String value1, String value2) {
addCriterion("Type not between", value1, value2, "type"); addCriterion("type not between", value1, value2, "type");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andRemarkIsNull() { public Criteria andRemarkIsNull() {
addCriterion("Remark is null"); addCriterion("remark is null");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andRemarkIsNotNull() { public Criteria andRemarkIsNotNull() {
addCriterion("Remark is not null"); addCriterion("remark is not null");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andRemarkEqualTo(String value) { public Criteria andRemarkEqualTo(String value) {
addCriterion("Remark =", value, "remark"); addCriterion("remark =", value, "remark");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andRemarkNotEqualTo(String value) { public Criteria andRemarkNotEqualTo(String value) {
addCriterion("Remark <>", value, "remark"); addCriterion("remark <>", value, "remark");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andRemarkGreaterThan(String value) { public Criteria andRemarkGreaterThan(String value) {
addCriterion("Remark >", value, "remark"); addCriterion("remark >", value, "remark");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andRemarkGreaterThanOrEqualTo(String value) { public Criteria andRemarkGreaterThanOrEqualTo(String value) {
addCriterion("Remark >=", value, "remark"); addCriterion("remark >=", value, "remark");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andRemarkLessThan(String value) { public Criteria andRemarkLessThan(String value) {
addCriterion("Remark <", value, "remark"); addCriterion("remark <", value, "remark");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andRemarkLessThanOrEqualTo(String value) { public Criteria andRemarkLessThanOrEqualTo(String value) {
addCriterion("Remark <=", value, "remark"); addCriterion("remark <=", value, "remark");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andRemarkLike(String value) { public Criteria andRemarkLike(String value) {
addCriterion("Remark like", value, "remark"); addCriterion("remark like", value, "remark");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andRemarkNotLike(String value) { public Criteria andRemarkNotLike(String value) {
addCriterion("Remark not like", value, "remark"); addCriterion("remark not like", value, "remark");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andRemarkIn(List<String> values) { public Criteria andRemarkIn(List<String> values) {
addCriterion("Remark in", values, "remark"); addCriterion("remark in", values, "remark");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andRemarkNotIn(List<String> values) { public Criteria andRemarkNotIn(List<String> values) {
addCriterion("Remark not in", values, "remark"); addCriterion("remark not in", values, "remark");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andRemarkBetween(String value1, String value2) { public Criteria andRemarkBetween(String value1, String value2) {
addCriterion("Remark between", value1, value2, "remark"); addCriterion("remark between", value1, value2, "remark");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andRemarkNotBetween(String value1, String value2) { public Criteria andRemarkNotBetween(String value1, String value2) {
addCriterion("Remark not between", value1, value2, "remark"); addCriterion("remark not between", value1, value2, "remark");
return (Criteria) this; return (Criteria) this;
} }
@@ -525,95 +435,82 @@ public class InOutItemExample {
} }
public Criteria andDeleteFlagIsNull() { public Criteria andDeleteFlagIsNull() {
addCriterion("delete_Flag is null"); addCriterion("delete_flag is null");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andDeleteFlagIsNotNull() { public Criteria andDeleteFlagIsNotNull() {
addCriterion("delete_Flag is not null"); addCriterion("delete_flag is not null");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andDeleteFlagEqualTo(String value) { public Criteria andDeleteFlagEqualTo(String value) {
addCriterion("delete_Flag =", value, "deleteFlag"); addCriterion("delete_flag =", value, "deleteFlag");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andDeleteFlagNotEqualTo(String value) { public Criteria andDeleteFlagNotEqualTo(String value) {
addCriterion("delete_Flag <>", value, "deleteFlag"); addCriterion("delete_flag <>", value, "deleteFlag");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andDeleteFlagGreaterThan(String value) { public Criteria andDeleteFlagGreaterThan(String value) {
addCriterion("delete_Flag >", value, "deleteFlag"); addCriterion("delete_flag >", value, "deleteFlag");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andDeleteFlagGreaterThanOrEqualTo(String value) { public Criteria andDeleteFlagGreaterThanOrEqualTo(String value) {
addCriterion("delete_Flag >=", value, "deleteFlag"); addCriterion("delete_flag >=", value, "deleteFlag");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andDeleteFlagLessThan(String value) { public Criteria andDeleteFlagLessThan(String value) {
addCriterion("delete_Flag <", value, "deleteFlag"); addCriterion("delete_flag <", value, "deleteFlag");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andDeleteFlagLessThanOrEqualTo(String value) { public Criteria andDeleteFlagLessThanOrEqualTo(String value) {
addCriterion("delete_Flag <=", value, "deleteFlag"); addCriterion("delete_flag <=", value, "deleteFlag");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andDeleteFlagLike(String value) { public Criteria andDeleteFlagLike(String value) {
addCriterion("delete_Flag like", value, "deleteFlag"); addCriterion("delete_flag like", value, "deleteFlag");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andDeleteFlagNotLike(String value) { public Criteria andDeleteFlagNotLike(String value) {
addCriterion("delete_Flag not like", value, "deleteFlag"); addCriterion("delete_flag not like", value, "deleteFlag");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andDeleteFlagIn(List<String> values) { public Criteria andDeleteFlagIn(List<String> values) {
addCriterion("delete_Flag in", values, "deleteFlag"); addCriterion("delete_flag in", values, "deleteFlag");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andDeleteFlagNotIn(List<String> values) { public Criteria andDeleteFlagNotIn(List<String> values) {
addCriterion("delete_Flag not in", values, "deleteFlag"); addCriterion("delete_flag not in", values, "deleteFlag");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andDeleteFlagBetween(String value1, String value2) { public Criteria andDeleteFlagBetween(String value1, String value2) {
addCriterion("delete_Flag between", value1, value2, "deleteFlag"); addCriterion("delete_flag between", value1, value2, "deleteFlag");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andDeleteFlagNotBetween(String value1, String value2) { public Criteria andDeleteFlagNotBetween(String value1, String value2) {
addCriterion("delete_Flag not between", value1, value2, "deleteFlag"); addCriterion("delete_flag not between", value1, value2, "deleteFlag");
return (Criteria) this; return (Criteria) this;
} }
} }
/**
* This class was generated by MyBatis Generator.
* This class corresponds to the database table jsh_inoutitem
*
* @mbggenerated do_not_delete_during_merge
*/
public static class Criteria extends GeneratedCriteria { public static class Criteria extends GeneratedCriteria {
protected Criteria() { protected Criteria() {
super(); super();
} }
} }
/**
* This class was generated by MyBatis Generator.
* This class corresponds to the database table jsh_inoutitem
*
* @mbggenerated
*/
public static class Criterion { public static class Criterion {
private String condition; private String condition;

248
src/main/java/com/jsh/erp/datasource/entities/Log.java
View File

@@ -3,290 +3,82 @@ package com.jsh.erp.datasource.entities;
import java.util.Date; import java.util.Date;
public class Log { public class Log {
/**
* This field was generated by MyBatis Generator.
* This field corresponds to the database column jsh_log.id
*
* @mbggenerated
*/
private Long id; private Long id;
/** private Long userId;
* This field was generated by MyBatis Generator.
* This field corresponds to the database column jsh_log.userID
*
* @mbggenerated
*/
private Long userid;
/**
* This field was generated by MyBatis Generator.
* This field corresponds to the database column jsh_log.operation
*
* @mbggenerated
*/
private String operation; private String operation;
/** private String clientIp;
* This field was generated by MyBatis Generator.
* This field corresponds to the database column jsh_log.clientIP
*
* @mbggenerated
*/
private String clientip;
/** private Date createTime;
* This field was generated by MyBatis Generator.
* This field corresponds to the database column jsh_log.createtime
*
* @mbggenerated
*/
private Date createtime;
/**
* This field was generated by MyBatis Generator.
* This field corresponds to the database column jsh_log.status
*
* @mbggenerated
*/
private Byte status; private Byte status;
/** private String content;
* This field was generated by MyBatis Generator.
* This field corresponds to the database column jsh_log.contentdetails
*
* @mbggenerated
*/
private String contentdetails;
/**
* This field was generated by MyBatis Generator.
* This field corresponds to the database column jsh_log.remark
*
* @mbggenerated
*/
private String remark;
/**
* This field was generated by MyBatis Generator.
* This field corresponds to the database column jsh_log.tenant_id
*
* @mbggenerated
*/
private Long tenantId; private Long tenantId;
/**
* This method was generated by MyBatis Generator.
* This method returns the value of the database column jsh_log.id
*
* @return the value of jsh_log.id
*
* @mbggenerated
*/
public Long getId() { public Long getId() {
return id; return id;
} }
/**
* This method was generated by MyBatis Generator.
* This method sets the value of the database column jsh_log.id
*
* @param id the value for jsh_log.id
*
* @mbggenerated
*/
public void setId(Long id) { public void setId(Long id) {
this.id = id; this.id = id;
} }
/** public Long getUserId() {
* This method was generated by MyBatis Generator. return userId;
* This method returns the value of the database column jsh_log.userID
*
* @return the value of jsh_log.userID
*
* @mbggenerated
*/
public Long getUserid() {
return userid;
} }
/** public void setUserId(Long userId) {
* This method was generated by MyBatis Generator. this.userId = userId;
* This method sets the value of the database column jsh_log.userID
*
* @param userid the value for jsh_log.userID
*
* @mbggenerated
*/
public void setUserid(Long userid) {
this.userid = userid;
} }
/**
* This method was generated by MyBatis Generator.
* This method returns the value of the database column jsh_log.operation
*
* @return the value of jsh_log.operation
*
* @mbggenerated
*/
public String getOperation() { public String getOperation() {
return operation; return operation;
} }
/**
* This method was generated by MyBatis Generator.
* This method sets the value of the database column jsh_log.operation
*
* @param operation the value for jsh_log.operation
*
* @mbggenerated
*/
public void setOperation(String operation) { public void setOperation(String operation) {
this.operation = operation == null ? null : operation.trim(); this.operation = operation == null ? null : operation.trim();
} }
/** public String getClientIp() {
* This method was generated by MyBatis Generator. return clientIp;
* This method returns the value of the database column jsh_log.clientIP
*
* @return the value of jsh_log.clientIP
*
* @mbggenerated
*/
public String getClientip() {
return clientip;
} }
/** public void setClientIp(String clientIp) {
* This method was generated by MyBatis Generator. this.clientIp = clientIp == null ? null : clientIp.trim();
* This method sets the value of the database column jsh_log.clientIP
*
* @param clientip the value for jsh_log.clientIP
*
* @mbggenerated
*/
public void setClientip(String clientip) {
this.clientip = clientip == null ? null : clientip.trim();
} }
/** public Date getCreateTime() {
* This method was generated by MyBatis Generator. return createTime;
* This method returns the value of the database column jsh_log.createtime
*
* @return the value of jsh_log.createtime
*
* @mbggenerated
*/
public Date getCreatetime() {
return createtime;
} }
/** public void setCreateTime(Date createTime) {
* This method was generated by MyBatis Generator. this.createTime = createTime;
* This method sets the value of the database column jsh_log.createtime
*
* @param createtime the value for jsh_log.createtime
*
* @mbggenerated
*/
public void setCreatetime(Date createtime) {
this.createtime = createtime;
} }
/**
* This method was generated by MyBatis Generator.
* This method returns the value of the database column jsh_log.status
*
* @return the value of jsh_log.status
*
* @mbggenerated
*/
public Byte getStatus() { public Byte getStatus() {
return status; return status;
} }
/**
* This method was generated by MyBatis Generator.
* This method sets the value of the database column jsh_log.status
*
* @param status the value for jsh_log.status
*
* @mbggenerated
*/
public void setStatus(Byte status) { public void setStatus(Byte status) {
this.status = status; this.status = status;
} }
/** public String getContent() {
* This method was generated by MyBatis Generator. return content;
* This method returns the value of the database column jsh_log.contentdetails
*
* @return the value of jsh_log.contentdetails
*
* @mbggenerated
*/
public String getContentdetails() {
return contentdetails;
} }
/** public void setContent(String content) {
* This method was generated by MyBatis Generator. this.content = content == null ? null : content.trim();
* This method sets the value of the database column jsh_log.contentdetails
*
* @param contentdetails the value for jsh_log.contentdetails
*
* @mbggenerated
*/
public void setContentdetails(String contentdetails) {
this.contentdetails = contentdetails == null ? null : contentdetails.trim();
} }
/**
* This method was generated by MyBatis Generator.
* This method returns the value of the database column jsh_log.remark
*
* @return the value of jsh_log.remark
*
* @mbggenerated
*/
public String getRemark() {
return remark;
}
/**
* This method was generated by MyBatis Generator.
* This method sets the value of the database column jsh_log.remark
*
* @param remark the value for jsh_log.remark
*
* @mbggenerated
*/
public void setRemark(String remark) {
this.remark = remark == null ? null : remark.trim();
}
/**
* This method was generated by MyBatis Generator.
* This method returns the value of the database column jsh_log.tenant_id
*
* @return the value of jsh_log.tenant_id
*
* @mbggenerated
*/
public Long getTenantId() { public Long getTenantId() {
return tenantId; return tenantId;
} }
/**
* This method was generated by MyBatis Generator.
* This method sets the value of the database column jsh_log.tenant_id
*
* @param tenantId the value for jsh_log.tenant_id
*
* @mbggenerated
*/
public void setTenantId(Long tenantId) { public void setTenantId(Long tenantId) {
this.tenantId = tenantId; this.tenantId = tenantId;
} }

385
src/main/java/com/jsh/erp/datasource/entities/LogExample.java
View File

@@ -5,118 +5,46 @@ import java.util.Date;
import java.util.List; import java.util.List;
public class LogExample { public class LogExample {
/**
* This field was generated by MyBatis Generator.
* This field corresponds to the database table jsh_log
*
* @mbggenerated
*/
protected String orderByClause; protected String orderByClause;
/**
* This field was generated by MyBatis Generator.
* This field corresponds to the database table jsh_log
*
* @mbggenerated
*/
protected boolean distinct; protected boolean distinct;
/**
* This field was generated by MyBatis Generator.
* This field corresponds to the database table jsh_log
*
* @mbggenerated
*/
protected List<Criteria> oredCriteria; protected List<Criteria> oredCriteria;
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table jsh_log
*
* @mbggenerated
*/
public LogExample() { public LogExample() {
oredCriteria = new ArrayList<Criteria>(); oredCriteria = new ArrayList<>();
} }
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table jsh_log
*
* @mbggenerated
*/
public void setOrderByClause(String orderByClause) { public void setOrderByClause(String orderByClause) {
this.orderByClause = orderByClause; this.orderByClause = orderByClause;
} }
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table jsh_log
*
* @mbggenerated
*/
public String getOrderByClause() { public String getOrderByClause() {
return orderByClause; return orderByClause;
} }
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table jsh_log
*
* @mbggenerated
*/
public void setDistinct(boolean distinct) { public void setDistinct(boolean distinct) {
this.distinct = distinct; this.distinct = distinct;
} }
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table jsh_log
*
* @mbggenerated
*/
public boolean isDistinct() { public boolean isDistinct() {
return distinct; return distinct;
} }
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table jsh_log
*
* @mbggenerated
*/
public List<Criteria> getOredCriteria() { public List<Criteria> getOredCriteria() {
return oredCriteria; return oredCriteria;
} }
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table jsh_log
*
* @mbggenerated
*/
public void or(Criteria criteria) { public void or(Criteria criteria) {
oredCriteria.add(criteria); oredCriteria.add(criteria);
} }
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table jsh_log
*
* @mbggenerated
*/
public Criteria or() { public Criteria or() {
Criteria criteria = createCriteriaInternal(); Criteria criteria = createCriteriaInternal();
oredCriteria.add(criteria); oredCriteria.add(criteria);
return criteria; return criteria;
} }
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table jsh_log
*
* @mbggenerated
*/
public Criteria createCriteria() { public Criteria createCriteria() {
Criteria criteria = createCriteriaInternal(); Criteria criteria = createCriteriaInternal();
if (oredCriteria.size() == 0) { if (oredCriteria.size() == 0) {
@@ -125,41 +53,23 @@ public class LogExample {
return criteria; return criteria;
} }
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table jsh_log
*
* @mbggenerated
*/
protected Criteria createCriteriaInternal() { protected Criteria createCriteriaInternal() {
Criteria criteria = new Criteria(); Criteria criteria = new Criteria();
return criteria; return criteria;
} }
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table jsh_log
*
* @mbggenerated
*/
public void clear() { public void clear() {
oredCriteria.clear(); oredCriteria.clear();
orderByClause = null; orderByClause = null;
distinct = false; distinct = false;
} }
/**
* This class was generated by MyBatis Generator.
* This class corresponds to the database table jsh_log
*
* @mbggenerated
*/
protected abstract static class GeneratedCriteria { protected abstract static class GeneratedCriteria {
protected List<Criterion> criteria; protected List<Criterion> criteria;
protected GeneratedCriteria() { protected GeneratedCriteria() {
super(); super();
criteria = new ArrayList<Criterion>(); criteria = new ArrayList<>();
} }
public boolean isValid() { public boolean isValid() {
@@ -255,63 +165,63 @@ public class LogExample {
return (Criteria) this; return (Criteria) this;
} }
public Criteria andUseridIsNull() { public Criteria andUserIdIsNull() {
addCriterion("userID is null"); addCriterion("user_id is null");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andUseridIsNotNull() { public Criteria andUserIdIsNotNull() {
addCriterion("userID is not null"); addCriterion("user_id is not null");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andUseridEqualTo(Long value) { public Criteria andUserIdEqualTo(Long value) {
addCriterion("userID =", value, "userid"); addCriterion("user_id =", value, "userId");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andUseridNotEqualTo(Long value) { public Criteria andUserIdNotEqualTo(Long value) {
addCriterion("userID <>", value, "userid"); addCriterion("user_id <>", value, "userId");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andUseridGreaterThan(Long value) { public Criteria andUserIdGreaterThan(Long value) {
addCriterion("userID >", value, "userid"); addCriterion("user_id >", value, "userId");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andUseridGreaterThanOrEqualTo(Long value) { public Criteria andUserIdGreaterThanOrEqualTo(Long value) {
addCriterion("userID >=", value, "userid"); addCriterion("user_id >=", value, "userId");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andUseridLessThan(Long value) { public Criteria andUserIdLessThan(Long value) {
addCriterion("userID <", value, "userid"); addCriterion("user_id <", value, "userId");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andUseridLessThanOrEqualTo(Long value) { public Criteria andUserIdLessThanOrEqualTo(Long value) {
addCriterion("userID <=", value, "userid"); addCriterion("user_id <=", value, "userId");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andUseridIn(List<Long> values) { public Criteria andUserIdIn(List<Long> values) {
addCriterion("userID in", values, "userid"); addCriterion("user_id in", values, "userId");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andUseridNotIn(List<Long> values) { public Criteria andUserIdNotIn(List<Long> values) {
addCriterion("userID not in", values, "userid"); addCriterion("user_id not in", values, "userId");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andUseridBetween(Long value1, Long value2) { public Criteria andUserIdBetween(Long value1, Long value2) {
addCriterion("userID between", value1, value2, "userid"); addCriterion("user_id between", value1, value2, "userId");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andUseridNotBetween(Long value1, Long value2) { public Criteria andUserIdNotBetween(Long value1, Long value2) {
addCriterion("userID not between", value1, value2, "userid"); addCriterion("user_id not between", value1, value2, "userId");
return (Criteria) this; return (Criteria) this;
} }
@@ -385,133 +295,133 @@ public class LogExample {
return (Criteria) this; return (Criteria) this;
} }
public Criteria andClientipIsNull() { public Criteria andClientIpIsNull() {
addCriterion("clientIP is null"); addCriterion("client_ip is null");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andClientipIsNotNull() { public Criteria andClientIpIsNotNull() {
addCriterion("clientIP is not null"); addCriterion("client_ip is not null");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andClientipEqualTo(String value) { public Criteria andClientIpEqualTo(String value) {
addCriterion("clientIP =", value, "clientip"); addCriterion("client_ip =", value, "clientIp");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andClientipNotEqualTo(String value) { public Criteria andClientIpNotEqualTo(String value) {
addCriterion("clientIP <>", value, "clientip"); addCriterion("client_ip <>", value, "clientIp");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andClientipGreaterThan(String value) { public Criteria andClientIpGreaterThan(String value) {
addCriterion("clientIP >", value, "clientip"); addCriterion("client_ip >", value, "clientIp");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andClientipGreaterThanOrEqualTo(String value) { public Criteria andClientIpGreaterThanOrEqualTo(String value) {
addCriterion("clientIP >=", value, "clientip"); addCriterion("client_ip >=", value, "clientIp");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andClientipLessThan(String value) { public Criteria andClientIpLessThan(String value) {
addCriterion("clientIP <", value, "clientip"); addCriterion("client_ip <", value, "clientIp");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andClientipLessThanOrEqualTo(String value) { public Criteria andClientIpLessThanOrEqualTo(String value) {
addCriterion("clientIP <=", value, "clientip"); addCriterion("client_ip <=", value, "clientIp");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andClientipLike(String value) { public Criteria andClientIpLike(String value) {
addCriterion("clientIP like", value, "clientip"); addCriterion("client_ip like", value, "clientIp");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andClientipNotLike(String value) { public Criteria andClientIpNotLike(String value) {
addCriterion("clientIP not like", value, "clientip"); addCriterion("client_ip not like", value, "clientIp");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andClientipIn(List<String> values) { public Criteria andClientIpIn(List<String> values) {
addCriterion("clientIP in", values, "clientip"); addCriterion("client_ip in", values, "clientIp");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andClientipNotIn(List<String> values) { public Criteria andClientIpNotIn(List<String> values) {
addCriterion("clientIP not in", values, "clientip"); addCriterion("client_ip not in", values, "clientIp");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andClientipBetween(String value1, String value2) { public Criteria andClientIpBetween(String value1, String value2) {
addCriterion("clientIP between", value1, value2, "clientip"); addCriterion("client_ip between", value1, value2, "clientIp");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andClientipNotBetween(String value1, String value2) { public Criteria andClientIpNotBetween(String value1, String value2) {
addCriterion("clientIP not between", value1, value2, "clientip"); addCriterion("client_ip not between", value1, value2, "clientIp");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andCreatetimeIsNull() { public Criteria andCreateTimeIsNull() {
addCriterion("createtime is null"); addCriterion("create_time is null");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andCreatetimeIsNotNull() { public Criteria andCreateTimeIsNotNull() {
addCriterion("createtime is not null"); addCriterion("create_time is not null");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andCreatetimeEqualTo(Date value) { public Criteria andCreateTimeEqualTo(Date value) {
addCriterion("createtime =", value, "createtime"); addCriterion("create_time =", value, "createTime");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andCreatetimeNotEqualTo(Date value) { public Criteria andCreateTimeNotEqualTo(Date value) {
addCriterion("createtime <>", value, "createtime"); addCriterion("create_time <>", value, "createTime");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andCreatetimeGreaterThan(Date value) { public Criteria andCreateTimeGreaterThan(Date value) {
addCriterion("createtime >", value, "createtime"); addCriterion("create_time >", value, "createTime");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andCreatetimeGreaterThanOrEqualTo(Date value) { public Criteria andCreateTimeGreaterThanOrEqualTo(Date value) {
addCriterion("createtime >=", value, "createtime"); addCriterion("create_time >=", value, "createTime");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andCreatetimeLessThan(Date value) { public Criteria andCreateTimeLessThan(Date value) {
addCriterion("createtime <", value, "createtime"); addCriterion("create_time <", value, "createTime");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andCreatetimeLessThanOrEqualTo(Date value) { public Criteria andCreateTimeLessThanOrEqualTo(Date value) {
addCriterion("createtime <=", value, "createtime"); addCriterion("create_time <=", value, "createTime");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andCreatetimeIn(List<Date> values) { public Criteria andCreateTimeIn(List<Date> values) {
addCriterion("createtime in", values, "createtime"); addCriterion("create_time in", values, "createTime");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andCreatetimeNotIn(List<Date> values) { public Criteria andCreateTimeNotIn(List<Date> values) {
addCriterion("createtime not in", values, "createtime"); addCriterion("create_time not in", values, "createTime");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andCreatetimeBetween(Date value1, Date value2) { public Criteria andCreateTimeBetween(Date value1, Date value2) {
addCriterion("createtime between", value1, value2, "createtime"); addCriterion("create_time between", value1, value2, "createTime");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andCreatetimeNotBetween(Date value1, Date value2) { public Criteria andCreateTimeNotBetween(Date value1, Date value2) {
addCriterion("createtime not between", value1, value2, "createtime"); addCriterion("create_time not between", value1, value2, "createTime");
return (Criteria) this; return (Criteria) this;
} }
@@ -575,143 +485,73 @@ public class LogExample {
return (Criteria) this; return (Criteria) this;
} }
public Criteria andContentdetailsIsNull() { public Criteria andContentIsNull() {
addCriterion("contentdetails is null"); addCriterion("content is null");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andContentdetailsIsNotNull() { public Criteria andContentIsNotNull() {
addCriterion("contentdetails is not null"); addCriterion("content is not null");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andContentdetailsEqualTo(String value) { public Criteria andContentEqualTo(String value) {
addCriterion("contentdetails =", value, "contentdetails"); addCriterion("content =", value, "content");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andContentdetailsNotEqualTo(String value) { public Criteria andContentNotEqualTo(String value) {
addCriterion("contentdetails <>", value, "contentdetails"); addCriterion("content <>", value, "content");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andContentdetailsGreaterThan(String value) { public Criteria andContentGreaterThan(String value) {
addCriterion("contentdetails >", value, "contentdetails"); addCriterion("content >", value, "content");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andContentdetailsGreaterThanOrEqualTo(String value) { public Criteria andContentGreaterThanOrEqualTo(String value) {
addCriterion("contentdetails >=", value, "contentdetails"); addCriterion("content >=", value, "content");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andContentdetailsLessThan(String value) { public Criteria andContentLessThan(String value) {
addCriterion("contentdetails <", value, "contentdetails"); addCriterion("content <", value, "content");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andContentdetailsLessThanOrEqualTo(String value) { public Criteria andContentLessThanOrEqualTo(String value) {
addCriterion("contentdetails <=", value, "contentdetails"); addCriterion("content <=", value, "content");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andContentdetailsLike(String value) { public Criteria andContentLike(String value) {
addCriterion("contentdetails like", value, "contentdetails"); addCriterion("content like", value, "content");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andContentdetailsNotLike(String value) { public Criteria andContentNotLike(String value) {
addCriterion("contentdetails not like", value, "contentdetails"); addCriterion("content not like", value, "content");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andContentdetailsIn(List<String> values) { public Criteria andContentIn(List<String> values) {
addCriterion("contentdetails in", values, "contentdetails"); addCriterion("content in", values, "content");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andContentdetailsNotIn(List<String> values) { public Criteria andContentNotIn(List<String> values) {
addCriterion("contentdetails not in", values, "contentdetails"); addCriterion("content not in", values, "content");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andContentdetailsBetween(String value1, String value2) { public Criteria andContentBetween(String value1, String value2) {
addCriterion("contentdetails between", value1, value2, "contentdetails"); addCriterion("content between", value1, value2, "content");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andContentdetailsNotBetween(String value1, String value2) { public Criteria andContentNotBetween(String value1, String value2) {
addCriterion("contentdetails not between", value1, value2, "contentdetails"); addCriterion("content not between", value1, value2, "content");
return (Criteria) this;
}
public Criteria andRemarkIsNull() {
addCriterion("remark is null");
return (Criteria) this;
}
public Criteria andRemarkIsNotNull() {
addCriterion("remark is not null");
return (Criteria) this;
}
public Criteria andRemarkEqualTo(String value) {
addCriterion("remark =", value, "remark");
return (Criteria) this;
}
public Criteria andRemarkNotEqualTo(String value) {
addCriterion("remark <>", value, "remark");
return (Criteria) this;
}
public Criteria andRemarkGreaterThan(String value) {
addCriterion("remark >", value, "remark");
return (Criteria) this;
}
public Criteria andRemarkGreaterThanOrEqualTo(String value) {
addCriterion("remark >=", value, "remark");
return (Criteria) this;
}
public Criteria andRemarkLessThan(String value) {
addCriterion("remark <", value, "remark");
return (Criteria) this;
}
public Criteria andRemarkLessThanOrEqualTo(String value) {
addCriterion("remark <=", value, "remark");
return (Criteria) this;
}
public Criteria andRemarkLike(String value) {
addCriterion("remark like", value, "remark");
return (Criteria) this;
}
public Criteria andRemarkNotLike(String value) {
addCriterion("remark not like", value, "remark");
return (Criteria) this;
}
public Criteria andRemarkIn(List<String> values) {
addCriterion("remark in", values, "remark");
return (Criteria) this;
}
public Criteria andRemarkNotIn(List<String> values) {
addCriterion("remark not in", values, "remark");
return (Criteria) this;
}
public Criteria andRemarkBetween(String value1, String value2) {
addCriterion("remark between", value1, value2, "remark");
return (Criteria) this;
}
public Criteria andRemarkNotBetween(String value1, String value2) {
addCriterion("remark not between", value1, value2, "remark");
return (Criteria) this; return (Criteria) this;
} }
@@ -776,25 +616,12 @@ public class LogExample {
} }
} }
/**
* This class was generated by MyBatis Generator.
* This class corresponds to the database table jsh_log
*
* @mbggenerated do_not_delete_during_merge
*/
public static class Criteria extends GeneratedCriteria { public static class Criteria extends GeneratedCriteria {
protected Criteria() { protected Criteria() {
super(); super();
} }
} }
/**
* This class was generated by MyBatis Generator.
* This class corresponds to the database table jsh_log
*
* @mbggenerated
*/
public static class Criterion { public static class Criterion {
private String condition; private String condition;

306
src/main/java/com/jsh/erp/datasource/entities/MaterialCategory.java
View File

@@ -3,418 +3,132 @@ package com.jsh.erp.datasource.entities;
import java.util.Date; import java.util.Date;
public class MaterialCategory { public class MaterialCategory {
/**
* This field was generated by MyBatis Generator.
* This field corresponds to the database column jsh_materialcategory.Id
*
* @mbggenerated
*/
private Long id; private Long id;
/**
* This field was generated by MyBatis Generator.
* This field corresponds to the database column jsh_materialcategory.Name
*
* @mbggenerated
*/
private String name; private String name;
/** private Short categoryLevel;
* This field was generated by MyBatis Generator.
* This field corresponds to the database column jsh_materialcategory.CategoryLevel
*
* @mbggenerated
*/
private Short categorylevel;
/** private Long parentId;
* This field was generated by MyBatis Generator.
* This field corresponds to the database column jsh_materialcategory.ParentId
*
* @mbggenerated
*/
private Long parentid;
/**
* This field was generated by MyBatis Generator.
* This field corresponds to the database column jsh_materialcategory.sort
*
* @mbggenerated
*/
private String sort; private String sort;
/**
* This field was generated by MyBatis Generator.
* This field corresponds to the database column jsh_materialcategory.status
*
* @mbggenerated
*/
private String status; private String status;
/**
* This field was generated by MyBatis Generator.
* This field corresponds to the database column jsh_materialcategory.serial_no
*
* @mbggenerated
*/
private String serialNo; private String serialNo;
/**
* This field was generated by MyBatis Generator.
* This field corresponds to the database column jsh_materialcategory.remark
*
* @mbggenerated
*/
private String remark; private String remark;
/**
* This field was generated by MyBatis Generator.
* This field corresponds to the database column jsh_materialcategory.create_time
*
* @mbggenerated
*/
private Date createTime; private Date createTime;
/**
* This field was generated by MyBatis Generator.
* This field corresponds to the database column jsh_materialcategory.creator
*
* @mbggenerated
*/
private Long creator; private Long creator;
/**
* This field was generated by MyBatis Generator.
* This field corresponds to the database column jsh_materialcategory.update_time
*
* @mbggenerated
*/
private Date updateTime; private Date updateTime;
/**
* This field was generated by MyBatis Generator.
* This field corresponds to the database column jsh_materialcategory.updater
*
* @mbggenerated
*/
private Long updater; private Long updater;
/**
* This field was generated by MyBatis Generator.
* This field corresponds to the database column jsh_materialcategory.tenant_id
*
* @mbggenerated
*/
private Long tenantId; private Long tenantId;
/**
* This method was generated by MyBatis Generator.
* This method returns the value of the database column jsh_materialcategory.Id
*
* @return the value of jsh_materialcategory.Id
*
* @mbggenerated
*/
public Long getId() { public Long getId() {
return id; return id;
} }
/**
* This method was generated by MyBatis Generator.
* This method sets the value of the database column jsh_materialcategory.Id
*
* @param id the value for jsh_materialcategory.Id
*
* @mbggenerated
*/
public void setId(Long id) { public void setId(Long id) {
this.id = id; this.id = id;
} }
/**
* This method was generated by MyBatis Generator.
* This method returns the value of the database column jsh_materialcategory.Name
*
* @return the value of jsh_materialcategory.Name
*
* @mbggenerated
*/
public String getName() { public String getName() {
return name; return name;
} }
/**
* This method was generated by MyBatis Generator.
* This method sets the value of the database column jsh_materialcategory.Name
*
* @param name the value for jsh_materialcategory.Name
*
* @mbggenerated
*/
public void setName(String name) { public void setName(String name) {
this.name = name == null ? null : name.trim(); this.name = name == null ? null : name.trim();
} }
/** public Short getCategoryLevel() {
* This method was generated by MyBatis Generator. return categoryLevel;
* This method returns the value of the database column jsh_materialcategory.CategoryLevel
*
* @return the value of jsh_materialcategory.CategoryLevel
*
* @mbggenerated
*/
public Short getCategorylevel() {
return categorylevel;
} }
/** public void setCategoryLevel(Short categoryLevel) {
* This method was generated by MyBatis Generator. this.categoryLevel = categoryLevel;
* This method sets the value of the database column jsh_materialcategory.CategoryLevel
*
* @param categorylevel the value for jsh_materialcategory.CategoryLevel
*
* @mbggenerated
*/
public void setCategorylevel(Short categorylevel) {
this.categorylevel = categorylevel;
} }
/** public Long getParentId() {
* This method was generated by MyBatis Generator. return parentId;
* This method returns the value of the database column jsh_materialcategory.ParentId
*
* @return the value of jsh_materialcategory.ParentId
*
* @mbggenerated
*/
public Long getParentid() {
return parentid;
} }
/** public void setParentId(Long parentId) {
* This method was generated by MyBatis Generator. this.parentId = parentId;
* This method sets the value of the database column jsh_materialcategory.ParentId
*
* @param parentid the value for jsh_materialcategory.ParentId
*
* @mbggenerated
*/
public void setParentid(Long parentid) {
this.parentid = parentid;
} }
/**
* This method was generated by MyBatis Generator.
* This method returns the value of the database column jsh_materialcategory.sort
*
* @return the value of jsh_materialcategory.sort
*
* @mbggenerated
*/
public String getSort() { public String getSort() {
return sort; return sort;
} }
/**
* This method was generated by MyBatis Generator.
* This method sets the value of the database column jsh_materialcategory.sort
*
* @param sort the value for jsh_materialcategory.sort
*
* @mbggenerated
*/
public void setSort(String sort) { public void setSort(String sort) {
this.sort = sort == null ? null : sort.trim(); this.sort = sort == null ? null : sort.trim();
} }
/**
* This method was generated by MyBatis Generator.
* This method returns the value of the database column jsh_materialcategory.status
*
* @return the value of jsh_materialcategory.status
*
* @mbggenerated
*/
public String getStatus() { public String getStatus() {
return status; return status;
} }
/**
* This method was generated by MyBatis Generator.
* This method sets the value of the database column jsh_materialcategory.status
*
* @param status the value for jsh_materialcategory.status
*
* @mbggenerated
*/
public void setStatus(String status) { public void setStatus(String status) {
this.status = status == null ? null : status.trim(); this.status = status == null ? null : status.trim();
} }
/**
* This method was generated by MyBatis Generator.
* This method returns the value of the database column jsh_materialcategory.serial_no
*
* @return the value of jsh_materialcategory.serial_no
*
* @mbggenerated
*/
public String getSerialNo() { public String getSerialNo() {
return serialNo; return serialNo;
} }
/**
* This method was generated by MyBatis Generator.
* This method sets the value of the database column jsh_materialcategory.serial_no
*
* @param serialNo the value for jsh_materialcategory.serial_no
*
* @mbggenerated
*/
public void setSerialNo(String serialNo) { public void setSerialNo(String serialNo) {
this.serialNo = serialNo == null ? null : serialNo.trim(); this.serialNo = serialNo == null ? null : serialNo.trim();
} }
/**
* This method was generated by MyBatis Generator.
* This method returns the value of the database column jsh_materialcategory.remark
*
* @return the value of jsh_materialcategory.remark
*
* @mbggenerated
*/
public String getRemark() { public String getRemark() {
return remark; return remark;
} }
/**
* This method was generated by MyBatis Generator.
* This method sets the value of the database column jsh_materialcategory.remark
*
* @param remark the value for jsh_materialcategory.remark
*
* @mbggenerated
*/
public void setRemark(String remark) { public void setRemark(String remark) {
this.remark = remark == null ? null : remark.trim(); this.remark = remark == null ? null : remark.trim();
} }
/**
* This method was generated by MyBatis Generator.
* This method returns the value of the database column jsh_materialcategory.create_time
*
* @return the value of jsh_materialcategory.create_time
*
* @mbggenerated
*/
public Date getCreateTime() { public Date getCreateTime() {
return createTime; return createTime;
} }
/**
* This method was generated by MyBatis Generator.
* This method sets the value of the database column jsh_materialcategory.create_time
*
* @param createTime the value for jsh_materialcategory.create_time
*
* @mbggenerated
*/
public void setCreateTime(Date createTime) { public void setCreateTime(Date createTime) {
this.createTime = createTime; this.createTime = createTime;
} }
/**
* This method was generated by MyBatis Generator.
* This method returns the value of the database column jsh_materialcategory.creator
*
* @return the value of jsh_materialcategory.creator
*
* @mbggenerated
*/
public Long getCreator() { public Long getCreator() {
return creator; return creator;
} }
/**
* This method was generated by MyBatis Generator.
* This method sets the value of the database column jsh_materialcategory.creator
*
* @param creator the value for jsh_materialcategory.creator
*
* @mbggenerated
*/
public void setCreator(Long creator) { public void setCreator(Long creator) {
this.creator = creator; this.creator = creator;
} }
/**
* This method was generated by MyBatis Generator.
* This method returns the value of the database column jsh_materialcategory.update_time
*
* @return the value of jsh_materialcategory.update_time
*
* @mbggenerated
*/
public Date getUpdateTime() { public Date getUpdateTime() {
return updateTime; return updateTime;
} }
/**
* This method was generated by MyBatis Generator.
* This method sets the value of the database column jsh_materialcategory.update_time
*
* @param updateTime the value for jsh_materialcategory.update_time
*
* @mbggenerated
*/
public void setUpdateTime(Date updateTime) { public void setUpdateTime(Date updateTime) {
this.updateTime = updateTime; this.updateTime = updateTime;
} }
/**
* This method was generated by MyBatis Generator.
* This method returns the value of the database column jsh_materialcategory.updater
*
* @return the value of jsh_materialcategory.updater
*
* @mbggenerated
*/
public Long getUpdater() { public Long getUpdater() {
return updater; return updater;
} }
/**
* This method was generated by MyBatis Generator.
* This method sets the value of the database column jsh_materialcategory.updater
*
* @param updater the value for jsh_materialcategory.updater
*
* @mbggenerated
*/
public void setUpdater(Long updater) { public void setUpdater(Long updater) {
this.updater = updater; this.updater = updater;
} }
/**
* This method was generated by MyBatis Generator.
* This method returns the value of the database column jsh_materialcategory.tenant_id
*
* @return the value of jsh_materialcategory.tenant_id
*
* @mbggenerated
*/
public Long getTenantId() { public Long getTenantId() {
return tenantId; return tenantId;
} }
/**
* This method was generated by MyBatis Generator.
* This method sets the value of the database column jsh_materialcategory.tenant_id
*
* @param tenantId the value for jsh_materialcategory.tenant_id
*
* @mbggenerated
*/
public void setTenantId(Long tenantId) { public void setTenantId(Long tenantId) {
this.tenantId = tenantId; this.tenantId = tenantId;
} }

255
src/main/java/com/jsh/erp/datasource/entities/MaterialCategoryExample.java
View File

@@ -5,118 +5,46 @@ import java.util.Date;
import java.util.List; import java.util.List;
public class MaterialCategoryExample { public class MaterialCategoryExample {
/**
* This field was generated by MyBatis Generator.
* This field corresponds to the database table jsh_materialcategory
*
* @mbggenerated
*/
protected String orderByClause; protected String orderByClause;
/**
* This field was generated by MyBatis Generator.
* This field corresponds to the database table jsh_materialcategory
*
* @mbggenerated
*/
protected boolean distinct; protected boolean distinct;
/**
* This field was generated by MyBatis Generator.
* This field corresponds to the database table jsh_materialcategory
*
* @mbggenerated
*/
protected List<Criteria> oredCriteria; protected List<Criteria> oredCriteria;
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table jsh_materialcategory
*
* @mbggenerated
*/
public MaterialCategoryExample() { public MaterialCategoryExample() {
oredCriteria = new ArrayList<Criteria>(); oredCriteria = new ArrayList<>();
} }
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table jsh_materialcategory
*
* @mbggenerated
*/
public void setOrderByClause(String orderByClause) { public void setOrderByClause(String orderByClause) {
this.orderByClause = orderByClause; this.orderByClause = orderByClause;
} }
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table jsh_materialcategory
*
* @mbggenerated
*/
public String getOrderByClause() { public String getOrderByClause() {
return orderByClause; return orderByClause;
} }
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table jsh_materialcategory
*
* @mbggenerated
*/
public void setDistinct(boolean distinct) { public void setDistinct(boolean distinct) {
this.distinct = distinct; this.distinct = distinct;
} }
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table jsh_materialcategory
*
* @mbggenerated
*/
public boolean isDistinct() { public boolean isDistinct() {
return distinct; return distinct;
} }
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table jsh_materialcategory
*
* @mbggenerated
*/
public List<Criteria> getOredCriteria() { public List<Criteria> getOredCriteria() {
return oredCriteria; return oredCriteria;
} }
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table jsh_materialcategory
*
* @mbggenerated
*/
public void or(Criteria criteria) { public void or(Criteria criteria) {
oredCriteria.add(criteria); oredCriteria.add(criteria);
} }
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table jsh_materialcategory
*
* @mbggenerated
*/
public Criteria or() { public Criteria or() {
Criteria criteria = createCriteriaInternal(); Criteria criteria = createCriteriaInternal();
oredCriteria.add(criteria); oredCriteria.add(criteria);
return criteria; return criteria;
} }
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table jsh_materialcategory
*
* @mbggenerated
*/
public Criteria createCriteria() { public Criteria createCriteria() {
Criteria criteria = createCriteriaInternal(); Criteria criteria = createCriteriaInternal();
if (oredCriteria.size() == 0) { if (oredCriteria.size() == 0) {
@@ -125,41 +53,23 @@ public class MaterialCategoryExample {
return criteria; return criteria;
} }
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table jsh_materialcategory
*
* @mbggenerated
*/
protected Criteria createCriteriaInternal() { protected Criteria createCriteriaInternal() {
Criteria criteria = new Criteria(); Criteria criteria = new Criteria();
return criteria; return criteria;
} }
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table jsh_materialcategory
*
* @mbggenerated
*/
public void clear() { public void clear() {
oredCriteria.clear(); oredCriteria.clear();
orderByClause = null; orderByClause = null;
distinct = false; distinct = false;
} }
/**
* This class was generated by MyBatis Generator.
* This class corresponds to the database table jsh_materialcategory
*
* @mbggenerated
*/
protected abstract static class GeneratedCriteria { protected abstract static class GeneratedCriteria {
protected List<Criterion> criteria; protected List<Criterion> criteria;
protected GeneratedCriteria() { protected GeneratedCriteria() {
super(); super();
criteria = new ArrayList<Criterion>(); criteria = new ArrayList<>();
} }
public boolean isValid() { public boolean isValid() {
@@ -196,252 +106,252 @@ public class MaterialCategoryExample {
} }
public Criteria andIdIsNull() { public Criteria andIdIsNull() {
addCriterion("Id is null"); addCriterion("id is null");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andIdIsNotNull() { public Criteria andIdIsNotNull() {
addCriterion("Id is not null"); addCriterion("id is not null");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andIdEqualTo(Long value) { public Criteria andIdEqualTo(Long value) {
addCriterion("Id =", value, "id"); addCriterion("id =", value, "id");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andIdNotEqualTo(Long value) { public Criteria andIdNotEqualTo(Long value) {
addCriterion("Id <>", value, "id"); addCriterion("id <>", value, "id");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andIdGreaterThan(Long value) { public Criteria andIdGreaterThan(Long value) {
addCriterion("Id >", value, "id"); addCriterion("id >", value, "id");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andIdGreaterThanOrEqualTo(Long value) { public Criteria andIdGreaterThanOrEqualTo(Long value) {
addCriterion("Id >=", value, "id"); addCriterion("id >=", value, "id");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andIdLessThan(Long value) { public Criteria andIdLessThan(Long value) {
addCriterion("Id <", value, "id"); addCriterion("id <", value, "id");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andIdLessThanOrEqualTo(Long value) { public Criteria andIdLessThanOrEqualTo(Long value) {
addCriterion("Id <=", value, "id"); addCriterion("id <=", value, "id");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andIdIn(List<Long> values) { public Criteria andIdIn(List<Long> values) {
addCriterion("Id in", values, "id"); addCriterion("id in", values, "id");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andIdNotIn(List<Long> values) { public Criteria andIdNotIn(List<Long> values) {
addCriterion("Id not in", values, "id"); addCriterion("id not in", values, "id");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andIdBetween(Long value1, Long value2) { public Criteria andIdBetween(Long value1, Long value2) {
addCriterion("Id between", value1, value2, "id"); addCriterion("id between", value1, value2, "id");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andIdNotBetween(Long value1, Long value2) { public Criteria andIdNotBetween(Long value1, Long value2) {
addCriterion("Id not between", value1, value2, "id"); addCriterion("id not between", value1, value2, "id");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andNameIsNull() { public Criteria andNameIsNull() {
addCriterion("Name is null"); addCriterion("name is null");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andNameIsNotNull() { public Criteria andNameIsNotNull() {
addCriterion("Name is not null"); addCriterion("name is not null");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andNameEqualTo(String value) { public Criteria andNameEqualTo(String value) {
addCriterion("Name =", value, "name"); addCriterion("name =", value, "name");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andNameNotEqualTo(String value) { public Criteria andNameNotEqualTo(String value) {
addCriterion("Name <>", value, "name"); addCriterion("name <>", value, "name");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andNameGreaterThan(String value) { public Criteria andNameGreaterThan(String value) {
addCriterion("Name >", value, "name"); addCriterion("name >", value, "name");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andNameGreaterThanOrEqualTo(String value) { public Criteria andNameGreaterThanOrEqualTo(String value) {
addCriterion("Name >=", value, "name"); addCriterion("name >=", value, "name");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andNameLessThan(String value) { public Criteria andNameLessThan(String value) {
addCriterion("Name <", value, "name"); addCriterion("name <", value, "name");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andNameLessThanOrEqualTo(String value) { public Criteria andNameLessThanOrEqualTo(String value) {
addCriterion("Name <=", value, "name"); addCriterion("name <=", value, "name");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andNameLike(String value) { public Criteria andNameLike(String value) {
addCriterion("Name like", value, "name"); addCriterion("name like", value, "name");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andNameNotLike(String value) { public Criteria andNameNotLike(String value) {
addCriterion("Name not like", value, "name"); addCriterion("name not like", value, "name");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andNameIn(List<String> values) { public Criteria andNameIn(List<String> values) {
addCriterion("Name in", values, "name"); addCriterion("name in", values, "name");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andNameNotIn(List<String> values) { public Criteria andNameNotIn(List<String> values) {
addCriterion("Name not in", values, "name"); addCriterion("name not in", values, "name");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andNameBetween(String value1, String value2) { public Criteria andNameBetween(String value1, String value2) {
addCriterion("Name between", value1, value2, "name"); addCriterion("name between", value1, value2, "name");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andNameNotBetween(String value1, String value2) { public Criteria andNameNotBetween(String value1, String value2) {
addCriterion("Name not between", value1, value2, "name"); addCriterion("name not between", value1, value2, "name");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andCategorylevelIsNull() { public Criteria andCategoryLevelIsNull() {
addCriterion("CategoryLevel is null"); addCriterion("category_level is null");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andCategorylevelIsNotNull() { public Criteria andCategoryLevelIsNotNull() {
addCriterion("CategoryLevel is not null"); addCriterion("category_level is not null");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andCategorylevelEqualTo(Short value) { public Criteria andCategoryLevelEqualTo(Short value) {
addCriterion("CategoryLevel =", value, "categorylevel"); addCriterion("category_level =", value, "categoryLevel");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andCategorylevelNotEqualTo(Short value) { public Criteria andCategoryLevelNotEqualTo(Short value) {
addCriterion("CategoryLevel <>", value, "categorylevel"); addCriterion("category_level <>", value, "categoryLevel");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andCategorylevelGreaterThan(Short value) { public Criteria andCategoryLevelGreaterThan(Short value) {
addCriterion("CategoryLevel >", value, "categorylevel"); addCriterion("category_level >", value, "categoryLevel");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andCategorylevelGreaterThanOrEqualTo(Short value) { public Criteria andCategoryLevelGreaterThanOrEqualTo(Short value) {
addCriterion("CategoryLevel >=", value, "categorylevel"); addCriterion("category_level >=", value, "categoryLevel");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andCategorylevelLessThan(Short value) { public Criteria andCategoryLevelLessThan(Short value) {
addCriterion("CategoryLevel <", value, "categorylevel"); addCriterion("category_level <", value, "categoryLevel");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andCategorylevelLessThanOrEqualTo(Short value) { public Criteria andCategoryLevelLessThanOrEqualTo(Short value) {
addCriterion("CategoryLevel <=", value, "categorylevel"); addCriterion("category_level <=", value, "categoryLevel");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andCategorylevelIn(List<Short> values) { public Criteria andCategoryLevelIn(List<Short> values) {
addCriterion("CategoryLevel in", values, "categorylevel"); addCriterion("category_level in", values, "categoryLevel");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andCategorylevelNotIn(List<Short> values) { public Criteria andCategoryLevelNotIn(List<Short> values) {
addCriterion("CategoryLevel not in", values, "categorylevel"); addCriterion("category_level not in", values, "categoryLevel");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andCategorylevelBetween(Short value1, Short value2) { public Criteria andCategoryLevelBetween(Short value1, Short value2) {
addCriterion("CategoryLevel between", value1, value2, "categorylevel"); addCriterion("category_level between", value1, value2, "categoryLevel");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andCategorylevelNotBetween(Short value1, Short value2) { public Criteria andCategoryLevelNotBetween(Short value1, Short value2) {
addCriterion("CategoryLevel not between", value1, value2, "categorylevel"); addCriterion("category_level not between", value1, value2, "categoryLevel");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andParentidIsNull() { public Criteria andParentIdIsNull() {
addCriterion("ParentId is null"); addCriterion("parent_id is null");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andParentidIsNotNull() { public Criteria andParentIdIsNotNull() {
addCriterion("ParentId is not null"); addCriterion("parent_id is not null");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andParentidEqualTo(Long value) { public Criteria andParentIdEqualTo(Long value) {
addCriterion("ParentId =", value, "parentid"); addCriterion("parent_id =", value, "parentId");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andParentidNotEqualTo(Long value) { public Criteria andParentIdNotEqualTo(Long value) {
addCriterion("ParentId <>", value, "parentid"); addCriterion("parent_id <>", value, "parentId");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andParentidGreaterThan(Long value) { public Criteria andParentIdGreaterThan(Long value) {
addCriterion("ParentId >", value, "parentid"); addCriterion("parent_id >", value, "parentId");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andParentidGreaterThanOrEqualTo(Long value) { public Criteria andParentIdGreaterThanOrEqualTo(Long value) {
addCriterion("ParentId >=", value, "parentid"); addCriterion("parent_id >=", value, "parentId");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andParentidLessThan(Long value) { public Criteria andParentIdLessThan(Long value) {
addCriterion("ParentId <", value, "parentid"); addCriterion("parent_id <", value, "parentId");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andParentidLessThanOrEqualTo(Long value) { public Criteria andParentIdLessThanOrEqualTo(Long value) {
addCriterion("ParentId <=", value, "parentid"); addCriterion("parent_id <=", value, "parentId");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andParentidIn(List<Long> values) { public Criteria andParentIdIn(List<Long> values) {
addCriterion("ParentId in", values, "parentid"); addCriterion("parent_id in", values, "parentId");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andParentidNotIn(List<Long> values) { public Criteria andParentIdNotIn(List<Long> values) {
addCriterion("ParentId not in", values, "parentid"); addCriterion("parent_id not in", values, "parentId");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andParentidBetween(Long value1, Long value2) { public Criteria andParentIdBetween(Long value1, Long value2) {
addCriterion("ParentId between", value1, value2, "parentid"); addCriterion("parent_id between", value1, value2, "parentId");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andParentidNotBetween(Long value1, Long value2) { public Criteria andParentIdNotBetween(Long value1, Long value2) {
addCriterion("ParentId not between", value1, value2, "parentid"); addCriterion("parent_id not between", value1, value2, "parentId");
return (Criteria) this; return (Criteria) this;
} }
@@ -1026,25 +936,12 @@ public class MaterialCategoryExample {
} }
} }
/**
* This class was generated by MyBatis Generator.
* This class corresponds to the database table jsh_materialcategory
*
* @mbggenerated do_not_delete_during_merge
*/
public static class Criteria extends GeneratedCriteria { public static class Criteria extends GeneratedCriteria {
protected Criteria() { protected Criteria() {
super(); super();
} }
} }
/**
* This class was generated by MyBatis Generator.
* This class corresponds to the database table jsh_materialcategory
*
* @mbggenerated
*/
public static class Criterion { public static class Criterion {
private String condition; private String condition;

152
src/main/java/com/jsh/erp/datasource/entities/MaterialProperty.java
View File

@@ -1,194 +1,62 @@
package com.jsh.erp.datasource.entities; package com.jsh.erp.datasource.entities;
public class MaterialProperty { public class MaterialProperty {
/**
* This field was generated by MyBatis Generator.
* This field corresponds to the database column jsh_materialproperty.id
*
* @mbggenerated
*/
private Long id; private Long id;
/** private String nativeName;
* This field was generated by MyBatis Generator.
* This field corresponds to the database column jsh_materialproperty.nativeName
*
* @mbggenerated
*/
private String nativename;
/**
* This field was generated by MyBatis Generator.
* This field corresponds to the database column jsh_materialproperty.enabled
*
* @mbggenerated
*/
private Boolean enabled; private Boolean enabled;
/**
* This field was generated by MyBatis Generator.
* This field corresponds to the database column jsh_materialproperty.sort
*
* @mbggenerated
*/
private String sort; private String sort;
/** private String anotherName;
* This field was generated by MyBatis Generator.
* This field corresponds to the database column jsh_materialproperty.anotherName
*
* @mbggenerated
*/
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; private String deleteFlag;
/**
* This method was generated by MyBatis Generator.
* This method returns the value of the database column jsh_materialproperty.id
*
* @return the value of jsh_materialproperty.id
*
* @mbggenerated
*/
public Long getId() { public Long getId() {
return id; return id;
} }
/**
* This method was generated by MyBatis Generator.
* This method sets the value of the database column jsh_materialproperty.id
*
* @param id the value for jsh_materialproperty.id
*
* @mbggenerated
*/
public void setId(Long id) { public void setId(Long id) {
this.id = id; this.id = id;
} }
/** public String getNativeName() {
* This method was generated by MyBatis Generator. return nativeName;
* This method returns the value of the database column jsh_materialproperty.nativeName
*
* @return the value of jsh_materialproperty.nativeName
*
* @mbggenerated
*/
public String getNativename() {
return nativename;
} }
/** public void setNativeName(String nativeName) {
* This method was generated by MyBatis Generator. this.nativeName = nativeName == null ? null : nativeName.trim();
* This method sets the value of the database column jsh_materialproperty.nativeName
*
* @param nativename the value for jsh_materialproperty.nativeName
*
* @mbggenerated
*/
public void setNativename(String nativename) {
this.nativename = nativename == null ? null : nativename.trim();
} }
/**
* This method was generated by MyBatis Generator.
* This method returns the value of the database column jsh_materialproperty.enabled
*
* @return the value of jsh_materialproperty.enabled
*
* @mbggenerated
*/
public Boolean getEnabled() { public Boolean getEnabled() {
return enabled; return enabled;
} }
/**
* This method was generated by MyBatis Generator.
* This method sets the value of the database column jsh_materialproperty.enabled
*
* @param enabled the value for jsh_materialproperty.enabled
*
* @mbggenerated
*/
public void setEnabled(Boolean enabled) { public void setEnabled(Boolean enabled) {
this.enabled = enabled; this.enabled = enabled;
} }
/**
* This method was generated by MyBatis Generator.
* This method returns the value of the database column jsh_materialproperty.sort
*
* @return the value of jsh_materialproperty.sort
*
* @mbggenerated
*/
public String getSort() { public String getSort() {
return sort; return sort;
} }
/**
* This method was generated by MyBatis Generator.
* This method sets the value of the database column jsh_materialproperty.sort
*
* @param sort the value for jsh_materialproperty.sort
*
* @mbggenerated
*/
public void setSort(String sort) { public void setSort(String sort) {
this.sort = sort == null ? null : sort.trim(); this.sort = sort == null ? null : sort.trim();
} }
/** public String getAnotherName() {
* This method was generated by MyBatis Generator. return anotherName;
* This method returns the value of the database column jsh_materialproperty.anotherName
*
* @return the value of jsh_materialproperty.anotherName
*
* @mbggenerated
*/
public String getAnothername() {
return anothername;
} }
/** public void setAnotherName(String anotherName) {
* This method was generated by MyBatis Generator. this.anotherName = anotherName == null ? null : anotherName.trim();
* This method sets the value of the database column jsh_materialproperty.anotherName
*
* @param anothername the value for jsh_materialproperty.anotherName
*
* @mbggenerated
*/
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() { public String getDeleteFlag() {
return deleteFlag; 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) { public void setDeleteFlag(String deleteFlag) {
this.deleteFlag = deleteFlag == null ? null : deleteFlag.trim(); this.deleteFlag = deleteFlag == null ? null : deleteFlag.trim();
} }

247
src/main/java/com/jsh/erp/datasource/entities/MaterialPropertyExample.java
View File

@@ -4,118 +4,46 @@ import java.util.ArrayList;
import java.util.List; import java.util.List;
public class MaterialPropertyExample { public class MaterialPropertyExample {
/**
* This field was generated by MyBatis Generator.
* This field corresponds to the database table jsh_materialproperty
*
* @mbggenerated
*/
protected String orderByClause; protected String orderByClause;
/**
* This field was generated by MyBatis Generator.
* This field corresponds to the database table jsh_materialproperty
*
* @mbggenerated
*/
protected boolean distinct; protected boolean distinct;
/**
* This field was generated by MyBatis Generator.
* This field corresponds to the database table jsh_materialproperty
*
* @mbggenerated
*/
protected List<Criteria> oredCriteria; protected List<Criteria> oredCriteria;
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table jsh_materialproperty
*
* @mbggenerated
*/
public MaterialPropertyExample() { public MaterialPropertyExample() {
oredCriteria = new ArrayList<Criteria>(); oredCriteria = new ArrayList<>();
} }
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table jsh_materialproperty
*
* @mbggenerated
*/
public void setOrderByClause(String orderByClause) { public void setOrderByClause(String orderByClause) {
this.orderByClause = orderByClause; this.orderByClause = orderByClause;
} }
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table jsh_materialproperty
*
* @mbggenerated
*/
public String getOrderByClause() { public String getOrderByClause() {
return orderByClause; return orderByClause;
} }
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table jsh_materialproperty
*
* @mbggenerated
*/
public void setDistinct(boolean distinct) { public void setDistinct(boolean distinct) {
this.distinct = distinct; this.distinct = distinct;
} }
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table jsh_materialproperty
*
* @mbggenerated
*/
public boolean isDistinct() { public boolean isDistinct() {
return distinct; return distinct;
} }
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table jsh_materialproperty
*
* @mbggenerated
*/
public List<Criteria> getOredCriteria() { public List<Criteria> getOredCriteria() {
return oredCriteria; return oredCriteria;
} }
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table jsh_materialproperty
*
* @mbggenerated
*/
public void or(Criteria criteria) { public void or(Criteria criteria) {
oredCriteria.add(criteria); oredCriteria.add(criteria);
} }
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table jsh_materialproperty
*
* @mbggenerated
*/
public Criteria or() { public Criteria or() {
Criteria criteria = createCriteriaInternal(); Criteria criteria = createCriteriaInternal();
oredCriteria.add(criteria); oredCriteria.add(criteria);
return criteria; return criteria;
} }
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table jsh_materialproperty
*
* @mbggenerated
*/
public Criteria createCriteria() { public Criteria createCriteria() {
Criteria criteria = createCriteriaInternal(); Criteria criteria = createCriteriaInternal();
if (oredCriteria.size() == 0) { if (oredCriteria.size() == 0) {
@@ -124,41 +52,23 @@ public class MaterialPropertyExample {
return criteria; return criteria;
} }
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table jsh_materialproperty
*
* @mbggenerated
*/
protected Criteria createCriteriaInternal() { protected Criteria createCriteriaInternal() {
Criteria criteria = new Criteria(); Criteria criteria = new Criteria();
return criteria; return criteria;
} }
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table jsh_materialproperty
*
* @mbggenerated
*/
public void clear() { public void clear() {
oredCriteria.clear(); oredCriteria.clear();
orderByClause = null; orderByClause = null;
distinct = false; distinct = false;
} }
/**
* This class was generated by MyBatis Generator.
* This class corresponds to the database table jsh_materialproperty
*
* @mbggenerated
*/
protected abstract static class GeneratedCriteria { protected abstract static class GeneratedCriteria {
protected List<Criterion> criteria; protected List<Criterion> criteria;
protected GeneratedCriteria() { protected GeneratedCriteria() {
super(); super();
criteria = new ArrayList<Criterion>(); criteria = new ArrayList<>();
} }
public boolean isValid() { public boolean isValid() {
@@ -254,73 +164,73 @@ public class MaterialPropertyExample {
return (Criteria) this; return (Criteria) this;
} }
public Criteria andNativenameIsNull() { public Criteria andNativeNameIsNull() {
addCriterion("nativeName is null"); addCriterion("native_name is null");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andNativenameIsNotNull() { public Criteria andNativeNameIsNotNull() {
addCriterion("nativeName is not null"); addCriterion("native_name is not null");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andNativenameEqualTo(String value) { public Criteria andNativeNameEqualTo(String value) {
addCriterion("nativeName =", value, "nativename"); addCriterion("native_name =", value, "nativeName");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andNativenameNotEqualTo(String value) { public Criteria andNativeNameNotEqualTo(String value) {
addCriterion("nativeName <>", value, "nativename"); addCriterion("native_name <>", value, "nativeName");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andNativenameGreaterThan(String value) { public Criteria andNativeNameGreaterThan(String value) {
addCriterion("nativeName >", value, "nativename"); addCriterion("native_name >", value, "nativeName");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andNativenameGreaterThanOrEqualTo(String value) { public Criteria andNativeNameGreaterThanOrEqualTo(String value) {
addCriterion("nativeName >=", value, "nativename"); addCriterion("native_name >=", value, "nativeName");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andNativenameLessThan(String value) { public Criteria andNativeNameLessThan(String value) {
addCriterion("nativeName <", value, "nativename"); addCriterion("native_name <", value, "nativeName");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andNativenameLessThanOrEqualTo(String value) { public Criteria andNativeNameLessThanOrEqualTo(String value) {
addCriterion("nativeName <=", value, "nativename"); addCriterion("native_name <=", value, "nativeName");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andNativenameLike(String value) { public Criteria andNativeNameLike(String value) {
addCriterion("nativeName like", value, "nativename"); addCriterion("native_name like", value, "nativeName");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andNativenameNotLike(String value) { public Criteria andNativeNameNotLike(String value) {
addCriterion("nativeName not like", value, "nativename"); addCriterion("native_name not like", value, "nativeName");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andNativenameIn(List<String> values) { public Criteria andNativeNameIn(List<String> values) {
addCriterion("nativeName in", values, "nativename"); addCriterion("native_name in", values, "nativeName");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andNativenameNotIn(List<String> values) { public Criteria andNativeNameNotIn(List<String> values) {
addCriterion("nativeName not in", values, "nativename"); addCriterion("native_name not in", values, "nativeName");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andNativenameBetween(String value1, String value2) { public Criteria andNativeNameBetween(String value1, String value2) {
addCriterion("nativeName between", value1, value2, "nativename"); addCriterion("native_name between", value1, value2, "nativeName");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andNativenameNotBetween(String value1, String value2) { public Criteria andNativeNameNotBetween(String value1, String value2) {
addCriterion("nativeName not between", value1, value2, "nativename"); addCriterion("native_name not between", value1, value2, "nativeName");
return (Criteria) this; return (Criteria) this;
} }
@@ -454,166 +364,153 @@ public class MaterialPropertyExample {
return (Criteria) this; return (Criteria) this;
} }
public Criteria andAnothernameIsNull() { public Criteria andAnotherNameIsNull() {
addCriterion("anotherName is null"); addCriterion("another_name is null");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andAnothernameIsNotNull() { public Criteria andAnotherNameIsNotNull() {
addCriterion("anotherName is not null"); addCriterion("another_name is not null");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andAnothernameEqualTo(String value) { public Criteria andAnotherNameEqualTo(String value) {
addCriterion("anotherName =", value, "anothername"); addCriterion("another_name =", value, "anotherName");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andAnothernameNotEqualTo(String value) { public Criteria andAnotherNameNotEqualTo(String value) {
addCriterion("anotherName <>", value, "anothername"); addCriterion("another_name <>", value, "anotherName");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andAnothernameGreaterThan(String value) { public Criteria andAnotherNameGreaterThan(String value) {
addCriterion("anotherName >", value, "anothername"); addCriterion("another_name >", value, "anotherName");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andAnothernameGreaterThanOrEqualTo(String value) { public Criteria andAnotherNameGreaterThanOrEqualTo(String value) {
addCriterion("anotherName >=", value, "anothername"); addCriterion("another_name >=", value, "anotherName");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andAnothernameLessThan(String value) { public Criteria andAnotherNameLessThan(String value) {
addCriterion("anotherName <", value, "anothername"); addCriterion("another_name <", value, "anotherName");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andAnothernameLessThanOrEqualTo(String value) { public Criteria andAnotherNameLessThanOrEqualTo(String value) {
addCriterion("anotherName <=", value, "anothername"); addCriterion("another_name <=", value, "anotherName");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andAnothernameLike(String value) { public Criteria andAnotherNameLike(String value) {
addCriterion("anotherName like", value, "anothername"); addCriterion("another_name like", value, "anotherName");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andAnothernameNotLike(String value) { public Criteria andAnotherNameNotLike(String value) {
addCriterion("anotherName not like", value, "anothername"); addCriterion("another_name not like", value, "anotherName");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andAnothernameIn(List<String> values) { public Criteria andAnotherNameIn(List<String> values) {
addCriterion("anotherName in", values, "anothername"); addCriterion("another_name in", values, "anotherName");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andAnothernameNotIn(List<String> values) { public Criteria andAnotherNameNotIn(List<String> values) {
addCriterion("anotherName not in", values, "anothername"); addCriterion("another_name not in", values, "anotherName");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andAnothernameBetween(String value1, String value2) { public Criteria andAnotherNameBetween(String value1, String value2) {
addCriterion("anotherName between", value1, value2, "anothername"); addCriterion("another_name between", value1, value2, "anotherName");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andAnothernameNotBetween(String value1, String value2) { public Criteria andAnotherNameNotBetween(String value1, String value2) {
addCriterion("anotherName not between", value1, value2, "anothername"); addCriterion("another_name not between", value1, value2, "anotherName");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andDeleteFlagIsNull() { public Criteria andDeleteFlagIsNull() {
addCriterion("delete_Flag is null"); addCriterion("delete_flag is null");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andDeleteFlagIsNotNull() { public Criteria andDeleteFlagIsNotNull() {
addCriterion("delete_Flag is not null"); addCriterion("delete_flag is not null");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andDeleteFlagEqualTo(String value) { public Criteria andDeleteFlagEqualTo(String value) {
addCriterion("delete_Flag =", value, "deleteFlag"); addCriterion("delete_flag =", value, "deleteFlag");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andDeleteFlagNotEqualTo(String value) { public Criteria andDeleteFlagNotEqualTo(String value) {
addCriterion("delete_Flag <>", value, "deleteFlag"); addCriterion("delete_flag <>", value, "deleteFlag");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andDeleteFlagGreaterThan(String value) { public Criteria andDeleteFlagGreaterThan(String value) {
addCriterion("delete_Flag >", value, "deleteFlag"); addCriterion("delete_flag >", value, "deleteFlag");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andDeleteFlagGreaterThanOrEqualTo(String value) { public Criteria andDeleteFlagGreaterThanOrEqualTo(String value) {
addCriterion("delete_Flag >=", value, "deleteFlag"); addCriterion("delete_flag >=", value, "deleteFlag");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andDeleteFlagLessThan(String value) { public Criteria andDeleteFlagLessThan(String value) {
addCriterion("delete_Flag <", value, "deleteFlag"); addCriterion("delete_flag <", value, "deleteFlag");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andDeleteFlagLessThanOrEqualTo(String value) { public Criteria andDeleteFlagLessThanOrEqualTo(String value) {
addCriterion("delete_Flag <=", value, "deleteFlag"); addCriterion("delete_flag <=", value, "deleteFlag");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andDeleteFlagLike(String value) { public Criteria andDeleteFlagLike(String value) {
addCriterion("delete_Flag like", value, "deleteFlag"); addCriterion("delete_flag like", value, "deleteFlag");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andDeleteFlagNotLike(String value) { public Criteria andDeleteFlagNotLike(String value) {
addCriterion("delete_Flag not like", value, "deleteFlag"); addCriterion("delete_flag not like", value, "deleteFlag");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andDeleteFlagIn(List<String> values) { public Criteria andDeleteFlagIn(List<String> values) {
addCriterion("delete_Flag in", values, "deleteFlag"); addCriterion("delete_flag in", values, "deleteFlag");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andDeleteFlagNotIn(List<String> values) { public Criteria andDeleteFlagNotIn(List<String> values) {
addCriterion("delete_Flag not in", values, "deleteFlag"); addCriterion("delete_flag not in", values, "deleteFlag");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andDeleteFlagBetween(String value1, String value2) { public Criteria andDeleteFlagBetween(String value1, String value2) {
addCriterion("delete_Flag between", value1, value2, "deleteFlag"); addCriterion("delete_flag between", value1, value2, "deleteFlag");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andDeleteFlagNotBetween(String value1, String value2) { public Criteria andDeleteFlagNotBetween(String value1, String value2) {
addCriterion("delete_Flag not between", value1, value2, "deleteFlag"); addCriterion("delete_flag not between", value1, value2, "deleteFlag");
return (Criteria) this; return (Criteria) this;
} }
} }
/**
* This class was generated by MyBatis Generator.
* This class corresponds to the database table jsh_materialproperty
*
* @mbggenerated do_not_delete_during_merge
*/
public static class Criteria extends GeneratedCriteria { public static class Criteria extends GeneratedCriteria {
protected Criteria() { protected Criteria() {
super(); super();
} }
} }
/**
* This class was generated by MyBatis Generator.
* This class corresponds to the database table jsh_materialproperty
*
* @mbggenerated
*/
public static class Criterion { public static class Criterion {
private String condition; private String condition;

110
src/main/java/com/jsh/erp/datasource/entities/Person.java
View File

@@ -1,162 +1,52 @@
package com.jsh.erp.datasource.entities; package com.jsh.erp.datasource.entities;
public class Person { public class Person {
/**
* This field was generated by MyBatis Generator.
* This field corresponds to the database column jsh_person.Id
*
* @mbggenerated
*/
private Long id; private Long id;
/**
* This field was generated by MyBatis Generator.
* This field corresponds to the database column jsh_person.Type
*
* @mbggenerated
*/
private String type; private String type;
/**
* This field was generated by MyBatis Generator.
* This field corresponds to the database column jsh_person.Name
*
* @mbggenerated
*/
private String name; private String name;
/**
* This field was generated by MyBatis Generator.
* This field corresponds to the database column jsh_person.tenant_id
*
* @mbggenerated
*/
private Long tenantId; 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; private String deleteFlag;
/**
* This method was generated by MyBatis Generator.
* This method returns the value of the database column jsh_person.Id
*
* @return the value of jsh_person.Id
*
* @mbggenerated
*/
public Long getId() { public Long getId() {
return id; return id;
} }
/**
* This method was generated by MyBatis Generator.
* This method sets the value of the database column jsh_person.Id
*
* @param id the value for jsh_person.Id
*
* @mbggenerated
*/
public void setId(Long id) { public void setId(Long id) {
this.id = id; this.id = id;
} }
/**
* This method was generated by MyBatis Generator.
* This method returns the value of the database column jsh_person.Type
*
* @return the value of jsh_person.Type
*
* @mbggenerated
*/
public String getType() { public String getType() {
return type; return type;
} }
/**
* This method was generated by MyBatis Generator.
* This method sets the value of the database column jsh_person.Type
*
* @param type the value for jsh_person.Type
*
* @mbggenerated
*/
public void setType(String type) { public void setType(String type) {
this.type = type == null ? null : type.trim(); this.type = type == null ? null : type.trim();
} }
/**
* This method was generated by MyBatis Generator.
* This method returns the value of the database column jsh_person.Name
*
* @return the value of jsh_person.Name
*
* @mbggenerated
*/
public String getName() { public String getName() {
return name; return name;
} }
/**
* This method was generated by MyBatis Generator.
* This method sets the value of the database column jsh_person.Name
*
* @param name the value for jsh_person.Name
*
* @mbggenerated
*/
public void setName(String name) { public void setName(String name) {
this.name = name == null ? null : name.trim(); this.name = name == null ? null : name.trim();
} }
/**
* This method was generated by MyBatis Generator.
* This method returns the value of the database column jsh_person.tenant_id
*
* @return the value of jsh_person.tenant_id
*
* @mbggenerated
*/
public Long getTenantId() { public Long getTenantId() {
return tenantId; return tenantId;
} }
/**
* This method was generated by MyBatis Generator.
* This method sets the value of the database column jsh_person.tenant_id
*
* @param tenantId the value for jsh_person.tenant_id
*
* @mbggenerated
*/
public void setTenantId(Long tenantId) { public void setTenantId(Long tenantId) {
this.tenantId = tenantId; this.tenantId = tenantId;
} }
/**
* This method was generated by MyBatis Generator.
* This method returns the value of the database column jsh_person.delete_Flag
*
* @return the value of jsh_person.delete_Flag
*
* @mbggenerated
*/
public String getDeleteFlag() { public String getDeleteFlag() {
return deleteFlag; return deleteFlag;
} }
/**
* This method was generated by MyBatis Generator.
* This method sets the value of the database column jsh_person.delete_Flag
*
* @param deleteFlag the value for jsh_person.delete_Flag
*
* @mbggenerated
*/
public void setDeleteFlag(String deleteFlag) { public void setDeleteFlag(String deleteFlag) {
this.deleteFlag = deleteFlag == null ? null : deleteFlag.trim(); this.deleteFlag = deleteFlag == null ? null : deleteFlag.trim();
} }

215
src/main/java/com/jsh/erp/datasource/entities/PersonExample.java
View File

@@ -4,118 +4,46 @@ import java.util.ArrayList;
import java.util.List; import java.util.List;
public class PersonExample { public class PersonExample {
/**
* This field was generated by MyBatis Generator.
* This field corresponds to the database table jsh_person
*
* @mbggenerated
*/
protected String orderByClause; protected String orderByClause;
/**
* This field was generated by MyBatis Generator.
* This field corresponds to the database table jsh_person
*
* @mbggenerated
*/
protected boolean distinct; protected boolean distinct;
/**
* This field was generated by MyBatis Generator.
* This field corresponds to the database table jsh_person
*
* @mbggenerated
*/
protected List<Criteria> oredCriteria; protected List<Criteria> oredCriteria;
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table jsh_person
*
* @mbggenerated
*/
public PersonExample() { public PersonExample() {
oredCriteria = new ArrayList<Criteria>(); oredCriteria = new ArrayList<>();
} }
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table jsh_person
*
* @mbggenerated
*/
public void setOrderByClause(String orderByClause) { public void setOrderByClause(String orderByClause) {
this.orderByClause = orderByClause; this.orderByClause = orderByClause;
} }
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table jsh_person
*
* @mbggenerated
*/
public String getOrderByClause() { public String getOrderByClause() {
return orderByClause; return orderByClause;
} }
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table jsh_person
*
* @mbggenerated
*/
public void setDistinct(boolean distinct) { public void setDistinct(boolean distinct) {
this.distinct = distinct; this.distinct = distinct;
} }
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table jsh_person
*
* @mbggenerated
*/
public boolean isDistinct() { public boolean isDistinct() {
return distinct; return distinct;
} }
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table jsh_person
*
* @mbggenerated
*/
public List<Criteria> getOredCriteria() { public List<Criteria> getOredCriteria() {
return oredCriteria; return oredCriteria;
} }
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table jsh_person
*
* @mbggenerated
*/
public void or(Criteria criteria) { public void or(Criteria criteria) {
oredCriteria.add(criteria); oredCriteria.add(criteria);
} }
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table jsh_person
*
* @mbggenerated
*/
public Criteria or() { public Criteria or() {
Criteria criteria = createCriteriaInternal(); Criteria criteria = createCriteriaInternal();
oredCriteria.add(criteria); oredCriteria.add(criteria);
return criteria; return criteria;
} }
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table jsh_person
*
* @mbggenerated
*/
public Criteria createCriteria() { public Criteria createCriteria() {
Criteria criteria = createCriteriaInternal(); Criteria criteria = createCriteriaInternal();
if (oredCriteria.size() == 0) { if (oredCriteria.size() == 0) {
@@ -124,41 +52,23 @@ public class PersonExample {
return criteria; return criteria;
} }
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table jsh_person
*
* @mbggenerated
*/
protected Criteria createCriteriaInternal() { protected Criteria createCriteriaInternal() {
Criteria criteria = new Criteria(); Criteria criteria = new Criteria();
return criteria; return criteria;
} }
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table jsh_person
*
* @mbggenerated
*/
public void clear() { public void clear() {
oredCriteria.clear(); oredCriteria.clear();
orderByClause = null; orderByClause = null;
distinct = false; distinct = false;
} }
/**
* This class was generated by MyBatis Generator.
* This class corresponds to the database table jsh_person
*
* @mbggenerated
*/
protected abstract static class GeneratedCriteria { protected abstract static class GeneratedCriteria {
protected List<Criterion> criteria; protected List<Criterion> criteria;
protected GeneratedCriteria() { protected GeneratedCriteria() {
super(); super();
criteria = new ArrayList<Criterion>(); criteria = new ArrayList<>();
} }
public boolean isValid() { public boolean isValid() {
@@ -195,202 +105,202 @@ public class PersonExample {
} }
public Criteria andIdIsNull() { public Criteria andIdIsNull() {
addCriterion("Id is null"); addCriterion("id is null");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andIdIsNotNull() { public Criteria andIdIsNotNull() {
addCriterion("Id is not null"); addCriterion("id is not null");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andIdEqualTo(Long value) { public Criteria andIdEqualTo(Long value) {
addCriterion("Id =", value, "id"); addCriterion("id =", value, "id");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andIdNotEqualTo(Long value) { public Criteria andIdNotEqualTo(Long value) {
addCriterion("Id <>", value, "id"); addCriterion("id <>", value, "id");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andIdGreaterThan(Long value) { public Criteria andIdGreaterThan(Long value) {
addCriterion("Id >", value, "id"); addCriterion("id >", value, "id");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andIdGreaterThanOrEqualTo(Long value) { public Criteria andIdGreaterThanOrEqualTo(Long value) {
addCriterion("Id >=", value, "id"); addCriterion("id >=", value, "id");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andIdLessThan(Long value) { public Criteria andIdLessThan(Long value) {
addCriterion("Id <", value, "id"); addCriterion("id <", value, "id");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andIdLessThanOrEqualTo(Long value) { public Criteria andIdLessThanOrEqualTo(Long value) {
addCriterion("Id <=", value, "id"); addCriterion("id <=", value, "id");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andIdIn(List<Long> values) { public Criteria andIdIn(List<Long> values) {
addCriterion("Id in", values, "id"); addCriterion("id in", values, "id");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andIdNotIn(List<Long> values) { public Criteria andIdNotIn(List<Long> values) {
addCriterion("Id not in", values, "id"); addCriterion("id not in", values, "id");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andIdBetween(Long value1, Long value2) { public Criteria andIdBetween(Long value1, Long value2) {
addCriterion("Id between", value1, value2, "id"); addCriterion("id between", value1, value2, "id");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andIdNotBetween(Long value1, Long value2) { public Criteria andIdNotBetween(Long value1, Long value2) {
addCriterion("Id not between", value1, value2, "id"); addCriterion("id not between", value1, value2, "id");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andTypeIsNull() { public Criteria andTypeIsNull() {
addCriterion("Type is null"); addCriterion("type is null");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andTypeIsNotNull() { public Criteria andTypeIsNotNull() {
addCriterion("Type is not null"); addCriterion("type is not null");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andTypeEqualTo(String value) { public Criteria andTypeEqualTo(String value) {
addCriterion("Type =", value, "type"); addCriterion("type =", value, "type");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andTypeNotEqualTo(String value) { public Criteria andTypeNotEqualTo(String value) {
addCriterion("Type <>", value, "type"); addCriterion("type <>", value, "type");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andTypeGreaterThan(String value) { public Criteria andTypeGreaterThan(String value) {
addCriterion("Type >", value, "type"); addCriterion("type >", value, "type");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andTypeGreaterThanOrEqualTo(String value) { public Criteria andTypeGreaterThanOrEqualTo(String value) {
addCriterion("Type >=", value, "type"); addCriterion("type >=", value, "type");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andTypeLessThan(String value) { public Criteria andTypeLessThan(String value) {
addCriterion("Type <", value, "type"); addCriterion("type <", value, "type");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andTypeLessThanOrEqualTo(String value) { public Criteria andTypeLessThanOrEqualTo(String value) {
addCriterion("Type <=", value, "type"); addCriterion("type <=", value, "type");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andTypeLike(String value) { public Criteria andTypeLike(String value) {
addCriterion("Type like", value, "type"); addCriterion("type like", value, "type");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andTypeNotLike(String value) { public Criteria andTypeNotLike(String value) {
addCriterion("Type not like", value, "type"); addCriterion("type not like", value, "type");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andTypeIn(List<String> values) { public Criteria andTypeIn(List<String> values) {
addCriterion("Type in", values, "type"); addCriterion("type in", values, "type");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andTypeNotIn(List<String> values) { public Criteria andTypeNotIn(List<String> values) {
addCriterion("Type not in", values, "type"); addCriterion("type not in", values, "type");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andTypeBetween(String value1, String value2) { public Criteria andTypeBetween(String value1, String value2) {
addCriterion("Type between", value1, value2, "type"); addCriterion("type between", value1, value2, "type");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andTypeNotBetween(String value1, String value2) { public Criteria andTypeNotBetween(String value1, String value2) {
addCriterion("Type not between", value1, value2, "type"); addCriterion("type not between", value1, value2, "type");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andNameIsNull() { public Criteria andNameIsNull() {
addCriterion("Name is null"); addCriterion("name is null");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andNameIsNotNull() { public Criteria andNameIsNotNull() {
addCriterion("Name is not null"); addCriterion("name is not null");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andNameEqualTo(String value) { public Criteria andNameEqualTo(String value) {
addCriterion("Name =", value, "name"); addCriterion("name =", value, "name");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andNameNotEqualTo(String value) { public Criteria andNameNotEqualTo(String value) {
addCriterion("Name <>", value, "name"); addCriterion("name <>", value, "name");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andNameGreaterThan(String value) { public Criteria andNameGreaterThan(String value) {
addCriterion("Name >", value, "name"); addCriterion("name >", value, "name");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andNameGreaterThanOrEqualTo(String value) { public Criteria andNameGreaterThanOrEqualTo(String value) {
addCriterion("Name >=", value, "name"); addCriterion("name >=", value, "name");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andNameLessThan(String value) { public Criteria andNameLessThan(String value) {
addCriterion("Name <", value, "name"); addCriterion("name <", value, "name");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andNameLessThanOrEqualTo(String value) { public Criteria andNameLessThanOrEqualTo(String value) {
addCriterion("Name <=", value, "name"); addCriterion("name <=", value, "name");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andNameLike(String value) { public Criteria andNameLike(String value) {
addCriterion("Name like", value, "name"); addCriterion("name like", value, "name");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andNameNotLike(String value) { public Criteria andNameNotLike(String value) {
addCriterion("Name not like", value, "name"); addCriterion("name not like", value, "name");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andNameIn(List<String> values) { public Criteria andNameIn(List<String> values) {
addCriterion("Name in", values, "name"); addCriterion("name in", values, "name");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andNameNotIn(List<String> values) { public Criteria andNameNotIn(List<String> values) {
addCriterion("Name not in", values, "name"); addCriterion("name not in", values, "name");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andNameBetween(String value1, String value2) { public Criteria andNameBetween(String value1, String value2) {
addCriterion("Name between", value1, value2, "name"); addCriterion("name between", value1, value2, "name");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andNameNotBetween(String value1, String value2) { public Criteria andNameNotBetween(String value1, String value2) {
addCriterion("Name not between", value1, value2, "name"); addCriterion("name not between", value1, value2, "name");
return (Criteria) this; return (Criteria) this;
} }
@@ -455,95 +365,82 @@ public class PersonExample {
} }
public Criteria andDeleteFlagIsNull() { public Criteria andDeleteFlagIsNull() {
addCriterion("delete_Flag is null"); addCriterion("delete_flag is null");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andDeleteFlagIsNotNull() { public Criteria andDeleteFlagIsNotNull() {
addCriterion("delete_Flag is not null"); addCriterion("delete_flag is not null");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andDeleteFlagEqualTo(String value) { public Criteria andDeleteFlagEqualTo(String value) {
addCriterion("delete_Flag =", value, "deleteFlag"); addCriterion("delete_flag =", value, "deleteFlag");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andDeleteFlagNotEqualTo(String value) { public Criteria andDeleteFlagNotEqualTo(String value) {
addCriterion("delete_Flag <>", value, "deleteFlag"); addCriterion("delete_flag <>", value, "deleteFlag");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andDeleteFlagGreaterThan(String value) { public Criteria andDeleteFlagGreaterThan(String value) {
addCriterion("delete_Flag >", value, "deleteFlag"); addCriterion("delete_flag >", value, "deleteFlag");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andDeleteFlagGreaterThanOrEqualTo(String value) { public Criteria andDeleteFlagGreaterThanOrEqualTo(String value) {
addCriterion("delete_Flag >=", value, "deleteFlag"); addCriterion("delete_flag >=", value, "deleteFlag");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andDeleteFlagLessThan(String value) { public Criteria andDeleteFlagLessThan(String value) {
addCriterion("delete_Flag <", value, "deleteFlag"); addCriterion("delete_flag <", value, "deleteFlag");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andDeleteFlagLessThanOrEqualTo(String value) { public Criteria andDeleteFlagLessThanOrEqualTo(String value) {
addCriterion("delete_Flag <=", value, "deleteFlag"); addCriterion("delete_flag <=", value, "deleteFlag");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andDeleteFlagLike(String value) { public Criteria andDeleteFlagLike(String value) {
addCriterion("delete_Flag like", value, "deleteFlag"); addCriterion("delete_flag like", value, "deleteFlag");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andDeleteFlagNotLike(String value) { public Criteria andDeleteFlagNotLike(String value) {
addCriterion("delete_Flag not like", value, "deleteFlag"); addCriterion("delete_flag not like", value, "deleteFlag");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andDeleteFlagIn(List<String> values) { public Criteria andDeleteFlagIn(List<String> values) {
addCriterion("delete_Flag in", values, "deleteFlag"); addCriterion("delete_flag in", values, "deleteFlag");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andDeleteFlagNotIn(List<String> values) { public Criteria andDeleteFlagNotIn(List<String> values) {
addCriterion("delete_Flag not in", values, "deleteFlag"); addCriterion("delete_flag not in", values, "deleteFlag");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andDeleteFlagBetween(String value1, String value2) { public Criteria andDeleteFlagBetween(String value1, String value2) {
addCriterion("delete_Flag between", value1, value2, "deleteFlag"); addCriterion("delete_flag between", value1, value2, "deleteFlag");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andDeleteFlagNotBetween(String value1, String value2) { public Criteria andDeleteFlagNotBetween(String value1, String value2) {
addCriterion("delete_Flag not between", value1, value2, "deleteFlag"); addCriterion("delete_flag not between", value1, value2, "deleteFlag");
return (Criteria) this; return (Criteria) this;
} }
} }
/**
* This class was generated by MyBatis Generator.
* This class corresponds to the database table jsh_person
*
* @mbggenerated do_not_delete_during_merge
*/
public static class Criteria extends GeneratedCriteria { public static class Criteria extends GeneratedCriteria {
protected Criteria() { protected Criteria() {
super(); super();
} }
} }
/**
* This class was generated by MyBatis Generator.
* This class corresponds to the database table jsh_person
*
* @mbggenerated
*/
public static class Criterion { public static class Criterion {
private String condition; private String condition;

154
src/main/java/com/jsh/erp/datasource/entities/Role.java
View File

@@ -1,226 +1,72 @@
package com.jsh.erp.datasource.entities; package com.jsh.erp.datasource.entities;
public class Role { public class Role {
/**
* This field was generated by MyBatis Generator.
* This field corresponds to the database column jsh_role.Id
*
* @mbggenerated
*/
private Long id; private Long id;
/**
* This field was generated by MyBatis Generator.
* This field corresponds to the database column jsh_role.Name
*
* @mbggenerated
*/
private String name; private String name;
/**
* This field was generated by MyBatis Generator.
* This field corresponds to the database column jsh_role.type
*
* @mbggenerated
*/
private String type; private String type;
/**
* This field was generated by MyBatis Generator.
* This field corresponds to the database column jsh_role.value
*
* @mbggenerated
*/
private String value; private String value;
/**
* This field was generated by MyBatis Generator.
* This field corresponds to the database column jsh_role.description
*
* @mbggenerated
*/
private String description; private String description;
/**
* This field was generated by MyBatis Generator.
* This field corresponds to the database column jsh_role.tenant_id
*
* @mbggenerated
*/
private Long tenantId; 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; private String deleteFlag;
/**
* This method was generated by MyBatis Generator.
* This method returns the value of the database column jsh_role.Id
*
* @return the value of jsh_role.Id
*
* @mbggenerated
*/
public Long getId() { public Long getId() {
return id; return id;
} }
/**
* This method was generated by MyBatis Generator.
* This method sets the value of the database column jsh_role.Id
*
* @param id the value for jsh_role.Id
*
* @mbggenerated
*/
public void setId(Long id) { public void setId(Long id) {
this.id = id; this.id = id;
} }
/**
* This method was generated by MyBatis Generator.
* This method returns the value of the database column jsh_role.Name
*
* @return the value of jsh_role.Name
*
* @mbggenerated
*/
public String getName() { public String getName() {
return name; return name;
} }
/**
* This method was generated by MyBatis Generator.
* This method sets the value of the database column jsh_role.Name
*
* @param name the value for jsh_role.Name
*
* @mbggenerated
*/
public void setName(String name) { public void setName(String name) {
this.name = name == null ? null : name.trim(); this.name = name == null ? null : name.trim();
} }
/**
* This method was generated by MyBatis Generator.
* This method returns the value of the database column jsh_role.type
*
* @return the value of jsh_role.type
*
* @mbggenerated
*/
public String getType() { public String getType() {
return type; return type;
} }
/**
* This method was generated by MyBatis Generator.
* This method sets the value of the database column jsh_role.type
*
* @param type the value for jsh_role.type
*
* @mbggenerated
*/
public void setType(String type) { public void setType(String type) {
this.type = type == null ? null : type.trim(); this.type = type == null ? null : type.trim();
} }
/**
* This method was generated by MyBatis Generator.
* This method returns the value of the database column jsh_role.value
*
* @return the value of jsh_role.value
*
* @mbggenerated
*/
public String getValue() { public String getValue() {
return value; return value;
} }
/**
* This method was generated by MyBatis Generator.
* This method sets the value of the database column jsh_role.value
*
* @param value the value for jsh_role.value
*
* @mbggenerated
*/
public void setValue(String value) { public void setValue(String value) {
this.value = value == null ? null : value.trim(); this.value = value == null ? null : value.trim();
} }
/**
* This method was generated by MyBatis Generator.
* This method returns the value of the database column jsh_role.description
*
* @return the value of jsh_role.description
*
* @mbggenerated
*/
public String getDescription() { public String getDescription() {
return description; return description;
} }
/**
* This method was generated by MyBatis Generator.
* This method sets the value of the database column jsh_role.description
*
* @param description the value for jsh_role.description
*
* @mbggenerated
*/
public void setDescription(String description) { public void setDescription(String description) {
this.description = description == null ? null : description.trim(); this.description = description == null ? null : description.trim();
} }
/**
* This method was generated by MyBatis Generator.
* This method returns the value of the database column jsh_role.tenant_id
*
* @return the value of jsh_role.tenant_id
*
* @mbggenerated
*/
public Long getTenantId() { public Long getTenantId() {
return tenantId; return tenantId;
} }
/**
* This method was generated by MyBatis Generator.
* This method sets the value of the database column jsh_role.tenant_id
*
* @param tenantId the value for jsh_role.tenant_id
*
* @mbggenerated
*/
public void setTenantId(Long tenantId) { public void setTenantId(Long tenantId) {
this.tenantId = tenantId; this.tenantId = tenantId;
} }
/**
* This method was generated by MyBatis Generator.
* This method returns the value of the database column jsh_role.delete_Flag
*
* @return the value of jsh_role.delete_Flag
*
* @mbggenerated
*/
public String getDeleteFlag() { public String getDeleteFlag() {
return deleteFlag; return deleteFlag;
} }
/**
* This method was generated by MyBatis Generator.
* This method sets the value of the database column jsh_role.delete_Flag
*
* @param deleteFlag the value for jsh_role.delete_Flag
*
* @mbggenerated
*/
public void setDeleteFlag(String deleteFlag) { public void setDeleteFlag(String deleteFlag) {
this.deleteFlag = deleteFlag == null ? null : deleteFlag.trim(); this.deleteFlag = deleteFlag == null ? null : deleteFlag.trim();
} }

187
src/main/java/com/jsh/erp/datasource/entities/RoleExample.java
View File

@@ -4,118 +4,46 @@ import java.util.ArrayList;
import java.util.List; import java.util.List;
public class RoleExample { public class RoleExample {
/**
* This field was generated by MyBatis Generator.
* This field corresponds to the database table jsh_role
*
* @mbggenerated
*/
protected String orderByClause; protected String orderByClause;
/**
* This field was generated by MyBatis Generator.
* This field corresponds to the database table jsh_role
*
* @mbggenerated
*/
protected boolean distinct; protected boolean distinct;
/**
* This field was generated by MyBatis Generator.
* This field corresponds to the database table jsh_role
*
* @mbggenerated
*/
protected List<Criteria> oredCriteria; protected List<Criteria> oredCriteria;
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table jsh_role
*
* @mbggenerated
*/
public RoleExample() { public RoleExample() {
oredCriteria = new ArrayList<Criteria>(); oredCriteria = new ArrayList<>();
} }
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table jsh_role
*
* @mbggenerated
*/
public void setOrderByClause(String orderByClause) { public void setOrderByClause(String orderByClause) {
this.orderByClause = orderByClause; this.orderByClause = orderByClause;
} }
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table jsh_role
*
* @mbggenerated
*/
public String getOrderByClause() { public String getOrderByClause() {
return orderByClause; return orderByClause;
} }
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table jsh_role
*
* @mbggenerated
*/
public void setDistinct(boolean distinct) { public void setDistinct(boolean distinct) {
this.distinct = distinct; this.distinct = distinct;
} }
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table jsh_role
*
* @mbggenerated
*/
public boolean isDistinct() { public boolean isDistinct() {
return distinct; return distinct;
} }
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table jsh_role
*
* @mbggenerated
*/
public List<Criteria> getOredCriteria() { public List<Criteria> getOredCriteria() {
return oredCriteria; return oredCriteria;
} }
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table jsh_role
*
* @mbggenerated
*/
public void or(Criteria criteria) { public void or(Criteria criteria) {
oredCriteria.add(criteria); oredCriteria.add(criteria);
} }
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table jsh_role
*
* @mbggenerated
*/
public Criteria or() { public Criteria or() {
Criteria criteria = createCriteriaInternal(); Criteria criteria = createCriteriaInternal();
oredCriteria.add(criteria); oredCriteria.add(criteria);
return criteria; return criteria;
} }
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table jsh_role
*
* @mbggenerated
*/
public Criteria createCriteria() { public Criteria createCriteria() {
Criteria criteria = createCriteriaInternal(); Criteria criteria = createCriteriaInternal();
if (oredCriteria.size() == 0) { if (oredCriteria.size() == 0) {
@@ -124,41 +52,23 @@ public class RoleExample {
return criteria; return criteria;
} }
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table jsh_role
*
* @mbggenerated
*/
protected Criteria createCriteriaInternal() { protected Criteria createCriteriaInternal() {
Criteria criteria = new Criteria(); Criteria criteria = new Criteria();
return criteria; return criteria;
} }
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table jsh_role
*
* @mbggenerated
*/
public void clear() { public void clear() {
oredCriteria.clear(); oredCriteria.clear();
orderByClause = null; orderByClause = null;
distinct = false; distinct = false;
} }
/**
* This class was generated by MyBatis Generator.
* This class corresponds to the database table jsh_role
*
* @mbggenerated
*/
protected abstract static class GeneratedCriteria { protected abstract static class GeneratedCriteria {
protected List<Criterion> criteria; protected List<Criterion> criteria;
protected GeneratedCriteria() { protected GeneratedCriteria() {
super(); super();
criteria = new ArrayList<Criterion>(); criteria = new ArrayList<>();
} }
public boolean isValid() { public boolean isValid() {
@@ -195,132 +105,132 @@ public class RoleExample {
} }
public Criteria andIdIsNull() { public Criteria andIdIsNull() {
addCriterion("Id is null"); addCriterion("id is null");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andIdIsNotNull() { public Criteria andIdIsNotNull() {
addCriterion("Id is not null"); addCriterion("id is not null");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andIdEqualTo(Long value) { public Criteria andIdEqualTo(Long value) {
addCriterion("Id =", value, "id"); addCriterion("id =", value, "id");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andIdNotEqualTo(Long value) { public Criteria andIdNotEqualTo(Long value) {
addCriterion("Id <>", value, "id"); addCriterion("id <>", value, "id");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andIdGreaterThan(Long value) { public Criteria andIdGreaterThan(Long value) {
addCriterion("Id >", value, "id"); addCriterion("id >", value, "id");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andIdGreaterThanOrEqualTo(Long value) { public Criteria andIdGreaterThanOrEqualTo(Long value) {
addCriterion("Id >=", value, "id"); addCriterion("id >=", value, "id");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andIdLessThan(Long value) { public Criteria andIdLessThan(Long value) {
addCriterion("Id <", value, "id"); addCriterion("id <", value, "id");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andIdLessThanOrEqualTo(Long value) { public Criteria andIdLessThanOrEqualTo(Long value) {
addCriterion("Id <=", value, "id"); addCriterion("id <=", value, "id");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andIdIn(List<Long> values) { public Criteria andIdIn(List<Long> values) {
addCriterion("Id in", values, "id"); addCriterion("id in", values, "id");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andIdNotIn(List<Long> values) { public Criteria andIdNotIn(List<Long> values) {
addCriterion("Id not in", values, "id"); addCriterion("id not in", values, "id");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andIdBetween(Long value1, Long value2) { public Criteria andIdBetween(Long value1, Long value2) {
addCriterion("Id between", value1, value2, "id"); addCriterion("id between", value1, value2, "id");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andIdNotBetween(Long value1, Long value2) { public Criteria andIdNotBetween(Long value1, Long value2) {
addCriterion("Id not between", value1, value2, "id"); addCriterion("id not between", value1, value2, "id");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andNameIsNull() { public Criteria andNameIsNull() {
addCriterion("Name is null"); addCriterion("name is null");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andNameIsNotNull() { public Criteria andNameIsNotNull() {
addCriterion("Name is not null"); addCriterion("name is not null");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andNameEqualTo(String value) { public Criteria andNameEqualTo(String value) {
addCriterion("Name =", value, "name"); addCriterion("name =", value, "name");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andNameNotEqualTo(String value) { public Criteria andNameNotEqualTo(String value) {
addCriterion("Name <>", value, "name"); addCriterion("name <>", value, "name");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andNameGreaterThan(String value) { public Criteria andNameGreaterThan(String value) {
addCriterion("Name >", value, "name"); addCriterion("name >", value, "name");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andNameGreaterThanOrEqualTo(String value) { public Criteria andNameGreaterThanOrEqualTo(String value) {
addCriterion("Name >=", value, "name"); addCriterion("name >=", value, "name");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andNameLessThan(String value) { public Criteria andNameLessThan(String value) {
addCriterion("Name <", value, "name"); addCriterion("name <", value, "name");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andNameLessThanOrEqualTo(String value) { public Criteria andNameLessThanOrEqualTo(String value) {
addCriterion("Name <=", value, "name"); addCriterion("name <=", value, "name");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andNameLike(String value) { public Criteria andNameLike(String value) {
addCriterion("Name like", value, "name"); addCriterion("name like", value, "name");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andNameNotLike(String value) { public Criteria andNameNotLike(String value) {
addCriterion("Name not like", value, "name"); addCriterion("name not like", value, "name");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andNameIn(List<String> values) { public Criteria andNameIn(List<String> values) {
addCriterion("Name in", values, "name"); addCriterion("name in", values, "name");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andNameNotIn(List<String> values) { public Criteria andNameNotIn(List<String> values) {
addCriterion("Name not in", values, "name"); addCriterion("name not in", values, "name");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andNameBetween(String value1, String value2) { public Criteria andNameBetween(String value1, String value2) {
addCriterion("Name between", value1, value2, "name"); addCriterion("name between", value1, value2, "name");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andNameNotBetween(String value1, String value2) { public Criteria andNameNotBetween(String value1, String value2) {
addCriterion("Name not between", value1, value2, "name"); addCriterion("name not between", value1, value2, "name");
return (Criteria) this; return (Criteria) this;
} }
@@ -595,95 +505,82 @@ public class RoleExample {
} }
public Criteria andDeleteFlagIsNull() { public Criteria andDeleteFlagIsNull() {
addCriterion("delete_Flag is null"); addCriterion("delete_flag is null");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andDeleteFlagIsNotNull() { public Criteria andDeleteFlagIsNotNull() {
addCriterion("delete_Flag is not null"); addCriterion("delete_flag is not null");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andDeleteFlagEqualTo(String value) { public Criteria andDeleteFlagEqualTo(String value) {
addCriterion("delete_Flag =", value, "deleteFlag"); addCriterion("delete_flag =", value, "deleteFlag");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andDeleteFlagNotEqualTo(String value) { public Criteria andDeleteFlagNotEqualTo(String value) {
addCriterion("delete_Flag <>", value, "deleteFlag"); addCriterion("delete_flag <>", value, "deleteFlag");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andDeleteFlagGreaterThan(String value) { public Criteria andDeleteFlagGreaterThan(String value) {
addCriterion("delete_Flag >", value, "deleteFlag"); addCriterion("delete_flag >", value, "deleteFlag");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andDeleteFlagGreaterThanOrEqualTo(String value) { public Criteria andDeleteFlagGreaterThanOrEqualTo(String value) {
addCriterion("delete_Flag >=", value, "deleteFlag"); addCriterion("delete_flag >=", value, "deleteFlag");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andDeleteFlagLessThan(String value) { public Criteria andDeleteFlagLessThan(String value) {
addCriterion("delete_Flag <", value, "deleteFlag"); addCriterion("delete_flag <", value, "deleteFlag");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andDeleteFlagLessThanOrEqualTo(String value) { public Criteria andDeleteFlagLessThanOrEqualTo(String value) {
addCriterion("delete_Flag <=", value, "deleteFlag"); addCriterion("delete_flag <=", value, "deleteFlag");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andDeleteFlagLike(String value) { public Criteria andDeleteFlagLike(String value) {
addCriterion("delete_Flag like", value, "deleteFlag"); addCriterion("delete_flag like", value, "deleteFlag");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andDeleteFlagNotLike(String value) { public Criteria andDeleteFlagNotLike(String value) {
addCriterion("delete_Flag not like", value, "deleteFlag"); addCriterion("delete_flag not like", value, "deleteFlag");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andDeleteFlagIn(List<String> values) { public Criteria andDeleteFlagIn(List<String> values) {
addCriterion("delete_Flag in", values, "deleteFlag"); addCriterion("delete_flag in", values, "deleteFlag");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andDeleteFlagNotIn(List<String> values) { public Criteria andDeleteFlagNotIn(List<String> values) {
addCriterion("delete_Flag not in", values, "deleteFlag"); addCriterion("delete_flag not in", values, "deleteFlag");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andDeleteFlagBetween(String value1, String value2) { public Criteria andDeleteFlagBetween(String value1, String value2) {
addCriterion("delete_Flag between", value1, value2, "deleteFlag"); addCriterion("delete_flag between", value1, value2, "deleteFlag");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andDeleteFlagNotBetween(String value1, String value2) { public Criteria andDeleteFlagNotBetween(String value1, String value2) {
addCriterion("delete_Flag not between", value1, value2, "deleteFlag"); addCriterion("delete_flag not between", value1, value2, "deleteFlag");
return (Criteria) this; return (Criteria) this;
} }
} }
/**
* This class was generated by MyBatis Generator.
* This class corresponds to the database table jsh_role
*
* @mbggenerated do_not_delete_during_merge
*/
public static class Criteria extends GeneratedCriteria { public static class Criteria extends GeneratedCriteria {
protected Criteria() { protected Criteria() {
super(); super();
} }
} }
/**
* This class was generated by MyBatis Generator.
* This class corresponds to the database table jsh_role
*
* @mbggenerated
*/
public static class Criterion { public static class Criterion {
private String condition; private String condition;

274
src/main/java/com/jsh/erp/datasource/entities/SerialNumber.java
View File

@@ -3,386 +3,122 @@ package com.jsh.erp.datasource.entities;
import java.util.Date; import java.util.Date;
public class SerialNumber { public class SerialNumber {
/**
* This field was generated by MyBatis Generator.
* This field corresponds to the database column jsh_serial_number.id
*
* @mbggenerated
*/
private Long id; private Long id;
/**
* This field was generated by MyBatis Generator.
* This field corresponds to the database column jsh_serial_number.material_Id
*
* @mbggenerated
*/
private Long materialId; private Long materialId;
/**
* This field was generated by MyBatis Generator.
* This field corresponds to the database column jsh_serial_number.serial_Number
*
* @mbggenerated
*/
private String serialNumber; private String serialNumber;
/**
* This field was generated by MyBatis Generator.
* This field corresponds to the database column jsh_serial_number.is_Sell
*
* @mbggenerated
*/
private String isSell; private String isSell;
/**
* This field was generated by MyBatis Generator.
* This field corresponds to the database column jsh_serial_number.remark
*
* @mbggenerated
*/
private String remark; private String remark;
/**
* This field was generated by MyBatis Generator.
* This field corresponds to the database column jsh_serial_number.delete_Flag
*
* @mbggenerated
*/
private String deleteFlag; private String deleteFlag;
/**
* This field was generated by MyBatis Generator.
* This field corresponds to the database column jsh_serial_number.create_Time
*
* @mbggenerated
*/
private Date createTime; private Date createTime;
/**
* This field was generated by MyBatis Generator.
* This field corresponds to the database column jsh_serial_number.creator
*
* @mbggenerated
*/
private Long creator; private Long creator;
/**
* This field was generated by MyBatis Generator.
* This field corresponds to the database column jsh_serial_number.update_Time
*
* @mbggenerated
*/
private Date updateTime; private Date updateTime;
/**
* This field was generated by MyBatis Generator.
* This field corresponds to the database column jsh_serial_number.updater
*
* @mbggenerated
*/
private Long updater; private Long updater;
/** private Long depotHeadId;
* This field was generated by MyBatis Generator.
* This field corresponds to the database column jsh_serial_number.depothead_Id
*
* @mbggenerated
*/
private Long depotheadId;
/**
* This field was generated by MyBatis Generator.
* This field corresponds to the database column jsh_serial_number.tenant_id
*
* @mbggenerated
*/
private Long tenantId; private Long tenantId;
/**
* This method was generated by MyBatis Generator.
* This method returns the value of the database column jsh_serial_number.id
*
* @return the value of jsh_serial_number.id
*
* @mbggenerated
*/
public Long getId() { public Long getId() {
return id; return id;
} }
/**
* This method was generated by MyBatis Generator.
* This method sets the value of the database column jsh_serial_number.id
*
* @param id the value for jsh_serial_number.id
*
* @mbggenerated
*/
public void setId(Long id) { public void setId(Long id) {
this.id = id; this.id = id;
} }
/**
* This method was generated by MyBatis Generator.
* This method returns the value of the database column jsh_serial_number.material_Id
*
* @return the value of jsh_serial_number.material_Id
*
* @mbggenerated
*/
public Long getMaterialId() { public Long getMaterialId() {
return materialId; return materialId;
} }
/**
* This method was generated by MyBatis Generator.
* This method sets the value of the database column jsh_serial_number.material_Id
*
* @param materialId the value for jsh_serial_number.material_Id
*
* @mbggenerated
*/
public void setMaterialId(Long materialId) { public void setMaterialId(Long materialId) {
this.materialId = materialId; this.materialId = materialId;
} }
/**
* This method was generated by MyBatis Generator.
* This method returns the value of the database column jsh_serial_number.serial_Number
*
* @return the value of jsh_serial_number.serial_Number
*
* @mbggenerated
*/
public String getSerialNumber() { public String getSerialNumber() {
return serialNumber; return serialNumber;
} }
/**
* This method was generated by MyBatis Generator.
* This method sets the value of the database column jsh_serial_number.serial_Number
*
* @param serialNumber the value for jsh_serial_number.serial_Number
*
* @mbggenerated
*/
public void setSerialNumber(String serialNumber) { public void setSerialNumber(String serialNumber) {
this.serialNumber = serialNumber == null ? null : serialNumber.trim(); this.serialNumber = serialNumber == null ? null : serialNumber.trim();
} }
/**
* This method was generated by MyBatis Generator.
* This method returns the value of the database column jsh_serial_number.is_Sell
*
* @return the value of jsh_serial_number.is_Sell
*
* @mbggenerated
*/
public String getIsSell() { public String getIsSell() {
return isSell; return isSell;
} }
/**
* This method was generated by MyBatis Generator.
* This method sets the value of the database column jsh_serial_number.is_Sell
*
* @param isSell the value for jsh_serial_number.is_Sell
*
* @mbggenerated
*/
public void setIsSell(String isSell) { public void setIsSell(String isSell) {
this.isSell = isSell == null ? null : isSell.trim(); this.isSell = isSell == null ? null : isSell.trim();
} }
/**
* This method was generated by MyBatis Generator.
* This method returns the value of the database column jsh_serial_number.remark
*
* @return the value of jsh_serial_number.remark
*
* @mbggenerated
*/
public String getRemark() { public String getRemark() {
return remark; return remark;
} }
/**
* This method was generated by MyBatis Generator.
* This method sets the value of the database column jsh_serial_number.remark
*
* @param remark the value for jsh_serial_number.remark
*
* @mbggenerated
*/
public void setRemark(String remark) { public void setRemark(String remark) {
this.remark = remark == null ? null : remark.trim(); this.remark = remark == null ? null : remark.trim();
} }
/**
* This method was generated by MyBatis Generator.
* This method returns the value of the database column jsh_serial_number.delete_Flag
*
* @return the value of jsh_serial_number.delete_Flag
*
* @mbggenerated
*/
public String getDeleteFlag() { public String getDeleteFlag() {
return deleteFlag; return deleteFlag;
} }
/**
* This method was generated by MyBatis Generator.
* This method sets the value of the database column jsh_serial_number.delete_Flag
*
* @param deleteFlag the value for jsh_serial_number.delete_Flag
*
* @mbggenerated
*/
public void setDeleteFlag(String deleteFlag) { public void setDeleteFlag(String deleteFlag) {
this.deleteFlag = deleteFlag == null ? null : deleteFlag.trim(); this.deleteFlag = deleteFlag == null ? null : deleteFlag.trim();
} }
/**
* This method was generated by MyBatis Generator.
* This method returns the value of the database column jsh_serial_number.create_Time
*
* @return the value of jsh_serial_number.create_Time
*
* @mbggenerated
*/
public Date getCreateTime() { public Date getCreateTime() {
return createTime; return createTime;
} }
/**
* This method was generated by MyBatis Generator.
* This method sets the value of the database column jsh_serial_number.create_Time
*
* @param createTime the value for jsh_serial_number.create_Time
*
* @mbggenerated
*/
public void setCreateTime(Date createTime) { public void setCreateTime(Date createTime) {
this.createTime = createTime; this.createTime = createTime;
} }
/**
* This method was generated by MyBatis Generator.
* This method returns the value of the database column jsh_serial_number.creator
*
* @return the value of jsh_serial_number.creator
*
* @mbggenerated
*/
public Long getCreator() { public Long getCreator() {
return creator; return creator;
} }
/**
* This method was generated by MyBatis Generator.
* This method sets the value of the database column jsh_serial_number.creator
*
* @param creator the value for jsh_serial_number.creator
*
* @mbggenerated
*/
public void setCreator(Long creator) { public void setCreator(Long creator) {
this.creator = creator; this.creator = creator;
} }
/**
* This method was generated by MyBatis Generator.
* This method returns the value of the database column jsh_serial_number.update_Time
*
* @return the value of jsh_serial_number.update_Time
*
* @mbggenerated
*/
public Date getUpdateTime() { public Date getUpdateTime() {
return updateTime; return updateTime;
} }
/**
* This method was generated by MyBatis Generator.
* This method sets the value of the database column jsh_serial_number.update_Time
*
* @param updateTime the value for jsh_serial_number.update_Time
*
* @mbggenerated
*/
public void setUpdateTime(Date updateTime) { public void setUpdateTime(Date updateTime) {
this.updateTime = updateTime; this.updateTime = updateTime;
} }
/**
* This method was generated by MyBatis Generator.
* This method returns the value of the database column jsh_serial_number.updater
*
* @return the value of jsh_serial_number.updater
*
* @mbggenerated
*/
public Long getUpdater() { public Long getUpdater() {
return updater; return updater;
} }
/**
* This method was generated by MyBatis Generator.
* This method sets the value of the database column jsh_serial_number.updater
*
* @param updater the value for jsh_serial_number.updater
*
* @mbggenerated
*/
public void setUpdater(Long updater) { public void setUpdater(Long updater) {
this.updater = updater; this.updater = updater;
} }
/** public Long getDepotHeadId() {
* This method was generated by MyBatis Generator. return depotHeadId;
* This method returns the value of the database column jsh_serial_number.depothead_Id
*
* @return the value of jsh_serial_number.depothead_Id
*
* @mbggenerated
*/
public Long getDepotheadId() {
return depotheadId;
} }
/** public void setDepotHeadId(Long depotHeadId) {
* This method was generated by MyBatis Generator. this.depotHeadId = depotHeadId;
* This method sets the value of the database column jsh_serial_number.depothead_Id
*
* @param depotheadId the value for jsh_serial_number.depothead_Id
*
* @mbggenerated
*/
public void setDepotheadId(Long depotheadId) {
this.depotheadId = depotheadId;
} }
/**
* This method was generated by MyBatis Generator.
* This method returns the value of the database column jsh_serial_number.tenant_id
*
* @return the value of jsh_serial_number.tenant_id
*
* @mbggenerated
*/
public Long getTenantId() { public Long getTenantId() {
return tenantId; return tenantId;
} }
/**
* This method was generated by MyBatis Generator.
* This method sets the value of the database column jsh_serial_number.tenant_id
*
* @param tenantId the value for jsh_serial_number.tenant_id
*
* @mbggenerated
*/
public void setTenantId(Long tenantId) { public void setTenantId(Long tenantId) {
this.tenantId = tenantId; this.tenantId = tenantId;
} }

311
src/main/java/com/jsh/erp/datasource/entities/SerialNumberExample.java
View File

@@ -5,118 +5,46 @@ import java.util.Date;
import java.util.List; import java.util.List;
public class SerialNumberExample { public class SerialNumberExample {
/**
* This field was generated by MyBatis Generator.
* This field corresponds to the database table jsh_serial_number
*
* @mbggenerated
*/
protected String orderByClause; protected String orderByClause;
/**
* This field was generated by MyBatis Generator.
* This field corresponds to the database table jsh_serial_number
*
* @mbggenerated
*/
protected boolean distinct; protected boolean distinct;
/**
* This field was generated by MyBatis Generator.
* This field corresponds to the database table jsh_serial_number
*
* @mbggenerated
*/
protected List<Criteria> oredCriteria; protected List<Criteria> oredCriteria;
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table jsh_serial_number
*
* @mbggenerated
*/
public SerialNumberExample() { public SerialNumberExample() {
oredCriteria = new ArrayList<Criteria>(); oredCriteria = new ArrayList<>();
} }
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table jsh_serial_number
*
* @mbggenerated
*/
public void setOrderByClause(String orderByClause) { public void setOrderByClause(String orderByClause) {
this.orderByClause = orderByClause; this.orderByClause = orderByClause;
} }
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table jsh_serial_number
*
* @mbggenerated
*/
public String getOrderByClause() { public String getOrderByClause() {
return orderByClause; return orderByClause;
} }
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table jsh_serial_number
*
* @mbggenerated
*/
public void setDistinct(boolean distinct) { public void setDistinct(boolean distinct) {
this.distinct = distinct; this.distinct = distinct;
} }
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table jsh_serial_number
*
* @mbggenerated
*/
public boolean isDistinct() { public boolean isDistinct() {
return distinct; return distinct;
} }
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table jsh_serial_number
*
* @mbggenerated
*/
public List<Criteria> getOredCriteria() { public List<Criteria> getOredCriteria() {
return oredCriteria; return oredCriteria;
} }
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table jsh_serial_number
*
* @mbggenerated
*/
public void or(Criteria criteria) { public void or(Criteria criteria) {
oredCriteria.add(criteria); oredCriteria.add(criteria);
} }
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table jsh_serial_number
*
* @mbggenerated
*/
public Criteria or() { public Criteria or() {
Criteria criteria = createCriteriaInternal(); Criteria criteria = createCriteriaInternal();
oredCriteria.add(criteria); oredCriteria.add(criteria);
return criteria; return criteria;
} }
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table jsh_serial_number
*
* @mbggenerated
*/
public Criteria createCriteria() { public Criteria createCriteria() {
Criteria criteria = createCriteriaInternal(); Criteria criteria = createCriteriaInternal();
if (oredCriteria.size() == 0) { if (oredCriteria.size() == 0) {
@@ -125,41 +53,23 @@ public class SerialNumberExample {
return criteria; return criteria;
} }
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table jsh_serial_number
*
* @mbggenerated
*/
protected Criteria createCriteriaInternal() { protected Criteria createCriteriaInternal() {
Criteria criteria = new Criteria(); Criteria criteria = new Criteria();
return criteria; return criteria;
} }
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table jsh_serial_number
*
* @mbggenerated
*/
public void clear() { public void clear() {
oredCriteria.clear(); oredCriteria.clear();
orderByClause = null; orderByClause = null;
distinct = false; distinct = false;
} }
/**
* This class was generated by MyBatis Generator.
* This class corresponds to the database table jsh_serial_number
*
* @mbggenerated
*/
protected abstract static class GeneratedCriteria { protected abstract static class GeneratedCriteria {
protected List<Criterion> criteria; protected List<Criterion> criteria;
protected GeneratedCriteria() { protected GeneratedCriteria() {
super(); super();
criteria = new ArrayList<Criterion>(); criteria = new ArrayList<>();
} }
public boolean isValid() { public boolean isValid() {
@@ -256,202 +166,202 @@ public class SerialNumberExample {
} }
public Criteria andMaterialIdIsNull() { public Criteria andMaterialIdIsNull() {
addCriterion("material_Id is null"); addCriterion("material_id is null");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andMaterialIdIsNotNull() { public Criteria andMaterialIdIsNotNull() {
addCriterion("material_Id is not null"); addCriterion("material_id is not null");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andMaterialIdEqualTo(Long value) { public Criteria andMaterialIdEqualTo(Long value) {
addCriterion("material_Id =", value, "materialId"); addCriterion("material_id =", value, "materialId");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andMaterialIdNotEqualTo(Long value) { public Criteria andMaterialIdNotEqualTo(Long value) {
addCriterion("material_Id <>", value, "materialId"); addCriterion("material_id <>", value, "materialId");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andMaterialIdGreaterThan(Long value) { public Criteria andMaterialIdGreaterThan(Long value) {
addCriterion("material_Id >", value, "materialId"); addCriterion("material_id >", value, "materialId");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andMaterialIdGreaterThanOrEqualTo(Long value) { public Criteria andMaterialIdGreaterThanOrEqualTo(Long value) {
addCriterion("material_Id >=", value, "materialId"); addCriterion("material_id >=", value, "materialId");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andMaterialIdLessThan(Long value) { public Criteria andMaterialIdLessThan(Long value) {
addCriterion("material_Id <", value, "materialId"); addCriterion("material_id <", value, "materialId");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andMaterialIdLessThanOrEqualTo(Long value) { public Criteria andMaterialIdLessThanOrEqualTo(Long value) {
addCriterion("material_Id <=", value, "materialId"); addCriterion("material_id <=", value, "materialId");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andMaterialIdIn(List<Long> values) { public Criteria andMaterialIdIn(List<Long> values) {
addCriterion("material_Id in", values, "materialId"); addCriterion("material_id in", values, "materialId");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andMaterialIdNotIn(List<Long> values) { public Criteria andMaterialIdNotIn(List<Long> values) {
addCriterion("material_Id not in", values, "materialId"); addCriterion("material_id not in", values, "materialId");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andMaterialIdBetween(Long value1, Long value2) { public Criteria andMaterialIdBetween(Long value1, Long value2) {
addCriterion("material_Id between", value1, value2, "materialId"); addCriterion("material_id between", value1, value2, "materialId");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andMaterialIdNotBetween(Long value1, Long value2) { public Criteria andMaterialIdNotBetween(Long value1, Long value2) {
addCriterion("material_Id not between", value1, value2, "materialId"); addCriterion("material_id not between", value1, value2, "materialId");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andSerialNumberIsNull() { public Criteria andSerialNumberIsNull() {
addCriterion("serial_Number is null"); addCriterion("serial_number is null");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andSerialNumberIsNotNull() { public Criteria andSerialNumberIsNotNull() {
addCriterion("serial_Number is not null"); addCriterion("serial_number is not null");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andSerialNumberEqualTo(String value) { public Criteria andSerialNumberEqualTo(String value) {
addCriterion("serial_Number =", value, "serialNumber"); addCriterion("serial_number =", value, "serialNumber");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andSerialNumberNotEqualTo(String value) { public Criteria andSerialNumberNotEqualTo(String value) {
addCriterion("serial_Number <>", value, "serialNumber"); addCriterion("serial_number <>", value, "serialNumber");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andSerialNumberGreaterThan(String value) { public Criteria andSerialNumberGreaterThan(String value) {
addCriterion("serial_Number >", value, "serialNumber"); addCriterion("serial_number >", value, "serialNumber");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andSerialNumberGreaterThanOrEqualTo(String value) { public Criteria andSerialNumberGreaterThanOrEqualTo(String value) {
addCriterion("serial_Number >=", value, "serialNumber"); addCriterion("serial_number >=", value, "serialNumber");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andSerialNumberLessThan(String value) { public Criteria andSerialNumberLessThan(String value) {
addCriterion("serial_Number <", value, "serialNumber"); addCriterion("serial_number <", value, "serialNumber");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andSerialNumberLessThanOrEqualTo(String value) { public Criteria andSerialNumberLessThanOrEqualTo(String value) {
addCriterion("serial_Number <=", value, "serialNumber"); addCriterion("serial_number <=", value, "serialNumber");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andSerialNumberLike(String value) { public Criteria andSerialNumberLike(String value) {
addCriterion("serial_Number like", value, "serialNumber"); addCriterion("serial_number like", value, "serialNumber");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andSerialNumberNotLike(String value) { public Criteria andSerialNumberNotLike(String value) {
addCriterion("serial_Number not like", value, "serialNumber"); addCriterion("serial_number not like", value, "serialNumber");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andSerialNumberIn(List<String> values) { public Criteria andSerialNumberIn(List<String> values) {
addCriterion("serial_Number in", values, "serialNumber"); addCriterion("serial_number in", values, "serialNumber");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andSerialNumberNotIn(List<String> values) { public Criteria andSerialNumberNotIn(List<String> values) {
addCriterion("serial_Number not in", values, "serialNumber"); addCriterion("serial_number not in", values, "serialNumber");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andSerialNumberBetween(String value1, String value2) { public Criteria andSerialNumberBetween(String value1, String value2) {
addCriterion("serial_Number between", value1, value2, "serialNumber"); addCriterion("serial_number between", value1, value2, "serialNumber");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andSerialNumberNotBetween(String value1, String value2) { public Criteria andSerialNumberNotBetween(String value1, String value2) {
addCriterion("serial_Number not between", value1, value2, "serialNumber"); addCriterion("serial_number not between", value1, value2, "serialNumber");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andIsSellIsNull() { public Criteria andIsSellIsNull() {
addCriterion("is_Sell is null"); addCriterion("is_sell is null");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andIsSellIsNotNull() { public Criteria andIsSellIsNotNull() {
addCriterion("is_Sell is not null"); addCriterion("is_sell is not null");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andIsSellEqualTo(String value) { public Criteria andIsSellEqualTo(String value) {
addCriterion("is_Sell =", value, "isSell"); addCriterion("is_sell =", value, "isSell");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andIsSellNotEqualTo(String value) { public Criteria andIsSellNotEqualTo(String value) {
addCriterion("is_Sell <>", value, "isSell"); addCriterion("is_sell <>", value, "isSell");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andIsSellGreaterThan(String value) { public Criteria andIsSellGreaterThan(String value) {
addCriterion("is_Sell >", value, "isSell"); addCriterion("is_sell >", value, "isSell");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andIsSellGreaterThanOrEqualTo(String value) { public Criteria andIsSellGreaterThanOrEqualTo(String value) {
addCriterion("is_Sell >=", value, "isSell"); addCriterion("is_sell >=", value, "isSell");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andIsSellLessThan(String value) { public Criteria andIsSellLessThan(String value) {
addCriterion("is_Sell <", value, "isSell"); addCriterion("is_sell <", value, "isSell");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andIsSellLessThanOrEqualTo(String value) { public Criteria andIsSellLessThanOrEqualTo(String value) {
addCriterion("is_Sell <=", value, "isSell"); addCriterion("is_sell <=", value, "isSell");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andIsSellLike(String value) { public Criteria andIsSellLike(String value) {
addCriterion("is_Sell like", value, "isSell"); addCriterion("is_sell like", value, "isSell");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andIsSellNotLike(String value) { public Criteria andIsSellNotLike(String value) {
addCriterion("is_Sell not like", value, "isSell"); addCriterion("is_sell not like", value, "isSell");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andIsSellIn(List<String> values) { public Criteria andIsSellIn(List<String> values) {
addCriterion("is_Sell in", values, "isSell"); addCriterion("is_sell in", values, "isSell");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andIsSellNotIn(List<String> values) { public Criteria andIsSellNotIn(List<String> values) {
addCriterion("is_Sell not in", values, "isSell"); addCriterion("is_sell not in", values, "isSell");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andIsSellBetween(String value1, String value2) { public Criteria andIsSellBetween(String value1, String value2) {
addCriterion("is_Sell between", value1, value2, "isSell"); addCriterion("is_sell between", value1, value2, "isSell");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andIsSellNotBetween(String value1, String value2) { public Criteria andIsSellNotBetween(String value1, String value2) {
addCriterion("is_Sell not between", value1, value2, "isSell"); addCriterion("is_sell not between", value1, value2, "isSell");
return (Criteria) this; return (Criteria) this;
} }
@@ -526,132 +436,132 @@ public class SerialNumberExample {
} }
public Criteria andDeleteFlagIsNull() { public Criteria andDeleteFlagIsNull() {
addCriterion("delete_Flag is null"); addCriterion("delete_flag is null");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andDeleteFlagIsNotNull() { public Criteria andDeleteFlagIsNotNull() {
addCriterion("delete_Flag is not null"); addCriterion("delete_flag is not null");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andDeleteFlagEqualTo(String value) { public Criteria andDeleteFlagEqualTo(String value) {
addCriterion("delete_Flag =", value, "deleteFlag"); addCriterion("delete_flag =", value, "deleteFlag");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andDeleteFlagNotEqualTo(String value) { public Criteria andDeleteFlagNotEqualTo(String value) {
addCriterion("delete_Flag <>", value, "deleteFlag"); addCriterion("delete_flag <>", value, "deleteFlag");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andDeleteFlagGreaterThan(String value) { public Criteria andDeleteFlagGreaterThan(String value) {
addCriterion("delete_Flag >", value, "deleteFlag"); addCriterion("delete_flag >", value, "deleteFlag");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andDeleteFlagGreaterThanOrEqualTo(String value) { public Criteria andDeleteFlagGreaterThanOrEqualTo(String value) {
addCriterion("delete_Flag >=", value, "deleteFlag"); addCriterion("delete_flag >=", value, "deleteFlag");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andDeleteFlagLessThan(String value) { public Criteria andDeleteFlagLessThan(String value) {
addCriterion("delete_Flag <", value, "deleteFlag"); addCriterion("delete_flag <", value, "deleteFlag");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andDeleteFlagLessThanOrEqualTo(String value) { public Criteria andDeleteFlagLessThanOrEqualTo(String value) {
addCriterion("delete_Flag <=", value, "deleteFlag"); addCriterion("delete_flag <=", value, "deleteFlag");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andDeleteFlagLike(String value) { public Criteria andDeleteFlagLike(String value) {
addCriterion("delete_Flag like", value, "deleteFlag"); addCriterion("delete_flag like", value, "deleteFlag");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andDeleteFlagNotLike(String value) { public Criteria andDeleteFlagNotLike(String value) {
addCriterion("delete_Flag not like", value, "deleteFlag"); addCriterion("delete_flag not like", value, "deleteFlag");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andDeleteFlagIn(List<String> values) { public Criteria andDeleteFlagIn(List<String> values) {
addCriterion("delete_Flag in", values, "deleteFlag"); addCriterion("delete_flag in", values, "deleteFlag");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andDeleteFlagNotIn(List<String> values) { public Criteria andDeleteFlagNotIn(List<String> values) {
addCriterion("delete_Flag not in", values, "deleteFlag"); addCriterion("delete_flag not in", values, "deleteFlag");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andDeleteFlagBetween(String value1, String value2) { public Criteria andDeleteFlagBetween(String value1, String value2) {
addCriterion("delete_Flag between", value1, value2, "deleteFlag"); addCriterion("delete_flag between", value1, value2, "deleteFlag");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andDeleteFlagNotBetween(String value1, String value2) { public Criteria andDeleteFlagNotBetween(String value1, String value2) {
addCriterion("delete_Flag not between", value1, value2, "deleteFlag"); addCriterion("delete_flag not between", value1, value2, "deleteFlag");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andCreateTimeIsNull() { public Criteria andCreateTimeIsNull() {
addCriterion("create_Time is null"); addCriterion("create_time is null");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andCreateTimeIsNotNull() { public Criteria andCreateTimeIsNotNull() {
addCriterion("create_Time is not null"); addCriterion("create_time is not null");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andCreateTimeEqualTo(Date value) { public Criteria andCreateTimeEqualTo(Date value) {
addCriterion("create_Time =", value, "createTime"); addCriterion("create_time =", value, "createTime");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andCreateTimeNotEqualTo(Date value) { public Criteria andCreateTimeNotEqualTo(Date value) {
addCriterion("create_Time <>", value, "createTime"); addCriterion("create_time <>", value, "createTime");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andCreateTimeGreaterThan(Date value) { public Criteria andCreateTimeGreaterThan(Date value) {
addCriterion("create_Time >", value, "createTime"); addCriterion("create_time >", value, "createTime");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andCreateTimeGreaterThanOrEqualTo(Date value) { public Criteria andCreateTimeGreaterThanOrEqualTo(Date value) {
addCriterion("create_Time >=", value, "createTime"); addCriterion("create_time >=", value, "createTime");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andCreateTimeLessThan(Date value) { public Criteria andCreateTimeLessThan(Date value) {
addCriterion("create_Time <", value, "createTime"); addCriterion("create_time <", value, "createTime");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andCreateTimeLessThanOrEqualTo(Date value) { public Criteria andCreateTimeLessThanOrEqualTo(Date value) {
addCriterion("create_Time <=", value, "createTime"); addCriterion("create_time <=", value, "createTime");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andCreateTimeIn(List<Date> values) { public Criteria andCreateTimeIn(List<Date> values) {
addCriterion("create_Time in", values, "createTime"); addCriterion("create_time in", values, "createTime");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andCreateTimeNotIn(List<Date> values) { public Criteria andCreateTimeNotIn(List<Date> values) {
addCriterion("create_Time not in", values, "createTime"); addCriterion("create_time not in", values, "createTime");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andCreateTimeBetween(Date value1, Date value2) { public Criteria andCreateTimeBetween(Date value1, Date value2) {
addCriterion("create_Time between", value1, value2, "createTime"); addCriterion("create_time between", value1, value2, "createTime");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andCreateTimeNotBetween(Date value1, Date value2) { public Criteria andCreateTimeNotBetween(Date value1, Date value2) {
addCriterion("create_Time not between", value1, value2, "createTime"); addCriterion("create_time not between", value1, value2, "createTime");
return (Criteria) this; return (Criteria) this;
} }
@@ -716,62 +626,62 @@ public class SerialNumberExample {
} }
public Criteria andUpdateTimeIsNull() { public Criteria andUpdateTimeIsNull() {
addCriterion("update_Time is null"); addCriterion("update_time is null");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andUpdateTimeIsNotNull() { public Criteria andUpdateTimeIsNotNull() {
addCriterion("update_Time is not null"); addCriterion("update_time is not null");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andUpdateTimeEqualTo(Date value) { public Criteria andUpdateTimeEqualTo(Date value) {
addCriterion("update_Time =", value, "updateTime"); addCriterion("update_time =", value, "updateTime");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andUpdateTimeNotEqualTo(Date value) { public Criteria andUpdateTimeNotEqualTo(Date value) {
addCriterion("update_Time <>", value, "updateTime"); addCriterion("update_time <>", value, "updateTime");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andUpdateTimeGreaterThan(Date value) { public Criteria andUpdateTimeGreaterThan(Date value) {
addCriterion("update_Time >", value, "updateTime"); addCriterion("update_time >", value, "updateTime");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andUpdateTimeGreaterThanOrEqualTo(Date value) { public Criteria andUpdateTimeGreaterThanOrEqualTo(Date value) {
addCriterion("update_Time >=", value, "updateTime"); addCriterion("update_time >=", value, "updateTime");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andUpdateTimeLessThan(Date value) { public Criteria andUpdateTimeLessThan(Date value) {
addCriterion("update_Time <", value, "updateTime"); addCriterion("update_time <", value, "updateTime");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andUpdateTimeLessThanOrEqualTo(Date value) { public Criteria andUpdateTimeLessThanOrEqualTo(Date value) {
addCriterion("update_Time <=", value, "updateTime"); addCriterion("update_time <=", value, "updateTime");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andUpdateTimeIn(List<Date> values) { public Criteria andUpdateTimeIn(List<Date> values) {
addCriterion("update_Time in", values, "updateTime"); addCriterion("update_time in", values, "updateTime");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andUpdateTimeNotIn(List<Date> values) { public Criteria andUpdateTimeNotIn(List<Date> values) {
addCriterion("update_Time not in", values, "updateTime"); addCriterion("update_time not in", values, "updateTime");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andUpdateTimeBetween(Date value1, Date value2) { public Criteria andUpdateTimeBetween(Date value1, Date value2) {
addCriterion("update_Time between", value1, value2, "updateTime"); addCriterion("update_time between", value1, value2, "updateTime");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andUpdateTimeNotBetween(Date value1, Date value2) { public Criteria andUpdateTimeNotBetween(Date value1, Date value2) {
addCriterion("update_Time not between", value1, value2, "updateTime"); addCriterion("update_time not between", value1, value2, "updateTime");
return (Criteria) this; return (Criteria) this;
} }
@@ -835,63 +745,63 @@ public class SerialNumberExample {
return (Criteria) this; return (Criteria) this;
} }
public Criteria andDepotheadIdIsNull() { public Criteria andDepotHeadIdIsNull() {
addCriterion("depothead_Id is null"); addCriterion("depot_head_id is null");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andDepotheadIdIsNotNull() { public Criteria andDepotHeadIdIsNotNull() {
addCriterion("depothead_Id is not null"); addCriterion("depot_head_id is not null");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andDepotheadIdEqualTo(Long value) { public Criteria andDepotHeadIdEqualTo(Long value) {
addCriterion("depothead_Id =", value, "depotheadId"); addCriterion("depot_head_id =", value, "depotHeadId");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andDepotheadIdNotEqualTo(Long value) { public Criteria andDepotHeadIdNotEqualTo(Long value) {
addCriterion("depothead_Id <>", value, "depotheadId"); addCriterion("depot_head_id <>", value, "depotHeadId");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andDepotheadIdGreaterThan(Long value) { public Criteria andDepotHeadIdGreaterThan(Long value) {
addCriterion("depothead_Id >", value, "depotheadId"); addCriterion("depot_head_id >", value, "depotHeadId");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andDepotheadIdGreaterThanOrEqualTo(Long value) { public Criteria andDepotHeadIdGreaterThanOrEqualTo(Long value) {
addCriterion("depothead_Id >=", value, "depotheadId"); addCriterion("depot_head_id >=", value, "depotHeadId");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andDepotheadIdLessThan(Long value) { public Criteria andDepotHeadIdLessThan(Long value) {
addCriterion("depothead_Id <", value, "depotheadId"); addCriterion("depot_head_id <", value, "depotHeadId");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andDepotheadIdLessThanOrEqualTo(Long value) { public Criteria andDepotHeadIdLessThanOrEqualTo(Long value) {
addCriterion("depothead_Id <=", value, "depotheadId"); addCriterion("depot_head_id <=", value, "depotHeadId");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andDepotheadIdIn(List<Long> values) { public Criteria andDepotHeadIdIn(List<Long> values) {
addCriterion("depothead_Id in", values, "depotheadId"); addCriterion("depot_head_id in", values, "depotHeadId");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andDepotheadIdNotIn(List<Long> values) { public Criteria andDepotHeadIdNotIn(List<Long> values) {
addCriterion("depothead_Id not in", values, "depotheadId"); addCriterion("depot_head_id not in", values, "depotHeadId");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andDepotheadIdBetween(Long value1, Long value2) { public Criteria andDepotHeadIdBetween(Long value1, Long value2) {
addCriterion("depothead_Id between", value1, value2, "depotheadId"); addCriterion("depot_head_id between", value1, value2, "depotHeadId");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andDepotheadIdNotBetween(Long value1, Long value2) { public Criteria andDepotHeadIdNotBetween(Long value1, Long value2) {
addCriterion("depothead_Id not between", value1, value2, "depotheadId"); addCriterion("depot_head_id not between", value1, value2, "depotHeadId");
return (Criteria) this; return (Criteria) this;
} }
@@ -956,25 +866,12 @@ public class SerialNumberExample {
} }
} }
/**
* This class was generated by MyBatis Generator.
* This class corresponds to the database table jsh_serial_number
*
* @mbggenerated do_not_delete_during_merge
*/
public static class Criteria extends GeneratedCriteria { public static class Criteria extends GeneratedCriteria {
protected Criteria() { protected Criteria() {
super(); super();
} }
} }
/**
* This class was generated by MyBatis Generator.
* This class corresponds to the database table jsh_serial_number
*
* @mbggenerated
*/
public static class Criterion { public static class Criterion {
private String condition; private String condition;

28
src/main/java/com/jsh/erp/datasource/entities/SystemConfigExample.java
View File

@@ -855,72 +855,72 @@ public class SystemConfigExample {
} }
public Criteria andDeleteFlagIsNull() { public Criteria andDeleteFlagIsNull() {
addCriterion("delete_Flag is null"); addCriterion("delete_flag is null");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andDeleteFlagIsNotNull() { public Criteria andDeleteFlagIsNotNull() {
addCriterion("delete_Flag is not null"); addCriterion("delete_flag is not null");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andDeleteFlagEqualTo(String value) { public Criteria andDeleteFlagEqualTo(String value) {
addCriterion("delete_Flag =", value, "deleteFlag"); addCriterion("delete_flag =", value, "deleteFlag");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andDeleteFlagNotEqualTo(String value) { public Criteria andDeleteFlagNotEqualTo(String value) {
addCriterion("delete_Flag <>", value, "deleteFlag"); addCriterion("delete_flag <>", value, "deleteFlag");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andDeleteFlagGreaterThan(String value) { public Criteria andDeleteFlagGreaterThan(String value) {
addCriterion("delete_Flag >", value, "deleteFlag"); addCriterion("delete_flag >", value, "deleteFlag");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andDeleteFlagGreaterThanOrEqualTo(String value) { public Criteria andDeleteFlagGreaterThanOrEqualTo(String value) {
addCriterion("delete_Flag >=", value, "deleteFlag"); addCriterion("delete_flag >=", value, "deleteFlag");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andDeleteFlagLessThan(String value) { public Criteria andDeleteFlagLessThan(String value) {
addCriterion("delete_Flag <", value, "deleteFlag"); addCriterion("delete_flag <", value, "deleteFlag");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andDeleteFlagLessThanOrEqualTo(String value) { public Criteria andDeleteFlagLessThanOrEqualTo(String value) {
addCriterion("delete_Flag <=", value, "deleteFlag"); addCriterion("delete_flag <=", value, "deleteFlag");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andDeleteFlagLike(String value) { public Criteria andDeleteFlagLike(String value) {
addCriterion("delete_Flag like", value, "deleteFlag"); addCriterion("delete_flag like", value, "deleteFlag");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andDeleteFlagNotLike(String value) { public Criteria andDeleteFlagNotLike(String value) {
addCriterion("delete_Flag not like", value, "deleteFlag"); addCriterion("delete_flag not like", value, "deleteFlag");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andDeleteFlagIn(List<String> values) { public Criteria andDeleteFlagIn(List<String> values) {
addCriterion("delete_Flag in", values, "deleteFlag"); addCriterion("delete_flag in", values, "deleteFlag");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andDeleteFlagNotIn(List<String> values) { public Criteria andDeleteFlagNotIn(List<String> values) {
addCriterion("delete_Flag not in", values, "deleteFlag"); addCriterion("delete_flag not in", values, "deleteFlag");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andDeleteFlagBetween(String value1, String value2) { public Criteria andDeleteFlagBetween(String value1, String value2) {
addCriterion("delete_Flag between", value1, value2, "deleteFlag"); addCriterion("delete_flag between", value1, value2, "deleteFlag");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andDeleteFlagNotBetween(String value1, String value2) { public Criteria andDeleteFlagNotBetween(String value1, String value2) {
addCriterion("delete_Flag not between", value1, value2, "deleteFlag"); addCriterion("delete_flag not between", value1, value2, "deleteFlag");
return (Criteria) this; return (Criteria) this;
} }
} }

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

@@ -3,7 +3,7 @@ package com.jsh.erp.datasource.entities;
public class Unit { public class Unit {
private Long id; private Long id;
private String uname; private String name;
private String basicUnit; private String basicUnit;
@@ -23,12 +23,12 @@ public class Unit {
this.id = id; this.id = id;
} }
public String getUname() { public String getName() {
return uname; return name;
} }
public void setUname(String uname) { public void setName(String name) {
this.uname = uname == null ? null : uname.trim(); this.name = name == null ? null : name.trim();
} }
public String getBasicUnit() { public String getBasicUnit() {

84
src/main/java/com/jsh/erp/datasource/entities/UnitExample.java
View File

@@ -164,73 +164,73 @@ public class UnitExample {
return (Criteria) this; return (Criteria) this;
} }
public Criteria andUnameIsNull() { public Criteria andNameIsNull() {
addCriterion("UName is null"); addCriterion("name is null");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andUnameIsNotNull() { public Criteria andNameIsNotNull() {
addCriterion("UName is not null"); addCriterion("name is not null");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andUnameEqualTo(String value) { public Criteria andNameEqualTo(String value) {
addCriterion("UName =", value, "uname"); addCriterion("name =", value, "name");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andUnameNotEqualTo(String value) { public Criteria andNameNotEqualTo(String value) {
addCriterion("UName <>", value, "uname"); addCriterion("name <>", value, "name");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andUnameGreaterThan(String value) { public Criteria andNameGreaterThan(String value) {
addCriterion("UName >", value, "uname"); addCriterion("name >", value, "name");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andUnameGreaterThanOrEqualTo(String value) { public Criteria andNameGreaterThanOrEqualTo(String value) {
addCriterion("UName >=", value, "uname"); addCriterion("name >=", value, "name");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andUnameLessThan(String value) { public Criteria andNameLessThan(String value) {
addCriterion("UName <", value, "uname"); addCriterion("name <", value, "name");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andUnameLessThanOrEqualTo(String value) { public Criteria andNameLessThanOrEqualTo(String value) {
addCriterion("UName <=", value, "uname"); addCriterion("name <=", value, "name");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andUnameLike(String value) { public Criteria andNameLike(String value) {
addCriterion("UName like", value, "uname"); addCriterion("name like", value, "name");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andUnameNotLike(String value) { public Criteria andNameNotLike(String value) {
addCriterion("UName not like", value, "uname"); addCriterion("name not like", value, "name");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andUnameIn(List<String> values) { public Criteria andNameIn(List<String> values) {
addCriterion("UName in", values, "uname"); addCriterion("name in", values, "name");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andUnameNotIn(List<String> values) { public Criteria andNameNotIn(List<String> values) {
addCriterion("UName not in", values, "uname"); addCriterion("name not in", values, "name");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andUnameBetween(String value1, String value2) { public Criteria andNameBetween(String value1, String value2) {
addCriterion("UName between", value1, value2, "uname"); addCriterion("name between", value1, value2, "name");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andUnameNotBetween(String value1, String value2) { public Criteria andNameNotBetween(String value1, String value2) {
addCriterion("UName not between", value1, value2, "uname"); addCriterion("name not between", value1, value2, "name");
return (Criteria) this; return (Criteria) this;
} }
@@ -495,72 +495,72 @@ public class UnitExample {
} }
public Criteria andDeleteFlagIsNull() { public Criteria andDeleteFlagIsNull() {
addCriterion("delete_Flag is null"); addCriterion("delete_flag is null");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andDeleteFlagIsNotNull() { public Criteria andDeleteFlagIsNotNull() {
addCriterion("delete_Flag is not null"); addCriterion("delete_flag is not null");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andDeleteFlagEqualTo(String value) { public Criteria andDeleteFlagEqualTo(String value) {
addCriterion("delete_Flag =", value, "deleteFlag"); addCriterion("delete_flag =", value, "deleteFlag");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andDeleteFlagNotEqualTo(String value) { public Criteria andDeleteFlagNotEqualTo(String value) {
addCriterion("delete_Flag <>", value, "deleteFlag"); addCriterion("delete_flag <>", value, "deleteFlag");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andDeleteFlagGreaterThan(String value) { public Criteria andDeleteFlagGreaterThan(String value) {
addCriterion("delete_Flag >", value, "deleteFlag"); addCriterion("delete_flag >", value, "deleteFlag");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andDeleteFlagGreaterThanOrEqualTo(String value) { public Criteria andDeleteFlagGreaterThanOrEqualTo(String value) {
addCriterion("delete_Flag >=", value, "deleteFlag"); addCriterion("delete_flag >=", value, "deleteFlag");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andDeleteFlagLessThan(String value) { public Criteria andDeleteFlagLessThan(String value) {
addCriterion("delete_Flag <", value, "deleteFlag"); addCriterion("delete_flag <", value, "deleteFlag");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andDeleteFlagLessThanOrEqualTo(String value) { public Criteria andDeleteFlagLessThanOrEqualTo(String value) {
addCriterion("delete_Flag <=", value, "deleteFlag"); addCriterion("delete_flag <=", value, "deleteFlag");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andDeleteFlagLike(String value) { public Criteria andDeleteFlagLike(String value) {
addCriterion("delete_Flag like", value, "deleteFlag"); addCriterion("delete_flag like", value, "deleteFlag");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andDeleteFlagNotLike(String value) { public Criteria andDeleteFlagNotLike(String value) {
addCriterion("delete_Flag not like", value, "deleteFlag"); addCriterion("delete_flag not like", value, "deleteFlag");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andDeleteFlagIn(List<String> values) { public Criteria andDeleteFlagIn(List<String> values) {
addCriterion("delete_Flag in", values, "deleteFlag"); addCriterion("delete_flag in", values, "deleteFlag");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andDeleteFlagNotIn(List<String> values) { public Criteria andDeleteFlagNotIn(List<String> values) {
addCriterion("delete_Flag not in", values, "deleteFlag"); addCriterion("delete_flag not in", values, "deleteFlag");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andDeleteFlagBetween(String value1, String value2) { public Criteria andDeleteFlagBetween(String value1, String value2) {
addCriterion("delete_Flag between", value1, value2, "deleteFlag"); addCriterion("delete_flag between", value1, value2, "deleteFlag");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andDeleteFlagNotBetween(String value1, String value2) { public Criteria andDeleteFlagNotBetween(String value1, String value2) {
addCriterion("delete_Flag not between", value1, value2, "deleteFlag"); addCriterion("delete_flag not between", value1, value2, "deleteFlag");
return (Criteria) this; return (Criteria) this;
} }
} }

152
src/main/java/com/jsh/erp/datasource/entities/UserBusiness.java
View File

@@ -1,194 +1,62 @@
package com.jsh.erp.datasource.entities; package com.jsh.erp.datasource.entities;
public class UserBusiness { public class UserBusiness {
/**
* This field was generated by MyBatis Generator.
* This field corresponds to the database column jsh_userbusiness.Id
*
* @mbggenerated
*/
private Long id; private Long id;
/**
* This field was generated by MyBatis Generator.
* This field corresponds to the database column jsh_userbusiness.Type
*
* @mbggenerated
*/
private String type; private String type;
/** private String keyId;
* This field was generated by MyBatis Generator.
* This field corresponds to the database column jsh_userbusiness.KeyId
*
* @mbggenerated
*/
private String keyid;
/**
* This field was generated by MyBatis Generator.
* This field corresponds to the database column jsh_userbusiness.Value
*
* @mbggenerated
*/
private String value; private String value;
/** private String btnStr;
* This field was generated by MyBatis Generator.
* This field corresponds to the database column jsh_userbusiness.BtnStr
*
* @mbggenerated
*/
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; private String deleteFlag;
/**
* This method was generated by MyBatis Generator.
* This method returns the value of the database column jsh_userbusiness.Id
*
* @return the value of jsh_userbusiness.Id
*
* @mbggenerated
*/
public Long getId() { public Long getId() {
return id; return id;
} }
/**
* This method was generated by MyBatis Generator.
* This method sets the value of the database column jsh_userbusiness.Id
*
* @param id the value for jsh_userbusiness.Id
*
* @mbggenerated
*/
public void setId(Long id) { public void setId(Long id) {
this.id = id; this.id = id;
} }
/**
* This method was generated by MyBatis Generator.
* This method returns the value of the database column jsh_userbusiness.Type
*
* @return the value of jsh_userbusiness.Type
*
* @mbggenerated
*/
public String getType() { public String getType() {
return type; return type;
} }
/**
* This method was generated by MyBatis Generator.
* This method sets the value of the database column jsh_userbusiness.Type
*
* @param type the value for jsh_userbusiness.Type
*
* @mbggenerated
*/
public void setType(String type) { public void setType(String type) {
this.type = type == null ? null : type.trim(); this.type = type == null ? null : type.trim();
} }
/** public String getKeyId() {
* This method was generated by MyBatis Generator. return keyId;
* This method returns the value of the database column jsh_userbusiness.KeyId
*
* @return the value of jsh_userbusiness.KeyId
*
* @mbggenerated
*/
public String getKeyid() {
return keyid;
} }
/** public void setKeyId(String keyId) {
* This method was generated by MyBatis Generator. this.keyId = keyId == null ? null : keyId.trim();
* This method sets the value of the database column jsh_userbusiness.KeyId
*
* @param keyid the value for jsh_userbusiness.KeyId
*
* @mbggenerated
*/
public void setKeyid(String keyid) {
this.keyid = keyid == null ? null : keyid.trim();
} }
/**
* This method was generated by MyBatis Generator.
* This method returns the value of the database column jsh_userbusiness.Value
*
* @return the value of jsh_userbusiness.Value
*
* @mbggenerated
*/
public String getValue() { public String getValue() {
return value; return value;
} }
/**
* This method was generated by MyBatis Generator.
* This method sets the value of the database column jsh_userbusiness.Value
*
* @param value the value for jsh_userbusiness.Value
*
* @mbggenerated
*/
public void setValue(String value) { public void setValue(String value) {
this.value = value == null ? null : value.trim(); this.value = value == null ? null : value.trim();
} }
/** public String getBtnStr() {
* This method was generated by MyBatis Generator. return btnStr;
* This method returns the value of the database column jsh_userbusiness.BtnStr
*
* @return the value of jsh_userbusiness.BtnStr
*
* @mbggenerated
*/
public String getBtnstr() {
return btnstr;
} }
/** public void setBtnStr(String btnStr) {
* This method was generated by MyBatis Generator. this.btnStr = btnStr == null ? null : btnStr.trim();
* This method sets the value of the database column jsh_userbusiness.BtnStr
*
* @param btnstr the value for jsh_userbusiness.BtnStr
*
* @mbggenerated
*/
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() { public String getDeleteFlag() {
return deleteFlag; 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) { public void setDeleteFlag(String deleteFlag) {
this.deleteFlag = deleteFlag == null ? null : deleteFlag.trim(); this.deleteFlag = deleteFlag == null ? null : deleteFlag.trim();
} }

327
src/main/java/com/jsh/erp/datasource/entities/UserBusinessExample.java
View File

@@ -4,118 +4,46 @@ import java.util.ArrayList;
import java.util.List; import java.util.List;
public class UserBusinessExample { public class UserBusinessExample {
/**
* This field was generated by MyBatis Generator.
* This field corresponds to the database table jsh_userbusiness
*
* @mbggenerated
*/
protected String orderByClause; protected String orderByClause;
/**
* This field was generated by MyBatis Generator.
* This field corresponds to the database table jsh_userbusiness
*
* @mbggenerated
*/
protected boolean distinct; protected boolean distinct;
/**
* This field was generated by MyBatis Generator.
* This field corresponds to the database table jsh_userbusiness
*
* @mbggenerated
*/
protected List<Criteria> oredCriteria; protected List<Criteria> oredCriteria;
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table jsh_userbusiness
*
* @mbggenerated
*/
public UserBusinessExample() { public UserBusinessExample() {
oredCriteria = new ArrayList<Criteria>(); oredCriteria = new ArrayList<>();
} }
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table jsh_userbusiness
*
* @mbggenerated
*/
public void setOrderByClause(String orderByClause) { public void setOrderByClause(String orderByClause) {
this.orderByClause = orderByClause; this.orderByClause = orderByClause;
} }
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table jsh_userbusiness
*
* @mbggenerated
*/
public String getOrderByClause() { public String getOrderByClause() {
return orderByClause; return orderByClause;
} }
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table jsh_userbusiness
*
* @mbggenerated
*/
public void setDistinct(boolean distinct) { public void setDistinct(boolean distinct) {
this.distinct = distinct; this.distinct = distinct;
} }
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table jsh_userbusiness
*
* @mbggenerated
*/
public boolean isDistinct() { public boolean isDistinct() {
return distinct; return distinct;
} }
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table jsh_userbusiness
*
* @mbggenerated
*/
public List<Criteria> getOredCriteria() { public List<Criteria> getOredCriteria() {
return oredCriteria; return oredCriteria;
} }
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table jsh_userbusiness
*
* @mbggenerated
*/
public void or(Criteria criteria) { public void or(Criteria criteria) {
oredCriteria.add(criteria); oredCriteria.add(criteria);
} }
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table jsh_userbusiness
*
* @mbggenerated
*/
public Criteria or() { public Criteria or() {
Criteria criteria = createCriteriaInternal(); Criteria criteria = createCriteriaInternal();
oredCriteria.add(criteria); oredCriteria.add(criteria);
return criteria; return criteria;
} }
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table jsh_userbusiness
*
* @mbggenerated
*/
public Criteria createCriteria() { public Criteria createCriteria() {
Criteria criteria = createCriteriaInternal(); Criteria criteria = createCriteriaInternal();
if (oredCriteria.size() == 0) { if (oredCriteria.size() == 0) {
@@ -124,41 +52,23 @@ public class UserBusinessExample {
return criteria; return criteria;
} }
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table jsh_userbusiness
*
* @mbggenerated
*/
protected Criteria createCriteriaInternal() { protected Criteria createCriteriaInternal() {
Criteria criteria = new Criteria(); Criteria criteria = new Criteria();
return criteria; return criteria;
} }
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table jsh_userbusiness
*
* @mbggenerated
*/
public void clear() { public void clear() {
oredCriteria.clear(); oredCriteria.clear();
orderByClause = null; orderByClause = null;
distinct = false; distinct = false;
} }
/**
* This class was generated by MyBatis Generator.
* This class corresponds to the database table jsh_userbusiness
*
* @mbggenerated
*/
protected abstract static class GeneratedCriteria { protected abstract static class GeneratedCriteria {
protected List<Criterion> criteria; protected List<Criterion> criteria;
protected GeneratedCriteria() { protected GeneratedCriteria() {
super(); super();
criteria = new ArrayList<Criterion>(); criteria = new ArrayList<>();
} }
public boolean isValid() { public boolean isValid() {
@@ -195,435 +105,422 @@ public class UserBusinessExample {
} }
public Criteria andIdIsNull() { public Criteria andIdIsNull() {
addCriterion("Id is null"); addCriterion("id is null");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andIdIsNotNull() { public Criteria andIdIsNotNull() {
addCriterion("Id is not null"); addCriterion("id is not null");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andIdEqualTo(Long value) { public Criteria andIdEqualTo(Long value) {
addCriterion("Id =", value, "id"); addCriterion("id =", value, "id");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andIdNotEqualTo(Long value) { public Criteria andIdNotEqualTo(Long value) {
addCriterion("Id <>", value, "id"); addCriterion("id <>", value, "id");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andIdGreaterThan(Long value) { public Criteria andIdGreaterThan(Long value) {
addCriterion("Id >", value, "id"); addCriterion("id >", value, "id");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andIdGreaterThanOrEqualTo(Long value) { public Criteria andIdGreaterThanOrEqualTo(Long value) {
addCriterion("Id >=", value, "id"); addCriterion("id >=", value, "id");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andIdLessThan(Long value) { public Criteria andIdLessThan(Long value) {
addCriterion("Id <", value, "id"); addCriterion("id <", value, "id");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andIdLessThanOrEqualTo(Long value) { public Criteria andIdLessThanOrEqualTo(Long value) {
addCriterion("Id <=", value, "id"); addCriterion("id <=", value, "id");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andIdIn(List<Long> values) { public Criteria andIdIn(List<Long> values) {
addCriterion("Id in", values, "id"); addCriterion("id in", values, "id");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andIdNotIn(List<Long> values) { public Criteria andIdNotIn(List<Long> values) {
addCriterion("Id not in", values, "id"); addCriterion("id not in", values, "id");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andIdBetween(Long value1, Long value2) { public Criteria andIdBetween(Long value1, Long value2) {
addCriterion("Id between", value1, value2, "id"); addCriterion("id between", value1, value2, "id");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andIdNotBetween(Long value1, Long value2) { public Criteria andIdNotBetween(Long value1, Long value2) {
addCriterion("Id not between", value1, value2, "id"); addCriterion("id not between", value1, value2, "id");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andTypeIsNull() { public Criteria andTypeIsNull() {
addCriterion("Type is null"); addCriterion("type is null");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andTypeIsNotNull() { public Criteria andTypeIsNotNull() {
addCriterion("Type is not null"); addCriterion("type is not null");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andTypeEqualTo(String value) { public Criteria andTypeEqualTo(String value) {
addCriterion("Type =", value, "type"); addCriterion("type =", value, "type");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andTypeNotEqualTo(String value) { public Criteria andTypeNotEqualTo(String value) {
addCriterion("Type <>", value, "type"); addCriterion("type <>", value, "type");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andTypeGreaterThan(String value) { public Criteria andTypeGreaterThan(String value) {
addCriterion("Type >", value, "type"); addCriterion("type >", value, "type");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andTypeGreaterThanOrEqualTo(String value) { public Criteria andTypeGreaterThanOrEqualTo(String value) {
addCriterion("Type >=", value, "type"); addCriterion("type >=", value, "type");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andTypeLessThan(String value) { public Criteria andTypeLessThan(String value) {
addCriterion("Type <", value, "type"); addCriterion("type <", value, "type");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andTypeLessThanOrEqualTo(String value) { public Criteria andTypeLessThanOrEqualTo(String value) {
addCriterion("Type <=", value, "type"); addCriterion("type <=", value, "type");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andTypeLike(String value) { public Criteria andTypeLike(String value) {
addCriterion("Type like", value, "type"); addCriterion("type like", value, "type");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andTypeNotLike(String value) { public Criteria andTypeNotLike(String value) {
addCriterion("Type not like", value, "type"); addCriterion("type not like", value, "type");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andTypeIn(List<String> values) { public Criteria andTypeIn(List<String> values) {
addCriterion("Type in", values, "type"); addCriterion("type in", values, "type");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andTypeNotIn(List<String> values) { public Criteria andTypeNotIn(List<String> values) {
addCriterion("Type not in", values, "type"); addCriterion("type not in", values, "type");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andTypeBetween(String value1, String value2) { public Criteria andTypeBetween(String value1, String value2) {
addCriterion("Type between", value1, value2, "type"); addCriterion("type between", value1, value2, "type");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andTypeNotBetween(String value1, String value2) { public Criteria andTypeNotBetween(String value1, String value2) {
addCriterion("Type not between", value1, value2, "type"); addCriterion("type not between", value1, value2, "type");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andKeyidIsNull() { public Criteria andKeyIdIsNull() {
addCriterion("KeyId is null"); addCriterion("key_id is null");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andKeyidIsNotNull() { public Criteria andKeyIdIsNotNull() {
addCriterion("KeyId is not null"); addCriterion("key_id is not null");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andKeyidEqualTo(String value) { public Criteria andKeyIdEqualTo(String value) {
addCriterion("KeyId =", value, "keyid"); addCriterion("key_id =", value, "keyId");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andKeyidNotEqualTo(String value) { public Criteria andKeyIdNotEqualTo(String value) {
addCriterion("KeyId <>", value, "keyid"); addCriterion("key_id <>", value, "keyId");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andKeyidGreaterThan(String value) { public Criteria andKeyIdGreaterThan(String value) {
addCriterion("KeyId >", value, "keyid"); addCriterion("key_id >", value, "keyId");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andKeyidGreaterThanOrEqualTo(String value) { public Criteria andKeyIdGreaterThanOrEqualTo(String value) {
addCriterion("KeyId >=", value, "keyid"); addCriterion("key_id >=", value, "keyId");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andKeyidLessThan(String value) { public Criteria andKeyIdLessThan(String value) {
addCriterion("KeyId <", value, "keyid"); addCriterion("key_id <", value, "keyId");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andKeyidLessThanOrEqualTo(String value) { public Criteria andKeyIdLessThanOrEqualTo(String value) {
addCriterion("KeyId <=", value, "keyid"); addCriterion("key_id <=", value, "keyId");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andKeyidLike(String value) { public Criteria andKeyIdLike(String value) {
addCriterion("KeyId like", value, "keyid"); addCriterion("key_id like", value, "keyId");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andKeyidNotLike(String value) { public Criteria andKeyIdNotLike(String value) {
addCriterion("KeyId not like", value, "keyid"); addCriterion("key_id not like", value, "keyId");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andKeyidIn(List<String> values) { public Criteria andKeyIdIn(List<String> values) {
addCriterion("KeyId in", values, "keyid"); addCriterion("key_id in", values, "keyId");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andKeyidNotIn(List<String> values) { public Criteria andKeyIdNotIn(List<String> values) {
addCriterion("KeyId not in", values, "keyid"); addCriterion("key_id not in", values, "keyId");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andKeyidBetween(String value1, String value2) { public Criteria andKeyIdBetween(String value1, String value2) {
addCriterion("KeyId between", value1, value2, "keyid"); addCriterion("key_id between", value1, value2, "keyId");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andKeyidNotBetween(String value1, String value2) { public Criteria andKeyIdNotBetween(String value1, String value2) {
addCriterion("KeyId not between", value1, value2, "keyid"); addCriterion("key_id not between", value1, value2, "keyId");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andValueIsNull() { public Criteria andValueIsNull() {
addCriterion("Value is null"); addCriterion("value is null");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andValueIsNotNull() { public Criteria andValueIsNotNull() {
addCriterion("Value is not null"); addCriterion("value is not null");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andValueEqualTo(String value) { public Criteria andValueEqualTo(String value) {
addCriterion("Value =", value, "value"); addCriterion("value =", value, "value");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andValueNotEqualTo(String value) { public Criteria andValueNotEqualTo(String value) {
addCriterion("Value <>", value, "value"); addCriterion("value <>", value, "value");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andValueGreaterThan(String value) { public Criteria andValueGreaterThan(String value) {
addCriterion("Value >", value, "value"); addCriterion("value >", value, "value");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andValueGreaterThanOrEqualTo(String value) { public Criteria andValueGreaterThanOrEqualTo(String value) {
addCriterion("Value >=", value, "value"); addCriterion("value >=", value, "value");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andValueLessThan(String value) { public Criteria andValueLessThan(String value) {
addCriterion("Value <", value, "value"); addCriterion("value <", value, "value");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andValueLessThanOrEqualTo(String value) { public Criteria andValueLessThanOrEqualTo(String value) {
addCriterion("Value <=", value, "value"); addCriterion("value <=", value, "value");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andValueLike(String value) { public Criteria andValueLike(String value) {
addCriterion("Value like", value, "value"); addCriterion("value like", value, "value");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andValueNotLike(String value) { public Criteria andValueNotLike(String value) {
addCriterion("Value not like", value, "value"); addCriterion("value not like", value, "value");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andValueIn(List<String> values) { public Criteria andValueIn(List<String> values) {
addCriterion("Value in", values, "value"); addCriterion("value in", values, "value");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andValueNotIn(List<String> values) { public Criteria andValueNotIn(List<String> values) {
addCriterion("Value not in", values, "value"); addCriterion("value not in", values, "value");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andValueBetween(String value1, String value2) { public Criteria andValueBetween(String value1, String value2) {
addCriterion("Value between", value1, value2, "value"); addCriterion("value between", value1, value2, "value");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andValueNotBetween(String value1, String value2) { public Criteria andValueNotBetween(String value1, String value2) {
addCriterion("Value not between", value1, value2, "value"); addCriterion("value not between", value1, value2, "value");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andBtnstrIsNull() { public Criteria andBtnStrIsNull() {
addCriterion("BtnStr is null"); addCriterion("btn_str is null");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andBtnstrIsNotNull() { public Criteria andBtnStrIsNotNull() {
addCriterion("BtnStr is not null"); addCriterion("btn_str is not null");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andBtnstrEqualTo(String value) { public Criteria andBtnStrEqualTo(String value) {
addCriterion("BtnStr =", value, "btnstr"); addCriterion("btn_str =", value, "btnStr");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andBtnstrNotEqualTo(String value) { public Criteria andBtnStrNotEqualTo(String value) {
addCriterion("BtnStr <>", value, "btnstr"); addCriterion("btn_str <>", value, "btnStr");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andBtnstrGreaterThan(String value) { public Criteria andBtnStrGreaterThan(String value) {
addCriterion("BtnStr >", value, "btnstr"); addCriterion("btn_str >", value, "btnStr");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andBtnstrGreaterThanOrEqualTo(String value) { public Criteria andBtnStrGreaterThanOrEqualTo(String value) {
addCriterion("BtnStr >=", value, "btnstr"); addCriterion("btn_str >=", value, "btnStr");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andBtnstrLessThan(String value) { public Criteria andBtnStrLessThan(String value) {
addCriterion("BtnStr <", value, "btnstr"); addCriterion("btn_str <", value, "btnStr");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andBtnstrLessThanOrEqualTo(String value) { public Criteria andBtnStrLessThanOrEqualTo(String value) {
addCriterion("BtnStr <=", value, "btnstr"); addCriterion("btn_str <=", value, "btnStr");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andBtnstrLike(String value) { public Criteria andBtnStrLike(String value) {
addCriterion("BtnStr like", value, "btnstr"); addCriterion("btn_str like", value, "btnStr");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andBtnstrNotLike(String value) { public Criteria andBtnStrNotLike(String value) {
addCriterion("BtnStr not like", value, "btnstr"); addCriterion("btn_str not like", value, "btnStr");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andBtnstrIn(List<String> values) { public Criteria andBtnStrIn(List<String> values) {
addCriterion("BtnStr in", values, "btnstr"); addCriterion("btn_str in", values, "btnStr");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andBtnstrNotIn(List<String> values) { public Criteria andBtnStrNotIn(List<String> values) {
addCriterion("BtnStr not in", values, "btnstr"); addCriterion("btn_str not in", values, "btnStr");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andBtnstrBetween(String value1, String value2) { public Criteria andBtnStrBetween(String value1, String value2) {
addCriterion("BtnStr between", value1, value2, "btnstr"); addCriterion("btn_str between", value1, value2, "btnStr");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andBtnstrNotBetween(String value1, String value2) { public Criteria andBtnStrNotBetween(String value1, String value2) {
addCriterion("BtnStr not between", value1, value2, "btnstr"); addCriterion("btn_str not between", value1, value2, "btnStr");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andDeleteFlagIsNull() { public Criteria andDeleteFlagIsNull() {
addCriterion("delete_Flag is null"); addCriterion("delete_flag is null");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andDeleteFlagIsNotNull() { public Criteria andDeleteFlagIsNotNull() {
addCriterion("delete_Flag is not null"); addCriterion("delete_flag is not null");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andDeleteFlagEqualTo(String value) { public Criteria andDeleteFlagEqualTo(String value) {
addCriterion("delete_Flag =", value, "deleteFlag"); addCriterion("delete_flag =", value, "deleteFlag");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andDeleteFlagNotEqualTo(String value) { public Criteria andDeleteFlagNotEqualTo(String value) {
addCriterion("delete_Flag <>", value, "deleteFlag"); addCriterion("delete_flag <>", value, "deleteFlag");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andDeleteFlagGreaterThan(String value) { public Criteria andDeleteFlagGreaterThan(String value) {
addCriterion("delete_Flag >", value, "deleteFlag"); addCriterion("delete_flag >", value, "deleteFlag");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andDeleteFlagGreaterThanOrEqualTo(String value) { public Criteria andDeleteFlagGreaterThanOrEqualTo(String value) {
addCriterion("delete_Flag >=", value, "deleteFlag"); addCriterion("delete_flag >=", value, "deleteFlag");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andDeleteFlagLessThan(String value) { public Criteria andDeleteFlagLessThan(String value) {
addCriterion("delete_Flag <", value, "deleteFlag"); addCriterion("delete_flag <", value, "deleteFlag");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andDeleteFlagLessThanOrEqualTo(String value) { public Criteria andDeleteFlagLessThanOrEqualTo(String value) {
addCriterion("delete_Flag <=", value, "deleteFlag"); addCriterion("delete_flag <=", value, "deleteFlag");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andDeleteFlagLike(String value) { public Criteria andDeleteFlagLike(String value) {
addCriterion("delete_Flag like", value, "deleteFlag"); addCriterion("delete_flag like", value, "deleteFlag");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andDeleteFlagNotLike(String value) { public Criteria andDeleteFlagNotLike(String value) {
addCriterion("delete_Flag not like", value, "deleteFlag"); addCriterion("delete_flag not like", value, "deleteFlag");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andDeleteFlagIn(List<String> values) { public Criteria andDeleteFlagIn(List<String> values) {
addCriterion("delete_Flag in", values, "deleteFlag"); addCriterion("delete_flag in", values, "deleteFlag");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andDeleteFlagNotIn(List<String> values) { public Criteria andDeleteFlagNotIn(List<String> values) {
addCriterion("delete_Flag not in", values, "deleteFlag"); addCriterion("delete_flag not in", values, "deleteFlag");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andDeleteFlagBetween(String value1, String value2) { public Criteria andDeleteFlagBetween(String value1, String value2) {
addCriterion("delete_Flag between", value1, value2, "deleteFlag"); addCriterion("delete_flag between", value1, value2, "deleteFlag");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andDeleteFlagNotBetween(String value1, String value2) { public Criteria andDeleteFlagNotBetween(String value1, String value2) {
addCriterion("delete_Flag not between", value1, value2, "deleteFlag"); addCriterion("delete_flag not between", value1, value2, "deleteFlag");
return (Criteria) this; return (Criteria) this;
} }
} }
/**
* This class was generated by MyBatis Generator.
* This class corresponds to the database table jsh_userbusiness
*
* @mbggenerated do_not_delete_during_merge
*/
public static class Criteria extends GeneratedCriteria { public static class Criteria extends GeneratedCriteria {
protected Criteria() { protected Criteria() {
super(); super();
} }
} }
/**
* This class was generated by MyBatis Generator.
* This class corresponds to the database table jsh_userbusiness
*
* @mbggenerated
*/
public static class Criterion { public static class Criterion {
private String condition; private String condition;

68
src/main/java/com/jsh/erp/datasource/mappers/AccountMapper.java
View File

@@ -6,91 +6,25 @@ import java.util.List;
import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Param;
public interface AccountMapper { public interface AccountMapper {
/** long countByExample(AccountExample example);
* This method was generated by MyBatis Generator.
* This method corresponds to the database table jsh_account
*
* @mbggenerated
*/
int countByExample(AccountExample example);
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table jsh_account
*
* @mbggenerated
*/
int deleteByExample(AccountExample example); int deleteByExample(AccountExample example);
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table jsh_account
*
* @mbggenerated
*/
int deleteByPrimaryKey(Long id); int deleteByPrimaryKey(Long id);
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table jsh_account
*
* @mbggenerated
*/
int insert(Account record); int insert(Account record);
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table jsh_account
*
* @mbggenerated
*/
int insertSelective(Account record); int insertSelective(Account record);
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table jsh_account
*
* @mbggenerated
*/
List<Account> selectByExample(AccountExample example); List<Account> selectByExample(AccountExample example);
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table jsh_account
*
* @mbggenerated
*/
Account selectByPrimaryKey(Long id); Account selectByPrimaryKey(Long id);
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table jsh_account
*
* @mbggenerated
*/
int updateByExampleSelective(@Param("record") Account record, @Param("example") AccountExample example); int updateByExampleSelective(@Param("record") Account record, @Param("example") AccountExample example);
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table jsh_account
*
* @mbggenerated
*/
int updateByExample(@Param("record") Account record, @Param("example") AccountExample example); int updateByExample(@Param("record") Account record, @Param("example") AccountExample example);
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table jsh_account
*
* @mbggenerated
*/
int updateByPrimaryKeySelective(Account record); int updateByPrimaryKeySelective(Account record);
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table jsh_account
*
* @mbggenerated
*/
int updateByPrimaryKey(Account record); int updateByPrimaryKey(Account record);
} }

30
src/main/java/com/jsh/erp/datasource/mappers/FunctionMapper.java Normal file
View File

@@ -0,0 +1,30 @@
package com.jsh.erp.datasource.mappers;
import com.jsh.erp.datasource.entities.Function;
import com.jsh.erp.datasource.entities.FunctionExample;
import java.util.List;
import org.apache.ibatis.annotations.Param;
public interface FunctionMapper {
long countByExample(FunctionExample example);
int deleteByExample(FunctionExample example);
int deleteByPrimaryKey(Long id);
int insert(Function record);
int insertSelective(Function record);
List<Function> selectByExample(FunctionExample example);
Function selectByPrimaryKey(Long id);
int updateByExampleSelective(@Param("record") Function record, @Param("example") FunctionExample example);
int updateByExample(@Param("record") Function record, @Param("example") FunctionExample example);
int updateByPrimaryKeySelective(Function record);
int updateByPrimaryKey(Function record);
}

11
src/main/java/com/jsh/erp/datasource/mappers/FunctionsMapperEx.java → src/main/java/com/jsh/erp/datasource/mappers/FunctionMapperEx.java
View File

@@ -1,23 +1,22 @@
package com.jsh.erp.datasource.mappers; package com.jsh.erp.datasource.mappers;
import com.jsh.erp.datasource.entities.Functions; import com.jsh.erp.datasource.entities.Function;
import com.jsh.erp.datasource.entities.FunctionsExample;
import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Param;
import java.util.Date; import java.util.Date;
import java.util.List; import java.util.List;
public interface FunctionsMapperEx { public interface FunctionMapperEx {
List<Functions> selectByConditionFunctions( List<Function> selectByConditionFunction(
@Param("name") String name, @Param("name") String name,
@Param("type") String type, @Param("type") String type,
@Param("offset") Integer offset, @Param("offset") Integer offset,
@Param("rows") Integer rows); @Param("rows") Integer rows);
Long countsByFunctions( Long countsByFunction(
@Param("name") String name, @Param("name") String name,
@Param("type") String type); @Param("type") String type);
int batchDeleteFunctionsByIds(@Param("updateTime") Date updateTime, @Param("updater") Long updater, @Param("ids") String ids[]); int batchDeleteFunctionByIds(@Param("updateTime") Date updateTime, @Param("updater") Long updater, @Param("ids") String ids[]);
} }

96
src/main/java/com/jsh/erp/datasource/mappers/FunctionsMapper.java
View File

@@ -1,96 +0,0 @@
package com.jsh.erp.datasource.mappers;
import com.jsh.erp.datasource.entities.Functions;
import com.jsh.erp.datasource.entities.FunctionsExample;
import java.util.List;
import org.apache.ibatis.annotations.Param;
public interface FunctionsMapper {
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table jsh_functions
*
* @mbggenerated
*/
int countByExample(FunctionsExample example);
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table jsh_functions
*
* @mbggenerated
*/
int deleteByExample(FunctionsExample example);
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table jsh_functions
*
* @mbggenerated
*/
int deleteByPrimaryKey(Long id);
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table jsh_functions
*
* @mbggenerated
*/
int insert(Functions record);
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table jsh_functions
*
* @mbggenerated
*/
int insertSelective(Functions record);
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table jsh_functions
*
* @mbggenerated
*/
List<Functions> selectByExample(FunctionsExample example);
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table jsh_functions
*
* @mbggenerated
*/
Functions selectByPrimaryKey(Long id);
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table jsh_functions
*
* @mbggenerated
*/
int updateByExampleSelective(@Param("record") Functions record, @Param("example") FunctionsExample example);
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table jsh_functions
*
* @mbggenerated
*/
int updateByExample(@Param("record") Functions record, @Param("example") FunctionsExample example);
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table jsh_functions
*
* @mbggenerated
*/
int updateByPrimaryKeySelective(Functions record);
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table jsh_functions
*
* @mbggenerated
*/
int updateByPrimaryKey(Functions record);
}

68
src/main/java/com/jsh/erp/datasource/mappers/InOutItemMapper.java
View File

@@ -6,91 +6,25 @@ import java.util.List;
import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Param;
public interface InOutItemMapper { public interface InOutItemMapper {
/** long countByExample(InOutItemExample example);
* This method was generated by MyBatis Generator.
* This method corresponds to the database table jsh_inoutitem
*
* @mbggenerated
*/
int countByExample(InOutItemExample example);
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table jsh_inoutitem
*
* @mbggenerated
*/
int deleteByExample(InOutItemExample example); int deleteByExample(InOutItemExample example);
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table jsh_inoutitem
*
* @mbggenerated
*/
int deleteByPrimaryKey(Long id); int deleteByPrimaryKey(Long id);
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table jsh_inoutitem
*
* @mbggenerated
*/
int insert(InOutItem record); int insert(InOutItem record);
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table jsh_inoutitem
*
* @mbggenerated
*/
int insertSelective(InOutItem record); int insertSelective(InOutItem record);
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table jsh_inoutitem
*
* @mbggenerated
*/
List<InOutItem> selectByExample(InOutItemExample example); List<InOutItem> selectByExample(InOutItemExample example);
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table jsh_inoutitem
*
* @mbggenerated
*/
InOutItem selectByPrimaryKey(Long id); InOutItem selectByPrimaryKey(Long id);
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table jsh_inoutitem
*
* @mbggenerated
*/
int updateByExampleSelective(@Param("record") InOutItem record, @Param("example") InOutItemExample example); int updateByExampleSelective(@Param("record") InOutItem record, @Param("example") InOutItemExample example);
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table jsh_inoutitem
*
* @mbggenerated
*/
int updateByExample(@Param("record") InOutItem record, @Param("example") InOutItemExample example); int updateByExample(@Param("record") InOutItem record, @Param("example") InOutItemExample example);
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table jsh_inoutitem
*
* @mbggenerated
*/
int updateByPrimaryKeySelective(InOutItem record); int updateByPrimaryKeySelective(InOutItem record);
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table jsh_inoutitem
*
* @mbggenerated
*/
int updateByPrimaryKey(InOutItem record); int updateByPrimaryKey(InOutItem record);
} }

68
src/main/java/com/jsh/erp/datasource/mappers/LogMapper.java
View File

@@ -6,91 +6,25 @@ import java.util.List;
import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Param;
public interface LogMapper { public interface LogMapper {
/** long countByExample(LogExample example);
* This method was generated by MyBatis Generator.
* This method corresponds to the database table jsh_log
*
* @mbggenerated
*/
int countByExample(LogExample example);
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table jsh_log
*
* @mbggenerated
*/
int deleteByExample(LogExample example); int deleteByExample(LogExample example);
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table jsh_log
*
* @mbggenerated
*/
int deleteByPrimaryKey(Long id); int deleteByPrimaryKey(Long id);
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table jsh_log
*
* @mbggenerated
*/
int insert(Log record); int insert(Log record);
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table jsh_log
*
* @mbggenerated
*/
int insertSelective(Log record); int insertSelective(Log record);
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table jsh_log
*
* @mbggenerated
*/
List<Log> selectByExample(LogExample example); List<Log> selectByExample(LogExample example);
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table jsh_log
*
* @mbggenerated
*/
Log selectByPrimaryKey(Long id); Log selectByPrimaryKey(Long id);
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table jsh_log
*
* @mbggenerated
*/
int updateByExampleSelective(@Param("record") Log record, @Param("example") LogExample example); int updateByExampleSelective(@Param("record") Log record, @Param("example") LogExample example);
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table jsh_log
*
* @mbggenerated
*/
int updateByExample(@Param("record") Log record, @Param("example") LogExample example); int updateByExample(@Param("record") Log record, @Param("example") LogExample example);
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table jsh_log
*
* @mbggenerated
*/
int updateByPrimaryKeySelective(Log record); int updateByPrimaryKeySelective(Log record);
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table jsh_log
*
* @mbggenerated
*/
int updateByPrimaryKey(Log record); int updateByPrimaryKey(Log record);
} }

8
src/main/java/com/jsh/erp/datasource/mappers/LogMapperEx.java
View File

@@ -11,21 +11,21 @@ public interface LogMapperEx {
List<LogVo4List> selectByConditionLog( List<LogVo4List> selectByConditionLog(
@Param("operation") String operation, @Param("operation") String operation,
@Param("usernameID") Integer usernameID, @Param("userId") Integer userId,
@Param("clientIp") String clientIp, @Param("clientIp") String clientIp,
@Param("status") Integer status, @Param("status") Integer status,
@Param("beginTime") String beginTime, @Param("beginTime") String beginTime,
@Param("endTime") String endTime, @Param("endTime") String endTime,
@Param("contentdetails") String contentdetails, @Param("content") String content,
@Param("offset") Integer offset, @Param("offset") Integer offset,
@Param("rows") Integer rows); @Param("rows") Integer rows);
Long countsByLog( Long countsByLog(
@Param("operation") String operation, @Param("operation") String operation,
@Param("usernameID") Integer usernameID, @Param("userId") Integer userId,
@Param("clientIp") String clientIp, @Param("clientIp") String clientIp,
@Param("status") Integer status, @Param("status") Integer status,
@Param("beginTime") String beginTime, @Param("beginTime") String beginTime,
@Param("endTime") String endTime, @Param("endTime") String endTime,
@Param("contentdetails") String contentdetails); @Param("content") String content);
} }

68
src/main/java/com/jsh/erp/datasource/mappers/MaterialCategoryMapper.java
View File

@@ -6,91 +6,25 @@ import java.util.List;
import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Param;
public interface MaterialCategoryMapper { public interface MaterialCategoryMapper {
/** long countByExample(MaterialCategoryExample example);
* This method was generated by MyBatis Generator.
* This method corresponds to the database table jsh_materialcategory
*
* @mbggenerated
*/
int countByExample(MaterialCategoryExample example);
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table jsh_materialcategory
*
* @mbggenerated
*/
int deleteByExample(MaterialCategoryExample example); int deleteByExample(MaterialCategoryExample example);
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table jsh_materialcategory
*
* @mbggenerated
*/
int deleteByPrimaryKey(Long id); int deleteByPrimaryKey(Long id);
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table jsh_materialcategory
*
* @mbggenerated
*/
int insert(MaterialCategory record); int insert(MaterialCategory record);
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table jsh_materialcategory
*
* @mbggenerated
*/
int insertSelective(MaterialCategory record); int insertSelective(MaterialCategory record);
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table jsh_materialcategory
*
* @mbggenerated
*/
List<MaterialCategory> selectByExample(MaterialCategoryExample example); List<MaterialCategory> selectByExample(MaterialCategoryExample example);
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table jsh_materialcategory
*
* @mbggenerated
*/
MaterialCategory selectByPrimaryKey(Long id); MaterialCategory selectByPrimaryKey(Long id);
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table jsh_materialcategory
*
* @mbggenerated
*/
int updateByExampleSelective(@Param("record") MaterialCategory record, @Param("example") MaterialCategoryExample example); int updateByExampleSelective(@Param("record") MaterialCategory record, @Param("example") MaterialCategoryExample example);
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table jsh_materialcategory
*
* @mbggenerated
*/
int updateByExample(@Param("record") MaterialCategory record, @Param("example") MaterialCategoryExample example); int updateByExample(@Param("record") MaterialCategory record, @Param("example") MaterialCategoryExample example);
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table jsh_materialcategory
*
* @mbggenerated
*/
int updateByPrimaryKeySelective(MaterialCategory record); int updateByPrimaryKeySelective(MaterialCategory record);
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table jsh_materialcategory
*
* @mbggenerated
*/
int updateByPrimaryKey(MaterialCategory record); int updateByPrimaryKey(MaterialCategory record);
} }

68
src/main/java/com/jsh/erp/datasource/mappers/MaterialPropertyMapper.java
View File

@@ -6,91 +6,25 @@ import java.util.List;
import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Param;
public interface MaterialPropertyMapper { public interface MaterialPropertyMapper {
/** long countByExample(MaterialPropertyExample example);
* This method was generated by MyBatis Generator.
* This method corresponds to the database table jsh_materialproperty
*
* @mbggenerated
*/
int countByExample(MaterialPropertyExample example);
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table jsh_materialproperty
*
* @mbggenerated
*/
int deleteByExample(MaterialPropertyExample example); int deleteByExample(MaterialPropertyExample example);
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table jsh_materialproperty
*
* @mbggenerated
*/
int deleteByPrimaryKey(Long id); int deleteByPrimaryKey(Long id);
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table jsh_materialproperty
*
* @mbggenerated
*/
int insert(MaterialProperty record); int insert(MaterialProperty record);
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table jsh_materialproperty
*
* @mbggenerated
*/
int insertSelective(MaterialProperty record); int insertSelective(MaterialProperty record);
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table jsh_materialproperty
*
* @mbggenerated
*/
List<MaterialProperty> selectByExample(MaterialPropertyExample example); List<MaterialProperty> selectByExample(MaterialPropertyExample example);
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table jsh_materialproperty
*
* @mbggenerated
*/
MaterialProperty selectByPrimaryKey(Long id); MaterialProperty selectByPrimaryKey(Long id);
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table jsh_materialproperty
*
* @mbggenerated
*/
int updateByExampleSelective(@Param("record") MaterialProperty record, @Param("example") MaterialPropertyExample example); int updateByExampleSelective(@Param("record") MaterialProperty record, @Param("example") MaterialPropertyExample example);
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table jsh_materialproperty
*
* @mbggenerated
*/
int updateByExample(@Param("record") MaterialProperty record, @Param("example") MaterialPropertyExample example); int updateByExample(@Param("record") MaterialProperty record, @Param("example") MaterialPropertyExample example);
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table jsh_materialproperty
*
* @mbggenerated
*/
int updateByPrimaryKeySelective(MaterialProperty record); int updateByPrimaryKeySelective(MaterialProperty record);
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table jsh_materialproperty
*
* @mbggenerated
*/
int updateByPrimaryKey(MaterialProperty record); int updateByPrimaryKey(MaterialProperty record);
} }

68
src/main/java/com/jsh/erp/datasource/mappers/PersonMapper.java
View File

@@ -6,91 +6,25 @@ import java.util.List;
import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Param;
public interface PersonMapper { public interface PersonMapper {
/** long countByExample(PersonExample example);
* This method was generated by MyBatis Generator.
* This method corresponds to the database table jsh_person
*
* @mbggenerated
*/
int countByExample(PersonExample example);
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table jsh_person
*
* @mbggenerated
*/
int deleteByExample(PersonExample example); int deleteByExample(PersonExample example);
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table jsh_person
*
* @mbggenerated
*/
int deleteByPrimaryKey(Long id); int deleteByPrimaryKey(Long id);
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table jsh_person
*
* @mbggenerated
*/
int insert(Person record); int insert(Person record);
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table jsh_person
*
* @mbggenerated
*/
int insertSelective(Person record); int insertSelective(Person record);
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table jsh_person
*
* @mbggenerated
*/
List<Person> selectByExample(PersonExample example); List<Person> selectByExample(PersonExample example);
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table jsh_person
*
* @mbggenerated
*/
Person selectByPrimaryKey(Long id); Person selectByPrimaryKey(Long id);
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table jsh_person
*
* @mbggenerated
*/
int updateByExampleSelective(@Param("record") Person record, @Param("example") PersonExample example); int updateByExampleSelective(@Param("record") Person record, @Param("example") PersonExample example);
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table jsh_person
*
* @mbggenerated
*/
int updateByExample(@Param("record") Person record, @Param("example") PersonExample example); int updateByExample(@Param("record") Person record, @Param("example") PersonExample example);
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table jsh_person
*
* @mbggenerated
*/
int updateByPrimaryKeySelective(Person record); int updateByPrimaryKeySelective(Person record);
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table jsh_person
*
* @mbggenerated
*/
int updateByPrimaryKey(Person record); int updateByPrimaryKey(Person record);
} }

68
src/main/java/com/jsh/erp/datasource/mappers/RoleMapper.java
View File

@@ -6,91 +6,25 @@ import java.util.List;
import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Param;
public interface RoleMapper { public interface RoleMapper {
/** long countByExample(RoleExample example);
* This method was generated by MyBatis Generator.
* This method corresponds to the database table jsh_role
*
* @mbggenerated
*/
int countByExample(RoleExample example);
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table jsh_role
*
* @mbggenerated
*/
int deleteByExample(RoleExample example); int deleteByExample(RoleExample example);
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table jsh_role
*
* @mbggenerated
*/
int deleteByPrimaryKey(Long id); int deleteByPrimaryKey(Long id);
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table jsh_role
*
* @mbggenerated
*/
int insert(Role record); int insert(Role record);
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table jsh_role
*
* @mbggenerated
*/
int insertSelective(Role record); int insertSelective(Role record);
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table jsh_role
*
* @mbggenerated
*/
List<Role> selectByExample(RoleExample example); List<Role> selectByExample(RoleExample example);
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table jsh_role
*
* @mbggenerated
*/
Role selectByPrimaryKey(Long id); Role selectByPrimaryKey(Long id);
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table jsh_role
*
* @mbggenerated
*/
int updateByExampleSelective(@Param("record") Role record, @Param("example") RoleExample example); int updateByExampleSelective(@Param("record") Role record, @Param("example") RoleExample example);
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table jsh_role
*
* @mbggenerated
*/
int updateByExample(@Param("record") Role record, @Param("example") RoleExample example); int updateByExample(@Param("record") Role record, @Param("example") RoleExample example);
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table jsh_role
*
* @mbggenerated
*/
int updateByPrimaryKeySelective(Role record); int updateByPrimaryKeySelective(Role record);
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table jsh_role
*
* @mbggenerated
*/
int updateByPrimaryKey(Role record); int updateByPrimaryKey(Role record);
} }

68
src/main/java/com/jsh/erp/datasource/mappers/SerialNumberMapper.java
View File

@@ -6,91 +6,25 @@ import java.util.List;
import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Param;
public interface SerialNumberMapper { public interface SerialNumberMapper {
/** long countByExample(SerialNumberExample example);
* This method was generated by MyBatis Generator.
* This method corresponds to the database table jsh_serial_number
*
* @mbggenerated
*/
int countByExample(SerialNumberExample example);
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table jsh_serial_number
*
* @mbggenerated
*/
int deleteByExample(SerialNumberExample example); int deleteByExample(SerialNumberExample example);
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table jsh_serial_number
*
* @mbggenerated
*/
int deleteByPrimaryKey(Long id); int deleteByPrimaryKey(Long id);
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table jsh_serial_number
*
* @mbggenerated
*/
int insert(SerialNumber record); int insert(SerialNumber record);
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table jsh_serial_number
*
* @mbggenerated
*/
int insertSelective(SerialNumber record); int insertSelective(SerialNumber record);
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table jsh_serial_number
*
* @mbggenerated
*/
List<SerialNumber> selectByExample(SerialNumberExample example); List<SerialNumber> selectByExample(SerialNumberExample example);
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table jsh_serial_number
*
* @mbggenerated
*/
SerialNumber selectByPrimaryKey(Long id); SerialNumber selectByPrimaryKey(Long id);
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table jsh_serial_number
*
* @mbggenerated
*/
int updateByExampleSelective(@Param("record") SerialNumber record, @Param("example") SerialNumberExample example); int updateByExampleSelective(@Param("record") SerialNumber record, @Param("example") SerialNumberExample example);
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table jsh_serial_number
*
* @mbggenerated
*/
int updateByExample(@Param("record") SerialNumber record, @Param("example") SerialNumberExample example); int updateByExample(@Param("record") SerialNumber record, @Param("example") SerialNumberExample example);
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table jsh_serial_number
*
* @mbggenerated
*/
int updateByPrimaryKeySelective(SerialNumber record); int updateByPrimaryKeySelective(SerialNumber record);
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table jsh_serial_number
*
* @mbggenerated
*/
int updateByPrimaryKey(SerialNumber record); int updateByPrimaryKey(SerialNumber record);
} }

68
src/main/java/com/jsh/erp/datasource/mappers/UserBusinessMapper.java
View File

@@ -6,91 +6,25 @@ import java.util.List;
import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Param;
public interface UserBusinessMapper { public interface UserBusinessMapper {
/** long countByExample(UserBusinessExample example);
* This method was generated by MyBatis Generator.
* This method corresponds to the database table jsh_userbusiness
*
* @mbggenerated
*/
int countByExample(UserBusinessExample example);
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table jsh_userbusiness
*
* @mbggenerated
*/
int deleteByExample(UserBusinessExample example); int deleteByExample(UserBusinessExample example);
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table jsh_userbusiness
*
* @mbggenerated
*/
int deleteByPrimaryKey(Long id); int deleteByPrimaryKey(Long id);
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table jsh_userbusiness
*
* @mbggenerated
*/
int insert(UserBusiness record); int insert(UserBusiness record);
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table jsh_userbusiness
*
* @mbggenerated
*/
int insertSelective(UserBusiness record); int insertSelective(UserBusiness record);
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table jsh_userbusiness
*
* @mbggenerated
*/
List<UserBusiness> selectByExample(UserBusinessExample example); List<UserBusiness> selectByExample(UserBusinessExample example);
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table jsh_userbusiness
*
* @mbggenerated
*/
UserBusiness selectByPrimaryKey(Long id); UserBusiness selectByPrimaryKey(Long id);
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table jsh_userbusiness
*
* @mbggenerated
*/
int updateByExampleSelective(@Param("record") UserBusiness record, @Param("example") UserBusinessExample example); int updateByExampleSelective(@Param("record") UserBusiness record, @Param("example") UserBusinessExample example);
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table jsh_userbusiness
*
* @mbggenerated
*/
int updateByExample(@Param("record") UserBusiness record, @Param("example") UserBusinessExample example); int updateByExample(@Param("record") UserBusiness record, @Param("example") UserBusinessExample example);
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table jsh_userbusiness
*
* @mbggenerated
*/
int updateByPrimaryKeySelective(UserBusiness record); int updateByPrimaryKeySelective(UserBusiness record);
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table jsh_userbusiness
*
* @mbggenerated
*/
int updateByPrimaryKey(UserBusiness record); int updateByPrimaryKey(UserBusiness record);
} }

2
src/main/java/com/jsh/erp/datasource/mappers/UserBusinessMapperEx.java
View File

@@ -9,5 +9,7 @@ import java.util.Date; /**
* @Date: 2019/3/29 15:09 * @Date: 2019/3/29 15:09
*/ */
public interface UserBusinessMapperEx { public interface UserBusinessMapperEx {
int batchDeleteUserBusinessByIds(@Param("updateTime") Date updateTime, @Param("updater") Long updater, @Param("ids") String ids[]); int batchDeleteUserBusinessByIds(@Param("updateTime") Date updateTime, @Param("updater") Long updater, @Param("ids") String ids[]);
} }

10
src/main/java/com/jsh/erp/datasource/vo/AccountVo4List.java
View File

@@ -4,13 +4,13 @@ import com.jsh.erp.datasource.entities.Account;
public class AccountVo4List extends Account{ public class AccountVo4List extends Account{
private String thismonthamount; private String thisMonthAmount;
public String getThismonthamount() { public String getThisMonthAmount() {
return thismonthamount; return thisMonthAmount;
} }
public void setThismonthamount(String thismonthamount) { public void setThisMonthAmount(String thisMonthAmount) {
this.thismonthamount = thismonthamount; this.thisMonthAmount = thisMonthAmount;
} }
} }

10
src/main/java/com/jsh/erp/datasource/vo/LogVo4List.java
View File

@@ -4,16 +4,16 @@ import com.jsh.erp.datasource.entities.Log;
public class LogVo4List extends Log { public class LogVo4List extends Log {
private String username; private String userName;
private String createTimeStr; private String createTimeStr;
public String getUsername() { public String getUserName() {
return username; return userName;
} }
public void setUsername(String username) { public void setUserName(String userName) {
this.username = username; this.userName = userName;
} }
public String getCreateTimeStr() { public String getCreateTimeStr() {

16
src/main/java/com/jsh/erp/service/account/AccountService.java
View File

@@ -104,9 +104,9 @@ public class AccountService {
if ((thisMonthAmount.compareTo(BigDecimal.ZERO))!=0) { if ((thisMonthAmount.compareTo(BigDecimal.ZERO))!=0) {
thisMonthAmountFmt = df.format(thisMonthAmount); thisMonthAmountFmt = df.format(thisMonthAmount);
} }
al.setThismonthamount(thisMonthAmountFmt); //本月发生额 al.setThisMonthAmount(thisMonthAmountFmt); //本月发生额
BigDecimal currentAmount = getAccountSum(al.getId(), "", "month").add(getAccountSumByHead(al.getId(), "", "month")).add(getAccountSumByDetail(al.getId(), "", "month")).add(getManyAccountSum(al.getId(), "", "month")) .add(al.getInitialamount()) ; BigDecimal currentAmount = getAccountSum(al.getId(), "", "month").add(getAccountSumByHead(al.getId(), "", "month")).add(getAccountSumByDetail(al.getId(), "", "month")).add(getManyAccountSum(al.getId(), "", "month")) .add(al.getInitialAmount()) ;
al.setCurrentamount(currentAmount); al.setCurrentAmount(currentAmount);
resList.add(al); resList.add(al);
} }
} }
@@ -126,10 +126,10 @@ public class AccountService {
@Transactional(value = "transactionManager", rollbackFor = Exception.class) @Transactional(value = "transactionManager", rollbackFor = Exception.class)
public int insertAccount(String beanJson, HttpServletRequest request)throws Exception { public int insertAccount(String beanJson, HttpServletRequest request)throws Exception {
Account account = JSONObject.parseObject(beanJson, Account.class); Account account = JSONObject.parseObject(beanJson, Account.class);
if(account.getInitialamount() == null) { if(account.getInitialAmount() == null) {
account.setInitialamount(BigDecimal.ZERO); account.setInitialAmount(BigDecimal.ZERO);
} }
account.setIsdefault(false); account.setIsDefault(false);
int result=0; int result=0;
try{ try{
result = accountMapper.insertSelective(account); result = accountMapper.insertSelective(account);
@@ -442,7 +442,7 @@ public class AccountService {
logService.insertLog("账户",BusinessConstants.LOG_OPERATION_TYPE_EDIT+accountId, logService.insertLog("账户",BusinessConstants.LOG_OPERATION_TYPE_EDIT+accountId,
((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest()); ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest());
Account account = new Account(); Account account = new Account();
account.setIsdefault(isDefault); account.setIsDefault(isDefault);
AccountExample example = new AccountExample(); AccountExample example = new AccountExample();
example.createCriteria().andIdEqualTo(accountId); example.createCriteria().andIdEqualTo(accountId);
int result=0; int result=0;
@@ -561,7 +561,7 @@ public class AccountService {
BigDecimal monthAmount = getAccountSum(a.getId(), timeStr, "month").add(getAccountSumByHead(a.getId(), timeStr, "month")) BigDecimal monthAmount = getAccountSum(a.getId(), timeStr, "month").add(getAccountSumByHead(a.getId(), timeStr, "month"))
.add(getAccountSumByDetail(a.getId(), timeStr, "month")).add(getManyAccountSum(a.getId(), timeStr, "month")); .add(getAccountSumByDetail(a.getId(), timeStr, "month")).add(getManyAccountSum(a.getId(), timeStr, "month"));
BigDecimal currentAmount = getAccountSum(a.getId(), "", "month").add(getAccountSumByHead(a.getId(), "", "month")) BigDecimal currentAmount = getAccountSum(a.getId(), "", "month").add(getAccountSumByHead(a.getId(), "", "month"))
.add(getAccountSumByDetail(a.getId(), "", "month")).add(getManyAccountSum(a.getId(), "", "month")).add(a.getInitialamount()); .add(getAccountSumByDetail(a.getId(), "", "month")).add(getManyAccountSum(a.getId(), "", "month")).add(a.getInitialAmount());
allMonthAmount = allMonthAmount.add(monthAmount); allMonthAmount = allMonthAmount.add(monthAmount);
allCurrentAmount = allCurrentAmount.add(currentAmount); allCurrentAmount = allCurrentAmount.add(currentAmount);
} }

25
src/main/java/com/jsh/erp/service/functions/FunctionsComponent.java → src/main/java/com/jsh/erp/service/functions/FunctionComponent.java
View File

@@ -1,7 +1,6 @@
package com.jsh.erp.service.functions; package com.jsh.erp.service.functions;
import com.jsh.erp.service.ICommonQuery; import com.jsh.erp.service.ICommonQuery;
import com.jsh.erp.service.functions.FunctionsService;
import com.jsh.erp.utils.Constants; import com.jsh.erp.utils.Constants;
import com.jsh.erp.utils.QueryUtils; import com.jsh.erp.utils.QueryUtils;
import com.jsh.erp.utils.StringUtil; import com.jsh.erp.utils.StringUtil;
@@ -12,16 +11,16 @@ import javax.servlet.http.HttpServletRequest;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
@Service(value = "functions_component") @Service(value = "function_component")
@FunctionsResource @FunctionResource
public class FunctionsComponent implements ICommonQuery { public class FunctionComponent implements ICommonQuery {
@Resource @Resource
private FunctionsService functionsService; private FunctionService functionService;
@Override @Override
public Object selectOne(Long id) throws Exception { public Object selectOne(Long id) throws Exception {
return functionsService.getFunctions(id); return functionService.getFunction(id);
} }
@Override @Override
@@ -34,7 +33,7 @@ public class FunctionsComponent implements ICommonQuery {
String name = StringUtil.getInfo(search, "name"); String name = StringUtil.getInfo(search, "name");
String type = StringUtil.getInfo(search, "type"); String type = StringUtil.getInfo(search, "type");
String order = QueryUtils.order(map); String order = QueryUtils.order(map);
return functionsService.select(name, type, QueryUtils.offset(map), QueryUtils.rows(map)); return functionService.select(name, type, QueryUtils.offset(map), QueryUtils.rows(map));
} }
@Override @Override
@@ -42,32 +41,32 @@ public class FunctionsComponent implements ICommonQuery {
String search = map.get(Constants.SEARCH); String search = map.get(Constants.SEARCH);
String name = StringUtil.getInfo(search, "name"); String name = StringUtil.getInfo(search, "name");
String type = StringUtil.getInfo(search, "type"); String type = StringUtil.getInfo(search, "type");
return functionsService.countFunctions(name, type); return functionService.countFunction(name, type);
} }
@Override @Override
public int insert(String beanJson, HttpServletRequest request)throws Exception { public int insert(String beanJson, HttpServletRequest request)throws Exception {
return functionsService.insertFunctions(beanJson, request); return functionService.insertFunction(beanJson, request);
} }
@Override @Override
public int update(String beanJson, Long id, HttpServletRequest request)throws Exception { public int update(String beanJson, Long id, HttpServletRequest request)throws Exception {
return functionsService.updateFunctions(beanJson, id, request); return functionService.updateFunction(beanJson, id, request);
} }
@Override @Override
public int delete(Long id, HttpServletRequest request)throws Exception { public int delete(Long id, HttpServletRequest request)throws Exception {
return functionsService.deleteFunctions(id, request); return functionService.deleteFunction(id, request);
} }
@Override @Override
public int batchDelete(String ids, HttpServletRequest request)throws Exception { public int batchDelete(String ids, HttpServletRequest request)throws Exception {
return functionsService.batchDeleteFunctions(ids, request); return functionService.batchDeleteFunction(ids, request);
} }
@Override @Override
public int checkIsNameExist(Long id, String name)throws Exception { public int checkIsNameExist(Long id, String name)throws Exception {
return functionsService.checkIsNameExist(id, name); return functionService.checkIsNameExist(id, name);
} }
} }

4
src/main/java/com/jsh/erp/service/functions/FunctionsResource.java → src/main/java/com/jsh/erp/service/functions/FunctionResource.java
View File

@@ -7,9 +7,9 @@ import java.lang.annotation.*;
/** /**
* @author jishenghua qq752718920 2018-10-7 15:26:27 * @author jishenghua qq752718920 2018-10-7 15:26:27
*/ */
@ResourceInfo(value = "functions") @ResourceInfo(value = "function")
@Inherited @Inherited
@Target(ElementType.TYPE) @Target(ElementType.TYPE)
@Retention(RetentionPolicy.RUNTIME) @Retention(RetentionPolicy.RUNTIME)
public @interface FunctionsResource { public @interface FunctionResource {
} }

93
src/main/java/com/jsh/erp/service/functions/FunctionsService.java → src/main/java/com/jsh/erp/service/functions/FunctionService.java
View File

@@ -2,14 +2,11 @@ package com.jsh.erp.service.functions;
import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson.JSONObject;
import com.jsh.erp.constants.BusinessConstants; import com.jsh.erp.constants.BusinessConstants;
import com.jsh.erp.constants.ExceptionConstants; import com.jsh.erp.datasource.entities.Function;
import com.jsh.erp.datasource.entities.DepotItem; import com.jsh.erp.datasource.entities.FunctionExample;
import com.jsh.erp.datasource.entities.Functions;
import com.jsh.erp.datasource.entities.FunctionsExample;
import com.jsh.erp.datasource.entities.User; import com.jsh.erp.datasource.entities.User;
import com.jsh.erp.datasource.mappers.FunctionsMapper; import com.jsh.erp.datasource.mappers.FunctionMapper;
import com.jsh.erp.datasource.mappers.FunctionsMapperEx; import com.jsh.erp.datasource.mappers.FunctionMapperEx;
import com.jsh.erp.exception.BusinessRunTimeException;
import com.jsh.erp.exception.JshException; import com.jsh.erp.exception.JshException;
import com.jsh.erp.service.log.LogService; import com.jsh.erp.service.log.LogService;
import com.jsh.erp.service.user.UserService; import com.jsh.erp.service.user.UserService;
@@ -28,21 +25,21 @@ import java.util.Date;
import java.util.List; import java.util.List;
@Service @Service
public class FunctionsService { public class FunctionService {
private Logger logger = LoggerFactory.getLogger(FunctionsService.class); private Logger logger = LoggerFactory.getLogger(FunctionService.class);
@Resource @Resource
private FunctionsMapper functionsMapper; private FunctionMapper functionsMapper;
@Resource @Resource
private FunctionsMapperEx functionsMapperEx; private FunctionMapperEx functionMapperEx;
@Resource @Resource
private UserService userService; private UserService userService;
@Resource @Resource
private LogService logService; private LogService logService;
public Functions getFunctions(long id)throws Exception { public Function getFunction(long id)throws Exception {
Functions result=null; Function result=null;
try{ try{
result=functionsMapper.selectByPrimaryKey(id); result=functionsMapper.selectByPrimaryKey(id);
}catch(Exception e){ }catch(Exception e){
@@ -51,11 +48,11 @@ public class FunctionsService {
return result; return result;
} }
public List<Functions> getFunctionsListByIds(String ids)throws Exception { public List<Function> getFunctionListByIds(String ids)throws Exception {
List<Long> idList = StringUtil.strToLongList(ids); List<Long> idList = StringUtil.strToLongList(ids);
List<Functions> list = new ArrayList<>(); List<Function> list = new ArrayList<>();
try{ try{
FunctionsExample example = new FunctionsExample(); FunctionExample example = new FunctionExample();
example.createCriteria().andIdIn(idList); example.createCriteria().andIdIn(idList);
list = functionsMapper.selectByExample(example); list = functionsMapper.selectByExample(example);
}catch(Exception e){ }catch(Exception e){
@@ -64,10 +61,10 @@ public class FunctionsService {
return list; return list;
} }
public List<Functions> getFunctions()throws Exception { public List<Function> getFunction()throws Exception {
FunctionsExample example = new FunctionsExample(); FunctionExample example = new FunctionExample();
example.createCriteria().andDeleteFlagNotEqualTo(BusinessConstants.DELETE_FLAG_DELETED); example.createCriteria().andDeleteFlagNotEqualTo(BusinessConstants.DELETE_FLAG_DELETED);
List<Functions> list=null; List<Function> list=null;
try{ try{
list=functionsMapper.selectByExample(example); list=functionsMapper.selectByExample(example);
}catch(Exception e){ }catch(Exception e){
@@ -76,20 +73,20 @@ public class FunctionsService {
return list; return list;
} }
public List<Functions> select(String name, String type, int offset, int rows)throws Exception { public List<Function> select(String name, String type, int offset, int rows)throws Exception {
List<Functions> list=null; List<Function> list=null;
try{ try{
list=functionsMapperEx.selectByConditionFunctions(name, type, offset, rows); list= functionMapperEx.selectByConditionFunction(name, type, offset, rows);
}catch(Exception e){ }catch(Exception e){
JshException.readFail(logger, e); JshException.readFail(logger, e);
} }
return list; return list;
} }
public Long countFunctions(String name, String type)throws Exception { public Long countFunction(String name, String type)throws Exception {
Long result=null; Long result=null;
try{ try{
result=functionsMapperEx.countsByFunctions(name, type); result= functionMapperEx.countsByFunction(name, type);
}catch(Exception e){ }catch(Exception e){
JshException.readFail(logger, e); JshException.readFail(logger, e);
} }
@@ -97,8 +94,8 @@ public class FunctionsService {
} }
@Transactional(value = "transactionManager", rollbackFor = Exception.class) @Transactional(value = "transactionManager", rollbackFor = Exception.class)
public int insertFunctions(String beanJson, HttpServletRequest request)throws Exception { public int insertFunction(String beanJson, HttpServletRequest request)throws Exception {
Functions functions = JSONObject.parseObject(beanJson, Functions.class); Function functions = JSONObject.parseObject(beanJson, Function.class);
int result=0; int result=0;
try{ try{
result=functionsMapper.insertSelective(functions); result=functionsMapper.insertSelective(functions);
@@ -111,8 +108,8 @@ public class FunctionsService {
} }
@Transactional(value = "transactionManager", rollbackFor = Exception.class) @Transactional(value = "transactionManager", rollbackFor = Exception.class)
public int updateFunctions(String beanJson, Long id, HttpServletRequest request) throws Exception{ public int updateFunction(String beanJson, Long id, HttpServletRequest request) throws Exception{
Functions functions = JSONObject.parseObject(beanJson, Functions.class); Function functions = JSONObject.parseObject(beanJson, Function.class);
functions.setId(id); functions.setId(id);
int result=0; int result=0;
try{ try{
@@ -126,7 +123,7 @@ public class FunctionsService {
} }
@Transactional(value = "transactionManager", rollbackFor = Exception.class) @Transactional(value = "transactionManager", rollbackFor = Exception.class)
public int deleteFunctions(Long id, HttpServletRequest request)throws Exception { public int deleteFunction(Long id, HttpServletRequest request)throws Exception {
int result=0; int result=0;
try{ try{
result=functionsMapper.deleteByPrimaryKey(id); result=functionsMapper.deleteByPrimaryKey(id);
@@ -139,9 +136,9 @@ public class FunctionsService {
} }
@Transactional(value = "transactionManager", rollbackFor = Exception.class) @Transactional(value = "transactionManager", rollbackFor = Exception.class)
public int batchDeleteFunctions(String ids, HttpServletRequest request)throws Exception { public int batchDeleteFunction(String ids, HttpServletRequest request)throws Exception {
List<Long> idList = StringUtil.strToLongList(ids); List<Long> idList = StringUtil.strToLongList(ids);
FunctionsExample example = new FunctionsExample(); FunctionExample example = new FunctionExample();
example.createCriteria().andIdIn(idList); example.createCriteria().andIdIn(idList);
int result=0; int result=0;
try{ try{
@@ -154,9 +151,9 @@ public class FunctionsService {
} }
public int checkIsNameExist(Long id, String name)throws Exception { public int checkIsNameExist(Long id, String name)throws Exception {
FunctionsExample example = new FunctionsExample(); FunctionExample example = new FunctionExample();
example.createCriteria().andIdNotEqualTo(id).andNameEqualTo(name).andDeleteFlagNotEqualTo(BusinessConstants.DELETE_FLAG_DELETED); example.createCriteria().andIdNotEqualTo(id).andNameEqualTo(name).andDeleteFlagNotEqualTo(BusinessConstants.DELETE_FLAG_DELETED);
List<Functions> list=null; List<Function> list=null;
try{ try{
list = functionsMapper.selectByExample(example); list = functionsMapper.selectByExample(example);
}catch(Exception e){ }catch(Exception e){
@@ -165,12 +162,12 @@ public class FunctionsService {
return list==null?0:list.size(); return list==null?0:list.size();
} }
public List<Functions> getRoleFunctions(String pNumber)throws Exception { public List<Function> getRoleFunction(String pNumber)throws Exception {
FunctionsExample example = new FunctionsExample(); FunctionExample example = new FunctionExample();
example.createCriteria().andEnabledEqualTo(true).andPnumberEqualTo(pNumber) example.createCriteria().andEnabledEqualTo(true).andParentNumberEqualTo(pNumber)
.andDeleteFlagNotEqualTo(BusinessConstants.DELETE_FLAG_DELETED); .andDeleteFlagNotEqualTo(BusinessConstants.DELETE_FLAG_DELETED);
example.setOrderByClause("Sort"); example.setOrderByClause("Sort");
List<Functions> list=null; List<Function> list=null;
try{ try{
list = functionsMapper.selectByExample(example); list = functionsMapper.selectByExample(example);
}catch(Exception e){ }catch(Exception e){
@@ -179,12 +176,12 @@ public class FunctionsService {
return list; return list;
} }
public List<Functions> findRoleFunctions(String pnumber)throws Exception{ public List<Function> findRoleFunction(String pnumber)throws Exception{
FunctionsExample example = new FunctionsExample(); FunctionExample example = new FunctionExample();
example.createCriteria().andEnabledEqualTo(true).andPnumberEqualTo(pnumber) example.createCriteria().andEnabledEqualTo(true).andParentNumberEqualTo(pnumber)
.andDeleteFlagNotEqualTo(BusinessConstants.DELETE_FLAG_DELETED); .andDeleteFlagNotEqualTo(BusinessConstants.DELETE_FLAG_DELETED);
example.setOrderByClause("Sort"); example.setOrderByClause("Sort");
List<Functions> list=null; List<Function> list=null;
try{ try{
list =functionsMapper.selectByExample(example); list =functionsMapper.selectByExample(example);
}catch(Exception e){ }catch(Exception e){
@@ -193,13 +190,13 @@ public class FunctionsService {
return list; return list;
} }
public List<Functions> findByIds(String functionsIds)throws Exception{ public List<Function> findByIds(String functionsIds)throws Exception{
List<Long> idList = StringUtil.strToLongList(functionsIds); List<Long> idList = StringUtil.strToLongList(functionsIds);
FunctionsExample example = new FunctionsExample(); FunctionExample example = new FunctionExample();
example.createCriteria().andEnabledEqualTo(true).andIdIn(idList) example.createCriteria().andEnabledEqualTo(true).andIdIn(idList)
.andDeleteFlagNotEqualTo(BusinessConstants.DELETE_FLAG_DELETED); .andDeleteFlagNotEqualTo(BusinessConstants.DELETE_FLAG_DELETED);
example.setOrderByClause("Sort asc"); example.setOrderByClause("Sort asc");
List<Functions> list=null; List<Function> list=null;
try{ try{
list =functionsMapper.selectByExample(example); list =functionsMapper.selectByExample(example);
}catch(Exception e){ }catch(Exception e){
@@ -209,11 +206,11 @@ public class FunctionsService {
} }
@Transactional(value = "transactionManager", rollbackFor = Exception.class) @Transactional(value = "transactionManager", rollbackFor = Exception.class)
public int batchDeleteFunctionsByIds(String ids)throws Exception { public int batchDeleteFunctionByIds(String ids)throws Exception {
StringBuffer sb = new StringBuffer(); StringBuffer sb = new StringBuffer();
sb.append(BusinessConstants.LOG_OPERATION_TYPE_DELETE); sb.append(BusinessConstants.LOG_OPERATION_TYPE_DELETE);
List<Functions> list = getFunctionsListByIds(ids); List<Function> list = getFunctionListByIds(ids);
for(Functions functions: list){ for(Function functions: list){
sb.append("[").append(functions.getName()).append("]"); sb.append("[").append(functions.getName()).append("]");
} }
logService.insertLog("功能", sb.toString(), logService.insertLog("功能", sb.toString(),
@@ -222,7 +219,7 @@ public class FunctionsService {
String [] idArray=ids.split(","); String [] idArray=ids.split(",");
int result=0; int result=0;
try{ try{
result =functionsMapperEx.batchDeleteFunctionsByIds(new Date(),userInfo==null?null:userInfo.getId(),idArray); result = functionMapperEx.batchDeleteFunctionByIds(new Date(),userInfo==null?null:userInfo.getId(),idArray);
}catch(Exception e){ }catch(Exception e){
JshException.writeFail(logger, e); JshException.writeFail(logger, e);
} }

17
src/main/java/com/jsh/erp/service/log/LogComponent.java
View File

@@ -25,20 +25,19 @@ public class LogComponent implements ICommonQuery {
@Override @Override
public List<?> select(Map<String, String> map)throws Exception { public List<?> select(Map<String, String> map)throws Exception {
return getUserList(map); return getLogList(map);
} }
private List<?> getUserList(Map<String, String> map)throws Exception { private List<?> getLogList(Map<String, String> map)throws Exception {
String search = map.get(Constants.SEARCH); String search = map.get(Constants.SEARCH);
String operation = StringUtil.getInfo(search, "operation"); String operation = StringUtil.getInfo(search, "operation");
Integer usernameID = StringUtil.parseInteger(StringUtil.getInfo(search, "usernameID")); Integer userId = StringUtil.parseInteger(StringUtil.getInfo(search, "userId"));
String clientIp = StringUtil.getInfo(search, "clientIp"); String clientIp = StringUtil.getInfo(search, "clientIp");
Integer status = StringUtil.parseInteger(StringUtil.getInfo(search, "status")); Integer status = StringUtil.parseInteger(StringUtil.getInfo(search, "status"));
String beginTime = StringUtil.getInfo(search, "beginTime"); String beginTime = StringUtil.getInfo(search, "beginTime");
String endTime = StringUtil.getInfo(search, "endTime"); String endTime = StringUtil.getInfo(search, "endTime");
String contentdetails = StringUtil.getInfo(search, "contentdetails"); String content = StringUtil.getInfo(search, "content");
String order = QueryUtils.order(map); return logService.select(operation, userId, clientIp, status, beginTime, endTime, content,
return logService.select(operation, usernameID, clientIp, status, beginTime, endTime, contentdetails,
QueryUtils.offset(map), QueryUtils.rows(map)); QueryUtils.offset(map), QueryUtils.rows(map));
} }
@@ -46,13 +45,13 @@ public class LogComponent implements ICommonQuery {
public Long counts(Map<String, String> map)throws Exception { public Long counts(Map<String, String> map)throws Exception {
String search = map.get(Constants.SEARCH); String search = map.get(Constants.SEARCH);
String operation = StringUtil.getInfo(search, "operation"); String operation = StringUtil.getInfo(search, "operation");
Integer usernameID = StringUtil.parseInteger(StringUtil.getInfo(search, "usernameID")); Integer userId = StringUtil.parseInteger(StringUtil.getInfo(search, "userId"));
String clientIp = StringUtil.getInfo(search, "clientIp"); String clientIp = StringUtil.getInfo(search, "clientIp");
Integer status = StringUtil.parseInteger(StringUtil.getInfo(search, "status")); Integer status = StringUtil.parseInteger(StringUtil.getInfo(search, "status"));
String beginTime = StringUtil.getInfo(search, "beginTime"); String beginTime = StringUtil.getInfo(search, "beginTime");
String endTime = StringUtil.getInfo(search, "endTime"); String endTime = StringUtil.getInfo(search, "endTime");
String contentdetails = StringUtil.getInfo(search, "contentdetails"); String content = StringUtil.getInfo(search, "content");
return logService.countLog(operation, usernameID, clientIp, status, beginTime, endTime, contentdetails); return logService.countLog(operation, userId, clientIp, status, beginTime, endTime, content);
} }
@Override @Override

24
src/main/java/com/jsh/erp/service/log/LogService.java
View File

@@ -55,15 +55,15 @@ public class LogService {
return list; return list;
} }
public List<LogVo4List> select(String operation, Integer usernameID, String clientIp, Integer status, String beginTime, String endTime, public List<LogVo4List> select(String operation, Integer userId, String clientIp, Integer status, String beginTime, String endTime,
String contentdetails, int offset, int rows)throws Exception { String content, int offset, int rows)throws Exception {
List<LogVo4List> list=null; List<LogVo4List> list=null;
try{ try{
list=logMapperEx.selectByConditionLog(operation, usernameID, clientIp, status, beginTime, endTime, list=logMapperEx.selectByConditionLog(operation, userId, clientIp, status, beginTime, endTime,
contentdetails, offset, rows); content, offset, rows);
if (null != list) { if (null != list) {
for (LogVo4List log : list) { for (LogVo4List log : list) {
log.setCreateTimeStr(Tools.getCenternTime(log.getCreatetime())); log.setCreateTimeStr(Tools.getCenternTime(log.getCreateTime()));
} }
} }
}catch(Exception e){ }catch(Exception e){
@@ -72,11 +72,11 @@ public class LogService {
return list; return list;
} }
public Long countLog(String operation, Integer usernameID, String clientIp, Integer status, String beginTime, String endTime, public Long countLog(String operation, Integer userId, String clientIp, Integer status, String beginTime, String endTime,
String contentdetails)throws Exception { String content)throws Exception {
Long result=null; Long result=null;
try{ try{
result=logMapperEx.countsByLog(operation, usernameID, clientIp, status, beginTime, endTime, contentdetails); result=logMapperEx.countsByLog(operation, userId, clientIp, status, beginTime, endTime, content);
}catch(Exception e){ }catch(Exception e){
JshException.readFail(logger, e); JshException.readFail(logger, e);
} }
@@ -153,13 +153,13 @@ public class LogService {
Long userId = getUserId(request); Long userId = getUserId(request);
if(userId!=null) { if(userId!=null) {
Log log = new Log(); Log log = new Log();
log.setUserid(userId); log.setUserId(userId);
log.setOperation(moduleName); log.setOperation(moduleName);
log.setClientip(getLocalIp(request)); log.setClientIp(getLocalIp(request));
log.setCreatetime(new Date()); log.setCreateTime(new Date());
Byte status = 0; Byte status = 0;
log.setStatus(status); log.setStatus(status);
log.setContentdetails(content); log.setContent(content);
logMapper.insertSelective(log); logMapper.insertSelective(log);
} }
}catch(Exception e){ }catch(Exception e){

16
src/main/java/com/jsh/erp/service/materialCategory/MaterialCategoryService.java
View File

@@ -90,7 +90,7 @@ public class MaterialCategoryService {
List<MaterialCategory> res= new ArrayList<MaterialCategory>(); List<MaterialCategory> res= new ArrayList<MaterialCategory>();
List<MaterialCategory> list=null; List<MaterialCategory> list=null;
MaterialCategoryExample example = new MaterialCategoryExample(); MaterialCategoryExample example = new MaterialCategoryExample();
example.createCriteria().andParentidEqualTo(parentId).andIdNotEqualTo(1l); example.createCriteria().andParentIdEqualTo(parentId).andIdNotEqualTo(1L);
example.setOrderByClause("id"); example.setOrderByClause("id");
list=materialCategoryMapper.selectByExample(example); list=materialCategoryMapper.selectByExample(example);
if(list!=null && list.size()>0) { if(list!=null && list.size()>0) {
@@ -230,9 +230,9 @@ public class MaterialCategoryService {
if(mc==null){ if(mc==null){
return 0; return 0;
} }
if(mc.getParentid()==null){ if(mc.getParentId()==null){
//没有给定父级目录的id，默认设置父级目录为根目录的父目录 //没有给定父级目录的id，默认设置父级目录为根目录的父目录
mc.setParentid(BusinessConstants.MATERIAL_CATEGORY_ROOT_PARENT_ID); mc.setParentId(BusinessConstants.MATERIAL_CATEGORY_ROOT_PARENT_ID);
} }
//检查商品类型编号是否已存在 //检查商品类型编号是否已存在
checkMaterialCategorySerialNo(mc); checkMaterialCategorySerialNo(mc);
@@ -288,9 +288,9 @@ public class MaterialCategoryService {
logService.insertLog("商品类型", logService.insertLog("商品类型",
new StringBuffer(BusinessConstants.LOG_OPERATION_TYPE_EDIT).append(mc.getName()).toString(), new StringBuffer(BusinessConstants.LOG_OPERATION_TYPE_EDIT).append(mc.getName()).toString(),
((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest()); ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest());
if(mc.getParentid()==null){ if(mc.getParentId()==null){
//没有给定父级目录的id，默认设置父级目录为根目录的父目录 //没有给定父级目录的id，默认设置父级目录为根目录的父目录
mc.setParentid(BusinessConstants.MATERIAL_CATEGORY_ROOT_PARENT_ID); mc.setParentId(BusinessConstants.MATERIAL_CATEGORY_ROOT_PARENT_ID);
} }
//检查商品类型编号是否已存在 //检查商品类型编号是否已存在
checkMaterialCategorySerialNo(mc); checkMaterialCategorySerialNo(mc);
@@ -362,7 +362,7 @@ public class MaterialCategoryService {
/** /**
* 校验 * 校验
* 1、产品表 jsh_material * 1、产品表 jsh_material
* 2、产品类型表 jsh_materialcategory * 2、产品类型表 jsh_material_category
* 是否有相关数据 * 是否有相关数据
* */ * */
int deleteTotal=0; int deleteTotal=0;
@@ -386,7 +386,7 @@ public class MaterialCategoryService {
ExceptionConstants.DELETE_FORCE_CONFIRM_MSG); ExceptionConstants.DELETE_FORCE_CONFIRM_MSG);
} }
/** /**
* 校验产品类型表 jsh_materialcategory * 校验产品类型表 jsh_material_category
* */ * */
List<MaterialCategory> materialCategoryList=null; List<MaterialCategory> materialCategoryList=null;
try{ try{
@@ -412,7 +412,7 @@ public class MaterialCategoryService {
* @param name * @param name
*/ */
public Long getCategoryIdByName(String name){ public Long getCategoryIdByName(String name){
Long categoryId = 0l; Long categoryId = 0L;
MaterialCategoryExample example = new MaterialCategoryExample(); MaterialCategoryExample example = new MaterialCategoryExample();
example.createCriteria().andNameEqualTo(name).andStatusNotEqualTo(BusinessConstants.DELETE_TYPE_FORCE); example.createCriteria().andNameEqualTo(name).andStatusNotEqualTo(BusinessConstants.DELETE_TYPE_FORCE);
List<MaterialCategory> list = materialCategoryMapper.selectByExample(example); List<MaterialCategory> list = materialCategoryMapper.selectByExample(example);

4
src/main/java/com/jsh/erp/service/materialProperty/MaterialPropertyService.java
View File

@@ -88,7 +88,7 @@ public class MaterialPropertyService {
try{ try{
result=materialPropertyMapper.insertSelective(materialProperty); result=materialPropertyMapper.insertSelective(materialProperty);
logService.insertLog("商品属性", logService.insertLog("商品属性",
new StringBuffer(BusinessConstants.LOG_OPERATION_TYPE_ADD).append(materialProperty.getNativename()).toString(), request); new StringBuffer(BusinessConstants.LOG_OPERATION_TYPE_ADD).append(materialProperty.getNativeName()).toString(), request);
}catch(Exception e){ }catch(Exception e){
JshException.writeFail(logger, e); JshException.writeFail(logger, e);
} }
@@ -103,7 +103,7 @@ public class MaterialPropertyService {
try{ try{
result=materialPropertyMapper.updateByPrimaryKeySelective(materialProperty); result=materialPropertyMapper.updateByPrimaryKeySelective(materialProperty);
logService.insertLog("商品属性", logService.insertLog("商品属性",
new StringBuffer(BusinessConstants.LOG_OPERATION_TYPE_EDIT).append(materialProperty.getNativename()).toString(), request); new StringBuffer(BusinessConstants.LOG_OPERATION_TYPE_EDIT).append(materialProperty.getNativeName()).toString(), request);
}catch(Exception e){ }catch(Exception e){
JshException.writeFail(logger, e); JshException.writeFail(logger, e);
} }

4
src/main/java/com/jsh/erp/service/person/PersonService.java
View File

@@ -173,7 +173,7 @@ public class PersonService {
List<Long> ids = StringUtil.strToLongList(personIDs); List<Long> ids = StringUtil.strToLongList(personIDs);
PersonExample example = new PersonExample(); PersonExample example = new PersonExample();
example.createCriteria().andIdIn(ids).andDeleteFlagNotEqualTo(BusinessConstants.DELETE_FLAG_DELETED); example.createCriteria().andIdIn(ids).andDeleteFlagNotEqualTo(BusinessConstants.DELETE_FLAG_DELETED);
example.setOrderByClause("Id asc"); example.setOrderByClause("id asc");
List<Person> list =null; List<Person> list =null;
try{ try{
list=personMapper.selectByExample(example); list=personMapper.selectByExample(example);
@@ -192,7 +192,7 @@ public class PersonService {
public List<Person> getPersonByType(String type)throws Exception { public List<Person> getPersonByType(String type)throws Exception {
PersonExample example = new PersonExample(); PersonExample example = new PersonExample();
example.createCriteria().andTypeEqualTo(type).andDeleteFlagNotEqualTo(BusinessConstants.DELETE_FLAG_DELETED); example.createCriteria().andTypeEqualTo(type).andDeleteFlagNotEqualTo(BusinessConstants.DELETE_FLAG_DELETED);
example.setOrderByClause("Id asc"); example.setOrderByClause("id asc");
List<Person> list =null; List<Person> list =null;
try{ try{
list=personMapper.selectByExample(example); list=personMapper.selectByExample(example);

12
src/main/java/com/jsh/erp/service/unit/UnitService.java
View File

@@ -104,7 +104,7 @@ public class UnitService {
try{ try{
result=unitMapper.insertSelective(unit); result=unitMapper.insertSelective(unit);
logService.insertLog("计量单位", logService.insertLog("计量单位",
new StringBuffer(BusinessConstants.LOG_OPERATION_TYPE_ADD).append(unit.getUname()).toString(), request); new StringBuffer(BusinessConstants.LOG_OPERATION_TYPE_ADD).append(unit.getName()).toString(), request);
}catch(Exception e){ }catch(Exception e){
JshException.writeFail(logger, e); JshException.writeFail(logger, e);
} }
@@ -119,7 +119,7 @@ public class UnitService {
try{ try{
result=unitMapper.updateByPrimaryKeySelective(unit); result=unitMapper.updateByPrimaryKeySelective(unit);
logService.insertLog("计量单位", logService.insertLog("计量单位",
new StringBuffer(BusinessConstants.LOG_OPERATION_TYPE_EDIT).append(unit.getUname()).toString(), request); new StringBuffer(BusinessConstants.LOG_OPERATION_TYPE_EDIT).append(unit.getName()).toString(), request);
}catch(Exception e){ }catch(Exception e){
JshException.writeFail(logger, e); JshException.writeFail(logger, e);
} }
@@ -156,7 +156,7 @@ public class UnitService {
public int checkIsNameExist(Long id, String name)throws Exception { public int checkIsNameExist(Long id, String name)throws Exception {
UnitExample example = new UnitExample(); UnitExample example = new UnitExample();
example.createCriteria().andIdNotEqualTo(id).andUnameEqualTo(name).andDeleteFlagNotEqualTo(BusinessConstants.DELETE_FLAG_DELETED); example.createCriteria().andIdNotEqualTo(id).andNameEqualTo(name).andDeleteFlagNotEqualTo(BusinessConstants.DELETE_FLAG_DELETED);
List<Unit> list=null; List<Unit> list=null;
try{ try{
list=unitMapper.selectByExample(example); list=unitMapper.selectByExample(example);
@@ -171,7 +171,7 @@ public class UnitService {
sb.append(BusinessConstants.LOG_OPERATION_TYPE_DELETE); sb.append(BusinessConstants.LOG_OPERATION_TYPE_DELETE);
List<Unit> list = getUnitListByIds(ids); List<Unit> list = getUnitListByIds(ids);
for(Unit unit: list){ for(Unit unit: list){
sb.append("[").append(unit.getUname()).append("]"); sb.append("[").append(unit.getName()).append("]");
} }
logService.insertLog("计量单位", sb.toString(), logService.insertLog("计量单位", sb.toString(),
((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest()); ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest());
@@ -234,9 +234,9 @@ public class UnitService {
* @param name * @param name
*/ */
public Long getUnitIdByName(String name){ public Long getUnitIdByName(String name){
Long unitId = 0l; Long unitId = 0L;
UnitExample example = new UnitExample(); UnitExample example = new UnitExample();
example.createCriteria().andUnameEqualTo(name).andDeleteFlagNotEqualTo(BusinessConstants.DELETE_FLAG_DELETED); example.createCriteria().andNameEqualTo(name).andDeleteFlagNotEqualTo(BusinessConstants.DELETE_FLAG_DELETED);
List<Unit> list = unitMapper.selectByExample(example); List<Unit> list = unitMapper.selectByExample(example);
if(list!=null && list.size()>0) { if(list!=null && list.size()>0) {
unitId = list.get(0).getId(); unitId = list.get(0).getId();

19
src/main/java/com/jsh/erp/service/userBusiness/UserBusinessService.java
View File

@@ -2,14 +2,12 @@ package com.jsh.erp.service.userBusiness;
import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson.JSONObject;
import com.jsh.erp.constants.BusinessConstants; import com.jsh.erp.constants.BusinessConstants;
import com.jsh.erp.constants.ExceptionConstants;
import com.jsh.erp.datasource.entities.*; import com.jsh.erp.datasource.entities.*;
import com.jsh.erp.datasource.mappers.UserBusinessMapper; import com.jsh.erp.datasource.mappers.UserBusinessMapper;
import com.jsh.erp.datasource.mappers.UserBusinessMapperEx; import com.jsh.erp.datasource.mappers.UserBusinessMapperEx;
import com.jsh.erp.exception.BusinessRunTimeException;
import com.jsh.erp.exception.JshException; import com.jsh.erp.exception.JshException;
import com.jsh.erp.service.CommonQueryManager; import com.jsh.erp.service.CommonQueryManager;
import com.jsh.erp.service.functions.FunctionsService; import com.jsh.erp.service.functions.FunctionService;
import com.jsh.erp.service.log.LogService; import com.jsh.erp.service.log.LogService;
import com.jsh.erp.service.user.UserService; import com.jsh.erp.service.user.UserService;
import com.jsh.erp.utils.StringUtil; import com.jsh.erp.utils.StringUtil;
@@ -17,7 +15,6 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional; import org.springframework.transaction.annotation.Transactional;
import org.springframework.util.CollectionUtils;
import org.springframework.web.context.request.RequestContextHolder; import org.springframework.web.context.request.RequestContextHolder;
import org.springframework.web.context.request.ServletRequestAttributes; import org.springframework.web.context.request.ServletRequestAttributes;
@@ -39,7 +36,7 @@ public class UserBusinessService {
private UserService userService; private UserService userService;
@Resource @Resource
private FunctionsService functionsService; private FunctionService functionService;
@Resource @Resource
private CommonQueryManager configResourceManager; private CommonQueryManager configResourceManager;
@@ -127,7 +124,7 @@ public class UserBusinessService {
public List<UserBusiness> getBasicData(String keyId, String type)throws Exception{ public List<UserBusiness> getBasicData(String keyId, String type)throws Exception{
UserBusinessExample example = new UserBusinessExample(); UserBusinessExample example = new UserBusinessExample();
example.createCriteria().andKeyidEqualTo(keyId).andTypeEqualTo(type) example.createCriteria().andKeyIdEqualTo(keyId).andTypeEqualTo(type)
.andDeleteFlagNotEqualTo(BusinessConstants.DELETE_FLAG_DELETED); .andDeleteFlagNotEqualTo(BusinessConstants.DELETE_FLAG_DELETED);
List<UserBusiness> list=null; List<UserBusiness> list=null;
try{ try{
@@ -140,7 +137,7 @@ public class UserBusinessService {
public Long checkIsValueExist(String type, String keyId)throws Exception { public Long checkIsValueExist(String type, String keyId)throws Exception {
UserBusinessExample example = new UserBusinessExample(); UserBusinessExample example = new UserBusinessExample();
example.createCriteria().andTypeEqualTo(type).andKeyidEqualTo(keyId) example.createCriteria().andTypeEqualTo(type).andKeyIdEqualTo(keyId)
.andDeleteFlagNotEqualTo(BusinessConstants.DELETE_FLAG_DELETED); .andDeleteFlagNotEqualTo(BusinessConstants.DELETE_FLAG_DELETED);
List<UserBusiness> list=null; List<UserBusiness> list=null;
try{ try{
@@ -159,7 +156,7 @@ public class UserBusinessService {
UserBusinessExample example = new UserBusinessExample(); UserBusinessExample example = new UserBusinessExample();
String newVaule = "%" + UBValue + "%"; String newVaule = "%" + UBValue + "%";
if(TypeVale !=null && KeyIdValue !=null) { if(TypeVale !=null && KeyIdValue !=null) {
example.createCriteria().andTypeEqualTo(TypeVale).andKeyidEqualTo(KeyIdValue).andValueLike(newVaule) example.createCriteria().andTypeEqualTo(TypeVale).andKeyIdEqualTo(KeyIdValue).andValueLike(newVaule)
.andDeleteFlagNotEqualTo(BusinessConstants.DELETE_FLAG_DELETED); .andDeleteFlagNotEqualTo(BusinessConstants.DELETE_FLAG_DELETED);
} else { } else {
example.createCriteria().andValueLike(newVaule) example.createCriteria().andValueLike(newVaule)
@@ -184,7 +181,7 @@ public class UserBusinessService {
new StringBuffer(BusinessConstants.LOG_OPERATION_TYPE_EDIT).append(userBusinessId).toString(), new StringBuffer(BusinessConstants.LOG_OPERATION_TYPE_EDIT).append(userBusinessId).toString(),
((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest()); ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest());
UserBusiness userBusiness = new UserBusiness(); UserBusiness userBusiness = new UserBusiness();
userBusiness.setBtnstr(btnStr); userBusiness.setBtnStr(btnStr);
UserBusinessExample example = new UserBusinessExample(); UserBusinessExample example = new UserBusinessExample();
example.createCriteria().andIdEqualTo(userBusinessId); example.createCriteria().andIdEqualTo(userBusinessId);
int result=0; int result=0;
@@ -198,7 +195,7 @@ public class UserBusinessService {
public List<UserBusiness> findRoleByUserId(String userId)throws Exception{ public List<UserBusiness> findRoleByUserId(String userId)throws Exception{
UserBusinessExample example = new UserBusinessExample(); UserBusinessExample example = new UserBusinessExample();
example.createCriteria().andKeyidEqualTo(userId).andTypeEqualTo("UserRole") example.createCriteria().andKeyIdEqualTo(userId).andTypeEqualTo("UserRole")
.andDeleteFlagNotEqualTo(BusinessConstants.DELETE_FLAG_DELETED); .andDeleteFlagNotEqualTo(BusinessConstants.DELETE_FLAG_DELETED);
List<UserBusiness> list=null; List<UserBusiness> list=null;
try{ try{
@@ -212,7 +209,7 @@ public class UserBusinessService {
public List<UserBusiness> findAppByRoles(String roles)throws Exception{ public List<UserBusiness> findAppByRoles(String roles)throws Exception{
List<String> rolesList = StringUtil.strToStringList(roles); List<String> rolesList = StringUtil.strToStringList(roles);
UserBusinessExample example = new UserBusinessExample(); UserBusinessExample example = new UserBusinessExample();
example.createCriteria().andKeyidIn(rolesList).andTypeEqualTo("RoleAPP") example.createCriteria().andKeyIdIn(rolesList).andTypeEqualTo("RoleAPP")
.andDeleteFlagNotEqualTo(BusinessConstants.DELETE_FLAG_DELETED); .andDeleteFlagNotEqualTo(BusinessConstants.DELETE_FLAG_DELETED);
List<UserBusiness> list=null; List<UserBusiness> list=null;
try{ try{

217
src/main/resources/mapper_xml/AccountMapper.xml
View File

@@ -2,25 +2,17 @@
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.jsh.erp.datasource.mappers.AccountMapper"> <mapper namespace="com.jsh.erp.datasource.mappers.AccountMapper">
<resultMap id="BaseResultMap" type="com.jsh.erp.datasource.entities.Account"> <resultMap id="BaseResultMap" type="com.jsh.erp.datasource.entities.Account">
<!-- <id column="id" jdbcType="BIGINT" property="id" />
WARNING - @mbggenerated <result column="name" jdbcType="VARCHAR" property="name" />
This element is automatically generated by MyBatis Generator, do not modify. <result column="serial_no" jdbcType="VARCHAR" property="serialNo" />
--> <result column="initial_amount" jdbcType="DECIMAL" property="initialAmount" />
<id column="Id" jdbcType="BIGINT" property="id" /> <result column="current_amount" jdbcType="DECIMAL" property="currentAmount" />
<result column="Name" jdbcType="VARCHAR" property="name" /> <result column="remark" jdbcType="VARCHAR" property="remark" />
<result column="SerialNo" jdbcType="VARCHAR" property="serialno" /> <result column="is_default" jdbcType="BIT" property="isDefault" />
<result column="InitialAmount" jdbcType="DECIMAL" property="initialamount" />
<result column="CurrentAmount" jdbcType="DECIMAL" property="currentamount" />
<result column="Remark" jdbcType="VARCHAR" property="remark" />
<result column="IsDefault" jdbcType="BIT" property="isdefault" />
<result column="tenant_id" jdbcType="BIGINT" property="tenantId" /> <result column="tenant_id" jdbcType="BIGINT" property="tenantId" />
<result column="delete_Flag" jdbcType="VARCHAR" property="deleteFlag" /> <result column="delete_flag" jdbcType="VARCHAR" property="deleteFlag" />
</resultMap> </resultMap>
<sql id="Example_Where_Clause"> <sql id="Example_Where_Clause">
<!--
WARNING - @mbggenerated
This element is automatically generated by MyBatis Generator, do not modify.
-->
<where> <where>
<foreach collection="oredCriteria" item="criteria" separator="or"> <foreach collection="oredCriteria" item="criteria" separator="or">
<if test="criteria.valid"> <if test="criteria.valid">
@@ -50,10 +42,6 @@
</where> </where>
</sql> </sql>
<sql id="Update_By_Example_Where_Clause"> <sql id="Update_By_Example_Where_Clause">
<!--
WARNING - @mbggenerated
This element is automatically generated by MyBatis Generator, do not modify.
-->
<where> <where>
<foreach collection="example.oredCriteria" item="criteria" separator="or"> <foreach collection="example.oredCriteria" item="criteria" separator="or">
<if test="criteria.valid"> <if test="criteria.valid">
@@ -83,17 +71,10 @@
</where> </where>
</sql> </sql>
<sql id="Base_Column_List"> <sql id="Base_Column_List">
<!-- id, name, serial_no, initial_amount, current_amount, remark, is_default, tenant_id,
WARNING - @mbggenerated delete_flag
This element is automatically generated by MyBatis Generator, do not modify.
-->
Id, Name, SerialNo, InitialAmount, CurrentAmount, Remark, IsDefault, tenant_id, delete_Flag
</sql> </sql>
<select id="selectByExample" parameterType="com.jsh.erp.datasource.entities.AccountExample" resultMap="BaseResultMap"> <select id="selectByExample" parameterType="com.jsh.erp.datasource.entities.AccountExample" resultMap="BaseResultMap">
<!--
WARNING - @mbggenerated
This element is automatically generated by MyBatis Generator, do not modify.
-->
select select
<if test="distinct"> <if test="distinct">
distinct distinct
@@ -108,80 +89,60 @@
</if> </if>
</select> </select>
<select id="selectByPrimaryKey" parameterType="java.lang.Long" resultMap="BaseResultMap"> <select id="selectByPrimaryKey" parameterType="java.lang.Long" resultMap="BaseResultMap">
<!--
WARNING - @mbggenerated
This element is automatically generated by MyBatis Generator, do not modify.
-->
select select
<include refid="Base_Column_List" /> <include refid="Base_Column_List" />
from jsh_account from jsh_account
where Id = #{id,jdbcType=BIGINT} where id = #{id,jdbcType=BIGINT}
</select> </select>
<delete id="deleteByPrimaryKey" parameterType="java.lang.Long"> <delete id="deleteByPrimaryKey" parameterType="java.lang.Long">
<!--
WARNING - @mbggenerated
This element is automatically generated by MyBatis Generator, do not modify.
-->
delete from jsh_account delete from jsh_account
where Id = #{id,jdbcType=BIGINT} where id = #{id,jdbcType=BIGINT}
</delete> </delete>
<delete id="deleteByExample" parameterType="com.jsh.erp.datasource.entities.AccountExample"> <delete id="deleteByExample" parameterType="com.jsh.erp.datasource.entities.AccountExample">
<!--
WARNING - @mbggenerated
This element is automatically generated by MyBatis Generator, do not modify.
-->
delete from jsh_account delete from jsh_account
<if test="_parameter != null"> <if test="_parameter != null">
<include refid="Example_Where_Clause" /> <include refid="Example_Where_Clause" />
</if> </if>
</delete> </delete>
<insert id="insert" parameterType="com.jsh.erp.datasource.entities.Account"> <insert id="insert" parameterType="com.jsh.erp.datasource.entities.Account">
<!-- insert into jsh_account (id, name, serial_no,
WARNING - @mbggenerated initial_amount, current_amount, remark,
This element is automatically generated by MyBatis Generator, do not modify. is_default, tenant_id, delete_flag
-->
insert into jsh_account (Id, Name, SerialNo,
InitialAmount, CurrentAmount, Remark,
IsDefault, tenant_id, delete_Flag
) )
values (#{id,jdbcType=BIGINT}, #{name,jdbcType=VARCHAR}, #{serialno,jdbcType=VARCHAR}, values (#{id,jdbcType=BIGINT}, #{name,jdbcType=VARCHAR}, #{serialNo,jdbcType=VARCHAR},
#{initialamount,jdbcType=DECIMAL}, #{currentamount,jdbcType=DECIMAL}, #{remark,jdbcType=VARCHAR}, #{initialAmount,jdbcType=DECIMAL}, #{currentAmount,jdbcType=DECIMAL}, #{remark,jdbcType=VARCHAR},
#{isdefault,jdbcType=BIT}, #{tenantId,jdbcType=BIGINT}, #{deleteFlag,jdbcType=VARCHAR} #{isDefault,jdbcType=BIT}, #{tenantId,jdbcType=BIGINT}, #{deleteFlag,jdbcType=VARCHAR}
) )
</insert> </insert>
<insert id="insertSelective" parameterType="com.jsh.erp.datasource.entities.Account"> <insert id="insertSelective" parameterType="com.jsh.erp.datasource.entities.Account">
<!--
WARNING - @mbggenerated
This element is automatically generated by MyBatis Generator, do not modify.
-->
insert into jsh_account insert into jsh_account
<trim prefix="(" suffix=")" suffixOverrides=","> <trim prefix="(" suffix=")" suffixOverrides=",">
<if test="id != null"> <if test="id != null">
Id, id,
</if> </if>
<if test="name != null"> <if test="name != null">
Name, name,
</if> </if>
<if test="serialno != null"> <if test="serialNo != null">
SerialNo, serial_no,
</if> </if>
<if test="initialamount != null"> <if test="initialAmount != null">
InitialAmount, initial_amount,
</if> </if>
<if test="currentamount != null"> <if test="currentAmount != null">
CurrentAmount, current_amount,
</if> </if>
<if test="remark != null"> <if test="remark != null">
Remark, remark,
</if> </if>
<if test="isdefault != null"> <if test="isDefault != null">
IsDefault, is_default,
</if> </if>
<if test="tenantId != null"> <if test="tenantId != null">
tenant_id, tenant_id,
</if> </if>
<if test="deleteFlag != null"> <if test="deleteFlag != null">
delete_Flag, delete_flag,
</if> </if>
</trim> </trim>
<trim prefix="values (" suffix=")" suffixOverrides=","> <trim prefix="values (" suffix=")" suffixOverrides=",">
@@ -191,20 +152,20 @@
<if test="name != null"> <if test="name != null">
#{name,jdbcType=VARCHAR}, #{name,jdbcType=VARCHAR},
</if> </if>
<if test="serialno != null"> <if test="serialNo != null">
#{serialno,jdbcType=VARCHAR}, #{serialNo,jdbcType=VARCHAR},
</if> </if>
<if test="initialamount != null"> <if test="initialAmount != null">
#{initialamount,jdbcType=DECIMAL}, #{initialAmount,jdbcType=DECIMAL},
</if> </if>
<if test="currentamount != null"> <if test="currentAmount != null">
#{currentamount,jdbcType=DECIMAL}, #{currentAmount,jdbcType=DECIMAL},
</if> </if>
<if test="remark != null"> <if test="remark != null">
#{remark,jdbcType=VARCHAR}, #{remark,jdbcType=VARCHAR},
</if> </if>
<if test="isdefault != null"> <if test="isDefault != null">
#{isdefault,jdbcType=BIT}, #{isDefault,jdbcType=BIT},
</if> </if>
<if test="tenantId != null"> <if test="tenantId != null">
#{tenantId,jdbcType=BIGINT}, #{tenantId,jdbcType=BIGINT},
@@ -214,49 +175,41 @@
</if> </if>
</trim> </trim>
</insert> </insert>
<select id="countByExample" parameterType="com.jsh.erp.datasource.entities.AccountExample" resultType="java.lang.Integer"> <select id="countByExample" parameterType="com.jsh.erp.datasource.entities.AccountExample" resultType="java.lang.Long">
<!--
WARNING - @mbggenerated
This element is automatically generated by MyBatis Generator, do not modify.
-->
select count(*) from jsh_account select count(*) from jsh_account
<if test="_parameter != null"> <if test="_parameter != null">
<include refid="Example_Where_Clause" /> <include refid="Example_Where_Clause" />
</if> </if>
</select> </select>
<update id="updateByExampleSelective" parameterType="map"> <update id="updateByExampleSelective" parameterType="map">
<!--
WARNING - @mbggenerated
This element is automatically generated by MyBatis Generator, do not modify.
-->
update jsh_account update jsh_account
<set> <set>
<if test="record.id != null"> <if test="record.id != null">
Id = #{record.id,jdbcType=BIGINT}, id = #{record.id,jdbcType=BIGINT},
</if> </if>
<if test="record.name != null"> <if test="record.name != null">
Name = #{record.name,jdbcType=VARCHAR}, name = #{record.name,jdbcType=VARCHAR},
</if> </if>
<if test="record.serialno != null"> <if test="record.serialNo != null">
SerialNo = #{record.serialno,jdbcType=VARCHAR}, serial_no = #{record.serialNo,jdbcType=VARCHAR},
</if> </if>
<if test="record.initialamount != null"> <if test="record.initialAmount != null">
InitialAmount = #{record.initialamount,jdbcType=DECIMAL}, initial_amount = #{record.initialAmount,jdbcType=DECIMAL},
</if> </if>
<if test="record.currentamount != null"> <if test="record.currentAmount != null">
CurrentAmount = #{record.currentamount,jdbcType=DECIMAL}, current_amount = #{record.currentAmount,jdbcType=DECIMAL},
</if> </if>
<if test="record.remark != null"> <if test="record.remark != null">
Remark = #{record.remark,jdbcType=VARCHAR}, remark = #{record.remark,jdbcType=VARCHAR},
</if> </if>
<if test="record.isdefault != null"> <if test="record.isDefault != null">
IsDefault = #{record.isdefault,jdbcType=BIT}, is_default = #{record.isDefault,jdbcType=BIT},
</if> </if>
<if test="record.tenantId != null"> <if test="record.tenantId != null">
tenant_id = #{record.tenantId,jdbcType=BIGINT}, tenant_id = #{record.tenantId,jdbcType=BIGINT},
</if> </if>
<if test="record.deleteFlag != null"> <if test="record.deleteFlag != null">
delete_Flag = #{record.deleteFlag,jdbcType=VARCHAR}, delete_flag = #{record.deleteFlag,jdbcType=VARCHAR},
</if> </if>
</set> </set>
<if test="_parameter != null"> <if test="_parameter != null">
@@ -264,72 +217,60 @@
</if> </if>
</update> </update>
<update id="updateByExample" parameterType="map"> <update id="updateByExample" parameterType="map">
<!--
WARNING - @mbggenerated
This element is automatically generated by MyBatis Generator, do not modify.
-->
update jsh_account update jsh_account
set Id = #{record.id,jdbcType=BIGINT}, set id = #{record.id,jdbcType=BIGINT},
Name = #{record.name,jdbcType=VARCHAR}, name = #{record.name,jdbcType=VARCHAR},
SerialNo = #{record.serialno,jdbcType=VARCHAR}, serial_no = #{record.serialNo,jdbcType=VARCHAR},
InitialAmount = #{record.initialamount,jdbcType=DECIMAL}, initial_amount = #{record.initialAmount,jdbcType=DECIMAL},
CurrentAmount = #{record.currentamount,jdbcType=DECIMAL}, current_amount = #{record.currentAmount,jdbcType=DECIMAL},
Remark = #{record.remark,jdbcType=VARCHAR}, remark = #{record.remark,jdbcType=VARCHAR},
IsDefault = #{record.isdefault,jdbcType=BIT}, is_default = #{record.isDefault,jdbcType=BIT},
tenant_id = #{record.tenantId,jdbcType=BIGINT}, tenant_id = #{record.tenantId,jdbcType=BIGINT},
delete_Flag = #{record.deleteFlag,jdbcType=VARCHAR} delete_flag = #{record.deleteFlag,jdbcType=VARCHAR}
<if test="_parameter != null"> <if test="_parameter != null">
<include refid="Update_By_Example_Where_Clause" /> <include refid="Update_By_Example_Where_Clause" />
</if> </if>
</update> </update>
<update id="updateByPrimaryKeySelective" parameterType="com.jsh.erp.datasource.entities.Account"> <update id="updateByPrimaryKeySelective" parameterType="com.jsh.erp.datasource.entities.Account">
<!--
WARNING - @mbggenerated
This element is automatically generated by MyBatis Generator, do not modify.
-->
update jsh_account update jsh_account
<set> <set>
<if test="name != null"> <if test="name != null">
Name = #{name,jdbcType=VARCHAR}, name = #{name,jdbcType=VARCHAR},
</if> </if>
<if test="serialno != null"> <if test="serialNo != null">
SerialNo = #{serialno,jdbcType=VARCHAR}, serial_no = #{serialNo,jdbcType=VARCHAR},
</if> </if>
<if test="initialamount != null"> <if test="initialAmount != null">
InitialAmount = #{initialamount,jdbcType=DECIMAL}, initial_amount = #{initialAmount,jdbcType=DECIMAL},
</if> </if>
<if test="currentamount != null"> <if test="currentAmount != null">
CurrentAmount = #{currentamount,jdbcType=DECIMAL}, current_amount = #{currentAmount,jdbcType=DECIMAL},
</if> </if>
<if test="remark != null"> <if test="remark != null">
Remark = #{remark,jdbcType=VARCHAR}, remark = #{remark,jdbcType=VARCHAR},
</if> </if>
<if test="isdefault != null"> <if test="isDefault != null">
IsDefault = #{isdefault,jdbcType=BIT}, is_default = #{isDefault,jdbcType=BIT},
</if> </if>
<if test="tenantId != null"> <if test="tenantId != null">
tenant_id = #{tenantId,jdbcType=BIGINT}, tenant_id = #{tenantId,jdbcType=BIGINT},
</if> </if>
<if test="deleteFlag != null"> <if test="deleteFlag != null">
delete_Flag = #{deleteFlag,jdbcType=VARCHAR}, delete_flag = #{deleteFlag,jdbcType=VARCHAR},
</if> </if>
</set> </set>
where Id = #{id,jdbcType=BIGINT} where id = #{id,jdbcType=BIGINT}
</update> </update>
<update id="updateByPrimaryKey" parameterType="com.jsh.erp.datasource.entities.Account"> <update id="updateByPrimaryKey" parameterType="com.jsh.erp.datasource.entities.Account">
<!--
WARNING - @mbggenerated
This element is automatically generated by MyBatis Generator, do not modify.
-->
update jsh_account update jsh_account
set Name = #{name,jdbcType=VARCHAR}, set name = #{name,jdbcType=VARCHAR},
SerialNo = #{serialno,jdbcType=VARCHAR}, serial_no = #{serialNo,jdbcType=VARCHAR},
InitialAmount = #{initialamount,jdbcType=DECIMAL}, initial_amount = #{initialAmount,jdbcType=DECIMAL},
CurrentAmount = #{currentamount,jdbcType=DECIMAL}, current_amount = #{currentAmount,jdbcType=DECIMAL},
Remark = #{remark,jdbcType=VARCHAR}, remark = #{remark,jdbcType=VARCHAR},
IsDefault = #{isdefault,jdbcType=BIT}, is_default = #{isDefault,jdbcType=BIT},
tenant_id = #{tenantId,jdbcType=BIGINT}, tenant_id = #{tenantId,jdbcType=BIGINT},
delete_Flag = #{deleteFlag,jdbcType=VARCHAR} delete_flag = #{deleteFlag,jdbcType=VARCHAR}
where Id = #{id,jdbcType=BIGINT} where id = #{id,jdbcType=BIGINT}
</update> </update>
</mapper> </mapper>

12
src/main/resources/mapper_xml/AccountMapperEx.xml
View File

@@ -2,7 +2,7 @@
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.jsh.erp.datasource.mappers.AccountMapperEx"> <mapper namespace="com.jsh.erp.datasource.mappers.AccountMapperEx">
<resultMap extends="com.jsh.erp.datasource.mappers.AccountMapper.BaseResultMap" id="ResultListMap" type="com.jsh.erp.datasource.vo.AccountVo4List"> <resultMap extends="com.jsh.erp.datasource.mappers.AccountMapper.BaseResultMap" id="ResultListMap" type="com.jsh.erp.datasource.vo.AccountVo4List">
<result column="thismonthamount" jdbcType="VARCHAR" property="thismonthamount" /> <result column="thisMonthAmount" jdbcType="VARCHAR" property="thisMonthAmount" />
</resultMap> </resultMap>
<resultMap id="ResultInOutList" type="com.jsh.erp.datasource.vo.AccountVo4InOutList"> <resultMap id="ResultInOutList" type="com.jsh.erp.datasource.vo.AccountVo4InOutList">
@@ -23,12 +23,12 @@
and name like '%${name}%' and name like '%${name}%'
</if> </if>
<if test="serialNo != null"> <if test="serialNo != null">
and SerialNo like '%${serialNo}%' and serial_no like '%${serialNo}%'
</if> </if>
<if test="remark != null"> <if test="remark != null">
and remark like '%${remark}%' and remark like '%${remark}%'
</if> </if>
and ifnull(delete_Flag,'0') !='1' and ifnull(delete_flag,'0') !='1'
<if test="offset != null and rows != null"> <if test="offset != null and rows != null">
limit #{offset},#{rows} limit #{offset},#{rows}
</if> </if>
@@ -43,12 +43,12 @@
and name like '%${name}%' and name like '%${name}%'
</if> </if>
<if test="serialNo != null"> <if test="serialNo != null">
and SerialNo like '%${serialNo}%' and serial_no like '%${serialNo}%'
</if> </if>
<if test="remark != null"> <if test="remark != null">
and remark like '%${remark}%' and remark like '%${remark}%'
</if> </if>
and ifnull(delete_Flag,'0') !='1' and ifnull(delete_flag,'0') !='1'
</select> </select>
<select id="findAccountInOutList" parameterType="com.jsh.erp.datasource.entities.AccountExample" resultMap="ResultInOutList"> <select id="findAccountInOutList" parameterType="com.jsh.erp.datasource.entities.AccountExample" resultMap="ResultInOutList">
@@ -175,7 +175,7 @@
</select> </select>
<update id="batchDeleteAccountByIds"> <update id="batchDeleteAccountByIds">
update jsh_account update jsh_account
set delete_Flag='1' set delete_flag='1'
where 1=1 where 1=1
and id in ( and id in (
<foreach collection="ids" item="id" separator=","> <foreach collection="ids" item="id" separator=",">

8
src/main/resources/mapper_xml/DepotHeadMapperEx.xml
View File

@@ -207,9 +207,9 @@
) priceSum ) priceSum
from jsh_depothead dh from jsh_depothead dh
INNER JOIN jsh_depotitem di on dh.id=di.HeaderId and ifnull(di.delete_Flag,'0') !='1' INNER JOIN jsh_depotitem di on dh.id=di.HeaderId and ifnull(di.delete_Flag,'0') !='1'
INNER JOIN (SELECT jsh_material.id,jsh_material.name mName, Model,jsh_materialcategory.`Name` categoryName INNER JOIN (SELECT jsh_material.id,jsh_material.name mName, Model,jsh_material_category.`Name` categoryName
from jsh_material from jsh_material
LEFT JOIN jsh_materialcategory on jsh_material.CategoryId=jsh_materialcategory.Id and ifnull(jsh_materialcategory.status,'0') !='2' LEFT JOIN jsh_material_category on jsh_material.CategoryId=jsh_material_category.Id and ifnull(jsh_material_category.status,'0') !='2'
where ifnull(jsh_material.delete_Flag,'0') !='1' where ifnull(jsh_material.delete_Flag,'0') !='1'
) m ) m
on m.Id=di.MaterialId where dh.type='${type}' and dh.OperTime >='${beginTime}' and dh.OperTime &lt;='${endTime}' on m.Id=di.MaterialId where dh.type='${type}' and dh.OperTime >='${beginTime}' and dh.OperTime &lt;='${endTime}'
@@ -233,9 +233,9 @@
select count(1) from select count(1) from
(select di.MaterialId, m.mName,m.Model,m.categoryName from jsh_depothead dh (select di.MaterialId, m.mName,m.Model,m.categoryName from jsh_depothead dh
INNER JOIN jsh_depotitem di on dh.id=di.HeaderId and ifnull(di.delete_Flag,'0') !='1' INNER JOIN jsh_depotitem di on dh.id=di.HeaderId and ifnull(di.delete_Flag,'0') !='1'
INNER JOIN (SELECT jsh_material.id,jsh_material.name mName, Model,jsh_materialcategory.`Name` categoryName INNER JOIN (SELECT jsh_material.id,jsh_material.name mName, Model,jsh_material_category.`Name` categoryName
from jsh_material from jsh_material
LEFT JOIN jsh_materialcategory on jsh_material.CategoryId=jsh_materialcategory.Id and ifnull(jsh_materialcategory.status,'0') !='2' LEFT JOIN jsh_material_category on jsh_material.CategoryId=jsh_material_category.Id and ifnull(jsh_material_category.status,'0') !='2'
where ifnull(jsh_material.delete_Flag,'0') !='1' where ifnull(jsh_material.delete_Flag,'0') !='1'
) m on m.Id=di.MaterialId where dh.type='${type}' and dh.OperTime >='${beginTime}' and dh.OperTime &lt;='${endTime}' ) m on m.Id=di.MaterialId where dh.type='${type}' and dh.OperTime >='${beginTime}' and dh.OperTime &lt;='${endTime}'
<if test="oId != null"> <if test="oId != null">

15
src/main/resources/mapper_xml/DepotItemMapperEx.xml
View File

@@ -28,16 +28,17 @@
<result column="DepotName" jdbcType="VARCHAR" property="DepotName" /> <result column="DepotName" jdbcType="VARCHAR" property="DepotName" />
<result column="AnotherDepotName" jdbcType="VARCHAR" property="AnotherDepotName" /> <result column="AnotherDepotName" jdbcType="VARCHAR" property="AnotherDepotName" />
<result column="UnitId" jdbcType="BIGINT" property="UnitId" /> <result column="UnitId" jdbcType="BIGINT" property="UnitId" />
<result column="UName" jdbcType="VARCHAR" property="UName" /> <result column="unit_name" jdbcType="VARCHAR" property="unitName" />
<result column="barCode" jdbcType="VARCHAR" property="barCode" /> <result column="barCode" jdbcType="VARCHAR" property="barCode" />
</resultMap> </resultMap>
<resultMap extends="com.jsh.erp.datasource.mappers.DepotItemMapper.BaseResultMap" id="ResultByMaterial" type="com.jsh.erp.datasource.entities.DepotItemVo4WithInfoEx"> <resultMap extends="com.jsh.erp.datasource.mappers.DepotItemMapper.BaseResultMap" id="ResultByMaterial" type="com.jsh.erp.datasource.entities.DepotItemVo4WithInfoEx">
<result column="MId" jdbcType="VARCHAR" property="MId" /> <result column="MId" jdbcType="VARCHAR" property="MId" />
<result column="MName" jdbcType="VARCHAR" property="MName" /> <result column="MName" jdbcType="VARCHAR" property="MName" />
<result column="MMfrs" jdbcType="VARCHAR" property="MMfrs" />
<result column="MModel" jdbcType="VARCHAR" property="MModel" /> <result column="MModel" jdbcType="VARCHAR" property="MModel" />
<result column="MaterialUnit" jdbcType="VARCHAR" property="MaterialUnit" /> <result column="MaterialUnit" jdbcType="VARCHAR" property="MaterialUnit" />
<result column="UName" jdbcType="VARCHAR" property="UName" /> <result column="unit_name" jdbcType="VARCHAR" property="unitName" />
<result column="MColor" jdbcType="VARCHAR" property="MColor" /> <result column="MColor" jdbcType="VARCHAR" property="MColor" />
<result column="purchase_decimal" jdbcType="DECIMAL" property="purchaseDecimal" /> <result column="purchase_decimal" jdbcType="DECIMAL" property="purchaseDecimal" />
</resultMap> </resultMap>
@@ -139,7 +140,7 @@
<select id="getDetailList" parameterType="com.jsh.erp.datasource.entities.DepotItemExample" resultMap="ResultWithInfoExMap"> <select id="getDetailList" parameterType="com.jsh.erp.datasource.entities.DepotItemExample" resultMap="ResultWithInfoExMap">
select di.*,m.Name MName,m.Model MModel,m.Unit MaterialUnit,m.Color MColor,m.Standard MStandard,m.Mfrs MMfrs, select di.*,m.Name MName,m.Model MModel,m.Unit MaterialUnit,m.Color MColor,m.Standard MStandard,m.Mfrs MMfrs,
m.OtherField1 MOtherField1,m.OtherField2 MOtherField2,m.OtherField3 MOtherField3, m.OtherField1 MOtherField1,m.OtherField2 MOtherField2,m.OtherField3 MOtherField3,
dp1.name DepotName,dp2.name AnotherDepotName, u.id UnitId, u.UName, me.bar_code barCode dp1.name DepotName,dp2.name AnotherDepotName, u.id UnitId, u.name unit_name, me.bar_code barCode
from jsh_depotitem di from jsh_depotitem di
left join jsh_material m on di.MaterialId=m.id and ifnull(m.delete_Flag,'0') !='1' left join jsh_material m on di.MaterialId=m.id and ifnull(m.delete_Flag,'0') !='1'
left join jsh_material_extend me on me.id=di.material_extend_id and ifnull(me.delete_Flag,'0') !='1' left join jsh_material_extend me on me.id=di.material_extend_id and ifnull(me.delete_Flag,'0') !='1'
@@ -152,8 +153,8 @@
</select> </select>
<select id="findByAll" parameterType="com.jsh.erp.datasource.entities.DepotItemExample" resultMap="ResultByMaterial"> <select id="findByAll" parameterType="com.jsh.erp.datasource.entities.DepotItemExample" resultMap="ResultByMaterial">
select m.id MId, m.Name MName, m.Model MModel, m.Unit MaterialUnit, m.Color MColor, select m.id MId, m.Name MName, m.Mfrs MMfrs, m.Model MModel, m.Unit MaterialUnit, m.Color MColor,
me.purchase_decimal, u.UName UName me.purchase_decimal, u.name unit_name
from jsh_material m from jsh_material m
left join jsh_depotitem di on di.MaterialId=m.id and ifnull(m.delete_Flag,'0') !='1' left join jsh_depotitem di on di.MaterialId=m.id and ifnull(m.delete_Flag,'0') !='1'
left join jsh_depothead dh on di.HeaderId=dh.id and ifnull(dh.delete_Flag,'0') !='1' left join jsh_depothead dh on di.HeaderId=dh.id and ifnull(dh.delete_Flag,'0') !='1'
@@ -171,7 +172,7 @@
and dh.OperTime &lt;= '${endTime}' and dh.OperTime &lt;= '${endTime}'
</if> </if>
and ifnull(di.delete_Flag,'0') !='1' and ifnull(di.delete_Flag,'0') !='1'
group by m.id,m.Name, m.Model, m.Unit, m.Color, me.purchase_decimal, u.UName group by m.id,m.Name, m.Model, m.Unit, m.Color, me.purchase_decimal, u.name
order by m.Name, m.Model asc order by m.Name, m.Model asc
<if test="offset != null and rows != null"> <if test="offset != null and rows != null">
limit #{offset},#{rows} limit #{offset},#{rows}
@@ -381,7 +382,7 @@
(IFNULL(intype.BasicInNumber ,0) - IFNULL(outtype.BasicOutNumber ,0) - ifnull(m.safetystock,0)) BasicLinjieNumber (IFNULL(intype.BasicInNumber ,0) - IFNULL(outtype.BasicOutNumber ,0) - ifnull(m.safetystock,0)) BasicLinjieNumber
FROM FROM
jsh_material m jsh_material m
LEFT JOIN jsh_materialcategory mc ON mc.Id = m.CategoryId LEFT JOIN jsh_material_category mc ON mc.Id = m.CategoryId
LEFT JOIN ( LEFT JOIN (
SELECT SELECT
di.MaterialId, di.MaterialId,

269
src/main/resources/mapper_xml/FunctionsMapper.xml → src/main/resources/mapper_xml/FunctionMapper.xml
View File

@@ -1,29 +1,21 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.jsh.erp.datasource.mappers.FunctionsMapper"> <mapper namespace="com.jsh.erp.datasource.mappers.FunctionMapper">
<resultMap id="BaseResultMap" type="com.jsh.erp.datasource.entities.Functions"> <resultMap id="BaseResultMap" type="com.jsh.erp.datasource.entities.Function">
<!-- <id column="id" jdbcType="BIGINT" property="id" />
WARNING - @mbggenerated <result column="number" jdbcType="VARCHAR" property="number" />
This element is automatically generated by MyBatis Generator, do not modify. <result column="name" jdbcType="VARCHAR" property="name" />
--> <result column="parent_number" jdbcType="VARCHAR" property="parentNumber" />
<id column="Id" jdbcType="BIGINT" property="id" /> <result column="url" jdbcType="VARCHAR" property="url" />
<result column="Number" jdbcType="VARCHAR" property="number" /> <result column="state" jdbcType="BIT" property="state" />
<result column="Name" jdbcType="VARCHAR" property="name" /> <result column="sort" jdbcType="VARCHAR" property="sort" />
<result column="PNumber" jdbcType="VARCHAR" property="pnumber" /> <result column="enabled" jdbcType="BIT" property="enabled" />
<result column="URL" jdbcType="VARCHAR" property="url" /> <result column="type" jdbcType="VARCHAR" property="type" />
<result column="State" jdbcType="BIT" property="state" /> <result column="push_btn" jdbcType="VARCHAR" property="pushBtn" />
<result column="Sort" jdbcType="VARCHAR" property="sort" />
<result column="Enabled" jdbcType="BIT" property="enabled" />
<result column="Type" jdbcType="VARCHAR" property="type" />
<result column="PushBtn" jdbcType="VARCHAR" property="pushbtn" />
<result column="icon" jdbcType="VARCHAR" property="icon" /> <result column="icon" jdbcType="VARCHAR" property="icon" />
<result column="delete_Flag" jdbcType="VARCHAR" property="deleteFlag" /> <result column="delete_flag" jdbcType="VARCHAR" property="deleteFlag" />
</resultMap> </resultMap>
<sql id="Example_Where_Clause"> <sql id="Example_Where_Clause">
<!--
WARNING - @mbggenerated
This element is automatically generated by MyBatis Generator, do not modify.
-->
<where> <where>
<foreach collection="oredCriteria" item="criteria" separator="or"> <foreach collection="oredCriteria" item="criteria" separator="or">
<if test="criteria.valid"> <if test="criteria.valid">
@@ -53,10 +45,6 @@
</where> </where>
</sql> </sql>
<sql id="Update_By_Example_Where_Clause"> <sql id="Update_By_Example_Where_Clause">
<!--
WARNING - @mbggenerated
This element is automatically generated by MyBatis Generator, do not modify.
-->
<where> <where>
<foreach collection="example.oredCriteria" item="criteria" separator="or"> <foreach collection="example.oredCriteria" item="criteria" separator="or">
<if test="criteria.valid"> <if test="criteria.valid">
@@ -86,23 +74,16 @@
</where> </where>
</sql> </sql>
<sql id="Base_Column_List"> <sql id="Base_Column_List">
<!-- id, number, name, parent_number, url, state, sort, enabled, type, push_btn, icon,
WARNING - @mbggenerated delete_flag
This element is automatically generated by MyBatis Generator, do not modify.
-->
Id, Number, Name, PNumber, URL, State, Sort, Enabled, Type, PushBtn, icon, delete_Flag
</sql> </sql>
<select id="selectByExample" parameterType="com.jsh.erp.datasource.entities.FunctionsExample" resultMap="BaseResultMap"> <select id="selectByExample" parameterType="com.jsh.erp.datasource.entities.FunctionExample" resultMap="BaseResultMap">
<!--
WARNING - @mbggenerated
This element is automatically generated by MyBatis Generator, do not modify.
-->
select select
<if test="distinct"> <if test="distinct">
distinct distinct
</if> </if>
<include refid="Base_Column_List" /> <include refid="Base_Column_List" />
from jsh_functions from jsh_function
<if test="_parameter != null"> <if test="_parameter != null">
<include refid="Example_Where_Clause" /> <include refid="Example_Where_Clause" />
</if> </if>
@@ -111,89 +92,69 @@
</if> </if>
</select> </select>
<select id="selectByPrimaryKey" parameterType="java.lang.Long" resultMap="BaseResultMap"> <select id="selectByPrimaryKey" parameterType="java.lang.Long" resultMap="BaseResultMap">
<!--
WARNING - @mbggenerated
This element is automatically generated by MyBatis Generator, do not modify.
-->
select select
<include refid="Base_Column_List" /> <include refid="Base_Column_List" />
from jsh_functions from jsh_function
where Id = #{id,jdbcType=BIGINT} where id = #{id,jdbcType=BIGINT}
</select> </select>
<delete id="deleteByPrimaryKey" parameterType="java.lang.Long"> <delete id="deleteByPrimaryKey" parameterType="java.lang.Long">
<!-- delete from jsh_function
WARNING - @mbggenerated where id = #{id,jdbcType=BIGINT}
This element is automatically generated by MyBatis Generator, do not modify.
-->
delete from jsh_functions
where Id = #{id,jdbcType=BIGINT}
</delete> </delete>
<delete id="deleteByExample" parameterType="com.jsh.erp.datasource.entities.FunctionsExample"> <delete id="deleteByExample" parameterType="com.jsh.erp.datasource.entities.FunctionExample">
<!-- delete from jsh_function
WARNING - @mbggenerated
This element is automatically generated by MyBatis Generator, do not modify.
-->
delete from jsh_functions
<if test="_parameter != null"> <if test="_parameter != null">
<include refid="Example_Where_Clause" /> <include refid="Example_Where_Clause" />
</if> </if>
</delete> </delete>
<insert id="insert" parameterType="com.jsh.erp.datasource.entities.Functions"> <insert id="insert" parameterType="com.jsh.erp.datasource.entities.Function">
<!-- insert into jsh_function (id, number, name,
WARNING - @mbggenerated parent_number, url, state,
This element is automatically generated by MyBatis Generator, do not modify. sort, enabled, type, push_btn,
--> icon, delete_flag)
insert into jsh_functions (Id, Number, Name,
PNumber, URL, State, Sort,
Enabled, Type, PushBtn,
icon, delete_Flag)
values (#{id,jdbcType=BIGINT}, #{number,jdbcType=VARCHAR}, #{name,jdbcType=VARCHAR}, values (#{id,jdbcType=BIGINT}, #{number,jdbcType=VARCHAR}, #{name,jdbcType=VARCHAR},
#{pnumber,jdbcType=VARCHAR}, #{url,jdbcType=VARCHAR}, #{state,jdbcType=BIT}, #{sort,jdbcType=VARCHAR}, #{parentNumber,jdbcType=VARCHAR}, #{url,jdbcType=VARCHAR}, #{state,jdbcType=BIT},
#{enabled,jdbcType=BIT}, #{type,jdbcType=VARCHAR}, #{pushbtn,jdbcType=VARCHAR}, #{sort,jdbcType=VARCHAR}, #{enabled,jdbcType=BIT}, #{type,jdbcType=VARCHAR}, #{pushBtn,jdbcType=VARCHAR},
#{icon,jdbcType=VARCHAR}, #{deleteFlag,jdbcType=VARCHAR}) #{icon,jdbcType=VARCHAR}, #{deleteFlag,jdbcType=VARCHAR})
</insert> </insert>
<insert id="insertSelective" parameterType="com.jsh.erp.datasource.entities.Functions"> <insert id="insertSelective" parameterType="com.jsh.erp.datasource.entities.Function">
<!-- insert into jsh_function
WARNING - @mbggenerated
This element is automatically generated by MyBatis Generator, do not modify.
-->
insert into jsh_functions
<trim prefix="(" suffix=")" suffixOverrides=","> <trim prefix="(" suffix=")" suffixOverrides=",">
<if test="id != null"> <if test="id != null">
Id, id,
</if> </if>
<if test="number != null"> <if test="number != null">
Number, number,
</if> </if>
<if test="name != null"> <if test="name != null">
Name, name,
</if> </if>
<if test="pnumber != null"> <if test="parentNumber != null">
PNumber, parent_number,
</if> </if>
<if test="url != null"> <if test="url != null">
URL, url,
</if> </if>
<if test="state != null"> <if test="state != null">
State, state,
</if> </if>
<if test="sort != null"> <if test="sort != null">
Sort, sort,
</if> </if>
<if test="enabled != null"> <if test="enabled != null">
Enabled, enabled,
</if> </if>
<if test="type != null"> <if test="type != null">
Type, type,
</if> </if>
<if test="pushbtn != null"> <if test="pushBtn != null">
PushBtn, push_btn,
</if> </if>
<if test="icon != null"> <if test="icon != null">
icon, icon,
</if> </if>
<if test="deleteFlag != null"> <if test="deleteFlag != null">
delete_Flag, delete_flag,
</if> </if>
</trim> </trim>
<trim prefix="values (" suffix=")" suffixOverrides=","> <trim prefix="values (" suffix=")" suffixOverrides=",">
@@ -206,8 +167,8 @@
<if test="name != null"> <if test="name != null">
#{name,jdbcType=VARCHAR}, #{name,jdbcType=VARCHAR},
</if> </if>
<if test="pnumber != null"> <if test="parentNumber != null">
#{pnumber,jdbcType=VARCHAR}, #{parentNumber,jdbcType=VARCHAR},
</if> </if>
<if test="url != null"> <if test="url != null">
#{url,jdbcType=VARCHAR}, #{url,jdbcType=VARCHAR},
@@ -224,8 +185,8 @@
<if test="type != null"> <if test="type != null">
#{type,jdbcType=VARCHAR}, #{type,jdbcType=VARCHAR},
</if> </if>
<if test="pushbtn != null"> <if test="pushBtn != null">
#{pushbtn,jdbcType=VARCHAR}, #{pushBtn,jdbcType=VARCHAR},
</if> </if>
<if test="icon != null"> <if test="icon != null">
#{icon,jdbcType=VARCHAR}, #{icon,jdbcType=VARCHAR},
@@ -235,58 +196,50 @@
</if> </if>
</trim> </trim>
</insert> </insert>
<select id="countByExample" parameterType="com.jsh.erp.datasource.entities.FunctionsExample" resultType="java.lang.Integer"> <select id="countByExample" parameterType="com.jsh.erp.datasource.entities.FunctionExample" resultType="java.lang.Long">
<!-- select count(*) from jsh_function
WARNING - @mbggenerated
This element is automatically generated by MyBatis Generator, do not modify.
-->
select count(*) from jsh_functions
<if test="_parameter != null"> <if test="_parameter != null">
<include refid="Example_Where_Clause" /> <include refid="Example_Where_Clause" />
</if> </if>
</select> </select>
<update id="updateByExampleSelective" parameterType="map"> <update id="updateByExampleSelective" parameterType="map">
<!-- update jsh_function
WARNING - @mbggenerated
This element is automatically generated by MyBatis Generator, do not modify.
-->
update jsh_functions
<set> <set>
<if test="record.id != null"> <if test="record.id != null">
Id = #{record.id,jdbcType=BIGINT}, id = #{record.id,jdbcType=BIGINT},
</if> </if>
<if test="record.number != null"> <if test="record.number != null">
Number = #{record.number,jdbcType=VARCHAR}, number = #{record.number,jdbcType=VARCHAR},
</if> </if>
<if test="record.name != null"> <if test="record.name != null">
Name = #{record.name,jdbcType=VARCHAR}, name = #{record.name,jdbcType=VARCHAR},
</if> </if>
<if test="record.pnumber != null"> <if test="record.parentNumber != null">
PNumber = #{record.pnumber,jdbcType=VARCHAR}, parent_number = #{record.parentNumber,jdbcType=VARCHAR},
</if> </if>
<if test="record.url != null"> <if test="record.url != null">
URL = #{record.url,jdbcType=VARCHAR}, url = #{record.url,jdbcType=VARCHAR},
</if> </if>
<if test="record.state != null"> <if test="record.state != null">
State = #{record.state,jdbcType=BIT}, state = #{record.state,jdbcType=BIT},
</if> </if>
<if test="record.sort != null"> <if test="record.sort != null">
Sort = #{record.sort,jdbcType=VARCHAR}, sort = #{record.sort,jdbcType=VARCHAR},
</if> </if>
<if test="record.enabled != null"> <if test="record.enabled != null">
Enabled = #{record.enabled,jdbcType=BIT}, enabled = #{record.enabled,jdbcType=BIT},
</if> </if>
<if test="record.type != null"> <if test="record.type != null">
Type = #{record.type,jdbcType=VARCHAR}, type = #{record.type,jdbcType=VARCHAR},
</if> </if>
<if test="record.pushbtn != null"> <if test="record.pushBtn != null">
PushBtn = #{record.pushbtn,jdbcType=VARCHAR}, push_btn = #{record.pushBtn,jdbcType=VARCHAR},
</if> </if>
<if test="record.icon != null"> <if test="record.icon != null">
icon = #{record.icon,jdbcType=VARCHAR}, icon = #{record.icon,jdbcType=VARCHAR},
</if> </if>
<if test="record.deleteFlag != null"> <if test="record.deleteFlag != null">
delete_Flag = #{record.deleteFlag,jdbcType=VARCHAR}, delete_flag = #{record.deleteFlag,jdbcType=VARCHAR},
</if> </if>
</set> </set>
<if test="_parameter != null"> <if test="_parameter != null">
@@ -294,87 +247,75 @@
</if> </if>
</update> </update>
<update id="updateByExample" parameterType="map"> <update id="updateByExample" parameterType="map">
<!-- update jsh_function
WARNING - @mbggenerated set id = #{record.id,jdbcType=BIGINT},
This element is automatically generated by MyBatis Generator, do not modify. number = #{record.number,jdbcType=VARCHAR},
--> name = #{record.name,jdbcType=VARCHAR},
update jsh_functions parent_number = #{record.parentNumber,jdbcType=VARCHAR},
set Id = #{record.id,jdbcType=BIGINT}, url = #{record.url,jdbcType=VARCHAR},
Number = #{record.number,jdbcType=VARCHAR}, state = #{record.state,jdbcType=BIT},
Name = #{record.name,jdbcType=VARCHAR}, sort = #{record.sort,jdbcType=VARCHAR},
PNumber = #{record.pnumber,jdbcType=VARCHAR}, enabled = #{record.enabled,jdbcType=BIT},
URL = #{record.url,jdbcType=VARCHAR}, type = #{record.type,jdbcType=VARCHAR},
State = #{record.state,jdbcType=BIT}, push_btn = #{record.pushBtn,jdbcType=VARCHAR},
Sort = #{record.sort,jdbcType=VARCHAR},
Enabled = #{record.enabled,jdbcType=BIT},
Type = #{record.type,jdbcType=VARCHAR},
PushBtn = #{record.pushbtn,jdbcType=VARCHAR},
icon = #{record.icon,jdbcType=VARCHAR}, icon = #{record.icon,jdbcType=VARCHAR},
delete_Flag = #{record.deleteFlag,jdbcType=VARCHAR} delete_flag = #{record.deleteFlag,jdbcType=VARCHAR}
<if test="_parameter != null"> <if test="_parameter != null">
<include refid="Update_By_Example_Where_Clause" /> <include refid="Update_By_Example_Where_Clause" />
</if> </if>
</update> </update>
<update id="updateByPrimaryKeySelective" parameterType="com.jsh.erp.datasource.entities.Functions"> <update id="updateByPrimaryKeySelective" parameterType="com.jsh.erp.datasource.entities.Function">
<!-- update jsh_function
WARNING - @mbggenerated
This element is automatically generated by MyBatis Generator, do not modify.
-->
update jsh_functions
<set> <set>
<if test="number != null"> <if test="number != null">
Number = #{number,jdbcType=VARCHAR}, number = #{number,jdbcType=VARCHAR},
</if> </if>
<if test="name != null"> <if test="name != null">
Name = #{name,jdbcType=VARCHAR}, name = #{name,jdbcType=VARCHAR},
</if> </if>
<if test="pnumber != null"> <if test="parentNumber != null">
PNumber = #{pnumber,jdbcType=VARCHAR}, parent_number = #{parentNumber,jdbcType=VARCHAR},
</if> </if>
<if test="url != null"> <if test="url != null">
URL = #{url,jdbcType=VARCHAR}, url = #{url,jdbcType=VARCHAR},
</if> </if>
<if test="state != null"> <if test="state != null">
State = #{state,jdbcType=BIT}, state = #{state,jdbcType=BIT},
</if> </if>
<if test="sort != null"> <if test="sort != null">
Sort = #{sort,jdbcType=VARCHAR}, sort = #{sort,jdbcType=VARCHAR},
</if> </if>
<if test="enabled != null"> <if test="enabled != null">
Enabled = #{enabled,jdbcType=BIT}, enabled = #{enabled,jdbcType=BIT},
</if> </if>
<if test="type != null"> <if test="type != null">
Type = #{type,jdbcType=VARCHAR}, type = #{type,jdbcType=VARCHAR},
</if> </if>
<if test="pushbtn != null"> <if test="pushBtn != null">
PushBtn = #{pushbtn,jdbcType=VARCHAR}, push_btn = #{pushBtn,jdbcType=VARCHAR},
</if> </if>
<if test="icon != null"> <if test="icon != null">
icon = #{icon,jdbcType=VARCHAR}, icon = #{icon,jdbcType=VARCHAR},
</if> </if>
<if test="deleteFlag != null"> <if test="deleteFlag != null">
delete_Flag = #{deleteFlag,jdbcType=VARCHAR}, delete_flag = #{deleteFlag,jdbcType=VARCHAR},
</if> </if>
</set> </set>
where Id = #{id,jdbcType=BIGINT} where id = #{id,jdbcType=BIGINT}
</update> </update>
<update id="updateByPrimaryKey" parameterType="com.jsh.erp.datasource.entities.Functions"> <update id="updateByPrimaryKey" parameterType="com.jsh.erp.datasource.entities.Function">
<!-- update jsh_function
WARNING - @mbggenerated set number = #{number,jdbcType=VARCHAR},
This element is automatically generated by MyBatis Generator, do not modify. name = #{name,jdbcType=VARCHAR},
--> parent_number = #{parentNumber,jdbcType=VARCHAR},
update jsh_functions url = #{url,jdbcType=VARCHAR},
set Number = #{number,jdbcType=VARCHAR}, state = #{state,jdbcType=BIT},
Name = #{name,jdbcType=VARCHAR}, sort = #{sort,jdbcType=VARCHAR},
PNumber = #{pnumber,jdbcType=VARCHAR}, enabled = #{enabled,jdbcType=BIT},
URL = #{url,jdbcType=VARCHAR}, type = #{type,jdbcType=VARCHAR},
State = #{state,jdbcType=BIT}, push_btn = #{pushBtn,jdbcType=VARCHAR},
Sort = #{sort,jdbcType=VARCHAR},
Enabled = #{enabled,jdbcType=BIT},
Type = #{type,jdbcType=VARCHAR},
PushBtn = #{pushbtn,jdbcType=VARCHAR},
icon = #{icon,jdbcType=VARCHAR}, icon = #{icon,jdbcType=VARCHAR},
delete_Flag = #{deleteFlag,jdbcType=VARCHAR} delete_flag = #{deleteFlag,jdbcType=VARCHAR}
where Id = #{id,jdbcType=BIGINT} where id = #{id,jdbcType=BIGINT}
</update> </update>
</mapper> </mapper>

20
src/main/resources/mapper_xml/FunctionsMapperEx.xml → src/main/resources/mapper_xml/FunctionMapperEx.xml
View File

@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.jsh.erp.datasource.mappers.FunctionsMapperEx"> <mapper namespace="com.jsh.erp.datasource.mappers.FunctionMapperEx">
<select id="selectByConditionFunctions" parameterType="com.jsh.erp.datasource.entities.FunctionsExample" resultMap="com.jsh.erp.datasource.mappers.FunctionsMapper.BaseResultMap"> <select id="selectByConditionFunction" parameterType="com.jsh.erp.datasource.entities.FunctionExample" resultMap="com.jsh.erp.datasource.mappers.FunctionMapper.BaseResultMap">
select * select *
FROM jsh_functions FROM jsh_function
where 1=1 where 1=1
<if test="name != null"> <if test="name != null">
and name like '%${name}%' and name like '%${name}%'
@@ -11,16 +11,16 @@
<if test="type != null"> <if test="type != null">
and type='${type}' and type='${type}'
</if> </if>
and ifnull(delete_Flag,'0') !='1' and ifnull(delete_flag,'0') !='1'
order by sort asc order by sort asc
<if test="offset != null and rows != null"> <if test="offset != null and rows != null">
limit #{offset},#{rows} limit #{offset},#{rows}
</if> </if>
</select> </select>
<select id="countsByFunctions" resultType="java.lang.Long"> <select id="countsByFunction" resultType="java.lang.Long">
SELECT SELECT
COUNT(id) COUNT(id)
FROM jsh_functions FROM jsh_function
WHERE 1=1 WHERE 1=1
<if test="name != null"> <if test="name != null">
and name like '%${name}%' and name like '%${name}%'
@@ -28,11 +28,11 @@
<if test="type != null"> <if test="type != null">
and type='${type}' and type='${type}'
</if> </if>
and ifnull(delete_Flag,'0') !='1' and ifnull(delete_flag,'0') !='1'
</select> </select>
<update id="batchDeleteFunctionsByIds"> <update id="batchDeleteFunctionByIds">
update jsh_functions update jsh_function
set delete_Flag='1' set delete_flag='1'
where 1=1 where 1=1
and id in ( and id in (
<foreach collection="ids" item="id" separator=","> <foreach collection="ids" item="id" separator=",">

152
src/main/resources/mapper_xml/InOutItemMapper.xml
View File

@@ -2,22 +2,14 @@
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.jsh.erp.datasource.mappers.InOutItemMapper"> <mapper namespace="com.jsh.erp.datasource.mappers.InOutItemMapper">
<resultMap id="BaseResultMap" type="com.jsh.erp.datasource.entities.InOutItem"> <resultMap id="BaseResultMap" type="com.jsh.erp.datasource.entities.InOutItem">
<!-- <id column="id" jdbcType="BIGINT" property="id" />
WARNING - @mbggenerated <result column="name" jdbcType="VARCHAR" property="name" />
This element is automatically generated by MyBatis Generator, do not modify. <result column="type" jdbcType="VARCHAR" property="type" />
--> <result column="remark" jdbcType="VARCHAR" property="remark" />
<id column="Id" jdbcType="BIGINT" property="id" />
<result column="Name" jdbcType="VARCHAR" property="name" />
<result column="Type" jdbcType="VARCHAR" property="type" />
<result column="Remark" jdbcType="VARCHAR" property="remark" />
<result column="tenant_id" jdbcType="BIGINT" property="tenantId" /> <result column="tenant_id" jdbcType="BIGINT" property="tenantId" />
<result column="delete_Flag" jdbcType="VARCHAR" property="deleteFlag" /> <result column="delete_flag" jdbcType="VARCHAR" property="deleteFlag" />
</resultMap> </resultMap>
<sql id="Example_Where_Clause"> <sql id="Example_Where_Clause">
<!--
WARNING - @mbggenerated
This element is automatically generated by MyBatis Generator, do not modify.
-->
<where> <where>
<foreach collection="oredCriteria" item="criteria" separator="or"> <foreach collection="oredCriteria" item="criteria" separator="or">
<if test="criteria.valid"> <if test="criteria.valid">
@@ -47,10 +39,6 @@
</where> </where>
</sql> </sql>
<sql id="Update_By_Example_Where_Clause"> <sql id="Update_By_Example_Where_Clause">
<!--
WARNING - @mbggenerated
This element is automatically generated by MyBatis Generator, do not modify.
-->
<where> <where>
<foreach collection="example.oredCriteria" item="criteria" separator="or"> <foreach collection="example.oredCriteria" item="criteria" separator="or">
<if test="criteria.valid"> <if test="criteria.valid">
@@ -80,23 +68,15 @@
</where> </where>
</sql> </sql>
<sql id="Base_Column_List"> <sql id="Base_Column_List">
<!-- id, name, type, remark, tenant_id, delete_flag
WARNING - @mbggenerated
This element is automatically generated by MyBatis Generator, do not modify.
-->
Id, Name, Type, Remark, tenant_id, delete_Flag
</sql> </sql>
<select id="selectByExample" parameterType="com.jsh.erp.datasource.entities.InOutItemExample" resultMap="BaseResultMap"> <select id="selectByExample" parameterType="com.jsh.erp.datasource.entities.InOutItemExample" resultMap="BaseResultMap">
<!--
WARNING - @mbggenerated
This element is automatically generated by MyBatis Generator, do not modify.
-->
select select
<if test="distinct"> <if test="distinct">
distinct distinct
</if> </if>
<include refid="Base_Column_List" /> <include refid="Base_Column_List" />
from jsh_inoutitem from jsh_in_out_item
<if test="_parameter != null"> <if test="_parameter != null">
<include refid="Example_Where_Clause" /> <include refid="Example_Where_Clause" />
</if> </if>
@@ -105,69 +85,49 @@
</if> </if>
</select> </select>
<select id="selectByPrimaryKey" parameterType="java.lang.Long" resultMap="BaseResultMap"> <select id="selectByPrimaryKey" parameterType="java.lang.Long" resultMap="BaseResultMap">
<!--
WARNING - @mbggenerated
This element is automatically generated by MyBatis Generator, do not modify.
-->
select select
<include refid="Base_Column_List" /> <include refid="Base_Column_List" />
from jsh_inoutitem from jsh_in_out_item
where Id = #{id,jdbcType=BIGINT} where id = #{id,jdbcType=BIGINT}
</select> </select>
<delete id="deleteByPrimaryKey" parameterType="java.lang.Long"> <delete id="deleteByPrimaryKey" parameterType="java.lang.Long">
<!-- delete from jsh_in_out_item
WARNING - @mbggenerated where id = #{id,jdbcType=BIGINT}
This element is automatically generated by MyBatis Generator, do not modify.
-->
delete from jsh_inoutitem
where Id = #{id,jdbcType=BIGINT}
</delete> </delete>
<delete id="deleteByExample" parameterType="com.jsh.erp.datasource.entities.InOutItemExample"> <delete id="deleteByExample" parameterType="com.jsh.erp.datasource.entities.InOutItemExample">
<!-- delete from jsh_in_out_item
WARNING - @mbggenerated
This element is automatically generated by MyBatis Generator, do not modify.
-->
delete from jsh_inoutitem
<if test="_parameter != null"> <if test="_parameter != null">
<include refid="Example_Where_Clause" /> <include refid="Example_Where_Clause" />
</if> </if>
</delete> </delete>
<insert id="insert" parameterType="com.jsh.erp.datasource.entities.InOutItem"> <insert id="insert" parameterType="com.jsh.erp.datasource.entities.InOutItem">
<!-- insert into jsh_in_out_item (id, name, type,
WARNING - @mbggenerated remark, tenant_id, delete_flag
This element is automatically generated by MyBatis Generator, do not modify.
-->
insert into jsh_inoutitem (Id, Name, Type,
Remark, tenant_id, delete_Flag
) )
values (#{id,jdbcType=BIGINT}, #{name,jdbcType=VARCHAR}, #{type,jdbcType=VARCHAR}, values (#{id,jdbcType=BIGINT}, #{name,jdbcType=VARCHAR}, #{type,jdbcType=VARCHAR},
#{remark,jdbcType=VARCHAR}, #{tenantId,jdbcType=BIGINT}, #{deleteFlag,jdbcType=VARCHAR} #{remark,jdbcType=VARCHAR}, #{tenantId,jdbcType=BIGINT}, #{deleteFlag,jdbcType=VARCHAR}
) )
</insert> </insert>
<insert id="insertSelective" parameterType="com.jsh.erp.datasource.entities.InOutItem"> <insert id="insertSelective" parameterType="com.jsh.erp.datasource.entities.InOutItem">
<!-- insert into jsh_in_out_item
WARNING - @mbggenerated
This element is automatically generated by MyBatis Generator, do not modify.
-->
insert into jsh_inoutitem
<trim prefix="(" suffix=")" suffixOverrides=","> <trim prefix="(" suffix=")" suffixOverrides=",">
<if test="id != null"> <if test="id != null">
Id, id,
</if> </if>
<if test="name != null"> <if test="name != null">
Name, name,
</if> </if>
<if test="type != null"> <if test="type != null">
Type, type,
</if> </if>
<if test="remark != null"> <if test="remark != null">
Remark, remark,
</if> </if>
<if test="tenantId != null"> <if test="tenantId != null">
tenant_id, tenant_id,
</if> </if>
<if test="deleteFlag != null"> <if test="deleteFlag != null">
delete_Flag, delete_flag,
</if> </if>
</trim> </trim>
<trim prefix="values (" suffix=")" suffixOverrides=","> <trim prefix="values (" suffix=")" suffixOverrides=",">
@@ -191,40 +151,32 @@
</if> </if>
</trim> </trim>
</insert> </insert>
<select id="countByExample" parameterType="com.jsh.erp.datasource.entities.InOutItemExample" resultType="java.lang.Integer"> <select id="countByExample" parameterType="com.jsh.erp.datasource.entities.InOutItemExample" resultType="java.lang.Long">
<!-- select count(*) from jsh_in_out_item
WARNING - @mbggenerated
This element is automatically generated by MyBatis Generator, do not modify.
-->
select count(*) from jsh_inoutitem
<if test="_parameter != null"> <if test="_parameter != null">
<include refid="Example_Where_Clause" /> <include refid="Example_Where_Clause" />
</if> </if>
</select> </select>
<update id="updateByExampleSelective" parameterType="map"> <update id="updateByExampleSelective" parameterType="map">
<!-- update jsh_in_out_item
WARNING - @mbggenerated
This element is automatically generated by MyBatis Generator, do not modify.
-->
update jsh_inoutitem
<set> <set>
<if test="record.id != null"> <if test="record.id != null">
Id = #{record.id,jdbcType=BIGINT}, id = #{record.id,jdbcType=BIGINT},
</if> </if>
<if test="record.name != null"> <if test="record.name != null">
Name = #{record.name,jdbcType=VARCHAR}, name = #{record.name,jdbcType=VARCHAR},
</if> </if>
<if test="record.type != null"> <if test="record.type != null">
Type = #{record.type,jdbcType=VARCHAR}, type = #{record.type,jdbcType=VARCHAR},
</if> </if>
<if test="record.remark != null"> <if test="record.remark != null">
Remark = #{record.remark,jdbcType=VARCHAR}, remark = #{record.remark,jdbcType=VARCHAR},
</if> </if>
<if test="record.tenantId != null"> <if test="record.tenantId != null">
tenant_id = #{record.tenantId,jdbcType=BIGINT}, tenant_id = #{record.tenantId,jdbcType=BIGINT},
</if> </if>
<if test="record.deleteFlag != null"> <if test="record.deleteFlag != null">
delete_Flag = #{record.deleteFlag,jdbcType=VARCHAR}, delete_flag = #{record.deleteFlag,jdbcType=VARCHAR},
</if> </if>
</set> </set>
<if test="_parameter != null"> <if test="_parameter != null">
@@ -232,57 +184,45 @@
</if> </if>
</update> </update>
<update id="updateByExample" parameterType="map"> <update id="updateByExample" parameterType="map">
<!-- update jsh_in_out_item
WARNING - @mbggenerated set id = #{record.id,jdbcType=BIGINT},
This element is automatically generated by MyBatis Generator, do not modify. name = #{record.name,jdbcType=VARCHAR},
--> type = #{record.type,jdbcType=VARCHAR},
update jsh_inoutitem remark = #{record.remark,jdbcType=VARCHAR},
set Id = #{record.id,jdbcType=BIGINT},
Name = #{record.name,jdbcType=VARCHAR},
Type = #{record.type,jdbcType=VARCHAR},
Remark = #{record.remark,jdbcType=VARCHAR},
tenant_id = #{record.tenantId,jdbcType=BIGINT}, tenant_id = #{record.tenantId,jdbcType=BIGINT},
delete_Flag = #{record.deleteFlag,jdbcType=VARCHAR} delete_flag = #{record.deleteFlag,jdbcType=VARCHAR}
<if test="_parameter != null"> <if test="_parameter != null">
<include refid="Update_By_Example_Where_Clause" /> <include refid="Update_By_Example_Where_Clause" />
</if> </if>
</update> </update>
<update id="updateByPrimaryKeySelective" parameterType="com.jsh.erp.datasource.entities.InOutItem"> <update id="updateByPrimaryKeySelective" parameterType="com.jsh.erp.datasource.entities.InOutItem">
<!-- update jsh_in_out_item
WARNING - @mbggenerated
This element is automatically generated by MyBatis Generator, do not modify.
-->
update jsh_inoutitem
<set> <set>
<if test="name != null"> <if test="name != null">
Name = #{name,jdbcType=VARCHAR}, name = #{name,jdbcType=VARCHAR},
</if> </if>
<if test="type != null"> <if test="type != null">
Type = #{type,jdbcType=VARCHAR}, type = #{type,jdbcType=VARCHAR},
</if> </if>
<if test="remark != null"> <if test="remark != null">
Remark = #{remark,jdbcType=VARCHAR}, remark = #{remark,jdbcType=VARCHAR},
</if> </if>
<if test="tenantId != null"> <if test="tenantId != null">
tenant_id = #{tenantId,jdbcType=BIGINT}, tenant_id = #{tenantId,jdbcType=BIGINT},
</if> </if>
<if test="deleteFlag != null"> <if test="deleteFlag != null">
delete_Flag = #{deleteFlag,jdbcType=VARCHAR}, delete_flag = #{deleteFlag,jdbcType=VARCHAR},
</if> </if>
</set> </set>
where Id = #{id,jdbcType=BIGINT} where id = #{id,jdbcType=BIGINT}
</update> </update>
<update id="updateByPrimaryKey" parameterType="com.jsh.erp.datasource.entities.InOutItem"> <update id="updateByPrimaryKey" parameterType="com.jsh.erp.datasource.entities.InOutItem">
<!-- update jsh_in_out_item
WARNING - @mbggenerated set name = #{name,jdbcType=VARCHAR},
This element is automatically generated by MyBatis Generator, do not modify. type = #{type,jdbcType=VARCHAR},
--> remark = #{remark,jdbcType=VARCHAR},
update jsh_inoutitem
set Name = #{name,jdbcType=VARCHAR},
Type = #{type,jdbcType=VARCHAR},
Remark = #{remark,jdbcType=VARCHAR},
tenant_id = #{tenantId,jdbcType=BIGINT}, tenant_id = #{tenantId,jdbcType=BIGINT},
delete_Flag = #{deleteFlag,jdbcType=VARCHAR} delete_flag = #{deleteFlag,jdbcType=VARCHAR}
where Id = #{id,jdbcType=BIGINT} where id = #{id,jdbcType=BIGINT}
</update> </update>
</mapper> </mapper>

12
src/main/resources/mapper_xml/InOutItemMapperEx.xml
View File

@@ -3,7 +3,7 @@
<mapper namespace="com.jsh.erp.datasource.mappers.InOutItemMapperEx"> <mapper namespace="com.jsh.erp.datasource.mappers.InOutItemMapperEx">
<select id="selectByConditionInOutItem" parameterType="com.jsh.erp.datasource.entities.InOutItemExample" resultMap="com.jsh.erp.datasource.mappers.InOutItemMapper.BaseResultMap"> <select id="selectByConditionInOutItem" parameterType="com.jsh.erp.datasource.entities.InOutItemExample" resultMap="com.jsh.erp.datasource.mappers.InOutItemMapper.BaseResultMap">
select * select *
FROM jsh_inoutitem FROM jsh_in_out_item
where 1=1 where 1=1
<if test="name != null"> <if test="name != null">
and name like '%${name}%' and name like '%${name}%'
@@ -14,7 +14,7 @@
<if test="remark != null"> <if test="remark != null">
and remark like '%${remark}%' and remark like '%${remark}%'
</if> </if>
and ifnull(delete_Flag,'0') !='1' and ifnull(delete_flag,'0') !='1'
<if test="offset != null and rows != null"> <if test="offset != null and rows != null">
limit #{offset},#{rows} limit #{offset},#{rows}
</if> </if>
@@ -22,7 +22,7 @@
<select id="countsByInOutItem" resultType="java.lang.Long"> <select id="countsByInOutItem" resultType="java.lang.Long">
SELECT SELECT
COUNT(id) COUNT(id)
FROM jsh_inoutitem FROM jsh_in_out_item
WHERE 1=1 WHERE 1=1
<if test="name != null"> <if test="name != null">
and name like '%${name}%' and name like '%${name}%'
@@ -33,11 +33,11 @@
<if test="remark != null"> <if test="remark != null">
and remark like '%${remark}%' and remark like '%${remark}%'
</if> </if>
and ifnull(delete_Flag,'0') !='1' and ifnull(delete_flag,'0') !='1'
</select> </select>
<update id="batchDeleteInOutItemByIds"> <update id="batchDeleteInOutItemByIds">
update jsh_inoutitem update jsh_in_out_item
set delete_Flag='1' set delete_flag='1'
where 1=1 where 1=1
and id in ( and id in (
<foreach collection="ids" item="id" separator=","> <foreach collection="ids" item="id" separator=",">

181
src/main/resources/mapper_xml/LogMapper.xml
View File

@@ -2,25 +2,16 @@
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.jsh.erp.datasource.mappers.LogMapper"> <mapper namespace="com.jsh.erp.datasource.mappers.LogMapper">
<resultMap id="BaseResultMap" type="com.jsh.erp.datasource.entities.Log"> <resultMap id="BaseResultMap" type="com.jsh.erp.datasource.entities.Log">
<!--
WARNING - @mbggenerated
This element is automatically generated by MyBatis Generator, do not modify.
-->
<id column="id" jdbcType="BIGINT" property="id" /> <id column="id" jdbcType="BIGINT" property="id" />
<result column="userID" jdbcType="BIGINT" property="userid" /> <result column="user_id" jdbcType="BIGINT" property="userId" />
<result column="operation" jdbcType="VARCHAR" property="operation" /> <result column="operation" jdbcType="VARCHAR" property="operation" />
<result column="clientIP" jdbcType="VARCHAR" property="clientip" /> <result column="client_ip" jdbcType="VARCHAR" property="clientIp" />
<result column="createtime" jdbcType="TIMESTAMP" property="createtime" /> <result column="create_time" jdbcType="TIMESTAMP" property="createTime" />
<result column="status" jdbcType="TINYINT" property="status" /> <result column="status" jdbcType="TINYINT" property="status" />
<result column="contentdetails" jdbcType="VARCHAR" property="contentdetails" /> <result column="content" jdbcType="VARCHAR" property="content" />
<result column="remark" jdbcType="VARCHAR" property="remark" />
<result column="tenant_id" jdbcType="BIGINT" property="tenantId" /> <result column="tenant_id" jdbcType="BIGINT" property="tenantId" />
</resultMap> </resultMap>
<sql id="Example_Where_Clause"> <sql id="Example_Where_Clause">
<!--
WARNING - @mbggenerated
This element is automatically generated by MyBatis Generator, do not modify.
-->
<where> <where>
<foreach collection="oredCriteria" item="criteria" separator="or"> <foreach collection="oredCriteria" item="criteria" separator="or">
<if test="criteria.valid"> <if test="criteria.valid">
@@ -50,10 +41,6 @@
</where> </where>
</sql> </sql>
<sql id="Update_By_Example_Where_Clause"> <sql id="Update_By_Example_Where_Clause">
<!--
WARNING - @mbggenerated
This element is automatically generated by MyBatis Generator, do not modify.
-->
<where> <where>
<foreach collection="example.oredCriteria" item="criteria" separator="or"> <foreach collection="example.oredCriteria" item="criteria" separator="or">
<if test="criteria.valid"> <if test="criteria.valid">
@@ -83,17 +70,9 @@
</where> </where>
</sql> </sql>
<sql id="Base_Column_List"> <sql id="Base_Column_List">
<!-- id, user_id, operation, client_ip, create_time, status, content, tenant_id
WARNING - @mbggenerated
This element is automatically generated by MyBatis Generator, do not modify.
-->
id, userID, operation, clientIP, createtime, status, contentdetails, remark, tenant_id
</sql> </sql>
<select id="selectByExample" parameterType="com.jsh.erp.datasource.entities.LogExample" resultMap="BaseResultMap"> <select id="selectByExample" parameterType="com.jsh.erp.datasource.entities.LogExample" resultMap="BaseResultMap">
<!--
WARNING - @mbggenerated
This element is automatically generated by MyBatis Generator, do not modify.
-->
select select
<if test="distinct"> <if test="distinct">
distinct distinct
@@ -108,77 +87,52 @@
</if> </if>
</select> </select>
<select id="selectByPrimaryKey" parameterType="java.lang.Long" resultMap="BaseResultMap"> <select id="selectByPrimaryKey" parameterType="java.lang.Long" resultMap="BaseResultMap">
<!--
WARNING - @mbggenerated
This element is automatically generated by MyBatis Generator, do not modify.
-->
select select
<include refid="Base_Column_List" /> <include refid="Base_Column_List" />
from jsh_log from jsh_log
where id = #{id,jdbcType=BIGINT} where id = #{id,jdbcType=BIGINT}
</select> </select>
<delete id="deleteByPrimaryKey" parameterType="java.lang.Long"> <delete id="deleteByPrimaryKey" parameterType="java.lang.Long">
<!--
WARNING - @mbggenerated
This element is automatically generated by MyBatis Generator, do not modify.
-->
delete from jsh_log delete from jsh_log
where id = #{id,jdbcType=BIGINT} where id = #{id,jdbcType=BIGINT}
</delete> </delete>
<delete id="deleteByExample" parameterType="com.jsh.erp.datasource.entities.LogExample"> <delete id="deleteByExample" parameterType="com.jsh.erp.datasource.entities.LogExample">
<!--
WARNING - @mbggenerated
This element is automatically generated by MyBatis Generator, do not modify.
-->
delete from jsh_log delete from jsh_log
<if test="_parameter != null"> <if test="_parameter != null">
<include refid="Example_Where_Clause" /> <include refid="Example_Where_Clause" />
</if> </if>
</delete> </delete>
<insert id="insert" parameterType="com.jsh.erp.datasource.entities.Log"> <insert id="insert" parameterType="com.jsh.erp.datasource.entities.Log">
<!-- insert into jsh_log (id, user_id, operation,
WARNING - @mbggenerated client_ip, create_time, status,
This element is automatically generated by MyBatis Generator, do not modify. content, tenant_id)
--> values (#{id,jdbcType=BIGINT}, #{userId,jdbcType=BIGINT}, #{operation,jdbcType=VARCHAR},
insert into jsh_log (id, userID, operation, #{clientIp,jdbcType=VARCHAR}, #{createTime,jdbcType=TIMESTAMP}, #{status,jdbcType=TINYINT},
clientIP, createtime, status, #{content,jdbcType=VARCHAR}, #{tenantId,jdbcType=BIGINT})
contentdetails, remark, tenant_id
)
values (#{id,jdbcType=BIGINT}, #{userid,jdbcType=BIGINT}, #{operation,jdbcType=VARCHAR},
#{clientip,jdbcType=VARCHAR}, #{createtime,jdbcType=TIMESTAMP}, #{status,jdbcType=TINYINT},
#{contentdetails,jdbcType=VARCHAR}, #{remark,jdbcType=VARCHAR}, #{tenantId,jdbcType=BIGINT}
)
</insert> </insert>
<insert id="insertSelective" parameterType="com.jsh.erp.datasource.entities.Log"> <insert id="insertSelective" parameterType="com.jsh.erp.datasource.entities.Log">
<!--
WARNING - @mbggenerated
This element is automatically generated by MyBatis Generator, do not modify.
-->
insert into jsh_log insert into jsh_log
<trim prefix="(" suffix=")" suffixOverrides=","> <trim prefix="(" suffix=")" suffixOverrides=",">
<if test="id != null"> <if test="id != null">
id, id,
</if> </if>
<if test="userid != null"> <if test="userId != null">
userID, user_id,
</if> </if>
<if test="operation != null"> <if test="operation != null">
operation, operation,
</if> </if>
<if test="clientip != null"> <if test="clientIp != null">
clientIP, client_ip,
</if> </if>
<if test="createtime != null"> <if test="createTime != null">
createtime, create_time,
</if> </if>
<if test="status != null"> <if test="status != null">
status, status,
</if> </if>
<if test="contentdetails != null"> <if test="content != null">
contentdetails, content,
</if>
<if test="remark != null">
remark,
</if> </if>
<if test="tenantId != null"> <if test="tenantId != null">
tenant_id, tenant_id,
@@ -188,72 +142,58 @@
<if test="id != null"> <if test="id != null">
#{id,jdbcType=BIGINT}, #{id,jdbcType=BIGINT},
</if> </if>
<if test="userid != null"> <if test="userId != null">
#{userid,jdbcType=BIGINT}, #{userId,jdbcType=BIGINT},
</if> </if>
<if test="operation != null"> <if test="operation != null">
#{operation,jdbcType=VARCHAR}, #{operation,jdbcType=VARCHAR},
</if> </if>
<if test="clientip != null"> <if test="clientIp != null">
#{clientip,jdbcType=VARCHAR}, #{clientIp,jdbcType=VARCHAR},
</if> </if>
<if test="createtime != null"> <if test="createTime != null">
#{createtime,jdbcType=TIMESTAMP}, #{createTime,jdbcType=TIMESTAMP},
</if> </if>
<if test="status != null"> <if test="status != null">
#{status,jdbcType=TINYINT}, #{status,jdbcType=TINYINT},
</if> </if>
<if test="contentdetails != null"> <if test="content != null">
#{contentdetails,jdbcType=VARCHAR}, #{content,jdbcType=VARCHAR},
</if>
<if test="remark != null">
#{remark,jdbcType=VARCHAR},
</if> </if>
<if test="tenantId != null"> <if test="tenantId != null">
#{tenantId,jdbcType=BIGINT}, #{tenantId,jdbcType=BIGINT},
</if> </if>
</trim> </trim>
</insert> </insert>
<select id="countByExample" parameterType="com.jsh.erp.datasource.entities.LogExample" resultType="java.lang.Integer"> <select id="countByExample" parameterType="com.jsh.erp.datasource.entities.LogExample" resultType="java.lang.Long">
<!--
WARNING - @mbggenerated
This element is automatically generated by MyBatis Generator, do not modify.
-->
select count(*) from jsh_log select count(*) from jsh_log
<if test="_parameter != null"> <if test="_parameter != null">
<include refid="Example_Where_Clause" /> <include refid="Example_Where_Clause" />
</if> </if>
</select> </select>
<update id="updateByExampleSelective" parameterType="map"> <update id="updateByExampleSelective" parameterType="map">
<!--
WARNING - @mbggenerated
This element is automatically generated by MyBatis Generator, do not modify.
-->
update jsh_log update jsh_log
<set> <set>
<if test="record.id != null"> <if test="record.id != null">
id = #{record.id,jdbcType=BIGINT}, id = #{record.id,jdbcType=BIGINT},
</if> </if>
<if test="record.userid != null"> <if test="record.userId != null">
userID = #{record.userid,jdbcType=BIGINT}, user_id = #{record.userId,jdbcType=BIGINT},
</if> </if>
<if test="record.operation != null"> <if test="record.operation != null">
operation = #{record.operation,jdbcType=VARCHAR}, operation = #{record.operation,jdbcType=VARCHAR},
</if> </if>
<if test="record.clientip != null"> <if test="record.clientIp != null">
clientIP = #{record.clientip,jdbcType=VARCHAR}, client_ip = #{record.clientIp,jdbcType=VARCHAR},
</if> </if>
<if test="record.createtime != null"> <if test="record.createTime != null">
createtime = #{record.createtime,jdbcType=TIMESTAMP}, create_time = #{record.createTime,jdbcType=TIMESTAMP},
</if> </if>
<if test="record.status != null"> <if test="record.status != null">
status = #{record.status,jdbcType=TINYINT}, status = #{record.status,jdbcType=TINYINT},
</if> </if>
<if test="record.contentdetails != null"> <if test="record.content != null">
contentdetails = #{record.contentdetails,jdbcType=VARCHAR}, content = #{record.content,jdbcType=VARCHAR},
</if>
<if test="record.remark != null">
remark = #{record.remark,jdbcType=VARCHAR},
</if> </if>
<if test="record.tenantId != null"> <if test="record.tenantId != null">
tenant_id = #{record.tenantId,jdbcType=BIGINT}, tenant_id = #{record.tenantId,jdbcType=BIGINT},
@@ -264,51 +204,39 @@
</if> </if>
</update> </update>
<update id="updateByExample" parameterType="map"> <update id="updateByExample" parameterType="map">
<!--
WARNING - @mbggenerated
This element is automatically generated by MyBatis Generator, do not modify.
-->
update jsh_log update jsh_log
set id = #{record.id,jdbcType=BIGINT}, set id = #{record.id,jdbcType=BIGINT},
userID = #{record.userid,jdbcType=BIGINT}, user_id = #{record.userId,jdbcType=BIGINT},
operation = #{record.operation,jdbcType=VARCHAR}, operation = #{record.operation,jdbcType=VARCHAR},
clientIP = #{record.clientip,jdbcType=VARCHAR}, client_ip = #{record.clientIp,jdbcType=VARCHAR},
createtime = #{record.createtime,jdbcType=TIMESTAMP}, create_time = #{record.createTime,jdbcType=TIMESTAMP},
status = #{record.status,jdbcType=TINYINT}, status = #{record.status,jdbcType=TINYINT},
contentdetails = #{record.contentdetails,jdbcType=VARCHAR}, content = #{record.content,jdbcType=VARCHAR},
remark = #{record.remark,jdbcType=VARCHAR},
tenant_id = #{record.tenantId,jdbcType=BIGINT} tenant_id = #{record.tenantId,jdbcType=BIGINT}
<if test="_parameter != null"> <if test="_parameter != null">
<include refid="Update_By_Example_Where_Clause" /> <include refid="Update_By_Example_Where_Clause" />
</if> </if>
</update> </update>
<update id="updateByPrimaryKeySelective" parameterType="com.jsh.erp.datasource.entities.Log"> <update id="updateByPrimaryKeySelective" parameterType="com.jsh.erp.datasource.entities.Log">
<!--
WARNING - @mbggenerated
This element is automatically generated by MyBatis Generator, do not modify.
-->
update jsh_log update jsh_log
<set> <set>
<if test="userid != null"> <if test="userId != null">
userID = #{userid,jdbcType=BIGINT}, user_id = #{userId,jdbcType=BIGINT},
</if> </if>
<if test="operation != null"> <if test="operation != null">
operation = #{operation,jdbcType=VARCHAR}, operation = #{operation,jdbcType=VARCHAR},
</if> </if>
<if test="clientip != null"> <if test="clientIp != null">
clientIP = #{clientip,jdbcType=VARCHAR}, client_ip = #{clientIp,jdbcType=VARCHAR},
</if> </if>
<if test="createtime != null"> <if test="createTime != null">
createtime = #{createtime,jdbcType=TIMESTAMP}, create_time = #{createTime,jdbcType=TIMESTAMP},
</if> </if>
<if test="status != null"> <if test="status != null">
status = #{status,jdbcType=TINYINT}, status = #{status,jdbcType=TINYINT},
</if> </if>
<if test="contentdetails != null"> <if test="content != null">
contentdetails = #{contentdetails,jdbcType=VARCHAR}, content = #{content,jdbcType=VARCHAR},
</if>
<if test="remark != null">
remark = #{remark,jdbcType=VARCHAR},
</if> </if>
<if test="tenantId != null"> <if test="tenantId != null">
tenant_id = #{tenantId,jdbcType=BIGINT}, tenant_id = #{tenantId,jdbcType=BIGINT},
@@ -317,18 +245,13 @@
where id = #{id,jdbcType=BIGINT} where id = #{id,jdbcType=BIGINT}
</update> </update>
<update id="updateByPrimaryKey" parameterType="com.jsh.erp.datasource.entities.Log"> <update id="updateByPrimaryKey" parameterType="com.jsh.erp.datasource.entities.Log">
<!--
WARNING - @mbggenerated
This element is automatically generated by MyBatis Generator, do not modify.
-->
update jsh_log update jsh_log
set userID = #{userid,jdbcType=BIGINT}, set user_id = #{userId,jdbcType=BIGINT},
operation = #{operation,jdbcType=VARCHAR}, operation = #{operation,jdbcType=VARCHAR},
clientIP = #{clientip,jdbcType=VARCHAR}, client_ip = #{clientIp,jdbcType=VARCHAR},
createtime = #{createtime,jdbcType=TIMESTAMP}, create_time = #{createTime,jdbcType=TIMESTAMP},
status = #{status,jdbcType=TINYINT}, status = #{status,jdbcType=TINYINT},
contentdetails = #{contentdetails,jdbcType=VARCHAR}, content = #{content,jdbcType=VARCHAR},
remark = #{remark,jdbcType=VARCHAR},
tenant_id = #{tenantId,jdbcType=BIGINT} tenant_id = #{tenantId,jdbcType=BIGINT}
where id = #{id,jdbcType=BIGINT} where id = #{id,jdbcType=BIGINT}
</update> </update>

42
src/main/resources/mapper_xml/LogMapperEx.xml
View File

@@ -2,36 +2,36 @@
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.jsh.erp.datasource.mappers.LogMapperEx"> <mapper namespace="com.jsh.erp.datasource.mappers.LogMapperEx">
<resultMap extends="com.jsh.erp.datasource.mappers.LogMapper.BaseResultMap" id="ResultExMap" type="com.jsh.erp.datasource.vo.LogVo4List"> <resultMap extends="com.jsh.erp.datasource.mappers.LogMapper.BaseResultMap" id="ResultExMap" type="com.jsh.erp.datasource.vo.LogVo4List">
<result column="userName" jdbcType="VARCHAR" property="username" /> <result column="userName" jdbcType="VARCHAR" property="userName" />
</resultMap> </resultMap>
<select id="selectByConditionLog" parameterType="com.jsh.erp.datasource.entities.LogExample" resultMap="ResultExMap"> <select id="selectByConditionLog" parameterType="com.jsh.erp.datasource.entities.LogExample" resultMap="ResultExMap">
select l.*,u.username userName select l.*,u.username userName
FROM jsh_log l FROM jsh_log l
left join jsh_user u on l.userID = u.id and ifnull(u.status,'0') not in('1','2') left join jsh_user u on l.user_id = u.id and ifnull(u.status,'0') not in('1','2')
where 1=1 where 1=1
<if test="operation != null"> <if test="operation != null">
and l.operation like '%${operation}%' and l.operation like '%${operation}%'
</if> </if>
<if test="usernameID != null"> <if test="userId != null">
and l.userID=${usernameID} and l.user_id=${userId}
</if> </if>
<if test="clientIp != null"> <if test="clientIp != null">
and l.clientIp like '%${clientIp}%' and l.client_ip like '%${clientIp}%'
</if> </if>
<if test="status != null"> <if test="status != null">
and l.status=${status} and l.status=${status}
</if> </if>
<if test="beginTime != null"> <if test="beginTime != null">
and l.createtime &gt;= '${beginTime}' and l.create_time &gt;= '${beginTime}'
</if> </if>
<if test="endTime != null"> <if test="endTime != null">
and l.createtime &lt;= '${endTime}' and l.create_time &lt;= '${endTime}'
</if> </if>
<if test="contentdetails != null"> <if test="content != null">
and l.contentdetails like '%${contentdetails}%' and l.content like '%${content}%'
</if> </if>
order by l.createtime desc order by l.create_time desc
<if test="offset != null and rows != null"> <if test="offset != null and rows != null">
limit #{offset},#{rows} limit #{offset},#{rows}
</if> </if>
@@ -44,23 +44,23 @@
<if test="operation != null"> <if test="operation != null">
and operation like '%${operation}%' and operation like '%${operation}%'
</if> </if>
<if test="usernameID != null"> <if test="userId != null">
and userID=${usernameID} and user_id=${userId}
</if> </if>
<if test="clientIp != null"> <if test="clientIp != null">
and clientIp like '%${clientIp}%' and client_ip like '%${clientIp}%'
</if> </if>
<if test="status != null"> <if test="status != null">
and status = ${status} and status = ${status}
</if> </if>
<if test="beginTime != null"><![CDATA[ <if test="beginTime != null">
and createtime >= '${beginTime}' and l.create_time &gt;= '${beginTime}'
]]></if> </if>
<if test="endTime != null"><![CDATA[ <if test="endTime != null">
and createtime <= '${endTime}' and l.create_time &lt;= '${endTime}'
]]></if> </if>
<if test="contentdetails != null"> <if test="content != null">
and contentdetails like '%${contentdetails}%' and content like '%${content}%'
</if> </if>
</select> </select>
</mapper> </mapper>

164
src/main/resources/mapper_xml/MaterialCategoryMapper.xml
View File

@@ -2,14 +2,10 @@
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.jsh.erp.datasource.mappers.MaterialCategoryMapper"> <mapper namespace="com.jsh.erp.datasource.mappers.MaterialCategoryMapper">
<resultMap id="BaseResultMap" type="com.jsh.erp.datasource.entities.MaterialCategory"> <resultMap id="BaseResultMap" type="com.jsh.erp.datasource.entities.MaterialCategory">
<!-- <id column="id" jdbcType="BIGINT" property="id" />
WARNING - @mbggenerated <result column="name" jdbcType="VARCHAR" property="name" />
This element is automatically generated by MyBatis Generator, do not modify. <result column="category_level" jdbcType="SMALLINT" property="categoryLevel" />
--> <result column="parent_id" jdbcType="BIGINT" property="parentId" />
<id column="Id" jdbcType="BIGINT" property="id" />
<result column="Name" jdbcType="VARCHAR" property="name" />
<result column="CategoryLevel" jdbcType="SMALLINT" property="categorylevel" />
<result column="ParentId" jdbcType="BIGINT" property="parentid" />
<result column="sort" jdbcType="VARCHAR" property="sort" /> <result column="sort" jdbcType="VARCHAR" property="sort" />
<result column="status" jdbcType="VARCHAR" property="status" /> <result column="status" jdbcType="VARCHAR" property="status" />
<result column="serial_no" jdbcType="VARCHAR" property="serialNo" /> <result column="serial_no" jdbcType="VARCHAR" property="serialNo" />
@@ -21,10 +17,6 @@
<result column="tenant_id" jdbcType="BIGINT" property="tenantId" /> <result column="tenant_id" jdbcType="BIGINT" property="tenantId" />
</resultMap> </resultMap>
<sql id="Example_Where_Clause"> <sql id="Example_Where_Clause">
<!--
WARNING - @mbggenerated
This element is automatically generated by MyBatis Generator, do not modify.
-->
<where> <where>
<foreach collection="oredCriteria" item="criteria" separator="or"> <foreach collection="oredCriteria" item="criteria" separator="or">
<if test="criteria.valid"> <if test="criteria.valid">
@@ -54,10 +46,6 @@
</where> </where>
</sql> </sql>
<sql id="Update_By_Example_Where_Clause"> <sql id="Update_By_Example_Where_Clause">
<!--
WARNING - @mbggenerated
This element is automatically generated by MyBatis Generator, do not modify.
-->
<where> <where>
<foreach collection="example.oredCriteria" item="criteria" separator="or"> <foreach collection="example.oredCriteria" item="criteria" separator="or">
<if test="criteria.valid"> <if test="criteria.valid">
@@ -87,24 +75,16 @@
</where> </where>
</sql> </sql>
<sql id="Base_Column_List"> <sql id="Base_Column_List">
<!-- id, name, category_level, parent_id, sort, status, serial_no, remark, create_time,
WARNING - @mbggenerated
This element is automatically generated by MyBatis Generator, do not modify.
-->
Id, Name, CategoryLevel, ParentId, sort, status, serial_no, remark, create_time,
creator, update_time, updater, tenant_id creator, update_time, updater, tenant_id
</sql> </sql>
<select id="selectByExample" parameterType="com.jsh.erp.datasource.entities.MaterialCategoryExample" resultMap="BaseResultMap"> <select id="selectByExample" parameterType="com.jsh.erp.datasource.entities.MaterialCategoryExample" resultMap="BaseResultMap">
<!--
WARNING - @mbggenerated
This element is automatically generated by MyBatis Generator, do not modify.
-->
select select
<if test="distinct"> <if test="distinct">
distinct distinct
</if> </if>
<include refid="Base_Column_List" /> <include refid="Base_Column_List" />
from jsh_materialcategory from jsh_material_category
<if test="_parameter != null"> <if test="_parameter != null">
<include refid="Example_Where_Clause" /> <include refid="Example_Where_Clause" />
</if> </if>
@@ -113,67 +93,47 @@
</if> </if>
</select> </select>
<select id="selectByPrimaryKey" parameterType="java.lang.Long" resultMap="BaseResultMap"> <select id="selectByPrimaryKey" parameterType="java.lang.Long" resultMap="BaseResultMap">
<!--
WARNING - @mbggenerated
This element is automatically generated by MyBatis Generator, do not modify.
-->
select select
<include refid="Base_Column_List" /> <include refid="Base_Column_List" />
from jsh_materialcategory from jsh_material_category
where Id = #{id,jdbcType=BIGINT} where id = #{id,jdbcType=BIGINT}
</select> </select>
<delete id="deleteByPrimaryKey" parameterType="java.lang.Long"> <delete id="deleteByPrimaryKey" parameterType="java.lang.Long">
<!-- delete from jsh_material_category
WARNING - @mbggenerated where id = #{id,jdbcType=BIGINT}
This element is automatically generated by MyBatis Generator, do not modify.
-->
delete from jsh_materialcategory
where Id = #{id,jdbcType=BIGINT}
</delete> </delete>
<delete id="deleteByExample" parameterType="com.jsh.erp.datasource.entities.MaterialCategoryExample"> <delete id="deleteByExample" parameterType="com.jsh.erp.datasource.entities.MaterialCategoryExample">
<!-- delete from jsh_material_category
WARNING - @mbggenerated
This element is automatically generated by MyBatis Generator, do not modify.
-->
delete from jsh_materialcategory
<if test="_parameter != null"> <if test="_parameter != null">
<include refid="Example_Where_Clause" /> <include refid="Example_Where_Clause" />
</if> </if>
</delete> </delete>
<insert id="insert" parameterType="com.jsh.erp.datasource.entities.MaterialCategory"> <insert id="insert" parameterType="com.jsh.erp.datasource.entities.MaterialCategory">
<!-- insert into jsh_material_category (id, name, category_level,
WARNING - @mbggenerated parent_id, sort, status,
This element is automatically generated by MyBatis Generator, do not modify.
-->
insert into jsh_materialcategory (Id, Name, CategoryLevel,
ParentId, sort, status,
serial_no, remark, create_time, serial_no, remark, create_time,
creator, update_time, updater, creator, update_time, updater,
tenant_id) tenant_id)
values (#{id,jdbcType=BIGINT}, #{name,jdbcType=VARCHAR}, #{categorylevel,jdbcType=SMALLINT}, values (#{id,jdbcType=BIGINT}, #{name,jdbcType=VARCHAR}, #{categoryLevel,jdbcType=SMALLINT},
#{parentid,jdbcType=BIGINT}, #{sort,jdbcType=VARCHAR}, #{status,jdbcType=VARCHAR}, #{parentId,jdbcType=BIGINT}, #{sort,jdbcType=VARCHAR}, #{status,jdbcType=VARCHAR},
#{serialNo,jdbcType=VARCHAR}, #{remark,jdbcType=VARCHAR}, #{createTime,jdbcType=TIMESTAMP}, #{serialNo,jdbcType=VARCHAR}, #{remark,jdbcType=VARCHAR}, #{createTime,jdbcType=TIMESTAMP},
#{creator,jdbcType=BIGINT}, #{updateTime,jdbcType=TIMESTAMP}, #{updater,jdbcType=BIGINT}, #{creator,jdbcType=BIGINT}, #{updateTime,jdbcType=TIMESTAMP}, #{updater,jdbcType=BIGINT},
#{tenantId,jdbcType=BIGINT}) #{tenantId,jdbcType=BIGINT})
</insert> </insert>
<insert id="insertSelective" parameterType="com.jsh.erp.datasource.entities.MaterialCategory"> <insert id="insertSelective" parameterType="com.jsh.erp.datasource.entities.MaterialCategory">
<!-- insert into jsh_material_category
WARNING - @mbggenerated
This element is automatically generated by MyBatis Generator, do not modify.
-->
insert into jsh_materialcategory
<trim prefix="(" suffix=")" suffixOverrides=","> <trim prefix="(" suffix=")" suffixOverrides=",">
<if test="id != null"> <if test="id != null">
Id, id,
</if> </if>
<if test="name != null"> <if test="name != null">
Name, name,
</if> </if>
<if test="categorylevel != null"> <if test="categoryLevel != null">
CategoryLevel, category_level,
</if> </if>
<if test="parentid != null"> <if test="parentId != null">
ParentId, parent_id,
</if> </if>
<if test="sort != null"> <if test="sort != null">
sort, sort,
@@ -210,11 +170,11 @@
<if test="name != null"> <if test="name != null">
#{name,jdbcType=VARCHAR}, #{name,jdbcType=VARCHAR},
</if> </if>
<if test="categorylevel != null"> <if test="categoryLevel != null">
#{categorylevel,jdbcType=SMALLINT}, #{categoryLevel,jdbcType=SMALLINT},
</if> </if>
<if test="parentid != null"> <if test="parentId != null">
#{parentid,jdbcType=BIGINT}, #{parentId,jdbcType=BIGINT},
</if> </if>
<if test="sort != null"> <if test="sort != null">
#{sort,jdbcType=VARCHAR}, #{sort,jdbcType=VARCHAR},
@@ -245,34 +205,26 @@
</if> </if>
</trim> </trim>
</insert> </insert>
<select id="countByExample" parameterType="com.jsh.erp.datasource.entities.MaterialCategoryExample" resultType="java.lang.Integer"> <select id="countByExample" parameterType="com.jsh.erp.datasource.entities.MaterialCategoryExample" resultType="java.lang.Long">
<!-- select count(*) from jsh_material_category
WARNING - @mbggenerated
This element is automatically generated by MyBatis Generator, do not modify.
-->
select count(*) from jsh_materialcategory
<if test="_parameter != null"> <if test="_parameter != null">
<include refid="Example_Where_Clause" /> <include refid="Example_Where_Clause" />
</if> </if>
</select> </select>
<update id="updateByExampleSelective" parameterType="map"> <update id="updateByExampleSelective" parameterType="map">
<!-- update jsh_material_category
WARNING - @mbggenerated
This element is automatically generated by MyBatis Generator, do not modify.
-->
update jsh_materialcategory
<set> <set>
<if test="record.id != null"> <if test="record.id != null">
Id = #{record.id,jdbcType=BIGINT}, id = #{record.id,jdbcType=BIGINT},
</if> </if>
<if test="record.name != null"> <if test="record.name != null">
Name = #{record.name,jdbcType=VARCHAR}, name = #{record.name,jdbcType=VARCHAR},
</if> </if>
<if test="record.categorylevel != null"> <if test="record.categoryLevel != null">
CategoryLevel = #{record.categorylevel,jdbcType=SMALLINT}, category_level = #{record.categoryLevel,jdbcType=SMALLINT},
</if> </if>
<if test="record.parentid != null"> <if test="record.parentId != null">
ParentId = #{record.parentid,jdbcType=BIGINT}, parent_id = #{record.parentId,jdbcType=BIGINT},
</if> </if>
<if test="record.sort != null"> <if test="record.sort != null">
sort = #{record.sort,jdbcType=VARCHAR}, sort = #{record.sort,jdbcType=VARCHAR},
@@ -307,15 +259,11 @@
</if> </if>
</update> </update>
<update id="updateByExample" parameterType="map"> <update id="updateByExample" parameterType="map">
<!-- update jsh_material_category
WARNING - @mbggenerated set id = #{record.id,jdbcType=BIGINT},
This element is automatically generated by MyBatis Generator, do not modify. name = #{record.name,jdbcType=VARCHAR},
--> category_level = #{record.categoryLevel,jdbcType=SMALLINT},
update jsh_materialcategory parent_id = #{record.parentId,jdbcType=BIGINT},
set Id = #{record.id,jdbcType=BIGINT},
Name = #{record.name,jdbcType=VARCHAR},
CategoryLevel = #{record.categorylevel,jdbcType=SMALLINT},
ParentId = #{record.parentid,jdbcType=BIGINT},
sort = #{record.sort,jdbcType=VARCHAR}, sort = #{record.sort,jdbcType=VARCHAR},
status = #{record.status,jdbcType=VARCHAR}, status = #{record.status,jdbcType=VARCHAR},
serial_no = #{record.serialNo,jdbcType=VARCHAR}, serial_no = #{record.serialNo,jdbcType=VARCHAR},
@@ -330,20 +278,16 @@
</if> </if>
</update> </update>
<update id="updateByPrimaryKeySelective" parameterType="com.jsh.erp.datasource.entities.MaterialCategory"> <update id="updateByPrimaryKeySelective" parameterType="com.jsh.erp.datasource.entities.MaterialCategory">
<!-- update jsh_material_category
WARNING - @mbggenerated
This element is automatically generated by MyBatis Generator, do not modify.
-->
update jsh_materialcategory
<set> <set>
<if test="name != null"> <if test="name != null">
Name = #{name,jdbcType=VARCHAR}, name = #{name,jdbcType=VARCHAR},
</if> </if>
<if test="categorylevel != null"> <if test="categoryLevel != null">
CategoryLevel = #{categorylevel,jdbcType=SMALLINT}, category_level = #{categoryLevel,jdbcType=SMALLINT},
</if> </if>
<if test="parentid != null"> <if test="parentId != null">
ParentId = #{parentid,jdbcType=BIGINT}, parent_id = #{parentId,jdbcType=BIGINT},
</if> </if>
<if test="sort != null"> <if test="sort != null">
sort = #{sort,jdbcType=VARCHAR}, sort = #{sort,jdbcType=VARCHAR},
@@ -373,17 +317,13 @@
tenant_id = #{tenantId,jdbcType=BIGINT}, tenant_id = #{tenantId,jdbcType=BIGINT},
</if> </if>
</set> </set>
where Id = #{id,jdbcType=BIGINT} where id = #{id,jdbcType=BIGINT}
</update> </update>
<update id="updateByPrimaryKey" parameterType="com.jsh.erp.datasource.entities.MaterialCategory"> <update id="updateByPrimaryKey" parameterType="com.jsh.erp.datasource.entities.MaterialCategory">
<!-- update jsh_material_category
WARNING - @mbggenerated set name = #{name,jdbcType=VARCHAR},
This element is automatically generated by MyBatis Generator, do not modify. category_level = #{categoryLevel,jdbcType=SMALLINT},
--> parent_id = #{parentId,jdbcType=BIGINT},
update jsh_materialcategory
set Name = #{name,jdbcType=VARCHAR},
CategoryLevel = #{categorylevel,jdbcType=SMALLINT},
ParentId = #{parentid,jdbcType=BIGINT},
sort = #{sort,jdbcType=VARCHAR}, sort = #{sort,jdbcType=VARCHAR},
status = #{status,jdbcType=VARCHAR}, status = #{status,jdbcType=VARCHAR},
serial_no = #{serialNo,jdbcType=VARCHAR}, serial_no = #{serialNo,jdbcType=VARCHAR},
@@ -393,6 +333,6 @@
update_time = #{updateTime,jdbcType=TIMESTAMP}, update_time = #{updateTime,jdbcType=TIMESTAMP},
updater = #{updater,jdbcType=BIGINT}, updater = #{updater,jdbcType=BIGINT},
tenant_id = #{tenantId,jdbcType=BIGINT} tenant_id = #{tenantId,jdbcType=BIGINT}
where Id = #{id,jdbcType=BIGINT} where id = #{id,jdbcType=BIGINT}
</update> </update>
</mapper> </mapper>

40
src/main/resources/mapper_xml/MaterialCategoryMapperEx.xml
View File

@@ -3,14 +3,14 @@
<mapper namespace="com.jsh.erp.datasource.mappers.MaterialCategoryMapperEx"> <mapper namespace="com.jsh.erp.datasource.mappers.MaterialCategoryMapperEx">
<select id="selectByConditionMaterialCategory" parameterType="com.jsh.erp.datasource.entities.MaterialCategoryExample" resultMap="com.jsh.erp.datasource.mappers.MaterialCategoryMapper.BaseResultMap"> <select id="selectByConditionMaterialCategory" parameterType="com.jsh.erp.datasource.entities.MaterialCategoryExample" resultMap="com.jsh.erp.datasource.mappers.MaterialCategoryMapper.BaseResultMap">
select * select *
FROM jsh_materialcategory FROM jsh_material_category
where 1=1 where 1=1
and ifnull(status,'0') !='2' and ifnull(status,'0') !='2'
<if test="name != null"> <if test="name != null">
and name like '%${name}%' and name like '%${name}%'
</if> </if>
<if test="parentId != null"> <if test="parentId != null">
and parentId = ${parentId} and parent_id = ${parentId}
</if> </if>
and Id !=1 and Id !=1
<if test="offset != null and rows != null"> <if test="offset != null and rows != null">
@@ -20,14 +20,14 @@
<select id="countsByMaterialCategory" resultType="java.lang.Long"> <select id="countsByMaterialCategory" resultType="java.lang.Long">
SELECT SELECT
COUNT(id) COUNT(id)
FROM jsh_materialcategory FROM jsh_material_category
WHERE 1=1 WHERE 1=1
and ifnull(status,'0') !='2' and ifnull(status,'0') !='2'
<if test="name != null"> <if test="name != null">
and name like '%${name}%' and name like '%${name}%'
</if> </if>
<if test="parentId != null"> <if test="parentId != null">
and parentId = ${parentId} and parent_id = ${parentId}
</if> </if>
and Id !=1 and Id !=1
</select> </select>
@@ -53,8 +53,8 @@
<select id="getNextNodeTree" resultMap="NextTreeResultMap"> <select id="getNextNodeTree" resultMap="NextTreeResultMap">
SELECT SELECT
<include refid="Base_Column_List"/>,#{currentId} as currentId <include refid="Base_Column_List"/>,#{currentId} as currentId
FROM jsh_materialcategory FROM jsh_material_category
WHERE ParentId = #{id} WHERE parent_id = #{id}
<if test="currentId != null"> <if test="currentId != null">
and id !=#{currentId} and id !=#{currentId}
</if> </if>
@@ -65,8 +65,8 @@
<select id="getNodeTree" resultMap="BaseTreeResultMap"> <select id="getNodeTree" resultMap="BaseTreeResultMap">
SELECT SELECT
<include refid="Base_Column_List"/>,#{currentId} as currentId <include refid="Base_Column_List"/>,#{currentId} as currentId
FROM jsh_materialcategory FROM jsh_material_category
WHERE ParentId = -1 WHERE parent_id = -1
and ifnull(status,'0') !='2' and ifnull(status,'0') !='2'
<if test="currentId != null"> <if test="currentId != null">
and id !=#{currentId} and id !=#{currentId}
@@ -75,17 +75,17 @@
</select> </select>
<insert id="addMaterialCategory" parameterType="com.jsh.erp.datasource.entities.MaterialCategory" <insert id="addMaterialCategory" parameterType="com.jsh.erp.datasource.entities.MaterialCategory"
useGeneratedKeys="true" keyProperty="id" keyColumn="id"> useGeneratedKeys="true" keyProperty="id" keyColumn="id">
insert into jsh_materialcategory insert into jsh_material_category
(Name, CategoryLevel, ParentId, sort,status,serial_no,remark, (name, category_level, parent_id, sort,status,serial_no,remark,
create_Time, creator,update_Time, updater) create_time, creator,update_time, updater)
values values
(#{name},#{categorylevel},#{parentid},#{sort},#{status},#{serialNo},#{remark}, (#{name},#{categoryLevel},#{parentId},#{sort},#{status},#{serialNo},#{remark},
#{createTime},#{creator},#{updateTime},#{updater} #{createTime},#{creator},#{updateTime},#{updater}
) )
</insert> </insert>
<update id="batchDeleteMaterialCategoryByIds"> <update id="batchDeleteMaterialCategoryByIds">
update jsh_materialcategory update jsh_material_category
set update_Time=#{updateTime},updater=#{updater},status='2' set update_time=#{updateTime},updater=#{updater},status='2'
where id in ( where id in (
<foreach collection="ids" item="id" separator=","> <foreach collection="ids" item="id" separator=",">
#{id} #{id}
@@ -93,16 +93,16 @@
) )
</update> </update>
<update id="editMaterialCategory"> <update id="editMaterialCategory">
update jsh_materialcategory update jsh_material_category
set update_Time=#{updateTime},updater=#{updater}, set update_time=#{updateTime},updater=#{updater},
ParentId=#{parentid},sort=#{sort},serial_no=#{serialNo}, parent_id=#{parentId},sort=#{sort},serial_no=#{serialNo},
name=#{name},remark=#{remark} name=#{name},remark=#{remark}
where id =#{id} where id =#{id}
</update> </update>
<select id="getMaterialCategoryBySerialNo" resultMap="com.jsh.erp.datasource.mappers.MaterialCategoryMapper.BaseResultMap"> <select id="getMaterialCategoryBySerialNo" resultMap="com.jsh.erp.datasource.mappers.MaterialCategoryMapper.BaseResultMap">
select select
<include refid="com.jsh.erp.datasource.mappers.MaterialCategoryMapper.Base_Column_List"/> <include refid="com.jsh.erp.datasource.mappers.MaterialCategoryMapper.Base_Column_List"/>
FROM jsh_materialcategory FROM jsh_material_category
where 1=1 where 1=1
and serial_no=#{serialNo} and serial_no=#{serialNo}
and ifnull(status,'0') !='2' and ifnull(status,'0') !='2'
@@ -110,9 +110,9 @@
<select id="getMaterialCategoryListByCategoryIds" resultMap="com.jsh.erp.datasource.mappers.MaterialCategoryMapper.BaseResultMap"> <select id="getMaterialCategoryListByCategoryIds" resultMap="com.jsh.erp.datasource.mappers.MaterialCategoryMapper.BaseResultMap">
select select
<include refid="com.jsh.erp.datasource.mappers.MaterialCategoryMapper.Base_Column_List" /> <include refid="com.jsh.erp.datasource.mappers.MaterialCategoryMapper.Base_Column_List" />
from jsh_materialcategory from jsh_material_category
where 1=1 where 1=1
and parentId in ( and parent_id in (
<foreach collection="parentIds" item="parentId" separator=","> <foreach collection="parentIds" item="parentId" separator=",">
#{parentId} #{parentId}
</foreach> </foreach>

26
src/main/resources/mapper_xml/MaterialMapperEx.xml
View File

@@ -13,16 +13,16 @@
</resultMap> </resultMap>
<resultMap extends="com.jsh.erp.datasource.mappers.MaterialMapper.BaseResultMap" id="ResultAndUnitMap" type="com.jsh.erp.datasource.entities.MaterialVo4Unit"> <resultMap extends="com.jsh.erp.datasource.mappers.MaterialMapper.BaseResultMap" id="ResultAndUnitMap" type="com.jsh.erp.datasource.entities.MaterialVo4Unit">
<result column="UName" jdbcType="VARCHAR" property="unitName" /> <result column="unit_name" jdbcType="VARCHAR" property="unitName" />
</resultMap> </resultMap>
<select id="selectByConditionMaterial" parameterType="com.jsh.erp.datasource.entities.MaterialExample" resultMap="ResultMapList"> <select id="selectByConditionMaterial" parameterType="com.jsh.erp.datasource.entities.MaterialExample" resultMap="ResultMapList">
select m.*,u.uname unitName, mc.name categoryName, me.bar_code, select m.*,u.name unitName, mc.name categoryName, me.bar_code,
me.purchase_decimal, me.commodity_decimal, me.wholesale_decimal,me.low_decimal me.purchase_decimal, me.commodity_decimal, me.wholesale_decimal,me.low_decimal
FROM jsh_material m FROM jsh_material m
left JOIN jsh_material_extend me on m.id = me.material_id and ifnull(me.delete_Flag,'0') !='1' left JOIN jsh_material_extend me on m.id = me.material_id and ifnull(me.delete_Flag,'0') !='1'
left JOIN jsh_unit u on m.UnitId = u.id and ifnull(u.delete_Flag,'0') !='1' left JOIN jsh_unit u on m.UnitId = u.id and ifnull(u.delete_Flag,'0') !='1'
left JOIN jsh_materialcategory mc on m.CategoryId = mc.id and ifnull(mc.status,'0') !='2' left JOIN jsh_material_category mc on m.CategoryId = mc.id and ifnull(mc.status,'0') !='2'
where 1=1 where 1=1
and me.default_flag=1 and me.default_flag=1
<if test="barCode != null"> <if test="barCode != null">
@@ -53,7 +53,7 @@
FROM jsh_material m FROM jsh_material m
left JOIN jsh_material_extend me on m.id = me.material_id and ifnull(me.delete_Flag,'0') !='1' left JOIN jsh_material_extend me on m.id = me.material_id and ifnull(me.delete_Flag,'0') !='1'
left JOIN jsh_unit u on m.UnitId = u.id and ifnull(u.delete_Flag,'0') !='1' left JOIN jsh_unit u on m.UnitId = u.id and ifnull(u.delete_Flag,'0') !='1'
left JOIN jsh_materialcategory mc on m.CategoryId = mc.id and ifnull(mc.status,'0') !='2' left JOIN jsh_material_category mc on m.CategoryId = mc.id and ifnull(mc.status,'0') !='2'
WHERE 1=1 WHERE 1=1
and me.default_flag=1 and me.default_flag=1
<if test="barCode != null"> <if test="barCode != null">
@@ -75,21 +75,21 @@
</select> </select>
<select id="findUnitName" resultType="java.lang.String"> <select id="findUnitName" resultType="java.lang.String">
select u.UName from jsh_unit u select u.name from jsh_unit u
left join jsh_material m on m.UnitId=u.id and ifnull(m.delete_Flag,'0') !='1' left join jsh_material m on m.UnitId=u.id and ifnull(m.delete_Flag,'0') !='1'
where m.id = ${mId} where m.id = ${mId}
and ifnull(u.delete_Flag,'0') !='1' and ifnull(u.delete_Flag,'0') !='1'
</select> </select>
<select id="findById" parameterType="com.jsh.erp.datasource.entities.MaterialExample" resultMap="ResultAndUnitMap"> <select id="findById" parameterType="com.jsh.erp.datasource.entities.MaterialExample" resultMap="ResultAndUnitMap">
select m.*,u.UName from jsh_material m select m.*,u.name unit_name from jsh_material m
left join jsh_unit u on m.UnitId=u.id and ifnull(u.delete_Flag,'0') !='1' left join jsh_unit u on m.UnitId=u.id and ifnull(u.delete_Flag,'0') !='1'
where m.id = ${id} where m.id = ${id}
and ifnull(m.delete_Flag,'0') !='1' and ifnull(m.delete_Flag,'0') !='1'
</select> </select>
<select id="findByIdWithBarCode" parameterType="com.jsh.erp.datasource.entities.MaterialExample" resultMap="ResultAndUnitMap"> <select id="findByIdWithBarCode" parameterType="com.jsh.erp.datasource.entities.MaterialExample" resultMap="ResultAndUnitMap">
select m.*,u.UName,me.bar_code m_bar_code, me.commodity_unit, me.purchase_decimal, me.commodity_decimal, select m.*,u.name unit_name,me.bar_code m_bar_code, me.commodity_unit, me.purchase_decimal, me.commodity_decimal,
me.wholesale_decimal, me.low_decimal me.wholesale_decimal, me.low_decimal
from jsh_material m from jsh_material m
left join jsh_material_extend me on m.id=me.material_id and ifnull(me.delete_Flag,'0') !='1' left join jsh_material_extend me on m.id=me.material_id and ifnull(me.delete_Flag,'0') !='1'
@@ -99,7 +99,7 @@
</select> </select>
<select id="findBySelectWithBarCode" parameterType="com.jsh.erp.datasource.entities.MaterialExample" resultMap="ResultAndUnitMap"> <select id="findBySelectWithBarCode" parameterType="com.jsh.erp.datasource.entities.MaterialExample" resultMap="ResultAndUnitMap">
select m.*,u.UName,me.bar_code m_bar_code,me.id meId,me.commodity_unit from jsh_material m select m.*,u.name unit_name,me.bar_code m_bar_code,me.id meId,me.commodity_unit from jsh_material m
left join jsh_material_extend me on m.id=me.material_id and ifnull(me.delete_Flag,'0') !='1' left join jsh_material_extend me on m.id=me.material_id and ifnull(me.delete_Flag,'0') !='1'
left join jsh_unit u on m.UnitId=u.id and ifnull(u.delete_Flag,'0') !='1' left join jsh_unit u on m.UnitId=u.id and ifnull(u.delete_Flag,'0') !='1'
where m.enabled=1 and me.id is not null where m.enabled=1 and me.id is not null
@@ -125,12 +125,12 @@
</select> </select>
<select id="findByAll" parameterType="com.jsh.erp.datasource.entities.MaterialExample" resultMap="ResultMapList"> <select id="findByAll" parameterType="com.jsh.erp.datasource.entities.MaterialExample" resultMap="ResultMapList">
select m.*,u.uname unitName, mc.name categoryName,me.commodity_unit,me.purchase_decimal, me.commodity_decimal, select m.*,u.name unitName, mc.name categoryName,me.commodity_unit,me.purchase_decimal, me.commodity_decimal,
me.wholesale_decimal, me.low_decimal me.wholesale_decimal, me.low_decimal
FROM jsh_material m FROM jsh_material m
left join jsh_material_extend me on m.id=me.material_id and ifnull(me.delete_Flag,'0') !='1' left join jsh_material_extend me on m.id=me.material_id and ifnull(me.delete_Flag,'0') !='1'
left JOIN jsh_unit u on m.UnitId = u.id and ifnull(u.delete_Flag,'0') !='1' left JOIN jsh_unit u on m.UnitId = u.id and ifnull(u.delete_Flag,'0') !='1'
left JOIN jsh_materialcategory mc on m.CategoryId = mc.id and ifnull(mc.status,'0') !='2' left JOIN jsh_material_category mc on m.CategoryId = mc.id and ifnull(mc.status,'0') !='2'
where 1=1 where 1=1
and me.default_flag=1 and me.default_flag=1
<if test="name != null"> <if test="name != null">
@@ -236,11 +236,11 @@
</select> </select>
<select id="getMaterialByMeId" parameterType="com.jsh.erp.datasource.entities.MaterialExample" resultMap="ResultMapList"> <select id="getMaterialByMeId" parameterType="com.jsh.erp.datasource.entities.MaterialExample" resultMap="ResultMapList">
select m.*,me.bar_code m_bar_code,u.uname unitName, mc.name categoryName select m.*,me.bar_code m_bar_code,u.name unitName, mc.name categoryName
FROM jsh_material m FROM jsh_material m
left join jsh_material_extend me on m.id=me.material_id and ifnull(me.delete_Flag,'0') !='1' left join jsh_material_extend me on m.id=me.material_id and ifnull(me.delete_Flag,'0') !='1'
left JOIN jsh_unit u on m.UnitId = u.id and ifnull(u.delete_Flag,'0') !='1' left JOIN jsh_unit u on m.UnitId = u.id and ifnull(u.delete_flag,'0') !='1'
left JOIN jsh_materialcategory mc on m.CategoryId = mc.id and ifnull(mc.status,'0') !='2' left JOIN jsh_material_category mc on m.CategoryId = mc.id and ifnull(mc.status,'0') !='2'
where 1=1 where 1=1
<if test="meId != null"> <if test="meId != null">
and me.id = ${meId} and me.id = ${meId}

148
src/main/resources/mapper_xml/MaterialPropertyMapper.xml
View File

@@ -2,22 +2,14 @@
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.jsh.erp.datasource.mappers.MaterialPropertyMapper"> <mapper namespace="com.jsh.erp.datasource.mappers.MaterialPropertyMapper">
<resultMap id="BaseResultMap" type="com.jsh.erp.datasource.entities.MaterialProperty"> <resultMap id="BaseResultMap" type="com.jsh.erp.datasource.entities.MaterialProperty">
<!--
WARNING - @mbggenerated
This element is automatically generated by MyBatis Generator, do not modify.
-->
<id column="id" jdbcType="BIGINT" property="id" /> <id column="id" jdbcType="BIGINT" property="id" />
<result column="nativeName" jdbcType="VARCHAR" property="nativename" /> <result column="native_name" jdbcType="VARCHAR" property="nativeName" />
<result column="enabled" jdbcType="BIT" property="enabled" /> <result column="enabled" jdbcType="BIT" property="enabled" />
<result column="sort" jdbcType="VARCHAR" property="sort" /> <result column="sort" jdbcType="VARCHAR" property="sort" />
<result column="anotherName" jdbcType="VARCHAR" property="anothername" /> <result column="another_name" jdbcType="VARCHAR" property="anotherName" />
<result column="delete_Flag" jdbcType="VARCHAR" property="deleteFlag" /> <result column="delete_flag" jdbcType="VARCHAR" property="deleteFlag" />
</resultMap> </resultMap>
<sql id="Example_Where_Clause"> <sql id="Example_Where_Clause">
<!--
WARNING - @mbggenerated
This element is automatically generated by MyBatis Generator, do not modify.
-->
<where> <where>
<foreach collection="oredCriteria" item="criteria" separator="or"> <foreach collection="oredCriteria" item="criteria" separator="or">
<if test="criteria.valid"> <if test="criteria.valid">
@@ -47,10 +39,6 @@
</where> </where>
</sql> </sql>
<sql id="Update_By_Example_Where_Clause"> <sql id="Update_By_Example_Where_Clause">
<!--
WARNING - @mbggenerated
This element is automatically generated by MyBatis Generator, do not modify.
-->
<where> <where>
<foreach collection="example.oredCriteria" item="criteria" separator="or"> <foreach collection="example.oredCriteria" item="criteria" separator="or">
<if test="criteria.valid"> <if test="criteria.valid">
@@ -80,23 +68,15 @@
</where> </where>
</sql> </sql>
<sql id="Base_Column_List"> <sql id="Base_Column_List">
<!-- id, native_name, enabled, sort, another_name, delete_flag
WARNING - @mbggenerated
This element is automatically generated by MyBatis Generator, do not modify.
-->
id, nativeName, enabled, sort, anotherName, delete_Flag
</sql> </sql>
<select id="selectByExample" parameterType="com.jsh.erp.datasource.entities.MaterialPropertyExample" resultMap="BaseResultMap"> <select id="selectByExample" parameterType="com.jsh.erp.datasource.entities.MaterialPropertyExample" resultMap="BaseResultMap">
<!--
WARNING - @mbggenerated
This element is automatically generated by MyBatis Generator, do not modify.
-->
select select
<if test="distinct"> <if test="distinct">
distinct distinct
</if> </if>
<include refid="Base_Column_List" /> <include refid="Base_Column_List" />
from jsh_materialproperty from jsh_material_property
<if test="_parameter != null"> <if test="_parameter != null">
<include refid="Example_Where_Clause" /> <include refid="Example_Where_Clause" />
</if> </if>
@@ -105,57 +85,37 @@
</if> </if>
</select> </select>
<select id="selectByPrimaryKey" parameterType="java.lang.Long" resultMap="BaseResultMap"> <select id="selectByPrimaryKey" parameterType="java.lang.Long" resultMap="BaseResultMap">
<!--
WARNING - @mbggenerated
This element is automatically generated by MyBatis Generator, do not modify.
-->
select select
<include refid="Base_Column_List" /> <include refid="Base_Column_List" />
from jsh_materialproperty from jsh_material_property
where id = #{id,jdbcType=BIGINT} where id = #{id,jdbcType=BIGINT}
</select> </select>
<delete id="deleteByPrimaryKey" parameterType="java.lang.Long"> <delete id="deleteByPrimaryKey" parameterType="java.lang.Long">
<!-- delete from jsh_material_property
WARNING - @mbggenerated
This element is automatically generated by MyBatis Generator, do not modify.
-->
delete from jsh_materialproperty
where id = #{id,jdbcType=BIGINT} where id = #{id,jdbcType=BIGINT}
</delete> </delete>
<delete id="deleteByExample" parameterType="com.jsh.erp.datasource.entities.MaterialPropertyExample"> <delete id="deleteByExample" parameterType="com.jsh.erp.datasource.entities.MaterialPropertyExample">
<!-- delete from jsh_material_property
WARNING - @mbggenerated
This element is automatically generated by MyBatis Generator, do not modify.
-->
delete from jsh_materialproperty
<if test="_parameter != null"> <if test="_parameter != null">
<include refid="Example_Where_Clause" /> <include refid="Example_Where_Clause" />
</if> </if>
</delete> </delete>
<insert id="insert" parameterType="com.jsh.erp.datasource.entities.MaterialProperty"> <insert id="insert" parameterType="com.jsh.erp.datasource.entities.MaterialProperty">
<!-- insert into jsh_material_property (id, native_name, enabled,
WARNING - @mbggenerated sort, another_name, delete_flag
This element is automatically generated by MyBatis Generator, do not modify.
-->
insert into jsh_materialproperty (id, nativeName, enabled,
sort, anotherName, delete_Flag
) )
values (#{id,jdbcType=BIGINT}, #{nativename,jdbcType=VARCHAR}, #{enabled,jdbcType=BIT}, values (#{id,jdbcType=BIGINT}, #{nativeName,jdbcType=VARCHAR}, #{enabled,jdbcType=BIT},
#{sort,jdbcType=VARCHAR}, #{anothername,jdbcType=VARCHAR}, #{deleteFlag,jdbcType=VARCHAR} #{sort,jdbcType=VARCHAR}, #{anotherName,jdbcType=VARCHAR}, #{deleteFlag,jdbcType=VARCHAR}
) )
</insert> </insert>
<insert id="insertSelective" parameterType="com.jsh.erp.datasource.entities.MaterialProperty"> <insert id="insertSelective" parameterType="com.jsh.erp.datasource.entities.MaterialProperty">
<!-- insert into jsh_material_property
WARNING - @mbggenerated
This element is automatically generated by MyBatis Generator, do not modify.
-->
insert into jsh_materialproperty
<trim prefix="(" suffix=")" suffixOverrides=","> <trim prefix="(" suffix=")" suffixOverrides=",">
<if test="id != null"> <if test="id != null">
id, id,
</if> </if>
<if test="nativename != null"> <if test="nativeName != null">
nativeName, native_name,
</if> </if>
<if test="enabled != null"> <if test="enabled != null">
enabled, enabled,
@@ -163,19 +123,19 @@
<if test="sort != null"> <if test="sort != null">
sort, sort,
</if> </if>
<if test="anothername != null"> <if test="anotherName != null">
anotherName, another_name,
</if> </if>
<if test="deleteFlag != null"> <if test="deleteFlag != null">
delete_Flag, delete_flag,
</if> </if>
</trim> </trim>
<trim prefix="values (" suffix=")" suffixOverrides=","> <trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="id != null"> <if test="id != null">
#{id,jdbcType=BIGINT}, #{id,jdbcType=BIGINT},
</if> </if>
<if test="nativename != null"> <if test="nativeName != null">
#{nativename,jdbcType=VARCHAR}, #{nativeName,jdbcType=VARCHAR},
</if> </if>
<if test="enabled != null"> <if test="enabled != null">
#{enabled,jdbcType=BIT}, #{enabled,jdbcType=BIT},
@@ -183,36 +143,28 @@
<if test="sort != null"> <if test="sort != null">
#{sort,jdbcType=VARCHAR}, #{sort,jdbcType=VARCHAR},
</if> </if>
<if test="anothername != null"> <if test="anotherName != null">
#{anothername,jdbcType=VARCHAR}, #{anotherName,jdbcType=VARCHAR},
</if> </if>
<if test="deleteFlag != null"> <if test="deleteFlag != null">
#{deleteFlag,jdbcType=VARCHAR}, #{deleteFlag,jdbcType=VARCHAR},
</if> </if>
</trim> </trim>
</insert> </insert>
<select id="countByExample" parameterType="com.jsh.erp.datasource.entities.MaterialPropertyExample" resultType="java.lang.Integer"> <select id="countByExample" parameterType="com.jsh.erp.datasource.entities.MaterialPropertyExample" resultType="java.lang.Long">
<!-- select count(*) from jsh_material_property
WARNING - @mbggenerated
This element is automatically generated by MyBatis Generator, do not modify.
-->
select count(*) from jsh_materialproperty
<if test="_parameter != null"> <if test="_parameter != null">
<include refid="Example_Where_Clause" /> <include refid="Example_Where_Clause" />
</if> </if>
</select> </select>
<update id="updateByExampleSelective" parameterType="map"> <update id="updateByExampleSelective" parameterType="map">
<!-- update jsh_material_property
WARNING - @mbggenerated
This element is automatically generated by MyBatis Generator, do not modify.
-->
update jsh_materialproperty
<set> <set>
<if test="record.id != null"> <if test="record.id != null">
id = #{record.id,jdbcType=BIGINT}, id = #{record.id,jdbcType=BIGINT},
</if> </if>
<if test="record.nativename != null"> <if test="record.nativeName != null">
nativeName = #{record.nativename,jdbcType=VARCHAR}, native_name = #{record.nativeName,jdbcType=VARCHAR},
</if> </if>
<if test="record.enabled != null"> <if test="record.enabled != null">
enabled = #{record.enabled,jdbcType=BIT}, enabled = #{record.enabled,jdbcType=BIT},
@@ -220,11 +172,11 @@
<if test="record.sort != null"> <if test="record.sort != null">
sort = #{record.sort,jdbcType=VARCHAR}, sort = #{record.sort,jdbcType=VARCHAR},
</if> </if>
<if test="record.anothername != null"> <if test="record.anotherName != null">
anotherName = #{record.anothername,jdbcType=VARCHAR}, another_name = #{record.anotherName,jdbcType=VARCHAR},
</if> </if>
<if test="record.deleteFlag != null"> <if test="record.deleteFlag != null">
delete_Flag = #{record.deleteFlag,jdbcType=VARCHAR}, delete_flag = #{record.deleteFlag,jdbcType=VARCHAR},
</if> </if>
</set> </set>
<if test="_parameter != null"> <if test="_parameter != null">
@@ -232,30 +184,22 @@
</if> </if>
</update> </update>
<update id="updateByExample" parameterType="map"> <update id="updateByExample" parameterType="map">
<!-- update jsh_material_property
WARNING - @mbggenerated
This element is automatically generated by MyBatis Generator, do not modify.
-->
update jsh_materialproperty
set id = #{record.id,jdbcType=BIGINT}, set id = #{record.id,jdbcType=BIGINT},
nativeName = #{record.nativename,jdbcType=VARCHAR}, native_name = #{record.nativeName,jdbcType=VARCHAR},
enabled = #{record.enabled,jdbcType=BIT}, enabled = #{record.enabled,jdbcType=BIT},
sort = #{record.sort,jdbcType=VARCHAR}, sort = #{record.sort,jdbcType=VARCHAR},
anotherName = #{record.anothername,jdbcType=VARCHAR}, another_name = #{record.anotherName,jdbcType=VARCHAR},
delete_Flag = #{record.deleteFlag,jdbcType=VARCHAR} delete_flag = #{record.deleteFlag,jdbcType=VARCHAR}
<if test="_parameter != null"> <if test="_parameter != null">
<include refid="Update_By_Example_Where_Clause" /> <include refid="Update_By_Example_Where_Clause" />
</if> </if>
</update> </update>
<update id="updateByPrimaryKeySelective" parameterType="com.jsh.erp.datasource.entities.MaterialProperty"> <update id="updateByPrimaryKeySelective" parameterType="com.jsh.erp.datasource.entities.MaterialProperty">
<!-- update jsh_material_property
WARNING - @mbggenerated
This element is automatically generated by MyBatis Generator, do not modify.
-->
update jsh_materialproperty
<set> <set>
<if test="nativename != null"> <if test="nativeName != null">
nativeName = #{nativename,jdbcType=VARCHAR}, native_name = #{nativeName,jdbcType=VARCHAR},
</if> </if>
<if test="enabled != null"> <if test="enabled != null">
enabled = #{enabled,jdbcType=BIT}, enabled = #{enabled,jdbcType=BIT},
@@ -263,26 +207,22 @@
<if test="sort != null"> <if test="sort != null">
sort = #{sort,jdbcType=VARCHAR}, sort = #{sort,jdbcType=VARCHAR},
</if> </if>
<if test="anothername != null"> <if test="anotherName != null">
anotherName = #{anothername,jdbcType=VARCHAR}, another_name = #{anotherName,jdbcType=VARCHAR},
</if> </if>
<if test="deleteFlag != null"> <if test="deleteFlag != null">
delete_Flag = #{deleteFlag,jdbcType=VARCHAR}, delete_flag = #{deleteFlag,jdbcType=VARCHAR},
</if> </if>
</set> </set>
where id = #{id,jdbcType=BIGINT} where id = #{id,jdbcType=BIGINT}
</update> </update>
<update id="updateByPrimaryKey" parameterType="com.jsh.erp.datasource.entities.MaterialProperty"> <update id="updateByPrimaryKey" parameterType="com.jsh.erp.datasource.entities.MaterialProperty">
<!-- update jsh_material_property
WARNING - @mbggenerated set native_name = #{nativeName,jdbcType=VARCHAR},
This element is automatically generated by MyBatis Generator, do not modify.
-->
update jsh_materialproperty
set nativeName = #{nativename,jdbcType=VARCHAR},
enabled = #{enabled,jdbcType=BIT}, enabled = #{enabled,jdbcType=BIT},
sort = #{sort,jdbcType=VARCHAR}, sort = #{sort,jdbcType=VARCHAR},
anotherName = #{anothername,jdbcType=VARCHAR}, another_name = #{anotherName,jdbcType=VARCHAR},
delete_Flag = #{deleteFlag,jdbcType=VARCHAR} delete_flag = #{deleteFlag,jdbcType=VARCHAR}
where id = #{id,jdbcType=BIGINT} where id = #{id,jdbcType=BIGINT}
</update> </update>
</mapper> </mapper>

16
src/main/resources/mapper_xml/MaterialPropertyMapperEx.xml
View File

@@ -3,12 +3,12 @@
<mapper namespace="com.jsh.erp.datasource.mappers.MaterialPropertyMapperEx"> <mapper namespace="com.jsh.erp.datasource.mappers.MaterialPropertyMapperEx">
<select id="selectByConditionMaterialProperty" parameterType="com.jsh.erp.datasource.entities.MaterialPropertyExample" resultMap="com.jsh.erp.datasource.mappers.MaterialPropertyMapper.BaseResultMap"> <select id="selectByConditionMaterialProperty" parameterType="com.jsh.erp.datasource.entities.MaterialPropertyExample" resultMap="com.jsh.erp.datasource.mappers.MaterialPropertyMapper.BaseResultMap">
select * select *
FROM jsh_materialproperty FROM jsh_material_property
where 1=1 where 1=1
<if test="name != null"> <if test="name != null">
and nativeName like '%${name}%' and native_name like '%${name}%'
</if> </if>
and ifnull(delete_Flag,'0') !='1' and ifnull(delete_flag,'0') !='1'
<if test="offset != null and rows != null"> <if test="offset != null and rows != null">
limit #{offset},#{rows} limit #{offset},#{rows}
</if> </if>
@@ -16,16 +16,16 @@
<select id="countsByMaterialProperty" resultType="java.lang.Long"> <select id="countsByMaterialProperty" resultType="java.lang.Long">
SELECT SELECT
COUNT(id) COUNT(id)
FROM jsh_materialproperty FROM jsh_material_property
WHERE 1=1 WHERE 1=1
<if test="name != null"> <if test="name != null">
and nativeName like '%${name}%' and native_name like '%${name}%'
</if> </if>
and ifnull(delete_Flag,'0') !='1' and ifnull(delete_flag,'0') !='1'
</select> </select>
<update id="batchDeleteMaterialPropertyByIds"> <update id="batchDeleteMaterialPropertyByIds">
update jsh_materialproperty update jsh_material_property
set delete_Flag='1' set delete_flag='1'
where 1=1 where 1=1
and id in ( and id in (
<foreach collection="ids" item="id" separator=","> <foreach collection="ids" item="id" separator=",">

120
src/main/resources/mapper_xml/PersonMapper.xml
View File

@@ -2,21 +2,13 @@
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.jsh.erp.datasource.mappers.PersonMapper"> <mapper namespace="com.jsh.erp.datasource.mappers.PersonMapper">
<resultMap id="BaseResultMap" type="com.jsh.erp.datasource.entities.Person"> <resultMap id="BaseResultMap" type="com.jsh.erp.datasource.entities.Person">
<!-- <id column="id" jdbcType="BIGINT" property="id" />
WARNING - @mbggenerated <result column="type" jdbcType="VARCHAR" property="type" />
This element is automatically generated by MyBatis Generator, do not modify. <result column="name" jdbcType="VARCHAR" property="name" />
-->
<id column="Id" jdbcType="BIGINT" property="id" />
<result column="Type" jdbcType="VARCHAR" property="type" />
<result column="Name" jdbcType="VARCHAR" property="name" />
<result column="tenant_id" jdbcType="BIGINT" property="tenantId" /> <result column="tenant_id" jdbcType="BIGINT" property="tenantId" />
<result column="delete_Flag" jdbcType="VARCHAR" property="deleteFlag" /> <result column="delete_flag" jdbcType="VARCHAR" property="deleteFlag" />
</resultMap> </resultMap>
<sql id="Example_Where_Clause"> <sql id="Example_Where_Clause">
<!--
WARNING - @mbggenerated
This element is automatically generated by MyBatis Generator, do not modify.
-->
<where> <where>
<foreach collection="oredCriteria" item="criteria" separator="or"> <foreach collection="oredCriteria" item="criteria" separator="or">
<if test="criteria.valid"> <if test="criteria.valid">
@@ -46,10 +38,6 @@
</where> </where>
</sql> </sql>
<sql id="Update_By_Example_Where_Clause"> <sql id="Update_By_Example_Where_Clause">
<!--
WARNING - @mbggenerated
This element is automatically generated by MyBatis Generator, do not modify.
-->
<where> <where>
<foreach collection="example.oredCriteria" item="criteria" separator="or"> <foreach collection="example.oredCriteria" item="criteria" separator="or">
<if test="criteria.valid"> <if test="criteria.valid">
@@ -79,17 +67,9 @@
</where> </where>
</sql> </sql>
<sql id="Base_Column_List"> <sql id="Base_Column_List">
<!-- id, type, name, tenant_id, delete_flag
WARNING - @mbggenerated
This element is automatically generated by MyBatis Generator, do not modify.
-->
Id, Type, Name, tenant_id, delete_Flag
</sql> </sql>
<select id="selectByExample" parameterType="com.jsh.erp.datasource.entities.PersonExample" resultMap="BaseResultMap"> <select id="selectByExample" parameterType="com.jsh.erp.datasource.entities.PersonExample" resultMap="BaseResultMap">
<!--
WARNING - @mbggenerated
This element is automatically generated by MyBatis Generator, do not modify.
-->
select select
<if test="distinct"> <if test="distinct">
distinct distinct
@@ -104,64 +84,44 @@
</if> </if>
</select> </select>
<select id="selectByPrimaryKey" parameterType="java.lang.Long" resultMap="BaseResultMap"> <select id="selectByPrimaryKey" parameterType="java.lang.Long" resultMap="BaseResultMap">
<!--
WARNING - @mbggenerated
This element is automatically generated by MyBatis Generator, do not modify.
-->
select select
<include refid="Base_Column_List" /> <include refid="Base_Column_List" />
from jsh_person from jsh_person
where Id = #{id,jdbcType=BIGINT} where id = #{id,jdbcType=BIGINT}
</select> </select>
<delete id="deleteByPrimaryKey" parameterType="java.lang.Long"> <delete id="deleteByPrimaryKey" parameterType="java.lang.Long">
<!--
WARNING - @mbggenerated
This element is automatically generated by MyBatis Generator, do not modify.
-->
delete from jsh_person delete from jsh_person
where Id = #{id,jdbcType=BIGINT} where id = #{id,jdbcType=BIGINT}
</delete> </delete>
<delete id="deleteByExample" parameterType="com.jsh.erp.datasource.entities.PersonExample"> <delete id="deleteByExample" parameterType="com.jsh.erp.datasource.entities.PersonExample">
<!--
WARNING - @mbggenerated
This element is automatically generated by MyBatis Generator, do not modify.
-->
delete from jsh_person delete from jsh_person
<if test="_parameter != null"> <if test="_parameter != null">
<include refid="Example_Where_Clause" /> <include refid="Example_Where_Clause" />
</if> </if>
</delete> </delete>
<insert id="insert" parameterType="com.jsh.erp.datasource.entities.Person"> <insert id="insert" parameterType="com.jsh.erp.datasource.entities.Person">
<!-- insert into jsh_person (id, type, name,
WARNING - @mbggenerated tenant_id, delete_flag)
This element is automatically generated by MyBatis Generator, do not modify.
-->
insert into jsh_person (Id, Type, Name,
tenant_id, delete_Flag)
values (#{id,jdbcType=BIGINT}, #{type,jdbcType=VARCHAR}, #{name,jdbcType=VARCHAR}, values (#{id,jdbcType=BIGINT}, #{type,jdbcType=VARCHAR}, #{name,jdbcType=VARCHAR},
#{tenantId,jdbcType=BIGINT}, #{deleteFlag,jdbcType=VARCHAR}) #{tenantId,jdbcType=BIGINT}, #{deleteFlag,jdbcType=VARCHAR})
</insert> </insert>
<insert id="insertSelective" parameterType="com.jsh.erp.datasource.entities.Person"> <insert id="insertSelective" parameterType="com.jsh.erp.datasource.entities.Person">
<!--
WARNING - @mbggenerated
This element is automatically generated by MyBatis Generator, do not modify.
-->
insert into jsh_person insert into jsh_person
<trim prefix="(" suffix=")" suffixOverrides=","> <trim prefix="(" suffix=")" suffixOverrides=",">
<if test="id != null"> <if test="id != null">
Id, id,
</if> </if>
<if test="type != null"> <if test="type != null">
Type, type,
</if> </if>
<if test="name != null"> <if test="name != null">
Name, name,
</if> </if>
<if test="tenantId != null"> <if test="tenantId != null">
tenant_id, tenant_id,
</if> </if>
<if test="deleteFlag != null"> <if test="deleteFlag != null">
delete_Flag, delete_flag,
</if> </if>
</trim> </trim>
<trim prefix="values (" suffix=")" suffixOverrides=","> <trim prefix="values (" suffix=")" suffixOverrides=",">
@@ -182,37 +142,29 @@
</if> </if>
</trim> </trim>
</insert> </insert>
<select id="countByExample" parameterType="com.jsh.erp.datasource.entities.PersonExample" resultType="java.lang.Integer"> <select id="countByExample" parameterType="com.jsh.erp.datasource.entities.PersonExample" resultType="java.lang.Long">
<!--
WARNING - @mbggenerated
This element is automatically generated by MyBatis Generator, do not modify.
-->
select count(*) from jsh_person select count(*) from jsh_person
<if test="_parameter != null"> <if test="_parameter != null">
<include refid="Example_Where_Clause" /> <include refid="Example_Where_Clause" />
</if> </if>
</select> </select>
<update id="updateByExampleSelective" parameterType="map"> <update id="updateByExampleSelective" parameterType="map">
<!--
WARNING - @mbggenerated
This element is automatically generated by MyBatis Generator, do not modify.
-->
update jsh_person update jsh_person
<set> <set>
<if test="record.id != null"> <if test="record.id != null">
Id = #{record.id,jdbcType=BIGINT}, id = #{record.id,jdbcType=BIGINT},
</if> </if>
<if test="record.type != null"> <if test="record.type != null">
Type = #{record.type,jdbcType=VARCHAR}, type = #{record.type,jdbcType=VARCHAR},
</if> </if>
<if test="record.name != null"> <if test="record.name != null">
Name = #{record.name,jdbcType=VARCHAR}, name = #{record.name,jdbcType=VARCHAR},
</if> </if>
<if test="record.tenantId != null"> <if test="record.tenantId != null">
tenant_id = #{record.tenantId,jdbcType=BIGINT}, tenant_id = #{record.tenantId,jdbcType=BIGINT},
</if> </if>
<if test="record.deleteFlag != null"> <if test="record.deleteFlag != null">
delete_Flag = #{record.deleteFlag,jdbcType=VARCHAR}, delete_flag = #{record.deleteFlag,jdbcType=VARCHAR},
</if> </if>
</set> </set>
<if test="_parameter != null"> <if test="_parameter != null">
@@ -220,52 +172,40 @@
</if> </if>
</update> </update>
<update id="updateByExample" parameterType="map"> <update id="updateByExample" parameterType="map">
<!--
WARNING - @mbggenerated
This element is automatically generated by MyBatis Generator, do not modify.
-->
update jsh_person update jsh_person
set Id = #{record.id,jdbcType=BIGINT}, set id = #{record.id,jdbcType=BIGINT},
Type = #{record.type,jdbcType=VARCHAR}, type = #{record.type,jdbcType=VARCHAR},
Name = #{record.name,jdbcType=VARCHAR}, name = #{record.name,jdbcType=VARCHAR},
tenant_id = #{record.tenantId,jdbcType=BIGINT}, tenant_id = #{record.tenantId,jdbcType=BIGINT},
delete_Flag = #{record.deleteFlag,jdbcType=VARCHAR} delete_flag = #{record.deleteFlag,jdbcType=VARCHAR}
<if test="_parameter != null"> <if test="_parameter != null">
<include refid="Update_By_Example_Where_Clause" /> <include refid="Update_By_Example_Where_Clause" />
</if> </if>
</update> </update>
<update id="updateByPrimaryKeySelective" parameterType="com.jsh.erp.datasource.entities.Person"> <update id="updateByPrimaryKeySelective" parameterType="com.jsh.erp.datasource.entities.Person">
<!--
WARNING - @mbggenerated
This element is automatically generated by MyBatis Generator, do not modify.
-->
update jsh_person update jsh_person
<set> <set>
<if test="type != null"> <if test="type != null">
Type = #{type,jdbcType=VARCHAR}, type = #{type,jdbcType=VARCHAR},
</if> </if>
<if test="name != null"> <if test="name != null">
Name = #{name,jdbcType=VARCHAR}, name = #{name,jdbcType=VARCHAR},
</if> </if>
<if test="tenantId != null"> <if test="tenantId != null">
tenant_id = #{tenantId,jdbcType=BIGINT}, tenant_id = #{tenantId,jdbcType=BIGINT},
</if> </if>
<if test="deleteFlag != null"> <if test="deleteFlag != null">
delete_Flag = #{deleteFlag,jdbcType=VARCHAR}, delete_flag = #{deleteFlag,jdbcType=VARCHAR},
</if> </if>
</set> </set>
where Id = #{id,jdbcType=BIGINT} where id = #{id,jdbcType=BIGINT}
</update> </update>
<update id="updateByPrimaryKey" parameterType="com.jsh.erp.datasource.entities.Person"> <update id="updateByPrimaryKey" parameterType="com.jsh.erp.datasource.entities.Person">
<!--
WARNING - @mbggenerated
This element is automatically generated by MyBatis Generator, do not modify.
-->
update jsh_person update jsh_person
set Type = #{type,jdbcType=VARCHAR}, set type = #{type,jdbcType=VARCHAR},
Name = #{name,jdbcType=VARCHAR}, name = #{name,jdbcType=VARCHAR},
tenant_id = #{tenantId,jdbcType=BIGINT}, tenant_id = #{tenantId,jdbcType=BIGINT},
delete_Flag = #{deleteFlag,jdbcType=VARCHAR} delete_flag = #{deleteFlag,jdbcType=VARCHAR}
where Id = #{id,jdbcType=BIGINT} where id = #{id,jdbcType=BIGINT}
</update> </update>
</mapper> </mapper>

6
src/main/resources/mapper_xml/PersonMapperEx.xml
View File

@@ -11,7 +11,7 @@
<if test="type != null"> <if test="type != null">
and type='${type}' and type='${type}'
</if> </if>
and ifnull(delete_Flag,'0') !='1' and ifnull(delete_flag,'0') !='1'
<if test="offset != null and rows != null"> <if test="offset != null and rows != null">
limit #{offset},#{rows} limit #{offset},#{rows}
</if> </if>
@@ -27,11 +27,11 @@
<if test="type != null"> <if test="type != null">
and type='${type}' and type='${type}'
</if> </if>
and ifnull(delete_Flag,'0') !='1' and ifnull(delete_flag,'0') !='1'
</select> </select>
<update id="batchDeletePersonByIds"> <update id="batchDeletePersonByIds">
update jsh_person update jsh_person
set delete_Flag='1' set delete_flag='1'
where 1=1 where 1=1
and id in ( and id in (
<foreach collection="ids" item="id" separator=","> <foreach collection="ids" item="id" separator=",">

108
src/main/resources/mapper_xml/RoleMapper.xml
View File

@@ -2,23 +2,15 @@
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.jsh.erp.datasource.mappers.RoleMapper"> <mapper namespace="com.jsh.erp.datasource.mappers.RoleMapper">
<resultMap id="BaseResultMap" type="com.jsh.erp.datasource.entities.Role"> <resultMap id="BaseResultMap" type="com.jsh.erp.datasource.entities.Role">
<!-- <id column="id" jdbcType="BIGINT" property="id" />
WARNING - @mbggenerated <result column="name" jdbcType="VARCHAR" property="name" />
This element is automatically generated by MyBatis Generator, do not modify.
-->
<id column="Id" jdbcType="BIGINT" property="id" />
<result column="Name" jdbcType="VARCHAR" property="name" />
<result column="type" jdbcType="VARCHAR" property="type" /> <result column="type" jdbcType="VARCHAR" property="type" />
<result column="value" jdbcType="VARCHAR" property="value" /> <result column="value" jdbcType="VARCHAR" property="value" />
<result column="description" jdbcType="VARCHAR" property="description" /> <result column="description" jdbcType="VARCHAR" property="description" />
<result column="tenant_id" jdbcType="BIGINT" property="tenantId" /> <result column="tenant_id" jdbcType="BIGINT" property="tenantId" />
<result column="delete_Flag" jdbcType="VARCHAR" property="deleteFlag" /> <result column="delete_flag" jdbcType="VARCHAR" property="deleteFlag" />
</resultMap> </resultMap>
<sql id="Example_Where_Clause"> <sql id="Example_Where_Clause">
<!--
WARNING - @mbggenerated
This element is automatically generated by MyBatis Generator, do not modify.
-->
<where> <where>
<foreach collection="oredCriteria" item="criteria" separator="or"> <foreach collection="oredCriteria" item="criteria" separator="or">
<if test="criteria.valid"> <if test="criteria.valid">
@@ -48,10 +40,6 @@
</where> </where>
</sql> </sql>
<sql id="Update_By_Example_Where_Clause"> <sql id="Update_By_Example_Where_Clause">
<!--
WARNING - @mbggenerated
This element is automatically generated by MyBatis Generator, do not modify.
-->
<where> <where>
<foreach collection="example.oredCriteria" item="criteria" separator="or"> <foreach collection="example.oredCriteria" item="criteria" separator="or">
<if test="criteria.valid"> <if test="criteria.valid">
@@ -81,17 +69,9 @@
</where> </where>
</sql> </sql>
<sql id="Base_Column_List"> <sql id="Base_Column_List">
<!-- id, name, type, value, description, tenant_id, delete_flag
WARNING - @mbggenerated
This element is automatically generated by MyBatis Generator, do not modify.
-->
Id, Name, type, value, description, tenant_id, delete_Flag
</sql> </sql>
<select id="selectByExample" parameterType="com.jsh.erp.datasource.entities.RoleExample" resultMap="BaseResultMap"> <select id="selectByExample" parameterType="com.jsh.erp.datasource.entities.RoleExample" resultMap="BaseResultMap">
<!--
WARNING - @mbggenerated
This element is automatically generated by MyBatis Generator, do not modify.
-->
select select
<if test="distinct"> <if test="distinct">
distinct distinct
@@ -106,57 +86,37 @@
</if> </if>
</select> </select>
<select id="selectByPrimaryKey" parameterType="java.lang.Long" resultMap="BaseResultMap"> <select id="selectByPrimaryKey" parameterType="java.lang.Long" resultMap="BaseResultMap">
<!--
WARNING - @mbggenerated
This element is automatically generated by MyBatis Generator, do not modify.
-->
select select
<include refid="Base_Column_List" /> <include refid="Base_Column_List" />
from jsh_role from jsh_role
where Id = #{id,jdbcType=BIGINT} where id = #{id,jdbcType=BIGINT}
</select> </select>
<delete id="deleteByPrimaryKey" parameterType="java.lang.Long"> <delete id="deleteByPrimaryKey" parameterType="java.lang.Long">
<!--
WARNING - @mbggenerated
This element is automatically generated by MyBatis Generator, do not modify.
-->
delete from jsh_role delete from jsh_role
where Id = #{id,jdbcType=BIGINT} where id = #{id,jdbcType=BIGINT}
</delete> </delete>
<delete id="deleteByExample" parameterType="com.jsh.erp.datasource.entities.RoleExample"> <delete id="deleteByExample" parameterType="com.jsh.erp.datasource.entities.RoleExample">
<!--
WARNING - @mbggenerated
This element is automatically generated by MyBatis Generator, do not modify.
-->
delete from jsh_role delete from jsh_role
<if test="_parameter != null"> <if test="_parameter != null">
<include refid="Example_Where_Clause" /> <include refid="Example_Where_Clause" />
</if> </if>
</delete> </delete>
<insert id="insert" parameterType="com.jsh.erp.datasource.entities.Role"> <insert id="insert" parameterType="com.jsh.erp.datasource.entities.Role">
<!-- insert into jsh_role (id, name, type,
WARNING - @mbggenerated
This element is automatically generated by MyBatis Generator, do not modify.
-->
insert into jsh_role (Id, Name, type,
value, description, tenant_id, value, description, tenant_id,
delete_Flag) delete_flag)
values (#{id,jdbcType=BIGINT}, #{name,jdbcType=VARCHAR}, #{type,jdbcType=VARCHAR}, values (#{id,jdbcType=BIGINT}, #{name,jdbcType=VARCHAR}, #{type,jdbcType=VARCHAR},
#{value,jdbcType=VARCHAR}, #{description,jdbcType=VARCHAR}, #{tenantId,jdbcType=BIGINT}, #{value,jdbcType=VARCHAR}, #{description,jdbcType=VARCHAR}, #{tenantId,jdbcType=BIGINT},
#{deleteFlag,jdbcType=VARCHAR}) #{deleteFlag,jdbcType=VARCHAR})
</insert> </insert>
<insert id="insertSelective" parameterType="com.jsh.erp.datasource.entities.Role"> <insert id="insertSelective" parameterType="com.jsh.erp.datasource.entities.Role">
<!--
WARNING - @mbggenerated
This element is automatically generated by MyBatis Generator, do not modify.
-->
insert into jsh_role insert into jsh_role
<trim prefix="(" suffix=")" suffixOverrides=","> <trim prefix="(" suffix=")" suffixOverrides=",">
<if test="id != null"> <if test="id != null">
Id, id,
</if> </if>
<if test="name != null"> <if test="name != null">
Name, name,
</if> </if>
<if test="type != null"> <if test="type != null">
type, type,
@@ -171,7 +131,7 @@
tenant_id, tenant_id,
</if> </if>
<if test="deleteFlag != null"> <if test="deleteFlag != null">
delete_Flag, delete_flag,
</if> </if>
</trim> </trim>
<trim prefix="values (" suffix=")" suffixOverrides=","> <trim prefix="values (" suffix=")" suffixOverrides=",">
@@ -198,28 +158,20 @@
</if> </if>
</trim> </trim>
</insert> </insert>
<select id="countByExample" parameterType="com.jsh.erp.datasource.entities.RoleExample" resultType="java.lang.Integer"> <select id="countByExample" parameterType="com.jsh.erp.datasource.entities.RoleExample" resultType="java.lang.Long">
<!--
WARNING - @mbggenerated
This element is automatically generated by MyBatis Generator, do not modify.
-->
select count(*) from jsh_role select count(*) from jsh_role
<if test="_parameter != null"> <if test="_parameter != null">
<include refid="Example_Where_Clause" /> <include refid="Example_Where_Clause" />
</if> </if>
</select> </select>
<update id="updateByExampleSelective" parameterType="map"> <update id="updateByExampleSelective" parameterType="map">
<!--
WARNING - @mbggenerated
This element is automatically generated by MyBatis Generator, do not modify.
-->
update jsh_role update jsh_role
<set> <set>
<if test="record.id != null"> <if test="record.id != null">
Id = #{record.id,jdbcType=BIGINT}, id = #{record.id,jdbcType=BIGINT},
</if> </if>
<if test="record.name != null"> <if test="record.name != null">
Name = #{record.name,jdbcType=VARCHAR}, name = #{record.name,jdbcType=VARCHAR},
</if> </if>
<if test="record.type != null"> <if test="record.type != null">
type = #{record.type,jdbcType=VARCHAR}, type = #{record.type,jdbcType=VARCHAR},
@@ -234,7 +186,7 @@
tenant_id = #{record.tenantId,jdbcType=BIGINT}, tenant_id = #{record.tenantId,jdbcType=BIGINT},
</if> </if>
<if test="record.deleteFlag != null"> <if test="record.deleteFlag != null">
delete_Flag = #{record.deleteFlag,jdbcType=VARCHAR}, delete_flag = #{record.deleteFlag,jdbcType=VARCHAR},
</if> </if>
</set> </set>
<if test="_parameter != null"> <if test="_parameter != null">
@@ -242,31 +194,23 @@
</if> </if>
</update> </update>
<update id="updateByExample" parameterType="map"> <update id="updateByExample" parameterType="map">
<!--
WARNING - @mbggenerated
This element is automatically generated by MyBatis Generator, do not modify.
-->
update jsh_role update jsh_role
set Id = #{record.id,jdbcType=BIGINT}, set id = #{record.id,jdbcType=BIGINT},
Name = #{record.name,jdbcType=VARCHAR}, name = #{record.name,jdbcType=VARCHAR},
type = #{record.type,jdbcType=VARCHAR}, type = #{record.type,jdbcType=VARCHAR},
value = #{record.value,jdbcType=VARCHAR}, value = #{record.value,jdbcType=VARCHAR},
description = #{record.description,jdbcType=VARCHAR}, description = #{record.description,jdbcType=VARCHAR},
tenant_id = #{record.tenantId,jdbcType=BIGINT}, tenant_id = #{record.tenantId,jdbcType=BIGINT},
delete_Flag = #{record.deleteFlag,jdbcType=VARCHAR} delete_flag = #{record.deleteFlag,jdbcType=VARCHAR}
<if test="_parameter != null"> <if test="_parameter != null">
<include refid="Update_By_Example_Where_Clause" /> <include refid="Update_By_Example_Where_Clause" />
</if> </if>
</update> </update>
<update id="updateByPrimaryKeySelective" parameterType="com.jsh.erp.datasource.entities.Role"> <update id="updateByPrimaryKeySelective" parameterType="com.jsh.erp.datasource.entities.Role">
<!--
WARNING - @mbggenerated
This element is automatically generated by MyBatis Generator, do not modify.
-->
update jsh_role update jsh_role
<set> <set>
<if test="name != null"> <if test="name != null">
Name = #{name,jdbcType=VARCHAR}, name = #{name,jdbcType=VARCHAR},
</if> </if>
<if test="type != null"> <if test="type != null">
type = #{type,jdbcType=VARCHAR}, type = #{type,jdbcType=VARCHAR},
@@ -281,23 +225,19 @@
tenant_id = #{tenantId,jdbcType=BIGINT}, tenant_id = #{tenantId,jdbcType=BIGINT},
</if> </if>
<if test="deleteFlag != null"> <if test="deleteFlag != null">
delete_Flag = #{deleteFlag,jdbcType=VARCHAR}, delete_flag = #{deleteFlag,jdbcType=VARCHAR},
</if> </if>
</set> </set>
where Id = #{id,jdbcType=BIGINT} where id = #{id,jdbcType=BIGINT}
</update> </update>
<update id="updateByPrimaryKey" parameterType="com.jsh.erp.datasource.entities.Role"> <update id="updateByPrimaryKey" parameterType="com.jsh.erp.datasource.entities.Role">
<!--
WARNING - @mbggenerated
This element is automatically generated by MyBatis Generator, do not modify.
-->
update jsh_role update jsh_role
set Name = #{name,jdbcType=VARCHAR}, set name = #{name,jdbcType=VARCHAR},
type = #{type,jdbcType=VARCHAR}, type = #{type,jdbcType=VARCHAR},
value = #{value,jdbcType=VARCHAR}, value = #{value,jdbcType=VARCHAR},
description = #{description,jdbcType=VARCHAR}, description = #{description,jdbcType=VARCHAR},
tenant_id = #{tenantId,jdbcType=BIGINT}, tenant_id = #{tenantId,jdbcType=BIGINT},
delete_Flag = #{deleteFlag,jdbcType=VARCHAR} delete_flag = #{deleteFlag,jdbcType=VARCHAR}
where Id = #{id,jdbcType=BIGINT} where id = #{id,jdbcType=BIGINT}
</update> </update>
</mapper> </mapper>

6
src/main/resources/mapper_xml/RoleMapperEx.xml
View File

@@ -5,7 +5,7 @@
SELECT * SELECT *
FROM jsh_role FROM jsh_role
WHERE 1=1 WHERE 1=1
and ifnull(delete_Flag,'0') !='1' and ifnull(delete_flag,'0') !='1'
<if test="name != null"> <if test="name != null">
and name like '%${name}%' and name like '%${name}%'
</if> </if>
@@ -18,14 +18,14 @@
COUNT(id) COUNT(id)
FROM jsh_role FROM jsh_role
WHERE 1=1 WHERE 1=1
and ifnull(delete_Flag,'0') !='1' and ifnull(delete_flag,'0') !='1'
<if test="name != null"> <if test="name != null">
and name like '%${name}%' and name like '%${name}%'
</if> </if>
</select> </select>
<update id="batchDeleteRoleByIds"> <update id="batchDeleteRoleByIds">
update jsh_role update jsh_role
set delete_Flag='1' set delete_flag='1'
where 1=1 where 1=1
and id in ( and id in (
<foreach collection="ids" item="id" separator=","> <foreach collection="ids" item="id" separator=",">

170
src/main/resources/mapper_xml/SerialNumberMapper.xml
View File

@@ -2,28 +2,20 @@
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.jsh.erp.datasource.mappers.SerialNumberMapper"> <mapper namespace="com.jsh.erp.datasource.mappers.SerialNumberMapper">
<resultMap id="BaseResultMap" type="com.jsh.erp.datasource.entities.SerialNumber"> <resultMap id="BaseResultMap" type="com.jsh.erp.datasource.entities.SerialNumber">
<!--
WARNING - @mbggenerated
This element is automatically generated by MyBatis Generator, do not modify.
-->
<id column="id" jdbcType="BIGINT" property="id" /> <id column="id" jdbcType="BIGINT" property="id" />
<result column="material_Id" jdbcType="BIGINT" property="materialId" /> <result column="material_id" jdbcType="BIGINT" property="materialId" />
<result column="serial_Number" jdbcType="VARCHAR" property="serialNumber" /> <result column="serial_number" jdbcType="VARCHAR" property="serialNumber" />
<result column="is_Sell" jdbcType="VARCHAR" property="isSell" /> <result column="is_sell" jdbcType="VARCHAR" property="isSell" />
<result column="remark" jdbcType="VARCHAR" property="remark" /> <result column="remark" jdbcType="VARCHAR" property="remark" />
<result column="delete_Flag" jdbcType="VARCHAR" property="deleteFlag" /> <result column="delete_flag" jdbcType="VARCHAR" property="deleteFlag" />
<result column="create_Time" jdbcType="TIMESTAMP" property="createTime" /> <result column="create_time" jdbcType="TIMESTAMP" property="createTime" />
<result column="creator" jdbcType="BIGINT" property="creator" /> <result column="creator" jdbcType="BIGINT" property="creator" />
<result column="update_Time" jdbcType="TIMESTAMP" property="updateTime" /> <result column="update_time" jdbcType="TIMESTAMP" property="updateTime" />
<result column="updater" jdbcType="BIGINT" property="updater" /> <result column="updater" jdbcType="BIGINT" property="updater" />
<result column="depothead_Id" jdbcType="BIGINT" property="depotheadId" /> <result column="depot_head_id" jdbcType="BIGINT" property="depotHeadId" />
<result column="tenant_id" jdbcType="BIGINT" property="tenantId" /> <result column="tenant_id" jdbcType="BIGINT" property="tenantId" />
</resultMap> </resultMap>
<sql id="Example_Where_Clause"> <sql id="Example_Where_Clause">
<!--
WARNING - @mbggenerated
This element is automatically generated by MyBatis Generator, do not modify.
-->
<where> <where>
<foreach collection="oredCriteria" item="criteria" separator="or"> <foreach collection="oredCriteria" item="criteria" separator="or">
<if test="criteria.valid"> <if test="criteria.valid">
@@ -53,10 +45,6 @@
</where> </where>
</sql> </sql>
<sql id="Update_By_Example_Where_Clause"> <sql id="Update_By_Example_Where_Clause">
<!--
WARNING - @mbggenerated
This element is automatically generated by MyBatis Generator, do not modify.
-->
<where> <where>
<foreach collection="example.oredCriteria" item="criteria" separator="or"> <foreach collection="example.oredCriteria" item="criteria" separator="or">
<if test="criteria.valid"> <if test="criteria.valid">
@@ -86,18 +74,10 @@
</where> </where>
</sql> </sql>
<sql id="Base_Column_List"> <sql id="Base_Column_List">
<!-- id, material_id, serial_number, is_sell, remark, delete_flag, create_time, creator,
WARNING - @mbggenerated update_time, updater, depot_head_id, tenant_id
This element is automatically generated by MyBatis Generator, do not modify.
-->
id, material_Id, serial_Number, is_Sell, remark, delete_Flag, create_Time, creator,
update_Time, updater, depothead_Id, tenant_id
</sql> </sql>
<select id="selectByExample" parameterType="com.jsh.erp.datasource.entities.SerialNumberExample" resultMap="BaseResultMap"> <select id="selectByExample" parameterType="com.jsh.erp.datasource.entities.SerialNumberExample" resultMap="BaseResultMap">
<!--
WARNING - @mbggenerated
This element is automatically generated by MyBatis Generator, do not modify.
-->
select select
<if test="distinct"> <if test="distinct">
distinct distinct
@@ -112,88 +92,68 @@
</if> </if>
</select> </select>
<select id="selectByPrimaryKey" parameterType="java.lang.Long" resultMap="BaseResultMap"> <select id="selectByPrimaryKey" parameterType="java.lang.Long" resultMap="BaseResultMap">
<!--
WARNING - @mbggenerated
This element is automatically generated by MyBatis Generator, do not modify.
-->
select select
<include refid="Base_Column_List" /> <include refid="Base_Column_List" />
from jsh_serial_number from jsh_serial_number
where id = #{id,jdbcType=BIGINT} where id = #{id,jdbcType=BIGINT}
</select> </select>
<delete id="deleteByPrimaryKey" parameterType="java.lang.Long"> <delete id="deleteByPrimaryKey" parameterType="java.lang.Long">
<!--
WARNING - @mbggenerated
This element is automatically generated by MyBatis Generator, do not modify.
-->
delete from jsh_serial_number delete from jsh_serial_number
where id = #{id,jdbcType=BIGINT} where id = #{id,jdbcType=BIGINT}
</delete> </delete>
<delete id="deleteByExample" parameterType="com.jsh.erp.datasource.entities.SerialNumberExample"> <delete id="deleteByExample" parameterType="com.jsh.erp.datasource.entities.SerialNumberExample">
<!--
WARNING - @mbggenerated
This element is automatically generated by MyBatis Generator, do not modify.
-->
delete from jsh_serial_number delete from jsh_serial_number
<if test="_parameter != null"> <if test="_parameter != null">
<include refid="Example_Where_Clause" /> <include refid="Example_Where_Clause" />
</if> </if>
</delete> </delete>
<insert id="insert" parameterType="com.jsh.erp.datasource.entities.SerialNumber"> <insert id="insert" parameterType="com.jsh.erp.datasource.entities.SerialNumber">
<!-- insert into jsh_serial_number (id, material_id, serial_number,
WARNING - @mbggenerated is_sell, remark, delete_flag,
This element is automatically generated by MyBatis Generator, do not modify. create_time, creator, update_time,
--> updater, depot_head_id, tenant_id
insert into jsh_serial_number (id, material_Id, serial_Number,
is_Sell, remark, delete_Flag,
create_Time, creator, update_Time,
updater, depothead_Id, tenant_id
) )
values (#{id,jdbcType=BIGINT}, #{materialId,jdbcType=BIGINT}, #{serialNumber,jdbcType=VARCHAR}, values (#{id,jdbcType=BIGINT}, #{materialId,jdbcType=BIGINT}, #{serialNumber,jdbcType=VARCHAR},
#{isSell,jdbcType=VARCHAR}, #{remark,jdbcType=VARCHAR}, #{deleteFlag,jdbcType=VARCHAR}, #{isSell,jdbcType=VARCHAR}, #{remark,jdbcType=VARCHAR}, #{deleteFlag,jdbcType=VARCHAR},
#{createTime,jdbcType=TIMESTAMP}, #{creator,jdbcType=BIGINT}, #{updateTime,jdbcType=TIMESTAMP}, #{createTime,jdbcType=TIMESTAMP}, #{creator,jdbcType=BIGINT}, #{updateTime,jdbcType=TIMESTAMP},
#{updater,jdbcType=BIGINT}, #{depotheadId,jdbcType=BIGINT}, #{tenantId,jdbcType=BIGINT} #{updater,jdbcType=BIGINT}, #{depotHeadId,jdbcType=BIGINT}, #{tenantId,jdbcType=BIGINT}
) )
</insert> </insert>
<insert id="insertSelective" parameterType="com.jsh.erp.datasource.entities.SerialNumber"> <insert id="insertSelective" parameterType="com.jsh.erp.datasource.entities.SerialNumber">
<!--
WARNING - @mbggenerated
This element is automatically generated by MyBatis Generator, do not modify.
-->
insert into jsh_serial_number insert into jsh_serial_number
<trim prefix="(" suffix=")" suffixOverrides=","> <trim prefix="(" suffix=")" suffixOverrides=",">
<if test="id != null"> <if test="id != null">
id, id,
</if> </if>
<if test="materialId != null"> <if test="materialId != null">
material_Id, material_id,
</if> </if>
<if test="serialNumber != null"> <if test="serialNumber != null">
serial_Number, serial_number,
</if> </if>
<if test="isSell != null"> <if test="isSell != null">
is_Sell, is_sell,
</if> </if>
<if test="remark != null"> <if test="remark != null">
remark, remark,
</if> </if>
<if test="deleteFlag != null"> <if test="deleteFlag != null">
delete_Flag, delete_flag,
</if> </if>
<if test="createTime != null"> <if test="createTime != null">
create_Time, create_time,
</if> </if>
<if test="creator != null"> <if test="creator != null">
creator, creator,
</if> </if>
<if test="updateTime != null"> <if test="updateTime != null">
update_Time, update_time,
</if> </if>
<if test="updater != null"> <if test="updater != null">
updater, updater,
</if> </if>
<if test="depotheadId != null"> <if test="depotHeadId != null">
depothead_Id, depot_head_id,
</if> </if>
<if test="tenantId != null"> <if test="tenantId != null">
tenant_id, tenant_id,
@@ -230,63 +190,55 @@
<if test="updater != null"> <if test="updater != null">
#{updater,jdbcType=BIGINT}, #{updater,jdbcType=BIGINT},
</if> </if>
<if test="depotheadId != null"> <if test="depotHeadId != null">
#{depotheadId,jdbcType=BIGINT}, #{depotHeadId,jdbcType=BIGINT},
</if> </if>
<if test="tenantId != null"> <if test="tenantId != null">
#{tenantId,jdbcType=BIGINT}, #{tenantId,jdbcType=BIGINT},
</if> </if>
</trim> </trim>
</insert> </insert>
<select id="countByExample" parameterType="com.jsh.erp.datasource.entities.SerialNumberExample" resultType="java.lang.Integer"> <select id="countByExample" parameterType="com.jsh.erp.datasource.entities.SerialNumberExample" resultType="java.lang.Long">
<!--
WARNING - @mbggenerated
This element is automatically generated by MyBatis Generator, do not modify.
-->
select count(*) from jsh_serial_number select count(*) from jsh_serial_number
<if test="_parameter != null"> <if test="_parameter != null">
<include refid="Example_Where_Clause" /> <include refid="Example_Where_Clause" />
</if> </if>
</select> </select>
<update id="updateByExampleSelective" parameterType="map"> <update id="updateByExampleSelective" parameterType="map">
<!--
WARNING - @mbggenerated
This element is automatically generated by MyBatis Generator, do not modify.
-->
update jsh_serial_number update jsh_serial_number
<set> <set>
<if test="record.id != null"> <if test="record.id != null">
id = #{record.id,jdbcType=BIGINT}, id = #{record.id,jdbcType=BIGINT},
</if> </if>
<if test="record.materialId != null"> <if test="record.materialId != null">
material_Id = #{record.materialId,jdbcType=BIGINT}, material_id = #{record.materialId,jdbcType=BIGINT},
</if> </if>
<if test="record.serialNumber != null"> <if test="record.serialNumber != null">
serial_Number = #{record.serialNumber,jdbcType=VARCHAR}, serial_number = #{record.serialNumber,jdbcType=VARCHAR},
</if> </if>
<if test="record.isSell != null"> <if test="record.isSell != null">
is_Sell = #{record.isSell,jdbcType=VARCHAR}, is_sell = #{record.isSell,jdbcType=VARCHAR},
</if> </if>
<if test="record.remark != null"> <if test="record.remark != null">
remark = #{record.remark,jdbcType=VARCHAR}, remark = #{record.remark,jdbcType=VARCHAR},
</if> </if>
<if test="record.deleteFlag != null"> <if test="record.deleteFlag != null">
delete_Flag = #{record.deleteFlag,jdbcType=VARCHAR}, delete_flag = #{record.deleteFlag,jdbcType=VARCHAR},
</if> </if>
<if test="record.createTime != null"> <if test="record.createTime != null">
create_Time = #{record.createTime,jdbcType=TIMESTAMP}, create_time = #{record.createTime,jdbcType=TIMESTAMP},
</if> </if>
<if test="record.creator != null"> <if test="record.creator != null">
creator = #{record.creator,jdbcType=BIGINT}, creator = #{record.creator,jdbcType=BIGINT},
</if> </if>
<if test="record.updateTime != null"> <if test="record.updateTime != null">
update_Time = #{record.updateTime,jdbcType=TIMESTAMP}, update_time = #{record.updateTime,jdbcType=TIMESTAMP},
</if> </if>
<if test="record.updater != null"> <if test="record.updater != null">
updater = #{record.updater,jdbcType=BIGINT}, updater = #{record.updater,jdbcType=BIGINT},
</if> </if>
<if test="record.depotheadId != null"> <if test="record.depotHeadId != null">
depothead_Id = #{record.depotheadId,jdbcType=BIGINT}, depot_head_id = #{record.depotHeadId,jdbcType=BIGINT},
</if> </if>
<if test="record.tenantId != null"> <if test="record.tenantId != null">
tenant_id = #{record.tenantId,jdbcType=BIGINT}, tenant_id = #{record.tenantId,jdbcType=BIGINT},
@@ -297,63 +249,55 @@
</if> </if>
</update> </update>
<update id="updateByExample" parameterType="map"> <update id="updateByExample" parameterType="map">
<!--
WARNING - @mbggenerated
This element is automatically generated by MyBatis Generator, do not modify.
-->
update jsh_serial_number update jsh_serial_number
set id = #{record.id,jdbcType=BIGINT}, set id = #{record.id,jdbcType=BIGINT},
material_Id = #{record.materialId,jdbcType=BIGINT}, material_id = #{record.materialId,jdbcType=BIGINT},
serial_Number = #{record.serialNumber,jdbcType=VARCHAR}, serial_number = #{record.serialNumber,jdbcType=VARCHAR},
is_Sell = #{record.isSell,jdbcType=VARCHAR}, is_sell = #{record.isSell,jdbcType=VARCHAR},
remark = #{record.remark,jdbcType=VARCHAR}, remark = #{record.remark,jdbcType=VARCHAR},
delete_Flag = #{record.deleteFlag,jdbcType=VARCHAR}, delete_flag = #{record.deleteFlag,jdbcType=VARCHAR},
create_Time = #{record.createTime,jdbcType=TIMESTAMP}, create_time = #{record.createTime,jdbcType=TIMESTAMP},
creator = #{record.creator,jdbcType=BIGINT}, creator = #{record.creator,jdbcType=BIGINT},
update_Time = #{record.updateTime,jdbcType=TIMESTAMP}, update_time = #{record.updateTime,jdbcType=TIMESTAMP},
updater = #{record.updater,jdbcType=BIGINT}, updater = #{record.updater,jdbcType=BIGINT},
depothead_Id = #{record.depotheadId,jdbcType=BIGINT}, depot_head_id = #{record.depotHeadId,jdbcType=BIGINT},
tenant_id = #{record.tenantId,jdbcType=BIGINT} tenant_id = #{record.tenantId,jdbcType=BIGINT}
<if test="_parameter != null"> <if test="_parameter != null">
<include refid="Update_By_Example_Where_Clause" /> <include refid="Update_By_Example_Where_Clause" />
</if> </if>
</update> </update>
<update id="updateByPrimaryKeySelective" parameterType="com.jsh.erp.datasource.entities.SerialNumber"> <update id="updateByPrimaryKeySelective" parameterType="com.jsh.erp.datasource.entities.SerialNumber">
<!--
WARNING - @mbggenerated
This element is automatically generated by MyBatis Generator, do not modify.
-->
update jsh_serial_number update jsh_serial_number
<set> <set>
<if test="materialId != null"> <if test="materialId != null">
material_Id = #{materialId,jdbcType=BIGINT}, material_id = #{materialId,jdbcType=BIGINT},
</if> </if>
<if test="serialNumber != null"> <if test="serialNumber != null">
serial_Number = #{serialNumber,jdbcType=VARCHAR}, serial_number = #{serialNumber,jdbcType=VARCHAR},
</if> </if>
<if test="isSell != null"> <if test="isSell != null">
is_Sell = #{isSell,jdbcType=VARCHAR}, is_sell = #{isSell,jdbcType=VARCHAR},
</if> </if>
<if test="remark != null"> <if test="remark != null">
remark = #{remark,jdbcType=VARCHAR}, remark = #{remark,jdbcType=VARCHAR},
</if> </if>
<if test="deleteFlag != null"> <if test="deleteFlag != null">
delete_Flag = #{deleteFlag,jdbcType=VARCHAR}, delete_flag = #{deleteFlag,jdbcType=VARCHAR},
</if> </if>
<if test="createTime != null"> <if test="createTime != null">
create_Time = #{createTime,jdbcType=TIMESTAMP}, create_time = #{createTime,jdbcType=TIMESTAMP},
</if> </if>
<if test="creator != null"> <if test="creator != null">
creator = #{creator,jdbcType=BIGINT}, creator = #{creator,jdbcType=BIGINT},
</if> </if>
<if test="updateTime != null"> <if test="updateTime != null">
update_Time = #{updateTime,jdbcType=TIMESTAMP}, update_time = #{updateTime,jdbcType=TIMESTAMP},
</if> </if>
<if test="updater != null"> <if test="updater != null">
updater = #{updater,jdbcType=BIGINT}, updater = #{updater,jdbcType=BIGINT},
</if> </if>
<if test="depotheadId != null"> <if test="depotHeadId != null">
depothead_Id = #{depotheadId,jdbcType=BIGINT}, depot_head_id = #{depotHeadId,jdbcType=BIGINT},
</if> </if>
<if test="tenantId != null"> <if test="tenantId != null">
tenant_id = #{tenantId,jdbcType=BIGINT}, tenant_id = #{tenantId,jdbcType=BIGINT},
@@ -362,21 +306,17 @@
where id = #{id,jdbcType=BIGINT} where id = #{id,jdbcType=BIGINT}
</update> </update>
<update id="updateByPrimaryKey" parameterType="com.jsh.erp.datasource.entities.SerialNumber"> <update id="updateByPrimaryKey" parameterType="com.jsh.erp.datasource.entities.SerialNumber">
<!--
WARNING - @mbggenerated
This element is automatically generated by MyBatis Generator, do not modify.
-->
update jsh_serial_number update jsh_serial_number
set material_Id = #{materialId,jdbcType=BIGINT}, set material_id = #{materialId,jdbcType=BIGINT},
serial_Number = #{serialNumber,jdbcType=VARCHAR}, serial_number = #{serialNumber,jdbcType=VARCHAR},
is_Sell = #{isSell,jdbcType=VARCHAR}, is_sell = #{isSell,jdbcType=VARCHAR},
remark = #{remark,jdbcType=VARCHAR}, remark = #{remark,jdbcType=VARCHAR},
delete_Flag = #{deleteFlag,jdbcType=VARCHAR}, delete_flag = #{deleteFlag,jdbcType=VARCHAR},
create_Time = #{createTime,jdbcType=TIMESTAMP}, create_time = #{createTime,jdbcType=TIMESTAMP},
creator = #{creator,jdbcType=BIGINT}, creator = #{creator,jdbcType=BIGINT},
update_Time = #{updateTime,jdbcType=TIMESTAMP}, update_time = #{updateTime,jdbcType=TIMESTAMP},
updater = #{updater,jdbcType=BIGINT}, updater = #{updater,jdbcType=BIGINT},
depothead_Id = #{depotheadId,jdbcType=BIGINT}, depot_head_id = #{depotHeadId,jdbcType=BIGINT},
tenant_id = #{tenantId,jdbcType=BIGINT} tenant_id = #{tenantId,jdbcType=BIGINT}
where id = #{id,jdbcType=BIGINT} where id = #{id,jdbcType=BIGINT}
</update> </update>

114
src/main/resources/mapper_xml/SerialNumberMapperEx.xml
View File

@@ -11,22 +11,22 @@
</resultMap> </resultMap>
<select id="selectByConditionSerialNumber" resultMap="SerialNumberExBaseResultMap"> <select id="selectByConditionSerialNumber" resultMap="SerialNumberExBaseResultMap">
select select
ser.id, ser.material_Id, ser.serial_Number, ser.is_Sell, ser.remark, ser.delete_Flag, ser.create_Time, ser.id, ser.material_id, ser.serial_number, ser.is_sell, ser.remark, ser.delete_flag, ser.create_time,
ser.update_Time,mat.name as materialName,null as creator,null as updater,null as creatorName, ser.update_time,mat.name as materialName,null as creator,null as updater,null as creatorName,
null as updaterName,ser.depothead_Id, dh.number as depotHeadNumber,concat(dh.SubType,dh.Type) as depotHeadType null as updaterName,ser.depot_head_id, dh.number as depotHeadNumber,concat(dh.SubType,dh.Type) as depotHeadType
FROM jsh_serial_number ser FROM jsh_serial_number ser
left join jsh_material mat on mat.id = ser.material_Id and ifnull(mat.delete_Flag,'0') !='1' left join jsh_material mat on mat.id = ser.material_Id and ifnull(mat.delete_Flag,'0') !='1'
left join jsh_depothead dh on dh.id= ser.depothead_Id and ifnull(dh.delete_Flag,'0') !='1' left join jsh_depothead dh on dh.id= ser.depot_head_id and ifnull(dh.delete_Flag,'0') !='1'
where 1=1 where 1=1
<if test="serialNumber != null"> <if test="serialNumber != null">
<bind name="serialNumber" value="'%' + _parameter.serialNumber + '%'" /> <bind name="serialNumber" value="'%' + _parameter.serialNumber + '%'" />
and ser.serial_Number like #{serialNumber} and ser.serial_number like #{serialNumber}
</if> </if>
<if test="materialName != null"> <if test="materialName != null">
<bind name="materialName" value="'%' + _parameter.materialName + '%'" /> <bind name="materialName" value="'%' + _parameter.materialName + '%'" />
and mat.name like #{materialName} and mat.name like #{materialName}
</if> </if>
and ifnull(ser.delete_Flag,'0') !='1' and ifnull(ser.delete_flag,'0') !='1'
order by ser.id desc order by ser.id desc
<if test="offset != null and rows != null"> <if test="offset != null and rows != null">
limit #{offset},#{rows} limit #{offset},#{rows}
@@ -36,7 +36,7 @@
SELECT SELECT
COUNT(ser.id) COUNT(ser.id)
FROM jsh_serial_number ser FROM jsh_serial_number ser
left JOIN jsh_material mat on mat.id = ser.material_Id and ifnull(mat.delete_Flag,'0') !='1' left JOIN jsh_material mat on mat.id = ser.material_Id and ifnull(mat.delete_flag,'0') !='1'
where 1=1 where 1=1
<if test="serialNumber != null"> <if test="serialNumber != null">
<bind name="serialNumber" value="'%' + _parameter.serialNumber + '%'" /> <bind name="serialNumber" value="'%' + _parameter.serialNumber + '%'" />
@@ -46,71 +46,71 @@
<bind name="materialName" value="'%' + _parameter.materialName + '%'" /> <bind name="materialName" value="'%' + _parameter.materialName + '%'" />
and mat.name like #{materialName} and mat.name like #{materialName}
</if> </if>
and ifnull(ser.delete_Flag,'0') !='1' and ifnull(ser.delete_flag,'0') !='1'
order by ser.id desc order by ser.id desc
</select> </select>
<select id="findById" resultMap="SerialNumberExBaseResultMap"> <select id="findById" resultMap="SerialNumberExBaseResultMap">
SELECT SELECT
ser.id, ser.material_Id, ser.serial_Number, ser.is_Sell, ser.remark, ser.delete_Flag, ser.create_Time, ser.id, ser.material_id, ser.serial_number, ser.is_sell, ser.remark, ser.delete_flag, ser.create_time,
ser.update_Time,ser.creator,ser.updater,mat.name as materialName,cr.username as creatorName, ser.update_time,ser.creator,ser.updater,mat.name as materialName,cr.username as creatorName,
ur.username as updaterName,ser.depothead_Id ur.username as updaterName,ser.depot_head_id
FROM jsh_serial_number ser FROM jsh_serial_number ser
left JOIN jsh_material mat on mat.id = ser.material_Id and ifnull(mat.delete_Flag,'0') !='1' left JOIN jsh_material mat on mat.id = ser.material_Id and ifnull(mat.delete_Flag,'0') !='1'
left join jsh_user cr on ser.creator=cr.id and ifnull(cr.status,'0') not in('1','2') left join jsh_user cr on ser.creator=cr.id and ifnull(cr.status,'0') not in('1','2')
left join jsh_user ur on ser.updater=ur.id and ifnull(ur.status,'0') not in('1','2') left join jsh_user ur on ser.updater=ur.id and ifnull(ur.status,'0') not in('1','2')
where 1=1 where 1=1
and ser.id=#{id} and ser.id=#{id}
and ifnull(ser.delete_Flag,'0') !='1' and ifnull(ser.delete_flag,'0') !='1'
order by ser.id desc order by ser.id desc
</select> </select>
<select id="findBySerialNumber" resultMap="SerialNumberExBaseResultMap"> <select id="findBySerialNumber" resultMap="SerialNumberExBaseResultMap">
SELECT SELECT
ser.id, ser.material_Id, ser.serial_Number, ser.is_Sell, ser.remark, ser.delete_Flag, ser.create_Time, ser.id, ser.material_id, ser.serial_number, ser.is_sell, ser.remark, ser.delete_flag, ser.create_time,
ser.update_Time,ser.creator,ser.updater,ser.depothead_Id ser.update_time,ser.creator,ser.updater,ser.depot_head_id
FROM jsh_serial_number ser FROM jsh_serial_number ser
where 1=1 where 1=1
<if test="serialNumber != null"> <if test="serialNumber != null">
and ser.serial_Number=#{serialNumber} and ser.serial_number=#{serialNumber}
</if> </if>
and ifnull(ser.delete_Flag,'0') !='1' and ifnull(ser.delete_flag,'0') !='1'
order by ser.id desc order by ser.id desc
</select> </select>
<insert id="addSerialNumber" parameterType="com.jsh.erp.datasource.entities.SerialNumberEx" <insert id="addSerialNumber" parameterType="com.jsh.erp.datasource.entities.SerialNumberEx"
useGeneratedKeys="true" keyProperty="id" keyColumn="id"> useGeneratedKeys="true" keyProperty="id" keyColumn="id">
insert into jsh_serial_number insert into jsh_serial_number
(material_Id, serial_Number, is_Sell, remark,delete_Flag, (material_id, serial_number, is_sell, remark,delete_flag,
create_Time, creator,update_Time, updater,depothead_Id) create_time, creator,update_time, updater,depot_head_id)
values values
(#{materialId},#{serialNumber},#{isSell},#{remark},#{deleteFlag}, (#{materialId},#{serialNumber},#{isSell},#{remark},#{deleteFlag},
#{createTime},#{creator},#{updateTime},#{updater},#{depotheadId} #{createTime},#{creator},#{updateTime},#{updater},#{depotHeadId}
) )
</insert> </insert>
<update id="updateSerialNumber" parameterType="com.jsh.erp.datasource.entities.SerialNumberEx"> <update id="updateSerialNumber" parameterType="com.jsh.erp.datasource.entities.SerialNumberEx">
update jsh_serial_number update jsh_serial_number
<set> <set>
<if test="materialId != null"> <if test="materialId != null">
material_Id = #{materialId,jdbcType=BIGINT}, material_id = #{materialId,jdbcType=BIGINT},
</if> </if>
<if test="serialNumber != null"> <if test="serialNumber != null">
serial_Number = #{serialNumber,jdbcType=VARCHAR}, serial_number = #{serialNumber,jdbcType=VARCHAR},
</if> </if>
<if test="isSell != null"> <if test="isSell != null">
is_Sell = #{isSell,jdbcType=VARCHAR}, is_sell = #{isSell,jdbcType=VARCHAR},
</if> </if>
<if test="remark != null"> <if test="remark != null">
remark = #{remark,jdbcType=VARCHAR}, remark = #{remark,jdbcType=VARCHAR},
</if> </if>
<if test="deleteFlag != null"> <if test="deleteFlag != null">
delete_Flag = #{deleteFlag,jdbcType=VARCHAR}, delete_flag = #{deleteFlag,jdbcType=VARCHAR},
</if> </if>
<if test="updateTime != null"> <if test="updateTime != null">
update_Time = #{updateTime,jdbcType=TIMESTAMP}, update_time = #{updateTime,jdbcType=TIMESTAMP},
</if> </if>
<if test="updater != null"> <if test="updater != null">
updater = #{updater,jdbcType=BIGINT}, updater = #{updater,jdbcType=BIGINT},
</if> </if>
<if test="depotheadId != null"> <if test="depotHeadId != null">
depothead_Id = #{depotheadId,jdbcType=BIGINT}, depot_head_id = #{depotHeadId,jdbcType=BIGINT},
</if> </if>
</set> </set>
where id = #{id,jdbcType=BIGINT} where id = #{id,jdbcType=BIGINT}
@@ -124,8 +124,8 @@
<if test="materialId != null"> <if test="materialId != null">
and ser.material_Id=#{materialId} and ser.material_Id=#{materialId}
</if> </if>
and ifnull(ser.delete_Flag,'0') !='1' and ifnull(ser.delete_flag,'0') !='1'
and ser.is_Sell !='1' and ser.is_sell !='1'
</select> </select>
<select id="countSerialNumberByMaterialIdAndDepotheadId" resultType="java.lang.Integer"> <select id="countSerialNumberByMaterialIdAndDepotheadId" resultType="java.lang.Integer">
SELECT SELECT
@@ -133,23 +133,23 @@
FROM jsh_serial_number ser FROM jsh_serial_number ser
where 1=1 where 1=1
<if test="materialId != null"> <if test="materialId != null">
and ser.material_Id=#{materialId} and ser.material_id=#{materialId}
</if> </if>
<if test="depotheadId != null"> <if test="depotHeadId != null">
and ser.depothead_Id=#{depotheadId} and ser.depot_head_id=#{depotHeadId}
</if> </if>
and ser.is_Sell =#{isSell,jdbcType=VARCHAR} and ser.is_sell =#{isSell,jdbcType=VARCHAR}
and ifnull(ser.delete_Flag,'0') !='1' and ifnull(ser.delete_flag,'0') !='1'
</select> </select>
<update id="sellSerialNumber"> <update id="sellSerialNumber">
update jsh_serial_number update jsh_serial_number
<set> <set>
is_Sell = '1', is_sell = '1',
<if test="depotheadId !=null "> <if test="depotHeadId !=null ">
depothead_Id = #{depotheadId}, depot_head_id = #{depotHeadId},
</if> </if>
<if test="updateTime !=null "> <if test="updateTime !=null ">
update_Time = #{updateTime}, update_time = #{updateTime},
</if> </if>
<if test="updater != null"> <if test="updater != null">
updater = #{updater}, updater = #{updater},
@@ -157,10 +157,10 @@
</set> </set>
where 1=1 where 1=1
<if test="materialId != null"> <if test="materialId != null">
and material_Id = #{materialId} and material_id = #{materialId}
</if> </if>
and is_Sell != '1' and is_sell != '1'
and ifnull(delete_Flag,'0') !='1' and ifnull(delete_flag,'0') !='1'
<if test="count != null"> <if test="count != null">
and id in and id in
( select batchSN.id from ( select batchSN.id from
@@ -169,8 +169,8 @@
<if test="materialId != null"> <if test="materialId != null">
and selFrom.material_Id = #{materialId} and selFrom.material_Id = #{materialId}
</if> </if>
and selFrom.is_Sell != '1' and selFrom.is_sell != '1'
and ifnull(selFrom.delete_Flag,'0') !='1' and ifnull(selFrom.delete_flag,'0') !='1'
limit 0,#{count} limit 0,#{count}
) batchSN ) batchSN
) )
@@ -180,9 +180,9 @@
<update id="cancelSerialNumber"> <update id="cancelSerialNumber">
update jsh_serial_number update jsh_serial_number
<set> <set>
is_Sell = '0', is_sell = '0',
<if test="updateTime !=null "> <if test="updateTime !=null ">
update_Time = #{updateTime}, update_time = #{updateTime},
</if> </if>
<if test="updater != null"> <if test="updater != null">
updater = #{updater}, updater = #{updater},
@@ -190,26 +190,26 @@
</set> </set>
where 1=1 where 1=1
<if test="materialId != null"> <if test="materialId != null">
and material_Id = #{materialId} and material_id = #{materialId}
</if> </if>
<if test="depotheadId !=null "> <if test="depotHeadId !=null ">
and depothead_Id = #{depotheadId,jdbcType=BIGINT} and depot_head_id = #{depotHeadId,jdbcType=BIGINT}
</if> </if>
and is_Sell != '0' and is_sell != '0'
and ifnull(delete_Flag,'0') !='1' and ifnull(delete_flag,'0') !='1'
<if test="count != null"> <if test="count != null">
and id in and id in
( select batchSN.id from ( select batchSN.id from
( select selFrom.id from jsh_serial_number selFrom ( select selFrom.id from jsh_serial_number selFrom
where 1=1 where 1=1
<if test="materialId != null"> <if test="materialId != null">
and selFrom.material_Id = #{materialId} and selFrom.material_id = #{materialId}
</if> </if>
<if test="depotheadId !=null "> <if test="depotHeadId !=null ">
and selFrom.depothead_Id = #{depotheadId,jdbcType=BIGINT} and selFrom.depot_head_id = #{depotHeadId,jdbcType=BIGINT}
</if> </if>
and selFrom.is_Sell !='0' and selFrom.is_sell !='0'
and ifnull(selFrom.delete_Flag,'0') !='1' and ifnull(selFrom.delete_flag,'0') !='1'
limit 0,#{count} limit 0,#{count}
) batchSN ) batchSN
) )
@@ -218,8 +218,8 @@
<insert id="batAddSerialNumber" <insert id="batAddSerialNumber"
useGeneratedKeys="true" keyProperty="id" keyColumn="id"> useGeneratedKeys="true" keyProperty="id" keyColumn="id">
insert into jsh_serial_number insert into jsh_serial_number
(material_Id, serial_Number, is_Sell, remark,delete_Flag, (material_id, serial_number, is_sell, remark,delete_flag,
create_Time, creator,update_Time, updater) create_time, creator,update_time, updater)
values values
<foreach collection='list' item='each' separator=','> <foreach collection='list' item='each' separator=','>
(#{each.materialId},#{each.serialNumber},'0',#{each.remark},'0', (#{each.materialId},#{each.serialNumber},'0',#{each.remark},'0',
@@ -229,7 +229,7 @@
</insert> </insert>
<update id="batchDeleteSerialNumberByIds"> <update id="batchDeleteSerialNumberByIds">
update jsh_serial_number update jsh_serial_number
set update_Time=#{updateTime},updater=#{updater},delete_Flag='1' set update_time=#{updateTime},updater=#{updater},delete_flag='1'
where 1=1 where 1=1
and id in ( and id in (
<foreach collection="ids" item="id" separator=","> <foreach collection="ids" item="id" separator=",">

38
src/main/resources/mapper_xml/SystemConfigMapper.xml
View File

@@ -13,7 +13,7 @@
<result column="customer_flag" jdbcType="VARCHAR" property="customerFlag" /> <result column="customer_flag" jdbcType="VARCHAR" property="customerFlag" />
<result column="minus_stock_flag" jdbcType="VARCHAR" property="minusStockFlag" /> <result column="minus_stock_flag" jdbcType="VARCHAR" property="minusStockFlag" />
<result column="tenant_id" jdbcType="BIGINT" property="tenantId" /> <result column="tenant_id" jdbcType="BIGINT" property="tenantId" />
<result column="delete_Flag" jdbcType="VARCHAR" property="deleteFlag" /> <result column="delete_flag" jdbcType="VARCHAR" property="deleteFlag" />
</resultMap> </resultMap>
<sql id="Example_Where_Clause"> <sql id="Example_Where_Clause">
<where> <where>
@@ -75,7 +75,7 @@
</sql> </sql>
<sql id="Base_Column_List"> <sql id="Base_Column_List">
id, company_name, company_contacts, company_address, company_tel, company_fax, company_post_code, id, company_name, company_contacts, company_address, company_tel, company_fax, company_post_code,
depot_flag, customer_flag, minus_stock_flag, tenant_id, delete_Flag depot_flag, customer_flag, minus_stock_flag, tenant_id, delete_flag
</sql> </sql>
<select id="selectByExample" parameterType="com.jsh.erp.datasource.entities.SystemConfigExample" resultMap="BaseResultMap"> <select id="selectByExample" parameterType="com.jsh.erp.datasource.entities.SystemConfigExample" resultMap="BaseResultMap">
select select
@@ -83,7 +83,7 @@
distinct distinct
</if> </if>
<include refid="Base_Column_List" /> <include refid="Base_Column_List" />
from jsh_systemconfig from jsh_system_config
<if test="_parameter != null"> <if test="_parameter != null">
<include refid="Example_Where_Clause" /> <include refid="Example_Where_Clause" />
</if> </if>
@@ -94,24 +94,24 @@
<select id="selectByPrimaryKey" parameterType="java.lang.Long" resultMap="BaseResultMap"> <select id="selectByPrimaryKey" parameterType="java.lang.Long" resultMap="BaseResultMap">
select select
<include refid="Base_Column_List" /> <include refid="Base_Column_List" />
from jsh_systemconfig from jsh_system_config
where id = #{id,jdbcType=BIGINT} where id = #{id,jdbcType=BIGINT}
</select> </select>
<delete id="deleteByPrimaryKey" parameterType="java.lang.Long"> <delete id="deleteByPrimaryKey" parameterType="java.lang.Long">
delete from jsh_systemconfig delete from jsh_system_config
where id = #{id,jdbcType=BIGINT} where id = #{id,jdbcType=BIGINT}
</delete> </delete>
<delete id="deleteByExample" parameterType="com.jsh.erp.datasource.entities.SystemConfigExample"> <delete id="deleteByExample" parameterType="com.jsh.erp.datasource.entities.SystemConfigExample">
delete from jsh_systemconfig delete from jsh_system_config
<if test="_parameter != null"> <if test="_parameter != null">
<include refid="Example_Where_Clause" /> <include refid="Example_Where_Clause" />
</if> </if>
</delete> </delete>
<insert id="insert" parameterType="com.jsh.erp.datasource.entities.SystemConfig"> <insert id="insert" parameterType="com.jsh.erp.datasource.entities.SystemConfig">
insert into jsh_systemconfig (id, company_name, company_contacts, insert into jsh_system_config (id, company_name, company_contacts,
company_address, company_tel, company_fax, company_address, company_tel, company_fax,
company_post_code, depot_flag, customer_flag, company_post_code, depot_flag, customer_flag,
minus_stock_flag, tenant_id, delete_Flag minus_stock_flag, tenant_id, delete_flag
) )
values (#{id,jdbcType=BIGINT}, #{companyName,jdbcType=VARCHAR}, #{companyContacts,jdbcType=VARCHAR}, values (#{id,jdbcType=BIGINT}, #{companyName,jdbcType=VARCHAR}, #{companyContacts,jdbcType=VARCHAR},
#{companyAddress,jdbcType=VARCHAR}, #{companyTel,jdbcType=VARCHAR}, #{companyFax,jdbcType=VARCHAR}, #{companyAddress,jdbcType=VARCHAR}, #{companyTel,jdbcType=VARCHAR}, #{companyFax,jdbcType=VARCHAR},
@@ -120,7 +120,7 @@
) )
</insert> </insert>
<insert id="insertSelective" parameterType="com.jsh.erp.datasource.entities.SystemConfig"> <insert id="insertSelective" parameterType="com.jsh.erp.datasource.entities.SystemConfig">
insert into jsh_systemconfig insert into jsh_system_config
<trim prefix="(" suffix=")" suffixOverrides=","> <trim prefix="(" suffix=")" suffixOverrides=",">
<if test="id != null"> <if test="id != null">
id, id,
@@ -156,7 +156,7 @@
tenant_id, tenant_id,
</if> </if>
<if test="deleteFlag != null"> <if test="deleteFlag != null">
delete_Flag, delete_flag,
</if> </if>
</trim> </trim>
<trim prefix="values (" suffix=")" suffixOverrides=","> <trim prefix="values (" suffix=")" suffixOverrides=",">
@@ -199,13 +199,13 @@
</trim> </trim>
</insert> </insert>
<select id="countByExample" parameterType="com.jsh.erp.datasource.entities.SystemConfigExample" resultType="java.lang.Long"> <select id="countByExample" parameterType="com.jsh.erp.datasource.entities.SystemConfigExample" resultType="java.lang.Long">
select count(*) from jsh_systemconfig select count(*) from jsh_system_config
<if test="_parameter != null"> <if test="_parameter != null">
<include refid="Example_Where_Clause" /> <include refid="Example_Where_Clause" />
</if> </if>
</select> </select>
<update id="updateByExampleSelective" parameterType="map"> <update id="updateByExampleSelective" parameterType="map">
update jsh_systemconfig update jsh_system_config
<set> <set>
<if test="record.id != null"> <if test="record.id != null">
id = #{record.id,jdbcType=BIGINT}, id = #{record.id,jdbcType=BIGINT},
@@ -241,7 +241,7 @@
tenant_id = #{record.tenantId,jdbcType=BIGINT}, tenant_id = #{record.tenantId,jdbcType=BIGINT},
</if> </if>
<if test="record.deleteFlag != null"> <if test="record.deleteFlag != null">
delete_Flag = #{record.deleteFlag,jdbcType=VARCHAR}, delete_flag = #{record.deleteFlag,jdbcType=VARCHAR},
</if> </if>
</set> </set>
<if test="_parameter != null"> <if test="_parameter != null">
@@ -249,7 +249,7 @@
</if> </if>
</update> </update>
<update id="updateByExample" parameterType="map"> <update id="updateByExample" parameterType="map">
update jsh_systemconfig update jsh_system_config
set id = #{record.id,jdbcType=BIGINT}, set id = #{record.id,jdbcType=BIGINT},
company_name = #{record.companyName,jdbcType=VARCHAR}, company_name = #{record.companyName,jdbcType=VARCHAR},
company_contacts = #{record.companyContacts,jdbcType=VARCHAR}, company_contacts = #{record.companyContacts,jdbcType=VARCHAR},
@@ -261,13 +261,13 @@
customer_flag = #{record.customerFlag,jdbcType=VARCHAR}, customer_flag = #{record.customerFlag,jdbcType=VARCHAR},
minus_stock_flag = #{record.minusStockFlag,jdbcType=VARCHAR}, minus_stock_flag = #{record.minusStockFlag,jdbcType=VARCHAR},
tenant_id = #{record.tenantId,jdbcType=BIGINT}, tenant_id = #{record.tenantId,jdbcType=BIGINT},
delete_Flag = #{record.deleteFlag,jdbcType=VARCHAR} delete_flag = #{record.deleteFlag,jdbcType=VARCHAR}
<if test="_parameter != null"> <if test="_parameter != null">
<include refid="Update_By_Example_Where_Clause" /> <include refid="Update_By_Example_Where_Clause" />
</if> </if>
</update> </update>
<update id="updateByPrimaryKeySelective" parameterType="com.jsh.erp.datasource.entities.SystemConfig"> <update id="updateByPrimaryKeySelective" parameterType="com.jsh.erp.datasource.entities.SystemConfig">
update jsh_systemconfig update jsh_system_config
<set> <set>
<if test="companyName != null"> <if test="companyName != null">
company_name = #{companyName,jdbcType=VARCHAR}, company_name = #{companyName,jdbcType=VARCHAR},
@@ -300,13 +300,13 @@
tenant_id = #{tenantId,jdbcType=BIGINT}, tenant_id = #{tenantId,jdbcType=BIGINT},
</if> </if>
<if test="deleteFlag != null"> <if test="deleteFlag != null">
delete_Flag = #{deleteFlag,jdbcType=VARCHAR}, delete_flag = #{deleteFlag,jdbcType=VARCHAR},
</if> </if>
</set> </set>
where id = #{id,jdbcType=BIGINT} where id = #{id,jdbcType=BIGINT}
</update> </update>
<update id="updateByPrimaryKey" parameterType="com.jsh.erp.datasource.entities.SystemConfig"> <update id="updateByPrimaryKey" parameterType="com.jsh.erp.datasource.entities.SystemConfig">
update jsh_systemconfig update jsh_system_config
set company_name = #{companyName,jdbcType=VARCHAR}, set company_name = #{companyName,jdbcType=VARCHAR},
company_contacts = #{companyContacts,jdbcType=VARCHAR}, company_contacts = #{companyContacts,jdbcType=VARCHAR},
company_address = #{companyAddress,jdbcType=VARCHAR}, company_address = #{companyAddress,jdbcType=VARCHAR},
@@ -317,7 +317,7 @@
customer_flag = #{customerFlag,jdbcType=VARCHAR}, customer_flag = #{customerFlag,jdbcType=VARCHAR},
minus_stock_flag = #{minusStockFlag,jdbcType=VARCHAR}, minus_stock_flag = #{minusStockFlag,jdbcType=VARCHAR},
tenant_id = #{tenantId,jdbcType=BIGINT}, tenant_id = #{tenantId,jdbcType=BIGINT},
delete_Flag = #{deleteFlag,jdbcType=VARCHAR} delete_flag = #{deleteFlag,jdbcType=VARCHAR}
where id = #{id,jdbcType=BIGINT} where id = #{id,jdbcType=BIGINT}
</update> </update>
</mapper> </mapper>

12
src/main/resources/mapper_xml/SystemConfigMapperEx.xml
View File

@@ -3,12 +3,12 @@
<mapper namespace="com.jsh.erp.datasource.mappers.SystemConfigMapperEx"> <mapper namespace="com.jsh.erp.datasource.mappers.SystemConfigMapperEx">
<select id="selectByConditionSystemConfig" parameterType="com.jsh.erp.datasource.entities.SystemConfigExample" resultMap="com.jsh.erp.datasource.mappers.SystemConfigMapper.BaseResultMap"> <select id="selectByConditionSystemConfig" parameterType="com.jsh.erp.datasource.entities.SystemConfigExample" resultMap="com.jsh.erp.datasource.mappers.SystemConfigMapper.BaseResultMap">
select * select *
FROM jsh_systemconfig FROM jsh_system_config
where 1=1 where 1=1
<if test="companyName != null"> <if test="companyName != null">
and company_name like '%${companyName}%' and company_name like '%${companyName}%'
</if> </if>
and ifnull(delete_Flag,'0') !='1' and ifnull(delete_flag,'0') !='1'
<if test="offset != null and rows != null"> <if test="offset != null and rows != null">
limit #{offset},#{rows} limit #{offset},#{rows}
</if> </if>
@@ -16,16 +16,16 @@
<select id="countsBySystemConfig" resultType="java.lang.Long"> <select id="countsBySystemConfig" resultType="java.lang.Long">
SELECT SELECT
COUNT(id) COUNT(id)
FROM jsh_systemconfig FROM jsh_system_config
WHERE 1=1 WHERE 1=1
<if test="companyName != null"> <if test="companyName != null">
and company_name like '%${companyName}%' and company_name like '%${companyName}%'
</if> </if>
and ifnull(delete_Flag,'0') !='1' and ifnull(delete_flag,'0') !='1'
</select> </select>
<update id="batchDeleteSystemConfigByIds"> <update id="batchDeleteSystemConfigByIds">
update jsh_systemconfig update jsh_system_config
set delete_Flag='1' set delete_flag='1'
where 1=1 where 1=1
and id in ( and id in (
<foreach collection="ids" item="id" separator=","> <foreach collection="ids" item="id" separator=",">

42
src/main/resources/mapper_xml/UnitMapper.xml
View File

@@ -3,12 +3,12 @@
<mapper namespace="com.jsh.erp.datasource.mappers.UnitMapper"> <mapper namespace="com.jsh.erp.datasource.mappers.UnitMapper">
<resultMap id="BaseResultMap" type="com.jsh.erp.datasource.entities.Unit"> <resultMap id="BaseResultMap" type="com.jsh.erp.datasource.entities.Unit">
<id column="id" jdbcType="BIGINT" property="id" /> <id column="id" jdbcType="BIGINT" property="id" />
<result column="UName" jdbcType="VARCHAR" property="uname" /> <result column="name" jdbcType="VARCHAR" property="name" />
<result column="basic_unit" jdbcType="VARCHAR" property="basicUnit" /> <result column="basic_unit" jdbcType="VARCHAR" property="basicUnit" />
<result column="other_unit" jdbcType="VARCHAR" property="otherUnit" /> <result column="other_unit" jdbcType="VARCHAR" property="otherUnit" />
<result column="ratio" jdbcType="INTEGER" property="ratio" /> <result column="ratio" jdbcType="INTEGER" property="ratio" />
<result column="tenant_id" jdbcType="BIGINT" property="tenantId" /> <result column="tenant_id" jdbcType="BIGINT" property="tenantId" />
<result column="delete_Flag" jdbcType="VARCHAR" property="deleteFlag" /> <result column="delete_flag" jdbcType="VARCHAR" property="deleteFlag" />
</resultMap> </resultMap>
<sql id="Example_Where_Clause"> <sql id="Example_Where_Clause">
<where> <where>
@@ -69,7 +69,7 @@
</where> </where>
</sql> </sql>
<sql id="Base_Column_List"> <sql id="Base_Column_List">
id, UName, basic_unit, other_unit, ratio, tenant_id, delete_Flag id, name, basic_unit, other_unit, ratio, tenant_id, delete_flag
</sql> </sql>
<select id="selectByExample" parameterType="com.jsh.erp.datasource.entities.UnitExample" resultMap="BaseResultMap"> <select id="selectByExample" parameterType="com.jsh.erp.datasource.entities.UnitExample" resultMap="BaseResultMap">
select select
@@ -102,10 +102,10 @@
</if> </if>
</delete> </delete>
<insert id="insert" parameterType="com.jsh.erp.datasource.entities.Unit"> <insert id="insert" parameterType="com.jsh.erp.datasource.entities.Unit">
insert into jsh_unit (id, UName, basic_unit, insert into jsh_unit (id, name, basic_unit,
other_unit, ratio, tenant_id, other_unit, ratio, tenant_id,
delete_Flag) delete_flag)
values (#{id,jdbcType=BIGINT}, #{uname,jdbcType=VARCHAR}, #{basicUnit,jdbcType=VARCHAR}, values (#{id,jdbcType=BIGINT}, #{name,jdbcType=VARCHAR}, #{basicUnit,jdbcType=VARCHAR},
#{otherUnit,jdbcType=VARCHAR}, #{ratio,jdbcType=INTEGER}, #{tenantId,jdbcType=BIGINT}, #{otherUnit,jdbcType=VARCHAR}, #{ratio,jdbcType=INTEGER}, #{tenantId,jdbcType=BIGINT},
#{deleteFlag,jdbcType=VARCHAR}) #{deleteFlag,jdbcType=VARCHAR})
</insert> </insert>
@@ -115,8 +115,8 @@
<if test="id != null"> <if test="id != null">
id, id,
</if> </if>
<if test="uname != null"> <if test="name != null">
UName, name,
</if> </if>
<if test="basicUnit != null"> <if test="basicUnit != null">
basic_unit, basic_unit,
@@ -131,15 +131,15 @@
tenant_id, tenant_id,
</if> </if>
<if test="deleteFlag != null"> <if test="deleteFlag != null">
delete_Flag, delete_flag,
</if> </if>
</trim> </trim>
<trim prefix="values (" suffix=")" suffixOverrides=","> <trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="id != null"> <if test="id != null">
#{id,jdbcType=BIGINT}, #{id,jdbcType=BIGINT},
</if> </if>
<if test="uname != null"> <if test="name != null">
#{uname,jdbcType=VARCHAR}, #{name,jdbcType=VARCHAR},
</if> </if>
<if test="basicUnit != null"> <if test="basicUnit != null">
#{basicUnit,jdbcType=VARCHAR}, #{basicUnit,jdbcType=VARCHAR},
@@ -170,8 +170,8 @@
<if test="record.id != null"> <if test="record.id != null">
id = #{record.id,jdbcType=BIGINT}, id = #{record.id,jdbcType=BIGINT},
</if> </if>
<if test="record.uname != null"> <if test="record.name != null">
UName = #{record.uname,jdbcType=VARCHAR}, name = #{record.name,jdbcType=VARCHAR},
</if> </if>
<if test="record.basicUnit != null"> <if test="record.basicUnit != null">
basic_unit = #{record.basicUnit,jdbcType=VARCHAR}, basic_unit = #{record.basicUnit,jdbcType=VARCHAR},
@@ -186,7 +186,7 @@
tenant_id = #{record.tenantId,jdbcType=BIGINT}, tenant_id = #{record.tenantId,jdbcType=BIGINT},
</if> </if>
<if test="record.deleteFlag != null"> <if test="record.deleteFlag != null">
delete_Flag = #{record.deleteFlag,jdbcType=VARCHAR}, delete_flag = #{record.deleteFlag,jdbcType=VARCHAR},
</if> </if>
</set> </set>
<if test="_parameter != null"> <if test="_parameter != null">
@@ -196,12 +196,12 @@
<update id="updateByExample" parameterType="map"> <update id="updateByExample" parameterType="map">
update jsh_unit update jsh_unit
set id = #{record.id,jdbcType=BIGINT}, set id = #{record.id,jdbcType=BIGINT},
UName = #{record.uname,jdbcType=VARCHAR}, name = #{record.name,jdbcType=VARCHAR},
basic_unit = #{record.basicUnit,jdbcType=VARCHAR}, basic_unit = #{record.basicUnit,jdbcType=VARCHAR},
other_unit = #{record.otherUnit,jdbcType=VARCHAR}, other_unit = #{record.otherUnit,jdbcType=VARCHAR},
ratio = #{record.ratio,jdbcType=INTEGER}, ratio = #{record.ratio,jdbcType=INTEGER},
tenant_id = #{record.tenantId,jdbcType=BIGINT}, tenant_id = #{record.tenantId,jdbcType=BIGINT},
delete_Flag = #{record.deleteFlag,jdbcType=VARCHAR} delete_flag = #{record.deleteFlag,jdbcType=VARCHAR}
<if test="_parameter != null"> <if test="_parameter != null">
<include refid="Update_By_Example_Where_Clause" /> <include refid="Update_By_Example_Where_Clause" />
</if> </if>
@@ -209,8 +209,8 @@
<update id="updateByPrimaryKeySelective" parameterType="com.jsh.erp.datasource.entities.Unit"> <update id="updateByPrimaryKeySelective" parameterType="com.jsh.erp.datasource.entities.Unit">
update jsh_unit update jsh_unit
<set> <set>
<if test="uname != null"> <if test="name != null">
UName = #{uname,jdbcType=VARCHAR}, name = #{name,jdbcType=VARCHAR},
</if> </if>
<if test="basicUnit != null"> <if test="basicUnit != null">
basic_unit = #{basicUnit,jdbcType=VARCHAR}, basic_unit = #{basicUnit,jdbcType=VARCHAR},
@@ -225,19 +225,19 @@
tenant_id = #{tenantId,jdbcType=BIGINT}, tenant_id = #{tenantId,jdbcType=BIGINT},
</if> </if>
<if test="deleteFlag != null"> <if test="deleteFlag != null">
delete_Flag = #{deleteFlag,jdbcType=VARCHAR}, delete_flag = #{deleteFlag,jdbcType=VARCHAR},
</if> </if>
</set> </set>
where id = #{id,jdbcType=BIGINT} where id = #{id,jdbcType=BIGINT}
</update> </update>
<update id="updateByPrimaryKey" parameterType="com.jsh.erp.datasource.entities.Unit"> <update id="updateByPrimaryKey" parameterType="com.jsh.erp.datasource.entities.Unit">
update jsh_unit update jsh_unit
set UName = #{uname,jdbcType=VARCHAR}, set name = #{name,jdbcType=VARCHAR},
basic_unit = #{basicUnit,jdbcType=VARCHAR}, basic_unit = #{basicUnit,jdbcType=VARCHAR},
other_unit = #{otherUnit,jdbcType=VARCHAR}, other_unit = #{otherUnit,jdbcType=VARCHAR},
ratio = #{ratio,jdbcType=INTEGER}, ratio = #{ratio,jdbcType=INTEGER},
tenant_id = #{tenantId,jdbcType=BIGINT}, tenant_id = #{tenantId,jdbcType=BIGINT},
delete_Flag = #{deleteFlag,jdbcType=VARCHAR} delete_flag = #{deleteFlag,jdbcType=VARCHAR}
where id = #{id,jdbcType=BIGINT} where id = #{id,jdbcType=BIGINT}
</update> </update>
</mapper> </mapper>

Some files were not shown because too many files have changed in this diff Show More