实现交接班业务逻辑

master
baogq 6 years ago
parent 624dcac7f0
commit 5be9e8d18b

@ -5,11 +5,8 @@ import java.util.Date;
import java.util.List;
import java.util.Random;
import com.ruoyi.baseinfo.domain.BaseDeviceInfo;
import com.ruoyi.baseinfo.domain.BaseShiftInfo;
import com.ruoyi.baseinfo.service.IBaseDeviceInfoService;
import com.ruoyi.baseinfo.service.IBasePlandetailInfoService;
import com.ruoyi.baseinfo.service.IBaseShiftInfoService;
import com.ruoyi.baseinfo.domain.*;
import com.ruoyi.baseinfo.service.*;
import com.ruoyi.common.utils.DateUtils;
import com.ruoyi.framework.util.ShiroUtils;
import org.apache.shiro.authz.annotation.RequiresPermissions;
@ -23,8 +20,6 @@ import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.ResponseBody;
import com.ruoyi.common.annotation.Log;
import com.ruoyi.common.enums.BusinessType;
import com.ruoyi.baseinfo.domain.BasePlanInfo;
import com.ruoyi.baseinfo.service.IBasePlanInfoService;
import com.ruoyi.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.common.utils.poi.ExcelUtil;
@ -50,6 +45,10 @@ public class BasePlanInfoController extends BaseController
private IBaseShiftInfoService baseShiftInfoService;
@Autowired
private IBasePlandetailInfoService basePlandetailInfoService;
@Autowired
private IBaseMaterialInfoService baseMaterialInfoService;
@Autowired
private IBaseGroupInfoService baseGroupInfoService;
@RequiresPermissions("baseinfo:planinfo:view")
@GetMapping()
@ -153,7 +152,28 @@ public class BasePlanInfoController extends BaseController
@ResponseBody
public AjaxResult remove(String ids)
{
basePlandetailInfoService.deleteBasePlandetailInfoByPlanIds(ids);
return toAjax(basePlanInfoService.deleteBasePlanInfoByIds(ids));
}
/**
*
*/
@RequiresPermissions("baseinfo:planchildinfo:list")
@GetMapping("/detail/{planid}")
public String detail(@PathVariable("planid") String planid, ModelMap mmap)
{
BasePlanInfo basePlanInfo = new BasePlanInfo();
BaseMaterialInfo baseMaterialInfo = new BaseMaterialInfo();
mmap.put("planDetailInfo", basePlanInfoService.selectBasePlanInfoListByPlanID(planid));
mmap.put("cbmaterialinfo", baseMaterialInfoService.selectBaseMaterialInfoList(baseMaterialInfo));
BaseGroupInfo baseGroupInfo = new BaseGroupInfo();
mmap.put("cbGroupInfo", baseGroupInfoService.selectBaseGroupInfoList(baseGroupInfo));
mmap.put("planInfoList", basePlanInfoService.selectBasePlanInfoList(basePlanInfo));
return "baseinfo/plandetailinfo/plandetailinfo";
}
}

@ -50,8 +50,10 @@ public class BasePlandetailInfoController extends BaseController
@RequiresPermissions("baseinfo:plandetailinfo:view")
@GetMapping()
public String plandetailinfo()
public String plandetailinfo(ModelMap mmap)
{
// BaseMaterialInfo baseMaterialInfo = new BaseMaterialInfo();
// mmap.put("cbmaterialinfo", baseMaterialInfoService.selectBaseMaterialInfoList(baseMaterialInfo));
return prefix + "/plandetailinfo";
}
@ -111,6 +113,8 @@ public class BasePlandetailInfoController extends BaseController
public String edit(@PathVariable("objid") Long objid, ModelMap mmap)
{
BasePlandetailInfo basePlandetailInfo = basePlandetailInfoService.selectBasePlandetailInfoById(objid);
mmap.put("cbMaterialinfo", baseMaterialInfoService.selectEditBaseMaterialInfoList(basePlandetailInfo.getMaterialId()));
mmap.put("cbGroupInfo", baseGroupInfoService.selectEditBaseGroupInfoList(basePlandetailInfo.getGroupId()));
mmap.put("basePlandetailInfo", basePlandetailInfo);
return prefix + "/edit";
}
@ -145,8 +149,6 @@ public class BasePlandetailInfoController extends BaseController
@GetMapping("/plandetail/{planid}")
public String planedit(@PathVariable("planid") String planid, ModelMap mmap)
{
// BasePlanInfo basePlanInfo = basePlanInfoService.selectBasePlanInfoById(planid);
// mmap.put("basePlanInfo", basePlanInfo);
BaseMaterialInfo baseMaterialInfo = new BaseMaterialInfo();
BaseGroupInfo baseGroupInfo = new BaseGroupInfo();
mmap.put("cbmaterialInfo",baseMaterialInfoService.selectBaseMaterialInfoList(baseMaterialInfo));
@ -155,4 +157,5 @@ public class BasePlandetailInfoController extends BaseController
mmap.put("planid", planid);
return prefix + "/add";
}
}

@ -0,0 +1,126 @@
package com.ruoyi.web.controller.baseinfo;
import java.util.List;
import org.apache.shiro.authz.annotation.RequiresPermissions;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller;
import org.springframework.ui.ModelMap;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.ResponseBody;
import com.ruoyi.common.annotation.Log;
import com.ruoyi.common.enums.BusinessType;
import com.ruoyi.baseinfo.domain.BaseShiftdetailInfo;
import com.ruoyi.baseinfo.service.IBaseShiftdetailInfoService;
import com.ruoyi.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.common.utils.poi.ExcelUtil;
import com.ruoyi.common.core.page.TableDataInfo;
/**
* Controller
*
* @author CaesarBao
* @date 2020-10-28
*/
@Controller
@RequestMapping("/baseinfo/shiftdetailinfo")
public class BaseShiftdetailInfoController extends BaseController
{
private String prefix = "baseinfo/shiftdetailinfo";
@Autowired
private IBaseShiftdetailInfoService baseShiftdetailInfoService;
@RequiresPermissions("baseinfo:shiftdetailinfo:view")
@GetMapping()
public String shiftdetailinfo()
{
return prefix + "/shiftdetailinfo";
}
/**
*
*/
@RequiresPermissions("baseinfo:shiftdetailinfo:list")
@PostMapping("/list")
@ResponseBody
public TableDataInfo list(BaseShiftdetailInfo baseShiftdetailInfo)
{
startPage();
List<BaseShiftdetailInfo> list = baseShiftdetailInfoService.selectBaseShiftdetailInfoList(baseShiftdetailInfo);
return getDataTable(list);
}
/**
*
*/
@RequiresPermissions("baseinfo:shiftdetailinfo:export")
@Log(title = "交接班详情信息", businessType = BusinessType.EXPORT)
@PostMapping("/export")
@ResponseBody
public AjaxResult export(BaseShiftdetailInfo baseShiftdetailInfo)
{
List<BaseShiftdetailInfo> list = baseShiftdetailInfoService.selectBaseShiftdetailInfoList(baseShiftdetailInfo);
ExcelUtil<BaseShiftdetailInfo> util = new ExcelUtil<BaseShiftdetailInfo>(BaseShiftdetailInfo.class);
return util.exportExcel(list, "shiftdetailinfo");
}
/**
*
*/
@GetMapping("/add")
public String add()
{
return prefix + "/add";
}
/**
*
*/
@RequiresPermissions("baseinfo:shiftdetailinfo:add")
@Log(title = "交接班详情信息", businessType = BusinessType.INSERT)
@PostMapping("/add")
@ResponseBody
public AjaxResult addSave(BaseShiftdetailInfo baseShiftdetailInfo)
{
return toAjax(baseShiftdetailInfoService.insertBaseShiftdetailInfo(baseShiftdetailInfo));
}
/**
*
*/
@GetMapping("/edit/{shiftNo}")
public String edit(@PathVariable("shiftNo") String shiftNo, ModelMap mmap)
{
BaseShiftdetailInfo baseShiftdetailInfo = baseShiftdetailInfoService.selectBaseShiftdetailInfoById(shiftNo);
mmap.put("baseShiftdetailInfo", baseShiftdetailInfo);
return prefix + "/edit";
}
/**
*
*/
@RequiresPermissions("baseinfo:shiftdetailinfo:edit")
@Log(title = "交接班详情信息", businessType = BusinessType.UPDATE)
@PostMapping("/edit")
@ResponseBody
public AjaxResult editSave(BaseShiftdetailInfo baseShiftdetailInfo)
{
return toAjax(baseShiftdetailInfoService.updateBaseShiftdetailInfo(baseShiftdetailInfo));
}
/**
*
*/
@RequiresPermissions("baseinfo:shiftdetailinfo:remove")
@Log(title = "交接班详情信息", businessType = BusinessType.DELETE)
@PostMapping( "/remove")
@ResponseBody
public AjaxResult remove(String ids)
{
return toAjax(baseShiftdetailInfoService.deleteBaseShiftdetailInfoByIds(ids));
}
}

