From 4354c15770e22e815d35000a29f43a7845b8b57a Mon Sep 17 00:00:00 2001 From: yinq Date: Wed, 3 Jul 2024 08:54:48 +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 | 99 +++++-- .../mes/record/domain/RecordStaffSalary.java | 254 +++++++++++------- .../mapper/RecordStaffSalaryMapper.java | 61 +++++ .../service/IRecordStaffSalaryService.java | 57 +++- .../impl/RecordStaffSalaryServiceImpl.java | 90 +++++-- .../mes/record/RecordStaffSalaryMapper.xml | 133 +++++++++ 6 files changed, 546 insertions(+), 148 deletions(-) create mode 100644 os-mes/src/main/java/com/os/mes/record/mapper/RecordStaffSalaryMapper.java create mode 100644 os-mes/src/main/resources/mapper/mes/record/RecordStaffSalaryMapper.xml 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 index 2477208..84b698b 100644 --- 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 @@ -1,45 +1,100 @@ package com.os.mes.record.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.core.page.TableDataInfo; -import com.os.mes.base.domain.BaseCustomData; -import com.os.mes.record.domain.RecordStaffAttendance; +import com.os.common.enums.BusinessType; 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; - +import com.os.common.utils.poi.ExcelUtil; +import com.os.common.core.page.TableDataInfo; /** * 员工工资记录Controller * * @author Yinq - * @date 2024-05-24 + * @date 2024-07-02 */ @RestController -@RequestMapping("/mes/record/staffSalary") +@RequestMapping("/mes/record/recordStaffSalary") public class RecordStaffSalaryController extends BaseController { - @Autowired - private IRecordStaffSalaryService staffSalaryService; - + private IRecordStaffSalaryService recordStaffSalaryService; /** - * 生成班组员工工资 - * @param recordStaffSalary - * @return + * 查询员工工资记录列表 */ - @GetMapping("/selectTeamEmployeesWages") - public AjaxResult selectTeamEmployeesWages(RecordStaffSalary recordStaffSalary) { - List list = staffSalaryService.selectTeamEmployeesWages(recordStaffSalary); - return success(list); + @PreAuthorize("@ss.hasPermi('mes/record:recordStaffSalary:list')") + @GetMapping("/list") + public TableDataInfo list(RecordStaffSalary recordStaffSalary) { + startPage(); + List list = recordStaffSalaryService.selectRecordStaffSalaryList(recordStaffSalary); + return getDataTable(list); } + /** + * 导出员工工资记录列表 + */ + @PreAuthorize("@ss.hasPermi('mes/record:recordStaffSalary:export')") + @Log(title = "员工工资记录", businessType = BusinessType.EXPORT) + @PostMapping("/export") + public void export(HttpServletResponse response, RecordStaffSalary recordStaffSalary) { + List list = recordStaffSalaryService.selectRecordStaffSalaryList(recordStaffSalary); + ExcelUtil util = new ExcelUtil(RecordStaffSalary.class); + util.exportExcel(response, list, "员工工资记录数据"); + } + /** + * 获取员工工资记录详细信息 + */ + @PreAuthorize("@ss.hasPermi('mes/record:recordStaffSalary:query')") + @GetMapping(value = "/{objId}") + public AjaxResult getInfo(@PathVariable("objId") Long objId) { + return success(recordStaffSalaryService.selectRecordStaffSalaryByObjId(objId)); + } + /** + * 新增员工工资记录 + */ + @PreAuthorize("@ss.hasPermi('mes/record:recordStaffSalary:add')") + @Log(title = "员工工资记录", businessType = BusinessType.INSERT) + @PostMapping + public AjaxResult add(@RequestBody RecordStaffSalary recordStaffSalary) { + recordStaffSalary.setCreateBy(getUsername()); + return toAjax(recordStaffSalaryService.insertRecordStaffSalary(recordStaffSalary)); + } + + /** + * 修改员工工资记录 + */ + @PreAuthorize("@ss.hasPermi('mes/record:recordStaffSalary:edit')") + @Log(title = "员工工资记录", businessType = BusinessType.UPDATE) + @PutMapping + public AjaxResult edit(@RequestBody RecordStaffSalary recordStaffSalary) { + recordStaffSalary.setUpdateBy(getUsername()); + return toAjax(recordStaffSalaryService.updateRecordStaffSalary(recordStaffSalary)); + } + + /** + * 删除员工工资记录 + */ + @PreAuthorize("@ss.hasPermi('mes/record:recordStaffSalary:remove')") + @Log(title = "员工工资记录", businessType = BusinessType.DELETE) + @DeleteMapping("/{objIds}") + public AjaxResult remove(@PathVariable Long[] objIds) { + return toAjax(recordStaffSalaryService.deleteRecordStaffSalaryByObjIds(objIds)); + } } 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 index 7d91c08..c9df660 100644 --- 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 @@ -1,143 +1,209 @@ package com.os.mes.record.domain; +import java.util.Date; +import com.fasterxml.jackson.annotation.JsonFormat; +import org.apache.commons.lang3.builder.ToStringBuilder; +import org.apache.commons.lang3.builder.ToStringStyle; import com.os.common.annotation.Excel; import com.os.common.core.domain.BaseEntity; -import java.math.BigDecimal; -import java.util.Date; - /** - * 员工工资记录对象 record_staff_attendance - * + * 员工工资记录对象 record_staff_salary + * * @author Yinq - * @date 2024-05-24 + * @date 2024-07-02 */ -public class RecordStaffSalary extends BaseEntity { +public class RecordStaffSalary extends BaseEntity +{ private static final long serialVersionUID = 1L; - /** - * 班组编号 - */ + /** 主键标识 */ + private Long objId; + + /** 身份证 */ + @Excel(name = "身份证") + private String idCard; + + /** 班组编号 */ @Excel(name = "班组编号") - private String teamCode; + private String groupId; - /** - * 班组名称 - */ - @Excel(name = "班组名称") - private String teamName; + /** 事件日期 */ + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @Excel(name = "事件日期", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss") + private Date eventDate; - /** - * 员工ID - */ - @Excel(name = "员工ID") - private String staffId; + /** 薪资类别 */ + @Excel(name = "薪资类别") + private String salaryCategory; - /** - * 员工名称 - */ - @Excel(name = "员工名称") - private String staffName; + /** 收入大类 */ + @Excel(name = "收入大类") + private String revenueClass; - /** - * 工资系数 - */ + /** 收入金额 */ + @Excel(name = "收入金额") + private Long revenueAmount; + + /** 收入理由 */ + @Excel(name = "收入理由") + private String revenueReason; + + /** 扣罚大类 */ + @Excel(name = "扣罚大类") + private String fineClass; + + /** 扣罚金额 */ + @Excel(name = "扣罚金额") + private Long fineAmount; + + /** 扣罚理由 */ + @Excel(name = "扣罚理由") + private String fineReason; + + /** 任务编号 */ + @Excel(name = "任务编号") + private String taskCode; + + /** 工资系数 */ @Excel(name = "工资系数") - private BigDecimal wageCoefficient; + private Long salaryCoefficient; - /** - * 工资 - */ - @Excel(name = "工资") - private BigDecimal wage; - - /** - * 开始日期 - */ - @Excel(name = "开始日期") - private Date beginDate; - - /** - * 结束日期 - */ - @Excel(name = "结束日期") - private Date endDate; - - public String getTeamCode() { - return teamCode; + public void setObjId(Long objId) + { + this.objId = objId; } - public void setTeamCode(String teamCode) { - this.teamCode = teamCode; + public Long getObjId() + { + return objId; + } + public void setIdCard(String idCard) + { + this.idCard = idCard; } - public String getTeamName() { - return teamName; + public String getIdCard() + { + return idCard; + } + public void setGroupId(String groupId) + { + this.groupId = groupId; } - public void setTeamName(String teamName) { - this.teamName = teamName; + public String getGroupId() + { + return groupId; + } + public void setEventDate(Date eventDate) + { + this.eventDate = eventDate; } - public String getStaffId() { - return staffId; + public Date getEventDate() + { + return eventDate; + } + public void setSalaryCategory(String salaryCategory) + { + this.salaryCategory = salaryCategory; } - public void setStaffId(String staffId) { - this.staffId = staffId; + public String getSalaryCategory() + { + return salaryCategory; + } + public void setRevenueClass(String revenueClass) + { + this.revenueClass = revenueClass; } - public String getStaffName() { - return staffName; + public String getRevenueClass() + { + return revenueClass; + } + public void setRevenueAmount(Long revenueAmount) + { + this.revenueAmount = revenueAmount; } - public void setStaffName(String staffName) { - this.staffName = staffName; + public Long getRevenueAmount() + { + return revenueAmount; + } + public void setRevenueReason(String revenueReason) + { + this.revenueReason = revenueReason; } - public BigDecimal getWageCoefficient() { - return wageCoefficient; + public String getRevenueReason() + { + return revenueReason; + } + public void setFineClass(String fineClass) + { + this.fineClass = fineClass; } - public void setWageCoefficient(BigDecimal wageCoefficient) { - this.wageCoefficient = wageCoefficient; + public String getFineClass() + { + return fineClass; + } + public void setFineAmount(Long fineAmount) + { + this.fineAmount = fineAmount; } - public BigDecimal getWage() { - return wage; + public Long getFineAmount() + { + return fineAmount; + } + public void setFineReason(String fineReason) + { + this.fineReason = fineReason; } - public void setWage(BigDecimal wage) { - this.wage = wage; + public String getFineReason() + { + return fineReason; + } + public void setTaskCode(String taskCode) + { + this.taskCode = taskCode; } - public Date getBeginDate() { - return beginDate; + public String getTaskCode() + { + return taskCode; + } + public void setSalaryCoefficient(Long salaryCoefficient) + { + this.salaryCoefficient = salaryCoefficient; } - public void setBeginDate(Date beginDate) { - this.beginDate = beginDate; - } - - public Date getEndDate() { - return endDate; - } - - public void setEndDate(Date endDate) { - this.endDate = endDate; + public Long getSalaryCoefficient() + { + return salaryCoefficient; } @Override public String toString() { - return "RecordStaffSalary{" + - "teamCode='" + teamCode + '\'' + - ", teamName='" + teamName + '\'' + - ", staffId='" + staffId + '\'' + - ", staffName='" + staffName + '\'' + - ", wageCoefficient=" + wageCoefficient + - ", wage=" + wage + - ", beginDate=" + beginDate + - ", endDate=" + endDate + - '}'; + return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) + .append("objId", getObjId()) + .append("idCard", getIdCard()) + .append("groupId", getGroupId()) + .append("eventDate", getEventDate()) + .append("salaryCategory", getSalaryCategory()) + .append("revenueClass", getRevenueClass()) + .append("revenueAmount", getRevenueAmount()) + .append("revenueReason", getRevenueReason()) + .append("fineClass", getFineClass()) + .append("fineAmount", getFineAmount()) + .append("fineReason", getFineReason()) + .append("createTime", getCreateTime()) + .append("taskCode", getTaskCode()) + .append("salaryCoefficient", getSalaryCoefficient()) + .toString(); } } diff --git a/os-mes/src/main/java/com/os/mes/record/mapper/RecordStaffSalaryMapper.java b/os-mes/src/main/java/com/os/mes/record/mapper/RecordStaffSalaryMapper.java new file mode 100644 index 0000000..2d5cc0e --- /dev/null +++ b/os-mes/src/main/java/com/os/mes/record/mapper/RecordStaffSalaryMapper.java @@ -0,0 +1,61 @@ +package com.os.mes.record.mapper; + +import java.util.List; + +import com.os.mes.record.domain.RecordStaffSalary; + +/** + * 员工工资记录Mapper接口 + * + * @author Yinq + * @date 2024-07-02 + */ +public interface RecordStaffSalaryMapper { + /** + * 查询员工工资记录 + * + * @param objId 员工工资记录主键 + * @return 员工工资记录 + */ + public RecordStaffSalary selectRecordStaffSalaryByObjId(Long objId); + + /** + * 查询员工工资记录列表 + * + * @param recordStaffSalary 员工工资记录 + * @return 员工工资记录集合 + */ + public List selectRecordStaffSalaryList(RecordStaffSalary recordStaffSalary); + + /** + * 新增员工工资记录 + * + * @param recordStaffSalary 员工工资记录 + * @return 结果 + */ + public int insertRecordStaffSalary(RecordStaffSalary recordStaffSalary); + + /** + * 修改员工工资记录 + * + * @param recordStaffSalary 员工工资记录 + * @return 结果 + */ + public int updateRecordStaffSalary(RecordStaffSalary recordStaffSalary); + + /** + * 删除员工工资记录 + * + * @param objId 员工工资记录主键 + * @return 结果 + */ + public int deleteRecordStaffSalaryByObjId(Long objId); + + /** + * 批量删除员工工资记录 + * + * @param objIds 需要删除的数据主键集合 + * @return 结果 + */ + public int deleteRecordStaffSalaryByObjIds(Long[] objIds); +} 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 index 5ab9fba..34f853d 100644 --- 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 @@ -1,24 +1,61 @@ package com.os.mes.record.service; - -import com.os.mes.record.domain.RecordStaffAttendance; -import com.os.mes.record.domain.RecordStaffSalary; - import java.util.List; +import com.os.mes.record.domain.RecordStaffSalary; + /** * 员工工资记录Service接口 * * @author Yinq - * @date 2024-05-24 + * @date 2024-07-02 */ public interface IRecordStaffSalaryService { - + /** + * 查询员工工资记录 + * + * @param objId 员工工资记录主键 + * @return 员工工资记录 + */ + public RecordStaffSalary selectRecordStaffSalaryByObjId(Long objId); /** - * 班组员工工资 - * @param recordStaffSalary - * @return + * 查询员工工资记录列表 + * + * @param recordStaffSalary 员工工资记录 + * @return 员工工资记录集合 */ - List selectTeamEmployeesWages(RecordStaffSalary recordStaffSalary); + public List selectRecordStaffSalaryList(RecordStaffSalary recordStaffSalary); + + /** + * 新增员工工资记录 + * + * @param recordStaffSalary 员工工资记录 + * @return 结果 + */ + public int insertRecordStaffSalary(RecordStaffSalary recordStaffSalary); + + /** + * 修改员工工资记录 + * + * @param recordStaffSalary 员工工资记录 + * @return 结果 + */ + public int updateRecordStaffSalary(RecordStaffSalary recordStaffSalary); + + /** + * 批量删除员工工资记录 + * + * @param objIds 需要删除的员工工资记录主键集合 + * @return 结果 + */ + public int deleteRecordStaffSalaryByObjIds(Long[] objIds); + + /** + * 删除员工工资记录信息 + * + * @param objId 员工工资记录主键 + * @return 结果 + */ + public int deleteRecordStaffSalaryByObjId(Long objId); } 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 index c36bf38..b602280 100644 --- 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 @@ -1,43 +1,89 @@ 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; +import com.os.common.utils.DateUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import com.os.mes.record.mapper.RecordStaffSalaryMapper; +import com.os.mes.record.domain.RecordStaffSalary; +import com.os.mes.record.service.IRecordStaffSalaryService; /** * 员工工资记录Service业务层处理 * * @author Yinq - * @date 2024-05-24 + * @date 2024-07-02 */ @Service public class RecordStaffSalaryServiceImpl implements IRecordStaffSalaryService { @Autowired - private RecordStaffAttendanceMapper recordStaffAttendanceMapper; - - @Autowired - private ProdOrderDetailMapper prodOrderDetailMapper; + private RecordStaffSalaryMapper recordStaffSalaryMapper; /** - * 班组员工工资 - * @param recordStaffSalary - * @return + * 查询员工工资记录 + * + * @param objId 员工工资记录主键 + * @return 员工工资记录 */ @Override - public List selectTeamEmployeesWages(RecordStaffSalary recordStaffSalary) { - - ProdOrderDetail orderDetail = new ProdOrderDetail(); - List prodOrderDetails = prodOrderDetailMapper.selectProdOrderDetailList(orderDetail); - - return null; + public RecordStaffSalary selectRecordStaffSalaryByObjId(Long objId) { + return recordStaffSalaryMapper.selectRecordStaffSalaryByObjId(objId); } + /** + * 查询员工工资记录列表 + * + * @param recordStaffSalary 员工工资记录 + * @return 员工工资记录 + */ + @Override + public List selectRecordStaffSalaryList(RecordStaffSalary recordStaffSalary) { + return recordStaffSalaryMapper.selectRecordStaffSalaryList(recordStaffSalary); + } + /** + * 新增员工工资记录 + * + * @param recordStaffSalary 员工工资记录 + * @return 结果 + */ + @Override + public int insertRecordStaffSalary(RecordStaffSalary recordStaffSalary) { + recordStaffSalary.setCreateTime(DateUtils.getNowDate()); + return recordStaffSalaryMapper.insertRecordStaffSalary(recordStaffSalary); + } + + /** + * 修改员工工资记录 + * + * @param recordStaffSalary 员工工资记录 + * @return 结果 + */ + @Override + public int updateRecordStaffSalary(RecordStaffSalary recordStaffSalary) { + return recordStaffSalaryMapper.updateRecordStaffSalary(recordStaffSalary); + } + + /** + * 批量删除员工工资记录 + * + * @param objIds 需要删除的员工工资记录主键 + * @return 结果 + */ + @Override + public int deleteRecordStaffSalaryByObjIds(Long[] objIds) { + return recordStaffSalaryMapper.deleteRecordStaffSalaryByObjIds(objIds); + } + + /** + * 删除员工工资记录信息 + * + * @param objId 员工工资记录主键 + * @return 结果 + */ + @Override + public int deleteRecordStaffSalaryByObjId(Long objId) { + return recordStaffSalaryMapper.deleteRecordStaffSalaryByObjId(objId); + } } diff --git a/os-mes/src/main/resources/mapper/mes/record/RecordStaffSalaryMapper.xml b/os-mes/src/main/resources/mapper/mes/record/RecordStaffSalaryMapper.xml new file mode 100644 index 0000000..779010c --- /dev/null +++ b/os-mes/src/main/resources/mapper/mes/record/RecordStaffSalaryMapper.xml @@ -0,0 +1,133 @@ + + + + + + + + + + + + + + + + + + + + + + + select obj_id, + id_card, + group_id, + event_date, + salary_category, + revenue_class, + revenue_amount, + revenue_reason, + fine_class, + fine_amount, + fine_reason, + create_time, + task_code, + salary_coefficient + from record_staff_salary + + + + + + + + insert into record_staff_salary + + id_card, + group_id, + event_date, + salary_category, + revenue_class, + revenue_amount, + revenue_reason, + fine_class, + fine_amount, + fine_reason, + create_time, + task_code, + salary_coefficient, + + + #{idCard}, + #{groupId}, + #{eventDate}, + #{salaryCategory}, + #{revenueClass}, + #{revenueAmount}, + #{revenueReason}, + #{fineClass}, + #{fineAmount}, + #{fineReason}, + #{createTime}, + #{taskCode}, + #{salaryCoefficient}, + + + + + update record_staff_salary + + id_card = #{idCard}, + group_id = #{groupId}, + event_date = #{eventDate}, + salary_category = #{salaryCategory}, + revenue_class = #{revenueClass}, + revenue_amount = #{revenueAmount}, + revenue_reason = #{revenueReason}, + fine_class = #{fineClass}, + fine_amount = #{fineAmount}, + fine_reason = #{fineReason}, + create_time = #{createTime}, + task_code = #{taskCode}, + salary_coefficient = #{salaryCoefficient}, + + where obj_id = #{objId} + + + + delete + from record_staff_salary + where obj_id = #{objId} + + + + delete from record_staff_salary where obj_id in + + #{objId} + + + \ No newline at end of file