From 92da9bae1d9ab4d9e64e3870da08c4f674be832b Mon Sep 17 00:00:00 2001 From: yinq Date: Tue, 25 Jun 2024 15:12:15 +0800 Subject: [PATCH] =?UTF-8?q?change=20-=20add=E5=91=98=E5=B7=A5=E5=B7=A5?= =?UTF-8?q?=E8=B5=84=E8=AE=B0=E5=BD=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../RecordStaffSalaryController.java | 43 ++++++ .../mes/record/domain/RecordStaffSalary.java | 143 ++++++++++++++++++ .../service/IRecordStaffSalaryService.java | 24 +++ .../impl/RecordStaffSalaryServiceImpl.java | 43 ++++++ 4 files changed, 253 insertions(+) create mode 100644 os-mes/src/main/java/com/os/mes/record/controller/RecordStaffSalaryController.java create mode 100644 os-mes/src/main/java/com/os/mes/record/domain/RecordStaffSalary.java create mode 100644 os-mes/src/main/java/com/os/mes/record/service/IRecordStaffSalaryService.java create mode 100644 os-mes/src/main/java/com/os/mes/record/service/impl/RecordStaffSalaryServiceImpl.java diff --git a/os-mes/src/main/java/com/os/mes/record/controller/RecordStaffSalaryController.java b/os-mes/src/main/java/com/os/mes/record/controller/RecordStaffSalaryController.java new file mode 100644 index 0000000..33ec523 --- /dev/null +++ b/os-mes/src/main/java/com/os/mes/record/controller/RecordStaffSalaryController.java @@ -0,0 +1,43 @@ +package com.os.mes.record.controller; + +import com.os.common.core.controller.BaseController; +import com.os.common.core.domain.AjaxResult; +import com.os.common.core.page.TableDataInfo; +import com.os.mes.base.domain.BaseCustomData; +import com.os.mes.record.domain.RecordStaffAttendance; +import com.os.mes.record.domain.RecordStaffSalary; +import com.os.mes.record.service.IRecordStaffAttendanceService; +import com.os.mes.record.service.IRecordStaffSalaryService; +import org.checkerframework.checker.units.qual.A; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; + +import java.util.List; + + +/** + * 员工工资记录Controller + * + * @author Yinq + * @date 2024-05-24 + */ +@RestController +@RequestMapping("/mes/record/staffSalary") +public class RecordStaffSalaryController extends BaseController { + + @Autowired + private IRecordStaffSalaryService staffSalaryService; + + + /** + * 班组员工工资 + * @param recordStaffSalary + * @return + */ + @GetMapping("/selectTeamEmployeesWages") + public AjaxResult selectTeamEmployeesWages(RecordStaffSalary recordStaffSalary) { + List list = staffSalaryService.selectTeamEmployeesWages(recordStaffSalary); + return success(list); + } + +} diff --git a/os-mes/src/main/java/com/os/mes/record/domain/RecordStaffSalary.java b/os-mes/src/main/java/com/os/mes/record/domain/RecordStaffSalary.java new file mode 100644 index 0000000..7d91c08 --- /dev/null +++ b/os-mes/src/main/java/com/os/mes/record/domain/RecordStaffSalary.java @@ -0,0 +1,143 @@ +package com.os.mes.record.domain; + +import com.os.common.annotation.Excel; +import com.os.common.core.domain.BaseEntity; + +import java.math.BigDecimal; +import java.util.Date; + +/** + * 员工工资记录对象 record_staff_attendance + * + * @author Yinq + * @date 2024-05-24 + */ +public class RecordStaffSalary extends BaseEntity { + private static final long serialVersionUID = 1L; + + /** + * 班组编号 + */ + @Excel(name = "班组编号") + private String teamCode; + + /** + * 班组名称 + */ + @Excel(name = "班组名称") + private String teamName; + + /** + * 员工ID + */ + @Excel(name = "员工ID") + private String staffId; + + /** + * 员工名称 + */ + @Excel(name = "员工名称") + private String staffName; + + /** + * 工资系数 + */ + @Excel(name = "工资系数") + private BigDecimal wageCoefficient; + + /** + * 工资 + */ + @Excel(name = "工资") + private BigDecimal wage; + + /** + * 开始日期 + */ + @Excel(name = "开始日期") + private Date beginDate; + + /** + * 结束日期 + */ + @Excel(name = "结束日期") + private Date endDate; + + public String getTeamCode() { + return teamCode; + } + + public void setTeamCode(String teamCode) { + this.teamCode = teamCode; + } + + 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 BigDecimal getWageCoefficient() { + return wageCoefficient; + } + + public void setWageCoefficient(BigDecimal wageCoefficient) { + this.wageCoefficient = wageCoefficient; + } + + public BigDecimal getWage() { + return wage; + } + + public void setWage(BigDecimal wage) { + this.wage = wage; + } + + public Date getBeginDate() { + return beginDate; + } + + public void setBeginDate(Date beginDate) { + this.beginDate = beginDate; + } + + public Date getEndDate() { + return endDate; + } + + public void setEndDate(Date endDate) { + this.endDate = endDate; + } + + @Override + public String toString() { + return "RecordStaffSalary{" + + "teamCode='" + teamCode + '\'' + + ", teamName='" + teamName + '\'' + + ", staffId='" + staffId + '\'' + + ", staffName='" + staffName + '\'' + + ", wageCoefficient=" + wageCoefficient + + ", wage=" + wage + + ", beginDate=" + beginDate + + ", endDate=" + endDate + + '}'; + } +} diff --git a/os-mes/src/main/java/com/os/mes/record/service/IRecordStaffSalaryService.java b/os-mes/src/main/java/com/os/mes/record/service/IRecordStaffSalaryService.java new file mode 100644 index 0000000..5ab9fba --- /dev/null +++ b/os-mes/src/main/java/com/os/mes/record/service/IRecordStaffSalaryService.java @@ -0,0 +1,24 @@ +package com.os.mes.record.service; + + +import com.os.mes.record.domain.RecordStaffAttendance; +import com.os.mes.record.domain.RecordStaffSalary; + +import java.util.List; + +/** + * 员工工资记录Service接口 + * + * @author Yinq + * @date 2024-05-24 + */ +public interface IRecordStaffSalaryService { + + + /** + * 班组员工工资 + * @param recordStaffSalary + * @return + */ + List selectTeamEmployeesWages(RecordStaffSalary recordStaffSalary); +} diff --git a/os-mes/src/main/java/com/os/mes/record/service/impl/RecordStaffSalaryServiceImpl.java b/os-mes/src/main/java/com/os/mes/record/service/impl/RecordStaffSalaryServiceImpl.java new file mode 100644 index 0000000..c36bf38 --- /dev/null +++ b/os-mes/src/main/java/com/os/mes/record/service/impl/RecordStaffSalaryServiceImpl.java @@ -0,0 +1,43 @@ +package com.os.mes.record.service.impl; + +import com.os.mes.prod.domain.ProdOrderDetail; +import com.os.mes.prod.mapper.ProdOrderDetailMapper; +import com.os.mes.record.domain.RecordStaffSalary; +import com.os.mes.record.mapper.RecordStaffAttendanceMapper; +import com.os.mes.record.service.IRecordStaffSalaryService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.util.List; + + +/** + * 员工工资记录Service业务层处理 + * + * @author Yinq + * @date 2024-05-24 + */ +@Service +public class RecordStaffSalaryServiceImpl implements IRecordStaffSalaryService { + @Autowired + private RecordStaffAttendanceMapper recordStaffAttendanceMapper; + + @Autowired + private ProdOrderDetailMapper prodOrderDetailMapper; + + /** + * 班组员工工资 + * @param recordStaffSalary + * @return + */ + @Override + public List selectTeamEmployeesWages(RecordStaffSalary recordStaffSalary) { + + ProdOrderDetail orderDetail = new ProdOrderDetail(); + List prodOrderDetails = prodOrderDetailMapper.selectProdOrderDetailList(orderDetail); + + return null; + } + + +}