@ -0,0 +1,149 @@
package com.ruoyi.web.controller.baseinfo;
import java.text.SimpleDateFormat;
import java.util.Date;
import java.util.List;
import com.ruoyi.baseinfo.domain.BaseDeviceInfo;
import com.ruoyi.baseinfo.domain.BaseGroupInfo;
import com.ruoyi.baseinfo.domain.BaseShiftInfo;
import com.ruoyi.baseinfo.service.IBaseDeviceInfoService;
import com.ruoyi.baseinfo.service.IBaseGroupInfoService;
import com.ruoyi.baseinfo.service.IBaseShiftInfoService;
import org.apache.shiro.authz.annotation.RequiresPermissions;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller;
import org.springframework.ui.ModelMap;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.ResponseBody;
import com.ruoyi.common.annotation.Log;
import com.ruoyi.common.enums.BusinessType;
import com.ruoyi.baseinfo.domain.BaseShiftmasterInfo;
import com.ruoyi.baseinfo.service.IBaseShiftmasterInfoService;
import com.ruoyi.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.common.utils.poi.ExcelUtil;
import com.ruoyi.common.core.page.TableDataInfo;
/**
* Controller
*
* @author CaesarBao
* @date 2020-10-28
*/
@Controller
@RequestMapping("/baseinfo/shiftmasterinfo")
public class BaseShiftmasterInfoController extends BaseController
{
private String prefix = "baseinfo/shiftmasterinfo";
@Autowired
private IBaseShiftmasterInfoService baseShiftmasterInfoService;
@Autowired
private IBaseDeviceInfoService baseDeviceInfoService;
@Autowired
private IBaseShiftInfoService baseShiftInfoService;
@Autowired
private IBaseGroupInfoService baseGroupInfoService;
@RequiresPermissions("baseinfo:shiftmasterinfo:view")
@GetMapping()
public String shiftmasterinfo(ModelMap mmap)
{
BaseDeviceInfo baseDeviceInfo = new BaseDeviceInfo();
BaseShiftInfo baseShiftInfo = new BaseShiftInfo();
BaseGroupInfo baseGroupInfo = new BaseGroupInfo();
mmap.put("cbdeviceInfo",baseDeviceInfoService.selectBaseDeviceInfoList(baseDeviceInfo));
mmap.put("cbshitfInfo",baseShiftInfoService.selectBaseShiftInfoList(baseShiftInfo));
mmap.put("cbgroupInfo",baseGroupInfoService.selectBaseGroupInfoList(baseGroupInfo));
return prefix + "/shiftmasterinfo";
}
/**
*
*/
@RequiresPermissions("baseinfo:shiftmasterinfo:list")
@PostMapping("/list")
@ResponseBody
public TableDataInfo list(BaseShiftmasterInfo baseShiftmasterInfo)
{
startPage();
List<BaseShiftmasterInfo> list = baseShiftmasterInfoService.selectBaseShiftmasterInfoList(baseShiftmasterInfo);
return getDataTable(list);
}
/**
*
*/
@RequiresPermissions("baseinfo:shiftmasterinfo:export")
@Log(title = "交接班基础信息", businessType = BusinessType.EXPORT)
@PostMapping("/export")
@ResponseBody
public AjaxResult export(BaseShiftmasterInfo baseShiftmasterInfo)
{
List<BaseShiftmasterInfo> list = baseShiftmasterInfoService.selectBaseShiftmasterInfoList(baseShiftmasterInfo);
ExcelUtil<BaseShiftmasterInfo> util = new ExcelUtil<BaseShiftmasterInfo>(BaseShiftmasterInfo.class);
return util.exportExcel(list, "shiftmasterinfo");
}
/**
*
*/
@GetMapping("/add")
public String add()
{
return prefix + "/add";
}
/**
*
*/
@RequiresPermissions("baseinfo:shiftmasterinfo:add")
@Log(title = "交接班基础信息", businessType = BusinessType.INSERT)
@PostMapping("/add")
@ResponseBody
public AjaxResult addSave(BaseShiftmasterInfo baseShiftmasterInfo)
{
String code = new SimpleDateFormat("yyMMddHHmmss").format(new Date());
baseShiftmasterInfo.setShiftNo(code);
return toAjax(baseShiftmasterInfoService.insertBaseShiftmasterInfo(baseShiftmasterInfo));
}
/**
*
*/
@GetMapping("/edit/{shiftNo}")
public String edit(@PathVariable("shiftNo") String shiftNo, ModelMap mmap)
{
BaseShiftmasterInfo baseShiftmasterInfo = baseShiftmasterInfoService.selectBaseShiftmasterInfoById(shiftNo);
mmap.put("baseShiftmasterInfo", baseShiftmasterInfo);
return prefix + "/edit";
}
/**
*
*/
@RequiresPermissions("baseinfo:shiftmasterinfo:edit")
@Log(title = "交接班基础信息", businessType = BusinessType.UPDATE)
@PostMapping("/edit")
@ResponseBody
public AjaxResult editSave(BaseShiftmasterInfo baseShiftmasterInfo)
{
return toAjax(baseShiftmasterInfoService.updateBaseShiftmasterInfo(baseShiftmasterInfo));
}
/**
*
*/
@RequiresPermissions("baseinfo:shiftmasterinfo:remove")
@Log(title = "交接班基础信息", businessType = BusinessType.DELETE)
@PostMapping( "/remove")
@ResponseBody
public AjaxResult remove(String ids)
{
return toAjax(baseShiftmasterInfoService.deleteBaseShiftmasterInfoByIds(ids));
}
}

@ -2,6 +2,8 @@
<html lang="zh" xmlns:th="http://www.thymeleaf.org" >
<head>
<th:block th:include="include :: header('修改计划明细')" />
<th:block th:include="include :: jasny-bootstrap-css" />
<th:block th:include="include :: select2-css" />
</head>
<body class="white-bg">
<div class="wrapper wrapper-content animated fadeInRight ibox-content">
@ -14,21 +16,11 @@
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">工序ID</label>
<label class="col-sm-3 control-label">物料</label>
<div class="col-sm-8">
<select name="planDetailId" class="form-control m-b">
<option value="">所有</option>
<select name="materialId" id="materialId" th:id="materialId" class="form-control m-b">
<option name="cbMaterialinfo" th:each="materialId:${cbMaterialinfo}" th:value="${materialId.materialId}" th:text="${materialId.materialName}" th:selected="${materialId.flag}" th:disabled="${materialId.status == '1'}"></option>
</select>
<span class="help-block m-b-none"><i class="fa fa-info-circle"></i> 代码生成请选择字典属性</span>
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">物料ID</label>
<div class="col-sm-8">
<select name="materialId" class="form-control m-b">
<option value="">所有</option>
</select>
<span class="help-block m-b-none"><i class="fa fa-info-circle"></i> 代码生成请选择字典属性</span>
</div>
</div>
<div class="form-group">
@ -54,10 +46,9 @@
<div class="form-group">
<label class="col-sm-3 control-label">班组ID</label>
<div class="col-sm-8">
<select name="groupId" class="form-control m-b">
<option value="">所有</option>
<select name="groupId" id="groupId" th:id="groupId" class="form-control m-b">
<option name="cbGroupInfo" th:each="groupId:${cbGroupInfo}" th:value="${groupId.groupid}" th:text="${groupId.groupname}" th:selected="${groupId.flag}" th:disabled="${groupId.status == '1'}"></option>
</select>
<span class="help-block m-b-none"><i class="fa fa-info-circle"></i> 代码生成请选择字典属性</span>
</div>
</div>
<div class="form-group">
@ -72,6 +63,8 @@
</form>
</div>
<th:block th:include="include :: footer" />
<th:block th:include="include :: jasny-bootstrap-js" />
<th:block th:include="include :: select2-js" />
<script th:inline="javascript">
var prefix = ctx + "baseinfo/plandetailinfo";
$("#form-plandetailinfo-edit").validate({

@ -12,20 +12,15 @@
<ul>
<li>
<label>计划ID</label>
<input type="text" name="planid"/>
</li>
<li>
<label>工序ID</label>
<select name="planDetailId">
<option value="">所有</option>
<option value="-1">代码生成请选择字典属性</option>
<select id="planid" name="planid" class="form-control">
<option th:each="planDetailInfo : ${planInfoList}" th:text="${planDetailInfo['planid']}" th:value="${planDetailInfo['planid']}" th:field="*{planDetailInfo.planid}"></option>
</select>
</li>
<li>
<label>物料ID</label>
<select name="materialId">
<option value="">所有</option>
<option value="-1">代码生成请选择字典属性</option>
<option value="">--请选择物料类型--</option>
<option name="cbmaterialinfo" th:each="materialId:${cbmaterialinfo}" th:value="${materialId.materialId}" th:text="${materialId.materialName}" th:disabled="${materialId.status == '1'}"></option>
</select>
</li>
<li>
@ -46,8 +41,8 @@
<li>
<label>班组ID</label>
<select name="groupId">
<option value="">所有</option>
<option value="-1">代码生成请选择字典属性</option>
<option value="">--请选择物料类型--</option>
<option name="cbGroupInfo" th:each="groupId:${cbGroupInfo}" th:value="${groupId.groupid}" th:text="${groupId.groupname}" th:disabled="${groupId.status == '1'}"></option>
</select>
</li>
<li>
@ -67,9 +62,9 @@
</div>
<div class="btn-group-sm" id="toolbar" role="group">
<a class="btn btn-success" onclick="$.operate.add()" shiro:hasPermission="baseinfo:plandetailinfo:add">
<i class="fa fa-plus"></i> 添加
</a>
<!-- <a class="btn btn-success" onclick="$.operate.add()" shiro:hasPermission="baseinfo:plandetailinfo:add">-->
<!-- <i class="fa fa-plus"></i> 添加-->
<!-- </a>-->
<a class="btn btn-primary single disabled" onclick="$.operate.edit()" shiro:hasPermission="baseinfo:plandetailinfo:edit">
<i class="fa fa-edit"></i> 修改
</a>
@ -113,10 +108,6 @@
field: 'planid',
title: '计划ID'
},
{
field: 'planDetailId',
title: '工序ID'
},
{
field: 'materialId',
title: '物料ID'
@ -137,8 +128,16 @@
}
},
{
field: 'groupId',
title: '班组ID'
field: 'groupname',
title: '班组'
},
{
field: 'startTime',
title: '起始时间'
},
{
field: 'overTime',
title: '结束时间'
},
{
field: 'remark',

@ -51,9 +51,9 @@
<a class="btn btn-success" onclick="$.operate.add()" shiro:hasPermission="baseinfo:planinfo:add">
<i class="fa fa-plus"></i> 添加
</a>
<a class="btn btn-primary single disabled" onclick="$.operate.edit()" shiro:hasPermission="baseinfo:planinfo:edit">
<i class="fa fa-edit"></i> 修改
</a>
<!-- <a class="btn btn-primary single disabled" onclick="$.operate.edit()" shiro:hasPermission="baseinfo:planinfo:edit">-->
<!-- <i class="fa fa-edit"></i> 修改-->
<!-- </a>-->
<a class="btn btn-danger multiple disabled" onclick="$.operate.removeAll()" shiro:hasPermission="baseinfo:planinfo:remove">
<i class="fa fa-remove"></i> 删除
</a>
@ -73,6 +73,7 @@
var planStateIdDatas = [[${@dict.getType('sys_planstate_info')}]];
var unitIdDatas = [[${@dict.getType('sys_unit_info')}]];
var statusDatas = [[${@dict.getType('sys_status_info')}]];
var listFlag = [[${@permission.hasPermi('baseinfo:plandetailinfo:list')}]];
var prefix = ctx + "baseinfo/planinfo";
$(function() {
var options = {
@ -86,7 +87,7 @@
onExpandRow: function(index, row, $detail) {
initChildTable(index, row, $detail);
},
modalName: "计划信息",
modalName: "计划下发",
columns: [{
checkbox: true
},
@ -97,7 +98,7 @@
},
{
field: 'deviceName',
title: '设备台'
title: '设备台'
},
{
field: 'shiftname',
@ -110,6 +111,14 @@
return $.table.selectDictLabel(planStateIdDatas, value);
}
},
{
field: 'startTime',
title: '起始时间'
},
{
field: 'overTime',
title: '结束时间'
},
{
field: 'status',
title: '状态标志',
@ -127,7 +136,8 @@
formatter: function(value, row, index) {
var actions = [];
actions.push('<a class="btn btn-success btn-xs ' + editFlag + '" href="javascript:void(0)" onclick="addPlanDetailInfo(\'' + row.planid + '\')"><i class="fa fa-edit"></i>新增计划明细</a> ');
actions.push('<a class="btn btn-success btn-xs ' + editFlag + '" href="javascript:void(0)" onclick="$.operate.edit(\'' + row.planid + '\')"><i class="fa fa-edit"></i>编辑</a> ');
actions.push('<a class="btn btn-info btn-xs ' + listFlag + '" href="javascript:void(0)" onclick="detail(\'' + row.planid + '\')"><i class="fa fa-list-ul"></i>列表</a> ');
actions.push('<a class="btn btn-success btn-xs ' + editFlag + '" href="javascript:void(0)" onclick="editPlanInfo(' + row.planid + ',\'' + row.planStateId + '\')"><i class="fa fa-edit"></i>编辑</a> ');
actions.push('<a class="btn btn-danger btn-xs ' + removeFlag + '" href="javascript:void(0)" onclick="$.operate.remove(\'' + row.planid + '\')"><i class="fa fa-remove"></i>删除</a>');
return actions.join('');
}
@ -135,13 +145,18 @@
};
$.table.init(options);
});
function editPlanInfo(row,planStateId) {
if(planStateId != 0){
$.modal.msgError("请知晓已下发计划不允许修改!");
}else {
$.modal.open("修改计划下发", prefix + "/edit/" + row);
}
};
function addPlanDetailInfo(row) {
console.log(row);
$.modal.open("计划明细", ctx +"baseinfo/plandetailinfo/plandetail/"+row);
};
initChildTable = function(index, row, $detail) {
var parentid = row.planid;
console.log(parentid)
var childTable = $detail.html('<table style="table-layout:fixed"></table>').find('table');
$(childTable).bootstrapTable({
url: ctx + "baseinfo/plandetailinfo/list",
@ -175,8 +190,16 @@
}
},
{
field: 'groupId',
title: '班组ID'
field: 'groupname',
title: '班组'
},
{
field: 'startTime',
title: '起始时间'
},
{
field: 'overTime',
title: '结束时间'
},
{
field: 'remark',
@ -189,18 +212,25 @@
return $.table.selectDictLabel(statusDatas, value);
}
},
{
title: '操作',
align: 'center',
formatter: function(value, row, index) {
var actions = [];
actions.push('<a class="btn btn-success btn-xs ' + editFlag + '" href="javascript:void(0)" onclick="$.operate.edit(\'' + row.objid + '\')"><i class="fa fa-edit"></i>编辑</a> ');
actions.push('<a class="btn btn-danger btn-xs ' + removeFlag + '" href="javascript:void(0)" onclick="$.operate.remove(\'' + row.objid + '\')"><i class="fa fa-remove"></i>删除</a>');
return actions.join('');
}
}]
// {
// title: '操作',
// align: 'center',
// formatter: function(value, row, index) {
// var actions = [];
// actions.push('<a class="btn btn-success btn-xs ' + editFlag + '" href="javascript:void(0)" onclick="$.operate.edit(\'' + row.objid + '\')"><i class="fa fa-edit"></i>编辑</a> ');
// actions.push('<a class="btn btn-danger btn-xs ' + removeFlag + '" href="javascript:void(0)" onclick="$.operate.remove(\'' + row.objid + '\')"><i class="fa fa-remove"></i>删除</a>');
// return actions.join('');
// }
// }
]
});
};
/*子计划列表-详细*/
function detail(planid) {
var url = prefix + '/detail/' + planid;
$.modal.openTab("详细计划信息", url);
}
</script>
</body>
</html>

