Compare commits
No commits in common. '636370a47639020173c47ff7ec05c42a5880e97f' and 'a92ba67876712439528bb55dc1341f35f55bef6d' have entirely different histories.
636370a476
...
a92ba67876
@ -1,100 +0,0 @@
|
|||||||
package com.os.mes.prod.controller;
|
|
||||||
|
|
||||||
import java.util.List;
|
|
||||||
import javax.servlet.http.HttpServletResponse;
|
|
||||||
|
|
||||||
import org.springframework.security.access.prepost.PreAuthorize;
|
|
||||||
import org.springframework.beans.factory.annotation.Autowired;
|
|
||||||
import org.springframework.web.bind.annotation.GetMapping;
|
|
||||||
import org.springframework.web.bind.annotation.PostMapping;
|
|
||||||
import org.springframework.web.bind.annotation.PutMapping;
|
|
||||||
import org.springframework.web.bind.annotation.DeleteMapping;
|
|
||||||
import org.springframework.web.bind.annotation.PathVariable;
|
|
||||||
import org.springframework.web.bind.annotation.RequestBody;
|
|
||||||
import org.springframework.web.bind.annotation.RequestMapping;
|
|
||||||
import org.springframework.web.bind.annotation.RestController;
|
|
||||||
import com.os.common.annotation.Log;
|
|
||||||
import com.os.common.core.controller.BaseController;
|
|
||||||
import com.os.common.core.domain.AjaxResult;
|
|
||||||
import com.os.common.enums.BusinessType;
|
|
||||||
import com.os.mes.prod.domain.ProdPlanExecuteUser;
|
|
||||||
import com.os.mes.prod.service.IProdPlanExecuteUserService;
|
|
||||||
import com.os.common.utils.poi.ExcelUtil;
|
|
||||||
import com.os.common.core.page.TableDataInfo;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* 生产工单执行用户Controller
|
|
||||||
*
|
|
||||||
* @author Yinq
|
|
||||||
* @date 2024-09-26
|
|
||||||
*/
|
|
||||||
@RestController
|
|
||||||
@RequestMapping("/mes/prod/planExecuteUser")
|
|
||||||
public class ProdPlanExecuteUserController extends BaseController {
|
|
||||||
@Autowired
|
|
||||||
private IProdPlanExecuteUserService prodPlanExecuteUserService;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* 查询生产工单执行用户列表
|
|
||||||
*/
|
|
||||||
@PreAuthorize("@ss.hasPermi('mes/prod:planExecuteUser:list')")
|
|
||||||
@GetMapping("/list")
|
|
||||||
public TableDataInfo list(ProdPlanExecuteUser prodPlanExecuteUser) {
|
|
||||||
startPage();
|
|
||||||
List<ProdPlanExecuteUser> list = prodPlanExecuteUserService.selectProdPlanExecuteUserList(prodPlanExecuteUser);
|
|
||||||
return getDataTable(list);
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* 导出生产工单执行用户列表
|
|
||||||
*/
|
|
||||||
@PreAuthorize("@ss.hasPermi('mes/prod:planExecuteUser:export')")
|
|
||||||
@Log(title = "生产工单执行用户", businessType = BusinessType.EXPORT)
|
|
||||||
@PostMapping("/export")
|
|
||||||
public void export(HttpServletResponse response, ProdPlanExecuteUser prodPlanExecuteUser) {
|
|
||||||
List<ProdPlanExecuteUser> list = prodPlanExecuteUserService.selectProdPlanExecuteUserList(prodPlanExecuteUser);
|
|
||||||
ExcelUtil<ProdPlanExecuteUser> util = new ExcelUtil<ProdPlanExecuteUser>(ProdPlanExecuteUser.class);
|
|
||||||
util.exportExcel(response, list, "生产工单执行用户数据");
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* 获取生产工单执行用户详细信息
|
|
||||||
*/
|
|
||||||
@PreAuthorize("@ss.hasPermi('mes/prod:planExecuteUser:query')")
|
|
||||||
@GetMapping(value = "/{objId}")
|
|
||||||
public AjaxResult getInfo(@PathVariable("objId") Long objId) {
|
|
||||||
return success(prodPlanExecuteUserService.selectProdPlanExecuteUserByObjId(objId));
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* 新增生产工单执行用户
|
|
||||||
*/
|
|
||||||
@PreAuthorize("@ss.hasPermi('mes/prod:planExecuteUser:add')")
|
|
||||||
@Log(title = "生产工单执行用户", businessType = BusinessType.INSERT)
|
|
||||||
@PostMapping
|
|
||||||
public AjaxResult add(@RequestBody ProdPlanExecuteUser prodPlanExecuteUser) {
|
|
||||||
prodPlanExecuteUser.setCreateBy(getUsername());
|
|
||||||
return toAjax(prodPlanExecuteUserService.insertProdPlanExecuteUser(prodPlanExecuteUser));
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* 修改生产工单执行用户
|
|
||||||
*/
|
|
||||||
@PreAuthorize("@ss.hasPermi('mes/prod:planExecuteUser:edit')")
|
|
||||||
@Log(title = "生产工单执行用户", businessType = BusinessType.UPDATE)
|
|
||||||
@PutMapping
|
|
||||||
public AjaxResult edit(@RequestBody ProdPlanExecuteUser prodPlanExecuteUser) {
|
|
||||||
prodPlanExecuteUser.setUpdateBy(getUsername());
|
|
||||||
return toAjax(prodPlanExecuteUserService.updateProdPlanExecuteUser(prodPlanExecuteUser));
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* 删除生产工单执行用户
|
|
||||||
*/
|
|
||||||
@PreAuthorize("@ss.hasPermi('mes/prod:planExecuteUser:remove')")
|
|
||||||
@Log(title = "生产工单执行用户", businessType = BusinessType.DELETE)
|
|
||||||
@DeleteMapping("/{objIds}")
|
|
||||||
public AjaxResult remove(@PathVariable Long[] objIds) {
|
|
||||||
return toAjax(prodPlanExecuteUserService.deleteProdPlanExecuteUserByObjIds(objIds));
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@ -1,69 +0,0 @@
|
|||||||
package com.os.mes.prod.mapper;
|
|
||||||
|
|
||||||
import java.util.List;
|
|
||||||
|
|
||||||
import com.os.mes.prod.domain.ProdPlanExecuteUser;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* 生产工单执行用户Mapper接口
|
|
||||||
*
|
|
||||||
* @author Yinq
|
|
||||||
* @date 2024-09-26
|
|
||||||
*/
|
|
||||||
public interface ProdPlanExecuteUserMapper {
|
|
||||||
/**
|
|
||||||
* 查询生产工单执行用户
|
|
||||||
*
|
|
||||||
* @param objId 生产工单执行用户主键
|
|
||||||
* @return 生产工单执行用户
|
|
||||||
*/
|
|
||||||
public ProdPlanExecuteUser selectProdPlanExecuteUserByObjId(Long objId);
|
|
||||||
|
|
||||||
/**
|
|
||||||
* 查询生产工单执行用户列表
|
|
||||||
*
|
|
||||||
* @param prodPlanExecuteUser 生产工单执行用户
|
|
||||||
* @return 生产工单执行用户集合
|
|
||||||
*/
|
|
||||||
public List<ProdPlanExecuteUser> selectProdPlanExecuteUserList(ProdPlanExecuteUser prodPlanExecuteUser);
|
|
||||||
|
|
||||||
/**
|
|
||||||
* 新增生产工单执行用户
|
|
||||||
*
|
|
||||||
* @param prodPlanExecuteUser 生产工单执行用户
|
|
||||||
* @return 结果
|
|
||||||
*/
|
|
||||||
public int insertProdPlanExecuteUser(ProdPlanExecuteUser prodPlanExecuteUser);
|
|
||||||
|
|
||||||
/**
|
|
||||||
* 修改生产工单执行用户
|
|
||||||
*
|
|
||||||
* @param prodPlanExecuteUser 生产工单执行用户
|
|
||||||
* @return 结果
|
|
||||||
*/
|
|
||||||
public int updateProdPlanExecuteUser(ProdPlanExecuteUser prodPlanExecuteUser);
|
|
||||||
|
|
||||||
/**
|
|
||||||
* 删除生产工单执行用户
|
|
||||||
*
|
|
||||||
* @param objId 生产工单执行用户主键
|
|
||||||
* @return 结果
|
|
||||||
*/
|
|
||||||
public int deleteProdPlanExecuteUserByObjId(Long objId);
|
|
||||||
|
|
||||||
/**
|
|
||||||
* 批量删除生产工单执行用户
|
|
||||||
*
|
|
||||||
* @param objIds 需要删除的数据主键集合
|
|
||||||
* @return 结果
|
|
||||||
*/
|
|
||||||
public int deleteProdPlanExecuteUserByObjIds(Long[] objIds);
|
|
||||||
|
|
||||||
/**
|
|
||||||
* 查询生产工单聚合执行用户列表
|
|
||||||
*
|
|
||||||
* @param prodPlanExecuteUser 生产工单执行用户
|
|
||||||
* @return 生产工单聚合执行用户集合
|
|
||||||
*/
|
|
||||||
List<ProdPlanExecuteUser> selectAggProdPlanExecuteUserList(ProdPlanExecuteUser prodPlanExecuteUser);
|
|
||||||
}
|
|
||||||
@ -1,61 +0,0 @@
|
|||||||
package com.os.mes.prod.service;
|
|
||||||
|
|
||||||
import java.util.List;
|
|
||||||
|
|
||||||
import com.os.mes.prod.domain.ProdPlanExecuteUser;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* 生产工单执行用户Service接口
|
|
||||||
*
|
|
||||||
* @author Yinq
|
|
||||||
* @date 2024-09-26
|
|
||||||
*/
|
|
||||||
public interface IProdPlanExecuteUserService {
|
|
||||||
/**
|
|
||||||
* 查询生产工单执行用户
|
|
||||||
*
|
|
||||||
* @param objId 生产工单执行用户主键
|
|
||||||
* @return 生产工单执行用户
|
|
||||||
*/
|
|
||||||
public ProdPlanExecuteUser selectProdPlanExecuteUserByObjId(Long objId);
|
|
||||||
|
|
||||||
/**
|
|
||||||
* 查询生产工单执行用户列表
|
|
||||||
*
|
|
||||||
* @param prodPlanExecuteUser 生产工单执行用户
|
|
||||||
* @return 生产工单执行用户集合
|
|
||||||
*/
|
|
||||||
public List<ProdPlanExecuteUser> selectProdPlanExecuteUserList(ProdPlanExecuteUser prodPlanExecuteUser);
|
|
||||||
|
|
||||||
/**
|
|
||||||
* 新增生产工单执行用户
|
|
||||||
*
|
|
||||||
* @param prodPlanExecuteUser 生产工单执行用户
|
|
||||||
* @return 结果
|
|
||||||
*/
|
|
||||||
public int insertProdPlanExecuteUser(ProdPlanExecuteUser prodPlanExecuteUser);
|
|
||||||
|
|
||||||
/**
|
|
||||||
* 修改生产工单执行用户
|
|
||||||
*
|
|
||||||
* @param prodPlanExecuteUser 生产工单执行用户
|
|
||||||
* @return 结果
|
|
||||||
*/
|
|
||||||
public int updateProdPlanExecuteUser(ProdPlanExecuteUser prodPlanExecuteUser);
|
|
||||||
|
|
||||||
/**
|
|
||||||
* 批量删除生产工单执行用户
|
|
||||||
*
|
|
||||||
* @param objIds 需要删除的生产工单执行用户主键集合
|
|
||||||
* @return 结果
|
|
||||||
*/
|
|
||||||
public int deleteProdPlanExecuteUserByObjIds(Long[] objIds);
|
|
||||||
|
|
||||||
/**
|
|
||||||
* 删除生产工单执行用户信息
|
|
||||||
*
|
|
||||||
* @param objId 生产工单执行用户主键
|
|
||||||
* @return 结果
|
|
||||||
*/
|
|
||||||
public int deleteProdPlanExecuteUserByObjId(Long objId);
|
|
||||||
}
|
|
||||||
@ -1,87 +0,0 @@
|
|||||||
package com.os.mes.prod.service.impl;
|
|
||||||
|
|
||||||
import java.util.List;
|
|
||||||
|
|
||||||
import org.springframework.beans.factory.annotation.Autowired;
|
|
||||||
import org.springframework.stereotype.Service;
|
|
||||||
import com.os.mes.prod.mapper.ProdPlanExecuteUserMapper;
|
|
||||||
import com.os.mes.prod.domain.ProdPlanExecuteUser;
|
|
||||||
import com.os.mes.prod.service.IProdPlanExecuteUserService;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* 生产工单执行用户Service业务层处理
|
|
||||||
*
|
|
||||||
* @author Yinq
|
|
||||||
* @date 2024-09-26
|
|
||||||
*/
|
|
||||||
@Service
|
|
||||||
public class ProdPlanExecuteUserServiceImpl implements IProdPlanExecuteUserService {
|
|
||||||
@Autowired
|
|
||||||
private ProdPlanExecuteUserMapper prodPlanExecuteUserMapper;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* 查询生产工单执行用户
|
|
||||||
*
|
|
||||||
* @param objId 生产工单执行用户主键
|
|
||||||
* @return 生产工单执行用户
|
|
||||||
*/
|
|
||||||
@Override
|
|
||||||
public ProdPlanExecuteUser selectProdPlanExecuteUserByObjId(Long objId) {
|
|
||||||
return prodPlanExecuteUserMapper.selectProdPlanExecuteUserByObjId(objId);
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* 查询生产工单执行用户列表
|
|
||||||
*
|
|
||||||
* @param prodPlanExecuteUser 生产工单执行用户
|
|
||||||
* @return 生产工单执行用户
|
|
||||||
*/
|
|
||||||
@Override
|
|
||||||
public List<ProdPlanExecuteUser> selectProdPlanExecuteUserList(ProdPlanExecuteUser prodPlanExecuteUser) {
|
|
||||||
return prodPlanExecuteUserMapper.selectAggProdPlanExecuteUserList(prodPlanExecuteUser);
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* 新增生产工单执行用户
|
|
||||||
*
|
|
||||||
* @param prodPlanExecuteUser 生产工单执行用户
|
|
||||||
* @return 结果
|
|
||||||
*/
|
|
||||||
@Override
|
|
||||||
public int insertProdPlanExecuteUser(ProdPlanExecuteUser prodPlanExecuteUser) {
|
|
||||||
return prodPlanExecuteUserMapper.insertProdPlanExecuteUser(prodPlanExecuteUser);
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* 修改生产工单执行用户
|
|
||||||
*
|
|
||||||
* @param prodPlanExecuteUser 生产工单执行用户
|
|
||||||
* @return 结果
|
|
||||||
*/
|
|
||||||
@Override
|
|
||||||
public int updateProdPlanExecuteUser(ProdPlanExecuteUser prodPlanExecuteUser) {
|
|
||||||
return prodPlanExecuteUserMapper.updateProdPlanExecuteUser(prodPlanExecuteUser);
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* 批量删除生产工单执行用户
|
|
||||||
*
|
|
||||||
* @param objIds 需要删除的生产工单执行用户主键
|
|
||||||
* @return 结果
|
|
||||||
*/
|
|
||||||
@Override
|
|
||||||
public int deleteProdPlanExecuteUserByObjIds(Long[] objIds) {
|
|
||||||
return prodPlanExecuteUserMapper.deleteProdPlanExecuteUserByObjIds(objIds);
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* 删除生产工单执行用户信息
|
|
||||||
*
|
|
||||||
* @param objId 生产工单执行用户主键
|
|
||||||
* @return 结果
|
|
||||||
*/
|
|
||||||
@Override
|
|
||||||
public int deleteProdPlanExecuteUserByObjId(Long objId) {
|
|
||||||
return prodPlanExecuteUserMapper.deleteProdPlanExecuteUserByObjId(objId);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@ -1,122 +0,0 @@
|
|||||||
package com.os.mes.record.domain;
|
|
||||||
|
|
||||||
import com.fasterxml.jackson.annotation.JsonFormat;
|
|
||||||
import com.os.common.annotation.Excel;
|
|
||||||
import com.os.common.core.domain.BaseEntity;
|
|
||||||
import org.apache.commons.lang3.builder.ToStringBuilder;
|
|
||||||
import org.apache.commons.lang3.builder.ToStringStyle;
|
|
||||||
|
|
||||||
import java.math.BigDecimal;
|
|
||||||
import java.util.Date;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* 员工工资汇总报表对象
|
|
||||||
*
|
|
||||||
* @author Yinq
|
|
||||||
* @date 2024-07-02
|
|
||||||
*/
|
|
||||||
public class ReportSalarySummary extends BaseEntity
|
|
||||||
{
|
|
||||||
private static final long serialVersionUID = 1L;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* 员工编号
|
|
||||||
*/
|
|
||||||
@Excel(name = "员工编号")
|
|
||||||
private String staffId;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* 员工名称
|
|
||||||
*/
|
|
||||||
@Excel(name = "员工名称")
|
|
||||||
private String staffName;
|
|
||||||
|
|
||||||
/** 身份证 */
|
|
||||||
@Excel(name = "身份证")
|
|
||||||
private String idCard;
|
|
||||||
|
|
||||||
/** 班组编号 */
|
|
||||||
@Excel(name = "班组编号")
|
|
||||||
private String groupId;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* 班组名称
|
|
||||||
*/
|
|
||||||
@Excel(name = "班组名称")
|
|
||||||
private String teamName;
|
|
||||||
|
|
||||||
/** 收入金额 */
|
|
||||||
@Excel(name = "收入金额")
|
|
||||||
private BigDecimal revenueAmount;
|
|
||||||
|
|
||||||
/** 事件日期 */
|
|
||||||
@JsonFormat(pattern = "yyyy-MM-dd")
|
|
||||||
@Excel(name = "事件日期", width = 30, dateFormat = "yyyy-MM-dd")
|
|
||||||
private Date eventDate;
|
|
||||||
|
|
||||||
public String getGroupId() {
|
|
||||||
return groupId;
|
|
||||||
}
|
|
||||||
|
|
||||||
public void setGroupId(String groupId) {
|
|
||||||
this.groupId = groupId;
|
|
||||||
}
|
|
||||||
|
|
||||||
public String getTeamName() {
|
|
||||||
return teamName;
|
|
||||||
}
|
|
||||||
|
|
||||||
public void setTeamName(String teamName) {
|
|
||||||
this.teamName = teamName;
|
|
||||||
}
|
|
||||||
|
|
||||||
public String getStaffId() {
|
|
||||||
return staffId;
|
|
||||||
}
|
|
||||||
|
|
||||||
public void setStaffId(String staffId) {
|
|
||||||
this.staffId = staffId;
|
|
||||||
}
|
|
||||||
|
|
||||||
public String getStaffName() {
|
|
||||||
return staffName;
|
|
||||||
}
|
|
||||||
|
|
||||||
public void setStaffName(String staffName) {
|
|
||||||
this.staffName = staffName;
|
|
||||||
}
|
|
||||||
|
|
||||||
public String getIdCard() {
|
|
||||||
return idCard;
|
|
||||||
}
|
|
||||||
|
|
||||||
public void setIdCard(String idCard) {
|
|
||||||
this.idCard = idCard;
|
|
||||||
}
|
|
||||||
|
|
||||||
public Date getEventDate() {
|
|
||||||
return eventDate;
|
|
||||||
}
|
|
||||||
|
|
||||||
public void setEventDate(Date eventDate) {
|
|
||||||
this.eventDate = eventDate;
|
|
||||||
}
|
|
||||||
|
|
||||||
public BigDecimal getRevenueAmount() {
|
|
||||||
return revenueAmount;
|
|
||||||
}
|
|
||||||
|
|
||||||
public void setRevenueAmount(BigDecimal revenueAmount) {
|
|
||||||
this.revenueAmount = revenueAmount;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public String toString() {
|
|
||||||
return "ReportSalarySummary{" +
|
|
||||||
", staffName='" + staffName + '\'' +
|
|
||||||
", idCard='" + idCard + '\'' +
|
|
||||||
", eventDate=" + eventDate +
|
|
||||||
", revenueAmount=" + revenueAmount +
|
|
||||||
'}';
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@ -1,94 +0,0 @@
|
|||||||
package com.os.mes.record.domain;
|
|
||||||
|
|
||||||
import com.fasterxml.jackson.annotation.JsonFormat;
|
|
||||||
import com.os.common.annotation.Excel;
|
|
||||||
import com.os.common.core.domain.BaseEntity;
|
|
||||||
import org.apache.commons.lang3.builder.ToStringBuilder;
|
|
||||||
import org.apache.commons.lang3.builder.ToStringStyle;
|
|
||||||
|
|
||||||
import java.math.BigDecimal;
|
|
||||||
import java.util.Date;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* 员工工资记录对象 record_staff_salary
|
|
||||||
*
|
|
||||||
* @author Yinq
|
|
||||||
* @date 2024-07-02
|
|
||||||
*/
|
|
||||||
public class StaffSalaryVo extends BaseEntity
|
|
||||||
{
|
|
||||||
private static final long serialVersionUID = 1L;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* 工序编号
|
|
||||||
*/
|
|
||||||
private String processCode;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* 员工ID
|
|
||||||
*/
|
|
||||||
private String staffId;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* 员工名称
|
|
||||||
*/
|
|
||||||
private String staffName;
|
|
||||||
|
|
||||||
/** 工资系数 */
|
|
||||||
private BigDecimal salaryCoefficient;
|
|
||||||
|
|
||||||
/** 该工序所有员工工资系数 */
|
|
||||||
private BigDecimal sumSalaryCoefficient;
|
|
||||||
|
|
||||||
public String getProcessCode() {
|
|
||||||
return processCode;
|
|
||||||
}
|
|
||||||
|
|
||||||
public void setProcessCode(String processCode) {
|
|
||||||
this.processCode = processCode;
|
|
||||||
}
|
|
||||||
|
|
||||||
public String getStaffId() {
|
|
||||||
return staffId;
|
|
||||||
}
|
|
||||||
|
|
||||||
public void setStaffId(String staffId) {
|
|
||||||
this.staffId = staffId;
|
|
||||||
}
|
|
||||||
|
|
||||||
public String getStaffName() {
|
|
||||||
return staffName;
|
|
||||||
}
|
|
||||||
|
|
||||||
public void setStaffName(String staffName) {
|
|
||||||
this.staffName = staffName;
|
|
||||||
}
|
|
||||||
|
|
||||||
public BigDecimal getSalaryCoefficient() {
|
|
||||||
return salaryCoefficient;
|
|
||||||
}
|
|
||||||
|
|
||||||
public void setSalaryCoefficient(BigDecimal salaryCoefficient) {
|
|
||||||
this.salaryCoefficient = salaryCoefficient;
|
|
||||||
}
|
|
||||||
|
|
||||||
public BigDecimal getSumSalaryCoefficient() {
|
|
||||||
return sumSalaryCoefficient;
|
|
||||||
}
|
|
||||||
|
|
||||||
public void setSumSalaryCoefficient(BigDecimal sumSalaryCoefficient) {
|
|
||||||
this.sumSalaryCoefficient = sumSalaryCoefficient;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public String toString() {
|
|
||||||
return "StaffSalaryVo{" +
|
|
||||||
"processCode='" + processCode + '\'' +
|
|
||||||
", staffId='" + staffId + '\'' +
|
|
||||||
", staffName='" + staffName + '\'' +
|
|
||||||
", salaryCoefficient=" + salaryCoefficient +
|
|
||||||
", sumSalaryCoefficient=" + sumSalaryCoefficient +
|
|
||||||
'}';
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
|
||||||
@ -1,211 +0,0 @@
|
|||||||
<?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.os.mes.prod.mapper.ProdPlanExecuteUserMapper">
|
|
||||||
|
|
||||||
<resultMap type="ProdPlanExecuteUser" id="ProdPlanExecuteUserResult">
|
|
||||||
<result property="objId" column="obj_id"/>
|
|
||||||
<result property="orderCode" column="order_code"/>
|
|
||||||
<result property="planCode" column="plan_code"/>
|
|
||||||
<result property="processCode" column="process_code"/>
|
|
||||||
<result property="stationCode" column="station_code"/>
|
|
||||||
<result property="staffId" column="staff_id"/>
|
|
||||||
<result property="completeAmount" column="complete_amount"/>
|
|
||||||
<result property="planBeginDate" column="plan_begin_date"/>
|
|
||||||
<result property="planEndDate" column="plan_end_date"/>
|
|
||||||
<result property="isFlag" column="is_flag"/>
|
|
||||||
<result property="createdBy" column="created_by"/>
|
|
||||||
<result property="createdTime" column="created_time"/>
|
|
||||||
<result property="updatedBy" column="updated_by"/>
|
|
||||||
<result property="updatedTime" column="updated_time"/>
|
|
||||||
<result property="offWorkTime" column="off_work_time"/>
|
|
||||||
<result property="batchNumber" column="batch_number"/>
|
|
||||||
<result property="staffName" column="staff_name"/>
|
|
||||||
<result property="stationName" column="station_name"/>
|
|
||||||
<result property="wageCoefficient" column="wage_coefficient"/>
|
|
||||||
<result property="BeltRequiredLength" column="BeltRequiredLength"/>
|
|
||||||
<result property="FormingArea" column="FormingArea"/>
|
|
||||||
<result property="SulfurizationArea" column="SulfurizationArea"/>
|
|
||||||
<result property="idCard" column="pass_word"/>
|
|
||||||
<result property="teamCode" column="team_code"/>
|
|
||||||
<result property="BeltLengthSpecifications" column="BeltLengthSpecifications"/>
|
|
||||||
<result property="RollCoatingArea" column="RollCoatingArea"/>
|
|
||||||
<result property="RolledFabricArea" column="RolledFabricArea"/>
|
|
||||||
</resultMap>
|
|
||||||
|
|
||||||
<sql id="selectProdPlanExecuteUserVo">
|
|
||||||
select ppeu.obj_id,
|
|
||||||
ppeu.order_code,
|
|
||||||
ppeu.plan_code,
|
|
||||||
ppeu.process_code,
|
|
||||||
ppeu.station_code,
|
|
||||||
ppeu.staff_id,
|
|
||||||
ppeu.complete_amount,
|
|
||||||
ppeu.plan_begin_date,
|
|
||||||
ppeu.plan_end_date,
|
|
||||||
ppeu.is_flag,
|
|
||||||
ppeu.created_by,
|
|
||||||
ppeu.created_time,
|
|
||||||
ppeu.updated_by,
|
|
||||||
ppeu.updated_time,
|
|
||||||
ppeu.batch_number,
|
|
||||||
FORMAT(ppeu.off_work_time, 'yyyy-MM-dd') off_work_time,
|
|
||||||
bsi.staff_name,
|
|
||||||
bsi.wage_coefficient,
|
|
||||||
bpl.product_line_name station_name,
|
|
||||||
pod.BeltRequiredLength,
|
|
||||||
pod.SulfurizationArea,
|
|
||||||
pod.RolledFabricArea,
|
|
||||||
pod.RollCoatingArea,
|
|
||||||
pod.FormingArea,
|
|
||||||
bsi.pass_word,
|
|
||||||
bsi.team_code,
|
|
||||||
pod.BeltLengthSpecifications
|
|
||||||
from prod_plan_execute_user ppeu
|
|
||||||
left join base_staff_info bsi on bsi.staff_id = ppeu.staff_id
|
|
||||||
left join base_product_line bpl on bpl.product_line_code = ppeu.station_code
|
|
||||||
left join prod_order_detail pod on ppeu.order_code = pod.SeqNo
|
|
||||||
</sql>
|
|
||||||
|
|
||||||
<select id="selectProdPlanExecuteUserList" parameterType="ProdPlanExecuteUser"
|
|
||||||
resultMap="ProdPlanExecuteUserResult">
|
|
||||||
<include refid="selectProdPlanExecuteUserVo"/>
|
|
||||||
<where>
|
|
||||||
<if test="orderCode != null and orderCode != ''">and ppeu.order_code = #{orderCode}</if>
|
|
||||||
<if test="planCode != null and planCode != ''">and ppeu.plan_code = #{planCode}</if>
|
|
||||||
<if test="processCode != null and processCode != ''">and ppeu.process_code = #{processCode}</if>
|
|
||||||
<if test="stationCode != null and stationCode != ''">and ppeu.station_code = #{stationCode}</if>
|
|
||||||
<if test="staffId != null and staffId != ''">and ppeu.staff_id = #{staffId}</if>
|
|
||||||
<if test="completeAmount != null ">and ppeu.complete_amount = #{completeAmount}</if>
|
|
||||||
<if test="planBeginDate != null ">and ppeu.plan_begin_date = #{planBeginDate}</if>
|
|
||||||
<if test="planEndDate != null ">and ppeu.plan_end_date = #{planEndDate}</if>
|
|
||||||
<if test="isFlag != null and isFlag != ''">and ppeu.is_flag = #{isFlag}</if>
|
|
||||||
<if test="batchNumber != null and batchNumber != ''">and ppeu.batch_number = #{batchNumber}</if>
|
|
||||||
<if test="params.beginOrderDate != null and params.beginOrderDate != '' and params.endOrderDate != null and params.endOrderDate != ''">
|
|
||||||
and FORMAT(ppeu.plan_end_date, 'yyyy-MM-dd') between #{params.beginOrderDate} and #{params.endOrderDate}
|
|
||||||
</if>
|
|
||||||
<if test="params.beginOffWorkTime != null and params.beginOffWorkTime != '' and params.endOffWorkTime != null and params.endOffWorkTime != ''">
|
|
||||||
and FORMAT(ppeu.off_work_time, 'yyyy-MM-dd') between #{params.beginOffWorkTime} and #{params.endOffWorkTime}
|
|
||||||
</if>
|
|
||||||
</where>
|
|
||||||
</select>
|
|
||||||
|
|
||||||
<select id="selectProdPlanExecuteUserByObjId" parameterType="Long" resultMap="ProdPlanExecuteUserResult">
|
|
||||||
<include refid="selectProdPlanExecuteUserVo"/>
|
|
||||||
where obj_id = #{objId}
|
|
||||||
</select>
|
|
||||||
|
|
||||||
<select id="selectAggProdPlanExecuteUserList" parameterType="ProdPlanExecuteUser" resultMap="ProdPlanExecuteUserResult">
|
|
||||||
SELECT ppeu.order_code,
|
|
||||||
ppeu.plan_code,
|
|
||||||
ppeu.process_code,
|
|
||||||
ppeu.station_code,
|
|
||||||
bpl.product_line_name AS station_name,
|
|
||||||
ppeu.complete_amount,
|
|
||||||
ppeu.plan_begin_date,
|
|
||||||
ppeu.plan_end_date,
|
|
||||||
ppeu.batch_number,
|
|
||||||
STUFF(
|
|
||||||
(SELECT DISTINCT ', ' + CAST(ppeu_inner.staff_id AS VARCHAR)
|
|
||||||
FROM prod_plan_execute_user ppeu_inner
|
|
||||||
WHERE ppeu_inner.plan_code = ppeu.plan_code
|
|
||||||
AND ppeu_inner.batch_number = ppeu.batch_number
|
|
||||||
FOR XML PATH('')), 1, 2, '') AS staff_id,
|
|
||||||
STUFF(
|
|
||||||
(SELECT DISTINCT ', ' + bsi.staff_name
|
|
||||||
FROM base_staff_info bsi
|
|
||||||
LEFT JOIN prod_plan_execute_user ppeu_inner ON ppeu_inner.staff_id = bsi.staff_id
|
|
||||||
WHERE ppeu_inner.plan_code = ppeu.plan_code
|
|
||||||
AND ppeu_inner.batch_number = ppeu.batch_number
|
|
||||||
FOR XML PATH('')), 1, 2, '') AS staff_name
|
|
||||||
FROM prod_plan_execute_user ppeu
|
|
||||||
LEFT JOIN base_product_line bpl ON bpl.product_line_code = ppeu.station_code
|
|
||||||
<where>
|
|
||||||
<if test="orderCode != null and orderCode != ''">and ppeu.order_code = #{orderCode}</if>
|
|
||||||
<if test="planCode != null and planCode != ''">and ppeu.plan_code = #{planCode}</if>
|
|
||||||
<if test="processCode != null and processCode != ''">and ppeu.process_code = #{processCode}</if>
|
|
||||||
<if test="stationCode != null and stationCode != ''">and ppeu.station_code = #{stationCode}</if>
|
|
||||||
<if test="staffId != null and staffId != ''">and ppeu.staff_id = #{staffId}</if>
|
|
||||||
<if test="completeAmount != null ">and ppeu.complete_amount = #{completeAmount}</if>
|
|
||||||
<if test="planBeginDate != null ">and ppeu.plan_begin_date = #{planBeginDate}</if>
|
|
||||||
<if test="planEndDate != null ">and ppeu.plan_end_date = #{planEndDate}</if>
|
|
||||||
<if test="isFlag != null and isFlag != ''">and ppeu.is_flag = #{isFlag}</if>
|
|
||||||
<if test="batchNumber != null and batchNumber != ''">and ppeu.batch_number = #{batchNumber}</if>
|
|
||||||
<if test="params.beginOrderDate != null and params.beginOrderDate != '' and params.endOrderDate != null and params.endOrderDate != ''">
|
|
||||||
and FORMAT(ppeu.plan_end_date, 'yyyy-MM-dd') between #{params.beginOrderDate} and #{params.endOrderDate}
|
|
||||||
</if>
|
|
||||||
</where>
|
|
||||||
GROUP BY ppeu.order_code, ppeu.plan_code, ppeu.process_code, ppeu.station_code, bpl.product_line_name,
|
|
||||||
ppeu.complete_amount, ppeu.plan_begin_date, ppeu.plan_end_date, ppeu.batch_number
|
|
||||||
ORDER BY ppeu.order_code desc, ppeu.station_code, ppeu.batch_number
|
|
||||||
</select>
|
|
||||||
|
|
||||||
<insert id="insertProdPlanExecuteUser" parameterType="ProdPlanExecuteUser" useGeneratedKeys="true"
|
|
||||||
keyProperty="objId">
|
|
||||||
insert into prod_plan_execute_user
|
|
||||||
<trim prefix="(" suffix=")" suffixOverrides=",">
|
|
||||||
<if test="orderCode != null">order_code,</if>
|
|
||||||
<if test="planCode != null">plan_code,</if>
|
|
||||||
<if test="processCode != null">process_code,</if>
|
|
||||||
<if test="stationCode != null">station_code,</if>
|
|
||||||
<if test="staffId != null">staff_id,</if>
|
|
||||||
<if test="completeAmount != null">complete_amount,</if>
|
|
||||||
<if test="planBeginDate != null">plan_begin_date,</if>
|
|
||||||
<if test="planEndDate != null">plan_end_date,</if>
|
|
||||||
<if test="isFlag != null">is_flag,</if>
|
|
||||||
<if test="createdBy != null">created_by,</if>
|
|
||||||
<if test="createdTime != null">created_time,</if>
|
|
||||||
<if test="updatedBy != null">updated_by,</if>
|
|
||||||
<if test="updatedTime != null">updated_time,</if>
|
|
||||||
</trim>
|
|
||||||
<trim prefix="values (" suffix=")" suffixOverrides=",">
|
|
||||||
<if test="orderCode != null">#{orderCode},</if>
|
|
||||||
<if test="planCode != null">#{planCode},</if>
|
|
||||||
<if test="processCode != null">#{processCode},</if>
|
|
||||||
<if test="stationCode != null">#{stationCode},</if>
|
|
||||||
<if test="staffId != null">#{staffId},</if>
|
|
||||||
<if test="completeAmount != null">#{completeAmount},</if>
|
|
||||||
<if test="planBeginDate != null">#{planBeginDate},</if>
|
|
||||||
<if test="planEndDate != null">#{planEndDate},</if>
|
|
||||||
<if test="isFlag != null">#{isFlag},</if>
|
|
||||||
<if test="createdBy != null">#{createdBy},</if>
|
|
||||||
<if test="createdTime != null">#{createdTime},</if>
|
|
||||||
<if test="updatedBy != null">#{updatedBy},</if>
|
|
||||||
<if test="updatedTime != null">#{updatedTime},</if>
|
|
||||||
</trim>
|
|
||||||
</insert>
|
|
||||||
|
|
||||||
<update id="updateProdPlanExecuteUser" parameterType="ProdPlanExecuteUser">
|
|
||||||
update prod_plan_execute_user
|
|
||||||
<trim prefix="SET" suffixOverrides=",">
|
|
||||||
<if test="orderCode != null">order_code = #{orderCode},</if>
|
|
||||||
<if test="planCode != null">plan_code = #{planCode},</if>
|
|
||||||
<if test="processCode != null">process_code = #{processCode},</if>
|
|
||||||
<if test="stationCode != null">station_code = #{stationCode},</if>
|
|
||||||
<if test="staffId != null">staff_id = #{staffId},</if>
|
|
||||||
<if test="completeAmount != null">complete_amount = #{completeAmount},</if>
|
|
||||||
<if test="planBeginDate != null">plan_begin_date = #{planBeginDate},</if>
|
|
||||||
<if test="planEndDate != null">plan_end_date = #{planEndDate},</if>
|
|
||||||
<if test="isFlag != null">is_flag = #{isFlag},</if>
|
|
||||||
<if test="createdBy != null">created_by = #{createdBy},</if>
|
|
||||||
<if test="createdTime != null">created_time = #{createdTime},</if>
|
|
||||||
<if test="updatedBy != null">updated_by = #{updatedBy},</if>
|
|
||||||
<if test="updatedTime != null">updated_time = #{updatedTime},</if>
|
|
||||||
</trim>
|
|
||||||
where obj_id = #{objId}
|
|
||||||
</update>
|
|
||||||
|
|
||||||
<delete id="deleteProdPlanExecuteUserByObjId" parameterType="Long">
|
|
||||||
delete
|
|
||||||
from prod_plan_execute_user
|
|
||||||
where obj_id = #{objId}
|
|
||||||
</delete>
|
|
||||||
|
|
||||||
<delete id="deleteProdPlanExecuteUserByObjIds" parameterType="String">
|
|
||||||
delete from prod_plan_execute_user where obj_id in
|
|
||||||
<foreach item="objId" collection="array" open="(" separator="," close=")">
|
|
||||||
#{objId}
|
|
||||||
</foreach>
|
|
||||||
</delete>
|
|
||||||
</mapper>
|
|
||||||
Loading…
Reference in New Issue