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

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

@@ -820,4 +820,86 @@ ROW_FORMAT=COMPACT
-- 修改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) {
var btnStr = userBusinessList[0].btnstr;
var btnStr = userBusinessList[0].btnStr;
if (btnStr != null) {
var btnObj = JSON.parse(btnStr);
for (var j = 0; j < btnObj.length; j++) {
@@ -71,10 +71,10 @@ if (btnStrList.length > 0) {
}
$.ajax({
type: "post",
url: "/functions/findMenu",
url: "/function/findMenu",
data: ({
pNumber: 0,
hasFunctions: functions
hasFunction: functions
}),
dataType: "json",
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>";
for(var i = 0 ;i < accountList.length;i++) {
var account = accountList[i];
options += '<option value="' + account.id + '" data-currentAmount="' + account.currentamount + '">' + account.name + '</option>';
if(account.isdefault) {
options += '<option value="' + account.id + '" data-currentAmount="' + account.currentAmount + '">' + account.name + '</option>';
if(account.isDefault) {
defaultAccountId = account.id; //给账户赋值默认id
}
}

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

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

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

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

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

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

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

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

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

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

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

@@ -118,7 +118,7 @@
return str;
}
},
{title: '计量单位', field: 'uname', width: 200}
{title: '计量单位', field: 'name', width: 200}
]],
toolbar: [
{
@@ -356,7 +356,7 @@
dataType: "json",
data: ({
info: JSON.stringify({
uname: name,
name: name,
basicUnit: basicName,
otherUnit: otherName,
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"/>
<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>
<input name="parentid" id="parentid" type="hidden"/>
<input name="parentId" id="parentId" type="hidden"/>
</td>
<td style="text-align: left;"></td>
</tr>
@@ -362,7 +362,7 @@
var thisRows = res.data.page.rows; //属性列表
for (var i = 0; i < thisRows.length; i++) {
if (thisRows[i].enabled) {
mPropertyListShort += thisRows[i].nativename + ",";
mPropertyListShort += thisRows[i].nativeName + ",";
}
}
if (mPropertyListShort) {
@@ -906,9 +906,9 @@
//表格模板变更
$(".tb-other-info").html("");
for (var i = 0; i < mPropertyList.length; i++) {
if (mPropertyList[i].nativename === "制造商") {
if (mPropertyList[i].nativeName === "制造商") {
$(".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) {
$(".tr-mfrs").show();
}
@@ -916,9 +916,9 @@
$(".tr-mfrs").hide();
}
}
if (mPropertyList[i].nativename === "自定义1") {
if (mPropertyList[i].nativeName === "自定义1") {
$(".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) {
$(".tr-otherField1").show();
}
@@ -926,9 +926,9 @@
$(".tr-otherField1").hide();
}
}
if (mPropertyList[i].nativename === "自定义2") {
if (mPropertyList[i].nativeName === "自定义2") {
$(".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) {
$(".tr-otherField2").show();
}
@@ -936,9 +936,9 @@
$(".tr-otherField2").hide();
}
}
if (mPropertyList[i].nativename === "自定义3") {
if (mPropertyList[i].nativeName === "自定义3") {
$(".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) {
$(".tr-otherField3").show();
}
@@ -1156,7 +1156,7 @@
}
var objInfo = $("#materialFM").serializeObject();
objInfo.UnitId = $("#manyUnit").val();
objInfo.CategoryId =$("#parentid").val();
objInfo.CategoryId =$("#parentId").val();
//初始库存信息
var stockArr = [];
$("#initDepot input").each(function () {
@@ -1221,7 +1221,7 @@
$("#Name").focus().textbox("setValue", rowsdata.name);
$("#EnableSerialNumber").val(rowsdata.enableserialnumber=='1'?'1':'0');
//商品类别id
$("#parentid").val(rowsdata.categoryid);
$("#parentId").val(rowsdata.categoryid);
//商品类别名称
$("#parentName").textbox("setValue", rowsdata.categoryName);
mId = rowsdata.categoryid;
@@ -1397,7 +1397,7 @@
console.log(res.length);
if (res.length) {
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);
//下拉框事件

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

@@ -111,7 +111,7 @@
//loadFilter: pagerFilter,
columns: [[
{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) {
if (rec.enabled) {
@@ -123,7 +123,7 @@
}
},
{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) {
var str = '';
@@ -213,10 +213,10 @@
//编辑信息
function editMaterialProperty(index) {
var rowsdata = $("#tableData").datagrid("getRows")[index];
$("#nativeName").text(rowsdata.nativename);
$("#nativeName").text(rowsdata.nativeName);
$("#enabled").attr("checked", rowsdata.enabled == true ? true : false);
$("#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;编辑商品属性');
$(".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"/>
<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>
<input name="parentid" id="parentid" type="hidden"/>
<input name="parentId" id="parentId" type="hidden"/>
</td>
</tr>
<tr>
<td>名称</td>
<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;"/>
<input name="id" id="id" type="hidden"/>
</td>
@@ -145,9 +145,9 @@
$('#materialCategoryFM').form('clear');
$('#materialCategoryDlg').dialog('open').dialog('setTitle', '<img src="/js/easyui/themes/icons/edit_add.png"/>&nbsp;修改商品类别信息');
$(".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);
$("#parentid").val(res.data.parentId);
$("#parentId").val(res.data.parentId);
$("#serialNo").textbox("setValue", res.data.serialNo);
$("#sort").textbox("setValue", res.data.sort);
$("#remark").textbox("setValue", res.data.remark);
@@ -250,7 +250,7 @@
//保存信息
$("#saveMaterialCategory").off("click").on("click", function () {
if (!$("#Name").val()) {
if (!$("#name").val()) {
$.messager.alert('提示', '商品类别名称不能为空！', 'warning');
return;
}

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

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

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

@@ -88,14 +88,14 @@
pageList: initPageNum,
columns: [[
{title: '名称', field: 'name', width: 100},
{title: '编号', field: 'serialno', width: 150, align: "center"},
{title: '期初金额', field: 'initialamount', width: 100, align: "center"},
{title: '本月发生额', field: 'thismonthamount', width: 100, align: "center"},
{title: '当前余额', field: 'currentamount', width: 100, align: "center"},
{title: '编号', field: 'serialNo', width: 150, align: "center"},
{title: '期初金额', field: 'initialAmount', width: 100, align: "center"},
{title: '本月发生额', field: 'thisMonthAmount', width: 100, align: "center"},
{title: '当前余额', field: 'currentAmount', width: 100, align: "center"},
{
title: '操作', field: 'op', width: 100, align: "center", formatter: function (value, rec) {
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;';
return str;
}

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

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

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

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

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

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

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

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

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

@@ -61,8 +61,8 @@ public class TenantConfig {
return true;
} else {
// 这里可以判断是否过滤表
if ("jsh_materialproperty".equals(tableName) || "jsh_sequence".equals(tableName)
|| "jsh_userbusiness".equals(tableName) || "jsh_functions".equals(tableName)
if ("jsh_material_property".equals(tableName) || "jsh_sequence".equals(tableName)
|| "jsh_user_business".equals(tableName) || "jsh_function".equals(tableName)
|| "jsh_tenant".equals(tableName)) {
return true;
} 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("")) {
ratio = "";
} else {
ratio = diEx.getUName();
ratio = diEx.getUnitName();
ratio = ratio.substring(ratio.indexOf("("));
}
//名称/型号/扩展信息/包装
@@ -182,7 +182,7 @@ public class DepotItemController {
+ ((diEx.getMStandard() == null || diEx.getMStandard().equals("")) ? "" : "(" + diEx.getMStandard() + ")")
+ ((diEx.getMModel() == null || diEx.getMModel().equals("")) ? "" : "(" + diEx.getMModel() + ")");
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);
BigDecimal stock = depotItemService.getStockByParam(diEx.getDepotid(),diEx.getMaterialid(),null,null,tenantId);
item.put("Stock", stock);
@@ -298,7 +298,7 @@ public class DepotItemController {
String materialOther = getOtherInfo(mpArr, diEx);
item.put("MaterialOther", materialOther);
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("InSum", depotItemService.getInNumByParam(depotId,mId,timeA,timeB,tenantId));
@@ -468,7 +468,7 @@ public class DepotItemController {
item.put("MaterialOther", materialOther);
item.put("MaterialColor", diEx.getMColor());
item.put("MaterialUnit", diEx.getMaterialUnit());
item.put("UName", diEx.getUName());
item.put("UName", diEx.getUnitName());
item.put("InSum", InSum);
item.put("OutSum", OutSum);
item.put("InSumPrice", InSumPrice);
@@ -536,7 +536,7 @@ public class DepotItemController {
item.put("MaterialOther", materialOther);
item.put("MaterialColor", diEx.getMColor());
item.put("MaterialUnit", diEx.getMaterialUnit());
item.put("UName", diEx.getUName());
item.put("UName", diEx.getUnitName());
item.put("OutSum", OutSumRetail.add(OutSum));
item.put("InSum", InSumRetail.add(InSum));
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.JSONObject;
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.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.utils.BaseResponseInfo;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.dao.DataAccessException;
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
import javax.servlet.http.HttpServletRequest;
import java.io.IOException;
import java.util.ArrayList;
import java.util.List;
@@ -25,26 +23,26 @@ import java.util.List;
* @author ji-sheng-hua jshERP
*/
@RestController
@RequestMapping(value = "/functions")
public class FunctionsController {
private Logger logger = LoggerFactory.getLogger(FunctionsController.class);
@RequestMapping(value = "/function")
public class FunctionController {
private Logger logger = LoggerFactory.getLogger(FunctionController.class);
@Resource
private FunctionsService functionsService;
private FunctionService functionService;
@Resource
private UserBusinessService userBusinessService;
@PostMapping(value = "/findMenu")
public JSONArray findMenu(@RequestParam(value="pNumber") String pNumber,
@RequestParam(value="hasFunctions") String hasFunctions,
@RequestParam(value="hasFunction") String hasFunction,
HttpServletRequest request)throws Exception {
//存放数据json数组
JSONArray dataArray = new JSONArray();
try {
//当前用户所拥有的功能列表，格式如：[1][2][5]
String fc = hasFunctions;
List<Functions> dataList = functionsService.getRoleFunctions(pNumber);
String fc = hasFunction;
List<Function> dataList = functionService.getRoleFunction(pNumber);
if (dataList.size() != 0) {
dataArray = getMenuByFunction(dataList, fc);
}
@@ -54,14 +52,14 @@ public class FunctionsController {
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();
for (Functions functions : dataList) {
for (Function function : dataList) {
JSONObject item = new JSONObject();
List<Functions> newList = functionsService.getRoleFunctions(functions.getNumber());
item.put("id", functions.getId());
item.put("text", functions.getName());
item.put("icon", functions.getIcon());
List<Function> newList = functionService.getRoleFunction(function.getNumber());
item.put("id", function.getId());
item.put("text", function.getName());
item.put("icon", function.getIcon());
if (newList.size()>0) {
JSONArray childrenArr = getMenuByFunction(newList, fc);
if(childrenArr.size()>0) {
@@ -69,8 +67,8 @@ public class FunctionsController {
dataArray.add(item);
}
} else {
item.put("url", functions.getUrl());
if (fc.indexOf("[" + functions.getId().toString() + "]") != -1) {
item.put("url", function.getUrl());
if (fc.indexOf("[" + function.getId().toString() + "]") != -1) {
dataArray.add(item);
}
}
@@ -83,12 +81,12 @@ public class FunctionsController {
* @param request
* @return
*/
@PostMapping(value = "/findRoleFunctions")
public JSONArray findRoleFunctions(@RequestParam("UBType") String type, @RequestParam("UBKeyId") String keyId,
@PostMapping(value = "/findRoleFunction")
public JSONArray findRoleFunction(@RequestParam("UBType") String type, @RequestParam("UBKeyId") String keyId,
HttpServletRequest request)throws Exception {
JSONArray arr = new JSONArray();
try {
List<Functions> dataListFun = functionsService.findRoleFunctions("0");
List<Function> dataListFun = functionService.findRoleFunction("0");
//开始拼接json数据
JSONObject outer = new JSONObject();
outer.put("id", 1);
@@ -98,8 +96,8 @@ public class FunctionsController {
JSONArray dataArray = new JSONArray();
if (null != dataListFun) {
//根据条件从列表里面移除"系统管理"
List<Functions> dataList = new ArrayList<Functions>();
for (Functions fun : dataListFun) {
List<Function> dataList = new ArrayList<Function>();
for (Function fun : dataListFun) {
//从session中获取租户id
String loginName = null;
Object userInfo = request.getSession().getAttribute("user");
@@ -125,23 +123,23 @@ public class FunctionsController {
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();
if (null != dataList) {
for (Functions functions : dataList) {
for (Function function : dataList) {
JSONObject item = new JSONObject();
item.put("id", functions.getId());
item.put("text", functions.getName());
item.put("id", function.getId());
item.put("text", function.getName());
Boolean flag = false;
try {
flag = userBusinessService.checkIsUserBusinessExist(type, keyId, "[" + functions.getId().toString() + "]");
flag = userBusinessService.checkIsUserBusinessExist(type, keyId, "[" + function.getId().toString() + "]");
} catch (Exception e) {
logger.error(">>>>>>>>>>>>>>>>>设置角色对应的功能：类型" + type + " KeyId为： " + keyId + " 存在异常！");
}
if (flag == true) {
item.put("checked", true);
}
List<Functions> funList = functionsService.findRoleFunctions(functions.getNumber());
List<Function> funList = functionService.findRoleFunction(function.getNumber());
if(funList.size()>0) {
JSONArray funArr = getFunctionList(funList, type, keyId);
item.put("children", funArr);
@@ -165,17 +163,17 @@ public class FunctionsController {
HttpServletRequest request)throws Exception {
BaseResponseInfo res = new BaseResponseInfo();
try {
List<Functions> dataList = functionsService.findByIds(functionsIds);
List<Function> dataList = functionService.findByIds(functionsIds);
JSONObject outer = new JSONObject();
outer.put("total", dataList.size());
//存放数据json数组
JSONArray dataArray = new JSONArray();
if (null != dataList) {
for (Functions functions : dataList) {
for (Function function : dataList) {
JSONObject item = new JSONObject();
item.put("Id", functions.getId());
item.put("Name", functions.getName());
item.put("PushBtn", functions.getPushbtn());
item.put("Id", function.getId());
item.put("Name", function.getName());
item.put("PushBtn", function.getPushBtn());
item.put("op", 1);
dataArray.add(item);
}
@@ -199,10 +197,10 @@ public class FunctionsController {
* @Param: ids
* @return java.lang.Object
*/
@RequestMapping(value = "/batchDeleteFunctionsByIds")
public Object batchDeleteFunctionsByIds(@RequestParam("ids") String ids) throws Exception {
@RequestMapping(value = "/batchDeleteFunctionByIds")
public Object batchDeleteFunctionByIds(@RequestParam("ids") String ids) throws Exception {
JSONObject result = ExceptionConstants.standardSuccess();
int i= functionsService.batchDeleteFunctionsByIds(ids);
int i= functionService.batchDeleteFunctionByIds(ids);
if(i<1){
logger.error("异常码[{}],异常提示[{}],参数,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) {
outer.put("id", mc.getId());
outer.put("name", mc.getName());
outer.put("parentId", mc.getParentid());
List<MaterialCategory> dataParentList = materialCategoryService.findById(mc.getParentid());
outer.put("parentId", mc.getParentId());
List<MaterialCategory> dataParentList = materialCategoryService.findById(mc.getParentId());
if(dataParentList!=null&&dataParentList.size()>0){
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;
public class Account {
/**
* This field was generated by MyBatis Generator.
* This field corresponds to the database column jsh_account.Id
*
* @mbggenerated
*/
private Long id;
/**
* This field was generated by MyBatis Generator.
* This field corresponds to the database column jsh_account.Name
*
* @mbggenerated
*/
private String name;
/**
* This field was generated by MyBatis Generator.
* This field corresponds to the database column jsh_account.SerialNo
*
* @mbggenerated
*/
private String serialno;
private String serialNo;
/**
* This field was generated by MyBatis Generator.
* This field corresponds to the database column jsh_account.InitialAmount
*
* @mbggenerated
*/
private BigDecimal initialamount;
private BigDecimal initialAmount;
/**
* This field was generated by MyBatis Generator.
* This field corresponds to the database column jsh_account.CurrentAmount
*
* @mbggenerated
*/
private BigDecimal currentamount;
private BigDecimal currentAmount;
/**
* This field was generated by MyBatis Generator.
* This field corresponds to the database column jsh_account.Remark
*
* @mbggenerated
*/
private String remark;
/**
* This field was generated by MyBatis Generator.
* This field corresponds to the database column jsh_account.IsDefault
*
* @mbggenerated
*/
private Boolean isdefault;
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;
/**
* This field was generated by MyBatis Generator.
* This field corresponds to the database column jsh_account.delete_Flag
*
* @mbggenerated
*/
private String deleteFlag;
/**
* This method was generated by MyBatis Generator.
* This method returns the value of the database column jsh_account.Id
*
* @return the value of jsh_account.Id
*
* @mbggenerated
*/
public Long getId() {
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) {
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() {
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) {
this.name = name == null ? null : name.trim();
}
/**
* This method was generated by MyBatis Generator.
* 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 String getSerialNo() {
return serialNo;
}
/**
* This method was generated by MyBatis Generator.
* 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 void setSerialNo(String serialNo) {
this.serialNo = serialNo == null ? null : serialNo.trim();
}
/**
* This method was generated by MyBatis Generator.
* 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 BigDecimal getInitialAmount() {
return initialAmount;
}
/**
* This method was generated by MyBatis Generator.
* 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 void setInitialAmount(BigDecimal initialAmount) {
this.initialAmount = initialAmount;
}
/**
* This method was generated by MyBatis Generator.
* 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 BigDecimal getCurrentAmount() {
return currentAmount;
}
/**
* This method was generated by MyBatis Generator.
* 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;
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() {
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) {
this.remark = remark == null ? null : remark.trim();
}
/**
* This method was generated by MyBatis Generator.
* 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 Boolean getIsDefault() {
return isDefault;
}
/**
* This method was generated by MyBatis Generator.
* 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;
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() {
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) {
this.tenantId = tenantId;
}
/**
* This method was generated by MyBatis Generator.
* This method returns the value of the database column jsh_account.delete_Flag
*
* @return the value of jsh_account.delete_Flag
*
* @mbggenerated
*/
public String getDeleteFlag() {
return deleteFlag;
}
/**
* This method was generated by MyBatis Generator.
* This method sets the value of the database column jsh_account.delete_Flag
*
* @param deleteFlag the value for jsh_account.delete_Flag
*
* @mbggenerated
*/
public void setDeleteFlag(String deleteFlag) {
this.deleteFlag = deleteFlag == null ? null : deleteFlag.trim();
}

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

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;
public class InOutItemExample {
/**
* This field was generated by MyBatis Generator.
* This field corresponds to the database table jsh_inoutitem
*
* @mbggenerated
*/
protected String orderByClause;
/**
* This field was generated by MyBatis Generator.
* This field corresponds to the database table jsh_inoutitem
*
* @mbggenerated
*/
protected boolean distinct;
/**
* This field was generated by MyBatis Generator.
* This field corresponds to the database table jsh_inoutitem
*
* @mbggenerated
*/
protected List<Criteria> oredCriteria;
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table jsh_inoutitem
*
* @mbggenerated
*/
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) {
this.orderByClause = orderByClause;
}
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table jsh_inoutitem
*
* @mbggenerated
*/
public String getOrderByClause() {
return orderByClause;
}
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table jsh_inoutitem
*
* @mbggenerated
*/
public void setDistinct(boolean distinct) {
this.distinct = distinct;
}
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table jsh_inoutitem
*
* @mbggenerated
*/
public boolean isDistinct() {
return distinct;
}
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table jsh_inoutitem
*
* @mbggenerated
*/
public List<Criteria> getOredCriteria() {
return oredCriteria;
}
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table jsh_inoutitem
*
* @mbggenerated
*/
public void or(Criteria criteria) {
oredCriteria.add(criteria);
}
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table jsh_inoutitem
*
* @mbggenerated
*/
public Criteria or() {
Criteria criteria = createCriteriaInternal();
oredCriteria.add(criteria);
return criteria;
}
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table jsh_inoutitem
*
* @mbggenerated
*/
public Criteria createCriteria() {
Criteria criteria = createCriteriaInternal();
if (oredCriteria.size() == 0) {
@@ -124,41 +52,23 @@ public class InOutItemExample {
return criteria;
}
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table jsh_inoutitem
*
* @mbggenerated
*/
protected Criteria createCriteriaInternal() {
Criteria criteria = new Criteria();
return criteria;
}
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table jsh_inoutitem
*
* @mbggenerated
*/
public void clear() {
oredCriteria.clear();
orderByClause = null;
distinct = false;
}
/**
* This class was generated by MyBatis Generator.
* This class corresponds to the database table jsh_inoutitem
*
* @mbggenerated
*/
protected abstract static class GeneratedCriteria {
protected List<Criterion> criteria;
protected GeneratedCriteria() {
super();
criteria = new ArrayList<Criterion>();
criteria = new ArrayList<>();
}
public boolean isValid() {
@@ -195,272 +105,272 @@ public class InOutItemExample {
}
public Criteria andIdIsNull() {
addCriterion("Id is null");
addCriterion("id is null");
return (Criteria) this;
}
public Criteria andIdIsNotNull() {
addCriterion("Id is not null");
addCriterion("id is not null");
return (Criteria) this;
}
public Criteria andIdEqualTo(Long value) {
addCriterion("Id =", value, "id");
addCriterion("id =", value, "id");
return (Criteria) this;
}
public Criteria andIdNotEqualTo(Long value) {
addCriterion("Id <>", value, "id");
addCriterion("id <>", value, "id");
return (Criteria) this;
}
public Criteria andIdGreaterThan(Long value) {
addCriterion("Id >", value, "id");
addCriterion("id >", value, "id");
return (Criteria) this;
}
public Criteria andIdGreaterThanOrEqualTo(Long value) {
addCriterion("Id >=", value, "id");
addCriterion("id >=", value, "id");
return (Criteria) this;
}
public Criteria andIdLessThan(Long value) {
addCriterion("Id <", value, "id");
addCriterion("id <", value, "id");
return (Criteria) this;
}
public Criteria andIdLessThanOrEqualTo(Long value) {
addCriterion("Id <=", value, "id");
addCriterion("id <=", value, "id");
return (Criteria) this;
}
public Criteria andIdIn(List<Long> values) {
addCriterion("Id in", values, "id");
addCriterion("id in", values, "id");
return (Criteria) this;
}
public Criteria andIdNotIn(List<Long> values) {
addCriterion("Id not in", values, "id");
addCriterion("id not in", values, "id");
return (Criteria) this;
}
public Criteria andIdBetween(Long value1, Long value2) {
addCriterion("Id between", value1, value2, "id");
addCriterion("id between", value1, value2, "id");
return (Criteria) this;
}
public Criteria andIdNotBetween(Long value1, Long value2) {
addCriterion("Id not between", value1, value2, "id");
addCriterion("id not between", value1, value2, "id");
return (Criteria) this;
}
public Criteria andNameIsNull() {
addCriterion("Name is null");
addCriterion("name is null");
return (Criteria) this;
}
public Criteria andNameIsNotNull() {
addCriterion("Name is not null");
addCriterion("name is not null");
return (Criteria) this;
}
public Criteria andNameEqualTo(String value) {
addCriterion("Name =", value, "name");
addCriterion("name =", value, "name");
return (Criteria) this;
}
public Criteria andNameNotEqualTo(String value) {
addCriterion("Name <>", value, "name");
addCriterion("name <>", value, "name");
return (Criteria) this;
}
public Criteria andNameGreaterThan(String value) {
addCriterion("Name >", value, "name");
addCriterion("name >", value, "name");
return (Criteria) this;
}
public Criteria andNameGreaterThanOrEqualTo(String value) {
addCriterion("Name >=", value, "name");
addCriterion("name >=", value, "name");
return (Criteria) this;
}
public Criteria andNameLessThan(String value) {
addCriterion("Name <", value, "name");
addCriterion("name <", value, "name");
return (Criteria) this;
}
public Criteria andNameLessThanOrEqualTo(String value) {
addCriterion("Name <=", value, "name");
addCriterion("name <=", value, "name");
return (Criteria) this;
}
public Criteria andNameLike(String value) {
addCriterion("Name like", value, "name");
addCriterion("name like", value, "name");
return (Criteria) this;
}
public Criteria andNameNotLike(String value) {
addCriterion("Name not like", value, "name");
addCriterion("name not like", value, "name");
return (Criteria) this;
}
public Criteria andNameIn(List<String> values) {
addCriterion("Name in", values, "name");
addCriterion("name in", values, "name");
return (Criteria) this;
}
public Criteria andNameNotIn(List<String> values) {
addCriterion("Name not in", values, "name");
addCriterion("name not in", values, "name");
return (Criteria) this;
}
public Criteria andNameBetween(String value1, String value2) {
addCriterion("Name between", value1, value2, "name");
addCriterion("name between", value1, value2, "name");
return (Criteria) this;
}
public Criteria andNameNotBetween(String value1, String value2) {
addCriterion("Name not between", value1, value2, "name");
addCriterion("name not between", value1, value2, "name");
return (Criteria) this;
}
public Criteria andTypeIsNull() {
addCriterion("Type is null");
addCriterion("type is null");
return (Criteria) this;
}
public Criteria andTypeIsNotNull() {
addCriterion("Type is not null");
addCriterion("type is not null");
return (Criteria) this;
}
public Criteria andTypeEqualTo(String value) {
addCriterion("Type =", value, "type");
addCriterion("type =", value, "type");
return (Criteria) this;
}
public Criteria andTypeNotEqualTo(String value) {
addCriterion("Type <>", value, "type");
addCriterion("type <>", value, "type");
return (Criteria) this;
}
public Criteria andTypeGreaterThan(String value) {
addCriterion("Type >", value, "type");
addCriterion("type >", value, "type");
return (Criteria) this;
}
public Criteria andTypeGreaterThanOrEqualTo(String value) {
addCriterion("Type >=", value, "type");
addCriterion("type >=", value, "type");
return (Criteria) this;
}
public Criteria andTypeLessThan(String value) {
addCriterion("Type <", value, "type");
addCriterion("type <", value, "type");
return (Criteria) this;
}
public Criteria andTypeLessThanOrEqualTo(String value) {
addCriterion("Type <=", value, "type");
addCriterion("type <=", value, "type");
return (Criteria) this;
}
public Criteria andTypeLike(String value) {
addCriterion("Type like", value, "type");
addCriterion("type like", value, "type");
return (Criteria) this;
}
public Criteria andTypeNotLike(String value) {
addCriterion("Type not like", value, "type");
addCriterion("type not like", value, "type");
return (Criteria) this;
}
public Criteria andTypeIn(List<String> values) {
addCriterion("Type in", values, "type");
addCriterion("type in", values, "type");
return (Criteria) this;
}
public Criteria andTypeNotIn(List<String> values) {
addCriterion("Type not in", values, "type");
addCriterion("type not in", values, "type");
return (Criteria) this;
}
public Criteria andTypeBetween(String value1, String value2) {
addCriterion("Type between", value1, value2, "type");
addCriterion("type between", value1, value2, "type");
return (Criteria) this;
}
public Criteria andTypeNotBetween(String value1, String value2) {
addCriterion("Type not between", value1, value2, "type");
addCriterion("type not between", value1, value2, "type");
return (Criteria) this;
}
public Criteria andRemarkIsNull() {
addCriterion("Remark is null");
addCriterion("remark is null");
return (Criteria) this;
}
public Criteria andRemarkIsNotNull() {
addCriterion("Remark is not null");
addCriterion("remark is not null");
return (Criteria) this;
}
public Criteria andRemarkEqualTo(String value) {
addCriterion("Remark =", value, "remark");
addCriterion("remark =", value, "remark");
return (Criteria) this;
}
public Criteria andRemarkNotEqualTo(String value) {
addCriterion("Remark <>", value, "remark");
addCriterion("remark <>", value, "remark");
return (Criteria) this;
}
public Criteria andRemarkGreaterThan(String value) {
addCriterion("Remark >", value, "remark");
addCriterion("remark >", value, "remark");
return (Criteria) this;
}
public Criteria andRemarkGreaterThanOrEqualTo(String value) {
addCriterion("Remark >=", value, "remark");
addCriterion("remark >=", value, "remark");
return (Criteria) this;
}
public Criteria andRemarkLessThan(String value) {
addCriterion("Remark <", value, "remark");
addCriterion("remark <", value, "remark");
return (Criteria) this;
}
public Criteria andRemarkLessThanOrEqualTo(String value) {
addCriterion("Remark <=", value, "remark");
addCriterion("remark <=", value, "remark");
return (Criteria) this;
}
public Criteria andRemarkLike(String value) {
addCriterion("Remark like", value, "remark");
addCriterion("remark like", value, "remark");
return (Criteria) this;
}
public Criteria andRemarkNotLike(String value) {
addCriterion("Remark not like", value, "remark");
addCriterion("remark not like", value, "remark");
return (Criteria) this;
}
public Criteria andRemarkIn(List<String> values) {
addCriterion("Remark in", values, "remark");
addCriterion("remark in", values, "remark");
return (Criteria) this;
}
public Criteria andRemarkNotIn(List<String> values) {
addCriterion("Remark not in", values, "remark");
addCriterion("remark not in", values, "remark");
return (Criteria) this;
}
public Criteria andRemarkBetween(String value1, String value2) {
addCriterion("Remark between", value1, value2, "remark");
addCriterion("remark between", value1, value2, "remark");
return (Criteria) this;
}
public Criteria andRemarkNotBetween(String value1, String value2) {
addCriterion("Remark not between", value1, value2, "remark");
addCriterion("remark not between", value1, value2, "remark");
return (Criteria) this;
}
@@ -525,95 +435,82 @@ public class InOutItemExample {
}
public Criteria andDeleteFlagIsNull() {
addCriterion("delete_Flag is null");
addCriterion("delete_flag is null");
return (Criteria) this;
}
public Criteria andDeleteFlagIsNotNull() {
addCriterion("delete_Flag is not null");
addCriterion("delete_flag is not null");
return (Criteria) this;
}
public Criteria andDeleteFlagEqualTo(String value) {
addCriterion("delete_Flag =", value, "deleteFlag");
addCriterion("delete_flag =", value, "deleteFlag");
return (Criteria) this;
}
public Criteria andDeleteFlagNotEqualTo(String value) {
addCriterion("delete_Flag <>", value, "deleteFlag");
addCriterion("delete_flag <>", value, "deleteFlag");
return (Criteria) this;
}
public Criteria andDeleteFlagGreaterThan(String value) {
addCriterion("delete_Flag >", value, "deleteFlag");
addCriterion("delete_flag >", value, "deleteFlag");
return (Criteria) this;
}
public Criteria andDeleteFlagGreaterThanOrEqualTo(String value) {
addCriterion("delete_Flag >=", value, "deleteFlag");
addCriterion("delete_flag >=", value, "deleteFlag");
return (Criteria) this;
}
public Criteria andDeleteFlagLessThan(String value) {
addCriterion("delete_Flag <", value, "deleteFlag");
addCriterion("delete_flag <", value, "deleteFlag");
return (Criteria) this;
}
public Criteria andDeleteFlagLessThanOrEqualTo(String value) {
addCriterion("delete_Flag <=", value, "deleteFlag");
addCriterion("delete_flag <=", value, "deleteFlag");
return (Criteria) this;
}
public Criteria andDeleteFlagLike(String value) {
addCriterion("delete_Flag like", value, "deleteFlag");
addCriterion("delete_flag like", value, "deleteFlag");
return (Criteria) this;
}
public Criteria andDeleteFlagNotLike(String value) {
addCriterion("delete_Flag not like", value, "deleteFlag");
addCriterion("delete_flag not like", value, "deleteFlag");
return (Criteria) this;
}
public Criteria andDeleteFlagIn(List<String> values) {
addCriterion("delete_Flag in", values, "deleteFlag");
addCriterion("delete_flag in", values, "deleteFlag");
return (Criteria) this;
}
public Criteria andDeleteFlagNotIn(List<String> values) {
addCriterion("delete_Flag not in", values, "deleteFlag");
addCriterion("delete_flag not in", values, "deleteFlag");
return (Criteria) this;
}
public Criteria andDeleteFlagBetween(String value1, String value2) {
addCriterion("delete_Flag between", value1, value2, "deleteFlag");
addCriterion("delete_flag between", value1, value2, "deleteFlag");
return (Criteria) this;
}
public Criteria andDeleteFlagNotBetween(String value1, String value2) {
addCriterion("delete_Flag not between", value1, value2, "deleteFlag");
addCriterion("delete_flag not between", value1, value2, "deleteFlag");
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 {
protected Criteria() {
super();
}
}
/**
* This class was generated by MyBatis Generator.
* This class corresponds to the database table jsh_inoutitem
*
* @mbggenerated
*/
public static class Criterion {
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;
public class Log {
/**
* This field was generated by MyBatis Generator.
* This field corresponds to the database column jsh_log.id
*
* @mbggenerated
*/
private Long id;
/**
* This field was generated by MyBatis Generator.
* This field corresponds to the database column jsh_log.userID
*
* @mbggenerated
*/
private Long userid;
private Long userId;
/**
* This field was generated by MyBatis Generator.
* This field corresponds to the database column jsh_log.operation
*
* @mbggenerated
*/
private String operation;
/**
* This field was generated by MyBatis Generator.
* This field corresponds to the database column jsh_log.clientIP
*
* @mbggenerated
*/
private String clientip;
private String clientIp;
/**
* This field was generated by MyBatis Generator.
* This field corresponds to the database column jsh_log.createtime
*
* @mbggenerated
*/
private Date createtime;
private Date createTime;
/**
* This field was generated by MyBatis Generator.
* This field corresponds to the database column jsh_log.status
*
* @mbggenerated
*/
private Byte status;
/**
* This field was generated by MyBatis Generator.
* This field corresponds to the database column jsh_log.contentdetails
*
* @mbggenerated
*/
private String contentdetails;
private String content;
/**
* 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;
/**
* 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() {
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) {
this.id = id;
}
/**
* This method was generated by MyBatis Generator.
* 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 Long getUserId() {
return userId;
}
/**
* This method was generated by MyBatis Generator.
* 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;
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() {
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) {
this.operation = operation == null ? null : operation.trim();
}
/**
* This method was generated by MyBatis Generator.
* 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 String getClientIp() {
return clientIp;
}
/**
* This method was generated by MyBatis Generator.
* 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 void setClientIp(String clientIp) {
this.clientIp = clientIp == null ? null : clientIp.trim();
}
/**
* This method was generated by MyBatis Generator.
* 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 Date getCreateTime() {
return createTime;
}
/**
* This method was generated by MyBatis Generator.
* 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;
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() {
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) {
this.status = status;
}
/**
* This method was generated by MyBatis Generator.
* 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 String getContent() {
return content;
}
/**
* This method was generated by MyBatis Generator.
* 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();
public void setContent(String content) {
this.content = content == null ? null : content.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() {
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) {
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;
public class LogExample {
/**
* This field was generated by MyBatis Generator.
* This field corresponds to the database table jsh_log
*
* @mbggenerated
*/
protected String orderByClause;
/**
* This field was generated by MyBatis Generator.
* This field corresponds to the database table jsh_log
*
* @mbggenerated
*/
protected boolean distinct;
/**
* This field was generated by MyBatis Generator.
* This field corresponds to the database table jsh_log
*
* @mbggenerated
*/
protected List<Criteria> oredCriteria;
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table jsh_log
*
* @mbggenerated
*/
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) {
this.orderByClause = orderByClause;
}
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table jsh_log
*
* @mbggenerated
*/
public String getOrderByClause() {
return orderByClause;
}
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table jsh_log
*
* @mbggenerated
*/
public void setDistinct(boolean distinct) {
this.distinct = distinct;
}
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table jsh_log
*
* @mbggenerated
*/
public boolean isDistinct() {
return distinct;
}
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table jsh_log
*
* @mbggenerated
*/
public List<Criteria> getOredCriteria() {
return oredCriteria;
}
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table jsh_log
*
* @mbggenerated
*/
public void or(Criteria criteria) {
oredCriteria.add(criteria);
}
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table jsh_log
*
* @mbggenerated
*/
public Criteria or() {
Criteria criteria = createCriteriaInternal();
oredCriteria.add(criteria);
return criteria;
}
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table jsh_log
*
* @mbggenerated
*/
public Criteria createCriteria() {
Criteria criteria = createCriteriaInternal();
if (oredCriteria.size() == 0) {
@@ -125,41 +53,23 @@ public class LogExample {
return criteria;
}
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table jsh_log
*
* @mbggenerated
*/
protected Criteria createCriteriaInternal() {
Criteria criteria = new Criteria();
return criteria;
}
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table jsh_log
*
* @mbggenerated
*/
public void clear() {
oredCriteria.clear();
orderByClause = null;
distinct = false;
}
/**
* This class was generated by MyBatis Generator.
* This class corresponds to the database table jsh_log
*
* @mbggenerated
*/
protected abstract static class GeneratedCriteria {
protected List<Criterion> criteria;
protected GeneratedCriteria() {
super();
criteria = new ArrayList<Criterion>();
criteria = new ArrayList<>();
}
public boolean isValid() {
@@ -255,63 +165,63 @@ public class LogExample {
return (Criteria) this;
}
public Criteria andUseridIsNull() {
addCriterion("userID is null");
public Criteria andUserIdIsNull() {
addCriterion("user_id is null");
return (Criteria) this;
}
public Criteria andUseridIsNotNull() {
addCriterion("userID is not null");
public Criteria andUserIdIsNotNull() {
addCriterion("user_id is not null");
return (Criteria) this;
}
public Criteria andUseridEqualTo(Long value) {
addCriterion("userID =", value, "userid");
public Criteria andUserIdEqualTo(Long value) {
addCriterion("user_id =", value, "userId");
return (Criteria) this;
}
public Criteria andUseridNotEqualTo(Long value) {
addCriterion("userID <>", value, "userid");
public Criteria andUserIdNotEqualTo(Long value) {
addCriterion("user_id <>", value, "userId");
return (Criteria) this;
}
public Criteria andUseridGreaterThan(Long value) {
addCriterion("userID >", value, "userid");
public Criteria andUserIdGreaterThan(Long value) {
addCriterion("user_id >", value, "userId");
return (Criteria) this;
}
public Criteria andUseridGreaterThanOrEqualTo(Long value) {
addCriterion("userID >=", value, "userid");
public Criteria andUserIdGreaterThanOrEqualTo(Long value) {
addCriterion("user_id >=", value, "userId");
return (Criteria) this;
}
public Criteria andUseridLessThan(Long value) {
addCriterion("userID <", value, "userid");
public Criteria andUserIdLessThan(Long value) {
addCriterion("user_id <", value, "userId");
return (Criteria) this;
}
public Criteria andUseridLessThanOrEqualTo(Long value) {
addCriterion("userID <=", value, "userid");
public Criteria andUserIdLessThanOrEqualTo(Long value) {
addCriterion("user_id <=", value, "userId");
return (Criteria) this;
}
public Criteria andUseridIn(List<Long> values) {
addCriterion("userID in", values, "userid");
public Criteria andUserIdIn(List<Long> values) {
addCriterion("user_id in", values, "userId");
return (Criteria) this;
}
public Criteria andUseridNotIn(List<Long> values) {
addCriterion("userID not in", values, "userid");
public Criteria andUserIdNotIn(List<Long> values) {
addCriterion("user_id not in", values, "userId");
return (Criteria) this;
}
public Criteria andUseridBetween(Long value1, Long value2) {
addCriterion("userID between", value1, value2, "userid");
public Criteria andUserIdBetween(Long value1, Long value2) {
addCriterion("user_id between", value1, value2, "userId");
return (Criteria) this;
}
public Criteria andUseridNotBetween(Long value1, Long value2) {
addCriterion("userID not between", value1, value2, "userid");
public Criteria andUserIdNotBetween(Long value1, Long value2) {
addCriterion("user_id not between", value1, value2, "userId");
return (Criteria) this;
}
@@ -385,133 +295,133 @@ public class LogExample {
return (Criteria) this;
}
public Criteria andClientipIsNull() {
addCriterion("clientIP is null");
public Criteria andClientIpIsNull() {
addCriterion("client_ip is null");
return (Criteria) this;
}
public Criteria andClientipIsNotNull() {
addCriterion("clientIP is not null");
public Criteria andClientIpIsNotNull() {
addCriterion("client_ip is not null");
return (Criteria) this;
}
public Criteria andClientipEqualTo(String value) {
addCriterion("clientIP =", value, "clientip");
public Criteria andClientIpEqualTo(String value) {
addCriterion("client_ip =", value, "clientIp");
return (Criteria) this;
}
public Criteria andClientipNotEqualTo(String value) {
addCriterion("clientIP <>", value, "clientip");
public Criteria andClientIpNotEqualTo(String value) {
addCriterion("client_ip <>", value, "clientIp");
return (Criteria) this;
}
public Criteria andClientipGreaterThan(String value) {
addCriterion("clientIP >", value, "clientip");
public Criteria andClientIpGreaterThan(String value) {
addCriterion("client_ip >", value, "clientIp");
return (Criteria) this;
}
public Criteria andClientipGreaterThanOrEqualTo(String value) {
addCriterion("clientIP >=", value, "clientip");
public Criteria andClientIpGreaterThanOrEqualTo(String value) {
addCriterion("client_ip >=", value, "clientIp");
return (Criteria) this;
}
public Criteria andClientipLessThan(String value) {
addCriterion("clientIP <", value, "clientip");
public Criteria andClientIpLessThan(String value) {
addCriterion("client_ip <", value, "clientIp");
return (Criteria) this;
}
public Criteria andClientipLessThanOrEqualTo(String value) {
addCriterion("clientIP <=", value, "clientip");
public Criteria andClientIpLessThanOrEqualTo(String value) {
addCriterion("client_ip <=", value, "clientIp");
return (Criteria) this;
}
public Criteria andClientipLike(String value) {
addCriterion("clientIP like", value, "clientip");
public Criteria andClientIpLike(String value) {
addCriterion("client_ip like", value, "clientIp");
return (Criteria) this;
}
public Criteria andClientipNotLike(String value) {
addCriterion("clientIP not like", value, "clientip");
public Criteria andClientIpNotLike(String value) {
addCriterion("client_ip not like", value, "clientIp");
return (Criteria) this;
}
public Criteria andClientipIn(List<String> values) {
addCriterion("clientIP in", values, "clientip");
public Criteria andClientIpIn(List<String> values) {
addCriterion("client_ip in", values, "clientIp");
return (Criteria) this;
}
public Criteria andClientipNotIn(List<String> values) {
addCriterion("clientIP not in", values, "clientip");
public Criteria andClientIpNotIn(List<String> values) {
addCriterion("client_ip not in", values, "clientIp");
return (Criteria) this;
}
public Criteria andClientipBetween(String value1, String value2) {
addCriterion("clientIP between", value1, value2, "clientip");
public Criteria andClientIpBetween(String value1, String value2) {
addCriterion("client_ip between", value1, value2, "clientIp");
return (Criteria) this;
}
public Criteria andClientipNotBetween(String value1, String value2) {
addCriterion("clientIP not between", value1, value2, "clientip");
public Criteria andClientIpNotBetween(String value1, String value2) {
addCriterion("client_ip not between", value1, value2, "clientIp");
return (Criteria) this;
}
public Criteria andCreatetimeIsNull() {
addCriterion("createtime is null");
public Criteria andCreateTimeIsNull() {
addCriterion("create_time is null");
return (Criteria) this;
}
public Criteria andCreatetimeIsNotNull() {
addCriterion("createtime is not null");
public Criteria andCreateTimeIsNotNull() {
addCriterion("create_time is not null");
return (Criteria) this;
}
public Criteria andCreatetimeEqualTo(Date value) {
addCriterion("createtime =", value, "createtime");
public Criteria andCreateTimeEqualTo(Date value) {
addCriterion("create_time =", value, "createTime");
return (Criteria) this;
}
public Criteria andCreatetimeNotEqualTo(Date value) {
addCriterion("createtime <>", value, "createtime");
public Criteria andCreateTimeNotEqualTo(Date value) {
addCriterion("create_time <>", value, "createTime");
return (Criteria) this;
}
public Criteria andCreatetimeGreaterThan(Date value) {
addCriterion("createtime >", value, "createtime");
public Criteria andCreateTimeGreaterThan(Date value) {
addCriterion("create_time >", value, "createTime");
return (Criteria) this;
}
public Criteria andCreatetimeGreaterThanOrEqualTo(Date value) {
addCriterion("createtime >=", value, "createtime");
public Criteria andCreateTimeGreaterThanOrEqualTo(Date value) {
addCriterion("create_time >=", value, "createTime");
return (Criteria) this;
}
public Criteria andCreatetimeLessThan(Date value) {
addCriterion("createtime <", value, "createtime");
public Criteria andCreateTimeLessThan(Date value) {
addCriterion("create_time <", value, "createTime");
return (Criteria) this;
}
public Criteria andCreatetimeLessThanOrEqualTo(Date value) {
addCriterion("createtime <=", value, "createtime");
public Criteria andCreateTimeLessThanOrEqualTo(Date value) {
addCriterion("create_time <=", value, "createTime");
return (Criteria) this;
}
public Criteria andCreatetimeIn(List<Date> values) {
addCriterion("createtime in", values, "createtime");
public Criteria andCreateTimeIn(List<Date> values) {
addCriterion("create_time in", values, "createTime");
return (Criteria) this;
}
public Criteria andCreatetimeNotIn(List<Date> values) {
addCriterion("createtime not in", values, "createtime");
public Criteria andCreateTimeNotIn(List<Date> values) {
addCriterion("create_time not in", values, "createTime");
return (Criteria) this;
}
public Criteria andCreatetimeBetween(Date value1, Date value2) {
addCriterion("createtime between", value1, value2, "createtime");
public Criteria andCreateTimeBetween(Date value1, Date value2) {
addCriterion("create_time between", value1, value2, "createTime");
return (Criteria) this;
}
public Criteria andCreatetimeNotBetween(Date value1, Date value2) {
addCriterion("createtime not between", value1, value2, "createtime");
public Criteria andCreateTimeNotBetween(Date value1, Date value2) {
addCriterion("create_time not between", value1, value2, "createTime");
return (Criteria) this;
}
@@ -575,143 +485,73 @@ public class LogExample {
return (Criteria) this;
}
public Criteria andContentdetailsIsNull() {
addCriterion("contentdetails is null");
public Criteria andContentIsNull() {
addCriterion("content is null");
return (Criteria) this;
}
public Criteria andContentdetailsIsNotNull() {
addCriterion("contentdetails is not null");
public Criteria andContentIsNotNull() {
addCriterion("content is not null");
return (Criteria) this;
}
public Criteria andContentdetailsEqualTo(String value) {
addCriterion("contentdetails =", value, "contentdetails");
public Criteria andContentEqualTo(String value) {
addCriterion("content =", value, "content");
return (Criteria) this;
}
public Criteria andContentdetailsNotEqualTo(String value) {
addCriterion("contentdetails <>", value, "contentdetails");
public Criteria andContentNotEqualTo(String value) {
addCriterion("content <>", value, "content");
return (Criteria) this;
}
public Criteria andContentdetailsGreaterThan(String value) {
addCriterion("contentdetails >", value, "contentdetails");
public Criteria andContentGreaterThan(String value) {
addCriterion("content >", value, "content");
return (Criteria) this;
}
public Criteria andContentdetailsGreaterThanOrEqualTo(String value) {
addCriterion("contentdetails >=", value, "contentdetails");
public Criteria andContentGreaterThanOrEqualTo(String value) {
addCriterion("content >=", value, "content");
return (Criteria) this;
}
public Criteria andContentdetailsLessThan(String value) {
addCriterion("contentdetails <", value, "contentdetails");
public Criteria andContentLessThan(String value) {
addCriterion("content <", value, "content");
return (Criteria) this;
}
public Criteria andContentdetailsLessThanOrEqualTo(String value) {
addCriterion("contentdetails <=", value, "contentdetails");
public Criteria andContentLessThanOrEqualTo(String value) {
addCriterion("content <=", value, "content");
return (Criteria) this;
}
public Criteria andContentdetailsLike(String value) {
addCriterion("contentdetails like", value, "contentdetails");
public Criteria andContentLike(String value) {
addCriterion("content like", value, "content");
return (Criteria) this;
}
public Criteria andContentdetailsNotLike(String value) {
addCriterion("contentdetails not like", value, "contentdetails");
public Criteria andContentNotLike(String value) {
addCriterion("content not like", value, "content");
return (Criteria) this;
}
public Criteria andContentdetailsIn(List<String> values) {
addCriterion("contentdetails in", values, "contentdetails");
public Criteria andContentIn(List<String> values) {
addCriterion("content in", values, "content");
return (Criteria) this;
}
public Criteria andContentdetailsNotIn(List<String> values) {
addCriterion("contentdetails not in", values, "contentdetails");
public Criteria andContentNotIn(List<String> values) {
addCriterion("content not in", values, "content");
return (Criteria) this;
}
public Criteria andContentdetailsBetween(String value1, String value2) {
addCriterion("contentdetails between", value1, value2, "contentdetails");
public Criteria andContentBetween(String value1, String value2) {
addCriterion("content between", value1, value2, "content");
return (Criteria) this;
}
public Criteria andContentdetailsNotBetween(String value1, String value2) {
addCriterion("contentdetails not between", value1, value2, "contentdetails");
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");
public Criteria andContentNotBetween(String value1, String value2) {
addCriterion("content not between", value1, value2, "content");
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 {
protected Criteria() {
super();
}
}
/**
* This class was generated by MyBatis Generator.
* This class corresponds to the database table jsh_log
*
* @mbggenerated
*/
public static class Criterion {
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;
public class MaterialCategory {
/**
* This field was generated by MyBatis Generator.
* This field corresponds to the database column jsh_materialcategory.Id
*
* @mbggenerated
*/
private Long id;
/**
* This field was generated by MyBatis Generator.
* This field corresponds to the database column jsh_materialcategory.Name
*
* @mbggenerated
*/
private String name;
/**
* This field was generated by MyBatis Generator.
* This field corresponds to the database column jsh_materialcategory.CategoryLevel
*
* @mbggenerated
*/
private Short categorylevel;
private Short categoryLevel;
/**
* This field was generated by MyBatis Generator.
* This field corresponds to the database column jsh_materialcategory.ParentId
*
* @mbggenerated
*/
private Long parentid;
private Long parentId;
/**
* This field was generated by MyBatis Generator.
* This field corresponds to the database column jsh_materialcategory.sort
*
* @mbggenerated
*/
private String sort;
/**
* This field was generated by MyBatis Generator.
* This field corresponds to the database column jsh_materialcategory.status
*
* @mbggenerated
*/
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;
/**
* This field was generated by MyBatis Generator.
* This field corresponds to the database column jsh_materialcategory.remark
*
* @mbggenerated
*/
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;
/**
* This field was generated by MyBatis Generator.
* This field corresponds to the database column jsh_materialcategory.creator
*
* @mbggenerated
*/
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;
/**
* This field was generated by MyBatis Generator.
* This field corresponds to the database column jsh_materialcategory.updater
*
* @mbggenerated
*/
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;
/**
* 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() {
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) {
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() {
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) {
this.name = name == null ? null : name.trim();
}
/**
* This method was generated by MyBatis Generator.
* 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 Short getCategoryLevel() {
return categoryLevel;
}
/**
* This method was generated by MyBatis Generator.
* 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 void setCategoryLevel(Short categoryLevel) {
this.categoryLevel = categoryLevel;
}
/**
* This method was generated by MyBatis Generator.
* 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 Long getParentId() {
return parentId;
}
/**
* This method was generated by MyBatis Generator.
* 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;
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() {
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) {
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() {
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) {
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() {
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) {
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() {
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) {
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() {
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) {
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() {
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) {
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() {
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) {
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() {
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) {
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() {
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) {
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;
public class MaterialCategoryExample {
/**
* This field was generated by MyBatis Generator.
* This field corresponds to the database table jsh_materialcategory
*
* @mbggenerated
*/
protected String orderByClause;
/**
* This field was generated by MyBatis Generator.
* This field corresponds to the database table jsh_materialcategory
*
* @mbggenerated
*/
protected boolean distinct;
/**
* This field was generated by MyBatis Generator.
* This field corresponds to the database table jsh_materialcategory
*
* @mbggenerated
*/
protected List<Criteria> oredCriteria;
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table jsh_materialcategory
*
* @mbggenerated
*/
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) {
this.orderByClause = orderByClause;
}
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table jsh_materialcategory
*
* @mbggenerated
*/
public String getOrderByClause() {
return orderByClause;
}
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table jsh_materialcategory
*
* @mbggenerated
*/
public void setDistinct(boolean distinct) {
this.distinct = distinct;
}
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table jsh_materialcategory
*
* @mbggenerated
*/
public boolean isDistinct() {
return distinct;
}
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table jsh_materialcategory
*
* @mbggenerated
*/
public List<Criteria> getOredCriteria() {
return oredCriteria;
}
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table jsh_materialcategory
*
* @mbggenerated
*/
public void or(Criteria criteria) {
oredCriteria.add(criteria);
}
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table jsh_materialcategory
*
* @mbggenerated
*/
public Criteria or() {
Criteria criteria = createCriteriaInternal();
oredCriteria.add(criteria);
return criteria;
}
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table jsh_materialcategory
*
* @mbggenerated
*/
public Criteria createCriteria() {
Criteria criteria = createCriteriaInternal();
if (oredCriteria.size() == 0) {
@@ -125,41 +53,23 @@ public class MaterialCategoryExample {
return criteria;
}
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table jsh_materialcategory
*
* @mbggenerated
*/
protected Criteria createCriteriaInternal() {
Criteria criteria = new Criteria();
return criteria;
}
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table jsh_materialcategory
*
* @mbggenerated
*/
public void clear() {
oredCriteria.clear();
orderByClause = null;
distinct = false;
}
/**
* This class was generated by MyBatis Generator.
* This class corresponds to the database table jsh_materialcategory
*
* @mbggenerated
*/
protected abstract static class GeneratedCriteria {
protected List<Criterion> criteria;
protected GeneratedCriteria() {
super();
criteria = new ArrayList<Criterion>();
criteria = new ArrayList<>();
}
public boolean isValid() {
@@ -196,252 +106,252 @@ public class MaterialCategoryExample {
}
public Criteria andIdIsNull() {
addCriterion("Id is null");
addCriterion("id is null");
return (Criteria) this;
}
public Criteria andIdIsNotNull() {
addCriterion("Id is not null");
addCriterion("id is not null");
return (Criteria) this;
}
public Criteria andIdEqualTo(Long value) {
addCriterion("Id =", value, "id");
addCriterion("id =", value, "id");
return (Criteria) this;
}
public Criteria andIdNotEqualTo(Long value) {
addCriterion("Id <>", value, "id");
addCriterion("id <>", value, "id");
return (Criteria) this;
}
public Criteria andIdGreaterThan(Long value) {
addCriterion("Id >", value, "id");
addCriterion("id >", value, "id");
return (Criteria) this;
}
public Criteria andIdGreaterThanOrEqualTo(Long value) {
addCriterion("Id >=", value, "id");
addCriterion("id >=", value, "id");
return (Criteria) this;
}
public Criteria andIdLessThan(Long value) {
addCriterion("Id <", value, "id");
addCriterion("id <", value, "id");
return (Criteria) this;
}
public Criteria andIdLessThanOrEqualTo(Long value) {
addCriterion("Id <=", value, "id");
addCriterion("id <=", value, "id");
return (Criteria) this;
}
public Criteria andIdIn(List<Long> values) {
addCriterion("Id in", values, "id");
addCriterion("id in", values, "id");
return (Criteria) this;
}
public Criteria andIdNotIn(List<Long> values) {
addCriterion("Id not in", values, "id");
addCriterion("id not in", values, "id");
return (Criteria) this;
}
public Criteria andIdBetween(Long value1, Long value2) {
addCriterion("Id between", value1, value2, "id");
addCriterion("id between", value1, value2, "id");
return (Criteria) this;
}
public Criteria andIdNotBetween(Long value1, Long value2) {
addCriterion("Id not between", value1, value2, "id");
addCriterion("id not between", value1, value2, "id");
return (Criteria) this;
}
public Criteria andNameIsNull() {
addCriterion("Name is null");
addCriterion("name is null");
return (Criteria) this;
}
public Criteria andNameIsNotNull() {
addCriterion("Name is not null");
addCriterion("name is not null");
return (Criteria) this;
}
public Criteria andNameEqualTo(String value) {
addCriterion("Name =", value, "name");
addCriterion("name =", value, "name");
return (Criteria) this;
}
public Criteria andNameNotEqualTo(String value) {
addCriterion("Name <>", value, "name");
addCriterion("name <>", value, "name");
return (Criteria) this;
}
public Criteria andNameGreaterThan(String value) {
addCriterion("Name >", value, "name");
addCriterion("name >", value, "name");
return (Criteria) this;
}
public Criteria andNameGreaterThanOrEqualTo(String value) {
addCriterion("Name >=", value, "name");
addCriterion("name >=", value, "name");
return (Criteria) this;
}
public Criteria andNameLessThan(String value) {
addCriterion("Name <", value, "name");
addCriterion("name <", value, "name");
return (Criteria) this;
}
public Criteria andNameLessThanOrEqualTo(String value) {
addCriterion("Name <=", value, "name");
addCriterion("name <=", value, "name");
return (Criteria) this;
}
public Criteria andNameLike(String value) {
addCriterion("Name like", value, "name");
addCriterion("name like", value, "name");
return (Criteria) this;
}
public Criteria andNameNotLike(String value) {
addCriterion("Name not like", value, "name");
addCriterion("name not like", value, "name");
return (Criteria) this;
}
public Criteria andNameIn(List<String> values) {
addCriterion("Name in", values, "name");
addCriterion("name in", values, "name");
return (Criteria) this;
}
public Criteria andNameNotIn(List<String> values) {
addCriterion("Name not in", values, "name");
addCriterion("name not in", values, "name");
return (Criteria) this;
}
public Criteria andNameBetween(String value1, String value2) {
addCriterion("Name between", value1, value2, "name");
addCriterion("name between", value1, value2, "name");
return (Criteria) this;
}
public Criteria andNameNotBetween(String value1, String value2) {
addCriterion("Name not between", value1, value2, "name");
addCriterion("name not between", value1, value2, "name");
return (Criteria) this;
}
public Criteria andCategorylevelIsNull() {
addCriterion("CategoryLevel is null");
public Criteria andCategoryLevelIsNull() {
addCriterion("category_level is null");
return (Criteria) this;
}
public Criteria andCategorylevelIsNotNull() {
addCriterion("CategoryLevel is not null");
public Criteria andCategoryLevelIsNotNull() {
addCriterion("category_level is not null");
return (Criteria) this;
}
public Criteria andCategorylevelEqualTo(Short value) {
addCriterion("CategoryLevel =", value, "categorylevel");
public Criteria andCategoryLevelEqualTo(Short value) {
addCriterion("category_level =", value, "categoryLevel");
return (Criteria) this;
}
public Criteria andCategorylevelNotEqualTo(Short value) {
addCriterion("CategoryLevel <>", value, "categorylevel");
public Criteria andCategoryLevelNotEqualTo(Short value) {
addCriterion("category_level <>", value, "categoryLevel");
return (Criteria) this;
}
public Criteria andCategorylevelGreaterThan(Short value) {
addCriterion("CategoryLevel >", value, "categorylevel");
public Criteria andCategoryLevelGreaterThan(Short value) {
addCriterion("category_level >", value, "categoryLevel");
return (Criteria) this;
}
public Criteria andCategorylevelGreaterThanOrEqualTo(Short value) {
addCriterion("CategoryLevel >=", value, "categorylevel");
public Criteria andCategoryLevelGreaterThanOrEqualTo(Short value) {
addCriterion("category_level >=", value, "categoryLevel");
return (Criteria) this;
}
public Criteria andCategorylevelLessThan(Short value) {
addCriterion("CategoryLevel <", value, "categorylevel");
public Criteria andCategoryLevelLessThan(Short value) {
addCriterion("category_level <", value, "categoryLevel");
return (Criteria) this;
}
public Criteria andCategorylevelLessThanOrEqualTo(Short value) {
addCriterion("CategoryLevel <=", value, "categorylevel");
public Criteria andCategoryLevelLessThanOrEqualTo(Short value) {
addCriterion("category_level <=", value, "categoryLevel");
return (Criteria) this;
}
public Criteria andCategorylevelIn(List<Short> values) {
addCriterion("CategoryLevel in", values, "categorylevel");
public Criteria andCategoryLevelIn(List<Short> values) {
addCriterion("category_level in", values, "categoryLevel");
return (Criteria) this;
}
public Criteria andCategorylevelNotIn(List<Short> values) {
addCriterion("CategoryLevel not in", values, "categorylevel");
public Criteria andCategoryLevelNotIn(List<Short> values) {
addCriterion("category_level not in", values, "categoryLevel");
return (Criteria) this;
}
public Criteria andCategorylevelBetween(Short value1, Short value2) {
addCriterion("CategoryLevel between", value1, value2, "categorylevel");
public Criteria andCategoryLevelBetween(Short value1, Short value2) {
addCriterion("category_level between", value1, value2, "categoryLevel");
return (Criteria) this;
}
public Criteria andCategorylevelNotBetween(Short value1, Short value2) {
addCriterion("CategoryLevel not between", value1, value2, "categorylevel");
public Criteria andCategoryLevelNotBetween(Short value1, Short value2) {
addCriterion("category_level not between", value1, value2, "categoryLevel");
return (Criteria) this;
}
public Criteria andParentidIsNull() {
addCriterion("ParentId is null");
public Criteria andParentIdIsNull() {
addCriterion("parent_id is null");
return (Criteria) this;
}
public Criteria andParentidIsNotNull() {
addCriterion("ParentId is not null");
public Criteria andParentIdIsNotNull() {
addCriterion("parent_id is not null");
return (Criteria) this;
}
public Criteria andParentidEqualTo(Long value) {
addCriterion("ParentId =", value, "parentid");
public Criteria andParentIdEqualTo(Long value) {
addCriterion("parent_id =", value, "parentId");
return (Criteria) this;
}
public Criteria andParentidNotEqualTo(Long value) {
addCriterion("ParentId <>", value, "parentid");
public Criteria andParentIdNotEqualTo(Long value) {
addCriterion("parent_id <>", value, "parentId");
return (Criteria) this;
}
public Criteria andParentidGreaterThan(Long value) {
addCriterion("ParentId >", value, "parentid");
public Criteria andParentIdGreaterThan(Long value) {
addCriterion("parent_id >", value, "parentId");
return (Criteria) this;
}
public Criteria andParentidGreaterThanOrEqualTo(Long value) {
addCriterion("ParentId >=", value, "parentid");
public Criteria andParentIdGreaterThanOrEqualTo(Long value) {
addCriterion("parent_id >=", value, "parentId");
return (Criteria) this;
}
public Criteria andParentidLessThan(Long value) {
addCriterion("ParentId <", value, "parentid");
public Criteria andParentIdLessThan(Long value) {
addCriterion("parent_id <", value, "parentId");
return (Criteria) this;
}
public Criteria andParentidLessThanOrEqualTo(Long value) {
addCriterion("ParentId <=", value, "parentid");
public Criteria andParentIdLessThanOrEqualTo(Long value) {
addCriterion("parent_id <=", value, "parentId");
return (Criteria) this;
}
public Criteria andParentidIn(List<Long> values) {
addCriterion("ParentId in", values, "parentid");
public Criteria andParentIdIn(List<Long> values) {
addCriterion("parent_id in", values, "parentId");
return (Criteria) this;
}
public Criteria andParentidNotIn(List<Long> values) {
addCriterion("ParentId not in", values, "parentid");
public Criteria andParentIdNotIn(List<Long> values) {
addCriterion("parent_id not in", values, "parentId");
return (Criteria) this;
}
public Criteria andParentidBetween(Long value1, Long value2) {
addCriterion("ParentId between", value1, value2, "parentid");
public Criteria andParentIdBetween(Long value1, Long value2) {
addCriterion("parent_id between", value1, value2, "parentId");
return (Criteria) this;
}
public Criteria andParentidNotBetween(Long value1, Long value2) {
addCriterion("ParentId not between", value1, value2, "parentid");
public Criteria andParentIdNotBetween(Long value1, Long value2) {
addCriterion("parent_id not between", value1, value2, "parentId");
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 {
protected Criteria() {
super();
}
}
/**
* This class was generated by MyBatis Generator.
* This class corresponds to the database table jsh_materialcategory
*
* @mbggenerated
*/
public static class Criterion {
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;
public class MaterialProperty {
/**
* This field was generated by MyBatis Generator.
* This field corresponds to the database column jsh_materialproperty.id
*
* @mbggenerated
*/
private Long id;
/**
* This field was generated by MyBatis Generator.
* This field corresponds to the database column jsh_materialproperty.nativeName
*
* @mbggenerated
*/
private String nativename;
private String nativeName;
/**
* This field was generated by MyBatis Generator.
* This field corresponds to the database column jsh_materialproperty.enabled
*
* @mbggenerated
*/
private Boolean enabled;
/**
* This field was generated by MyBatis Generator.
* This field corresponds to the database column jsh_materialproperty.sort
*
* @mbggenerated
*/
private String sort;
/**
* This field was generated by MyBatis Generator.
* This field corresponds to the database column jsh_materialproperty.anotherName
*
* @mbggenerated
*/
private String anothername;
private String anotherName;
/**
* This field was generated by MyBatis Generator.
* This field corresponds to the database column jsh_materialproperty.delete_Flag
*
* @mbggenerated
*/
private String deleteFlag;
/**
* This method was generated by MyBatis Generator.
* This method returns the value of the database column jsh_materialproperty.id
*
* @return the value of jsh_materialproperty.id
*
* @mbggenerated
*/
public Long getId() {
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) {
this.id = id;
}
/**
* This method was generated by MyBatis Generator.
* 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 String getNativeName() {
return nativeName;
}
/**
* This method was generated by MyBatis Generator.
* 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();
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() {
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) {
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() {
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) {
this.sort = sort == null ? null : sort.trim();
}
/**
* This method was generated by MyBatis Generator.
* 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 String getAnotherName() {
return anotherName;
}
/**
* This method was generated by MyBatis Generator.
* 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();
public void setAnotherName(String anotherName) {
this.anotherName = anotherName == null ? null : anotherName.trim();
}
/**
* This method was generated by MyBatis Generator.
* This method returns the value of the database column jsh_materialproperty.delete_Flag
*
* @return the value of jsh_materialproperty.delete_Flag
*
* @mbggenerated
*/
public String getDeleteFlag() {
return deleteFlag;
}
/**
* This method was generated by MyBatis Generator.
* This method sets the value of the database column jsh_materialproperty.delete_Flag
*
* @param deleteFlag the value for jsh_materialproperty.delete_Flag
*
* @mbggenerated
*/
public void setDeleteFlag(String deleteFlag) {
this.deleteFlag = deleteFlag == null ? null : deleteFlag.trim();
}

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

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

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;
public class RoleExample {
/**
* This field was generated by MyBatis Generator.
* This field corresponds to the database table jsh_role
*
* @mbggenerated
*/
protected String orderByClause;
/**
* This field was generated by MyBatis Generator.
* This field corresponds to the database table jsh_role
*
* @mbggenerated
*/
protected boolean distinct;
/**
* This field was generated by MyBatis Generator.
* This field corresponds to the database table jsh_role
*
* @mbggenerated
*/
protected List<Criteria> oredCriteria;
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table jsh_role
*
* @mbggenerated
*/
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) {
this.orderByClause = orderByClause;
}
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table jsh_role
*
* @mbggenerated
*/
public String getOrderByClause() {
return orderByClause;
}
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table jsh_role
*
* @mbggenerated
*/
public void setDistinct(boolean distinct) {
this.distinct = distinct;
}
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table jsh_role
*
* @mbggenerated
*/
public boolean isDistinct() {
return distinct;
}
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table jsh_role
*
* @mbggenerated
*/
public List<Criteria> getOredCriteria() {
return oredCriteria;
}
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table jsh_role
*
* @mbggenerated
*/
public void or(Criteria criteria) {
oredCriteria.add(criteria);
}
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table jsh_role
*
* @mbggenerated
*/
public Criteria or() {
Criteria criteria = createCriteriaInternal();
oredCriteria.add(criteria);
return criteria;
}
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table jsh_role
*
* @mbggenerated
*/
public Criteria createCriteria() {
Criteria criteria = createCriteriaInternal();
if (oredCriteria.size() == 0) {
@@ -124,41 +52,23 @@ public class RoleExample {
return criteria;
}
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table jsh_role
*
* @mbggenerated
*/
protected Criteria createCriteriaInternal() {
Criteria criteria = new Criteria();
return criteria;
}
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table jsh_role
*
* @mbggenerated
*/
public void clear() {
oredCriteria.clear();
orderByClause = null;
distinct = false;
}
/**
* This class was generated by MyBatis Generator.
* This class corresponds to the database table jsh_role
*
* @mbggenerated
*/
protected abstract static class GeneratedCriteria {
protected List<Criterion> criteria;
protected GeneratedCriteria() {
super();
criteria = new ArrayList<Criterion>();
criteria = new ArrayList<>();
}
public boolean isValid() {
@@ -195,132 +105,132 @@ public class RoleExample {
}
public Criteria andIdIsNull() {
addCriterion("Id is null");
addCriterion("id is null");
return (Criteria) this;
}
public Criteria andIdIsNotNull() {
addCriterion("Id is not null");
addCriterion("id is not null");
return (Criteria) this;
}
public Criteria andIdEqualTo(Long value) {
addCriterion("Id =", value, "id");
addCriterion("id =", value, "id");
return (Criteria) this;
}
public Criteria andIdNotEqualTo(Long value) {
addCriterion("Id <>", value, "id");
addCriterion("id <>", value, "id");
return (Criteria) this;
}
public Criteria andIdGreaterThan(Long value) {
addCriterion("Id >", value, "id");
addCriterion("id >", value, "id");
return (Criteria) this;
}
public Criteria andIdGreaterThanOrEqualTo(Long value) {
addCriterion("Id >=", value, "id");
addCriterion("id >=", value, "id");
return (Criteria) this;
}
public Criteria andIdLessThan(Long value) {
addCriterion("Id <", value, "id");
addCriterion("id <", value, "id");
return (Criteria) this;
}
public Criteria andIdLessThanOrEqualTo(Long value) {
addCriterion("Id <=", value, "id");
addCriterion("id <=", value, "id");
return (Criteria) this;
}
public Criteria andIdIn(List<Long> values) {
addCriterion("Id in", values, "id");
addCriterion("id in", values, "id");
return (Criteria) this;
}
public Criteria andIdNotIn(List<Long> values) {
addCriterion("Id not in", values, "id");
addCriterion("id not in", values, "id");
return (Criteria) this;
}
public Criteria andIdBetween(Long value1, Long value2) {
addCriterion("Id between", value1, value2, "id");
addCriterion("id between", value1, value2, "id");
return (Criteria) this;
}
public Criteria andIdNotBetween(Long value1, Long value2) {
addCriterion("Id not between", value1, value2, "id");
addCriterion("id not between", value1, value2, "id");
return (Criteria) this;
}
public Criteria andNameIsNull() {
addCriterion("Name is null");
addCriterion("name is null");
return (Criteria) this;
}
public Criteria andNameIsNotNull() {
addCriterion("Name is not null");
addCriterion("name is not null");
return (Criteria) this;
}
public Criteria andNameEqualTo(String value) {
addCriterion("Name =", value, "name");
addCriterion("name =", value, "name");
return (Criteria) this;
}
public Criteria andNameNotEqualTo(String value) {
addCriterion("Name <>", value, "name");
addCriterion("name <>", value, "name");
return (Criteria) this;
}
public Criteria andNameGreaterThan(String value) {
addCriterion("Name >", value, "name");
addCriterion("name >", value, "name");
return (Criteria) this;
}
public Criteria andNameGreaterThanOrEqualTo(String value) {
addCriterion("Name >=", value, "name");
addCriterion("name >=", value, "name");
return (Criteria) this;
}
public Criteria andNameLessThan(String value) {
addCriterion("Name <", value, "name");
addCriterion("name <", value, "name");
return (Criteria) this;
}
public Criteria andNameLessThanOrEqualTo(String value) {
addCriterion("Name <=", value, "name");
addCriterion("name <=", value, "name");
return (Criteria) this;
}
public Criteria andNameLike(String value) {
addCriterion("Name like", value, "name");
addCriterion("name like", value, "name");
return (Criteria) this;
}
public Criteria andNameNotLike(String value) {
addCriterion("Name not like", value, "name");
addCriterion("name not like", value, "name");
return (Criteria) this;
}
public Criteria andNameIn(List<String> values) {
addCriterion("Name in", values, "name");
addCriterion("name in", values, "name");
return (Criteria) this;
}
public Criteria andNameNotIn(List<String> values) {
addCriterion("Name not in", values, "name");
addCriterion("name not in", values, "name");
return (Criteria) this;
}
public Criteria andNameBetween(String value1, String value2) {
addCriterion("Name between", value1, value2, "name");
addCriterion("name between", value1, value2, "name");
return (Criteria) this;
}
public Criteria andNameNotBetween(String value1, String value2) {
addCriterion("Name not between", value1, value2, "name");
addCriterion("name not between", value1, value2, "name");
return (Criteria) this;
}
@@ -595,95 +505,82 @@ public class RoleExample {
}
public Criteria andDeleteFlagIsNull() {
addCriterion("delete_Flag is null");
addCriterion("delete_flag is null");
return (Criteria) this;
}
public Criteria andDeleteFlagIsNotNull() {
addCriterion("delete_Flag is not null");
addCriterion("delete_flag is not null");
return (Criteria) this;
}
public Criteria andDeleteFlagEqualTo(String value) {
addCriterion("delete_Flag =", value, "deleteFlag");
addCriterion("delete_flag =", value, "deleteFlag");
return (Criteria) this;
}
public Criteria andDeleteFlagNotEqualTo(String value) {
addCriterion("delete_Flag <>", value, "deleteFlag");
addCriterion("delete_flag <>", value, "deleteFlag");
return (Criteria) this;
}
public Criteria andDeleteFlagGreaterThan(String value) {
addCriterion("delete_Flag >", value, "deleteFlag");
addCriterion("delete_flag >", value, "deleteFlag");
return (Criteria) this;
}
public Criteria andDeleteFlagGreaterThanOrEqualTo(String value) {
addCriterion("delete_Flag >=", value, "deleteFlag");
addCriterion("delete_flag >=", value, "deleteFlag");
return (Criteria) this;
}
public Criteria andDeleteFlagLessThan(String value) {
addCriterion("delete_Flag <", value, "deleteFlag");
addCriterion("delete_flag <", value, "deleteFlag");
return (Criteria) this;
}
public Criteria andDeleteFlagLessThanOrEqualTo(String value) {
addCriterion("delete_Flag <=", value, "deleteFlag");
addCriterion("delete_flag <=", value, "deleteFlag");
return (Criteria) this;
}
public Criteria andDeleteFlagLike(String value) {
addCriterion("delete_Flag like", value, "deleteFlag");
addCriterion("delete_flag like", value, "deleteFlag");
return (Criteria) this;
}
public Criteria andDeleteFlagNotLike(String value) {
addCriterion("delete_Flag not like", value, "deleteFlag");
addCriterion("delete_flag not like", value, "deleteFlag");
return (Criteria) this;
}
public Criteria andDeleteFlagIn(List<String> values) {
addCriterion("delete_Flag in", values, "deleteFlag");
addCriterion("delete_flag in", values, "deleteFlag");
return (Criteria) this;
}
public Criteria andDeleteFlagNotIn(List<String> values) {
addCriterion("delete_Flag not in", values, "deleteFlag");
addCriterion("delete_flag not in", values, "deleteFlag");
return (Criteria) this;
}
public Criteria andDeleteFlagBetween(String value1, String value2) {
addCriterion("delete_Flag between", value1, value2, "deleteFlag");
addCriterion("delete_flag between", value1, value2, "deleteFlag");
return (Criteria) this;
}
public Criteria andDeleteFlagNotBetween(String value1, String value2) {
addCriterion("delete_Flag not between", value1, value2, "deleteFlag");
addCriterion("delete_flag not between", value1, value2, "deleteFlag");
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 {
protected Criteria() {
super();
}
}
/**
* This class was generated by MyBatis Generator.
* This class corresponds to the database table jsh_role
*
* @mbggenerated
*/
public static class Criterion {
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;
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;
/**
* This field was generated by MyBatis Generator.
* This field corresponds to the database column jsh_serial_number.material_Id
*
* @mbggenerated
*/
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;
/**
* This field was generated by MyBatis Generator.
* This field corresponds to the database column jsh_serial_number.is_Sell
*
* @mbggenerated
*/
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;
/**
* This field was generated by MyBatis Generator.
* This field corresponds to the database column jsh_serial_number.delete_Flag
*
* @mbggenerated
*/
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;
/**
* This field was generated by MyBatis Generator.
* This field corresponds to the database column jsh_serial_number.creator
*
* @mbggenerated
*/
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;
/**
* This field was generated by MyBatis Generator.
* This field corresponds to the database column jsh_serial_number.updater
*
* @mbggenerated
*/
private Long updater;
/**
* This field was generated by MyBatis Generator.
* This field corresponds to the database column jsh_serial_number.depothead_Id
*
* @mbggenerated
*/
private Long depotheadId;
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;
/**
* 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() {
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) {
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() {
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) {
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() {
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) {
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() {
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) {
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() {
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) {
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() {
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) {
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() {
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) {
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() {
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) {
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() {
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) {
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() {
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) {
this.updater = updater;
}
/**
* This method was generated by MyBatis Generator.
* 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 Long getDepotHeadId() {
return depotHeadId;
}
/**
* This method was generated by MyBatis Generator.
* 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;
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() {
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) {
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;
public class SerialNumberExample {
/**
* This field was generated by MyBatis Generator.
* This field corresponds to the database table jsh_serial_number
*
* @mbggenerated
*/
protected String orderByClause;
/**
* This field was generated by MyBatis Generator.
* This field corresponds to the database table jsh_serial_number
*
* @mbggenerated
*/
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;
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table jsh_serial_number
*
* @mbggenerated
*/
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) {
this.orderByClause = orderByClause;
}
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table jsh_serial_number
*
* @mbggenerated
*/
public String getOrderByClause() {
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) {
this.distinct = distinct;
}
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table jsh_serial_number
*
* @mbggenerated
*/
public boolean isDistinct() {
return distinct;
}
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table jsh_serial_number
*
* @mbggenerated
*/
public List<Criteria> getOredCriteria() {
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) {
oredCriteria.add(criteria);
}
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table jsh_serial_number
*
* @mbggenerated
*/
public Criteria or() {
Criteria criteria = createCriteriaInternal();
oredCriteria.add(criteria);
return criteria;
}
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table jsh_serial_number
*
* @mbggenerated
*/
public Criteria createCriteria() {
Criteria criteria = createCriteriaInternal();
if (oredCriteria.size() == 0) {
@@ -125,41 +53,23 @@ public class SerialNumberExample {
return criteria;
}
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table jsh_serial_number
*
* @mbggenerated
*/
protected Criteria createCriteriaInternal() {
Criteria criteria = new Criteria();
return criteria;
}
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table jsh_serial_number
*
* @mbggenerated
*/
public void clear() {
oredCriteria.clear();
orderByClause = null;
distinct = false;
}
/**
* This class was generated by MyBatis Generator.
* This class corresponds to the database table jsh_serial_number
*
* @mbggenerated
*/
protected abstract static class GeneratedCriteria {
protected List<Criterion> criteria;
protected GeneratedCriteria() {
super();
criteria = new ArrayList<Criterion>();
criteria = new ArrayList<>();
}
public boolean isValid() {
@@ -256,202 +166,202 @@ public class SerialNumberExample {
}
public Criteria andMaterialIdIsNull() {
addCriterion("material_Id is null");
addCriterion("material_id is null");
return (Criteria) this;
}
public Criteria andMaterialIdIsNotNull() {
addCriterion("material_Id is not null");
addCriterion("material_id is not null");
return (Criteria) this;
}
public Criteria andMaterialIdEqualTo(Long value) {
addCriterion("material_Id =", value, "materialId");
addCriterion("material_id =", value, "materialId");
return (Criteria) this;
}
public Criteria andMaterialIdNotEqualTo(Long value) {
addCriterion("material_Id <>", value, "materialId");
addCriterion("material_id <>", value, "materialId");
return (Criteria) this;
}
public Criteria andMaterialIdGreaterThan(Long value) {
addCriterion("material_Id >", value, "materialId");
addCriterion("material_id >", value, "materialId");
return (Criteria) this;
}
public Criteria andMaterialIdGreaterThanOrEqualTo(Long value) {
addCriterion("material_Id >=", value, "materialId");
addCriterion("material_id >=", value, "materialId");
return (Criteria) this;
}
public Criteria andMaterialIdLessThan(Long value) {
addCriterion("material_Id <", value, "materialId");
addCriterion("material_id <", value, "materialId");
return (Criteria) this;
}
public Criteria andMaterialIdLessThanOrEqualTo(Long value) {
addCriterion("material_Id <=", value, "materialId");
addCriterion("material_id <=", value, "materialId");
return (Criteria) this;
}
public Criteria andMaterialIdIn(List<Long> values) {
addCriterion("material_Id in", values, "materialId");
addCriterion("material_id in", values, "materialId");
return (Criteria) this;
}
public Criteria andMaterialIdNotIn(List<Long> values) {
addCriterion("material_Id not in", values, "materialId");
addCriterion("material_id not in", values, "materialId");
return (Criteria) this;
}
public Criteria andMaterialIdBetween(Long value1, Long value2) {
addCriterion("material_Id between", value1, value2, "materialId");
addCriterion("material_id between", value1, value2, "materialId");
return (Criteria) this;
}
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;
}
public Criteria andSerialNumberIsNull() {
addCriterion("serial_Number is null");
addCriterion("serial_number is null");
return (Criteria) this;
}
public Criteria andSerialNumberIsNotNull() {
addCriterion("serial_Number is not null");
addCriterion("serial_number is not null");
return (Criteria) this;
}
public Criteria andSerialNumberEqualTo(String value) {
addCriterion("serial_Number =", value, "serialNumber");
addCriterion("serial_number =", value, "serialNumber");
return (Criteria) this;
}
public Criteria andSerialNumberNotEqualTo(String value) {
addCriterion("serial_Number <>", value, "serialNumber");
addCriterion("serial_number <>", value, "serialNumber");
return (Criteria) this;
}
public Criteria andSerialNumberGreaterThan(String value) {
addCriterion("serial_Number >", value, "serialNumber");
addCriterion("serial_number >", value, "serialNumber");
return (Criteria) this;
}
public Criteria andSerialNumberGreaterThanOrEqualTo(String value) {
addCriterion("serial_Number >=", value, "serialNumber");
addCriterion("serial_number >=", value, "serialNumber");
return (Criteria) this;
}
public Criteria andSerialNumberLessThan(String value) {
addCriterion("serial_Number <", value, "serialNumber");
addCriterion("serial_number <", value, "serialNumber");
return (Criteria) this;
}
public Criteria andSerialNumberLessThanOrEqualTo(String value) {
addCriterion("serial_Number <=", value, "serialNumber");
addCriterion("serial_number <=", value, "serialNumber");
return (Criteria) this;
}
public Criteria andSerialNumberLike(String value) {
addCriterion("serial_Number like", value, "serialNumber");
addCriterion("serial_number like", value, "serialNumber");
return (Criteria) this;
}
public Criteria andSerialNumberNotLike(String value) {
addCriterion("serial_Number not like", value, "serialNumber");
addCriterion("serial_number not like", value, "serialNumber");
return (Criteria) this;
}
public Criteria andSerialNumberIn(List<String> values) {
addCriterion("serial_Number in", values, "serialNumber");
addCriterion("serial_number in", values, "serialNumber");
return (Criteria) this;
}
public Criteria andSerialNumberNotIn(List<String> values) {
addCriterion("serial_Number not in", values, "serialNumber");
addCriterion("serial_number not in", values, "serialNumber");
return (Criteria) this;
}
public Criteria andSerialNumberBetween(String value1, String value2) {
addCriterion("serial_Number between", value1, value2, "serialNumber");
addCriterion("serial_number between", value1, value2, "serialNumber");
return (Criteria) this;
}
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;
}
public Criteria andIsSellIsNull() {
addCriterion("is_Sell is null");
addCriterion("is_sell is null");
return (Criteria) this;
}
public Criteria andIsSellIsNotNull() {
addCriterion("is_Sell is not null");
addCriterion("is_sell is not null");
return (Criteria) this;
}
public Criteria andIsSellEqualTo(String value) {
addCriterion("is_Sell =", value, "isSell");
addCriterion("is_sell =", value, "isSell");
return (Criteria) this;
}
public Criteria andIsSellNotEqualTo(String value) {
addCriterion("is_Sell <>", value, "isSell");
addCriterion("is_sell <>", value, "isSell");
return (Criteria) this;
}
public Criteria andIsSellGreaterThan(String value) {
addCriterion("is_Sell >", value, "isSell");
addCriterion("is_sell >", value, "isSell");
return (Criteria) this;
}
public Criteria andIsSellGreaterThanOrEqualTo(String value) {
addCriterion("is_Sell >=", value, "isSell");
addCriterion("is_sell >=", value, "isSell");
return (Criteria) this;
}
public Criteria andIsSellLessThan(String value) {
addCriterion("is_Sell <", value, "isSell");
addCriterion("is_sell <", value, "isSell");
return (Criteria) this;
}
public Criteria andIsSellLessThanOrEqualTo(String value) {
addCriterion("is_Sell <=", value, "isSell");
addCriterion("is_sell <=", value, "isSell");
return (Criteria) this;
}
public Criteria andIsSellLike(String value) {
addCriterion("is_Sell like", value, "isSell");
addCriterion("is_sell like", value, "isSell");
return (Criteria) this;
}
public Criteria andIsSellNotLike(String value) {
addCriterion("is_Sell not like", value, "isSell");
addCriterion("is_sell not like", value, "isSell");
return (Criteria) this;
}
public Criteria andIsSellIn(List<String> values) {
addCriterion("is_Sell in", values, "isSell");
addCriterion("is_sell in", values, "isSell");
return (Criteria) this;
}
public Criteria andIsSellNotIn(List<String> values) {
addCriterion("is_Sell not in", values, "isSell");
addCriterion("is_sell not in", values, "isSell");
return (Criteria) this;
}
public Criteria andIsSellBetween(String value1, String value2) {
addCriterion("is_Sell between", value1, value2, "isSell");
addCriterion("is_sell between", value1, value2, "isSell");
return (Criteria) this;
}
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;
}
@@ -526,132 +436,132 @@ public class SerialNumberExample {
}
public Criteria andDeleteFlagIsNull() {
addCriterion("delete_Flag is null");
addCriterion("delete_flag is null");
return (Criteria) this;
}
public Criteria andDeleteFlagIsNotNull() {
addCriterion("delete_Flag is not null");
addCriterion("delete_flag is not null");
return (Criteria) this;
}
public Criteria andDeleteFlagEqualTo(String value) {
addCriterion("delete_Flag =", value, "deleteFlag");
addCriterion("delete_flag =", value, "deleteFlag");
return (Criteria) this;
}
public Criteria andDeleteFlagNotEqualTo(String value) {
addCriterion("delete_Flag <>", value, "deleteFlag");
addCriterion("delete_flag <>", value, "deleteFlag");
return (Criteria) this;
}
public Criteria andDeleteFlagGreaterThan(String value) {
addCriterion("delete_Flag >", value, "deleteFlag");
addCriterion("delete_flag >", value, "deleteFlag");
return (Criteria) this;
}
public Criteria andDeleteFlagGreaterThanOrEqualTo(String value) {
addCriterion("delete_Flag >=", value, "deleteFlag");
addCriterion("delete_flag >=", value, "deleteFlag");
return (Criteria) this;
}
public Criteria andDeleteFlagLessThan(String value) {
addCriterion("delete_Flag <", value, "deleteFlag");
addCriterion("delete_flag <", value, "deleteFlag");
return (Criteria) this;
}
public Criteria andDeleteFlagLessThanOrEqualTo(String value) {
addCriterion("delete_Flag <=", value, "deleteFlag");
addCriterion("delete_flag <=", value, "deleteFlag");
return (Criteria) this;
}
public Criteria andDeleteFlagLike(String value) {
addCriterion("delete_Flag like", value, "deleteFlag");
addCriterion("delete_flag like", value, "deleteFlag");
return (Criteria) this;
}
public Criteria andDeleteFlagNotLike(String value) {
addCriterion("delete_Flag not like", value, "deleteFlag");
addCriterion("delete_flag not like", value, "deleteFlag");
return (Criteria) this;
}
public Criteria andDeleteFlagIn(List<String> values) {
addCriterion("delete_Flag in", values, "deleteFlag");
addCriterion("delete_flag in", values, "deleteFlag");
return (Criteria) this;
}
public Criteria andDeleteFlagNotIn(List<String> values) {
addCriterion("delete_Flag not in", values, "deleteFlag");
addCriterion("delete_flag not in", values, "deleteFlag");
return (Criteria) this;
}
public Criteria andDeleteFlagBetween(String value1, String value2) {
addCriterion("delete_Flag between", value1, value2, "deleteFlag");
addCriterion("delete_flag between", value1, value2, "deleteFlag");
return (Criteria) this;
}
public Criteria andDeleteFlagNotBetween(String value1, String value2) {
addCriterion("delete_Flag not between", value1, value2, "deleteFlag");
addCriterion("delete_flag not between", value1, value2, "deleteFlag");
return (Criteria) this;
}
public Criteria andCreateTimeIsNull() {
addCriterion("create_Time is null");
addCriterion("create_time is null");
return (Criteria) this;
}
public Criteria andCreateTimeIsNotNull() {
addCriterion("create_Time is not null");
addCriterion("create_time is not null");
return (Criteria) this;
}
public Criteria andCreateTimeEqualTo(Date value) {
addCriterion("create_Time =", value, "createTime");
addCriterion("create_time =", value, "createTime");
return (Criteria) this;
}
public Criteria andCreateTimeNotEqualTo(Date value) {
addCriterion("create_Time <>", value, "createTime");
addCriterion("create_time <>", value, "createTime");
return (Criteria) this;
}
public Criteria andCreateTimeGreaterThan(Date value) {
addCriterion("create_Time >", value, "createTime");
addCriterion("create_time >", value, "createTime");
return (Criteria) this;
}
public Criteria andCreateTimeGreaterThanOrEqualTo(Date value) {
addCriterion("create_Time >=", value, "createTime");
addCriterion("create_time >=", value, "createTime");
return (Criteria) this;
}
public Criteria andCreateTimeLessThan(Date value) {
addCriterion("create_Time <", value, "createTime");
addCriterion("create_time <", value, "createTime");
return (Criteria) this;
}
public Criteria andCreateTimeLessThanOrEqualTo(Date value) {
addCriterion("create_Time <=", value, "createTime");
addCriterion("create_time <=", value, "createTime");
return (Criteria) this;
}
public Criteria andCreateTimeIn(List<Date> values) {
addCriterion("create_Time in", values, "createTime");
addCriterion("create_time in", values, "createTime");
return (Criteria) this;
}
public Criteria andCreateTimeNotIn(List<Date> values) {
addCriterion("create_Time not in", values, "createTime");
addCriterion("create_time not in", values, "createTime");
return (Criteria) this;
}
public Criteria andCreateTimeBetween(Date value1, Date value2) {
addCriterion("create_Time between", value1, value2, "createTime");
addCriterion("create_time between", value1, value2, "createTime");
return (Criteria) this;
}
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;
}
@@ -716,62 +626,62 @@ public class SerialNumberExample {
}
public Criteria andUpdateTimeIsNull() {
addCriterion("update_Time is null");
addCriterion("update_time is null");
return (Criteria) this;
}
public Criteria andUpdateTimeIsNotNull() {
addCriterion("update_Time is not null");
addCriterion("update_time is not null");
return (Criteria) this;
}
public Criteria andUpdateTimeEqualTo(Date value) {
addCriterion("update_Time =", value, "updateTime");
addCriterion("update_time =", value, "updateTime");
return (Criteria) this;
}
public Criteria andUpdateTimeNotEqualTo(Date value) {
addCriterion("update_Time <>", value, "updateTime");
addCriterion("update_time <>", value, "updateTime");
return (Criteria) this;
}
public Criteria andUpdateTimeGreaterThan(Date value) {
addCriterion("update_Time >", value, "updateTime");
addCriterion("update_time >", value, "updateTime");
return (Criteria) this;
}
public Criteria andUpdateTimeGreaterThanOrEqualTo(Date value) {
addCriterion("update_Time >=", value, "updateTime");
addCriterion("update_time >=", value, "updateTime");
return (Criteria) this;
}
public Criteria andUpdateTimeLessThan(Date value) {
addCriterion("update_Time <", value, "updateTime");
addCriterion("update_time <", value, "updateTime");
return (Criteria) this;
}
public Criteria andUpdateTimeLessThanOrEqualTo(Date value) {
addCriterion("update_Time <=", value, "updateTime");
addCriterion("update_time <=", value, "updateTime");
return (Criteria) this;
}
public Criteria andUpdateTimeIn(List<Date> values) {
addCriterion("update_Time in", values, "updateTime");
addCriterion("update_time in", values, "updateTime");
return (Criteria) this;
}
public Criteria andUpdateTimeNotIn(List<Date> values) {
addCriterion("update_Time not in", values, "updateTime");
addCriterion("update_time not in", values, "updateTime");
return (Criteria) this;
}
public Criteria andUpdateTimeBetween(Date value1, Date value2) {
addCriterion("update_Time between", value1, value2, "updateTime");
addCriterion("update_time between", value1, value2, "updateTime");
return (Criteria) this;
}
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;
}
@@ -835,63 +745,63 @@ public class SerialNumberExample {
return (Criteria) this;
}
public Criteria andDepotheadIdIsNull() {
addCriterion("depothead_Id is null");
public Criteria andDepotHeadIdIsNull() {
addCriterion("depot_head_id is null");
return (Criteria) this;
}
public Criteria andDepotheadIdIsNotNull() {
addCriterion("depothead_Id is not null");
public Criteria andDepotHeadIdIsNotNull() {
addCriterion("depot_head_id is not null");
return (Criteria) this;
}
public Criteria andDepotheadIdEqualTo(Long value) {
addCriterion("depothead_Id =", value, "depotheadId");
public Criteria andDepotHeadIdEqualTo(Long value) {
addCriterion("depot_head_id =", value, "depotHeadId");
return (Criteria) this;
}
public Criteria andDepotheadIdNotEqualTo(Long value) {
addCriterion("depothead_Id <>", value, "depotheadId");
public Criteria andDepotHeadIdNotEqualTo(Long value) {
addCriterion("depot_head_id <>", value, "depotHeadId");
return (Criteria) this;
}
public Criteria andDepotheadIdGreaterThan(Long value) {
addCriterion("depothead_Id >", value, "depotheadId");
public Criteria andDepotHeadIdGreaterThan(Long value) {
addCriterion("depot_head_id >", value, "depotHeadId");
return (Criteria) this;
}
public Criteria andDepotheadIdGreaterThanOrEqualTo(Long value) {
addCriterion("depothead_Id >=", value, "depotheadId");
public Criteria andDepotHeadIdGreaterThanOrEqualTo(Long value) {
addCriterion("depot_head_id >=", value, "depotHeadId");
return (Criteria) this;
}
public Criteria andDepotheadIdLessThan(Long value) {
addCriterion("depothead_Id <", value, "depotheadId");
public Criteria andDepotHeadIdLessThan(Long value) {
addCriterion("depot_head_id <", value, "depotHeadId");
return (Criteria) this;
}
public Criteria andDepotheadIdLessThanOrEqualTo(Long value) {
addCriterion("depothead_Id <=", value, "depotheadId");
public Criteria andDepotHeadIdLessThanOrEqualTo(Long value) {
addCriterion("depot_head_id <=", value, "depotHeadId");
return (Criteria) this;
}
public Criteria andDepotheadIdIn(List<Long> values) {
addCriterion("depothead_Id in", values, "depotheadId");
public Criteria andDepotHeadIdIn(List<Long> values) {
addCriterion("depot_head_id in", values, "depotHeadId");
return (Criteria) this;
}
public Criteria andDepotheadIdNotIn(List<Long> values) {
addCriterion("depothead_Id not in", values, "depotheadId");
public Criteria andDepotHeadIdNotIn(List<Long> values) {
addCriterion("depot_head_id not in", values, "depotHeadId");
return (Criteria) this;
}
public Criteria andDepotheadIdBetween(Long value1, Long value2) {
addCriterion("depothead_Id between", value1, value2, "depotheadId");
public Criteria andDepotHeadIdBetween(Long value1, Long value2) {
addCriterion("depot_head_id between", value1, value2, "depotHeadId");
return (Criteria) this;
}
public Criteria andDepotheadIdNotBetween(Long value1, Long value2) {
addCriterion("depothead_Id not between", value1, value2, "depotheadId");
public Criteria andDepotHeadIdNotBetween(Long value1, Long value2) {
addCriterion("depot_head_id not between", value1, value2, "depotHeadId");
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 {
protected Criteria() {
super();
}
}
/**
* This class was generated by MyBatis Generator.
* This class corresponds to the database table jsh_serial_number
*
* @mbggenerated
*/
public static class Criterion {
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() {
addCriterion("delete_Flag is null");
addCriterion("delete_flag is null");
return (Criteria) this;
}
public Criteria andDeleteFlagIsNotNull() {
addCriterion("delete_Flag is not null");
addCriterion("delete_flag is not null");
return (Criteria) this;
}
public Criteria andDeleteFlagEqualTo(String value) {
addCriterion("delete_Flag =", value, "deleteFlag");
addCriterion("delete_flag =", value, "deleteFlag");
return (Criteria) this;
}
public Criteria andDeleteFlagNotEqualTo(String value) {
addCriterion("delete_Flag <>", value, "deleteFlag");
addCriterion("delete_flag <>", value, "deleteFlag");
return (Criteria) this;
}
public Criteria andDeleteFlagGreaterThan(String value) {
addCriterion("delete_Flag >", value, "deleteFlag");
addCriterion("delete_flag >", value, "deleteFlag");
return (Criteria) this;
}
public Criteria andDeleteFlagGreaterThanOrEqualTo(String value) {
addCriterion("delete_Flag >=", value, "deleteFlag");
addCriterion("delete_flag >=", value, "deleteFlag");
return (Criteria) this;
}
public Criteria andDeleteFlagLessThan(String value) {
addCriterion("delete_Flag <", value, "deleteFlag");
addCriterion("delete_flag <", value, "deleteFlag");
return (Criteria) this;
}
public Criteria andDeleteFlagLessThanOrEqualTo(String value) {
addCriterion("delete_Flag <=", value, "deleteFlag");
addCriterion("delete_flag <=", value, "deleteFlag");
return (Criteria) this;
}
public Criteria andDeleteFlagLike(String value) {
addCriterion("delete_Flag like", value, "deleteFlag");
addCriterion("delete_flag like", value, "deleteFlag");
return (Criteria) this;
}
public Criteria andDeleteFlagNotLike(String value) {
addCriterion("delete_Flag not like", value, "deleteFlag");
addCriterion("delete_flag not like", value, "deleteFlag");
return (Criteria) this;
}
public Criteria andDeleteFlagIn(List<String> values) {
addCriterion("delete_Flag in", values, "deleteFlag");
addCriterion("delete_flag in", values, "deleteFlag");
return (Criteria) this;
}
public Criteria andDeleteFlagNotIn(List<String> values) {
addCriterion("delete_Flag not in", values, "deleteFlag");
addCriterion("delete_flag not in", values, "deleteFlag");
return (Criteria) this;
}
public Criteria andDeleteFlagBetween(String value1, String value2) {
addCriterion("delete_Flag between", value1, value2, "deleteFlag");
addCriterion("delete_flag between", value1, value2, "deleteFlag");
return (Criteria) this;
}
public Criteria andDeleteFlagNotBetween(String value1, String value2) {
addCriterion("delete_Flag not between", value1, value2, "deleteFlag");
addCriterion("delete_flag not between", value1, value2, "deleteFlag");
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 {
private Long id;
private String uname;
private String name;
private String basicUnit;
@@ -23,12 +23,12 @@ public class Unit {
this.id = id;
}
public String getUname() {
return uname;
public String getName() {
return name;
}
public void setUname(String uname) {
this.uname = uname == null ? null : uname.trim();
public void setName(String name) {
this.name = name == null ? null : name.trim();
}
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;
}
public Criteria andUnameIsNull() {
addCriterion("UName is null");
public Criteria andNameIsNull() {
addCriterion("name is null");
return (Criteria) this;
}
public Criteria andUnameIsNotNull() {
addCriterion("UName is not null");
public Criteria andNameIsNotNull() {
addCriterion("name is not null");
return (Criteria) this;
}
public Criteria andUnameEqualTo(String value) {
addCriterion("UName =", value, "uname");
public Criteria andNameEqualTo(String value) {
addCriterion("name =", value, "name");
return (Criteria) this;
}
public Criteria andUnameNotEqualTo(String value) {
addCriterion("UName <>", value, "uname");
public Criteria andNameNotEqualTo(String value) {
addCriterion("name <>", value, "name");
return (Criteria) this;
}
public Criteria andUnameGreaterThan(String value) {
addCriterion("UName >", value, "uname");
public Criteria andNameGreaterThan(String value) {
addCriterion("name >", value, "name");
return (Criteria) this;
}
public Criteria andUnameGreaterThanOrEqualTo(String value) {
addCriterion("UName >=", value, "uname");
public Criteria andNameGreaterThanOrEqualTo(String value) {
addCriterion("name >=", value, "name");
return (Criteria) this;
}
public Criteria andUnameLessThan(String value) {
addCriterion("UName <", value, "uname");
public Criteria andNameLessThan(String value) {
addCriterion("name <", value, "name");
return (Criteria) this;
}
public Criteria andUnameLessThanOrEqualTo(String value) {
addCriterion("UName <=", value, "uname");
public Criteria andNameLessThanOrEqualTo(String value) {
addCriterion("name <=", value, "name");
return (Criteria) this;
}
public Criteria andUnameLike(String value) {
addCriterion("UName like", value, "uname");
public Criteria andNameLike(String value) {
addCriterion("name like", value, "name");
return (Criteria) this;
}
public Criteria andUnameNotLike(String value) {
addCriterion("UName not like", value, "uname");
public Criteria andNameNotLike(String value) {
addCriterion("name not like", value, "name");
return (Criteria) this;
}
public Criteria andUnameIn(List<String> values) {
addCriterion("UName in", values, "uname");
public Criteria andNameIn(List<String> values) {
addCriterion("name in", values, "name");
return (Criteria) this;
}
public Criteria andUnameNotIn(List<String> values) {
addCriterion("UName not in", values, "uname");
public Criteria andNameNotIn(List<String> values) {
addCriterion("name not in", values, "name");
return (Criteria) this;
}
public Criteria andUnameBetween(String value1, String value2) {
addCriterion("UName between", value1, value2, "uname");
public Criteria andNameBetween(String value1, String value2) {
addCriterion("name between", value1, value2, "name");
return (Criteria) this;
}
public Criteria andUnameNotBetween(String value1, String value2) {
addCriterion("UName not between", value1, value2, "uname");
public Criteria andNameNotBetween(String value1, String value2) {
addCriterion("name not between", value1, value2, "name");
return (Criteria) this;
}
@@ -495,72 +495,72 @@ public class UnitExample {
}
public Criteria andDeleteFlagIsNull() {
addCriterion("delete_Flag is null");
addCriterion("delete_flag is null");
return (Criteria) this;
}
public Criteria andDeleteFlagIsNotNull() {
addCriterion("delete_Flag is not null");
addCriterion("delete_flag is not null");
return (Criteria) this;
}
public Criteria andDeleteFlagEqualTo(String value) {
addCriterion("delete_Flag =", value, "deleteFlag");
addCriterion("delete_flag =", value, "deleteFlag");
return (Criteria) this;
}
public Criteria andDeleteFlagNotEqualTo(String value) {
addCriterion("delete_Flag <>", value, "deleteFlag");
addCriterion("delete_flag <>", value, "deleteFlag");
return (Criteria) this;
}
public Criteria andDeleteFlagGreaterThan(String value) {
addCriterion("delete_Flag >", value, "deleteFlag");
addCriterion("delete_flag >", value, "deleteFlag");
return (Criteria) this;
}
public Criteria andDeleteFlagGreaterThanOrEqualTo(String value) {
addCriterion("delete_Flag >=", value, "deleteFlag");
addCriterion("delete_flag >=", value, "deleteFlag");
return (Criteria) this;
}
public Criteria andDeleteFlagLessThan(String value) {
addCriterion("delete_Flag <", value, "deleteFlag");
addCriterion("delete_flag <", value, "deleteFlag");
return (Criteria) this;
}
public Criteria andDeleteFlagLessThanOrEqualTo(String value) {
addCriterion("delete_Flag <=", value, "deleteFlag");
addCriterion("delete_flag <=", value, "deleteFlag");
return (Criteria) this;
}
public Criteria andDeleteFlagLike(String value) {
addCriterion("delete_Flag like", value, "deleteFlag");
addCriterion("delete_flag like", value, "deleteFlag");
return (Criteria) this;
}
public Criteria andDeleteFlagNotLike(String value) {
addCriterion("delete_Flag not like", value, "deleteFlag");
addCriterion("delete_flag not like", value, "deleteFlag");
return (Criteria) this;
}
public Criteria andDeleteFlagIn(List<String> values) {
addCriterion("delete_Flag in", values, "deleteFlag");
addCriterion("delete_flag in", values, "deleteFlag");
return (Criteria) this;
}
public Criteria andDeleteFlagNotIn(List<String> values) {
addCriterion("delete_Flag not in", values, "deleteFlag");
addCriterion("delete_flag not in", values, "deleteFlag");
return (Criteria) this;
}
public Criteria andDeleteFlagBetween(String value1, String value2) {
addCriterion("delete_Flag between", value1, value2, "deleteFlag");
addCriterion("delete_flag between", value1, value2, "deleteFlag");
return (Criteria) this;
}
public Criteria andDeleteFlagNotBetween(String value1, String value2) {
addCriterion("delete_Flag not between", value1, value2, "deleteFlag");
addCriterion("delete_flag not between", value1, value2, "deleteFlag");
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;
public class UserBusiness {
/**
* This field was generated by MyBatis Generator.
* This field corresponds to the database column jsh_userbusiness.Id
*
* @mbggenerated
*/
private Long id;
/**
* This field was generated by MyBatis Generator.
* This field corresponds to the database column jsh_userbusiness.Type
*
* @mbggenerated
*/
private String type;
/**
* This field was generated by MyBatis Generator.
* This field corresponds to the database column jsh_userbusiness.KeyId
*
* @mbggenerated
*/
private String keyid;
private String keyId;
/**
* This field was generated by MyBatis Generator.
* This field corresponds to the database column jsh_userbusiness.Value
*
* @mbggenerated
*/
private String value;
/**
* This field was generated by MyBatis Generator.
* This field corresponds to the database column jsh_userbusiness.BtnStr
*
* @mbggenerated
*/
private String btnstr;
private String btnStr;
/**
* This field was generated by MyBatis Generator.
* This field corresponds to the database column jsh_userbusiness.delete_Flag
*
* @mbggenerated
*/
private String deleteFlag;
/**
* This method was generated by MyBatis Generator.
* This method returns the value of the database column jsh_userbusiness.Id
*
* @return the value of jsh_userbusiness.Id
*
* @mbggenerated
*/
public Long getId() {
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) {
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() {
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) {
this.type = type == null ? null : type.trim();
}
/**
* This method was generated by MyBatis Generator.
* 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 String getKeyId() {
return keyId;
}
/**
* This method was generated by MyBatis Generator.
* 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();
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() {
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) {
this.value = value == null ? null : value.trim();
}
/**
* This method was generated by MyBatis Generator.
* 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 String getBtnStr() {
return btnStr;
}
/**
* This method was generated by MyBatis Generator.
* 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();
public void setBtnStr(String btnStr) {
this.btnStr = btnStr == null ? null : btnStr.trim();
}
/**
* This method was generated by MyBatis Generator.
* This method returns the value of the database column jsh_userbusiness.delete_Flag
*
* @return the value of jsh_userbusiness.delete_Flag
*
* @mbggenerated
*/
public String getDeleteFlag() {
return deleteFlag;
}
/**
* This method was generated by MyBatis Generator.
* This method sets the value of the database column jsh_userbusiness.delete_Flag
*
* @param deleteFlag the value for jsh_userbusiness.delete_Flag
*
* @mbggenerated
*/
public void setDeleteFlag(String deleteFlag) {
this.deleteFlag = deleteFlag == null ? null : deleteFlag.trim();
}

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

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;
import com.jsh.erp.datasource.entities.Functions;
import com.jsh.erp.datasource.entities.FunctionsExample;
import com.jsh.erp.datasource.entities.Function;
import org.apache.ibatis.annotations.Param;
import java.util.Date;
import java.util.List;
public interface FunctionsMapperEx {
public interface FunctionMapperEx {
List<Functions> selectByConditionFunctions(
List<Function> selectByConditionFunction(
@Param("name") String name,
@Param("type") String type,
@Param("offset") Integer offset,
@Param("rows") Integer rows);
Long countsByFunctions(
Long countsByFunction(
@Param("name") String name,
@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;
public interface InOutItemMapper {
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table jsh_inoutitem
*
* @mbggenerated
*/
int countByExample(InOutItemExample example);
long countByExample(InOutItemExample example);
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table jsh_inoutitem
*
* @mbggenerated
*/
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);
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table jsh_inoutitem
*
* @mbggenerated
*/
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);
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table jsh_inoutitem
*
* @mbggenerated
*/
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);
/**
* 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);
/**
* 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);
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table jsh_inoutitem
*
* @mbggenerated
*/
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);
}

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;
public interface LogMapper {
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table jsh_log
*
* @mbggenerated
*/
int countByExample(LogExample example);
long countByExample(LogExample example);
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table jsh_log
*
* @mbggenerated
*/
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);
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table jsh_log
*
* @mbggenerated
*/
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);
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table jsh_log
*
* @mbggenerated
*/
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);
/**
* 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);
/**
* 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);
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table jsh_log
*
* @mbggenerated
*/
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);
}

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

@@ -11,21 +11,21 @@ public interface LogMapperEx {
List<LogVo4List> selectByConditionLog(
@Param("operation") String operation,
@Param("usernameID") Integer usernameID,
@Param("userId") Integer userId,
@Param("clientIp") String clientIp,
@Param("status") Integer status,
@Param("beginTime") String beginTime,
@Param("endTime") String endTime,
@Param("contentdetails") String contentdetails,
@Param("content") String content,
@Param("offset") Integer offset,
@Param("rows") Integer rows);
Long countsByLog(
@Param("operation") String operation,
@Param("usernameID") Integer usernameID,
@Param("userId") Integer userId,
@Param("clientIp") String clientIp,
@Param("status") Integer status,
@Param("beginTime") String beginTime,
@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;
public interface MaterialCategoryMapper {
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table jsh_materialcategory
*
* @mbggenerated
*/
int countByExample(MaterialCategoryExample example);
long countByExample(MaterialCategoryExample example);
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table jsh_materialcategory
*
* @mbggenerated
*/
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);
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table jsh_materialcategory
*
* @mbggenerated
*/
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);
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table jsh_materialcategory
*
* @mbggenerated
*/
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);
/**
* 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);
/**
* 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);
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table jsh_materialcategory
*
* @mbggenerated
*/
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);
}

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;
public interface MaterialPropertyMapper {
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table jsh_materialproperty
*
* @mbggenerated
*/
int countByExample(MaterialPropertyExample example);
long countByExample(MaterialPropertyExample example);
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table jsh_materialproperty
*
* @mbggenerated
*/
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);
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table jsh_materialproperty
*
* @mbggenerated
*/
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);
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table jsh_materialproperty
*
* @mbggenerated
*/
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);
/**
* 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);
/**
* 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);
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table jsh_materialproperty
*
* @mbggenerated
*/
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);
}

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;
public interface PersonMapper {
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table jsh_person
*
* @mbggenerated
*/
int countByExample(PersonExample example);
long countByExample(PersonExample example);
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table jsh_person
*
* @mbggenerated
*/
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);
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table jsh_person
*
* @mbggenerated
*/
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);
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table jsh_person
*
* @mbggenerated
*/
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);
/**
* 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);
/**
* 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);
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table jsh_person
*
* @mbggenerated
*/
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);
}

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;
public interface RoleMapper {
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table jsh_role
*
* @mbggenerated
*/
int countByExample(RoleExample example);
long countByExample(RoleExample example);
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table jsh_role
*
* @mbggenerated
*/
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);
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table jsh_role
*
* @mbggenerated
*/
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);
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table jsh_role
*
* @mbggenerated
*/
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);
/**
* 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);
/**
* 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);
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table jsh_role
*
* @mbggenerated
*/
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);
}

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;
public interface SerialNumberMapper {
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table jsh_serial_number
*
* @mbggenerated
*/
int countByExample(SerialNumberExample example);
long 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);
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table jsh_serial_number
*
* @mbggenerated
*/
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);
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table jsh_serial_number
*
* @mbggenerated
*/
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);
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table jsh_serial_number
*
* @mbggenerated
*/
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);
/**
* 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);
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table jsh_serial_number
*
* @mbggenerated
*/
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);
}

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;
public interface UserBusinessMapper {
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table jsh_userbusiness
*
* @mbggenerated
*/
int countByExample(UserBusinessExample example);
long countByExample(UserBusinessExample example);
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table jsh_userbusiness
*
* @mbggenerated
*/
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);
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table jsh_userbusiness
*
* @mbggenerated
*/
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);
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table jsh_userbusiness
*
* @mbggenerated
*/
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);
/**
* 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);
/**
* 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);
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table jsh_userbusiness
*
* @mbggenerated
*/
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);
}

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
*/
public interface UserBusinessMapperEx {
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{
private String thismonthamount;
private String thisMonthAmount;
public String getThismonthamount() {
return thismonthamount;
public String getThisMonthAmount() {
return thisMonthAmount;
}
public void setThismonthamount(String thismonthamount) {
this.thismonthamount = thismonthamount;
public void setThisMonthAmount(String 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 {
private String username;
private String userName;
private String createTimeStr;
public String getUsername() {
return username;
public String getUserName() {
return userName;
}
public void setUsername(String username) {
this.username = username;
public void setUserName(String userName) {
this.userName = userName;
}
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) {
thisMonthAmountFmt = df.format(thisMonthAmount);
}
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()) ;
al.setCurrentamount(currentAmount);
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()) ;
al.setCurrentAmount(currentAmount);
resList.add(al);
}
}
@@ -126,10 +126,10 @@ public class AccountService {
@Transactional(value = "transactionManager", rollbackFor = Exception.class)
public int insertAccount(String beanJson, HttpServletRequest request)throws Exception {
Account account = JSONObject.parseObject(beanJson, Account.class);
if(account.getInitialamount() == null) {
account.setInitialamount(BigDecimal.ZERO);
if(account.getInitialAmount() == null) {
account.setInitialAmount(BigDecimal.ZERO);
}
account.setIsdefault(false);
account.setIsDefault(false);
int result=0;
try{
result = accountMapper.insertSelective(account);
@@ -442,7 +442,7 @@ public class AccountService {
logService.insertLog("账户",BusinessConstants.LOG_OPERATION_TYPE_EDIT+accountId,
((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest());
Account account = new Account();
account.setIsdefault(isDefault);
account.setIsDefault(isDefault);
AccountExample example = new AccountExample();
example.createCriteria().andIdEqualTo(accountId);
int result=0;
@@ -561,7 +561,7 @@ public class AccountService {
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"));
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);
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;
import com.jsh.erp.service.ICommonQuery;
import com.jsh.erp.service.functions.FunctionsService;
import com.jsh.erp.utils.Constants;
import com.jsh.erp.utils.QueryUtils;
import com.jsh.erp.utils.StringUtil;
@@ -12,16 +11,16 @@ import javax.servlet.http.HttpServletRequest;
import java.util.List;
import java.util.Map;
@Service(value = "functions_component")
@FunctionsResource
public class FunctionsComponent implements ICommonQuery {
@Service(value = "function_component")
@FunctionResource
public class FunctionComponent implements ICommonQuery {
@Resource
private FunctionsService functionsService;
private FunctionService functionService;
@Override
public Object selectOne(Long id) throws Exception {
return functionsService.getFunctions(id);
return functionService.getFunction(id);
}
@Override
@@ -34,7 +33,7 @@ public class FunctionsComponent implements ICommonQuery {
String name = StringUtil.getInfo(search, "name");
String type = StringUtil.getInfo(search, "type");
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
@@ -42,32 +41,32 @@ public class FunctionsComponent implements ICommonQuery {
String search = map.get(Constants.SEARCH);
String name = StringUtil.getInfo(search, "name");
String type = StringUtil.getInfo(search, "type");
return functionsService.countFunctions(name, type);
return functionService.countFunction(name, type);
}
@Override
public int insert(String beanJson, HttpServletRequest request)throws Exception {
return functionsService.insertFunctions(beanJson, request);
return functionService.insertFunction(beanJson, request);
}
@Override
public int update(String beanJson, Long id, HttpServletRequest request)throws Exception {
return functionsService.updateFunctions(beanJson, id, request);
return functionService.updateFunction(beanJson, id, request);
}
@Override
public int delete(Long id, HttpServletRequest request)throws Exception {
return functionsService.deleteFunctions(id, request);
return functionService.deleteFunction(id, request);
}
@Override
public int batchDelete(String ids, HttpServletRequest request)throws Exception {
return functionsService.batchDeleteFunctions(ids, request);
return functionService.batchDeleteFunction(ids, request);
}
@Override
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
*/
@ResourceInfo(value = "functions")
@ResourceInfo(value = "function")
@Inherited
@Target(ElementType.TYPE)
@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.jsh.erp.constants.BusinessConstants;
import com.jsh.erp.constants.ExceptionConstants;
import com.jsh.erp.datasource.entities.DepotItem;
import com.jsh.erp.datasource.entities.Functions;
import com.jsh.erp.datasource.entities.FunctionsExample;
import com.jsh.erp.datasource.entities.Function;
import com.jsh.erp.datasource.entities.FunctionExample;
import com.jsh.erp.datasource.entities.User;
import com.jsh.erp.datasource.mappers.FunctionsMapper;
import com.jsh.erp.datasource.mappers.FunctionsMapperEx;
import com.jsh.erp.exception.BusinessRunTimeException;
import com.jsh.erp.datasource.mappers.FunctionMapper;
import com.jsh.erp.datasource.mappers.FunctionMapperEx;
import com.jsh.erp.exception.JshException;
import com.jsh.erp.service.log.LogService;
import com.jsh.erp.service.user.UserService;
@@ -28,21 +25,21 @@ import java.util.Date;
import java.util.List;
@Service
public class FunctionsService {
private Logger logger = LoggerFactory.getLogger(FunctionsService.class);
public class FunctionService {
private Logger logger = LoggerFactory.getLogger(FunctionService.class);
@Resource
private FunctionsMapper functionsMapper;
private FunctionMapper functionsMapper;
@Resource
private FunctionsMapperEx functionsMapperEx;
private FunctionMapperEx functionMapperEx;
@Resource
private UserService userService;
@Resource
private LogService logService;
public Functions getFunctions(long id)throws Exception {
Functions result=null;
public Function getFunction(long id)throws Exception {
Function result=null;
try{
result=functionsMapper.selectByPrimaryKey(id);
}catch(Exception e){
@@ -51,11 +48,11 @@ public class FunctionsService {
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<Functions> list = new ArrayList<>();
List<Function> list = new ArrayList<>();
try{
FunctionsExample example = new FunctionsExample();
FunctionExample example = new FunctionExample();
example.createCriteria().andIdIn(idList);
list = functionsMapper.selectByExample(example);
}catch(Exception e){
@@ -64,10 +61,10 @@ public class FunctionsService {
return list;
}
public List<Functions> getFunctions()throws Exception {
FunctionsExample example = new FunctionsExample();
public List<Function> getFunction()throws Exception {
FunctionExample example = new FunctionExample();
example.createCriteria().andDeleteFlagNotEqualTo(BusinessConstants.DELETE_FLAG_DELETED);
List<Functions> list=null;
List<Function> list=null;
try{
list=functionsMapper.selectByExample(example);
}catch(Exception e){
@@ -76,20 +73,20 @@ public class FunctionsService {
return list;
}
public List<Functions> select(String name, String type, int offset, int rows)throws Exception {
List<Functions> list=null;
public List<Function> select(String name, String type, int offset, int rows)throws Exception {
List<Function> list=null;
try{
list=functionsMapperEx.selectByConditionFunctions(name, type, offset, rows);
list= functionMapperEx.selectByConditionFunction(name, type, offset, rows);
}catch(Exception e){
JshException.readFail(logger, e);
}
return list;
}
public Long countFunctions(String name, String type)throws Exception {
public Long countFunction(String name, String type)throws Exception {
Long result=null;
try{
result=functionsMapperEx.countsByFunctions(name, type);
result= functionMapperEx.countsByFunction(name, type);
}catch(Exception e){
JshException.readFail(logger, e);
}
@@ -97,8 +94,8 @@ public class FunctionsService {
}
@Transactional(value = "transactionManager", rollbackFor = Exception.class)
public int insertFunctions(String beanJson, HttpServletRequest request)throws Exception {
Functions functions = JSONObject.parseObject(beanJson, Functions.class);
public int insertFunction(String beanJson, HttpServletRequest request)throws Exception {
Function functions = JSONObject.parseObject(beanJson, Function.class);
int result=0;
try{
result=functionsMapper.insertSelective(functions);
@@ -111,8 +108,8 @@ public class FunctionsService {
}
@Transactional(value = "transactionManager", rollbackFor = Exception.class)
public int updateFunctions(String beanJson, Long id, HttpServletRequest request) throws Exception{
Functions functions = JSONObject.parseObject(beanJson, Functions.class);
public int updateFunction(String beanJson, Long id, HttpServletRequest request) throws Exception{
Function functions = JSONObject.parseObject(beanJson, Function.class);
functions.setId(id);
int result=0;
try{
@@ -126,7 +123,7 @@ public class FunctionsService {
}
@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;
try{
result=functionsMapper.deleteByPrimaryKey(id);
@@ -139,9 +136,9 @@ public class FunctionsService {
}
@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);
FunctionsExample example = new FunctionsExample();
FunctionExample example = new FunctionExample();
example.createCriteria().andIdIn(idList);
int result=0;
try{
@@ -154,9 +151,9 @@ public class FunctionsService {
}
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);
List<Functions> list=null;
List<Function> list=null;
try{
list = functionsMapper.selectByExample(example);
}catch(Exception e){
@@ -165,12 +162,12 @@ public class FunctionsService {
return list==null?0:list.size();
}
public List<Functions> getRoleFunctions(String pNumber)throws Exception {
FunctionsExample example = new FunctionsExample();
example.createCriteria().andEnabledEqualTo(true).andPnumberEqualTo(pNumber)
public List<Function> getRoleFunction(String pNumber)throws Exception {
FunctionExample example = new FunctionExample();
example.createCriteria().andEnabledEqualTo(true).andParentNumberEqualTo(pNumber)
.andDeleteFlagNotEqualTo(BusinessConstants.DELETE_FLAG_DELETED);
example.setOrderByClause("Sort");
List<Functions> list=null;
List<Function> list=null;
try{
list = functionsMapper.selectByExample(example);
}catch(Exception e){
@@ -179,12 +176,12 @@ public class FunctionsService {
return list;
}
public List<Functions> findRoleFunctions(String pnumber)throws Exception{
FunctionsExample example = new FunctionsExample();
example.createCriteria().andEnabledEqualTo(true).andPnumberEqualTo(pnumber)
public List<Function> findRoleFunction(String pnumber)throws Exception{
FunctionExample example = new FunctionExample();
example.createCriteria().andEnabledEqualTo(true).andParentNumberEqualTo(pnumber)
.andDeleteFlagNotEqualTo(BusinessConstants.DELETE_FLAG_DELETED);
example.setOrderByClause("Sort");
List<Functions> list=null;
List<Function> list=null;
try{
list =functionsMapper.selectByExample(example);
}catch(Exception e){
@@ -193,13 +190,13 @@ public class FunctionsService {
return list;
}
public List<Functions> findByIds(String functionsIds)throws Exception{
public List<Function> findByIds(String functionsIds)throws Exception{
List<Long> idList = StringUtil.strToLongList(functionsIds);
FunctionsExample example = new FunctionsExample();
FunctionExample example = new FunctionExample();
example.createCriteria().andEnabledEqualTo(true).andIdIn(idList)
.andDeleteFlagNotEqualTo(BusinessConstants.DELETE_FLAG_DELETED);
example.setOrderByClause("Sort asc");
List<Functions> list=null;
List<Function> list=null;
try{
list =functionsMapper.selectByExample(example);
}catch(Exception e){
@@ -209,11 +206,11 @@ public class FunctionsService {
}
@Transactional(value = "transactionManager", rollbackFor = Exception.class)
public int batchDeleteFunctionsByIds(String ids)throws Exception {
public int batchDeleteFunctionByIds(String ids)throws Exception {
StringBuffer sb = new StringBuffer();
sb.append(BusinessConstants.LOG_OPERATION_TYPE_DELETE);
List<Functions> list = getFunctionsListByIds(ids);
for(Functions functions: list){
List<Function> list = getFunctionListByIds(ids);
for(Function functions: list){
sb.append("[").append(functions.getName()).append("]");
}
logService.insertLog("功能", sb.toString(),
@@ -222,7 +219,7 @@ public class FunctionsService {
String [] idArray=ids.split(",");
int result=0;
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){
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
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 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");
Integer status = StringUtil.parseInteger(StringUtil.getInfo(search, "status"));
String beginTime = StringUtil.getInfo(search, "beginTime");
String endTime = StringUtil.getInfo(search, "endTime");
String contentdetails = StringUtil.getInfo(search, "contentdetails");
String order = QueryUtils.order(map);
return logService.select(operation, usernameID, clientIp, status, beginTime, endTime, contentdetails,
String content = StringUtil.getInfo(search, "content");
return logService.select(operation, userId, clientIp, status, beginTime, endTime, content,
QueryUtils.offset(map), QueryUtils.rows(map));
}
@@ -46,13 +45,13 @@ public class LogComponent implements ICommonQuery {
public Long counts(Map<String, String> map)throws Exception {
String search = map.get(Constants.SEARCH);
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");
Integer status = StringUtil.parseInteger(StringUtil.getInfo(search, "status"));
String beginTime = StringUtil.getInfo(search, "beginTime");
String endTime = StringUtil.getInfo(search, "endTime");
String contentdetails = StringUtil.getInfo(search, "contentdetails");
return logService.countLog(operation, usernameID, clientIp, status, beginTime, endTime, contentdetails);
String content = StringUtil.getInfo(search, "content");
return logService.countLog(operation, userId, clientIp, status, beginTime, endTime, content);
}
@Override

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

@@ -55,15 +55,15 @@ public class LogService {
return list;
}
public List<LogVo4List> select(String operation, Integer usernameID, String clientIp, Integer status, String beginTime, String endTime,
String contentdetails, int offset, int rows)throws Exception {
public List<LogVo4List> select(String operation, Integer userId, String clientIp, Integer status, String beginTime, String endTime,
String content, int offset, int rows)throws Exception {
List<LogVo4List> list=null;
try{
list=logMapperEx.selectByConditionLog(operation, usernameID, clientIp, status, beginTime, endTime,
contentdetails, offset, rows);
list=logMapperEx.selectByConditionLog(operation, userId, clientIp, status, beginTime, endTime,
content, offset, rows);
if (null != list) {
for (LogVo4List log : list) {
log.setCreateTimeStr(Tools.getCenternTime(log.getCreatetime()));
log.setCreateTimeStr(Tools.getCenternTime(log.getCreateTime()));
}
}
}catch(Exception e){
@@ -72,11 +72,11 @@ public class LogService {
return list;
}
public Long countLog(String operation, Integer usernameID, String clientIp, Integer status, String beginTime, String endTime,
String contentdetails)throws Exception {
public Long countLog(String operation, Integer userId, String clientIp, Integer status, String beginTime, String endTime,
String content)throws Exception {
Long result=null;
try{
result=logMapperEx.countsByLog(operation, usernameID, clientIp, status, beginTime, endTime, contentdetails);
result=logMapperEx.countsByLog(operation, userId, clientIp, status, beginTime, endTime, content);
}catch(Exception e){
JshException.readFail(logger, e);
}
@@ -153,13 +153,13 @@ public class LogService {
Long userId = getUserId(request);
if(userId!=null) {
Log log = new Log();
log.setUserid(userId);
log.setUserId(userId);
log.setOperation(moduleName);
log.setClientip(getLocalIp(request));
log.setCreatetime(new Date());
log.setClientIp(getLocalIp(request));
log.setCreateTime(new Date());
Byte status = 0;
log.setStatus(status);
log.setContentdetails(content);
log.setContent(content);
logMapper.insertSelective(log);
}
}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> list=null;
MaterialCategoryExample example = new MaterialCategoryExample();
example.createCriteria().andParentidEqualTo(parentId).andIdNotEqualTo(1l);
example.createCriteria().andParentIdEqualTo(parentId).andIdNotEqualTo(1L);
example.setOrderByClause("id");
list=materialCategoryMapper.selectByExample(example);
if(list!=null && list.size()>0) {
@@ -230,9 +230,9 @@ public class MaterialCategoryService {
if(mc==null){
return 0;
}
if(mc.getParentid()==null){
if(mc.getParentId()==null){
//没有给定父级目录的id，默认设置父级目录为根目录的父目录
mc.setParentid(BusinessConstants.MATERIAL_CATEGORY_ROOT_PARENT_ID);
mc.setParentId(BusinessConstants.MATERIAL_CATEGORY_ROOT_PARENT_ID);
}
//检查商品类型编号是否已存在
checkMaterialCategorySerialNo(mc);
@@ -288,9 +288,9 @@ public class MaterialCategoryService {
logService.insertLog("商品类型",
new StringBuffer(BusinessConstants.LOG_OPERATION_TYPE_EDIT).append(mc.getName()).toString(),
((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest());
if(mc.getParentid()==null){
if(mc.getParentId()==null){
//没有给定父级目录的id，默认设置父级目录为根目录的父目录
mc.setParentid(BusinessConstants.MATERIAL_CATEGORY_ROOT_PARENT_ID);
mc.setParentId(BusinessConstants.MATERIAL_CATEGORY_ROOT_PARENT_ID);
}
//检查商品类型编号是否已存在
checkMaterialCategorySerialNo(mc);
@@ -362,7 +362,7 @@ public class MaterialCategoryService {
/**
* 校验
* 1、产品表 jsh_material
* 2、产品类型表 jsh_materialcategory
* 2、产品类型表 jsh_material_category
* 是否有相关数据
* */
int deleteTotal=0;
@@ -386,7 +386,7 @@ public class MaterialCategoryService {
ExceptionConstants.DELETE_FORCE_CONFIRM_MSG);
}
/**
* 校验产品类型表 jsh_materialcategory
* 校验产品类型表 jsh_material_category
* */
List<MaterialCategory> materialCategoryList=null;
try{
@@ -412,7 +412,7 @@ public class MaterialCategoryService {
* @param name
*/
public Long getCategoryIdByName(String name){
Long categoryId = 0l;
Long categoryId = 0L;
MaterialCategoryExample example = new MaterialCategoryExample();
example.createCriteria().andNameEqualTo(name).andStatusNotEqualTo(BusinessConstants.DELETE_TYPE_FORCE);
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{
result=materialPropertyMapper.insertSelective(materialProperty);
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){
JshException.writeFail(logger, e);
}
@@ -103,7 +103,7 @@ public class MaterialPropertyService {
try{
result=materialPropertyMapper.updateByPrimaryKeySelective(materialProperty);
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){
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);
PersonExample example = new PersonExample();
example.createCriteria().andIdIn(ids).andDeleteFlagNotEqualTo(BusinessConstants.DELETE_FLAG_DELETED);
example.setOrderByClause("Id asc");
example.setOrderByClause("id asc");
List<Person> list =null;
try{
list=personMapper.selectByExample(example);
@@ -192,7 +192,7 @@ public class PersonService {
public List<Person> getPersonByType(String type)throws Exception {
PersonExample example = new PersonExample();
example.createCriteria().andTypeEqualTo(type).andDeleteFlagNotEqualTo(BusinessConstants.DELETE_FLAG_DELETED);
example.setOrderByClause("Id asc");
example.setOrderByClause("id asc");
List<Person> list =null;
try{
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{
result=unitMapper.insertSelective(unit);
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){
JshException.writeFail(logger, e);
}
@@ -119,7 +119,7 @@ public class UnitService {
try{
result=unitMapper.updateByPrimaryKeySelective(unit);
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){
JshException.writeFail(logger, e);
}
@@ -156,7 +156,7 @@ public class UnitService {
public int checkIsNameExist(Long id, String name)throws Exception {
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;
try{
list=unitMapper.selectByExample(example);
@@ -171,7 +171,7 @@ public class UnitService {
sb.append(BusinessConstants.LOG_OPERATION_TYPE_DELETE);
List<Unit> list = getUnitListByIds(ids);
for(Unit unit: list){
sb.append("[").append(unit.getUname()).append("]");
sb.append("[").append(unit.getName()).append("]");
}
logService.insertLog("计量单位", sb.toString(),
((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest());
@@ -234,9 +234,9 @@ public class UnitService {
* @param name
*/
public Long getUnitIdByName(String name){
Long unitId = 0l;
Long unitId = 0L;
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);
if(list!=null && list.size()>0) {
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.jsh.erp.constants.BusinessConstants;
import com.jsh.erp.constants.ExceptionConstants;
import com.jsh.erp.datasource.entities.*;
import com.jsh.erp.datasource.mappers.UserBusinessMapper;
import com.jsh.erp.datasource.mappers.UserBusinessMapperEx;
import com.jsh.erp.exception.BusinessRunTimeException;
import com.jsh.erp.exception.JshException;
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.user.UserService;
import com.jsh.erp.utils.StringUtil;
@@ -17,7 +15,6 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.util.CollectionUtils;
import org.springframework.web.context.request.RequestContextHolder;
import org.springframework.web.context.request.ServletRequestAttributes;
@@ -39,7 +36,7 @@ public class UserBusinessService {
private UserService userService;
@Resource
private FunctionsService functionsService;
private FunctionService functionService;
@Resource
private CommonQueryManager configResourceManager;
@@ -127,7 +124,7 @@ public class UserBusinessService {
public List<UserBusiness> getBasicData(String keyId, String type)throws Exception{
UserBusinessExample example = new UserBusinessExample();
example.createCriteria().andKeyidEqualTo(keyId).andTypeEqualTo(type)
example.createCriteria().andKeyIdEqualTo(keyId).andTypeEqualTo(type)
.andDeleteFlagNotEqualTo(BusinessConstants.DELETE_FLAG_DELETED);
List<UserBusiness> list=null;
try{
@@ -140,7 +137,7 @@ public class UserBusinessService {
public Long checkIsValueExist(String type, String keyId)throws Exception {
UserBusinessExample example = new UserBusinessExample();
example.createCriteria().andTypeEqualTo(type).andKeyidEqualTo(keyId)
example.createCriteria().andTypeEqualTo(type).andKeyIdEqualTo(keyId)
.andDeleteFlagNotEqualTo(BusinessConstants.DELETE_FLAG_DELETED);
List<UserBusiness> list=null;
try{
@@ -159,7 +156,7 @@ public class UserBusinessService {
UserBusinessExample example = new UserBusinessExample();
String newVaule = "%" + UBValue + "%";
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);
} else {
example.createCriteria().andValueLike(newVaule)
@@ -184,7 +181,7 @@ public class UserBusinessService {
new StringBuffer(BusinessConstants.LOG_OPERATION_TYPE_EDIT).append(userBusinessId).toString(),
((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest());
UserBusiness userBusiness = new UserBusiness();
userBusiness.setBtnstr(btnStr);
userBusiness.setBtnStr(btnStr);
UserBusinessExample example = new UserBusinessExample();
example.createCriteria().andIdEqualTo(userBusinessId);
int result=0;
@@ -198,7 +195,7 @@ public class UserBusinessService {
public List<UserBusiness> findRoleByUserId(String userId)throws Exception{
UserBusinessExample example = new UserBusinessExample();
example.createCriteria().andKeyidEqualTo(userId).andTypeEqualTo("UserRole")
example.createCriteria().andKeyIdEqualTo(userId).andTypeEqualTo("UserRole")
.andDeleteFlagNotEqualTo(BusinessConstants.DELETE_FLAG_DELETED);
List<UserBusiness> list=null;
try{
@@ -212,7 +209,7 @@ public class UserBusinessService {
public List<UserBusiness> findAppByRoles(String roles)throws Exception{
List<String> rolesList = StringUtil.strToStringList(roles);
UserBusinessExample example = new UserBusinessExample();
example.createCriteria().andKeyidIn(rolesList).andTypeEqualTo("RoleAPP")
example.createCriteria().andKeyIdIn(rolesList).andTypeEqualTo("RoleAPP")
.andDeleteFlagNotEqualTo(BusinessConstants.DELETE_FLAG_DELETED);
List<UserBusiness> list=null;
try{

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

@@ -1,335 +1,276 @@
<?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">
<mapper namespace="com.jsh.erp.datasource.mappers.AccountMapper">
<resultMap id="BaseResultMap" type="com.jsh.erp.datasource.entities.Account">
<!--
WARNING - @mbggenerated
This element is automatically generated by MyBatis Generator, do not modify.
-->
<id column="Id" jdbcType="BIGINT" property="id" />
<result column="Name" jdbcType="VARCHAR" property="name" />
<result column="SerialNo" jdbcType="VARCHAR" property="serialno" />
<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="delete_Flag" jdbcType="VARCHAR" property="deleteFlag" />
</resultMap>
<sql id="Example_Where_Clause">
<!--
WARNING - @mbggenerated
This element is automatically generated by MyBatis Generator, do not modify.
-->
<where>
<foreach collection="oredCriteria" item="criteria" separator="or">
<if test="criteria.valid">
<trim prefix="(" prefixOverrides="and" suffix=")">
<foreach collection="criteria.criteria" item="criterion">
<choose>
<when test="criterion.noValue">
and ${criterion.condition}
</when>
<when test="criterion.singleValue">
and ${criterion.condition} #{criterion.value}
</when>
<when test="criterion.betweenValue">
and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
</when>
<when test="criterion.listValue">
and ${criterion.condition}
<foreach close=")" collection="criterion.value" item="listItem" open="(" separator=",">
#{listItem}
</foreach>
</when>
</choose>
</foreach>
</trim>
</if>
</foreach>
</where>
</sql>
<sql id="Update_By_Example_Where_Clause">
<!--
WARNING - @mbggenerated
This element is automatically generated by MyBatis Generator, do not modify.
-->
<where>
<foreach collection="example.oredCriteria" item="criteria" separator="or">
<if test="criteria.valid">
<trim prefix="(" prefixOverrides="and" suffix=")">
<foreach collection="criteria.criteria" item="criterion">
<choose>
<when test="criterion.noValue">
and ${criterion.condition}
</when>
<when test="criterion.singleValue">
and ${criterion.condition} #{criterion.value}
</when>
<when test="criterion.betweenValue">
and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
</when>
<when test="criterion.listValue">
and ${criterion.condition}
<foreach close=")" collection="criterion.value" item="listItem" open="(" separator=",">
#{listItem}
</foreach>
</when>
</choose>
</foreach>
</trim>
</if>
</foreach>
</where>
</sql>
<sql id="Base_Column_List">
<!--
WARNING - @mbggenerated
This element is automatically generated by MyBatis Generator, do not modify.
-->
Id, Name, SerialNo, InitialAmount, CurrentAmount, Remark, IsDefault, tenant_id, delete_Flag
</sql>
<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
<if test="distinct">
distinct
</if>
<include refid="Base_Column_List" />
from jsh_account
<if test="_parameter != null">
<include refid="Example_Where_Clause" />
</if>
<if test="orderByClause != null">
order by ${orderByClause}
</if>
</select>
<select id="selectByPrimaryKey" parameterType="java.lang.Long" resultMap="BaseResultMap">
<!--
WARNING - @mbggenerated
This element is automatically generated by MyBatis Generator, do not modify.
-->
select
<include refid="Base_Column_List" />
from jsh_account
where Id = #{id,jdbcType=BIGINT}
</select>
<delete id="deleteByPrimaryKey" parameterType="java.lang.Long">
<!--
WARNING - @mbggenerated
This element is automatically generated by MyBatis Generator, do not modify.
-->
delete from jsh_account
where Id = #{id,jdbcType=BIGINT}
</delete>
<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
<if test="_parameter != null">
<include refid="Example_Where_Clause" />
</if>
</delete>
<insert id="insert" parameterType="com.jsh.erp.datasource.entities.Account">
<!--
WARNING - @mbggenerated
This element is automatically generated by MyBatis Generator, do not modify.
-->
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},
#{initialamount,jdbcType=DECIMAL}, #{currentamount,jdbcType=DECIMAL}, #{remark,jdbcType=VARCHAR},
#{isdefault,jdbcType=BIT}, #{tenantId,jdbcType=BIGINT}, #{deleteFlag,jdbcType=VARCHAR}
)
</insert>
<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
<trim prefix="(" suffix=")" suffixOverrides=",">
<if test="id != null">
Id,
</if>
<if test="name != null">
Name,
</if>
<if test="serialno != null">
SerialNo,
</if>
<if test="initialamount != null">
InitialAmount,
</if>
<if test="currentamount != null">
CurrentAmount,
</if>
<if test="remark != null">
Remark,
</if>
<if test="isdefault != null">
IsDefault,
</if>
<if test="tenantId != null">
tenant_id,
</if>
<if test="deleteFlag != null">
delete_Flag,
</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="id != null">
#{id,jdbcType=BIGINT},
</if>
<if test="name != null">
#{name,jdbcType=VARCHAR},
</if>
<if test="serialno != null">
#{serialno,jdbcType=VARCHAR},
</if>
<if test="initialamount != null">
#{initialamount,jdbcType=DECIMAL},
</if>
<if test="currentamount != null">
#{currentamount,jdbcType=DECIMAL},
</if>
<if test="remark != null">
#{remark,jdbcType=VARCHAR},
</if>
<if test="isdefault != null">
#{isdefault,jdbcType=BIT},
</if>
<if test="tenantId != null">
#{tenantId,jdbcType=BIGINT},
</if>
<if test="deleteFlag != null">
#{deleteFlag,jdbcType=VARCHAR},
</if>
</trim>
</insert>
<select id="countByExample" parameterType="com.jsh.erp.datasource.entities.AccountExample" resultType="java.lang.Integer">
<!--
WARNING - @mbggenerated
This element is automatically generated by MyBatis Generator, do not modify.
-->
select count(*) from jsh_account
<if test="_parameter != null">
<include refid="Example_Where_Clause" />
</if>
</select>
<update id="updateByExampleSelective" parameterType="map">
<!--
WARNING - @mbggenerated
This element is automatically generated by MyBatis Generator, do not modify.
-->
update jsh_account
<set>
<if test="record.id != null">
Id = #{record.id,jdbcType=BIGINT},
</if>
<if test="record.name != null">
Name = #{record.name,jdbcType=VARCHAR},
</if>
<if test="record.serialno != null">
SerialNo = #{record.serialno,jdbcType=VARCHAR},
</if>
<if test="record.initialamount != null">
InitialAmount = #{record.initialamount,jdbcType=DECIMAL},
</if>
<if test="record.currentamount != null">
CurrentAmount = #{record.currentamount,jdbcType=DECIMAL},
</if>
<if test="record.remark != null">
Remark = #{record.remark,jdbcType=VARCHAR},
</if>
<if test="record.isdefault != null">
IsDefault = #{record.isdefault,jdbcType=BIT},
</if>
<if test="record.tenantId != null">
tenant_id = #{record.tenantId,jdbcType=BIGINT},
</if>
<if test="record.deleteFlag != null">
delete_Flag = #{record.deleteFlag,jdbcType=VARCHAR},
</if>
</set>
<if test="_parameter != null">
<include refid="Update_By_Example_Where_Clause" />
</if>
</update>
<update id="updateByExample" parameterType="map">
<!--
WARNING - @mbggenerated
This element is automatically generated by MyBatis Generator, do not modify.
-->
update jsh_account
set Id = #{record.id,jdbcType=BIGINT},
Name = #{record.name,jdbcType=VARCHAR},
SerialNo = #{record.serialno,jdbcType=VARCHAR},
InitialAmount = #{record.initialamount,jdbcType=DECIMAL},
CurrentAmount = #{record.currentamount,jdbcType=DECIMAL},
Remark = #{record.remark,jdbcType=VARCHAR},
IsDefault = #{record.isdefault,jdbcType=BIT},
tenant_id = #{record.tenantId,jdbcType=BIGINT},
delete_Flag = #{record.deleteFlag,jdbcType=VARCHAR}
<if test="_parameter != null">
<include refid="Update_By_Example_Where_Clause" />
</if>
</update>
<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
<set>
<if test="name != null">
Name = #{name,jdbcType=VARCHAR},
</if>
<if test="serialno != null">
SerialNo = #{serialno,jdbcType=VARCHAR},
</if>
<if test="initialamount != null">
InitialAmount = #{initialamount,jdbcType=DECIMAL},
</if>
<if test="currentamount != null">
CurrentAmount = #{currentamount,jdbcType=DECIMAL},
</if>
<if test="remark != null">
Remark = #{remark,jdbcType=VARCHAR},
</if>
<if test="isdefault != null">
IsDefault = #{isdefault,jdbcType=BIT},
</if>
<if test="tenantId != null">
tenant_id = #{tenantId,jdbcType=BIGINT},
</if>
<if test="deleteFlag != null">
delete_Flag = #{deleteFlag,jdbcType=VARCHAR},
</if>
</set>
where Id = #{id,jdbcType=BIGINT}
</update>
<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
set Name = #{name,jdbcType=VARCHAR},
SerialNo = #{serialno,jdbcType=VARCHAR},
InitialAmount = #{initialamount,jdbcType=DECIMAL},
CurrentAmount = #{currentamount,jdbcType=DECIMAL},
Remark = #{remark,jdbcType=VARCHAR},
IsDefault = #{isdefault,jdbcType=BIT},
tenant_id = #{tenantId,jdbcType=BIGINT},
delete_Flag = #{deleteFlag,jdbcType=VARCHAR}
where Id = #{id,jdbcType=BIGINT}
</update>
<mapper namespace="com.jsh.erp.datasource.mappers.AccountMapper">
<resultMap id="BaseResultMap" type="com.jsh.erp.datasource.entities.Account">
<id column="id" jdbcType="BIGINT" property="id" />
<result column="name" jdbcType="VARCHAR" property="name" />
<result column="serial_no" jdbcType="VARCHAR" property="serialNo" />
<result column="initial_amount" jdbcType="DECIMAL" property="initialAmount" />
<result column="current_amount" jdbcType="DECIMAL" property="currentAmount" />
<result column="remark" jdbcType="VARCHAR" property="remark" />
<result column="is_default" jdbcType="BIT" property="isDefault" />
<result column="tenant_id" jdbcType="BIGINT" property="tenantId" />
<result column="delete_flag" jdbcType="VARCHAR" property="deleteFlag" />
</resultMap>
<sql id="Example_Where_Clause">
<where>
<foreach collection="oredCriteria" item="criteria" separator="or">
<if test="criteria.valid">
<trim prefix="(" prefixOverrides="and" suffix=")">
<foreach collection="criteria.criteria" item="criterion">
<choose>
<when test="criterion.noValue">
and ${criterion.condition}
</when>
<when test="criterion.singleValue">
and ${criterion.condition} #{criterion.value}
</when>
<when test="criterion.betweenValue">
and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
</when>
<when test="criterion.listValue">
and ${criterion.condition}
<foreach close=")" collection="criterion.value" item="listItem" open="(" separator=",">
#{listItem}
</foreach>
</when>
</choose>
</foreach>
</trim>
</if>
</foreach>
</where>
</sql>
<sql id="Update_By_Example_Where_Clause">
<where>
<foreach collection="example.oredCriteria" item="criteria" separator="or">
<if test="criteria.valid">
<trim prefix="(" prefixOverrides="and" suffix=")">
<foreach collection="criteria.criteria" item="criterion">
<choose>
<when test="criterion.noValue">
and ${criterion.condition}
</when>
<when test="criterion.singleValue">
and ${criterion.condition} #{criterion.value}
</when>
<when test="criterion.betweenValue">
and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
</when>
<when test="criterion.listValue">
and ${criterion.condition}
<foreach close=")" collection="criterion.value" item="listItem" open="(" separator=",">
#{listItem}
</foreach>
</when>
</choose>
</foreach>
</trim>
</if>
</foreach>
</where>
</sql>
<sql id="Base_Column_List">
id, name, serial_no, initial_amount, current_amount, remark, is_default, tenant_id,
delete_flag
</sql>
<select id="selectByExample" parameterType="com.jsh.erp.datasource.entities.AccountExample" resultMap="BaseResultMap">
select
<if test="distinct">
distinct
</if>
<include refid="Base_Column_List" />
from jsh_account
<if test="_parameter != null">
<include refid="Example_Where_Clause" />
</if>
<if test="orderByClause != null">
order by ${orderByClause}
</if>
</select>
<select id="selectByPrimaryKey" parameterType="java.lang.Long" resultMap="BaseResultMap">
select
<include refid="Base_Column_List" />
from jsh_account
where id = #{id,jdbcType=BIGINT}
</select>
<delete id="deleteByPrimaryKey" parameterType="java.lang.Long">
delete from jsh_account
where id = #{id,jdbcType=BIGINT}
</delete>
<delete id="deleteByExample" parameterType="com.jsh.erp.datasource.entities.AccountExample">
delete from jsh_account
<if test="_parameter != null">
<include refid="Example_Where_Clause" />
</if>
</delete>
<insert id="insert" parameterType="com.jsh.erp.datasource.entities.Account">
insert into jsh_account (id, name, serial_no,
initial_amount, current_amount, remark,
is_default, tenant_id, delete_flag
)
values (#{id,jdbcType=BIGINT}, #{name,jdbcType=VARCHAR}, #{serialNo,jdbcType=VARCHAR},
#{initialAmount,jdbcType=DECIMAL}, #{currentAmount,jdbcType=DECIMAL}, #{remark,jdbcType=VARCHAR},
#{isDefault,jdbcType=BIT}, #{tenantId,jdbcType=BIGINT}, #{deleteFlag,jdbcType=VARCHAR}
)
</insert>
<insert id="insertSelective" parameterType="com.jsh.erp.datasource.entities.Account">
insert into jsh_account
<trim prefix="(" suffix=")" suffixOverrides=",">
<if test="id != null">
id,
</if>
<if test="name != null">
name,
</if>
<if test="serialNo != null">
serial_no,
</if>
<if test="initialAmount != null">
initial_amount,
</if>
<if test="currentAmount != null">
current_amount,
</if>
<if test="remark != null">
remark,
</if>
<if test="isDefault != null">
is_default,
</if>
<if test="tenantId != null">
tenant_id,
</if>
<if test="deleteFlag != null">
delete_flag,
</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="id != null">
#{id,jdbcType=BIGINT},
</if>
<if test="name != null">
#{name,jdbcType=VARCHAR},
</if>
<if test="serialNo != null">
#{serialNo,jdbcType=VARCHAR},
</if>
<if test="initialAmount != null">
#{initialAmount,jdbcType=DECIMAL},
</if>
<if test="currentAmount != null">
#{currentAmount,jdbcType=DECIMAL},
</if>
<if test="remark != null">
#{remark,jdbcType=VARCHAR},
</if>
<if test="isDefault != null">
#{isDefault,jdbcType=BIT},
</if>
<if test="tenantId != null">
#{tenantId,jdbcType=BIGINT},
</if>
<if test="deleteFlag != null">
#{deleteFlag,jdbcType=VARCHAR},
</if>
</trim>
</insert>
<select id="countByExample" parameterType="com.jsh.erp.datasource.entities.AccountExample" resultType="java.lang.Long">
select count(*) from jsh_account
<if test="_parameter != null">
<include refid="Example_Where_Clause" />
</if>
</select>
<update id="updateByExampleSelective" parameterType="map">
update jsh_account
<set>
<if test="record.id != null">
id = #{record.id,jdbcType=BIGINT},
</if>
<if test="record.name != null">
name = #{record.name,jdbcType=VARCHAR},
</if>
<if test="record.serialNo != null">
serial_no = #{record.serialNo,jdbcType=VARCHAR},
</if>
<if test="record.initialAmount != null">
initial_amount = #{record.initialAmount,jdbcType=DECIMAL},
</if>
<if test="record.currentAmount != null">
current_amount = #{record.currentAmount,jdbcType=DECIMAL},
</if>
<if test="record.remark != null">
remark = #{record.remark,jdbcType=VARCHAR},
</if>
<if test="record.isDefault != null">
is_default = #{record.isDefault,jdbcType=BIT},
</if>
<if test="record.tenantId != null">
tenant_id = #{record.tenantId,jdbcType=BIGINT},
</if>
<if test="record.deleteFlag != null">
delete_flag = #{record.deleteFlag,jdbcType=VARCHAR},
</if>
</set>
<if test="_parameter != null">
<include refid="Update_By_Example_Where_Clause" />
</if>
</update>
<update id="updateByExample" parameterType="map">
update jsh_account
set id = #{record.id,jdbcType=BIGINT},
name = #{record.name,jdbcType=VARCHAR},
serial_no = #{record.serialNo,jdbcType=VARCHAR},
initial_amount = #{record.initialAmount,jdbcType=DECIMAL},
current_amount = #{record.currentAmount,jdbcType=DECIMAL},
remark = #{record.remark,jdbcType=VARCHAR},
is_default = #{record.isDefault,jdbcType=BIT},
tenant_id = #{record.tenantId,jdbcType=BIGINT},
delete_flag = #{record.deleteFlag,jdbcType=VARCHAR}
<if test="_parameter != null">
<include refid="Update_By_Example_Where_Clause" />
</if>
</update>
<update id="updateByPrimaryKeySelective" parameterType="com.jsh.erp.datasource.entities.Account">
update jsh_account
<set>
<if test="name != null">
name = #{name,jdbcType=VARCHAR},
</if>
<if test="serialNo != null">
serial_no = #{serialNo,jdbcType=VARCHAR},
</if>
<if test="initialAmount != null">
initial_amount = #{initialAmount,jdbcType=DECIMAL},
</if>
<if test="currentAmount != null">
current_amount = #{currentAmount,jdbcType=DECIMAL},
</if>
<if test="remark != null">
remark = #{remark,jdbcType=VARCHAR},
</if>
<if test="isDefault != null">
is_default = #{isDefault,jdbcType=BIT},
</if>
<if test="tenantId != null">
tenant_id = #{tenantId,jdbcType=BIGINT},
</if>
<if test="deleteFlag != null">
delete_flag = #{deleteFlag,jdbcType=VARCHAR},
</if>
</set>
where id = #{id,jdbcType=BIGINT}
</update>
<update id="updateByPrimaryKey" parameterType="com.jsh.erp.datasource.entities.Account">
update jsh_account
set name = #{name,jdbcType=VARCHAR},
serial_no = #{serialNo,jdbcType=VARCHAR},
initial_amount = #{initialAmount,jdbcType=DECIMAL},
current_amount = #{currentAmount,jdbcType=DECIMAL},
remark = #{remark,jdbcType=VARCHAR},
is_default = #{isDefault,jdbcType=BIT},
tenant_id = #{tenantId,jdbcType=BIGINT},
delete_flag = #{deleteFlag,jdbcType=VARCHAR}
where id = #{id,jdbcType=BIGINT}
</update>
</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">
<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">
<result column="thismonthamount" jdbcType="VARCHAR" property="thismonthamount" />
<result column="thisMonthAmount" jdbcType="VARCHAR" property="thisMonthAmount" />
</resultMap>
<resultMap id="ResultInOutList" type="com.jsh.erp.datasource.vo.AccountVo4InOutList">
@@ -23,12 +23,12 @@
and name like '%${name}%'
</if>
<if test="serialNo != null">
and SerialNo like '%${serialNo}%'
and serial_no like '%${serialNo}%'
</if>
<if test="remark != null">
and remark like '%${remark}%'
</if>
and ifnull(delete_Flag,'0') !='1'
and ifnull(delete_flag,'0') !='1'
<if test="offset != null and rows != null">
limit #{offset},#{rows}
</if>
@@ -43,12 +43,12 @@
and name like '%${name}%'
</if>
<if test="serialNo != null">
and SerialNo like '%${serialNo}%'
and serial_no like '%${serialNo}%'
</if>
<if test="remark != null">
and remark like '%${remark}%'
</if>
and ifnull(delete_Flag,'0') !='1'
and ifnull(delete_flag,'0') !='1'
</select>
<select id="findAccountInOutList" parameterType="com.jsh.erp.datasource.entities.AccountExample" resultMap="ResultInOutList">
@@ -175,7 +175,7 @@
</select>
<update id="batchDeleteAccountByIds">
update jsh_account
set delete_Flag='1'
set delete_flag='1'
where 1=1
and id in (
<foreach collection="ids" item="id" separator=",">

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

@@ -207,9 +207,9 @@
) priceSum
from jsh_depothead dh
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
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'
) m
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 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 (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
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'
) m on m.Id=di.MaterialId where dh.type='${type}' and dh.OperTime >='${beginTime}' and dh.OperTime &lt;='${endTime}'
<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="AnotherDepotName" jdbcType="VARCHAR" property="AnotherDepotName" />
<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" />
</resultMap>
<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="MName" jdbcType="VARCHAR" property="MName" />
<result column="MMfrs" jdbcType="VARCHAR" property="MMfrs" />
<result column="MModel" jdbcType="VARCHAR" property="MModel" />
<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="purchase_decimal" jdbcType="DECIMAL" property="purchaseDecimal" />
</resultMap>
@@ -139,7 +140,7 @@
<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,
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
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'
@@ -152,8 +153,8 @@
</select>
<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,
me.purchase_decimal, u.UName UName
select m.id MId, m.Name MName, m.Mfrs MMfrs, m.Model MModel, m.Unit MaterialUnit, m.Color MColor,
me.purchase_decimal, u.name unit_name
from jsh_material m
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'
@@ -171,7 +172,7 @@
and dh.OperTime &lt;= '${endTime}'
</if>
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
<if test="offset != null and rows != null">
limit #{offset},#{rows}
@@ -381,7 +382,7 @@
(IFNULL(intype.BasicInNumber ,0) - IFNULL(outtype.BasicOutNumber ,0) - ifnull(m.safetystock,0)) BasicLinjieNumber
FROM
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 (
SELECT
di.MaterialId,

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

@@ -1,380 +1,321 @@
<?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">
<mapper namespace="com.jsh.erp.datasource.mappers.FunctionsMapper">
<resultMap id="BaseResultMap" type="com.jsh.erp.datasource.entities.Functions">
<!--
WARNING - @mbggenerated
This element is automatically generated by MyBatis Generator, do not modify.
-->
<id column="Id" jdbcType="BIGINT" property="id" />
<result column="Number" jdbcType="VARCHAR" property="number" />
<result column="Name" jdbcType="VARCHAR" property="name" />
<result column="PNumber" jdbcType="VARCHAR" property="pnumber" />
<result column="URL" jdbcType="VARCHAR" property="url" />
<result column="State" jdbcType="BIT" property="state" />
<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="delete_Flag" jdbcType="VARCHAR" property="deleteFlag" />
</resultMap>
<sql id="Example_Where_Clause">
<!--
WARNING - @mbggenerated
This element is automatically generated by MyBatis Generator, do not modify.
-->
<where>
<foreach collection="oredCriteria" item="criteria" separator="or">
<if test="criteria.valid">
<trim prefix="(" prefixOverrides="and" suffix=")">
<foreach collection="criteria.criteria" item="criterion">
<choose>
<when test="criterion.noValue">
and ${criterion.condition}
</when>
<when test="criterion.singleValue">
and ${criterion.condition} #{criterion.value}
</when>
<when test="criterion.betweenValue">
and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
</when>
<when test="criterion.listValue">
and ${criterion.condition}
<foreach close=")" collection="criterion.value" item="listItem" open="(" separator=",">
#{listItem}
</foreach>
</when>
</choose>
</foreach>
</trim>
</if>
</foreach>
</where>
</sql>
<sql id="Update_By_Example_Where_Clause">
<!--
WARNING - @mbggenerated
This element is automatically generated by MyBatis Generator, do not modify.
-->
<where>
<foreach collection="example.oredCriteria" item="criteria" separator="or">
<if test="criteria.valid">
<trim prefix="(" prefixOverrides="and" suffix=")">
<foreach collection="criteria.criteria" item="criterion">
<choose>
<when test="criterion.noValue">
and ${criterion.condition}
</when>
<when test="criterion.singleValue">
and ${criterion.condition} #{criterion.value}
</when>
<when test="criterion.betweenValue">
and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
</when>
<when test="criterion.listValue">
and ${criterion.condition}
<foreach close=")" collection="criterion.value" item="listItem" open="(" separator=",">
#{listItem}
</foreach>
</when>
</choose>
</foreach>
</trim>
</if>
</foreach>
</where>
</sql>
<sql id="Base_Column_List">
<!--
WARNING - @mbggenerated
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>
<select id="selectByExample" parameterType="com.jsh.erp.datasource.entities.FunctionsExample" resultMap="BaseResultMap">
<!--
WARNING - @mbggenerated
This element is automatically generated by MyBatis Generator, do not modify.
-->
select
<if test="distinct">
distinct
</if>
<include refid="Base_Column_List" />
from jsh_functions
<if test="_parameter != null">
<include refid="Example_Where_Clause" />
</if>
<if test="orderByClause != null">
order by ${orderByClause}
</if>
</select>
<select id="selectByPrimaryKey" parameterType="java.lang.Long" resultMap="BaseResultMap">
<!--
WARNING - @mbggenerated
This element is automatically generated by MyBatis Generator, do not modify.
-->
select
<include refid="Base_Column_List" />
from jsh_functions
where Id = #{id,jdbcType=BIGINT}
</select>
<delete id="deleteByPrimaryKey" parameterType="java.lang.Long">
<!--
WARNING - @mbggenerated
This element is automatically generated by MyBatis Generator, do not modify.
-->
delete from jsh_functions
where Id = #{id,jdbcType=BIGINT}
</delete>
<delete id="deleteByExample" parameterType="com.jsh.erp.datasource.entities.FunctionsExample">
<!--
WARNING - @mbggenerated
This element is automatically generated by MyBatis Generator, do not modify.
-->
delete from jsh_functions
<if test="_parameter != null">
<include refid="Example_Where_Clause" />
</if>
</delete>
<insert id="insert" parameterType="com.jsh.erp.datasource.entities.Functions">
<!--
WARNING - @mbggenerated
This element is automatically generated by MyBatis Generator, do not modify.
-->
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},
#{pnumber,jdbcType=VARCHAR}, #{url,jdbcType=VARCHAR}, #{state,jdbcType=BIT}, #{sort,jdbcType=VARCHAR},
#{enabled,jdbcType=BIT}, #{type,jdbcType=VARCHAR}, #{pushbtn,jdbcType=VARCHAR},
#{icon,jdbcType=VARCHAR}, #{deleteFlag,jdbcType=VARCHAR})
</insert>
<insert id="insertSelective" parameterType="com.jsh.erp.datasource.entities.Functions">
<!--
WARNING - @mbggenerated
This element is automatically generated by MyBatis Generator, do not modify.
-->
insert into jsh_functions
<trim prefix="(" suffix=")" suffixOverrides=",">
<if test="id != null">
Id,
</if>
<if test="number != null">
Number,
</if>
<if test="name != null">
Name,
</if>
<if test="pnumber != null">
PNumber,
</if>
<if test="url != null">
URL,
</if>
<if test="state != null">
State,
</if>
<if test="sort != null">
Sort,
</if>
<if test="enabled != null">
Enabled,
</if>
<if test="type != null">
Type,
</if>
<if test="pushbtn != null">
PushBtn,
</if>
<if test="icon != null">
icon,
</if>
<if test="deleteFlag != null">
delete_Flag,
</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="id != null">
#{id,jdbcType=BIGINT},
</if>
<if test="number != null">
#{number,jdbcType=VARCHAR},
</if>
<if test="name != null">
#{name,jdbcType=VARCHAR},
</if>
<if test="pnumber != null">
#{pnumber,jdbcType=VARCHAR},
</if>
<if test="url != null">
#{url,jdbcType=VARCHAR},
</if>
<if test="state != null">
#{state,jdbcType=BIT},
</if>
<if test="sort != null">
#{sort,jdbcType=VARCHAR},
</if>
<if test="enabled != null">
#{enabled,jdbcType=BIT},
</if>
<if test="type != null">
#{type,jdbcType=VARCHAR},
</if>
<if test="pushbtn != null">
#{pushbtn,jdbcType=VARCHAR},
</if>
<if test="icon != null">
#{icon,jdbcType=VARCHAR},
</if>
<if test="deleteFlag != null">
#{deleteFlag,jdbcType=VARCHAR},
</if>
</trim>
</insert>
<select id="countByExample" parameterType="com.jsh.erp.datasource.entities.FunctionsExample" resultType="java.lang.Integer">
<!--
WARNING - @mbggenerated
This element is automatically generated by MyBatis Generator, do not modify.
-->
select count(*) from jsh_functions
<if test="_parameter != null">
<include refid="Example_Where_Clause" />
</if>
</select>
<update id="updateByExampleSelective" parameterType="map">
<!--
WARNING - @mbggenerated
This element is automatically generated by MyBatis Generator, do not modify.
-->
update jsh_functions
<set>
<if test="record.id != null">
Id = #{record.id,jdbcType=BIGINT},
</if>
<if test="record.number != null">
Number = #{record.number,jdbcType=VARCHAR},
</if>
<if test="record.name != null">
Name = #{record.name,jdbcType=VARCHAR},
</if>
<if test="record.pnumber != null">
PNumber = #{record.pnumber,jdbcType=VARCHAR},
</if>
<if test="record.url != null">
URL = #{record.url,jdbcType=VARCHAR},
</if>
<if test="record.state != null">
State = #{record.state,jdbcType=BIT},
</if>
<if test="record.sort != null">
Sort = #{record.sort,jdbcType=VARCHAR},
</if>
<if test="record.enabled != null">
Enabled = #{record.enabled,jdbcType=BIT},
</if>
<if test="record.type != null">
Type = #{record.type,jdbcType=VARCHAR},
</if>
<if test="record.pushbtn != null">
PushBtn = #{record.pushbtn,jdbcType=VARCHAR},
</if>
<if test="record.icon != null">
icon = #{record.icon,jdbcType=VARCHAR},
</if>
<if test="record.deleteFlag != null">
delete_Flag = #{record.deleteFlag,jdbcType=VARCHAR},
</if>
</set>
<if test="_parameter != null">
<include refid="Update_By_Example_Where_Clause" />
</if>
</update>
<update id="updateByExample" parameterType="map">
<!--
WARNING - @mbggenerated
This element is automatically generated by MyBatis Generator, do not modify.
-->
update jsh_functions
set Id = #{record.id,jdbcType=BIGINT},
Number = #{record.number,jdbcType=VARCHAR},
Name = #{record.name,jdbcType=VARCHAR},
PNumber = #{record.pnumber,jdbcType=VARCHAR},
URL = #{record.url,jdbcType=VARCHAR},
State = #{record.state,jdbcType=BIT},
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},
delete_Flag = #{record.deleteFlag,jdbcType=VARCHAR}
<if test="_parameter != null">
<include refid="Update_By_Example_Where_Clause" />
</if>
</update>
<update id="updateByPrimaryKeySelective" parameterType="com.jsh.erp.datasource.entities.Functions">
<!--
WARNING - @mbggenerated
This element is automatically generated by MyBatis Generator, do not modify.
-->
update jsh_functions
<set>
<if test="number != null">
Number = #{number,jdbcType=VARCHAR},
</if>
<if test="name != null">
Name = #{name,jdbcType=VARCHAR},
</if>
<if test="pnumber != null">
PNumber = #{pnumber,jdbcType=VARCHAR},
</if>
<if test="url != null">
URL = #{url,jdbcType=VARCHAR},
</if>
<if test="state != null">
State = #{state,jdbcType=BIT},
</if>
<if test="sort != null">
Sort = #{sort,jdbcType=VARCHAR},
</if>
<if test="enabled != null">
Enabled = #{enabled,jdbcType=BIT},
</if>
<if test="type != null">
Type = #{type,jdbcType=VARCHAR},
</if>
<if test="pushbtn != null">
PushBtn = #{pushbtn,jdbcType=VARCHAR},
</if>
<if test="icon != null">
icon = #{icon,jdbcType=VARCHAR},
</if>
<if test="deleteFlag != null">
delete_Flag = #{deleteFlag,jdbcType=VARCHAR},
</if>
</set>
where Id = #{id,jdbcType=BIGINT}
</update>
<update id="updateByPrimaryKey" parameterType="com.jsh.erp.datasource.entities.Functions">
<!--
WARNING - @mbggenerated
This element is automatically generated by MyBatis Generator, do not modify.
-->
update jsh_functions
set Number = #{number,jdbcType=VARCHAR},
Name = #{name,jdbcType=VARCHAR},
PNumber = #{pnumber,jdbcType=VARCHAR},
URL = #{url,jdbcType=VARCHAR},
State = #{state,jdbcType=BIT},
Sort = #{sort,jdbcType=VARCHAR},
Enabled = #{enabled,jdbcType=BIT},
Type = #{type,jdbcType=VARCHAR},
PushBtn = #{pushbtn,jdbcType=VARCHAR},
icon = #{icon,jdbcType=VARCHAR},
delete_Flag = #{deleteFlag,jdbcType=VARCHAR}
where Id = #{id,jdbcType=BIGINT}
</update>
<?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">
<mapper namespace="com.jsh.erp.datasource.mappers.FunctionMapper">
<resultMap id="BaseResultMap" type="com.jsh.erp.datasource.entities.Function">
<id column="id" jdbcType="BIGINT" property="id" />
<result column="number" jdbcType="VARCHAR" property="number" />
<result column="name" jdbcType="VARCHAR" property="name" />
<result column="parent_number" jdbcType="VARCHAR" property="parentNumber" />
<result column="url" jdbcType="VARCHAR" property="url" />
<result column="state" jdbcType="BIT" property="state" />
<result column="sort" jdbcType="VARCHAR" property="sort" />
<result column="enabled" jdbcType="BIT" property="enabled" />
<result column="type" jdbcType="VARCHAR" property="type" />
<result column="push_btn" jdbcType="VARCHAR" property="pushBtn" />
<result column="icon" jdbcType="VARCHAR" property="icon" />
<result column="delete_flag" jdbcType="VARCHAR" property="deleteFlag" />
</resultMap>
<sql id="Example_Where_Clause">
<where>
<foreach collection="oredCriteria" item="criteria" separator="or">
<if test="criteria.valid">
<trim prefix="(" prefixOverrides="and" suffix=")">
<foreach collection="criteria.criteria" item="criterion">
<choose>
<when test="criterion.noValue">
and ${criterion.condition}
</when>
<when test="criterion.singleValue">
and ${criterion.condition} #{criterion.value}
</when>
<when test="criterion.betweenValue">
and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
</when>
<when test="criterion.listValue">
and ${criterion.condition}
<foreach close=")" collection="criterion.value" item="listItem" open="(" separator=",">
#{listItem}
</foreach>
</when>
</choose>
</foreach>
</trim>
</if>
</foreach>
</where>
</sql>
<sql id="Update_By_Example_Where_Clause">
<where>
<foreach collection="example.oredCriteria" item="criteria" separator="or">
<if test="criteria.valid">
<trim prefix="(" prefixOverrides="and" suffix=")">
<foreach collection="criteria.criteria" item="criterion">
<choose>
<when test="criterion.noValue">
and ${criterion.condition}
</when>
<when test="criterion.singleValue">
and ${criterion.condition} #{criterion.value}
</when>
<when test="criterion.betweenValue">
and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
</when>
<when test="criterion.listValue">
and ${criterion.condition}
<foreach close=")" collection="criterion.value" item="listItem" open="(" separator=",">
#{listItem}
</foreach>
</when>
</choose>
</foreach>
</trim>
</if>
</foreach>
</where>
</sql>
<sql id="Base_Column_List">
id, number, name, parent_number, url, state, sort, enabled, type, push_btn, icon,
delete_flag
</sql>
<select id="selectByExample" parameterType="com.jsh.erp.datasource.entities.FunctionExample" resultMap="BaseResultMap">
select
<if test="distinct">
distinct
</if>
<include refid="Base_Column_List" />
from jsh_function
<if test="_parameter != null">
<include refid="Example_Where_Clause" />
</if>
<if test="orderByClause != null">
order by ${orderByClause}
</if>
</select>
<select id="selectByPrimaryKey" parameterType="java.lang.Long" resultMap="BaseResultMap">
select
<include refid="Base_Column_List" />
from jsh_function
where id = #{id,jdbcType=BIGINT}
</select>
<delete id="deleteByPrimaryKey" parameterType="java.lang.Long">
delete from jsh_function
where id = #{id,jdbcType=BIGINT}
</delete>
<delete id="deleteByExample" parameterType="com.jsh.erp.datasource.entities.FunctionExample">
delete from jsh_function
<if test="_parameter != null">
<include refid="Example_Where_Clause" />
</if>
</delete>
<insert id="insert" parameterType="com.jsh.erp.datasource.entities.Function">
insert into jsh_function (id, number, name,
parent_number, url, state,
sort, enabled, type, push_btn,
icon, delete_flag)
values (#{id,jdbcType=BIGINT}, #{number,jdbcType=VARCHAR}, #{name,jdbcType=VARCHAR},
#{parentNumber,jdbcType=VARCHAR}, #{url,jdbcType=VARCHAR}, #{state,jdbcType=BIT},
#{sort,jdbcType=VARCHAR}, #{enabled,jdbcType=BIT}, #{type,jdbcType=VARCHAR}, #{pushBtn,jdbcType=VARCHAR},
#{icon,jdbcType=VARCHAR}, #{deleteFlag,jdbcType=VARCHAR})
</insert>
<insert id="insertSelective" parameterType="com.jsh.erp.datasource.entities.Function">
insert into jsh_function
<trim prefix="(" suffix=")" suffixOverrides=",">
<if test="id != null">
id,
</if>
<if test="number != null">
number,
</if>
<if test="name != null">
name,
</if>
<if test="parentNumber != null">
parent_number,
</if>
<if test="url != null">
url,
</if>
<if test="state != null">
state,
</if>
<if test="sort != null">
sort,
</if>
<if test="enabled != null">
enabled,
</if>
<if test="type != null">
type,
</if>
<if test="pushBtn != null">
push_btn,
</if>
<if test="icon != null">
icon,
</if>
<if test="deleteFlag != null">
delete_flag,
</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="id != null">
#{id,jdbcType=BIGINT},
</if>
<if test="number != null">
#{number,jdbcType=VARCHAR},
</if>
<if test="name != null">
#{name,jdbcType=VARCHAR},
</if>
<if test="parentNumber != null">
#{parentNumber,jdbcType=VARCHAR},
</if>
<if test="url != null">
#{url,jdbcType=VARCHAR},
</if>
<if test="state != null">
#{state,jdbcType=BIT},
</if>
<if test="sort != null">
#{sort,jdbcType=VARCHAR},
</if>
<if test="enabled != null">
#{enabled,jdbcType=BIT},
</if>
<if test="type != null">
#{type,jdbcType=VARCHAR},
</if>
<if test="pushBtn != null">
#{pushBtn,jdbcType=VARCHAR},
</if>
<if test="icon != null">
#{icon,jdbcType=VARCHAR},
</if>
<if test="deleteFlag != null">
#{deleteFlag,jdbcType=VARCHAR},
</if>
</trim>
</insert>
<select id="countByExample" parameterType="com.jsh.erp.datasource.entities.FunctionExample" resultType="java.lang.Long">
select count(*) from jsh_function
<if test="_parameter != null">
<include refid="Example_Where_Clause" />
</if>
</select>
<update id="updateByExampleSelective" parameterType="map">
update jsh_function
<set>
<if test="record.id != null">
id = #{record.id,jdbcType=BIGINT},
</if>
<if test="record.number != null">
number = #{record.number,jdbcType=VARCHAR},
</if>
<if test="record.name != null">
name = #{record.name,jdbcType=VARCHAR},
</if>
<if test="record.parentNumber != null">
parent_number = #{record.parentNumber,jdbcType=VARCHAR},
</if>
<if test="record.url != null">
url = #{record.url,jdbcType=VARCHAR},
</if>
<if test="record.state != null">
state = #{record.state,jdbcType=BIT},
</if>
<if test="record.sort != null">
sort = #{record.sort,jdbcType=VARCHAR},
</if>
<if test="record.enabled != null">
enabled = #{record.enabled,jdbcType=BIT},
</if>
<if test="record.type != null">
type = #{record.type,jdbcType=VARCHAR},
</if>
<if test="record.pushBtn != null">
push_btn = #{record.pushBtn,jdbcType=VARCHAR},
</if>
<if test="record.icon != null">
icon = #{record.icon,jdbcType=VARCHAR},
</if>
<if test="record.deleteFlag != null">
delete_flag = #{record.deleteFlag,jdbcType=VARCHAR},
</if>
</set>
<if test="_parameter != null">
<include refid="Update_By_Example_Where_Clause" />
</if>
</update>
<update id="updateByExample" parameterType="map">
update jsh_function
set id = #{record.id,jdbcType=BIGINT},
number = #{record.number,jdbcType=VARCHAR},
name = #{record.name,jdbcType=VARCHAR},
parent_number = #{record.parentNumber,jdbcType=VARCHAR},
url = #{record.url,jdbcType=VARCHAR},
state = #{record.state,jdbcType=BIT},
sort = #{record.sort,jdbcType=VARCHAR},
enabled = #{record.enabled,jdbcType=BIT},
type = #{record.type,jdbcType=VARCHAR},
push_btn = #{record.pushBtn,jdbcType=VARCHAR},
icon = #{record.icon,jdbcType=VARCHAR},
delete_flag = #{record.deleteFlag,jdbcType=VARCHAR}
<if test="_parameter != null">
<include refid="Update_By_Example_Where_Clause" />
</if>
</update>
<update id="updateByPrimaryKeySelective" parameterType="com.jsh.erp.datasource.entities.Function">
update jsh_function
<set>
<if test="number != null">
number = #{number,jdbcType=VARCHAR},
</if>
<if test="name != null">
name = #{name,jdbcType=VARCHAR},
</if>
<if test="parentNumber != null">
parent_number = #{parentNumber,jdbcType=VARCHAR},
</if>
<if test="url != null">
url = #{url,jdbcType=VARCHAR},
</if>
<if test="state != null">
state = #{state,jdbcType=BIT},
</if>
<if test="sort != null">
sort = #{sort,jdbcType=VARCHAR},
</if>
<if test="enabled != null">
enabled = #{enabled,jdbcType=BIT},
</if>
<if test="type != null">
type = #{type,jdbcType=VARCHAR},
</if>
<if test="pushBtn != null">
push_btn = #{pushBtn,jdbcType=VARCHAR},
</if>
<if test="icon != null">
icon = #{icon,jdbcType=VARCHAR},
</if>
<if test="deleteFlag != null">
delete_flag = #{deleteFlag,jdbcType=VARCHAR},
</if>
</set>
where id = #{id,jdbcType=BIGINT}
</update>
<update id="updateByPrimaryKey" parameterType="com.jsh.erp.datasource.entities.Function">
update jsh_function
set number = #{number,jdbcType=VARCHAR},
name = #{name,jdbcType=VARCHAR},
parent_number = #{parentNumber,jdbcType=VARCHAR},
url = #{url,jdbcType=VARCHAR},
state = #{state,jdbcType=BIT},
sort = #{sort,jdbcType=VARCHAR},
enabled = #{enabled,jdbcType=BIT},
type = #{type,jdbcType=VARCHAR},
push_btn = #{pushBtn,jdbcType=VARCHAR},
icon = #{icon,jdbcType=VARCHAR},
delete_flag = #{deleteFlag,jdbcType=VARCHAR}
where id = #{id,jdbcType=BIGINT}
</update>
</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"?>
<!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">
<select id="selectByConditionFunctions" parameterType="com.jsh.erp.datasource.entities.FunctionsExample" resultMap="com.jsh.erp.datasource.mappers.FunctionsMapper.BaseResultMap">
<mapper namespace="com.jsh.erp.datasource.mappers.FunctionMapperEx">
<select id="selectByConditionFunction" parameterType="com.jsh.erp.datasource.entities.FunctionExample" resultMap="com.jsh.erp.datasource.mappers.FunctionMapper.BaseResultMap">
select *
FROM jsh_functions
FROM jsh_function
where 1=1
<if test="name != null">
and name like '%${name}%'
@@ -11,16 +11,16 @@
<if test="type != null">
and type='${type}'
</if>
and ifnull(delete_Flag,'0') !='1'
and ifnull(delete_flag,'0') !='1'
order by sort asc
<if test="offset != null and rows != null">
limit #{offset},#{rows}
</if>
</select>
<select id="countsByFunctions" resultType="java.lang.Long">
<select id="countsByFunction" resultType="java.lang.Long">
SELECT
COUNT(id)
FROM jsh_functions
FROM jsh_function
WHERE 1=1
<if test="name != null">
and name like '%${name}%'
@@ -28,11 +28,11 @@
<if test="type != null">
and type='${type}'
</if>
and ifnull(delete_Flag,'0') !='1'
and ifnull(delete_flag,'0') !='1'
</select>
<update id="batchDeleteFunctionsByIds">
update jsh_functions
set delete_Flag='1'
<update id="batchDeleteFunctionByIds">
update jsh_function
set delete_flag='1'
where 1=1
and id in (
<foreach collection="ids" item="id" separator=",">

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

@@ -1,288 +1,228 @@
<?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">
<mapper namespace="com.jsh.erp.datasource.mappers.InOutItemMapper">
<resultMap id="BaseResultMap" type="com.jsh.erp.datasource.entities.InOutItem">
<!--
WARNING - @mbggenerated
This element is automatically generated by MyBatis Generator, do not modify.
-->
<id column="Id" jdbcType="BIGINT" property="id" />
<result column="Name" jdbcType="VARCHAR" property="name" />
<result column="Type" jdbcType="VARCHAR" property="type" />
<result column="Remark" jdbcType="VARCHAR" property="remark" />
<result column="tenant_id" jdbcType="BIGINT" property="tenantId" />
<result column="delete_Flag" jdbcType="VARCHAR" property="deleteFlag" />
</resultMap>
<sql id="Example_Where_Clause">
<!--
WARNING - @mbggenerated
This element is automatically generated by MyBatis Generator, do not modify.
-->
<where>
<foreach collection="oredCriteria" item="criteria" separator="or">
<if test="criteria.valid">
<trim prefix="(" prefixOverrides="and" suffix=")">
<foreach collection="criteria.criteria" item="criterion">
<choose>
<when test="criterion.noValue">
and ${criterion.condition}
</when>
<when test="criterion.singleValue">
and ${criterion.condition} #{criterion.value}
</when>
<when test="criterion.betweenValue">
and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
</when>
<when test="criterion.listValue">
and ${criterion.condition}
<foreach close=")" collection="criterion.value" item="listItem" open="(" separator=",">
#{listItem}
</foreach>
</when>
</choose>
</foreach>
</trim>
</if>
</foreach>
</where>
</sql>
<sql id="Update_By_Example_Where_Clause">
<!--
WARNING - @mbggenerated
This element is automatically generated by MyBatis Generator, do not modify.
-->
<where>
<foreach collection="example.oredCriteria" item="criteria" separator="or">
<if test="criteria.valid">
<trim prefix="(" prefixOverrides="and" suffix=")">
<foreach collection="criteria.criteria" item="criterion">
<choose>
<when test="criterion.noValue">
and ${criterion.condition}
</when>
<when test="criterion.singleValue">
and ${criterion.condition} #{criterion.value}
</when>
<when test="criterion.betweenValue">
and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
</when>
<when test="criterion.listValue">
and ${criterion.condition}
<foreach close=")" collection="criterion.value" item="listItem" open="(" separator=",">
#{listItem}
</foreach>
</when>
</choose>
</foreach>
</trim>
</if>
</foreach>
</where>
</sql>
<sql id="Base_Column_List">
<!--
WARNING - @mbggenerated
This element is automatically generated by MyBatis Generator, do not modify.
-->
Id, Name, Type, Remark, tenant_id, delete_Flag
</sql>
<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
<if test="distinct">
distinct
</if>
<include refid="Base_Column_List" />
from jsh_inoutitem
<if test="_parameter != null">
<include refid="Example_Where_Clause" />
</if>
<if test="orderByClause != null">
order by ${orderByClause}
</if>
</select>
<select id="selectByPrimaryKey" parameterType="java.lang.Long" resultMap="BaseResultMap">
<!--
WARNING - @mbggenerated
This element is automatically generated by MyBatis Generator, do not modify.
-->
select
<include refid="Base_Column_List" />
from jsh_inoutitem
where Id = #{id,jdbcType=BIGINT}
</select>
<delete id="deleteByPrimaryKey" parameterType="java.lang.Long">
<!--
WARNING - @mbggenerated
This element is automatically generated by MyBatis Generator, do not modify.
-->
delete from jsh_inoutitem
where Id = #{id,jdbcType=BIGINT}
</delete>
<delete id="deleteByExample" parameterType="com.jsh.erp.datasource.entities.InOutItemExample">
<!--
WARNING - @mbggenerated
This element is automatically generated by MyBatis Generator, do not modify.
-->
delete from jsh_inoutitem
<if test="_parameter != null">
<include refid="Example_Where_Clause" />
</if>
</delete>
<insert id="insert" parameterType="com.jsh.erp.datasource.entities.InOutItem">
<!--
WARNING - @mbggenerated
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},
#{remark,jdbcType=VARCHAR}, #{tenantId,jdbcType=BIGINT}, #{deleteFlag,jdbcType=VARCHAR}
)
</insert>
<insert id="insertSelective" parameterType="com.jsh.erp.datasource.entities.InOutItem">
<!--
WARNING - @mbggenerated
This element is automatically generated by MyBatis Generator, do not modify.
-->
insert into jsh_inoutitem
<trim prefix="(" suffix=")" suffixOverrides=",">
<if test="id != null">
Id,
</if>
<if test="name != null">
Name,
</if>
<if test="type != null">
Type,
</if>
<if test="remark != null">
Remark,
</if>
<if test="tenantId != null">
tenant_id,
</if>
<if test="deleteFlag != null">
delete_Flag,
</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="id != null">
#{id,jdbcType=BIGINT},
</if>
<if test="name != null">
#{name,jdbcType=VARCHAR},
</if>
<if test="type != null">
#{type,jdbcType=VARCHAR},
</if>
<if test="remark != null">
#{remark,jdbcType=VARCHAR},
</if>
<if test="tenantId != null">
#{tenantId,jdbcType=BIGINT},
</if>
<if test="deleteFlag != null">
#{deleteFlag,jdbcType=VARCHAR},
</if>
</trim>
</insert>
<select id="countByExample" parameterType="com.jsh.erp.datasource.entities.InOutItemExample" resultType="java.lang.Integer">
<!--
WARNING - @mbggenerated
This element is automatically generated by MyBatis Generator, do not modify.
-->
select count(*) from jsh_inoutitem
<if test="_parameter != null">
<include refid="Example_Where_Clause" />
</if>
</select>
<update id="updateByExampleSelective" parameterType="map">
<!--
WARNING - @mbggenerated
This element is automatically generated by MyBatis Generator, do not modify.
-->
update jsh_inoutitem
<set>
<if test="record.id != null">
Id = #{record.id,jdbcType=BIGINT},
</if>
<if test="record.name != null">
Name = #{record.name,jdbcType=VARCHAR},
</if>
<if test="record.type != null">
Type = #{record.type,jdbcType=VARCHAR},
</if>
<if test="record.remark != null">
Remark = #{record.remark,jdbcType=VARCHAR},
</if>
<if test="record.tenantId != null">
tenant_id = #{record.tenantId,jdbcType=BIGINT},
</if>
<if test="record.deleteFlag != null">
delete_Flag = #{record.deleteFlag,jdbcType=VARCHAR},
</if>
</set>
<if test="_parameter != null">
<include refid="Update_By_Example_Where_Clause" />
</if>
</update>
<update id="updateByExample" parameterType="map">
<!--
WARNING - @mbggenerated
This element is automatically generated by MyBatis Generator, do not modify.
-->
update jsh_inoutitem
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},
delete_Flag = #{record.deleteFlag,jdbcType=VARCHAR}
<if test="_parameter != null">
<include refid="Update_By_Example_Where_Clause" />
</if>
</update>
<update id="updateByPrimaryKeySelective" parameterType="com.jsh.erp.datasource.entities.InOutItem">
<!--
WARNING - @mbggenerated
This element is automatically generated by MyBatis Generator, do not modify.
-->
update jsh_inoutitem
<set>
<if test="name != null">
Name = #{name,jdbcType=VARCHAR},
</if>
<if test="type != null">
Type = #{type,jdbcType=VARCHAR},
</if>
<if test="remark != null">
Remark = #{remark,jdbcType=VARCHAR},
</if>
<if test="tenantId != null">
tenant_id = #{tenantId,jdbcType=BIGINT},
</if>
<if test="deleteFlag != null">
delete_Flag = #{deleteFlag,jdbcType=VARCHAR},
</if>
</set>
where Id = #{id,jdbcType=BIGINT}
</update>
<update id="updateByPrimaryKey" parameterType="com.jsh.erp.datasource.entities.InOutItem">
<!--
WARNING - @mbggenerated
This element is automatically generated by MyBatis Generator, do not modify.
-->
update jsh_inoutitem
set Name = #{name,jdbcType=VARCHAR},
Type = #{type,jdbcType=VARCHAR},
Remark = #{remark,jdbcType=VARCHAR},
tenant_id = #{tenantId,jdbcType=BIGINT},
delete_Flag = #{deleteFlag,jdbcType=VARCHAR}
where Id = #{id,jdbcType=BIGINT}
</update>
<mapper namespace="com.jsh.erp.datasource.mappers.InOutItemMapper">
<resultMap id="BaseResultMap" type="com.jsh.erp.datasource.entities.InOutItem">
<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="delete_flag" jdbcType="VARCHAR" property="deleteFlag" />
</resultMap>
<sql id="Example_Where_Clause">
<where>
<foreach collection="oredCriteria" item="criteria" separator="or">
<if test="criteria.valid">
<trim prefix="(" prefixOverrides="and" suffix=")">
<foreach collection="criteria.criteria" item="criterion">
<choose>
<when test="criterion.noValue">
and ${criterion.condition}
</when>
<when test="criterion.singleValue">
and ${criterion.condition} #{criterion.value}
</when>
<when test="criterion.betweenValue">
and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
</when>
<when test="criterion.listValue">
and ${criterion.condition}
<foreach close=")" collection="criterion.value" item="listItem" open="(" separator=",">
#{listItem}
</foreach>
</when>
</choose>
</foreach>
</trim>
</if>
</foreach>
</where>
</sql>
<sql id="Update_By_Example_Where_Clause">
<where>
<foreach collection="example.oredCriteria" item="criteria" separator="or">
<if test="criteria.valid">
<trim prefix="(" prefixOverrides="and" suffix=")">
<foreach collection="criteria.criteria" item="criterion">
<choose>
<when test="criterion.noValue">
and ${criterion.condition}
</when>
<when test="criterion.singleValue">
and ${criterion.condition} #{criterion.value}
</when>
<when test="criterion.betweenValue">
and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
</when>
<when test="criterion.listValue">
and ${criterion.condition}
<foreach close=")" collection="criterion.value" item="listItem" open="(" separator=",">
#{listItem}
</foreach>
</when>
</choose>
</foreach>
</trim>
</if>
</foreach>
</where>
</sql>
<sql id="Base_Column_List">
id, name, type, remark, tenant_id, delete_flag
</sql>
<select id="selectByExample" parameterType="com.jsh.erp.datasource.entities.InOutItemExample" resultMap="BaseResultMap">
select
<if test="distinct">
distinct
</if>
<include refid="Base_Column_List" />
from jsh_in_out_item
<if test="_parameter != null">
<include refid="Example_Where_Clause" />
</if>
<if test="orderByClause != null">
order by ${orderByClause}
</if>
</select>
<select id="selectByPrimaryKey" parameterType="java.lang.Long" resultMap="BaseResultMap">
select
<include refid="Base_Column_List" />
from jsh_in_out_item
where id = #{id,jdbcType=BIGINT}
</select>
<delete id="deleteByPrimaryKey" parameterType="java.lang.Long">
delete from jsh_in_out_item
where id = #{id,jdbcType=BIGINT}
</delete>
<delete id="deleteByExample" parameterType="com.jsh.erp.datasource.entities.InOutItemExample">
delete from jsh_in_out_item
<if test="_parameter != null">
<include refid="Example_Where_Clause" />
</if>
</delete>
<insert id="insert" parameterType="com.jsh.erp.datasource.entities.InOutItem">
insert into jsh_in_out_item (id, name, type,
remark, tenant_id, delete_flag
)
values (#{id,jdbcType=BIGINT}, #{name,jdbcType=VARCHAR}, #{type,jdbcType=VARCHAR},
#{remark,jdbcType=VARCHAR}, #{tenantId,jdbcType=BIGINT}, #{deleteFlag,jdbcType=VARCHAR}
)
</insert>
<insert id="insertSelective" parameterType="com.jsh.erp.datasource.entities.InOutItem">
insert into jsh_in_out_item
<trim prefix="(" suffix=")" suffixOverrides=",">
<if test="id != null">
id,
</if>
<if test="name != null">
name,
</if>
<if test="type != null">
type,
</if>
<if test="remark != null">
remark,
</if>
<if test="tenantId != null">
tenant_id,
</if>
<if test="deleteFlag != null">
delete_flag,
</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="id != null">
#{id,jdbcType=BIGINT},
</if>
<if test="name != null">
#{name,jdbcType=VARCHAR},
</if>
<if test="type != null">
#{type,jdbcType=VARCHAR},
</if>
<if test="remark != null">
#{remark,jdbcType=VARCHAR},
</if>
<if test="tenantId != null">
#{tenantId,jdbcType=BIGINT},
</if>
<if test="deleteFlag != null">
#{deleteFlag,jdbcType=VARCHAR},
</if>
</trim>
</insert>
<select id="countByExample" parameterType="com.jsh.erp.datasource.entities.InOutItemExample" resultType="java.lang.Long">
select count(*) from jsh_in_out_item
<if test="_parameter != null">
<include refid="Example_Where_Clause" />
</if>
</select>
<update id="updateByExampleSelective" parameterType="map">
update jsh_in_out_item
<set>
<if test="record.id != null">
id = #{record.id,jdbcType=BIGINT},
</if>
<if test="record.name != null">
name = #{record.name,jdbcType=VARCHAR},
</if>
<if test="record.type != null">
type = #{record.type,jdbcType=VARCHAR},
</if>
<if test="record.remark != null">
remark = #{record.remark,jdbcType=VARCHAR},
</if>
<if test="record.tenantId != null">
tenant_id = #{record.tenantId,jdbcType=BIGINT},
</if>
<if test="record.deleteFlag != null">
delete_flag = #{record.deleteFlag,jdbcType=VARCHAR},
</if>
</set>
<if test="_parameter != null">
<include refid="Update_By_Example_Where_Clause" />
</if>
</update>
<update id="updateByExample" parameterType="map">
update jsh_in_out_item
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},
delete_flag = #{record.deleteFlag,jdbcType=VARCHAR}
<if test="_parameter != null">
<include refid="Update_By_Example_Where_Clause" />
</if>
</update>
<update id="updateByPrimaryKeySelective" parameterType="com.jsh.erp.datasource.entities.InOutItem">
update jsh_in_out_item
<set>
<if test="name != null">
name = #{name,jdbcType=VARCHAR},
</if>
<if test="type != null">
type = #{type,jdbcType=VARCHAR},
</if>
<if test="remark != null">
remark = #{remark,jdbcType=VARCHAR},
</if>
<if test="tenantId != null">
tenant_id = #{tenantId,jdbcType=BIGINT},
</if>
<if test="deleteFlag != null">
delete_flag = #{deleteFlag,jdbcType=VARCHAR},
</if>
</set>
where id = #{id,jdbcType=BIGINT}
</update>
<update id="updateByPrimaryKey" parameterType="com.jsh.erp.datasource.entities.InOutItem">
update jsh_in_out_item
set name = #{name,jdbcType=VARCHAR},
type = #{type,jdbcType=VARCHAR},
remark = #{remark,jdbcType=VARCHAR},
tenant_id = #{tenantId,jdbcType=BIGINT},
delete_flag = #{deleteFlag,jdbcType=VARCHAR}
where id = #{id,jdbcType=BIGINT}
</update>
</mapper>

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

@@ -3,7 +3,7 @@
<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 *
FROM jsh_inoutitem
FROM jsh_in_out_item
where 1=1
<if test="name != null">
and name like '%${name}%'
@@ -14,7 +14,7 @@
<if test="remark != null">
and remark like '%${remark}%'
</if>
and ifnull(delete_Flag,'0') !='1'
and ifnull(delete_flag,'0') !='1'
<if test="offset != null and rows != null">
limit #{offset},#{rows}
</if>
@@ -22,7 +22,7 @@
<select id="countsByInOutItem" resultType="java.lang.Long">
SELECT
COUNT(id)
FROM jsh_inoutitem
FROM jsh_in_out_item
WHERE 1=1
<if test="name != null">
and name like '%${name}%'
@@ -33,11 +33,11 @@
<if test="remark != null">
and remark like '%${remark}%'
</if>
and ifnull(delete_Flag,'0') !='1'
and ifnull(delete_flag,'0') !='1'
</select>
<update id="batchDeleteInOutItemByIds">
update jsh_inoutitem
set delete_Flag='1'
update jsh_in_out_item
set delete_flag='1'
where 1=1
and id in (
<foreach collection="ids" item="id" separator=",">

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

@@ -1,335 +1,258 @@
<?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">
<mapper namespace="com.jsh.erp.datasource.mappers.LogMapper">
<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" />
<result column="userID" jdbcType="BIGINT" property="userid" />
<result column="operation" jdbcType="VARCHAR" property="operation" />
<result column="clientIP" jdbcType="VARCHAR" property="clientip" />
<result column="createtime" jdbcType="TIMESTAMP" property="createtime" />
<result column="status" jdbcType="TINYINT" property="status" />
<result column="contentdetails" jdbcType="VARCHAR" property="contentdetails" />
<result column="remark" jdbcType="VARCHAR" property="remark" />
<result column="tenant_id" jdbcType="BIGINT" property="tenantId" />
</resultMap>
<sql id="Example_Where_Clause">
<!--
WARNING - @mbggenerated
This element is automatically generated by MyBatis Generator, do not modify.
-->
<where>
<foreach collection="oredCriteria" item="criteria" separator="or">
<if test="criteria.valid">
<trim prefix="(" prefixOverrides="and" suffix=")">
<foreach collection="criteria.criteria" item="criterion">
<choose>
<when test="criterion.noValue">
and ${criterion.condition}
</when>
<when test="criterion.singleValue">
and ${criterion.condition} #{criterion.value}
</when>
<when test="criterion.betweenValue">
and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
</when>
<when test="criterion.listValue">
and ${criterion.condition}
<foreach close=")" collection="criterion.value" item="listItem" open="(" separator=",">
#{listItem}
</foreach>
</when>
</choose>
</foreach>
</trim>
</if>
</foreach>
</where>
</sql>
<sql id="Update_By_Example_Where_Clause">
<!--
WARNING - @mbggenerated
This element is automatically generated by MyBatis Generator, do not modify.
-->
<where>
<foreach collection="example.oredCriteria" item="criteria" separator="or">
<if test="criteria.valid">
<trim prefix="(" prefixOverrides="and" suffix=")">
<foreach collection="criteria.criteria" item="criterion">
<choose>
<when test="criterion.noValue">
and ${criterion.condition}
</when>
<when test="criterion.singleValue">
and ${criterion.condition} #{criterion.value}
</when>
<when test="criterion.betweenValue">
and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
</when>
<when test="criterion.listValue">
and ${criterion.condition}
<foreach close=")" collection="criterion.value" item="listItem" open="(" separator=",">
#{listItem}
</foreach>
</when>
</choose>
</foreach>
</trim>
</if>
</foreach>
</where>
</sql>
<sql id="Base_Column_List">
<!--
WARNING - @mbggenerated
This element is automatically generated by MyBatis Generator, do not modify.
-->
id, userID, operation, clientIP, createtime, status, contentdetails, remark, tenant_id
</sql>
<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
<if test="distinct">
distinct
</if>
<include refid="Base_Column_List" />
from jsh_log
<if test="_parameter != null">
<include refid="Example_Where_Clause" />
</if>
<if test="orderByClause != null">
order by ${orderByClause}
</if>
</select>
<select id="selectByPrimaryKey" parameterType="java.lang.Long" resultMap="BaseResultMap">
<!--
WARNING - @mbggenerated
This element is automatically generated by MyBatis Generator, do not modify.
-->
select
<include refid="Base_Column_List" />
from jsh_log
where id = #{id,jdbcType=BIGINT}
</select>
<delete id="deleteByPrimaryKey" parameterType="java.lang.Long">
<!--
WARNING - @mbggenerated
This element is automatically generated by MyBatis Generator, do not modify.
-->
delete from jsh_log
where id = #{id,jdbcType=BIGINT}
</delete>
<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
<if test="_parameter != null">
<include refid="Example_Where_Clause" />
</if>
</delete>
<insert id="insert" parameterType="com.jsh.erp.datasource.entities.Log">
<!--
WARNING - @mbggenerated
This element is automatically generated by MyBatis Generator, do not modify.
-->
insert into jsh_log (id, userID, operation,
clientIP, createtime, status,
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 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
<trim prefix="(" suffix=")" suffixOverrides=",">
<if test="id != null">
id,
</if>
<if test="userid != null">
userID,
</if>
<if test="operation != null">
operation,
</if>
<if test="clientip != null">
clientIP,
</if>
<if test="createtime != null">
createtime,
</if>
<if test="status != null">
status,
</if>
<if test="contentdetails != null">
contentdetails,
</if>
<if test="remark != null">
remark,
</if>
<if test="tenantId != null">
tenant_id,
</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="id != null">
#{id,jdbcType=BIGINT},
</if>
<if test="userid != null">
#{userid,jdbcType=BIGINT},
</if>
<if test="operation != null">
#{operation,jdbcType=VARCHAR},
</if>
<if test="clientip != null">
#{clientip,jdbcType=VARCHAR},
</if>
<if test="createtime != null">
#{createtime,jdbcType=TIMESTAMP},
</if>
<if test="status != null">
#{status,jdbcType=TINYINT},
</if>
<if test="contentdetails != null">
#{contentdetails,jdbcType=VARCHAR},
</if>
<if test="remark != null">
#{remark,jdbcType=VARCHAR},
</if>
<if test="tenantId != null">
#{tenantId,jdbcType=BIGINT},
</if>
</trim>
</insert>
<select id="countByExample" parameterType="com.jsh.erp.datasource.entities.LogExample" resultType="java.lang.Integer">
<!--
WARNING - @mbggenerated
This element is automatically generated by MyBatis Generator, do not modify.
-->
select count(*) from jsh_log
<if test="_parameter != null">
<include refid="Example_Where_Clause" />
</if>
</select>
<update id="updateByExampleSelective" parameterType="map">
<!--
WARNING - @mbggenerated
This element is automatically generated by MyBatis Generator, do not modify.
-->
update jsh_log
<set>
<if test="record.id != null">
id = #{record.id,jdbcType=BIGINT},
</if>
<if test="record.userid != null">
userID = #{record.userid,jdbcType=BIGINT},
</if>
<if test="record.operation != null">
operation = #{record.operation,jdbcType=VARCHAR},
</if>
<if test="record.clientip != null">
clientIP = #{record.clientip,jdbcType=VARCHAR},
</if>
<if test="record.createtime != null">
createtime = #{record.createtime,jdbcType=TIMESTAMP},
</if>
<if test="record.status != null">
status = #{record.status,jdbcType=TINYINT},
</if>
<if test="record.contentdetails != null">
contentdetails = #{record.contentdetails,jdbcType=VARCHAR},
</if>
<if test="record.remark != null">
remark = #{record.remark,jdbcType=VARCHAR},
</if>
<if test="record.tenantId != null">
tenant_id = #{record.tenantId,jdbcType=BIGINT},
</if>
</set>
<if test="_parameter != null">
<include refid="Update_By_Example_Where_Clause" />
</if>
</update>
<update id="updateByExample" parameterType="map">
<!--
WARNING - @mbggenerated
This element is automatically generated by MyBatis Generator, do not modify.
-->
update jsh_log
set id = #{record.id,jdbcType=BIGINT},
userID = #{record.userid,jdbcType=BIGINT},
operation = #{record.operation,jdbcType=VARCHAR},
clientIP = #{record.clientip,jdbcType=VARCHAR},
createtime = #{record.createtime,jdbcType=TIMESTAMP},
status = #{record.status,jdbcType=TINYINT},
contentdetails = #{record.contentdetails,jdbcType=VARCHAR},
remark = #{record.remark,jdbcType=VARCHAR},
tenant_id = #{record.tenantId,jdbcType=BIGINT}
<if test="_parameter != null">
<include refid="Update_By_Example_Where_Clause" />
</if>
</update>
<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
<set>
<if test="userid != null">
userID = #{userid,jdbcType=BIGINT},
</if>
<if test="operation != null">
operation = #{operation,jdbcType=VARCHAR},
</if>
<if test="clientip != null">
clientIP = #{clientip,jdbcType=VARCHAR},
</if>
<if test="createtime != null">
createtime = #{createtime,jdbcType=TIMESTAMP},
</if>
<if test="status != null">
status = #{status,jdbcType=TINYINT},
</if>
<if test="contentdetails != null">
contentdetails = #{contentdetails,jdbcType=VARCHAR},
</if>
<if test="remark != null">
remark = #{remark,jdbcType=VARCHAR},
</if>
<if test="tenantId != null">
tenant_id = #{tenantId,jdbcType=BIGINT},
</if>
</set>
where id = #{id,jdbcType=BIGINT}
</update>
<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
set userID = #{userid,jdbcType=BIGINT},
operation = #{operation,jdbcType=VARCHAR},
clientIP = #{clientip,jdbcType=VARCHAR},
createtime = #{createtime,jdbcType=TIMESTAMP},
status = #{status,jdbcType=TINYINT},
contentdetails = #{contentdetails,jdbcType=VARCHAR},
remark = #{remark,jdbcType=VARCHAR},
tenant_id = #{tenantId,jdbcType=BIGINT}
where id = #{id,jdbcType=BIGINT}
</update>
<mapper namespace="com.jsh.erp.datasource.mappers.LogMapper">
<resultMap id="BaseResultMap" type="com.jsh.erp.datasource.entities.Log">
<id column="id" jdbcType="BIGINT" property="id" />
<result column="user_id" jdbcType="BIGINT" property="userId" />
<result column="operation" jdbcType="VARCHAR" property="operation" />
<result column="client_ip" jdbcType="VARCHAR" property="clientIp" />
<result column="create_time" jdbcType="TIMESTAMP" property="createTime" />
<result column="status" jdbcType="TINYINT" property="status" />
<result column="content" jdbcType="VARCHAR" property="content" />
<result column="tenant_id" jdbcType="BIGINT" property="tenantId" />
</resultMap>
<sql id="Example_Where_Clause">
<where>
<foreach collection="oredCriteria" item="criteria" separator="or">
<if test="criteria.valid">
<trim prefix="(" prefixOverrides="and" suffix=")">
<foreach collection="criteria.criteria" item="criterion">
<choose>
<when test="criterion.noValue">
and ${criterion.condition}
</when>
<when test="criterion.singleValue">
and ${criterion.condition} #{criterion.value}
</when>
<when test="criterion.betweenValue">
and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
</when>
<when test="criterion.listValue">
and ${criterion.condition}
<foreach close=")" collection="criterion.value" item="listItem" open="(" separator=",">
#{listItem}
</foreach>
</when>
</choose>
</foreach>
</trim>
</if>
</foreach>
</where>
</sql>
<sql id="Update_By_Example_Where_Clause">
<where>
<foreach collection="example.oredCriteria" item="criteria" separator="or">
<if test="criteria.valid">
<trim prefix="(" prefixOverrides="and" suffix=")">
<foreach collection="criteria.criteria" item="criterion">
<choose>
<when test="criterion.noValue">
and ${criterion.condition}
</when>
<when test="criterion.singleValue">
and ${criterion.condition} #{criterion.value}
</when>
<when test="criterion.betweenValue">
and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
</when>
<when test="criterion.listValue">
and ${criterion.condition}
<foreach close=")" collection="criterion.value" item="listItem" open="(" separator=",">
#{listItem}
</foreach>
</when>
</choose>
</foreach>
</trim>
</if>
</foreach>
</where>
</sql>
<sql id="Base_Column_List">
id, user_id, operation, client_ip, create_time, status, content, tenant_id
</sql>
<select id="selectByExample" parameterType="com.jsh.erp.datasource.entities.LogExample" resultMap="BaseResultMap">
select
<if test="distinct">
distinct
</if>
<include refid="Base_Column_List" />
from jsh_log
<if test="_parameter != null">
<include refid="Example_Where_Clause" />
</if>
<if test="orderByClause != null">
order by ${orderByClause}
</if>
</select>
<select id="selectByPrimaryKey" parameterType="java.lang.Long" resultMap="BaseResultMap">
select
<include refid="Base_Column_List" />
from jsh_log
where id = #{id,jdbcType=BIGINT}
</select>
<delete id="deleteByPrimaryKey" parameterType="java.lang.Long">
delete from jsh_log
where id = #{id,jdbcType=BIGINT}
</delete>
<delete id="deleteByExample" parameterType="com.jsh.erp.datasource.entities.LogExample">
delete from jsh_log
<if test="_parameter != null">
<include refid="Example_Where_Clause" />
</if>
</delete>
<insert id="insert" parameterType="com.jsh.erp.datasource.entities.Log">
insert into jsh_log (id, user_id, operation,
client_ip, create_time, status,
content, tenant_id)
values (#{id,jdbcType=BIGINT}, #{userId,jdbcType=BIGINT}, #{operation,jdbcType=VARCHAR},
#{clientIp,jdbcType=VARCHAR}, #{createTime,jdbcType=TIMESTAMP}, #{status,jdbcType=TINYINT},
#{content,jdbcType=VARCHAR}, #{tenantId,jdbcType=BIGINT})
</insert>
<insert id="insertSelective" parameterType="com.jsh.erp.datasource.entities.Log">
insert into jsh_log
<trim prefix="(" suffix=")" suffixOverrides=",">
<if test="id != null">
id,
</if>
<if test="userId != null">
user_id,
</if>
<if test="operation != null">
operation,
</if>
<if test="clientIp != null">
client_ip,
</if>
<if test="createTime != null">
create_time,
</if>
<if test="status != null">
status,
</if>
<if test="content != null">
content,
</if>
<if test="tenantId != null">
tenant_id,
</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="id != null">
#{id,jdbcType=BIGINT},
</if>
<if test="userId != null">
#{userId,jdbcType=BIGINT},
</if>
<if test="operation != null">
#{operation,jdbcType=VARCHAR},
</if>
<if test="clientIp != null">
#{clientIp,jdbcType=VARCHAR},
</if>
<if test="createTime != null">
#{createTime,jdbcType=TIMESTAMP},
</if>
<if test="status != null">
#{status,jdbcType=TINYINT},
</if>
<if test="content != null">
#{content,jdbcType=VARCHAR},
</if>
<if test="tenantId != null">
#{tenantId,jdbcType=BIGINT},
</if>
</trim>
</insert>
<select id="countByExample" parameterType="com.jsh.erp.datasource.entities.LogExample" resultType="java.lang.Long">
select count(*) from jsh_log
<if test="_parameter != null">
<include refid="Example_Where_Clause" />
</if>
</select>
<update id="updateByExampleSelective" parameterType="map">
update jsh_log
<set>
<if test="record.id != null">
id = #{record.id,jdbcType=BIGINT},
</if>
<if test="record.userId != null">
user_id = #{record.userId,jdbcType=BIGINT},
</if>
<if test="record.operation != null">
operation = #{record.operation,jdbcType=VARCHAR},
</if>
<if test="record.clientIp != null">
client_ip = #{record.clientIp,jdbcType=VARCHAR},
</if>
<if test="record.createTime != null">
create_time = #{record.createTime,jdbcType=TIMESTAMP},
</if>
<if test="record.status != null">
status = #{record.status,jdbcType=TINYINT},
</if>
<if test="record.content != null">
content = #{record.content,jdbcType=VARCHAR},
</if>
<if test="record.tenantId != null">
tenant_id = #{record.tenantId,jdbcType=BIGINT},
</if>
</set>
<if test="_parameter != null">
<include refid="Update_By_Example_Where_Clause" />
</if>
</update>
<update id="updateByExample" parameterType="map">
update jsh_log
set id = #{record.id,jdbcType=BIGINT},
user_id = #{record.userId,jdbcType=BIGINT},
operation = #{record.operation,jdbcType=VARCHAR},
client_ip = #{record.clientIp,jdbcType=VARCHAR},
create_time = #{record.createTime,jdbcType=TIMESTAMP},
status = #{record.status,jdbcType=TINYINT},
content = #{record.content,jdbcType=VARCHAR},
tenant_id = #{record.tenantId,jdbcType=BIGINT}
<if test="_parameter != null">
<include refid="Update_By_Example_Where_Clause" />
</if>
</update>
<update id="updateByPrimaryKeySelective" parameterType="com.jsh.erp.datasource.entities.Log">
update jsh_log
<set>
<if test="userId != null">
user_id = #{userId,jdbcType=BIGINT},
</if>
<if test="operation != null">
operation = #{operation,jdbcType=VARCHAR},
</if>
<if test="clientIp != null">
client_ip = #{clientIp,jdbcType=VARCHAR},
</if>
<if test="createTime != null">
create_time = #{createTime,jdbcType=TIMESTAMP},
</if>
<if test="status != null">
status = #{status,jdbcType=TINYINT},
</if>
<if test="content != null">
content = #{content,jdbcType=VARCHAR},
</if>
<if test="tenantId != null">
tenant_id = #{tenantId,jdbcType=BIGINT},
</if>
</set>
where id = #{id,jdbcType=BIGINT}
</update>
<update id="updateByPrimaryKey" parameterType="com.jsh.erp.datasource.entities.Log">
update jsh_log
set user_id = #{userId,jdbcType=BIGINT},
operation = #{operation,jdbcType=VARCHAR},
client_ip = #{clientIp,jdbcType=VARCHAR},
create_time = #{createTime,jdbcType=TIMESTAMP},
status = #{status,jdbcType=TINYINT},
content = #{content,jdbcType=VARCHAR},
tenant_id = #{tenantId,jdbcType=BIGINT}
where id = #{id,jdbcType=BIGINT}
</update>
</mapper>

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">
<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">
<result column="userName" jdbcType="VARCHAR" property="username" />
<result column="userName" jdbcType="VARCHAR" property="userName" />
</resultMap>
<select id="selectByConditionLog" parameterType="com.jsh.erp.datasource.entities.LogExample" resultMap="ResultExMap">
select l.*,u.username userName
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
<if test="operation != null">
and l.operation like '%${operation}%'
</if>
<if test="usernameID != null">
and l.userID=${usernameID}
<if test="userId != null">
and l.user_id=${userId}
</if>
<if test="clientIp != null">
and l.clientIp like '%${clientIp}%'
and l.client_ip like '%${clientIp}%'
</if>
<if test="status != null">
and l.status=${status}
</if>
<if test="beginTime != null">
and l.createtime &gt;= '${beginTime}'
and l.create_time &gt;= '${beginTime}'
</if>
<if test="endTime != null">
and l.createtime &lt;= '${endTime}'
and l.create_time &lt;= '${endTime}'
</if>
<if test="contentdetails != null">
and l.contentdetails like '%${contentdetails}%'
<if test="content != null">
and l.content like '%${content}%'
</if>
order by l.createtime desc
order by l.create_time desc
<if test="offset != null and rows != null">
limit #{offset},#{rows}
</if>
@@ -44,23 +44,23 @@
<if test="operation != null">
and operation like '%${operation}%'
</if>
<if test="usernameID != null">
and userID=${usernameID}
<if test="userId != null">
and user_id=${userId}
</if>
<if test="clientIp != null">
and clientIp like '%${clientIp}%'
and client_ip like '%${clientIp}%'
</if>
<if test="status != null">
and status = ${status}
</if>
<if test="beginTime != null"><![CDATA[
and createtime >= '${beginTime}'
]]></if>
<if test="endTime != null"><![CDATA[
and createtime <= '${endTime}'
]]></if>
<if test="contentdetails != null">
and contentdetails like '%${contentdetails}%'
<if test="beginTime != null">
and l.create_time &gt;= '${beginTime}'
</if>
<if test="endTime != null">
and l.create_time &lt;= '${endTime}'
</if>
<if test="content != null">
and content like '%${content}%'
</if>
</select>
</mapper>

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

@@ -1,398 +1,338 @@
<?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">
<mapper namespace="com.jsh.erp.datasource.mappers.MaterialCategoryMapper">
<resultMap id="BaseResultMap" type="com.jsh.erp.datasource.entities.MaterialCategory">
<!--
WARNING - @mbggenerated
This element is automatically generated by MyBatis Generator, do not modify.
-->
<id column="Id" jdbcType="BIGINT" property="id" />
<result column="Name" jdbcType="VARCHAR" property="name" />
<result column="CategoryLevel" jdbcType="SMALLINT" property="categorylevel" />
<result column="ParentId" jdbcType="BIGINT" property="parentid" />
<result column="sort" jdbcType="VARCHAR" property="sort" />
<result column="status" jdbcType="VARCHAR" property="status" />
<result column="serial_no" jdbcType="VARCHAR" property="serialNo" />
<result column="remark" jdbcType="VARCHAR" property="remark" />
<result column="create_time" jdbcType="TIMESTAMP" property="createTime" />
<result column="creator" jdbcType="BIGINT" property="creator" />
<result column="update_time" jdbcType="TIMESTAMP" property="updateTime" />
<result column="updater" jdbcType="BIGINT" property="updater" />
<result column="tenant_id" jdbcType="BIGINT" property="tenantId" />
</resultMap>
<sql id="Example_Where_Clause">
<!--
WARNING - @mbggenerated
This element is automatically generated by MyBatis Generator, do not modify.
-->
<where>
<foreach collection="oredCriteria" item="criteria" separator="or">
<if test="criteria.valid">
<trim prefix="(" prefixOverrides="and" suffix=")">
<foreach collection="criteria.criteria" item="criterion">
<choose>
<when test="criterion.noValue">
and ${criterion.condition}
</when>
<when test="criterion.singleValue">
and ${criterion.condition} #{criterion.value}
</when>
<when test="criterion.betweenValue">
and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
</when>
<when test="criterion.listValue">
and ${criterion.condition}
<foreach close=")" collection="criterion.value" item="listItem" open="(" separator=",">
#{listItem}
</foreach>
</when>
</choose>
</foreach>
</trim>
</if>
</foreach>
</where>
</sql>
<sql id="Update_By_Example_Where_Clause">
<!--
WARNING - @mbggenerated
This element is automatically generated by MyBatis Generator, do not modify.
-->
<where>
<foreach collection="example.oredCriteria" item="criteria" separator="or">
<if test="criteria.valid">
<trim prefix="(" prefixOverrides="and" suffix=")">
<foreach collection="criteria.criteria" item="criterion">
<choose>
<when test="criterion.noValue">
and ${criterion.condition}
</when>
<when test="criterion.singleValue">
and ${criterion.condition} #{criterion.value}
</when>
<when test="criterion.betweenValue">
and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
</when>
<when test="criterion.listValue">
and ${criterion.condition}
<foreach close=")" collection="criterion.value" item="listItem" open="(" separator=",">
#{listItem}
</foreach>
</when>
</choose>
</foreach>
</trim>
</if>
</foreach>
</where>
</sql>
<sql id="Base_Column_List">
<!--
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
</sql>
<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
<if test="distinct">
distinct
</if>
<include refid="Base_Column_List" />
from jsh_materialcategory
<if test="_parameter != null">
<include refid="Example_Where_Clause" />
</if>
<if test="orderByClause != null">
order by ${orderByClause}
</if>
</select>
<select id="selectByPrimaryKey" parameterType="java.lang.Long" resultMap="BaseResultMap">
<!--
WARNING - @mbggenerated
This element is automatically generated by MyBatis Generator, do not modify.
-->
select
<include refid="Base_Column_List" />
from jsh_materialcategory
where Id = #{id,jdbcType=BIGINT}
</select>
<delete id="deleteByPrimaryKey" parameterType="java.lang.Long">
<!--
WARNING - @mbggenerated
This element is automatically generated by MyBatis Generator, do not modify.
-->
delete from jsh_materialcategory
where Id = #{id,jdbcType=BIGINT}
</delete>
<delete id="deleteByExample" parameterType="com.jsh.erp.datasource.entities.MaterialCategoryExample">
<!--
WARNING - @mbggenerated
This element is automatically generated by MyBatis Generator, do not modify.
-->
delete from jsh_materialcategory
<if test="_parameter != null">
<include refid="Example_Where_Clause" />
</if>
</delete>
<insert id="insert" parameterType="com.jsh.erp.datasource.entities.MaterialCategory">
<!--
WARNING - @mbggenerated
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,
creator, update_time, updater,
tenant_id)
values (#{id,jdbcType=BIGINT}, #{name,jdbcType=VARCHAR}, #{categorylevel,jdbcType=SMALLINT},
#{parentid,jdbcType=BIGINT}, #{sort,jdbcType=VARCHAR}, #{status,jdbcType=VARCHAR},
#{serialNo,jdbcType=VARCHAR}, #{remark,jdbcType=VARCHAR}, #{createTime,jdbcType=TIMESTAMP},
#{creator,jdbcType=BIGINT}, #{updateTime,jdbcType=TIMESTAMP}, #{updater,jdbcType=BIGINT},
#{tenantId,jdbcType=BIGINT})
</insert>
<insert id="insertSelective" parameterType="com.jsh.erp.datasource.entities.MaterialCategory">
<!--
WARNING - @mbggenerated
This element is automatically generated by MyBatis Generator, do not modify.
-->
insert into jsh_materialcategory
<trim prefix="(" suffix=")" suffixOverrides=",">
<if test="id != null">
Id,
</if>
<if test="name != null">
Name,
</if>
<if test="categorylevel != null">
CategoryLevel,
</if>
<if test="parentid != null">
ParentId,
</if>
<if test="sort != null">
sort,
</if>
<if test="status != null">
status,
</if>
<if test="serialNo != null">
serial_no,
</if>
<if test="remark != null">
remark,
</if>
<if test="createTime != null">
create_time,
</if>
<if test="creator != null">
creator,
</if>
<if test="updateTime != null">
update_time,
</if>
<if test="updater != null">
updater,
</if>
<if test="tenantId != null">
tenant_id,
</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="id != null">
#{id,jdbcType=BIGINT},
</if>
<if test="name != null">
#{name,jdbcType=VARCHAR},
</if>
<if test="categorylevel != null">
#{categorylevel,jdbcType=SMALLINT},
</if>
<if test="parentid != null">
#{parentid,jdbcType=BIGINT},
</if>
<if test="sort != null">
#{sort,jdbcType=VARCHAR},
</if>
<if test="status != null">
#{status,jdbcType=VARCHAR},
</if>
<if test="serialNo != null">
#{serialNo,jdbcType=VARCHAR},
</if>
<if test="remark != null">
#{remark,jdbcType=VARCHAR},
</if>
<if test="createTime != null">
#{createTime,jdbcType=TIMESTAMP},
</if>
<if test="creator != null">
#{creator,jdbcType=BIGINT},
</if>
<if test="updateTime != null">
#{updateTime,jdbcType=TIMESTAMP},
</if>
<if test="updater != null">
#{updater,jdbcType=BIGINT},
</if>
<if test="tenantId != null">
#{tenantId,jdbcType=BIGINT},
</if>
</trim>
</insert>
<select id="countByExample" parameterType="com.jsh.erp.datasource.entities.MaterialCategoryExample" resultType="java.lang.Integer">
<!--
WARNING - @mbggenerated
This element is automatically generated by MyBatis Generator, do not modify.
-->
select count(*) from jsh_materialcategory
<if test="_parameter != null">
<include refid="Example_Where_Clause" />
</if>
</select>
<update id="updateByExampleSelective" parameterType="map">
<!--
WARNING - @mbggenerated
This element is automatically generated by MyBatis Generator, do not modify.
-->
update jsh_materialcategory
<set>
<if test="record.id != null">
Id = #{record.id,jdbcType=BIGINT},
</if>
<if test="record.name != null">
Name = #{record.name,jdbcType=VARCHAR},
</if>
<if test="record.categorylevel != null">
CategoryLevel = #{record.categorylevel,jdbcType=SMALLINT},
</if>
<if test="record.parentid != null">
ParentId = #{record.parentid,jdbcType=BIGINT},
</if>
<if test="record.sort != null">
sort = #{record.sort,jdbcType=VARCHAR},
</if>
<if test="record.status != null">
status = #{record.status,jdbcType=VARCHAR},
</if>
<if test="record.serialNo != null">
serial_no = #{record.serialNo,jdbcType=VARCHAR},
</if>
<if test="record.remark != null">
remark = #{record.remark,jdbcType=VARCHAR},
</if>
<if test="record.createTime != null">
create_time = #{record.createTime,jdbcType=TIMESTAMP},
</if>
<if test="record.creator != null">
creator = #{record.creator,jdbcType=BIGINT},
</if>
<if test="record.updateTime != null">
update_time = #{record.updateTime,jdbcType=TIMESTAMP},
</if>
<if test="record.updater != null">
updater = #{record.updater,jdbcType=BIGINT},
</if>
<if test="record.tenantId != null">
tenant_id = #{record.tenantId,jdbcType=BIGINT},
</if>
</set>
<if test="_parameter != null">
<include refid="Update_By_Example_Where_Clause" />
</if>
</update>
<update id="updateByExample" parameterType="map">
<!--
WARNING - @mbggenerated
This element is automatically generated by MyBatis Generator, do not modify.
-->
update jsh_materialcategory
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},
status = #{record.status,jdbcType=VARCHAR},
serial_no = #{record.serialNo,jdbcType=VARCHAR},
remark = #{record.remark,jdbcType=VARCHAR},
create_time = #{record.createTime,jdbcType=TIMESTAMP},
creator = #{record.creator,jdbcType=BIGINT},
update_time = #{record.updateTime,jdbcType=TIMESTAMP},
updater = #{record.updater,jdbcType=BIGINT},
tenant_id = #{record.tenantId,jdbcType=BIGINT}
<if test="_parameter != null">
<include refid="Update_By_Example_Where_Clause" />
</if>
</update>
<update id="updateByPrimaryKeySelective" parameterType="com.jsh.erp.datasource.entities.MaterialCategory">
<!--
WARNING - @mbggenerated
This element is automatically generated by MyBatis Generator, do not modify.
-->
update jsh_materialcategory
<set>
<if test="name != null">
Name = #{name,jdbcType=VARCHAR},
</if>
<if test="categorylevel != null">
CategoryLevel = #{categorylevel,jdbcType=SMALLINT},
</if>
<if test="parentid != null">
ParentId = #{parentid,jdbcType=BIGINT},
</if>
<if test="sort != null">
sort = #{sort,jdbcType=VARCHAR},
</if>
<if test="status != null">
status = #{status,jdbcType=VARCHAR},
</if>
<if test="serialNo != null">
serial_no = #{serialNo,jdbcType=VARCHAR},
</if>
<if test="remark != null">
remark = #{remark,jdbcType=VARCHAR},
</if>
<if test="createTime != null">
create_time = #{createTime,jdbcType=TIMESTAMP},
</if>
<if test="creator != null">
creator = #{creator,jdbcType=BIGINT},
</if>
<if test="updateTime != null">
update_time = #{updateTime,jdbcType=TIMESTAMP},
</if>
<if test="updater != null">
updater = #{updater,jdbcType=BIGINT},
</if>
<if test="tenantId != null">
tenant_id = #{tenantId,jdbcType=BIGINT},
</if>
</set>
where Id = #{id,jdbcType=BIGINT}
</update>
<update id="updateByPrimaryKey" parameterType="com.jsh.erp.datasource.entities.MaterialCategory">
<!--
WARNING - @mbggenerated
This element is automatically generated by MyBatis Generator, do not modify.
-->
update jsh_materialcategory
set Name = #{name,jdbcType=VARCHAR},
CategoryLevel = #{categorylevel,jdbcType=SMALLINT},
ParentId = #{parentid,jdbcType=BIGINT},
sort = #{sort,jdbcType=VARCHAR},
status = #{status,jdbcType=VARCHAR},
serial_no = #{serialNo,jdbcType=VARCHAR},
remark = #{remark,jdbcType=VARCHAR},
create_time = #{createTime,jdbcType=TIMESTAMP},
creator = #{creator,jdbcType=BIGINT},
update_time = #{updateTime,jdbcType=TIMESTAMP},
updater = #{updater,jdbcType=BIGINT},
tenant_id = #{tenantId,jdbcType=BIGINT}
where Id = #{id,jdbcType=BIGINT}
</update>
<mapper namespace="com.jsh.erp.datasource.mappers.MaterialCategoryMapper">
<resultMap id="BaseResultMap" type="com.jsh.erp.datasource.entities.MaterialCategory">
<id column="id" jdbcType="BIGINT" property="id" />
<result column="name" jdbcType="VARCHAR" property="name" />
<result column="category_level" jdbcType="SMALLINT" property="categoryLevel" />
<result column="parent_id" jdbcType="BIGINT" property="parentId" />
<result column="sort" jdbcType="VARCHAR" property="sort" />
<result column="status" jdbcType="VARCHAR" property="status" />
<result column="serial_no" jdbcType="VARCHAR" property="serialNo" />
<result column="remark" jdbcType="VARCHAR" property="remark" />
<result column="create_time" jdbcType="TIMESTAMP" property="createTime" />
<result column="creator" jdbcType="BIGINT" property="creator" />
<result column="update_time" jdbcType="TIMESTAMP" property="updateTime" />
<result column="updater" jdbcType="BIGINT" property="updater" />
<result column="tenant_id" jdbcType="BIGINT" property="tenantId" />
</resultMap>
<sql id="Example_Where_Clause">
<where>
<foreach collection="oredCriteria" item="criteria" separator="or">
<if test="criteria.valid">
<trim prefix="(" prefixOverrides="and" suffix=")">
<foreach collection="criteria.criteria" item="criterion">
<choose>
<when test="criterion.noValue">
and ${criterion.condition}
</when>
<when test="criterion.singleValue">
and ${criterion.condition} #{criterion.value}
</when>
<when test="criterion.betweenValue">
and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
</when>
<when test="criterion.listValue">
and ${criterion.condition}
<foreach close=")" collection="criterion.value" item="listItem" open="(" separator=",">
#{listItem}
</foreach>
</when>
</choose>
</foreach>
</trim>
</if>
</foreach>
</where>
</sql>
<sql id="Update_By_Example_Where_Clause">
<where>
<foreach collection="example.oredCriteria" item="criteria" separator="or">
<if test="criteria.valid">
<trim prefix="(" prefixOverrides="and" suffix=")">
<foreach collection="criteria.criteria" item="criterion">
<choose>
<when test="criterion.noValue">
and ${criterion.condition}
</when>
<when test="criterion.singleValue">
and ${criterion.condition} #{criterion.value}
</when>
<when test="criterion.betweenValue">
and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
</when>
<when test="criterion.listValue">
and ${criterion.condition}
<foreach close=")" collection="criterion.value" item="listItem" open="(" separator=",">
#{listItem}
</foreach>
</when>
</choose>
</foreach>
</trim>
</if>
</foreach>
</where>
</sql>
<sql id="Base_Column_List">
id, name, category_level, parent_id, sort, status, serial_no, remark, create_time,
creator, update_time, updater, tenant_id
</sql>
<select id="selectByExample" parameterType="com.jsh.erp.datasource.entities.MaterialCategoryExample" resultMap="BaseResultMap">
select
<if test="distinct">
distinct
</if>
<include refid="Base_Column_List" />
from jsh_material_category
<if test="_parameter != null">
<include refid="Example_Where_Clause" />
</if>
<if test="orderByClause != null">
order by ${orderByClause}
</if>
</select>
<select id="selectByPrimaryKey" parameterType="java.lang.Long" resultMap="BaseResultMap">
select
<include refid="Base_Column_List" />
from jsh_material_category
where id = #{id,jdbcType=BIGINT}
</select>
<delete id="deleteByPrimaryKey" parameterType="java.lang.Long">
delete from jsh_material_category
where id = #{id,jdbcType=BIGINT}
</delete>
<delete id="deleteByExample" parameterType="com.jsh.erp.datasource.entities.MaterialCategoryExample">
delete from jsh_material_category
<if test="_parameter != null">
<include refid="Example_Where_Clause" />
</if>
</delete>
<insert id="insert" parameterType="com.jsh.erp.datasource.entities.MaterialCategory">
insert into jsh_material_category (id, name, category_level,
parent_id, sort, status,
serial_no, remark, create_time,
creator, update_time, updater,
tenant_id)
values (#{id,jdbcType=BIGINT}, #{name,jdbcType=VARCHAR}, #{categoryLevel,jdbcType=SMALLINT},
#{parentId,jdbcType=BIGINT}, #{sort,jdbcType=VARCHAR}, #{status,jdbcType=VARCHAR},
#{serialNo,jdbcType=VARCHAR}, #{remark,jdbcType=VARCHAR}, #{createTime,jdbcType=TIMESTAMP},
#{creator,jdbcType=BIGINT}, #{updateTime,jdbcType=TIMESTAMP}, #{updater,jdbcType=BIGINT},
#{tenantId,jdbcType=BIGINT})
</insert>
<insert id="insertSelective" parameterType="com.jsh.erp.datasource.entities.MaterialCategory">
insert into jsh_material_category
<trim prefix="(" suffix=")" suffixOverrides=",">
<if test="id != null">
id,
</if>
<if test="name != null">
name,
</if>
<if test="categoryLevel != null">
category_level,
</if>
<if test="parentId != null">
parent_id,
</if>
<if test="sort != null">
sort,
</if>
<if test="status != null">
status,
</if>
<if test="serialNo != null">
serial_no,
</if>
<if test="remark != null">
remark,
</if>
<if test="createTime != null">
create_time,
</if>
<if test="creator != null">
creator,
</if>
<if test="updateTime != null">
update_time,
</if>
<if test="updater != null">
updater,
</if>
<if test="tenantId != null">
tenant_id,
</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="id != null">
#{id,jdbcType=BIGINT},
</if>
<if test="name != null">
#{name,jdbcType=VARCHAR},
</if>
<if test="categoryLevel != null">
#{categoryLevel,jdbcType=SMALLINT},
</if>
<if test="parentId != null">
#{parentId,jdbcType=BIGINT},
</if>
<if test="sort != null">
#{sort,jdbcType=VARCHAR},
</if>
<if test="status != null">
#{status,jdbcType=VARCHAR},
</if>
<if test="serialNo != null">
#{serialNo,jdbcType=VARCHAR},
</if>
<if test="remark != null">
#{remark,jdbcType=VARCHAR},
</if>
<if test="createTime != null">
#{createTime,jdbcType=TIMESTAMP},
</if>
<if test="creator != null">
#{creator,jdbcType=BIGINT},
</if>
<if test="updateTime != null">
#{updateTime,jdbcType=TIMESTAMP},
</if>
<if test="updater != null">
#{updater,jdbcType=BIGINT},
</if>
<if test="tenantId != null">
#{tenantId,jdbcType=BIGINT},
</if>
</trim>
</insert>
<select id="countByExample" parameterType="com.jsh.erp.datasource.entities.MaterialCategoryExample" resultType="java.lang.Long">
select count(*) from jsh_material_category
<if test="_parameter != null">
<include refid="Example_Where_Clause" />
</if>
</select>
<update id="updateByExampleSelective" parameterType="map">
update jsh_material_category
<set>
<if test="record.id != null">
id = #{record.id,jdbcType=BIGINT},
</if>
<if test="record.name != null">
name = #{record.name,jdbcType=VARCHAR},
</if>
<if test="record.categoryLevel != null">
category_level = #{record.categoryLevel,jdbcType=SMALLINT},
</if>
<if test="record.parentId != null">
parent_id = #{record.parentId,jdbcType=BIGINT},
</if>
<if test="record.sort != null">
sort = #{record.sort,jdbcType=VARCHAR},
</if>
<if test="record.status != null">
status = #{record.status,jdbcType=VARCHAR},
</if>
<if test="record.serialNo != null">
serial_no = #{record.serialNo,jdbcType=VARCHAR},
</if>
<if test="record.remark != null">
remark = #{record.remark,jdbcType=VARCHAR},
</if>
<if test="record.createTime != null">
create_time = #{record.createTime,jdbcType=TIMESTAMP},
</if>
<if test="record.creator != null">
creator = #{record.creator,jdbcType=BIGINT},
</if>
<if test="record.updateTime != null">
update_time = #{record.updateTime,jdbcType=TIMESTAMP},
</if>
<if test="record.updater != null">
updater = #{record.updater,jdbcType=BIGINT},
</if>
<if test="record.tenantId != null">
tenant_id = #{record.tenantId,jdbcType=BIGINT},
</if>
</set>
<if test="_parameter != null">
<include refid="Update_By_Example_Where_Clause" />
</if>
</update>
<update id="updateByExample" parameterType="map">
update jsh_material_category
set id = #{record.id,jdbcType=BIGINT},
name = #{record.name,jdbcType=VARCHAR},
category_level = #{record.categoryLevel,jdbcType=SMALLINT},
parent_id = #{record.parentId,jdbcType=BIGINT},
sort = #{record.sort,jdbcType=VARCHAR},
status = #{record.status,jdbcType=VARCHAR},
serial_no = #{record.serialNo,jdbcType=VARCHAR},
remark = #{record.remark,jdbcType=VARCHAR},
create_time = #{record.createTime,jdbcType=TIMESTAMP},
creator = #{record.creator,jdbcType=BIGINT},
update_time = #{record.updateTime,jdbcType=TIMESTAMP},
updater = #{record.updater,jdbcType=BIGINT},
tenant_id = #{record.tenantId,jdbcType=BIGINT}
<if test="_parameter != null">
<include refid="Update_By_Example_Where_Clause" />
</if>
</update>
<update id="updateByPrimaryKeySelective" parameterType="com.jsh.erp.datasource.entities.MaterialCategory">
update jsh_material_category
<set>
<if test="name != null">
name = #{name,jdbcType=VARCHAR},
</if>
<if test="categoryLevel != null">
category_level = #{categoryLevel,jdbcType=SMALLINT},
</if>
<if test="parentId != null">
parent_id = #{parentId,jdbcType=BIGINT},
</if>
<if test="sort != null">
sort = #{sort,jdbcType=VARCHAR},
</if>
<if test="status != null">
status = #{status,jdbcType=VARCHAR},
</if>
<if test="serialNo != null">
serial_no = #{serialNo,jdbcType=VARCHAR},
</if>
<if test="remark != null">
remark = #{remark,jdbcType=VARCHAR},
</if>
<if test="createTime != null">
create_time = #{createTime,jdbcType=TIMESTAMP},
</if>
<if test="creator != null">
creator = #{creator,jdbcType=BIGINT},
</if>
<if test="updateTime != null">
update_time = #{updateTime,jdbcType=TIMESTAMP},
</if>
<if test="updater != null">
updater = #{updater,jdbcType=BIGINT},
</if>
<if test="tenantId != null">
tenant_id = #{tenantId,jdbcType=BIGINT},
</if>
</set>
where id = #{id,jdbcType=BIGINT}
</update>
<update id="updateByPrimaryKey" parameterType="com.jsh.erp.datasource.entities.MaterialCategory">
update jsh_material_category
set name = #{name,jdbcType=VARCHAR},
category_level = #{categoryLevel,jdbcType=SMALLINT},
parent_id = #{parentId,jdbcType=BIGINT},
sort = #{sort,jdbcType=VARCHAR},
status = #{status,jdbcType=VARCHAR},
serial_no = #{serialNo,jdbcType=VARCHAR},
remark = #{remark,jdbcType=VARCHAR},
create_time = #{createTime,jdbcType=TIMESTAMP},
creator = #{creator,jdbcType=BIGINT},
update_time = #{updateTime,jdbcType=TIMESTAMP},
updater = #{updater,jdbcType=BIGINT},
tenant_id = #{tenantId,jdbcType=BIGINT}
where id = #{id,jdbcType=BIGINT}
</update>
</mapper>

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

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

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

@@ -13,16 +13,16 @@
</resultMap>
<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>
<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
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_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
and me.default_flag=1
<if test="barCode != null">
@@ -53,7 +53,7 @@
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_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
and me.default_flag=1
<if test="barCode != null">
@@ -75,21 +75,21 @@
</select>
<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'
where m.id = ${mId}
and ifnull(u.delete_Flag,'0') !='1'
</select>
<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'
where m.id = ${id}
and ifnull(m.delete_Flag,'0') !='1'
</select>
<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
from jsh_material m
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 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_unit u on m.UnitId=u.id and ifnull(u.delete_Flag,'0') !='1'
where m.enabled=1 and me.id is not null
@@ -125,12 +125,12 @@
</select>
<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
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_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
and me.default_flag=1
<if test="name != null">
@@ -236,11 +236,11 @@
</select>
<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
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_materialcategory mc on m.CategoryId = mc.id and ifnull(mc.status,'0') !='2'
left JOIN jsh_unit u on m.UnitId = u.id and ifnull(u.delete_flag,'0') !='1'
left JOIN jsh_material_category mc on m.CategoryId = mc.id and ifnull(mc.status,'0') !='2'
where 1=1
<if test="meId != null">
and me.id = ${meId}

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

@@ -1,288 +1,228 @@
<?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">
<mapper namespace="com.jsh.erp.datasource.mappers.MaterialPropertyMapper">
<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" />
<result column="nativeName" jdbcType="VARCHAR" property="nativename" />
<result column="enabled" jdbcType="BIT" property="enabled" />
<result column="sort" jdbcType="VARCHAR" property="sort" />
<result column="anotherName" jdbcType="VARCHAR" property="anothername" />
<result column="delete_Flag" jdbcType="VARCHAR" property="deleteFlag" />
</resultMap>
<sql id="Example_Where_Clause">
<!--
WARNING - @mbggenerated
This element is automatically generated by MyBatis Generator, do not modify.
-->
<where>
<foreach collection="oredCriteria" item="criteria" separator="or">
<if test="criteria.valid">
<trim prefix="(" prefixOverrides="and" suffix=")">
<foreach collection="criteria.criteria" item="criterion">
<choose>
<when test="criterion.noValue">
and ${criterion.condition}
</when>
<when test="criterion.singleValue">
and ${criterion.condition} #{criterion.value}
</when>
<when test="criterion.betweenValue">
and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
</when>
<when test="criterion.listValue">
and ${criterion.condition}
<foreach close=")" collection="criterion.value" item="listItem" open="(" separator=",">
#{listItem}
</foreach>
</when>
</choose>
</foreach>
</trim>
</if>
</foreach>
</where>
</sql>
<sql id="Update_By_Example_Where_Clause">
<!--
WARNING - @mbggenerated
This element is automatically generated by MyBatis Generator, do not modify.
-->
<where>
<foreach collection="example.oredCriteria" item="criteria" separator="or">
<if test="criteria.valid">
<trim prefix="(" prefixOverrides="and" suffix=")">
<foreach collection="criteria.criteria" item="criterion">
<choose>
<when test="criterion.noValue">
and ${criterion.condition}
</when>
<when test="criterion.singleValue">
and ${criterion.condition} #{criterion.value}
</when>
<when test="criterion.betweenValue">
and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
</when>
<when test="criterion.listValue">
and ${criterion.condition}
<foreach close=")" collection="criterion.value" item="listItem" open="(" separator=",">
#{listItem}
</foreach>
</when>
</choose>
</foreach>
</trim>
</if>
</foreach>
</where>
</sql>
<sql id="Base_Column_List">
<!--
WARNING - @mbggenerated
This element is automatically generated by MyBatis Generator, do not modify.
-->
id, nativeName, enabled, sort, anotherName, delete_Flag
</sql>
<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
<if test="distinct">
distinct
</if>
<include refid="Base_Column_List" />
from jsh_materialproperty
<if test="_parameter != null">
<include refid="Example_Where_Clause" />
</if>
<if test="orderByClause != null">
order by ${orderByClause}
</if>
</select>
<select id="selectByPrimaryKey" parameterType="java.lang.Long" resultMap="BaseResultMap">
<!--
WARNING - @mbggenerated
This element is automatically generated by MyBatis Generator, do not modify.
-->
select
<include refid="Base_Column_List" />
from jsh_materialproperty
where id = #{id,jdbcType=BIGINT}
</select>
<delete id="deleteByPrimaryKey" parameterType="java.lang.Long">
<!--
WARNING - @mbggenerated
This element is automatically generated by MyBatis Generator, do not modify.
-->
delete from jsh_materialproperty
where id = #{id,jdbcType=BIGINT}
</delete>
<delete id="deleteByExample" parameterType="com.jsh.erp.datasource.entities.MaterialPropertyExample">
<!--
WARNING - @mbggenerated
This element is automatically generated by MyBatis Generator, do not modify.
-->
delete from jsh_materialproperty
<if test="_parameter != null">
<include refid="Example_Where_Clause" />
</if>
</delete>
<insert id="insert" parameterType="com.jsh.erp.datasource.entities.MaterialProperty">
<!--
WARNING - @mbggenerated
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},
#{sort,jdbcType=VARCHAR}, #{anothername,jdbcType=VARCHAR}, #{deleteFlag,jdbcType=VARCHAR}
)
</insert>
<insert id="insertSelective" parameterType="com.jsh.erp.datasource.entities.MaterialProperty">
<!--
WARNING - @mbggenerated
This element is automatically generated by MyBatis Generator, do not modify.
-->
insert into jsh_materialproperty
<trim prefix="(" suffix=")" suffixOverrides=",">
<if test="id != null">
id,
</if>
<if test="nativename != null">
nativeName,
</if>
<if test="enabled != null">
enabled,
</if>
<if test="sort != null">
sort,
</if>
<if test="anothername != null">
anotherName,
</if>
<if test="deleteFlag != null">
delete_Flag,
</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="id != null">
#{id,jdbcType=BIGINT},
</if>
<if test="nativename != null">
#{nativename,jdbcType=VARCHAR},
</if>
<if test="enabled != null">
#{enabled,jdbcType=BIT},
</if>
<if test="sort != null">
#{sort,jdbcType=VARCHAR},
</if>
<if test="anothername != null">
#{anothername,jdbcType=VARCHAR},
</if>
<if test="deleteFlag != null">
#{deleteFlag,jdbcType=VARCHAR},
</if>
</trim>
</insert>
<select id="countByExample" parameterType="com.jsh.erp.datasource.entities.MaterialPropertyExample" resultType="java.lang.Integer">
<!--
WARNING - @mbggenerated
This element is automatically generated by MyBatis Generator, do not modify.
-->
select count(*) from jsh_materialproperty
<if test="_parameter != null">
<include refid="Example_Where_Clause" />
</if>
</select>
<update id="updateByExampleSelective" parameterType="map">
<!--
WARNING - @mbggenerated
This element is automatically generated by MyBatis Generator, do not modify.
-->
update jsh_materialproperty
<set>
<if test="record.id != null">
id = #{record.id,jdbcType=BIGINT},
</if>
<if test="record.nativename != null">
nativeName = #{record.nativename,jdbcType=VARCHAR},
</if>
<if test="record.enabled != null">
enabled = #{record.enabled,jdbcType=BIT},
</if>
<if test="record.sort != null">
sort = #{record.sort,jdbcType=VARCHAR},
</if>
<if test="record.anothername != null">
anotherName = #{record.anothername,jdbcType=VARCHAR},
</if>
<if test="record.deleteFlag != null">
delete_Flag = #{record.deleteFlag,jdbcType=VARCHAR},
</if>
</set>
<if test="_parameter != null">
<include refid="Update_By_Example_Where_Clause" />
</if>
</update>
<update id="updateByExample" parameterType="map">
<!--
WARNING - @mbggenerated
This element is automatically generated by MyBatis Generator, do not modify.
-->
update jsh_materialproperty
set id = #{record.id,jdbcType=BIGINT},
nativeName = #{record.nativename,jdbcType=VARCHAR},
enabled = #{record.enabled,jdbcType=BIT},
sort = #{record.sort,jdbcType=VARCHAR},
anotherName = #{record.anothername,jdbcType=VARCHAR},
delete_Flag = #{record.deleteFlag,jdbcType=VARCHAR}
<if test="_parameter != null">
<include refid="Update_By_Example_Where_Clause" />
</if>
</update>
<update id="updateByPrimaryKeySelective" parameterType="com.jsh.erp.datasource.entities.MaterialProperty">
<!--
WARNING - @mbggenerated
This element is automatically generated by MyBatis Generator, do not modify.
-->
update jsh_materialproperty
<set>
<if test="nativename != null">
nativeName = #{nativename,jdbcType=VARCHAR},
</if>
<if test="enabled != null">
enabled = #{enabled,jdbcType=BIT},
</if>
<if test="sort != null">
sort = #{sort,jdbcType=VARCHAR},
</if>
<if test="anothername != null">
anotherName = #{anothername,jdbcType=VARCHAR},
</if>
<if test="deleteFlag != null">
delete_Flag = #{deleteFlag,jdbcType=VARCHAR},
</if>
</set>
where id = #{id,jdbcType=BIGINT}
</update>
<update id="updateByPrimaryKey" parameterType="com.jsh.erp.datasource.entities.MaterialProperty">
<!--
WARNING - @mbggenerated
This element is automatically generated by MyBatis Generator, do not modify.
-->
update jsh_materialproperty
set nativeName = #{nativename,jdbcType=VARCHAR},
enabled = #{enabled,jdbcType=BIT},
sort = #{sort,jdbcType=VARCHAR},
anotherName = #{anothername,jdbcType=VARCHAR},
delete_Flag = #{deleteFlag,jdbcType=VARCHAR}
where id = #{id,jdbcType=BIGINT}
</update>
<mapper namespace="com.jsh.erp.datasource.mappers.MaterialPropertyMapper">
<resultMap id="BaseResultMap" type="com.jsh.erp.datasource.entities.MaterialProperty">
<id column="id" jdbcType="BIGINT" property="id" />
<result column="native_name" jdbcType="VARCHAR" property="nativeName" />
<result column="enabled" jdbcType="BIT" property="enabled" />
<result column="sort" jdbcType="VARCHAR" property="sort" />
<result column="another_name" jdbcType="VARCHAR" property="anotherName" />
<result column="delete_flag" jdbcType="VARCHAR" property="deleteFlag" />
</resultMap>
<sql id="Example_Where_Clause">
<where>
<foreach collection="oredCriteria" item="criteria" separator="or">
<if test="criteria.valid">
<trim prefix="(" prefixOverrides="and" suffix=")">
<foreach collection="criteria.criteria" item="criterion">
<choose>
<when test="criterion.noValue">
and ${criterion.condition}
</when>
<when test="criterion.singleValue">
and ${criterion.condition} #{criterion.value}
</when>
<when test="criterion.betweenValue">
and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
</when>
<when test="criterion.listValue">
and ${criterion.condition}
<foreach close=")" collection="criterion.value" item="listItem" open="(" separator=",">
#{listItem}
</foreach>
</when>
</choose>
</foreach>
</trim>
</if>
</foreach>
</where>
</sql>
<sql id="Update_By_Example_Where_Clause">
<where>
<foreach collection="example.oredCriteria" item="criteria" separator="or">
<if test="criteria.valid">
<trim prefix="(" prefixOverrides="and" suffix=")">
<foreach collection="criteria.criteria" item="criterion">
<choose>
<when test="criterion.noValue">
and ${criterion.condition}
</when>
<when test="criterion.singleValue">
and ${criterion.condition} #{criterion.value}
</when>
<when test="criterion.betweenValue">
and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
</when>
<when test="criterion.listValue">
and ${criterion.condition}
<foreach close=")" collection="criterion.value" item="listItem" open="(" separator=",">
#{listItem}
</foreach>
</when>
</choose>
</foreach>
</trim>
</if>
</foreach>
</where>
</sql>
<sql id="Base_Column_List">
id, native_name, enabled, sort, another_name, delete_flag
</sql>
<select id="selectByExample" parameterType="com.jsh.erp.datasource.entities.MaterialPropertyExample" resultMap="BaseResultMap">
select
<if test="distinct">
distinct
</if>
<include refid="Base_Column_List" />
from jsh_material_property
<if test="_parameter != null">
<include refid="Example_Where_Clause" />
</if>
<if test="orderByClause != null">
order by ${orderByClause}
</if>
</select>
<select id="selectByPrimaryKey" parameterType="java.lang.Long" resultMap="BaseResultMap">
select
<include refid="Base_Column_List" />
from jsh_material_property
where id = #{id,jdbcType=BIGINT}
</select>
<delete id="deleteByPrimaryKey" parameterType="java.lang.Long">
delete from jsh_material_property
where id = #{id,jdbcType=BIGINT}
</delete>
<delete id="deleteByExample" parameterType="com.jsh.erp.datasource.entities.MaterialPropertyExample">
delete from jsh_material_property
<if test="_parameter != null">
<include refid="Example_Where_Clause" />
</if>
</delete>
<insert id="insert" parameterType="com.jsh.erp.datasource.entities.MaterialProperty">
insert into jsh_material_property (id, native_name, enabled,
sort, another_name, delete_flag
)
values (#{id,jdbcType=BIGINT}, #{nativeName,jdbcType=VARCHAR}, #{enabled,jdbcType=BIT},
#{sort,jdbcType=VARCHAR}, #{anotherName,jdbcType=VARCHAR}, #{deleteFlag,jdbcType=VARCHAR}
)
</insert>
<insert id="insertSelective" parameterType="com.jsh.erp.datasource.entities.MaterialProperty">
insert into jsh_material_property
<trim prefix="(" suffix=")" suffixOverrides=",">
<if test="id != null">
id,
</if>
<if test="nativeName != null">
native_name,
</if>
<if test="enabled != null">
enabled,
</if>
<if test="sort != null">
sort,
</if>
<if test="anotherName != null">
another_name,
</if>
<if test="deleteFlag != null">
delete_flag,
</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="id != null">
#{id,jdbcType=BIGINT},
</if>
<if test="nativeName != null">
#{nativeName,jdbcType=VARCHAR},
</if>
<if test="enabled != null">
#{enabled,jdbcType=BIT},
</if>
<if test="sort != null">
#{sort,jdbcType=VARCHAR},
</if>
<if test="anotherName != null">
#{anotherName,jdbcType=VARCHAR},
</if>
<if test="deleteFlag != null">
#{deleteFlag,jdbcType=VARCHAR},
</if>
</trim>
</insert>
<select id="countByExample" parameterType="com.jsh.erp.datasource.entities.MaterialPropertyExample" resultType="java.lang.Long">
select count(*) from jsh_material_property
<if test="_parameter != null">
<include refid="Example_Where_Clause" />
</if>
</select>
<update id="updateByExampleSelective" parameterType="map">
update jsh_material_property
<set>
<if test="record.id != null">
id = #{record.id,jdbcType=BIGINT},
</if>
<if test="record.nativeName != null">
native_name = #{record.nativeName,jdbcType=VARCHAR},
</if>
<if test="record.enabled != null">
enabled = #{record.enabled,jdbcType=BIT},
</if>
<if test="record.sort != null">
sort = #{record.sort,jdbcType=VARCHAR},
</if>
<if test="record.anotherName != null">
another_name = #{record.anotherName,jdbcType=VARCHAR},
</if>
<if test="record.deleteFlag != null">
delete_flag = #{record.deleteFlag,jdbcType=VARCHAR},
</if>
</set>
<if test="_parameter != null">
<include refid="Update_By_Example_Where_Clause" />
</if>
</update>
<update id="updateByExample" parameterType="map">
update jsh_material_property
set id = #{record.id,jdbcType=BIGINT},
native_name = #{record.nativeName,jdbcType=VARCHAR},
enabled = #{record.enabled,jdbcType=BIT},
sort = #{record.sort,jdbcType=VARCHAR},
another_name = #{record.anotherName,jdbcType=VARCHAR},
delete_flag = #{record.deleteFlag,jdbcType=VARCHAR}
<if test="_parameter != null">
<include refid="Update_By_Example_Where_Clause" />
</if>
</update>
<update id="updateByPrimaryKeySelective" parameterType="com.jsh.erp.datasource.entities.MaterialProperty">
update jsh_material_property
<set>
<if test="nativeName != null">
native_name = #{nativeName,jdbcType=VARCHAR},
</if>
<if test="enabled != null">
enabled = #{enabled,jdbcType=BIT},
</if>
<if test="sort != null">
sort = #{sort,jdbcType=VARCHAR},
</if>
<if test="anotherName != null">
another_name = #{anotherName,jdbcType=VARCHAR},
</if>
<if test="deleteFlag != null">
delete_flag = #{deleteFlag,jdbcType=VARCHAR},
</if>
</set>
where id = #{id,jdbcType=BIGINT}
</update>
<update id="updateByPrimaryKey" parameterType="com.jsh.erp.datasource.entities.MaterialProperty">
update jsh_material_property
set native_name = #{nativeName,jdbcType=VARCHAR},
enabled = #{enabled,jdbcType=BIT},
sort = #{sort,jdbcType=VARCHAR},
another_name = #{anotherName,jdbcType=VARCHAR},
delete_flag = #{deleteFlag,jdbcType=VARCHAR}
where id = #{id,jdbcType=BIGINT}
</update>
</mapper>

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

@@ -3,12 +3,12 @@
<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 *
FROM jsh_materialproperty
FROM jsh_material_property
where 1=1
<if test="name != null">
and nativeName like '%${name}%'
and native_name like '%${name}%'
</if>
and ifnull(delete_Flag,'0') !='1'
and ifnull(delete_flag,'0') !='1'
<if test="offset != null and rows != null">
limit #{offset},#{rows}
</if>
@@ -16,16 +16,16 @@
<select id="countsByMaterialProperty" resultType="java.lang.Long">
SELECT
COUNT(id)
FROM jsh_materialproperty
FROM jsh_material_property
WHERE 1=1
<if test="name != null">
and nativeName like '%${name}%'
and native_name like '%${name}%'
</if>
and ifnull(delete_Flag,'0') !='1'
and ifnull(delete_flag,'0') !='1'
</select>
<update id="batchDeleteMaterialPropertyByIds">
update jsh_materialproperty
set delete_Flag='1'
update jsh_material_property
set delete_flag='1'
where 1=1
and id in (
<foreach collection="ids" item="id" separator=",">

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

@@ -1,271 +1,211 @@
<?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">
<mapper namespace="com.jsh.erp.datasource.mappers.PersonMapper">
<resultMap id="BaseResultMap" type="com.jsh.erp.datasource.entities.Person">
<!--
WARNING - @mbggenerated
This element is automatically generated by MyBatis Generator, do not modify.
-->
<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="delete_Flag" jdbcType="VARCHAR" property="deleteFlag" />
</resultMap>
<sql id="Example_Where_Clause">
<!--
WARNING - @mbggenerated
This element is automatically generated by MyBatis Generator, do not modify.
-->
<where>
<foreach collection="oredCriteria" item="criteria" separator="or">
<if test="criteria.valid">
<trim prefix="(" prefixOverrides="and" suffix=")">
<foreach collection="criteria.criteria" item="criterion">
<choose>
<when test="criterion.noValue">
and ${criterion.condition}
</when>
<when test="criterion.singleValue">
and ${criterion.condition} #{criterion.value}
</when>
<when test="criterion.betweenValue">
and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
</when>
<when test="criterion.listValue">
and ${criterion.condition}
<foreach close=")" collection="criterion.value" item="listItem" open="(" separator=",">
#{listItem}
</foreach>
</when>
</choose>
</foreach>
</trim>
</if>
</foreach>
</where>
</sql>
<sql id="Update_By_Example_Where_Clause">
<!--
WARNING - @mbggenerated
This element is automatically generated by MyBatis Generator, do not modify.
-->
<where>
<foreach collection="example.oredCriteria" item="criteria" separator="or">
<if test="criteria.valid">
<trim prefix="(" prefixOverrides="and" suffix=")">
<foreach collection="criteria.criteria" item="criterion">
<choose>
<when test="criterion.noValue">
and ${criterion.condition}
</when>
<when test="criterion.singleValue">
and ${criterion.condition} #{criterion.value}
</when>
<when test="criterion.betweenValue">
and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
</when>
<when test="criterion.listValue">
and ${criterion.condition}
<foreach close=")" collection="criterion.value" item="listItem" open="(" separator=",">
#{listItem}
</foreach>
</when>
</choose>
</foreach>
</trim>
</if>
</foreach>
</where>
</sql>
<sql id="Base_Column_List">
<!--
WARNING - @mbggenerated
This element is automatically generated by MyBatis Generator, do not modify.
-->
Id, Type, Name, tenant_id, delete_Flag
</sql>
<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
<if test="distinct">
distinct
</if>
<include refid="Base_Column_List" />
from jsh_person
<if test="_parameter != null">
<include refid="Example_Where_Clause" />
</if>
<if test="orderByClause != null">
order by ${orderByClause}
</if>
</select>
<select id="selectByPrimaryKey" parameterType="java.lang.Long" resultMap="BaseResultMap">
<!--
WARNING - @mbggenerated
This element is automatically generated by MyBatis Generator, do not modify.
-->
select
<include refid="Base_Column_List" />
from jsh_person
where Id = #{id,jdbcType=BIGINT}
</select>
<delete id="deleteByPrimaryKey" parameterType="java.lang.Long">
<!--
WARNING - @mbggenerated
This element is automatically generated by MyBatis Generator, do not modify.
-->
delete from jsh_person
where Id = #{id,jdbcType=BIGINT}
</delete>
<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
<if test="_parameter != null">
<include refid="Example_Where_Clause" />
</if>
</delete>
<insert id="insert" parameterType="com.jsh.erp.datasource.entities.Person">
<!--
WARNING - @mbggenerated
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},
#{tenantId,jdbcType=BIGINT}, #{deleteFlag,jdbcType=VARCHAR})
</insert>
<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
<trim prefix="(" suffix=")" suffixOverrides=",">
<if test="id != null">
Id,
</if>
<if test="type != null">
Type,
</if>
<if test="name != null">
Name,
</if>
<if test="tenantId != null">
tenant_id,
</if>
<if test="deleteFlag != null">
delete_Flag,
</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="id != null">
#{id,jdbcType=BIGINT},
</if>
<if test="type != null">
#{type,jdbcType=VARCHAR},
</if>
<if test="name != null">
#{name,jdbcType=VARCHAR},
</if>
<if test="tenantId != null">
#{tenantId,jdbcType=BIGINT},
</if>
<if test="deleteFlag != null">
#{deleteFlag,jdbcType=VARCHAR},
</if>
</trim>
</insert>
<select id="countByExample" parameterType="com.jsh.erp.datasource.entities.PersonExample" resultType="java.lang.Integer">
<!--
WARNING - @mbggenerated
This element is automatically generated by MyBatis Generator, do not modify.
-->
select count(*) from jsh_person
<if test="_parameter != null">
<include refid="Example_Where_Clause" />
</if>
</select>
<update id="updateByExampleSelective" parameterType="map">
<!--
WARNING - @mbggenerated
This element is automatically generated by MyBatis Generator, do not modify.
-->
update jsh_person
<set>
<if test="record.id != null">
Id = #{record.id,jdbcType=BIGINT},
</if>
<if test="record.type != null">
Type = #{record.type,jdbcType=VARCHAR},
</if>
<if test="record.name != null">
Name = #{record.name,jdbcType=VARCHAR},
</if>
<if test="record.tenantId != null">
tenant_id = #{record.tenantId,jdbcType=BIGINT},
</if>
<if test="record.deleteFlag != null">
delete_Flag = #{record.deleteFlag,jdbcType=VARCHAR},
</if>
</set>
<if test="_parameter != null">
<include refid="Update_By_Example_Where_Clause" />
</if>
</update>
<update id="updateByExample" parameterType="map">
<!--
WARNING - @mbggenerated
This element is automatically generated by MyBatis Generator, do not modify.
-->
update jsh_person
set Id = #{record.id,jdbcType=BIGINT},
Type = #{record.type,jdbcType=VARCHAR},
Name = #{record.name,jdbcType=VARCHAR},
tenant_id = #{record.tenantId,jdbcType=BIGINT},
delete_Flag = #{record.deleteFlag,jdbcType=VARCHAR}
<if test="_parameter != null">
<include refid="Update_By_Example_Where_Clause" />
</if>
</update>
<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
<set>
<if test="type != null">
Type = #{type,jdbcType=VARCHAR},
</if>
<if test="name != null">
Name = #{name,jdbcType=VARCHAR},
</if>
<if test="tenantId != null">
tenant_id = #{tenantId,jdbcType=BIGINT},
</if>
<if test="deleteFlag != null">
delete_Flag = #{deleteFlag,jdbcType=VARCHAR},
</if>
</set>
where Id = #{id,jdbcType=BIGINT}
</update>
<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
set Type = #{type,jdbcType=VARCHAR},
Name = #{name,jdbcType=VARCHAR},
tenant_id = #{tenantId,jdbcType=BIGINT},
delete_Flag = #{deleteFlag,jdbcType=VARCHAR}
where Id = #{id,jdbcType=BIGINT}
</update>
<mapper namespace="com.jsh.erp.datasource.mappers.PersonMapper">
<resultMap id="BaseResultMap" type="com.jsh.erp.datasource.entities.Person">
<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="delete_flag" jdbcType="VARCHAR" property="deleteFlag" />
</resultMap>
<sql id="Example_Where_Clause">
<where>
<foreach collection="oredCriteria" item="criteria" separator="or">
<if test="criteria.valid">
<trim prefix="(" prefixOverrides="and" suffix=")">
<foreach collection="criteria.criteria" item="criterion">
<choose>
<when test="criterion.noValue">
and ${criterion.condition}
</when>
<when test="criterion.singleValue">
and ${criterion.condition} #{criterion.value}
</when>
<when test="criterion.betweenValue">
and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
</when>
<when test="criterion.listValue">
and ${criterion.condition}
<foreach close=")" collection="criterion.value" item="listItem" open="(" separator=",">
#{listItem}
</foreach>
</when>
</choose>
</foreach>
</trim>
</if>
</foreach>
</where>
</sql>
<sql id="Update_By_Example_Where_Clause">
<where>
<foreach collection="example.oredCriteria" item="criteria" separator="or">
<if test="criteria.valid">
<trim prefix="(" prefixOverrides="and" suffix=")">
<foreach collection="criteria.criteria" item="criterion">
<choose>
<when test="criterion.noValue">
and ${criterion.condition}
</when>
<when test="criterion.singleValue">
and ${criterion.condition} #{criterion.value}
</when>
<when test="criterion.betweenValue">
and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
</when>
<when test="criterion.listValue">
and ${criterion.condition}
<foreach close=")" collection="criterion.value" item="listItem" open="(" separator=",">
#{listItem}
</foreach>
</when>
</choose>
</foreach>
</trim>
</if>
</foreach>
</where>
</sql>
<sql id="Base_Column_List">
id, type, name, tenant_id, delete_flag
</sql>
<select id="selectByExample" parameterType="com.jsh.erp.datasource.entities.PersonExample" resultMap="BaseResultMap">
select
<if test="distinct">
distinct
</if>
<include refid="Base_Column_List" />
from jsh_person
<if test="_parameter != null">
<include refid="Example_Where_Clause" />
</if>
<if test="orderByClause != null">
order by ${orderByClause}
</if>
</select>
<select id="selectByPrimaryKey" parameterType="java.lang.Long" resultMap="BaseResultMap">
select
<include refid="Base_Column_List" />
from jsh_person
where id = #{id,jdbcType=BIGINT}
</select>
<delete id="deleteByPrimaryKey" parameterType="java.lang.Long">
delete from jsh_person
where id = #{id,jdbcType=BIGINT}
</delete>
<delete id="deleteByExample" parameterType="com.jsh.erp.datasource.entities.PersonExample">
delete from jsh_person
<if test="_parameter != null">
<include refid="Example_Where_Clause" />
</if>
</delete>
<insert id="insert" parameterType="com.jsh.erp.datasource.entities.Person">
insert into jsh_person (id, type, name,
tenant_id, delete_flag)
values (#{id,jdbcType=BIGINT}, #{type,jdbcType=VARCHAR}, #{name,jdbcType=VARCHAR},
#{tenantId,jdbcType=BIGINT}, #{deleteFlag,jdbcType=VARCHAR})
</insert>
<insert id="insertSelective" parameterType="com.jsh.erp.datasource.entities.Person">
insert into jsh_person
<trim prefix="(" suffix=")" suffixOverrides=",">
<if test="id != null">
id,
</if>
<if test="type != null">
type,
</if>
<if test="name != null">
name,
</if>
<if test="tenantId != null">
tenant_id,
</if>
<if test="deleteFlag != null">
delete_flag,
</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="id != null">
#{id,jdbcType=BIGINT},
</if>
<if test="type != null">
#{type,jdbcType=VARCHAR},
</if>
<if test="name != null">
#{name,jdbcType=VARCHAR},
</if>
<if test="tenantId != null">
#{tenantId,jdbcType=BIGINT},
</if>
<if test="deleteFlag != null">
#{deleteFlag,jdbcType=VARCHAR},
</if>
</trim>
</insert>
<select id="countByExample" parameterType="com.jsh.erp.datasource.entities.PersonExample" resultType="java.lang.Long">
select count(*) from jsh_person
<if test="_parameter != null">
<include refid="Example_Where_Clause" />
</if>
</select>
<update id="updateByExampleSelective" parameterType="map">
update jsh_person
<set>
<if test="record.id != null">
id = #{record.id,jdbcType=BIGINT},
</if>
<if test="record.type != null">
type = #{record.type,jdbcType=VARCHAR},
</if>
<if test="record.name != null">
name = #{record.name,jdbcType=VARCHAR},
</if>
<if test="record.tenantId != null">
tenant_id = #{record.tenantId,jdbcType=BIGINT},
</if>
<if test="record.deleteFlag != null">
delete_flag = #{record.deleteFlag,jdbcType=VARCHAR},
</if>
</set>
<if test="_parameter != null">
<include refid="Update_By_Example_Where_Clause" />
</if>
</update>
<update id="updateByExample" parameterType="map">
update jsh_person
set id = #{record.id,jdbcType=BIGINT},
type = #{record.type,jdbcType=VARCHAR},
name = #{record.name,jdbcType=VARCHAR},
tenant_id = #{record.tenantId,jdbcType=BIGINT},
delete_flag = #{record.deleteFlag,jdbcType=VARCHAR}
<if test="_parameter != null">
<include refid="Update_By_Example_Where_Clause" />
</if>
</update>
<update id="updateByPrimaryKeySelective" parameterType="com.jsh.erp.datasource.entities.Person">
update jsh_person
<set>
<if test="type != null">
type = #{type,jdbcType=VARCHAR},
</if>
<if test="name != null">
name = #{name,jdbcType=VARCHAR},
</if>
<if test="tenantId != null">
tenant_id = #{tenantId,jdbcType=BIGINT},
</if>
<if test="deleteFlag != null">
delete_flag = #{deleteFlag,jdbcType=VARCHAR},
</if>
</set>
where id = #{id,jdbcType=BIGINT}
</update>
<update id="updateByPrimaryKey" parameterType="com.jsh.erp.datasource.entities.Person">
update jsh_person
set type = #{type,jdbcType=VARCHAR},
name = #{name,jdbcType=VARCHAR},
tenant_id = #{tenantId,jdbcType=BIGINT},
delete_flag = #{deleteFlag,jdbcType=VARCHAR}
where id = #{id,jdbcType=BIGINT}
</update>
</mapper>

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

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

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

@@ -1,303 +1,243 @@
<?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">
<mapper namespace="com.jsh.erp.datasource.mappers.RoleMapper">
<resultMap id="BaseResultMap" type="com.jsh.erp.datasource.entities.Role">
<!--
WARNING - @mbggenerated
This element is automatically generated by MyBatis Generator, do not modify.
-->
<id column="Id" jdbcType="BIGINT" property="id" />
<result column="Name" jdbcType="VARCHAR" property="name" />
<result column="type" jdbcType="VARCHAR" property="type" />
<result column="value" jdbcType="VARCHAR" property="value" />
<result column="description" jdbcType="VARCHAR" property="description" />
<result column="tenant_id" jdbcType="BIGINT" property="tenantId" />
<result column="delete_Flag" jdbcType="VARCHAR" property="deleteFlag" />
</resultMap>
<sql id="Example_Where_Clause">
<!--
WARNING - @mbggenerated
This element is automatically generated by MyBatis Generator, do not modify.
-->
<where>
<foreach collection="oredCriteria" item="criteria" separator="or">
<if test="criteria.valid">
<trim prefix="(" prefixOverrides="and" suffix=")">
<foreach collection="criteria.criteria" item="criterion">
<choose>
<when test="criterion.noValue">
and ${criterion.condition}
</when>
<when test="criterion.singleValue">
and ${criterion.condition} #{criterion.value}
</when>
<when test="criterion.betweenValue">
and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
</when>
<when test="criterion.listValue">
and ${criterion.condition}
<foreach close=")" collection="criterion.value" item="listItem" open="(" separator=",">
#{listItem}
</foreach>
</when>
</choose>
</foreach>
</trim>
</if>
</foreach>
</where>
</sql>
<sql id="Update_By_Example_Where_Clause">
<!--
WARNING - @mbggenerated
This element is automatically generated by MyBatis Generator, do not modify.
-->
<where>
<foreach collection="example.oredCriteria" item="criteria" separator="or">
<if test="criteria.valid">
<trim prefix="(" prefixOverrides="and" suffix=")">
<foreach collection="criteria.criteria" item="criterion">
<choose>
<when test="criterion.noValue">
and ${criterion.condition}
</when>
<when test="criterion.singleValue">
and ${criterion.condition} #{criterion.value}
</when>
<when test="criterion.betweenValue">
and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
</when>
<when test="criterion.listValue">
and ${criterion.condition}
<foreach close=")" collection="criterion.value" item="listItem" open="(" separator=",">
#{listItem}
</foreach>
</when>
</choose>
</foreach>
</trim>
</if>
</foreach>
</where>
</sql>
<sql id="Base_Column_List">
<!--
WARNING - @mbggenerated
This element is automatically generated by MyBatis Generator, do not modify.
-->
Id, Name, type, value, description, tenant_id, delete_Flag
</sql>
<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
<if test="distinct">
distinct
</if>
<include refid="Base_Column_List" />
from jsh_role
<if test="_parameter != null">
<include refid="Example_Where_Clause" />
</if>
<if test="orderByClause != null">
order by ${orderByClause}
</if>
</select>
<select id="selectByPrimaryKey" parameterType="java.lang.Long" resultMap="BaseResultMap">
<!--
WARNING - @mbggenerated
This element is automatically generated by MyBatis Generator, do not modify.
-->
select
<include refid="Base_Column_List" />
from jsh_role
where Id = #{id,jdbcType=BIGINT}
</select>
<delete id="deleteByPrimaryKey" parameterType="java.lang.Long">
<!--
WARNING - @mbggenerated
This element is automatically generated by MyBatis Generator, do not modify.
-->
delete from jsh_role
where Id = #{id,jdbcType=BIGINT}
</delete>
<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
<if test="_parameter != null">
<include refid="Example_Where_Clause" />
</if>
</delete>
<insert id="insert" parameterType="com.jsh.erp.datasource.entities.Role">
<!--
WARNING - @mbggenerated
This element is automatically generated by MyBatis Generator, do not modify.
-->
insert into jsh_role (Id, Name, type,
value, description, tenant_id,
delete_Flag)
values (#{id,jdbcType=BIGINT}, #{name,jdbcType=VARCHAR}, #{type,jdbcType=VARCHAR},
#{value,jdbcType=VARCHAR}, #{description,jdbcType=VARCHAR}, #{tenantId,jdbcType=BIGINT},
#{deleteFlag,jdbcType=VARCHAR})
</insert>
<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
<trim prefix="(" suffix=")" suffixOverrides=",">
<if test="id != null">
Id,
</if>
<if test="name != null">
Name,
</if>
<if test="type != null">
type,
</if>
<if test="value != null">
value,
</if>
<if test="description != null">
description,
</if>
<if test="tenantId != null">
tenant_id,
</if>
<if test="deleteFlag != null">
delete_Flag,
</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="id != null">
#{id,jdbcType=BIGINT},
</if>
<if test="name != null">
#{name,jdbcType=VARCHAR},
</if>
<if test="type != null">
#{type,jdbcType=VARCHAR},
</if>
<if test="value != null">
#{value,jdbcType=VARCHAR},
</if>
<if test="description != null">
#{description,jdbcType=VARCHAR},
</if>
<if test="tenantId != null">
#{tenantId,jdbcType=BIGINT},
</if>
<if test="deleteFlag != null">
#{deleteFlag,jdbcType=VARCHAR},
</if>
</trim>
</insert>
<select id="countByExample" parameterType="com.jsh.erp.datasource.entities.RoleExample" resultType="java.lang.Integer">
<!--
WARNING - @mbggenerated
This element is automatically generated by MyBatis Generator, do not modify.
-->
select count(*) from jsh_role
<if test="_parameter != null">
<include refid="Example_Where_Clause" />
</if>
</select>
<update id="updateByExampleSelective" parameterType="map">
<!--
WARNING - @mbggenerated
This element is automatically generated by MyBatis Generator, do not modify.
-->
update jsh_role
<set>
<if test="record.id != null">
Id = #{record.id,jdbcType=BIGINT},
</if>
<if test="record.name != null">
Name = #{record.name,jdbcType=VARCHAR},
</if>
<if test="record.type != null">
type = #{record.type,jdbcType=VARCHAR},
</if>
<if test="record.value != null">
value = #{record.value,jdbcType=VARCHAR},
</if>
<if test="record.description != null">
description = #{record.description,jdbcType=VARCHAR},
</if>
<if test="record.tenantId != null">
tenant_id = #{record.tenantId,jdbcType=BIGINT},
</if>
<if test="record.deleteFlag != null">
delete_Flag = #{record.deleteFlag,jdbcType=VARCHAR},
</if>
</set>
<if test="_parameter != null">
<include refid="Update_By_Example_Where_Clause" />
</if>
</update>
<update id="updateByExample" parameterType="map">
<!--
WARNING - @mbggenerated
This element is automatically generated by MyBatis Generator, do not modify.
-->
update jsh_role
set Id = #{record.id,jdbcType=BIGINT},
Name = #{record.name,jdbcType=VARCHAR},
type = #{record.type,jdbcType=VARCHAR},
value = #{record.value,jdbcType=VARCHAR},
description = #{record.description,jdbcType=VARCHAR},
tenant_id = #{record.tenantId,jdbcType=BIGINT},
delete_Flag = #{record.deleteFlag,jdbcType=VARCHAR}
<if test="_parameter != null">
<include refid="Update_By_Example_Where_Clause" />
</if>
</update>
<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
<set>
<if test="name != null">
Name = #{name,jdbcType=VARCHAR},
</if>
<if test="type != null">
type = #{type,jdbcType=VARCHAR},
</if>
<if test="value != null">
value = #{value,jdbcType=VARCHAR},
</if>
<if test="description != null">
description = #{description,jdbcType=VARCHAR},
</if>
<if test="tenantId != null">
tenant_id = #{tenantId,jdbcType=BIGINT},
</if>
<if test="deleteFlag != null">
delete_Flag = #{deleteFlag,jdbcType=VARCHAR},
</if>
</set>
where Id = #{id,jdbcType=BIGINT}
</update>
<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
set Name = #{name,jdbcType=VARCHAR},
type = #{type,jdbcType=VARCHAR},
value = #{value,jdbcType=VARCHAR},
description = #{description,jdbcType=VARCHAR},
tenant_id = #{tenantId,jdbcType=BIGINT},
delete_Flag = #{deleteFlag,jdbcType=VARCHAR}
where Id = #{id,jdbcType=BIGINT}
</update>
<mapper namespace="com.jsh.erp.datasource.mappers.RoleMapper">
<resultMap id="BaseResultMap" type="com.jsh.erp.datasource.entities.Role">
<id column="id" jdbcType="BIGINT" property="id" />
<result column="name" jdbcType="VARCHAR" property="name" />
<result column="type" jdbcType="VARCHAR" property="type" />
<result column="value" jdbcType="VARCHAR" property="value" />
<result column="description" jdbcType="VARCHAR" property="description" />
<result column="tenant_id" jdbcType="BIGINT" property="tenantId" />
<result column="delete_flag" jdbcType="VARCHAR" property="deleteFlag" />
</resultMap>
<sql id="Example_Where_Clause">
<where>
<foreach collection="oredCriteria" item="criteria" separator="or">
<if test="criteria.valid">
<trim prefix="(" prefixOverrides="and" suffix=")">
<foreach collection="criteria.criteria" item="criterion">
<choose>
<when test="criterion.noValue">
and ${criterion.condition}
</when>
<when test="criterion.singleValue">
and ${criterion.condition} #{criterion.value}
</when>
<when test="criterion.betweenValue">
and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
</when>
<when test="criterion.listValue">
and ${criterion.condition}
<foreach close=")" collection="criterion.value" item="listItem" open="(" separator=",">
#{listItem}
</foreach>
</when>
</choose>
</foreach>
</trim>
</if>
</foreach>
</where>
</sql>
<sql id="Update_By_Example_Where_Clause">
<where>
<foreach collection="example.oredCriteria" item="criteria" separator="or">
<if test="criteria.valid">
<trim prefix="(" prefixOverrides="and" suffix=")">
<foreach collection="criteria.criteria" item="criterion">
<choose>
<when test="criterion.noValue">
and ${criterion.condition}
</when>
<when test="criterion.singleValue">
and ${criterion.condition} #{criterion.value}
</when>
<when test="criterion.betweenValue">
and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
</when>
<when test="criterion.listValue">
and ${criterion.condition}
<foreach close=")" collection="criterion.value" item="listItem" open="(" separator=",">
#{listItem}
</foreach>
</when>
</choose>
</foreach>
</trim>
</if>
</foreach>
</where>
</sql>
<sql id="Base_Column_List">
id, name, type, value, description, tenant_id, delete_flag
</sql>
<select id="selectByExample" parameterType="com.jsh.erp.datasource.entities.RoleExample" resultMap="BaseResultMap">
select
<if test="distinct">
distinct
</if>
<include refid="Base_Column_List" />
from jsh_role
<if test="_parameter != null">
<include refid="Example_Where_Clause" />
</if>
<if test="orderByClause != null">
order by ${orderByClause}
</if>
</select>
<select id="selectByPrimaryKey" parameterType="java.lang.Long" resultMap="BaseResultMap">
select
<include refid="Base_Column_List" />
from jsh_role
where id = #{id,jdbcType=BIGINT}
</select>
<delete id="deleteByPrimaryKey" parameterType="java.lang.Long">
delete from jsh_role
where id = #{id,jdbcType=BIGINT}
</delete>
<delete id="deleteByExample" parameterType="com.jsh.erp.datasource.entities.RoleExample">
delete from jsh_role
<if test="_parameter != null">
<include refid="Example_Where_Clause" />
</if>
</delete>
<insert id="insert" parameterType="com.jsh.erp.datasource.entities.Role">
insert into jsh_role (id, name, type,
value, description, tenant_id,
delete_flag)
values (#{id,jdbcType=BIGINT}, #{name,jdbcType=VARCHAR}, #{type,jdbcType=VARCHAR},
#{value,jdbcType=VARCHAR}, #{description,jdbcType=VARCHAR}, #{tenantId,jdbcType=BIGINT},
#{deleteFlag,jdbcType=VARCHAR})
</insert>
<insert id="insertSelective" parameterType="com.jsh.erp.datasource.entities.Role">
insert into jsh_role
<trim prefix="(" suffix=")" suffixOverrides=",">
<if test="id != null">
id,
</if>
<if test="name != null">
name,
</if>
<if test="type != null">
type,
</if>
<if test="value != null">
value,
</if>
<if test="description != null">
description,
</if>
<if test="tenantId != null">
tenant_id,
</if>
<if test="deleteFlag != null">
delete_flag,
</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="id != null">
#{id,jdbcType=BIGINT},
</if>
<if test="name != null">
#{name,jdbcType=VARCHAR},
</if>
<if test="type != null">
#{type,jdbcType=VARCHAR},
</if>
<if test="value != null">
#{value,jdbcType=VARCHAR},
</if>
<if test="description != null">
#{description,jdbcType=VARCHAR},
</if>
<if test="tenantId != null">
#{tenantId,jdbcType=BIGINT},
</if>
<if test="deleteFlag != null">
#{deleteFlag,jdbcType=VARCHAR},
</if>
</trim>
</insert>
<select id="countByExample" parameterType="com.jsh.erp.datasource.entities.RoleExample" resultType="java.lang.Long">
select count(*) from jsh_role
<if test="_parameter != null">
<include refid="Example_Where_Clause" />
</if>
</select>
<update id="updateByExampleSelective" parameterType="map">
update jsh_role
<set>
<if test="record.id != null">
id = #{record.id,jdbcType=BIGINT},
</if>
<if test="record.name != null">
name = #{record.name,jdbcType=VARCHAR},
</if>
<if test="record.type != null">
type = #{record.type,jdbcType=VARCHAR},
</if>
<if test="record.value != null">
value = #{record.value,jdbcType=VARCHAR},
</if>
<if test="record.description != null">
description = #{record.description,jdbcType=VARCHAR},
</if>
<if test="record.tenantId != null">
tenant_id = #{record.tenantId,jdbcType=BIGINT},
</if>
<if test="record.deleteFlag != null">
delete_flag = #{record.deleteFlag,jdbcType=VARCHAR},
</if>
</set>
<if test="_parameter != null">
<include refid="Update_By_Example_Where_Clause" />
</if>
</update>
<update id="updateByExample" parameterType="map">
update jsh_role
set id = #{record.id,jdbcType=BIGINT},
name = #{record.name,jdbcType=VARCHAR},
type = #{record.type,jdbcType=VARCHAR},
value = #{record.value,jdbcType=VARCHAR},
description = #{record.description,jdbcType=VARCHAR},
tenant_id = #{record.tenantId,jdbcType=BIGINT},
delete_flag = #{record.deleteFlag,jdbcType=VARCHAR}
<if test="_parameter != null">
<include refid="Update_By_Example_Where_Clause" />
</if>
</update>
<update id="updateByPrimaryKeySelective" parameterType="com.jsh.erp.datasource.entities.Role">
update jsh_role
<set>
<if test="name != null">
name = #{name,jdbcType=VARCHAR},
</if>
<if test="type != null">
type = #{type,jdbcType=VARCHAR},
</if>
<if test="value != null">
value = #{value,jdbcType=VARCHAR},
</if>
<if test="description != null">
description = #{description,jdbcType=VARCHAR},
</if>
<if test="tenantId != null">
tenant_id = #{tenantId,jdbcType=BIGINT},
</if>
<if test="deleteFlag != null">
delete_flag = #{deleteFlag,jdbcType=VARCHAR},
</if>
</set>
where id = #{id,jdbcType=BIGINT}
</update>
<update id="updateByPrimaryKey" parameterType="com.jsh.erp.datasource.entities.Role">
update jsh_role
set name = #{name,jdbcType=VARCHAR},
type = #{type,jdbcType=VARCHAR},
value = #{value,jdbcType=VARCHAR},
description = #{description,jdbcType=VARCHAR},
tenant_id = #{tenantId,jdbcType=BIGINT},
delete_flag = #{deleteFlag,jdbcType=VARCHAR}
where id = #{id,jdbcType=BIGINT}
</update>
</mapper>

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

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

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

@@ -1,383 +1,323 @@
<?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">
<mapper namespace="com.jsh.erp.datasource.mappers.SerialNumberMapper">
<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" />
<result column="material_Id" jdbcType="BIGINT" property="materialId" />
<result column="serial_Number" jdbcType="VARCHAR" property="serialNumber" />
<result column="is_Sell" jdbcType="VARCHAR" property="isSell" />
<result column="remark" jdbcType="VARCHAR" property="remark" />
<result column="delete_Flag" jdbcType="VARCHAR" property="deleteFlag" />
<result column="create_Time" jdbcType="TIMESTAMP" property="createTime" />
<result column="creator" jdbcType="BIGINT" property="creator" />
<result column="update_Time" jdbcType="TIMESTAMP" property="updateTime" />
<result column="updater" jdbcType="BIGINT" property="updater" />
<result column="depothead_Id" jdbcType="BIGINT" property="depotheadId" />
<result column="tenant_id" jdbcType="BIGINT" property="tenantId" />
</resultMap>
<sql id="Example_Where_Clause">
<!--
WARNING - @mbggenerated
This element is automatically generated by MyBatis Generator, do not modify.
-->
<where>
<foreach collection="oredCriteria" item="criteria" separator="or">
<if test="criteria.valid">
<trim prefix="(" prefixOverrides="and" suffix=")">
<foreach collection="criteria.criteria" item="criterion">
<choose>
<when test="criterion.noValue">
and ${criterion.condition}
</when>
<when test="criterion.singleValue">
and ${criterion.condition} #{criterion.value}
</when>
<when test="criterion.betweenValue">
and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
</when>
<when test="criterion.listValue">
and ${criterion.condition}
<foreach close=")" collection="criterion.value" item="listItem" open="(" separator=",">
#{listItem}
</foreach>
</when>
</choose>
</foreach>
</trim>
</if>
</foreach>
</where>
</sql>
<sql id="Update_By_Example_Where_Clause">
<!--
WARNING - @mbggenerated
This element is automatically generated by MyBatis Generator, do not modify.
-->
<where>
<foreach collection="example.oredCriteria" item="criteria" separator="or">
<if test="criteria.valid">
<trim prefix="(" prefixOverrides="and" suffix=")">
<foreach collection="criteria.criteria" item="criterion">
<choose>
<when test="criterion.noValue">
and ${criterion.condition}
</when>
<when test="criterion.singleValue">
and ${criterion.condition} #{criterion.value}
</when>
<when test="criterion.betweenValue">
and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
</when>
<when test="criterion.listValue">
and ${criterion.condition}
<foreach close=")" collection="criterion.value" item="listItem" open="(" separator=",">
#{listItem}
</foreach>
</when>
</choose>
</foreach>
</trim>
</if>
</foreach>
</where>
</sql>
<sql id="Base_Column_List">
<!--
WARNING - @mbggenerated
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>
<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
<if test="distinct">
distinct
</if>
<include refid="Base_Column_List" />
from jsh_serial_number
<if test="_parameter != null">
<include refid="Example_Where_Clause" />
</if>
<if test="orderByClause != null">
order by ${orderByClause}
</if>
</select>
<select id="selectByPrimaryKey" parameterType="java.lang.Long" resultMap="BaseResultMap">
<!--
WARNING - @mbggenerated
This element is automatically generated by MyBatis Generator, do not modify.
-->
select
<include refid="Base_Column_List" />
from jsh_serial_number
where id = #{id,jdbcType=BIGINT}
</select>
<delete id="deleteByPrimaryKey" parameterType="java.lang.Long">
<!--
WARNING - @mbggenerated
This element is automatically generated by MyBatis Generator, do not modify.
-->
delete from jsh_serial_number
where id = #{id,jdbcType=BIGINT}
</delete>
<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
<if test="_parameter != null">
<include refid="Example_Where_Clause" />
</if>
</delete>
<insert id="insert" 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 (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},
#{isSell,jdbcType=VARCHAR}, #{remark,jdbcType=VARCHAR}, #{deleteFlag,jdbcType=VARCHAR},
#{createTime,jdbcType=TIMESTAMP}, #{creator,jdbcType=BIGINT}, #{updateTime,jdbcType=TIMESTAMP},
#{updater,jdbcType=BIGINT}, #{depotheadId,jdbcType=BIGINT}, #{tenantId,jdbcType=BIGINT}
)
</insert>
<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
<trim prefix="(" suffix=")" suffixOverrides=",">
<if test="id != null">
id,
</if>
<if test="materialId != null">
material_Id,
</if>
<if test="serialNumber != null">
serial_Number,
</if>
<if test="isSell != null">
is_Sell,
</if>
<if test="remark != null">
remark,
</if>
<if test="deleteFlag != null">
delete_Flag,
</if>
<if test="createTime != null">
create_Time,
</if>
<if test="creator != null">
creator,
</if>
<if test="updateTime != null">
update_Time,
</if>
<if test="updater != null">
updater,
</if>
<if test="depotheadId != null">
depothead_Id,
</if>
<if test="tenantId != null">
tenant_id,
</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="id != null">
#{id,jdbcType=BIGINT},
</if>
<if test="materialId != null">
#{materialId,jdbcType=BIGINT},
</if>
<if test="serialNumber != null">
#{serialNumber,jdbcType=VARCHAR},
</if>
<if test="isSell != null">
#{isSell,jdbcType=VARCHAR},
</if>
<if test="remark != null">
#{remark,jdbcType=VARCHAR},
</if>
<if test="deleteFlag != null">
#{deleteFlag,jdbcType=VARCHAR},
</if>
<if test="createTime != null">
#{createTime,jdbcType=TIMESTAMP},
</if>
<if test="creator != null">
#{creator,jdbcType=BIGINT},
</if>
<if test="updateTime != null">
#{updateTime,jdbcType=TIMESTAMP},
</if>
<if test="updater != null">
#{updater,jdbcType=BIGINT},
</if>
<if test="depotheadId != null">
#{depotheadId,jdbcType=BIGINT},
</if>
<if test="tenantId != null">
#{tenantId,jdbcType=BIGINT},
</if>
</trim>
</insert>
<select id="countByExample" parameterType="com.jsh.erp.datasource.entities.SerialNumberExample" resultType="java.lang.Integer">
<!--
WARNING - @mbggenerated
This element is automatically generated by MyBatis Generator, do not modify.
-->
select count(*) from jsh_serial_number
<if test="_parameter != null">
<include refid="Example_Where_Clause" />
</if>
</select>
<update id="updateByExampleSelective" parameterType="map">
<!--
WARNING - @mbggenerated
This element is automatically generated by MyBatis Generator, do not modify.
-->
update jsh_serial_number
<set>
<if test="record.id != null">
id = #{record.id,jdbcType=BIGINT},
</if>
<if test="record.materialId != null">
material_Id = #{record.materialId,jdbcType=BIGINT},
</if>
<if test="record.serialNumber != null">
serial_Number = #{record.serialNumber,jdbcType=VARCHAR},
</if>
<if test="record.isSell != null">
is_Sell = #{record.isSell,jdbcType=VARCHAR},
</if>
<if test="record.remark != null">
remark = #{record.remark,jdbcType=VARCHAR},
</if>
<if test="record.deleteFlag != null">
delete_Flag = #{record.deleteFlag,jdbcType=VARCHAR},
</if>
<if test="record.createTime != null">
create_Time = #{record.createTime,jdbcType=TIMESTAMP},
</if>
<if test="record.creator != null">
creator = #{record.creator,jdbcType=BIGINT},
</if>
<if test="record.updateTime != null">
update_Time = #{record.updateTime,jdbcType=TIMESTAMP},
</if>
<if test="record.updater != null">
updater = #{record.updater,jdbcType=BIGINT},
</if>
<if test="record.depotheadId != null">
depothead_Id = #{record.depotheadId,jdbcType=BIGINT},
</if>
<if test="record.tenantId != null">
tenant_id = #{record.tenantId,jdbcType=BIGINT},
</if>
</set>
<if test="_parameter != null">
<include refid="Update_By_Example_Where_Clause" />
</if>
</update>
<update id="updateByExample" parameterType="map">
<!--
WARNING - @mbggenerated
This element is automatically generated by MyBatis Generator, do not modify.
-->
update jsh_serial_number
set id = #{record.id,jdbcType=BIGINT},
material_Id = #{record.materialId,jdbcType=BIGINT},
serial_Number = #{record.serialNumber,jdbcType=VARCHAR},
is_Sell = #{record.isSell,jdbcType=VARCHAR},
remark = #{record.remark,jdbcType=VARCHAR},
delete_Flag = #{record.deleteFlag,jdbcType=VARCHAR},
create_Time = #{record.createTime,jdbcType=TIMESTAMP},
creator = #{record.creator,jdbcType=BIGINT},
update_Time = #{record.updateTime,jdbcType=TIMESTAMP},
updater = #{record.updater,jdbcType=BIGINT},
depothead_Id = #{record.depotheadId,jdbcType=BIGINT},
tenant_id = #{record.tenantId,jdbcType=BIGINT}
<if test="_parameter != null">
<include refid="Update_By_Example_Where_Clause" />
</if>
</update>
<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
<set>
<if test="materialId != null">
material_Id = #{materialId,jdbcType=BIGINT},
</if>
<if test="serialNumber != null">
serial_Number = #{serialNumber,jdbcType=VARCHAR},
</if>
<if test="isSell != null">
is_Sell = #{isSell,jdbcType=VARCHAR},
</if>
<if test="remark != null">
remark = #{remark,jdbcType=VARCHAR},
</if>
<if test="deleteFlag != null">
delete_Flag = #{deleteFlag,jdbcType=VARCHAR},
</if>
<if test="createTime != null">
create_Time = #{createTime,jdbcType=TIMESTAMP},
</if>
<if test="creator != null">
creator = #{creator,jdbcType=BIGINT},
</if>
<if test="updateTime != null">
update_Time = #{updateTime,jdbcType=TIMESTAMP},
</if>
<if test="updater != null">
updater = #{updater,jdbcType=BIGINT},
</if>
<if test="depotheadId != null">
depothead_Id = #{depotheadId,jdbcType=BIGINT},
</if>
<if test="tenantId != null">
tenant_id = #{tenantId,jdbcType=BIGINT},
</if>
</set>
where id = #{id,jdbcType=BIGINT}
</update>
<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
set material_Id = #{materialId,jdbcType=BIGINT},
serial_Number = #{serialNumber,jdbcType=VARCHAR},
is_Sell = #{isSell,jdbcType=VARCHAR},
remark = #{remark,jdbcType=VARCHAR},
delete_Flag = #{deleteFlag,jdbcType=VARCHAR},
create_Time = #{createTime,jdbcType=TIMESTAMP},
creator = #{creator,jdbcType=BIGINT},
update_Time = #{updateTime,jdbcType=TIMESTAMP},
updater = #{updater,jdbcType=BIGINT},
depothead_Id = #{depotheadId,jdbcType=BIGINT},
tenant_id = #{tenantId,jdbcType=BIGINT}
where id = #{id,jdbcType=BIGINT}
</update>
<mapper namespace="com.jsh.erp.datasource.mappers.SerialNumberMapper">
<resultMap id="BaseResultMap" type="com.jsh.erp.datasource.entities.SerialNumber">
<id column="id" jdbcType="BIGINT" property="id" />
<result column="material_id" jdbcType="BIGINT" property="materialId" />
<result column="serial_number" jdbcType="VARCHAR" property="serialNumber" />
<result column="is_sell" jdbcType="VARCHAR" property="isSell" />
<result column="remark" jdbcType="VARCHAR" property="remark" />
<result column="delete_flag" jdbcType="VARCHAR" property="deleteFlag" />
<result column="create_time" jdbcType="TIMESTAMP" property="createTime" />
<result column="creator" jdbcType="BIGINT" property="creator" />
<result column="update_time" jdbcType="TIMESTAMP" property="updateTime" />
<result column="updater" jdbcType="BIGINT" property="updater" />
<result column="depot_head_id" jdbcType="BIGINT" property="depotHeadId" />
<result column="tenant_id" jdbcType="BIGINT" property="tenantId" />
</resultMap>
<sql id="Example_Where_Clause">
<where>
<foreach collection="oredCriteria" item="criteria" separator="or">
<if test="criteria.valid">
<trim prefix="(" prefixOverrides="and" suffix=")">
<foreach collection="criteria.criteria" item="criterion">
<choose>
<when test="criterion.noValue">
and ${criterion.condition}
</when>
<when test="criterion.singleValue">
and ${criterion.condition} #{criterion.value}
</when>
<when test="criterion.betweenValue">
and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
</when>
<when test="criterion.listValue">
and ${criterion.condition}
<foreach close=")" collection="criterion.value" item="listItem" open="(" separator=",">
#{listItem}
</foreach>
</when>
</choose>
</foreach>
</trim>
</if>
</foreach>
</where>
</sql>
<sql id="Update_By_Example_Where_Clause">
<where>
<foreach collection="example.oredCriteria" item="criteria" separator="or">
<if test="criteria.valid">
<trim prefix="(" prefixOverrides="and" suffix=")">
<foreach collection="criteria.criteria" item="criterion">
<choose>
<when test="criterion.noValue">
and ${criterion.condition}
</when>
<when test="criterion.singleValue">
and ${criterion.condition} #{criterion.value}
</when>
<when test="criterion.betweenValue">
and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
</when>
<when test="criterion.listValue">
and ${criterion.condition}
<foreach close=")" collection="criterion.value" item="listItem" open="(" separator=",">
#{listItem}
</foreach>
</when>
</choose>
</foreach>
</trim>
</if>
</foreach>
</where>
</sql>
<sql id="Base_Column_List">
id, material_id, serial_number, is_sell, remark, delete_flag, create_time, creator,
update_time, updater, depot_head_id, tenant_id
</sql>
<select id="selectByExample" parameterType="com.jsh.erp.datasource.entities.SerialNumberExample" resultMap="BaseResultMap">
select
<if test="distinct">
distinct
</if>
<include refid="Base_Column_List" />
from jsh_serial_number
<if test="_parameter != null">
<include refid="Example_Where_Clause" />
</if>
<if test="orderByClause != null">
order by ${orderByClause}
</if>
</select>
<select id="selectByPrimaryKey" parameterType="java.lang.Long" resultMap="BaseResultMap">
select
<include refid="Base_Column_List" />
from jsh_serial_number
where id = #{id,jdbcType=BIGINT}
</select>
<delete id="deleteByPrimaryKey" parameterType="java.lang.Long">
delete from jsh_serial_number
where id = #{id,jdbcType=BIGINT}
</delete>
<delete id="deleteByExample" parameterType="com.jsh.erp.datasource.entities.SerialNumberExample">
delete from jsh_serial_number
<if test="_parameter != null">
<include refid="Example_Where_Clause" />
</if>
</delete>
<insert id="insert" parameterType="com.jsh.erp.datasource.entities.SerialNumber">
insert into jsh_serial_number (id, material_id, serial_number,
is_sell, remark, delete_flag,
create_time, creator, update_time,
updater, depot_head_id, tenant_id
)
values (#{id,jdbcType=BIGINT}, #{materialId,jdbcType=BIGINT}, #{serialNumber,jdbcType=VARCHAR},
#{isSell,jdbcType=VARCHAR}, #{remark,jdbcType=VARCHAR}, #{deleteFlag,jdbcType=VARCHAR},
#{createTime,jdbcType=TIMESTAMP}, #{creator,jdbcType=BIGINT}, #{updateTime,jdbcType=TIMESTAMP},
#{updater,jdbcType=BIGINT}, #{depotHeadId,jdbcType=BIGINT}, #{tenantId,jdbcType=BIGINT}
)
</insert>
<insert id="insertSelective" parameterType="com.jsh.erp.datasource.entities.SerialNumber">
insert into jsh_serial_number
<trim prefix="(" suffix=")" suffixOverrides=",">
<if test="id != null">
id,
</if>
<if test="materialId != null">
material_id,
</if>
<if test="serialNumber != null">
serial_number,
</if>
<if test="isSell != null">
is_sell,
</if>
<if test="remark != null">
remark,
</if>
<if test="deleteFlag != null">
delete_flag,
</if>
<if test="createTime != null">
create_time,
</if>
<if test="creator != null">
creator,
</if>
<if test="updateTime != null">
update_time,
</if>
<if test="updater != null">
updater,
</if>
<if test="depotHeadId != null">
depot_head_id,
</if>
<if test="tenantId != null">
tenant_id,
</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="id != null">
#{id,jdbcType=BIGINT},
</if>
<if test="materialId != null">
#{materialId,jdbcType=BIGINT},
</if>
<if test="serialNumber != null">
#{serialNumber,jdbcType=VARCHAR},
</if>
<if test="isSell != null">
#{isSell,jdbcType=VARCHAR},
</if>
<if test="remark != null">
#{remark,jdbcType=VARCHAR},
</if>
<if test="deleteFlag != null">
#{deleteFlag,jdbcType=VARCHAR},
</if>
<if test="createTime != null">
#{createTime,jdbcType=TIMESTAMP},
</if>
<if test="creator != null">
#{creator,jdbcType=BIGINT},
</if>
<if test="updateTime != null">
#{updateTime,jdbcType=TIMESTAMP},
</if>
<if test="updater != null">
#{updater,jdbcType=BIGINT},
</if>
<if test="depotHeadId != null">
#{depotHeadId,jdbcType=BIGINT},
</if>
<if test="tenantId != null">
#{tenantId,jdbcType=BIGINT},
</if>
</trim>
</insert>
<select id="countByExample" parameterType="com.jsh.erp.datasource.entities.SerialNumberExample" resultType="java.lang.Long">
select count(*) from jsh_serial_number
<if test="_parameter != null">
<include refid="Example_Where_Clause" />
</if>
</select>
<update id="updateByExampleSelective" parameterType="map">
update jsh_serial_number
<set>
<if test="record.id != null">
id = #{record.id,jdbcType=BIGINT},
</if>
<if test="record.materialId != null">
material_id = #{record.materialId,jdbcType=BIGINT},
</if>
<if test="record.serialNumber != null">
serial_number = #{record.serialNumber,jdbcType=VARCHAR},
</if>
<if test="record.isSell != null">
is_sell = #{record.isSell,jdbcType=VARCHAR},
</if>
<if test="record.remark != null">
remark = #{record.remark,jdbcType=VARCHAR},
</if>
<if test="record.deleteFlag != null">
delete_flag = #{record.deleteFlag,jdbcType=VARCHAR},
</if>
<if test="record.createTime != null">
create_time = #{record.createTime,jdbcType=TIMESTAMP},
</if>
<if test="record.creator != null">
creator = #{record.creator,jdbcType=BIGINT},
</if>
<if test="record.updateTime != null">
update_time = #{record.updateTime,jdbcType=TIMESTAMP},
</if>
<if test="record.updater != null">
updater = #{record.updater,jdbcType=BIGINT},
</if>
<if test="record.depotHeadId != null">
depot_head_id = #{record.depotHeadId,jdbcType=BIGINT},
</if>
<if test="record.tenantId != null">
tenant_id = #{record.tenantId,jdbcType=BIGINT},
</if>
</set>
<if test="_parameter != null">
<include refid="Update_By_Example_Where_Clause" />
</if>
</update>
<update id="updateByExample" parameterType="map">
update jsh_serial_number
set id = #{record.id,jdbcType=BIGINT},
material_id = #{record.materialId,jdbcType=BIGINT},
serial_number = #{record.serialNumber,jdbcType=VARCHAR},
is_sell = #{record.isSell,jdbcType=VARCHAR},
remark = #{record.remark,jdbcType=VARCHAR},
delete_flag = #{record.deleteFlag,jdbcType=VARCHAR},
create_time = #{record.createTime,jdbcType=TIMESTAMP},
creator = #{record.creator,jdbcType=BIGINT},
update_time = #{record.updateTime,jdbcType=TIMESTAMP},
updater = #{record.updater,jdbcType=BIGINT},
depot_head_id = #{record.depotHeadId,jdbcType=BIGINT},
tenant_id = #{record.tenantId,jdbcType=BIGINT}
<if test="_parameter != null">
<include refid="Update_By_Example_Where_Clause" />
</if>
</update>
<update id="updateByPrimaryKeySelective" parameterType="com.jsh.erp.datasource.entities.SerialNumber">
update jsh_serial_number
<set>
<if test="materialId != null">
material_id = #{materialId,jdbcType=BIGINT},
</if>
<if test="serialNumber != null">
serial_number = #{serialNumber,jdbcType=VARCHAR},
</if>
<if test="isSell != null">
is_sell = #{isSell,jdbcType=VARCHAR},
</if>
<if test="remark != null">
remark = #{remark,jdbcType=VARCHAR},
</if>
<if test="deleteFlag != null">
delete_flag = #{deleteFlag,jdbcType=VARCHAR},
</if>
<if test="createTime != null">
create_time = #{createTime,jdbcType=TIMESTAMP},
</if>
<if test="creator != null">
creator = #{creator,jdbcType=BIGINT},
</if>
<if test="updateTime != null">
update_time = #{updateTime,jdbcType=TIMESTAMP},
</if>
<if test="updater != null">
updater = #{updater,jdbcType=BIGINT},
</if>
<if test="depotHeadId != null">
depot_head_id = #{depotHeadId,jdbcType=BIGINT},
</if>
<if test="tenantId != null">
tenant_id = #{tenantId,jdbcType=BIGINT},
</if>
</set>
where id = #{id,jdbcType=BIGINT}
</update>
<update id="updateByPrimaryKey" parameterType="com.jsh.erp.datasource.entities.SerialNumber">
update jsh_serial_number
set material_id = #{materialId,jdbcType=BIGINT},
serial_number = #{serialNumber,jdbcType=VARCHAR},
is_sell = #{isSell,jdbcType=VARCHAR},
remark = #{remark,jdbcType=VARCHAR},
delete_flag = #{deleteFlag,jdbcType=VARCHAR},
create_time = #{createTime,jdbcType=TIMESTAMP},
creator = #{creator,jdbcType=BIGINT},
update_time = #{updateTime,jdbcType=TIMESTAMP},
updater = #{updater,jdbcType=BIGINT},
depot_head_id = #{depotHeadId,jdbcType=BIGINT},
tenant_id = #{tenantId,jdbcType=BIGINT}
where id = #{id,jdbcType=BIGINT}
</update>
</mapper>

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

@@ -11,22 +11,22 @@
</resultMap>
<select id="selectByConditionSerialNumber" resultMap="SerialNumberExBaseResultMap">
select
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,
null as updaterName,ser.depothead_Id, dh.number as depotHeadNumber,concat(dh.SubType,dh.Type) as depotHeadType
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,
null as updaterName,ser.depot_head_id, dh.number as depotHeadNumber,concat(dh.SubType,dh.Type) as depotHeadType
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_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
<if test="serialNumber != null">
<bind name="serialNumber" value="'%' + _parameter.serialNumber + '%'" />
and ser.serial_Number like #{serialNumber}
and ser.serial_number like #{serialNumber}
</if>
<if test="materialName != null">
<bind name="materialName" value="'%' + _parameter.materialName + '%'" />
and mat.name like #{materialName}
</if>
and ifnull(ser.delete_Flag,'0') !='1'
and ifnull(ser.delete_flag,'0') !='1'
order by ser.id desc
<if test="offset != null and rows != null">
limit #{offset},#{rows}
@@ -36,7 +36,7 @@
SELECT
COUNT(ser.id)
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
<if test="serialNumber != null">
<bind name="serialNumber" value="'%' + _parameter.serialNumber + '%'" />
@@ -46,71 +46,71 @@
<bind name="materialName" value="'%' + _parameter.materialName + '%'" />
and mat.name like #{materialName}
</if>
and ifnull(ser.delete_Flag,'0') !='1'
and ifnull(ser.delete_flag,'0') !='1'
order by ser.id desc
</select>
<select id="findById" resultMap="SerialNumberExBaseResultMap">
SELECT
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,
ur.username as updaterName,ser.depothead_Id
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,
ur.username as updaterName,ser.depot_head_id
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_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')
where 1=1
and ser.id=#{id}
and ifnull(ser.delete_Flag,'0') !='1'
and ifnull(ser.delete_flag,'0') !='1'
order by ser.id desc
</select>
<select id="findBySerialNumber" resultMap="SerialNumberExBaseResultMap">
SELECT
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.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.depot_head_id
FROM jsh_serial_number ser
where 1=1
<if test="serialNumber != null">
and ser.serial_Number=#{serialNumber}
and ser.serial_number=#{serialNumber}
</if>
and ifnull(ser.delete_Flag,'0') !='1'
and ifnull(ser.delete_flag,'0') !='1'
order by ser.id desc
</select>
<insert id="addSerialNumber" parameterType="com.jsh.erp.datasource.entities.SerialNumberEx"
useGeneratedKeys="true" keyProperty="id" keyColumn="id">
insert into jsh_serial_number
(material_Id, serial_Number, is_Sell, remark,delete_Flag,
create_Time, creator,update_Time, updater,depothead_Id)
(material_id, serial_number, is_sell, remark,delete_flag,
create_time, creator,update_time, updater,depot_head_id)
values
(#{materialId},#{serialNumber},#{isSell},#{remark},#{deleteFlag},
#{createTime},#{creator},#{updateTime},#{updater},#{depotheadId}
#{createTime},#{creator},#{updateTime},#{updater},#{depotHeadId}
)
</insert>
<update id="updateSerialNumber" parameterType="com.jsh.erp.datasource.entities.SerialNumberEx">
update jsh_serial_number
<set>
<if test="materialId != null">
material_Id = #{materialId,jdbcType=BIGINT},
material_id = #{materialId,jdbcType=BIGINT},
</if>
<if test="serialNumber != null">
serial_Number = #{serialNumber,jdbcType=VARCHAR},
serial_number = #{serialNumber,jdbcType=VARCHAR},
</if>
<if test="isSell != null">
is_Sell = #{isSell,jdbcType=VARCHAR},
is_sell = #{isSell,jdbcType=VARCHAR},
</if>
<if test="remark != null">
remark = #{remark,jdbcType=VARCHAR},
</if>
<if test="deleteFlag != null">
delete_Flag = #{deleteFlag,jdbcType=VARCHAR},
delete_flag = #{deleteFlag,jdbcType=VARCHAR},
</if>
<if test="updateTime != null">
update_Time = #{updateTime,jdbcType=TIMESTAMP},
update_time = #{updateTime,jdbcType=TIMESTAMP},
</if>
<if test="updater != null">
updater = #{updater,jdbcType=BIGINT},
</if>
<if test="depotheadId != null">
depothead_Id = #{depotheadId,jdbcType=BIGINT},
<if test="depotHeadId != null">
depot_head_id = #{depotHeadId,jdbcType=BIGINT},
</if>
</set>
where id = #{id,jdbcType=BIGINT}
@@ -124,8 +124,8 @@
<if test="materialId != null">
and ser.material_Id=#{materialId}
</if>
and ifnull(ser.delete_Flag,'0') !='1'
and ser.is_Sell !='1'
and ifnull(ser.delete_flag,'0') !='1'
and ser.is_sell !='1'
</select>
<select id="countSerialNumberByMaterialIdAndDepotheadId" resultType="java.lang.Integer">
SELECT
@@ -133,23 +133,23 @@
FROM jsh_serial_number ser
where 1=1
<if test="materialId != null">
and ser.material_Id=#{materialId}
and ser.material_id=#{materialId}
</if>
<if test="depotheadId != null">
and ser.depothead_Id=#{depotheadId}
<if test="depotHeadId != null">
and ser.depot_head_id=#{depotHeadId}
</if>
and ser.is_Sell =#{isSell,jdbcType=VARCHAR}
and ifnull(ser.delete_Flag,'0') !='1'
and ser.is_sell =#{isSell,jdbcType=VARCHAR}
and ifnull(ser.delete_flag,'0') !='1'
</select>
<update id="sellSerialNumber">
update jsh_serial_number
<set>
is_Sell = '1',
<if test="depotheadId !=null ">
depothead_Id = #{depotheadId},
is_sell = '1',
<if test="depotHeadId !=null ">
depot_head_id = #{depotHeadId},
</if>
<if test="updateTime !=null ">
update_Time = #{updateTime},
update_time = #{updateTime},
</if>
<if test="updater != null">
updater = #{updater},
@@ -157,10 +157,10 @@
</set>
where 1=1
<if test="materialId != null">
and material_Id = #{materialId}
and material_id = #{materialId}
</if>
and is_Sell != '1'
and ifnull(delete_Flag,'0') !='1'
and is_sell != '1'
and ifnull(delete_flag,'0') !='1'
<if test="count != null">
and id in
( select batchSN.id from
@@ -169,8 +169,8 @@
<if test="materialId != null">
and selFrom.material_Id = #{materialId}
</if>
and selFrom.is_Sell != '1'
and ifnull(selFrom.delete_Flag,'0') !='1'
and selFrom.is_sell != '1'
and ifnull(selFrom.delete_flag,'0') !='1'
limit 0,#{count}
) batchSN
)
@@ -180,9 +180,9 @@
<update id="cancelSerialNumber">
update jsh_serial_number
<set>
is_Sell = '0',
is_sell = '0',
<if test="updateTime !=null ">
update_Time = #{updateTime},
update_time = #{updateTime},
</if>
<if test="updater != null">
updater = #{updater},
@@ -190,26 +190,26 @@
</set>
where 1=1
<if test="materialId != null">
and material_Id = #{materialId}
and material_id = #{materialId}
</if>
<if test="depotheadId !=null ">
and depothead_Id = #{depotheadId,jdbcType=BIGINT}
<if test="depotHeadId !=null ">
and depot_head_id = #{depotHeadId,jdbcType=BIGINT}
</if>
and is_Sell != '0'
and ifnull(delete_Flag,'0') !='1'
and is_sell != '0'
and ifnull(delete_flag,'0') !='1'
<if test="count != null">
and id in
( select batchSN.id from
( select selFrom.id from jsh_serial_number selFrom
where 1=1
<if test="materialId != null">
and selFrom.material_Id = #{materialId}
and selFrom.material_id = #{materialId}
</if>
<if test="depotheadId !=null ">
and selFrom.depothead_Id = #{depotheadId,jdbcType=BIGINT}
<if test="depotHeadId !=null ">
and selFrom.depot_head_id = #{depotHeadId,jdbcType=BIGINT}
</if>
and selFrom.is_Sell !='0'
and ifnull(selFrom.delete_Flag,'0') !='1'
and selFrom.is_sell !='0'
and ifnull(selFrom.delete_flag,'0') !='1'
limit 0,#{count}
) batchSN
)
@@ -218,8 +218,8 @@
<insert id="batAddSerialNumber"
useGeneratedKeys="true" keyProperty="id" keyColumn="id">
insert into jsh_serial_number
(material_Id, serial_Number, is_Sell, remark,delete_Flag,
create_Time, creator,update_Time, updater)
(material_id, serial_number, is_sell, remark,delete_flag,
create_time, creator,update_time, updater)
values
<foreach collection='list' item='each' separator=','>
(#{each.materialId},#{each.serialNumber},'0',#{each.remark},'0',
@@ -229,7 +229,7 @@
</insert>
<update id="batchDeleteSerialNumberByIds">
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
and id in (
<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="minus_stock_flag" jdbcType="VARCHAR" property="minusStockFlag" />
<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>
<sql id="Example_Where_Clause">
<where>
@@ -75,7 +75,7 @@
</sql>
<sql id="Base_Column_List">
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>
<select id="selectByExample" parameterType="com.jsh.erp.datasource.entities.SystemConfigExample" resultMap="BaseResultMap">
select
@@ -83,7 +83,7 @@
distinct
</if>
<include refid="Base_Column_List" />
from jsh_systemconfig
from jsh_system_config
<if test="_parameter != null">
<include refid="Example_Where_Clause" />
</if>
@@ -94,24 +94,24 @@
<select id="selectByPrimaryKey" parameterType="java.lang.Long" resultMap="BaseResultMap">
select
<include refid="Base_Column_List" />
from jsh_systemconfig
from jsh_system_config
where id = #{id,jdbcType=BIGINT}
</select>
<delete id="deleteByPrimaryKey" parameterType="java.lang.Long">
delete from jsh_systemconfig
delete from jsh_system_config
where id = #{id,jdbcType=BIGINT}
</delete>
<delete id="deleteByExample" parameterType="com.jsh.erp.datasource.entities.SystemConfigExample">
delete from jsh_systemconfig
delete from jsh_system_config
<if test="_parameter != null">
<include refid="Example_Where_Clause" />
</if>
</delete>
<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_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},
#{companyAddress,jdbcType=VARCHAR}, #{companyTel,jdbcType=VARCHAR}, #{companyFax,jdbcType=VARCHAR},
@@ -120,7 +120,7 @@
)
</insert>
<insert id="insertSelective" parameterType="com.jsh.erp.datasource.entities.SystemConfig">
insert into jsh_systemconfig
insert into jsh_system_config
<trim prefix="(" suffix=")" suffixOverrides=",">
<if test="id != null">
id,
@@ -156,7 +156,7 @@
tenant_id,
</if>
<if test="deleteFlag != null">
delete_Flag,
delete_flag,
</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
@@ -199,13 +199,13 @@
</trim>
</insert>
<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">
<include refid="Example_Where_Clause" />
</if>
</select>
<update id="updateByExampleSelective" parameterType="map">
update jsh_systemconfig
update jsh_system_config
<set>
<if test="record.id != null">
id = #{record.id,jdbcType=BIGINT},
@@ -241,7 +241,7 @@
tenant_id = #{record.tenantId,jdbcType=BIGINT},
</if>
<if test="record.deleteFlag != null">
delete_Flag = #{record.deleteFlag,jdbcType=VARCHAR},
delete_flag = #{record.deleteFlag,jdbcType=VARCHAR},
</if>
</set>
<if test="_parameter != null">
@@ -249,7 +249,7 @@
</if>
</update>
<update id="updateByExample" parameterType="map">
update jsh_systemconfig
update jsh_system_config
set id = #{record.id,jdbcType=BIGINT},
company_name = #{record.companyName,jdbcType=VARCHAR},
company_contacts = #{record.companyContacts,jdbcType=VARCHAR},
@@ -261,13 +261,13 @@
customer_flag = #{record.customerFlag,jdbcType=VARCHAR},
minus_stock_flag = #{record.minusStockFlag,jdbcType=VARCHAR},
tenant_id = #{record.tenantId,jdbcType=BIGINT},
delete_Flag = #{record.deleteFlag,jdbcType=VARCHAR}
delete_flag = #{record.deleteFlag,jdbcType=VARCHAR}
<if test="_parameter != null">
<include refid="Update_By_Example_Where_Clause" />
</if>
</update>
<update id="updateByPrimaryKeySelective" parameterType="com.jsh.erp.datasource.entities.SystemConfig">
update jsh_systemconfig
update jsh_system_config
<set>
<if test="companyName != null">
company_name = #{companyName,jdbcType=VARCHAR},
@@ -300,13 +300,13 @@
tenant_id = #{tenantId,jdbcType=BIGINT},
</if>
<if test="deleteFlag != null">
delete_Flag = #{deleteFlag,jdbcType=VARCHAR},
delete_flag = #{deleteFlag,jdbcType=VARCHAR},
</if>
</set>
where id = #{id,jdbcType=BIGINT}
</update>
<update id="updateByPrimaryKey" parameterType="com.jsh.erp.datasource.entities.SystemConfig">
update jsh_systemconfig
update jsh_system_config
set company_name = #{companyName,jdbcType=VARCHAR},
company_contacts = #{companyContacts,jdbcType=VARCHAR},
company_address = #{companyAddress,jdbcType=VARCHAR},
@@ -317,7 +317,7 @@
customer_flag = #{customerFlag,jdbcType=VARCHAR},
minus_stock_flag = #{minusStockFlag,jdbcType=VARCHAR},
tenant_id = #{tenantId,jdbcType=BIGINT},
delete_Flag = #{deleteFlag,jdbcType=VARCHAR}
delete_flag = #{deleteFlag,jdbcType=VARCHAR}
where id = #{id,jdbcType=BIGINT}
</update>
</mapper>

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

@@ -3,12 +3,12 @@
<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 *
FROM jsh_systemconfig
FROM jsh_system_config
where 1=1
<if test="companyName != null">
and company_name like '%${companyName}%'
</if>
and ifnull(delete_Flag,'0') !='1'
and ifnull(delete_flag,'0') !='1'
<if test="offset != null and rows != null">
limit #{offset},#{rows}
</if>
@@ -16,16 +16,16 @@
<select id="countsBySystemConfig" resultType="java.lang.Long">
SELECT
COUNT(id)
FROM jsh_systemconfig
FROM jsh_system_config
WHERE 1=1
<if test="companyName != null">
and company_name like '%${companyName}%'
</if>
and ifnull(delete_Flag,'0') !='1'
and ifnull(delete_flag,'0') !='1'
</select>
<update id="batchDeleteSystemConfigByIds">
update jsh_systemconfig
set delete_Flag='1'
update jsh_system_config
set delete_flag='1'
where 1=1
and id in (
<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">
<resultMap id="BaseResultMap" type="com.jsh.erp.datasource.entities.Unit">
<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="other_unit" jdbcType="VARCHAR" property="otherUnit" />
<result column="ratio" jdbcType="INTEGER" property="ratio" />
<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>
<sql id="Example_Where_Clause">
<where>
@@ -69,7 +69,7 @@
</where>
</sql>
<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>
<select id="selectByExample" parameterType="com.jsh.erp.datasource.entities.UnitExample" resultMap="BaseResultMap">
select
@@ -102,10 +102,10 @@
</if>
</delete>
<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,
delete_Flag)
values (#{id,jdbcType=BIGINT}, #{uname,jdbcType=VARCHAR}, #{basicUnit,jdbcType=VARCHAR},
delete_flag)
values (#{id,jdbcType=BIGINT}, #{name,jdbcType=VARCHAR}, #{basicUnit,jdbcType=VARCHAR},
#{otherUnit,jdbcType=VARCHAR}, #{ratio,jdbcType=INTEGER}, #{tenantId,jdbcType=BIGINT},
#{deleteFlag,jdbcType=VARCHAR})
</insert>
@@ -115,8 +115,8 @@
<if test="id != null">
id,
</if>
<if test="uname != null">
UName,
<if test="name != null">
name,
</if>
<if test="basicUnit != null">
basic_unit,
@@ -131,15 +131,15 @@
tenant_id,
</if>
<if test="deleteFlag != null">
delete_Flag,
delete_flag,
</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="id != null">
#{id,jdbcType=BIGINT},
</if>
<if test="uname != null">
#{uname,jdbcType=VARCHAR},
<if test="name != null">
#{name,jdbcType=VARCHAR},
</if>
<if test="basicUnit != null">
#{basicUnit,jdbcType=VARCHAR},
@@ -170,8 +170,8 @@
<if test="record.id != null">
id = #{record.id,jdbcType=BIGINT},
</if>
<if test="record.uname != null">
UName = #{record.uname,jdbcType=VARCHAR},
<if test="record.name != null">
name = #{record.name,jdbcType=VARCHAR},
</if>
<if test="record.basicUnit != null">
basic_unit = #{record.basicUnit,jdbcType=VARCHAR},
@@ -186,7 +186,7 @@
tenant_id = #{record.tenantId,jdbcType=BIGINT},
</if>
<if test="record.deleteFlag != null">
delete_Flag = #{record.deleteFlag,jdbcType=VARCHAR},
delete_flag = #{record.deleteFlag,jdbcType=VARCHAR},
</if>
</set>
<if test="_parameter != null">
@@ -196,12 +196,12 @@
<update id="updateByExample" parameterType="map">
update jsh_unit
set id = #{record.id,jdbcType=BIGINT},
UName = #{record.uname,jdbcType=VARCHAR},
name = #{record.name,jdbcType=VARCHAR},
basic_unit = #{record.basicUnit,jdbcType=VARCHAR},
other_unit = #{record.otherUnit,jdbcType=VARCHAR},
ratio = #{record.ratio,jdbcType=INTEGER},
tenant_id = #{record.tenantId,jdbcType=BIGINT},
delete_Flag = #{record.deleteFlag,jdbcType=VARCHAR}
delete_flag = #{record.deleteFlag,jdbcType=VARCHAR}
<if test="_parameter != null">
<include refid="Update_By_Example_Where_Clause" />
</if>
@@ -209,8 +209,8 @@
<update id="updateByPrimaryKeySelective" parameterType="com.jsh.erp.datasource.entities.Unit">
update jsh_unit
<set>
<if test="uname != null">
UName = #{uname,jdbcType=VARCHAR},
<if test="name != null">
name = #{name,jdbcType=VARCHAR},
</if>
<if test="basicUnit != null">
basic_unit = #{basicUnit,jdbcType=VARCHAR},
@@ -225,19 +225,19 @@
tenant_id = #{tenantId,jdbcType=BIGINT},
</if>
<if test="deleteFlag != null">
delete_Flag = #{deleteFlag,jdbcType=VARCHAR},
delete_flag = #{deleteFlag,jdbcType=VARCHAR},
</if>
</set>
where id = #{id,jdbcType=BIGINT}
</update>
<update id="updateByPrimaryKey" parameterType="com.jsh.erp.datasource.entities.Unit">
update jsh_unit
set UName = #{uname,jdbcType=VARCHAR},
set name = #{name,jdbcType=VARCHAR},
basic_unit = #{basicUnit,jdbcType=VARCHAR},
other_unit = #{otherUnit,jdbcType=VARCHAR},
ratio = #{ratio,jdbcType=INTEGER},
tenant_id = #{tenantId,jdbcType=BIGINT},
delete_Flag = #{deleteFlag,jdbcType=VARCHAR}
delete_flag = #{deleteFlag,jdbcType=VARCHAR}
where id = #{id,jdbcType=BIGINT}
</update>
</mapper>

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