@ -0,0 +1,40 @@
<!DOCTYPE html>
<html lang="zh" xmlns:th="http://www.thymeleaf.org" >
<head>
<th:block th:include="include :: header('新增交接班详情信息')" />
</head>
<body class="white-bg">
<div class="wrapper wrapper-content animated fadeInRight ibox-content">
<form class="form-horizontal m" id="form-shiftdetailinfo-add">
<div class="form-group">
<label class="col-sm-3 control-label">状态标志:</label>
<div class="col-sm-8">
<div class="radio-box" th:each="dict : ${@dict.getType('sys_status_info')}">
<input type="radio" th:id="${'status_' + dict.dictCode}" name="status" th:value="${dict.dictValue}" th:checked="${dict.default}">
<label th:for="${'status_' + dict.dictCode}" th:text="${dict.dictLabel}"></label>
</div>
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">删除标志:</label>
<div class="col-sm-8">
<input name="delFlag" class="form-control" type="text">
</div>
</div>
</form>
</div>
<th:block th:include="include :: footer" />
<script th:inline="javascript">
var prefix = ctx + "baseinfo/shiftdetailinfo"
$("#form-shiftdetailinfo-add").validate({
focusCleanup: true
});
function submitHandler() {
if ($.validate.form()) {
$.operate.save(prefix + "/add", $('#form-shiftdetailinfo-add').serialize());
}
}
</script>
</body>
</html>

@ -0,0 +1,35 @@
<!DOCTYPE html>
<html lang="zh" xmlns:th="http://www.thymeleaf.org" >
<head>
<th:block th:include="include :: header('修改交接班详情信息')" />
</head>
<body class="white-bg">
<div class="wrapper wrapper-content animated fadeInRight ibox-content">
<form class="form-horizontal m" id="form-shiftdetailinfo-edit" th:object="${baseShiftdetailInfo}">
<input name="shiftNo" th:field="*{shiftNo}" type="hidden">
<div class="form-group">
<label class="col-sm-3 control-label">状态标志:</label>
<div class="col-sm-8">
<div class="radio-box" th:each="dict : ${@dict.getType('sys_status_info')}">
<input type="radio" th:id="${'status_' + dict.dictCode}" name="status" th:value="${dict.dictValue}" th:field="*{status}">
<label th:for="${'status_' + dict.dictCode}" th:text="${dict.dictLabel}"></label>
</div>
</div>
</div>
</form>
</div>
<th:block th:include="include :: footer" />
<script th:inline="javascript">
var prefix = ctx + "baseinfo/shiftdetailinfo";
$("#form-shiftdetailinfo-edit").validate({
focusCleanup: true
});
function submitHandler() {
if ($.validate.form()) {
$.operate.save(prefix + "/edit", $('#form-shiftdetailinfo-edit').serialize());
}
}
</script>
</body>
</html>

@ -0,0 +1,107 @@
<!DOCTYPE html>
<html lang="zh" xmlns:th="http://www.thymeleaf.org" xmlns:shiro="http://www.pollix.at/thymeleaf/shiro">
<head>
<th:block th:include="include :: header('交接班详情信息列表')" />
</head>
<body class="gray-bg">
<div class="container-div">
<div class="row">
<div class="col-sm-12 search-collapse">
<form id="formId">
<div class="select-list">
<ul>
<li>
<label>状态标志:</label>
<select name="status" th:with="type=${@dict.getType('sys_status_info')}">
<option value="">所有</option>
<option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>
</select>
</li>
<li>
<a class="btn btn-primary btn-rounded btn-sm" onclick="$.table.search()"><i class="fa fa-search"></i>&nbsp;搜索</a>
<a class="btn btn-warning btn-rounded btn-sm" onclick="$.form.reset()"><i class="fa fa-refresh"></i>&nbsp;重置</a>
</li>
</ul>
</div>
</form>
</div>
<div class="btn-group-sm" id="toolbar" role="group">
<a class="btn btn-success" onclick="$.operate.add()" shiro:hasPermission="baseinfo:shiftdetailinfo:add">
<i class="fa fa-plus"></i> 添加
</a>
<a class="btn btn-primary single disabled" onclick="$.operate.edit()" shiro:hasPermission="baseinfo:shiftdetailinfo:edit">
<i class="fa fa-edit"></i> 修改
</a>
<a class="btn btn-danger multiple disabled" onclick="$.operate.removeAll()" shiro:hasPermission="baseinfo:shiftdetailinfo:remove">
<i class="fa fa-remove"></i> 删除
</a>
<a class="btn btn-warning" onclick="$.table.exportExcel()" shiro:hasPermission="baseinfo:shiftdetailinfo:export">
<i class="fa fa-download"></i> 导出
</a>
</div>
<div class="col-sm-12 select-table table-striped">
<table id="bootstrap-table"></table>
</div>
</div>
</div>
<th:block th:include="include :: footer" />
<script th:inline="javascript">
var editFlag = [[${@permission.hasPermi('baseinfo:shiftdetailinfo:edit')}]];
var removeFlag = [[${@permission.hasPermi('baseinfo:shiftdetailinfo:remove')}]];
var statusDatas = [[${@dict.getType('sys_status_info')}]];
var prefix = ctx + "baseinfo/shiftdetailinfo";
$(function() {
var options = {
url: prefix + "/list",
createUrl: prefix + "/add",
updateUrl: prefix + "/edit/{id}",
removeUrl: prefix + "/remove",
exportUrl: prefix + "/export",
modalName: "交接班详情信息",
columns: [{
checkbox: true
},
{
field: 'shiftNo',
title: '交接班编号',
visible: false
},
{
field: 'postId',
title: '职位ID',
visible: false
},
{
field: 'empId',
title: '交接班人员ID',
visible: false
},
{
field: 'status',
title: '状态标志',
formatter: function(value, row, index) {
return $.table.selectDictLabel(statusDatas, value);
}
},
{
field: 'remark',
title: '备注'
},
{
title: '操作',
align: 'center',
formatter: function(value, row, index) {
var actions = [];
actions.push('<a class="btn btn-success btn-xs ' + editFlag + '" href="javascript:void(0)" onclick="$.operate.edit(\'' + row.shiftNo + '\')"><i class="fa fa-edit"></i>编辑</a> ');
actions.push('<a class="btn btn-danger btn-xs ' + removeFlag + '" href="javascript:void(0)" onclick="$.operate.remove(\'' + row.shiftNo + '\')"><i class="fa fa-remove"></i>删除</a>');
return actions.join('');
}
}]
};
$.table.init(options);
});
</script>
</body>
</html>

@ -0,0 +1,81 @@
<!DOCTYPE html>
<html lang="zh" xmlns:th="http://www.thymeleaf.org" >
<head>
<th:block th:include="include :: header('新增交接班基础信息')" />
<th:block th:include="include :: datetimepicker-css" />
</head>
<body class="white-bg">
<div class="wrapper wrapper-content animated fadeInRight ibox-content">
<form class="form-horizontal m" id="form-shiftmasterinfo-add">
<div class="form-group">
<label class="col-sm-3 control-label">基台设备ID</label>
<div class="col-sm-8">
<input name="deviceId" class="form-control" type="text">
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">班次ID</label>
<div class="col-sm-8">
<input name="shiftId" class="form-control" type="text">
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">班组ID</label>
<div class="col-sm-8">
<input name="groupId" class="form-control" type="text">
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">起始时间:</label>
<div class="col-sm-8">
<div class="input-group date">
<input name="startTime" class="form-control" placeholder="yyyy-MM-dd" type="text">
<span class="input-group-addon"><i class="fa fa-calendar"></i></span>
</div>
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">结束时间:</label>
<div class="col-sm-8">
<div class="input-group date">
<input name="overTime" class="form-control" placeholder="yyyy-MM-dd" type="text">
<span class="input-group-addon"><i class="fa fa-calendar"></i></span>
</div>
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">备注:</label>
<div class="col-sm-8">
<input name="remark" class="form-control" type="text">
</div>
</div>
</form>
</div>
<th:block th:include="include :: footer" />
<th:block th:include="include :: datetimepicker-js" />
<script th:inline="javascript">
var prefix = ctx + "baseinfo/shiftmasterinfo"
$("#form-shiftmasterinfo-add").validate({
focusCleanup: true
});
function submitHandler() {
if ($.validate.form()) {
$.operate.save(prefix + "/add", $('#form-shiftmasterinfo-add').serialize());
}
}
$("input[name='startTime']").datetimepicker({
format: "yyyy-mm-dd",
minView: "month",
autoclose: true
});
$("input[name='overTime']").datetimepicker({
format: "yyyy-mm-dd",
minView: "month",
autoclose: true
});
</script>
</body>
</html>

@ -0,0 +1,85 @@
<!DOCTYPE html>
<html lang="zh" xmlns:th="http://www.thymeleaf.org" >
<head>
<th:block th:include="include :: header('修改交接班基础信息')" />
<th:block th:include="include :: datetimepicker-css" />
</head>
<body class="white-bg">
<div class="wrapper wrapper-content animated fadeInRight ibox-content">
<form class="form-horizontal m" id="form-shiftmasterinfo-edit" th:object="${baseShiftmasterInfo}">
<input name="shiftNo" th:field="*{shiftNo}" type="hidden">
<div class="form-group">
<label class="col-sm-3 control-label">基台设备ID</label>
<div class="col-sm-8">
<input name="deviceId" th:field="*{deviceId}" class="form-control" type="text">
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">班次ID</label>
<div class="col-sm-8">
<input name="shiftId" th:field="*{shiftId}" class="form-control" type="text">
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">班组ID</label>
<div class="col-sm-8">
<input name="groupId" th:field="*{groupId}" class="form-control" type="text">
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">起始时间:</label>
<div class="col-sm-8">
<div class="input-group date">
<input name="startTime" th:value="${#dates.format(baseShiftmasterInfo.startTime, 'yyyy-MM-dd')}" class="form-control" placeholder="yyyy-MM-dd" type="text">
<span class="input-group-addon"><i class="fa fa-calendar"></i></span>
</div>
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">结束时间:</label>
<div class="col-sm-8">
<div class="input-group date">
<input name="overTime" th:value="${#dates.format(baseShiftmasterInfo.overTime, 'yyyy-MM-dd')}" class="form-control" placeholder="yyyy-MM-dd" type="text">
<span class="input-group-addon"><i class="fa fa-calendar"></i></span>
</div>
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">状态标志:</label>
<div class="col-sm-8">
<div class="radio-box" th:each="dict : ${@dict.getType('sys_status_info')}">
<input type="radio" th:id="${'status_' + dict.dictCode}" name="status" th:value="${dict.dictValue}" th:field="*{status}">
<label th:for="${'status_' + dict.dictCode}" th:text="${dict.dictLabel}"></label>
</div>
</div>
</div>
</form>
</div>
<th:block th:include="include :: footer" />
<th:block th:include="include :: datetimepicker-js" />
<script th:inline="javascript">
var prefix = ctx + "baseinfo/shiftmasterinfo";
$("#form-shiftmasterinfo-edit").validate({
focusCleanup: true
});
function submitHandler() {
if ($.validate.form()) {
$.operate.save(prefix + "/edit", $('#form-shiftmasterinfo-edit').serialize());
}
}
$("input[name='startTime']").datetimepicker({
format: "yyyy-mm-dd",
minView: "month",
autoclose: true
});
$("input[name='overTime']").datetimepicker({
format: "yyyy-mm-dd",
minView: "month",
autoclose: true
});
</script>
</body>
</html>

@ -0,0 +1,192 @@
<!DOCTYPE html>
<html lang="zh" xmlns:th="http://www.thymeleaf.org" xmlns:shiro="http://www.pollix.at/thymeleaf/shiro">
<head>
<th:block th:include="include :: header('交接班基础信息列表')" />
</head>
<body class="gray-bg">
<div class="container-div">
<div class="row">
<div class="col-sm-12 search-collapse">
<form id="formId">
<div class="select-list">
<ul>
<li>
<label>基台设备:</label>
<select name="deviceId" id="deviceId" class="form-control ">
<option value="">--请选择设备基台--</option>
<option name="cbdeviceInfo" th:each="deviceId:${cbdeviceInfo}" th:value="${deviceId.deviceId}" th:text="${deviceId.deviceName}" th:disabled="${deviceId.status == '1'}"></option>
</select>
</li>
<li>
<label>班次:</label>
<select name="shiftId" id="shiftId" class="form-control ">
<option value="">--请选择计划班次--</option>
<option name="cbshitfInfo" th:each="shiftId:${cbshitfInfo}" th:value="${shiftId.shiftid}" th:text="${shiftId.shiftname}" th:disabled="${shiftId.status == '1'}"></option>
</select>
</li>
<li>
<label>班组:</label>
<select name="groupId" id="groupId" class="groupId ">
<option value="">--请选择计划班次--</option>
<option name="cbgroupInfo" th:each="groupId:${cbgroupInfo}" th:value="${groupId.groupid}" th:text="${groupId.groupname}" th:disabled="${groupId.status == '1'}"></option>
</select>
</li>
<li class="select-time">
<label>起始时间:</label>
<input type="text" class="time-input" id="startTime" placeholder="开始时间" name="params[beginStartTime]"/>
<span>-</span>
<input type="text" class="time-input" id="endTime" placeholder="结束时间" name="params[endStartTime]"/>
</li>
<li class="select-time">
<label>结束时间:</label>
<input type="text" class="time-input" id="startTime" placeholder="开始时间" name="params[beginOverTime]"/>
<span>-</span>
<input type="text" class="time-input" id="endTime" placeholder="结束时间" name="params[endOverTime]"/>
</li>
<li>
<label>状态标志:</label>
<select name="status" th:with="type=${@dict.getType('sys_status_info')}">
<option value="">所有</option>
<option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>
</select>
</li>
<li>
<a class="btn btn-primary btn-rounded btn-sm" onclick="$.table.search()"><i class="fa fa-search"></i>&nbsp;搜索</a>
<a class="btn btn-warning btn-rounded btn-sm" onclick="$.form.reset()"><i class="fa fa-refresh"></i>&nbsp;重置</a>
</li>
</ul>
</div>
</form>
</div>
<div class="btn-group-sm" id="toolbar" role="group">
<a class="btn btn-success" onclick="$.operate.add()" shiro:hasPermission="baseinfo:shiftmasterinfo:add">
<i class="fa fa-plus"></i> 添加
</a>
<a class="btn btn-primary single disabled" onclick="$.operate.edit()" shiro:hasPermission="baseinfo:shiftmasterinfo:edit">
<i class="fa fa-edit"></i> 修改
</a>
<a class="btn btn-danger multiple disabled" onclick="$.operate.removeAll()" shiro:hasPermission="baseinfo:shiftmasterinfo:remove">
<i class="fa fa-remove"></i> 删除
</a>
<a class="btn btn-warning" onclick="$.table.exportExcel()" shiro:hasPermission="baseinfo:shiftmasterinfo:export">
<i class="fa fa-download"></i> 导出
</a>
</div>
<div class="col-sm-12 select-table table-striped">
<table id="bootstrap-table"></table>
</div>
</div>
</div>
<th:block th:include="include :: footer" />
<script th:inline="javascript">
var editFlag = [[${@permission.hasPermi('baseinfo:shiftmasterinfo:edit')}]];
var removeFlag = [[${@permission.hasPermi('baseinfo:shiftmasterinfo:remove')}]];
var statusDatas = [[${@dict.getType('sys_status_info')}]];
var prefix = ctx + "baseinfo/shiftmasterinfo";
$(function() {
var options = {
url: prefix + "/list",
createUrl: prefix + "/add",
updateUrl: prefix + "/edit/{id}",
removeUrl: prefix + "/remove",
exportUrl: prefix + "/export",
modalName: "交接班基础信息",
detailView: true,
onExpandRow: function(index, row, $detail) {
initChildTable(index, row, $detail);
},
columns: [{
checkbox: true
},
{
field: 'shiftNo',
title: '交接班编号',
visible: true
},
{
field: 'deviceName',
title: '基台设备'
},
{
field: 'shiftname',
title: '班次'
},
{
field: 'groupname',
title: '班组'
},
{
field: 'startTime',
title: '起始时间'
},
{
field: 'overTime',
title: '结束时间'
},
{
field: 'status',
title: '状态标志',
formatter: function(value, row, index) {
return $.table.selectDictLabel(statusDatas, value);
}
},
{
field: 'remark',
title: '备注'
},
{
title: '操作',
align: 'center',
formatter: function(value, row, index) {
var actions = [];
actions.push('<a class="btn btn-success btn-xs ' + editFlag + '" href="javascript:void(0)" onclick="$.operate.edit(\'' + row.shiftNo + '\')"><i class="fa fa-edit"></i>编辑</a> ');
actions.push('<a class="btn btn-danger btn-xs ' + removeFlag + '" href="javascript:void(0)" onclick="$.operate.remove(\'' + row.shiftNo + '\')"><i class="fa fa-remove"></i>删除</a>');
return actions.join('');
}
}]
};
$.table.init(options);
});
initChildTable = function(index, row, $detail) {
var shiftNo = row.shiftNo;
console.log(shiftNo)
var childTable = $detail.html('<table style="table-layout:fixed"></table>').find('table');
$(childTable).bootstrapTable({
url: ctx + "baseinfo/shiftdetailinfo/list",
method: 'post',
sidePagination: "server",
contentType: "application/x-www-form-urlencoded",
queryParams : {
shiftNo: row.shiftNo
},
columns: [{
field : 'shiftNo',
title : '交接班编号'
},
{
field: 'postName',
title: '职位',
},
{
field: 'empName',
title: '交接班人员',
},
{
field: 'status',
title: '状态标志',
formatter: function(value, row, index) {
return $.table.selectDictLabel(statusDatas, value);
}
},
{
field: 'remark',
title: '备注'
},]
});
};
</script>
</body>
</html>

@ -1,5 +1,6 @@
package com.ruoyi.baseinfo.domain;
import lombok.Data;
import org.apache.commons.lang3.builder.ToStringBuilder;
import org.apache.commons.lang3.builder.ToStringStyle;
import com.ruoyi.common.annotation.Excel;
@ -11,6 +12,7 @@ import com.ruoyi.common.core.domain.BaseEntity;
* @author CasearBao
* @date 2020-10-21
*/
@Data
public class BaseGroupInfo extends BaseEntity
{
private static final long serialVersionUID = 1L;
@ -33,6 +35,8 @@ public class BaseGroupInfo extends BaseEntity
/** 删除标志0代表存在 1代表删除 */
private String delFlag;
private boolean flag = false;
public void setObjid(Long objid)
{
this.objid = objid;

@ -43,6 +43,8 @@ public class BaseMaterialInfo extends BaseEntity
/** 删除标志0代表存在 1代表删除 */
private String delFlag;
private boolean flag = false;
private String materialTypeName;
public void setObjid(Long objid)

@ -6,6 +6,8 @@ import org.apache.commons.lang3.builder.ToStringStyle;
import com.ruoyi.common.annotation.Excel;
import com.ruoyi.common.core.domain.BaseEntity;
import java.util.Date;
/**
* base_plan_info
*
@ -44,6 +46,18 @@ public class BasePlanInfo extends BaseEntity
private String shiftname;
private String groupname;
/** 起始时间 */
@Excel(name = "起始时间", width = 30, dateFormat = "yyyy-MM-dd")
private Date startTime;
/** 结束时间 */
@Excel(name = "结束时间", width = 30, dateFormat = "yyyy-MM-dd")
private Date overTime;
private BasePlandetailInfo planDetailInfo;
public void setPlanid(String planid)
{
this.planid = planid;

@ -1,16 +1,20 @@
package com.ruoyi.baseinfo.domain;
import lombok.Data;
import org.apache.commons.lang3.builder.ToStringBuilder;
import org.apache.commons.lang3.builder.ToStringStyle;
import com.ruoyi.common.annotation.Excel;
import com.ruoyi.common.core.domain.BaseEntity;
import java.util.Date;
/**
* base_plandetail_info
*
* @author CaesarBao
* @date 2020-10-23
*/
@Data
public class BasePlandetailInfo extends BaseEntity
{
private static final long serialVersionUID = 1L;
@ -49,6 +53,16 @@ public class BasePlandetailInfo extends BaseEntity
/** 删除标志0代表存在 1代表删除 */
private String delFlag;
private String groupname;
/** 起始时间 */
@Excel(name = "起始时间", width = 30, dateFormat = "yyyy-MM-dd")
private Date startTime;
/** 结束时间 */
@Excel(name = "结束时间", width = 30, dateFormat = "yyyy-MM-dd")
private Date overTime;
public void setObjid(Long objid)
{
this.objid = objid;

@ -0,0 +1,104 @@
package com.ruoyi.baseinfo.domain;
import lombok.Data;
import org.apache.commons.lang3.builder.ToStringBuilder;
import org.apache.commons.lang3.builder.ToStringStyle;
import com.ruoyi.common.annotation.Excel;
import com.ruoyi.common.core.domain.BaseEntity;
/**
* base_shiftdetail_info
*
* @author CaesarBao
* @date 2020-10-28
*/
@Data
public class BaseShiftdetailInfo extends BaseEntity
{
private static final long serialVersionUID = 1L;
/** 交接班编号 */
@Excel(name = "交接班编号")
private String shiftNo;
/** 职位ID */
@Excel(name = "职位ID")
private String postId;
/** 交接班人员ID */
@Excel(name = "交接班人员ID")
private String empId;
/** 状态标志0代表可用 1代表停用 */
@Excel(name = "状态标志", readConverterExp = "0=代表可用,1=代表停用")
private String status;
/** 删除标志0代表存在 1代表删除 */
private String delFlag;
private String postName;
private String empName;
public void setShiftNo(String shiftNo)
{
this.shiftNo = shiftNo;
}
public String getShiftNo()
{
return shiftNo;
}
public void setPostId(String postId)
{
this.postId = postId;
}
public String getPostId()
{
return postId;
}
public void setEmpId(String empId)
{
this.empId = empId;
}
public String getEmpId()
{
return empId;
}
public void setStatus(String status)
{
this.status = status;
}
public String getStatus()
{
return status;
}
public void setDelFlag(String delFlag)
{
this.delFlag = delFlag;
}
public String getDelFlag()
{
return delFlag;
}
@Override
public String toString() {
return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
.append("shiftNo", getShiftNo())
.append("postId", getPostId())
.append("empId", getEmpId())
.append("status", getStatus())
.append("remark", getRemark())
.append("createBy", getCreateBy())
.append("createTime", getCreateTime())
.append("updateBy", getUpdateBy())
.append("updateTime", getUpdateTime())
.append("delFlag", getDelFlag())
.toString();
}
}

@ -0,0 +1,149 @@
package com.ruoyi.baseinfo.domain;
import java.util.Date;
import lombok.Data;
import org.apache.commons.lang3.builder.ToStringBuilder;
import org.apache.commons.lang3.builder.ToStringStyle;
import com.ruoyi.common.annotation.Excel;
import com.ruoyi.common.core.domain.BaseEntity;
/**
* base_shiftmaster_info
*
* @author CaesarBao
* @date 2020-10-28
*/
@Data
public class BaseShiftmasterInfo extends BaseEntity
{
private static final long serialVersionUID = 1L;
/** 交接班编号 */
private String shiftNo;
/** 基台设备ID */
@Excel(name = "基台设备ID")
private String deviceId;
/** 班次ID */
@Excel(name = "班次ID")
private String shiftId;
/** 班组ID */
@Excel(name = "班组ID")
private String groupId;
/** 起始时间 */
@Excel(name = "起始时间", width = 30, dateFormat = "yyyy-MM-dd")
private Date startTime;
/** 结束时间 */
@Excel(name = "结束时间", width = 30, dateFormat = "yyyy-MM-dd")
private Date overTime;
/** 状态标志0代表可用 1代表停用 */
@Excel(name = "状态标志", readConverterExp = "0=代表可用,1=代表停用")
private String status;
/** 删除标志0代表存在 1代表删除 */
private String delFlag;
private String deviceName;
private String shiftname;
private String groupname;
public void setShiftNo(String shiftNo)
{
this.shiftNo = shiftNo;
}
public String getShiftNo()
{
return shiftNo;
}
public void setDeviceId(String deviceId)
{
this.deviceId = deviceId;
}
public String getDeviceId()
{
return deviceId;
}
public void setShiftId(String shiftId)
{
this.shiftId = shiftId;
}
public String getShiftId()
{
return shiftId;
}
public void setGroupId(String groupId)
{
this.groupId = groupId;
}
public String getGroupId()
{
return groupId;
}
public void setStartTime(Date startTime)
{
this.startTime = startTime;
}
public Date getStartTime()
{
return startTime;
}
public void setOverTime(Date overTime)
{
this.overTime = overTime;
}
public Date getOverTime()
{
return overTime;
}
public void setStatus(String status)
{
this.status = status;
}
public String getStatus()
{
return status;
}
public void setDelFlag(String delFlag)
{
this.delFlag = delFlag;
}
public String getDelFlag()
{
return delFlag;
}
@Override
public String toString() {
return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
.append("shiftNo", getShiftNo())
.append("deviceId", getDeviceId())
.append("shiftId", getShiftId())
.append("groupId", getGroupId())
.append("startTime", getStartTime())
.append("overTime", getOverTime())
.append("status", getStatus())
.append("remark", getRemark())
.append("createBy", getCreateBy())
.append("createTime", getCreateTime())
.append("updateBy", getUpdateBy())
.append("updateTime", getUpdateTime())
.append("delFlag", getDelFlag())
.toString();
}
}

@ -58,4 +58,6 @@ public interface BasePlanInfoMapper
* @return
*/
public int deleteBasePlanInfoByIds(String[] planids);
public BasePlanInfo selectBasePlanInfoListByPlanID(String planid);
}

@ -58,4 +58,8 @@ public interface BasePlandetailInfoMapper
* @return
*/
public int deleteBasePlandetailInfoByIds(String[] objids);
public int deleteBasePlandetailInfoByPlanIds(String[] objids);
public BasePlandetailInfo selectBasePlandetailInfoByPlanID(String planid);
}

@ -0,0 +1,61 @@
package com.ruoyi.baseinfo.mapper;
import java.util.List;
import com.ruoyi.baseinfo.domain.BaseShiftdetailInfo;
/**
* Mapper
*
* @author CaesarBao
* @date 2020-10-28
*/
public interface BaseShiftdetailInfoMapper
{
/**
*
*
* @param shiftNo ID
* @return
*/
public BaseShiftdetailInfo selectBaseShiftdetailInfoById(String shiftNo);
/**
*
*
* @param baseShiftdetailInfo
* @return
*/
public List<BaseShiftdetailInfo> selectBaseShiftdetailInfoList(BaseShiftdetailInfo baseShiftdetailInfo);
/**
*
*
* @param baseShiftdetailInfo
* @return
*/
public int insertBaseShiftdetailInfo(BaseShiftdetailInfo baseShiftdetailInfo);
/**
*
*
* @param baseShiftdetailInfo
* @return
*/
public int updateBaseShiftdetailInfo(BaseShiftdetailInfo baseShiftdetailInfo);
/**
*
*
* @param shiftNo ID
* @return
*/
public int deleteBaseShiftdetailInfoById(String shiftNo);
/**
*
*
* @param shiftNos ID
* @return
*/
public int deleteBaseShiftdetailInfoByIds(String[] shiftNos);
}

@ -0,0 +1,61 @@
package com.ruoyi.baseinfo.mapper;
import java.util.List;
import com.ruoyi.baseinfo.domain.BaseShiftmasterInfo;
/**
* Mapper
*
* @author CaesarBao
* @date 2020-10-28
*/
public interface BaseShiftmasterInfoMapper
{
/**
*
*
* @param shiftNo ID
* @return
*/
public BaseShiftmasterInfo selectBaseShiftmasterInfoById(String shiftNo);
/**
*
*
* @param baseShiftmasterInfo
* @return
*/
public List<BaseShiftmasterInfo> selectBaseShiftmasterInfoList(BaseShiftmasterInfo baseShiftmasterInfo);
/**
*
*
* @param baseShiftmasterInfo
* @return
*/
public int insertBaseShiftmasterInfo(BaseShiftmasterInfo baseShiftmasterInfo);
/**
*
*
* @param baseShiftmasterInfo
* @return
*/
public int updateBaseShiftmasterInfo(BaseShiftmasterInfo baseShiftmasterInfo);
/**
*
*
* @param shiftNo ID
* @return
*/
public int deleteBaseShiftmasterInfoById(String shiftNo);
/**
*
*
* @param shiftNos ID
* @return
*/
public int deleteBaseShiftmasterInfoByIds(String[] shiftNos);
}

@ -58,4 +58,6 @@ public interface IBaseGroupInfoService
* @return
*/
public int deleteBaseGroupInfoById(Long objid);
public List<BaseGroupInfo> selectEditBaseGroupInfoList(String groupid);
}

@ -58,4 +58,6 @@ public interface IBaseMaterialInfoService
* @return
*/
public int deleteBaseMaterialInfoById(Long objid);
public List<BaseMaterialInfo> selectEditBaseMaterialInfoList(String materialId);
}

@ -58,4 +58,6 @@ public interface IBasePlanInfoService
* @return
*/
public int deleteBasePlanInfoById(String planid);
public BasePlanInfo selectBasePlanInfoListByPlanID(String planid);
}

@ -58,4 +58,9 @@ public interface IBasePlandetailInfoService
* @return
*/
public int deleteBasePlandetailInfoById(Long objid);
public int deleteBasePlandetailInfoByPlanIds(String ids);
public BasePlandetailInfo selectBasePlandetailInfoByPlanID(String planid);
}

@ -0,0 +1,61 @@
package com.ruoyi.baseinfo.service;
import java.util.List;
import com.ruoyi.baseinfo.domain.BaseShiftdetailInfo;
/**
* Service
*
* @author CaesarBao
* @date 2020-10-28
*/
public interface IBaseShiftdetailInfoService
{
/**
*
*
* @param shiftNo ID
* @return
*/
public BaseShiftdetailInfo selectBaseShiftdetailInfoById(String shiftNo);
/**
*
*
* @param baseShiftdetailInfo
* @return
*/
public List<BaseShiftdetailInfo> selectBaseShiftdetailInfoList(BaseShiftdetailInfo baseShiftdetailInfo);
/**
*
*
* @param baseShiftdetailInfo
* @return
*/
public int insertBaseShiftdetailInfo(BaseShiftdetailInfo baseShiftdetailInfo);
/**
*
*
* @param baseShiftdetailInfo
* @return
*/
public int updateBaseShiftdetailInfo(BaseShiftdetailInfo baseShiftdetailInfo);
/**
*
*
* @param ids ID
* @return
*/
public int deleteBaseShiftdetailInfoByIds(String ids);
/**
*
*
* @param shiftNo ID
* @return
*/
public int deleteBaseShiftdetailInfoById(String shiftNo);
}

@ -0,0 +1,61 @@
package com.ruoyi.baseinfo.service;
import java.util.List;
import com.ruoyi.baseinfo.domain.BaseShiftmasterInfo;
/**
* Service
*
* @author CaesarBao
* @date 2020-10-28
*/
public interface IBaseShiftmasterInfoService
{
/**
*
*
* @param shiftNo ID
* @return
*/
public BaseShiftmasterInfo selectBaseShiftmasterInfoById(String shiftNo);
/**
*
*
* @param baseShiftmasterInfo
* @return
*/
public List<BaseShiftmasterInfo> selectBaseShiftmasterInfoList(BaseShiftmasterInfo baseShiftmasterInfo);
/**
*
*
* @param baseShiftmasterInfo
* @return
*/
public int insertBaseShiftmasterInfo(BaseShiftmasterInfo baseShiftmasterInfo);
/**
*
*
* @param baseShiftmasterInfo
* @return
*/
public int updateBaseShiftmasterInfo(BaseShiftmasterInfo baseShiftmasterInfo);
/**
*
*
* @param ids ID
* @return
*/
public int deleteBaseShiftmasterInfoByIds(String ids);
/**
*
*
* @param shiftNo ID
* @return
*/
public int deleteBaseShiftmasterInfoById(String shiftNo);
}

@ -94,4 +94,19 @@ public class BaseGroupInfoServiceImpl implements IBaseGroupInfoService
{
return baseGroupInfoMapper.deleteBaseGroupInfoById(objid);
}
@Override
public List<BaseGroupInfo> selectEditBaseGroupInfoList(String groupid)
{
BaseGroupInfo baseGroupInfos = new BaseGroupInfo();
List<BaseGroupInfo> baseGroupInfoList = baseGroupInfoMapper.selectBaseGroupInfoList(baseGroupInfos);
for (BaseGroupInfo BaseGroupInfo:baseGroupInfoList
) {
if(BaseGroupInfo.getGroupid().equals(groupid)){
BaseGroupInfo.setFlag(true);
break;
}
}
return baseGroupInfoList;
}
}

@ -94,4 +94,19 @@ public class BaseMaterialInfoServiceImpl implements IBaseMaterialInfoService
{
return baseMaterialInfoMapper.deleteBaseMaterialInfoById(objid);
}
@Override
public List<BaseMaterialInfo> selectEditBaseMaterialInfoList(String materialId)
{
BaseMaterialInfo baseMaterialInfos = new BaseMaterialInfo();
List<BaseMaterialInfo> baseMaterialInfoList = baseMaterialInfoMapper.selectBaseMaterialInfoList(baseMaterialInfos);
for (BaseMaterialInfo baseMaterialInfo:baseMaterialInfoList
) {
if(baseMaterialInfo.getMaterialId().equals(materialId)){
baseMaterialInfo.setFlag(true);
break;
}
}
return baseMaterialInfoList;
}
}

@ -94,4 +94,10 @@ public class BasePlanInfoServiceImpl implements IBasePlanInfoService
{
return basePlanInfoMapper.deleteBasePlanInfoById(planid);
}
@Override
public BasePlanInfo selectBasePlanInfoListByPlanID(String planid)
{
return basePlanInfoMapper.selectBasePlanInfoListByPlanID(planid);
}
}

@ -94,4 +94,16 @@ public class BasePlandetailInfoServiceImpl implements IBasePlandetailInfoService
{
return basePlandetailInfoMapper.deleteBasePlandetailInfoById(objid);
}
@Override
public int deleteBasePlandetailInfoByPlanIds(String ids)
{
return basePlandetailInfoMapper.deleteBasePlandetailInfoByPlanIds(Convert.toStrArray(ids));
}
@Override
public BasePlandetailInfo selectBasePlandetailInfoByPlanID(String planid)
{
return basePlandetailInfoMapper.selectBasePlandetailInfoByPlanID(planid);
}
}

@ -0,0 +1,97 @@
package com.ruoyi.baseinfo.service.impl;
import java.util.List;
import com.ruoyi.common.utils.DateUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import com.ruoyi.baseinfo.mapper.BaseShiftdetailInfoMapper;
import com.ruoyi.baseinfo.domain.BaseShiftdetailInfo;
import com.ruoyi.baseinfo.service.IBaseShiftdetailInfoService;
import com.ruoyi.common.core.text.Convert;
/**
* Service
*
* @author CaesarBao
* @date 2020-10-28
*/
@Service
public class BaseShiftdetailInfoServiceImpl implements IBaseShiftdetailInfoService
{
@Autowired
private BaseShiftdetailInfoMapper baseShiftdetailInfoMapper;
/**
*
*
* @param shiftNo ID
* @return
*/
@Override
public BaseShiftdetailInfo selectBaseShiftdetailInfoById(String shiftNo)
{
return baseShiftdetailInfoMapper.selectBaseShiftdetailInfoById(shiftNo);
}
/**
*
*
* @param baseShiftdetailInfo
* @return
*/
@Override
public List<BaseShiftdetailInfo> selectBaseShiftdetailInfoList(BaseShiftdetailInfo baseShiftdetailInfo)
{
return baseShiftdetailInfoMapper.selectBaseShiftdetailInfoList(baseShiftdetailInfo);
}
/**
*
*
* @param baseShiftdetailInfo
* @return
*/
@Override
public int insertBaseShiftdetailInfo(BaseShiftdetailInfo baseShiftdetailInfo)
{
baseShiftdetailInfo.setCreateTime(DateUtils.getNowDate());
return baseShiftdetailInfoMapper.insertBaseShiftdetailInfo(baseShiftdetailInfo);
}
/**
*
*
* @param baseShiftdetailInfo
* @return
*/
@Override
public int updateBaseShiftdetailInfo(BaseShiftdetailInfo baseShiftdetailInfo)
{
baseShiftdetailInfo.setUpdateTime(DateUtils.getNowDate());
return baseShiftdetailInfoMapper.updateBaseShiftdetailInfo(baseShiftdetailInfo);
}
/**
*
*
* @param ids ID
* @return
*/
@Override
public int deleteBaseShiftdetailInfoByIds(String ids)
{
return baseShiftdetailInfoMapper.deleteBaseShiftdetailInfoByIds(Convert.toStrArray(ids));
}
/**
*
*
* @param shiftNo ID
* @return
*/
@Override
public int deleteBaseShiftdetailInfoById(String shiftNo)
{
return baseShiftdetailInfoMapper.deleteBaseShiftdetailInfoById(shiftNo);
}
}

@ -0,0 +1,97 @@
package com.ruoyi.baseinfo.service.impl;
import java.util.List;
import com.ruoyi.common.utils.DateUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import com.ruoyi.baseinfo.mapper.BaseShiftmasterInfoMapper;
import com.ruoyi.baseinfo.domain.BaseShiftmasterInfo;
import com.ruoyi.baseinfo.service.IBaseShiftmasterInfoService;
import com.ruoyi.common.core.text.Convert;
/**
* Service
*
* @author CaesarBao
* @date 2020-10-28
*/
@Service
public class BaseShiftmasterInfoServiceImpl implements IBaseShiftmasterInfoService
{
@Autowired
private BaseShiftmasterInfoMapper baseShiftmasterInfoMapper;
/**
*
*
* @param shiftNo ID
* @return
*/
@Override
public BaseShiftmasterInfo selectBaseShiftmasterInfoById(String shiftNo)
{
return baseShiftmasterInfoMapper.selectBaseShiftmasterInfoById(shiftNo);
}
/**
*
*
* @param baseShiftmasterInfo
* @return
*/
@Override
public List<BaseShiftmasterInfo> selectBaseShiftmasterInfoList(BaseShiftmasterInfo baseShiftmasterInfo)
{
return baseShiftmasterInfoMapper.selectBaseShiftmasterInfoList(baseShiftmasterInfo);
}
/**
*
*
* @param baseShiftmasterInfo
* @return
*/
@Override
public int insertBaseShiftmasterInfo(BaseShiftmasterInfo baseShiftmasterInfo)
{
baseShiftmasterInfo.setCreateTime(DateUtils.getNowDate());
return baseShiftmasterInfoMapper.insertBaseShiftmasterInfo(baseShiftmasterInfo);
}
/**
*
*
* @param baseShiftmasterInfo
* @return
*/
@Override
public int updateBaseShiftmasterInfo(BaseShiftmasterInfo baseShiftmasterInfo)
{
baseShiftmasterInfo.setUpdateTime(DateUtils.getNowDate());
return baseShiftmasterInfoMapper.updateBaseShiftmasterInfo(baseShiftmasterInfo);
}
/**
*
*
* @param ids ID
* @return
*/
@Override
public int deleteBaseShiftmasterInfoByIds(String ids)
{
return baseShiftmasterInfoMapper.deleteBaseShiftmasterInfoByIds(Convert.toStrArray(ids));
}
/**
*
*
* @param shiftNo ID
* @return
*/
@Override
public int deleteBaseShiftmasterInfoById(String shiftNo)
{
return baseShiftmasterInfoMapper.deleteBaseShiftmasterInfoById(shiftNo);
}
}

@ -9,6 +9,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<result property="deviceid" column="deviceid" />
<result property="planShiftId" column="plan_shift_id" />
<result property="planStateId" column="plan_state_id" />
<result property="startTime" column="start_time" />
<result property="overTime" column="over_time" />
<result property="status" column="status" />
<result property="remark" column="remark" />
<result property="createBy" column="create_by" />
@ -18,14 +20,25 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<result property="delFlag" column="del_flag" />
<result property="deviceName" column="device_name" />
<result property="shiftname" column="shiftname" />
<result property="groupname" column="groupname" />
<association property="planDetailInfo" column="planDetailInfo" javaType="BasePlandetailInfo" resultMap="BasePlanDetailInfoResult" />
</resultMap>
<resultMap type="BasePlandetailInfo" id="BasePlanDetailInfoResult">
<result property="objid" column="objid" />
<result property="materialId" column="material_id" />
<result property="planAmount" column="plan_amount" />
<result property="realAmount" column="real_amount" />
<result property="unitId" column="unit_id" />
<result property="groupId" column="group_id" />
</resultMap>
<sql id="selectBasePlanInfoVo">
select planid, deviceid, plan_shift_id, plan_state_id, status, remark, create_by, create_time, update_by, update_time, del_flag from base_plan_info
select planid, deviceid, plan_shift_id, plan_state_id, start_time, over_time, status, remark, create_by, create_time, update_by, update_time, del_flag from base_plan_info
</sql>
<select id="selectBasePlanInfoList" parameterType="BasePlanInfo" resultMap="BasePlanInfoResult">
select t1.planid, t1.deviceid,t2.device_name, t1.plan_shift_id,t3.shiftname, t1.plan_state_id, t1.status, t1.remark, t1.create_by, t1.create_time, t1.update_by, t1.update_time, t1.del_flag from base_plan_info t1
select t1.planid, t1.deviceid,t2.device_name, t1.plan_shift_id,t3.shiftname, t1.plan_state_id, t1.status, t1.remark, t1.start_time, t1.over_time, t1.create_by, t1.create_time, t1.update_by, t1.update_time, t1.del_flag from base_plan_info t1
left join base_device_info t2 on t1.deviceid = t2.device_id
left join base_shift_info t3 on t1.plan_shift_id = t3.shiftid
<where>
@ -48,6 +61,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="deviceid != null">deviceid,</if>
<if test="planShiftId != null">plan_shift_id,</if>
<if test="planStateId != null">plan_state_id,</if>
<if test="startTime != null">start_time,</if>
<if test="overTime != null">over_time,</if>
<if test="status != null">status,</if>
<if test="remark != null">remark,</if>
<if test="createBy != null">create_by,</if>
@ -61,6 +76,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="deviceid != null">#{deviceid},</if>
<if test="planShiftId != null">#{planShiftId},</if>
<if test="planStateId != null">#{planStateId},</if>
<if test="startTime != null">#{startTime},</if>
<if test="overTime != null">#{overTime},</if>
<if test="status != null">#{status},</if>
<if test="remark != null">#{remark},</if>
<if test="createBy != null">#{createBy},</if>
@ -77,6 +94,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="deviceid != null">deviceid = #{deviceid},</if>
<if test="planShiftId != null">plan_shift_id = #{planShiftId},</if>
<if test="planStateId != null">plan_state_id = #{planStateId},</if>
<if test="startTime != null">start_time = #{startTime},</if>
<if test="overTime != null">over_time = #{overTime},</if>
<if test="status != null">status = #{status},</if>
<if test="remark != null">remark = #{remark},</if>
<if test="createBy != null">create_by = #{createBy},</if>
@ -99,4 +118,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</foreach>
</delete>
<select id="selectBasePlanInfoListByPlanID" parameterType="String" resultMap="BasePlanInfoResult">
select t1.planid, t1.deviceid, t1.plan_shift_id, t1.plan_state_id, t1.start_time, t1.over_time,t1.status, t1.remark, t1.create_by, t1.create_time, t1.update_by, t1.update_time, t1.del_flag,t2.objid,t2.material_id,t2.plan_amount,t2.real_amount,t2.unit_id,t2.group_id,t3.groupname from base_plan_info
t1 left join base_plandetail_info t2 on t1.planid = t2.planid
left join base_group_info t3 on t2.group_id = t3.groupid
where t1.planid = #{planid}
</select>
</mapper>

@ -12,6 +12,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<result property="realAmount" column="real_amount" />
<result property="unitId" column="unit_id" />
<result property="groupId" column="group_id" />
<result property="startTime" column="start_time" />
<result property="overTime" column="over_time" />
<result property="remark" column="remark" />
<result property="status" column="status" />
<result property="createBy" column="create_by" />
@ -19,14 +21,16 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<result property="updateBy" column="update_by" />
<result property="updateTime" column="update_time" />
<result property="delFlag" column="del_flag" />
<result property="groupname" column="groupname" />
</resultMap>
<sql id="selectBasePlandetailInfoVo">
select objid, planid, material_id, plan_amount, real_amount, unit_id, group_id, remark, status, create_by, create_time, update_by, update_time, del_flag from base_plandetail_info
select objid, planid, material_id, plan_amount, real_amount, unit_id, group_id, start_time, over_time,remark, status, create_by, create_time, update_by, update_time, del_flag from base_plandetail_info
</sql>
<select id="selectBasePlandetailInfoList" parameterType="BasePlandetailInfo" resultMap="BasePlandetailInfoResult">
<include refid="selectBasePlandetailInfoVo"/>
select t1.objid, t1.planid, t1.material_id, t1.plan_amount, t1.real_amount, t1.unit_id, t1.group_id,t2.groupname, t1.start_time, t1.over_time, t1.remark, t1.status, t1.create_by, t1.create_time, t1.update_by, t1.update_time, t1.del_flag
from base_plandetail_info t1 left join base_group_info t2 on t1.group_id = t2.groupid
<where>
<if test="planid != null and planid != ''"> and planid = #{planid}</if>
<if test="materialId != null and materialId != ''"> and material_id = #{materialId}</if>
@ -53,6 +57,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="realAmount != null">real_amount,</if>
<if test="unitId != null">unit_id,</if>
<if test="groupId != null">group_id,</if>
<if test="startTime != null">start_time,</if>
<if test="overTime != null">over_time,</if>
<if test="remark != null">remark,</if>
<if test="status != null">status,</if>
<if test="createBy != null">create_by,</if>
@ -69,6 +75,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="realAmount != null">#{realAmount},</if>
<if test="unitId != null">#{unitId},</if>
<if test="groupId != null">#{groupId},</if>
<if test="startTime != null">#{startTime},</if>
<if test="overTime != null">#{overTime},</if>
<if test="remark != null">#{remark},</if>
<if test="status != null">#{status},</if>
<if test="createBy != null">#{createBy},</if>
@ -88,6 +96,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="realAmount != null">real_amount = #{realAmount},</if>
<if test="unitId != null">unit_id = #{unitId},</if>
<if test="groupId != null">group_id = #{groupId},</if>
<if test="startTime != null">start_time = #{startTime},</if>
<if test="overTime != null">over_time = #{overTime},</if>
<if test="remark != null">remark = #{remark},</if>
<if test="status != null">status = #{status},</if>
<if test="createBy != null">create_by = #{createBy},</if>
@ -110,4 +120,16 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</foreach>
</delete>
<delete id="deleteBasePlandetailInfoByPlanIds" parameterType="String">
delete from base_plandetail_info where planid in
<foreach item="objid" collection="array" open="(" separator="," close=")">
#{objid}
</foreach>
</delete>
<select id="selectBasePlandetailInfoByPlanID" parameterType="String" resultMap="BasePlandetailInfoResult">
<include refid="selectBasePlandetailInfoVo"/>
where planid = #{planid}
</select>
</mapper>

@ -0,0 +1,95 @@
<?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.ruoyi.baseinfo.mapper.BaseShiftdetailInfoMapper">
<resultMap type="BaseShiftdetailInfo" id="BaseShiftdetailInfoResult">
<result property="shiftNo" column="shift_no" />
<result property="postId" column="post_id" />
<result property="empId" column="emp_id" />
<result property="status" column="status" />
<result property="remark" column="remark" />
<result property="createBy" column="create_by" />
<result property="createTime" column="create_time" />
<result property="updateBy" column="update_by" />
<result property="updateTime" column="update_time" />
<result property="delFlag" column="del_flag" />
<result property="postName" column="post_name" />
<result property="empName" column="emp_name" />
</resultMap>
<sql id="selectBaseShiftdetailInfoVo">
select shift_no, post_id, emp_id, status, remark, create_by, create_time, update_by, update_time, del_flag from base_shiftdetail_info
</sql>
<select id="selectBaseShiftdetailInfoList" parameterType="BaseShiftdetailInfo" resultMap="BaseShiftdetailInfoResult">
select shift_no, t1.post_id,t3.post_name, t1.emp_id,t2.emp_name, t1.status, t1.remark, t1.create_by, t1.create_time, t1.update_by, t1.update_time, t1.del_flag from base_shiftdetail_info t1
left join base_employee_info t2 on t1.emp_id = t2.emp_id
left join base_post_info t3 on t1.post_id = t3.post_id
<where>
<if test="status != null and status != ''"> and t1.status = #{status}</if>
</where>
</select>
<select id="selectBaseShiftdetailInfoById" parameterType="String" resultMap="BaseShiftdetailInfoResult">
<include refid="selectBaseShiftdetailInfoVo"/>
where shift_no = #{shiftNo}
</select>
<insert id="insertBaseShiftdetailInfo" parameterType="BaseShiftdetailInfo">
insert into base_shiftdetail_info
<trim prefix="(" suffix=")" suffixOverrides=",">
<if test="shiftNo != null">shift_no,</if>
<if test="postId != null">post_id,</if>
<if test="empId != null">emp_id,</if>
<if test="status != null">status,</if>
<if test="remark != null">remark,</if>
<if test="createBy != null">create_by,</if>
<if test="createTime != null">create_time,</if>
<if test="updateBy != null">update_by,</if>
<if test="updateTime != null">update_time,</if>
<if test="delFlag != null">del_flag,</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="shiftNo != null">#{shiftNo},</if>
<if test="postId != null">#{postId},</if>
<if test="empId != null">#{empId},</if>
<if test="status != null">#{status},</if>
<if test="remark != null">#{remark},</if>
<if test="createBy != null">#{createBy},</if>
<if test="createTime != null">#{createTime},</if>
<if test="updateBy != null">#{updateBy},</if>
<if test="updateTime != null">#{updateTime},</if>
<if test="delFlag != null">#{delFlag},</if>
</trim>
</insert>
<update id="updateBaseShiftdetailInfo" parameterType="BaseShiftdetailInfo">
update base_shiftdetail_info
<trim prefix="SET" suffixOverrides=",">
<if test="postId != null">post_id = #{postId},</if>
<if test="empId != null">emp_id = #{empId},</if>
<if test="status != null">status = #{status},</if>
<if test="remark != null">remark = #{remark},</if>
<if test="createBy != null">create_by = #{createBy},</if>
<if test="createTime != null">create_time = #{createTime},</if>
<if test="updateBy != null">update_by = #{updateBy},</if>
<if test="updateTime != null">update_time = #{updateTime},</if>
<if test="delFlag != null">del_flag = #{delFlag},</if>
</trim>
where shift_no = #{shiftNo}
</update>
<delete id="deleteBaseShiftdetailInfoById" parameterType="String">
delete from base_shiftdetail_info where shift_no = #{shiftNo}
</delete>
<delete id="deleteBaseShiftdetailInfoByIds" parameterType="String">
delete from base_shiftdetail_info where shift_no in
<foreach item="shiftNo" collection="array" open="(" separator="," close=")">
#{shiftNo}
</foreach>
</delete>
</mapper>

@ -0,0 +1,114 @@
<?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.ruoyi.baseinfo.mapper.BaseShiftmasterInfoMapper">
<resultMap type="BaseShiftmasterInfo" id="BaseShiftmasterInfoResult">
<result property="shiftNo" column="shift_no" />
<result property="deviceId" column="device_id" />
<result property="shiftId" column="shift_id" />
<result property="groupId" column="group_id" />
<result property="startTime" column="start_time" />
<result property="overTime" column="over_time" />
<result property="status" column="status" />
<result property="remark" column="remark" />
<result property="createBy" column="create_by" />
<result property="createTime" column="create_time" />
<result property="updateBy" column="update_by" />
<result property="updateTime" column="update_time" />
<result property="delFlag" column="del_flag" />
<result property="deviceName" column="device_name" />
<result property="shiftname" column="shiftname" />
<result property="groupname" column="groupname" />
</resultMap>
<sql id="selectBaseShiftmasterInfoVo">
select shift_no, device_id, shift_id, group_id, start_time, over_time, status, remark, create_by, create_time, update_by, update_time, del_flag from base_shiftmaster_info
</sql>
<select id="selectBaseShiftmasterInfoList" parameterType="BaseShiftmasterInfo" resultMap="BaseShiftmasterInfoResult">
select t1.shift_no, t1.device_id,t2.device_name, t1.shift_id,t3.shiftname, t1.group_id,t4.groupname, t1.start_time, t1.over_time, t1.status, t1.remark, t1.create_by, t1.create_time, t1.update_by, t1.update_time, t1.del_flag from base_shiftmaster_info t1
left join base_device_info t2 on t1.device_id = t2.device_id
left join base_shift_info t3 on t1.shift_id = t3.shiftid
left join base_group_info t4 on t1.group_id = t4.groupid
<where>
<if test="deviceId != null and deviceId != ''"> and t1.device_id = #{deviceId}</if>
<if test="shiftId != null and shiftId != ''"> and t1.shift_id = #{shiftId}</if>
<if test="groupId != null and groupId != ''"> and t1.group_id = #{groupId}</if>
<if test="startTime != null "> and t1.start_time = #{startTime}</if>
<if test="overTime != null "> and t1.over_time = #{overTime}</if>
<if test="status != null and status != ''"> and t1.status = #{status}</if>
</where>
</select>
<select id="selectBaseShiftmasterInfoById" parameterType="String" resultMap="BaseShiftmasterInfoResult">
<include refid="selectBaseShiftmasterInfoVo"/>
where shift_no = #{shiftNo}
</select>
<insert id="insertBaseShiftmasterInfo" parameterType="BaseShiftmasterInfo">
insert into base_shiftmaster_info
<trim prefix="(" suffix=")" suffixOverrides=",">
<if test="shiftNo != null">shift_no,</if>
<if test="deviceId != null">device_id,</if>
<if test="shiftId != null">shift_id,</if>
<if test="groupId != null">group_id,</if>
<if test="startTime != null">start_time,</if>
<if test="overTime != null">over_time,</if>
<if test="status != null">status,</if>
<if test="remark != null">remark,</if>
<if test="createBy != null">create_by,</if>
<if test="createTime != null">create_time,</if>
<if test="updateBy != null">update_by,</if>
<if test="updateTime != null">update_time,</if>
<if test="delFlag != null">del_flag,</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="shiftNo != null">#{shiftNo},</if>
<if test="deviceId != null">#{deviceId},</if>
<if test="shiftId != null">#{shiftId},</if>
<if test="groupId != null">#{groupId},</if>
<if test="startTime != null">#{startTime},</if>
<if test="overTime != null">#{overTime},</if>
<if test="status != null">#{status},</if>
<if test="remark != null">#{remark},</if>
<if test="createBy != null">#{createBy},</if>
<if test="createTime != null">#{createTime},</if>
<if test="updateBy != null">#{updateBy},</if>
<if test="updateTime != null">#{updateTime},</if>
<if test="delFlag != null">#{delFlag},</if>
</trim>
</insert>
<update id="updateBaseShiftmasterInfo" parameterType="BaseShiftmasterInfo">
update base_shiftmaster_info
<trim prefix="SET" suffixOverrides=",">
<if test="deviceId != null">device_id = #{deviceId},</if>
<if test="shiftId != null">shift_id = #{shiftId},</if>
<if test="groupId != null">group_id = #{groupId},</if>
<if test="startTime != null">start_time = #{startTime},</if>
<if test="overTime != null">over_time = #{overTime},</if>
<if test="status != null">status = #{status},</if>
<if test="remark != null">remark = #{remark},</if>
<if test="createBy != null">create_by = #{createBy},</if>
<if test="createTime != null">create_time = #{createTime},</if>
<if test="updateBy != null">update_by = #{updateBy},</if>
<if test="updateTime != null">update_time = #{updateTime},</if>
<if test="delFlag != null">del_flag = #{delFlag},</if>
</trim>
where shift_no = #{shiftNo}
</update>
<delete id="deleteBaseShiftmasterInfoById" parameterType="String">
delete from base_shiftmaster_info where shift_no = #{shiftNo}
</delete>
<delete id="deleteBaseShiftmasterInfoByIds" parameterType="String">
delete from base_shiftmaster_info where shift_no in
<foreach item="shiftNo" collection="array" open="(" separator="," close=")">
#{shiftNo}
</foreach>
</delete>
</mapper>
Loading…
Cancel
Save