From 6c7ef6495a28803d117b61b0e6ac88fae9843a8c Mon Sep 17 00:00:00 2001 From: yinq Date: Tue, 11 Jun 2024 10:03:27 +0800 Subject: [PATCH] =?UTF-8?q?change=20-=20=E4=BA=BA=E5=91=98=E4=BF=A1?= =?UTF-8?q?=E6=81=AF=E5=8A=A0=E5=B2=97=E4=BD=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/system/SysPostController.java | 10 +++++++ .../com/os/mes/base/domain/BaseStaffInfo.java | 28 +++++++++++++++++++ .../com/os/mes/prod/domain/ProdPlanInfo.java | 13 +++++---- .../mapper/mes/base/BaseStaffInfoMapper.xml | 11 +++++++- .../record/RecordStaffAttendanceMapper.xml | 16 +++++------ 5 files changed, 63 insertions(+), 15 deletions(-) diff --git a/os-admin/src/main/java/com/os/web/controller/system/SysPostController.java b/os-admin/src/main/java/com/os/web/controller/system/SysPostController.java index 3b98237..14c464d 100644 --- a/os-admin/src/main/java/com/os/web/controller/system/SysPostController.java +++ b/os-admin/src/main/java/com/os/web/controller/system/SysPostController.java @@ -45,6 +45,16 @@ public class SysPostController extends BaseController List list = postService.selectPostList(post); return getDataTable(list); } + + /** + * 获取岗位下拉框列表 + */ + @GetMapping("/getPostList") + public AjaxResult getPostList(SysPost post) + { + List list = postService.selectPostList(post); + return success(list); + } @Log(title = "岗位管理", businessType = BusinessType.EXPORT) @PreAuthorize("@ss.hasPermi('system:post:export')") diff --git a/os-mes/src/main/java/com/os/mes/base/domain/BaseStaffInfo.java b/os-mes/src/main/java/com/os/mes/base/domain/BaseStaffInfo.java index 325ce89..c2105cb 100644 --- a/os-mes/src/main/java/com/os/mes/base/domain/BaseStaffInfo.java +++ b/os-mes/src/main/java/com/os/mes/base/domain/BaseStaffInfo.java @@ -86,6 +86,34 @@ public class BaseStaffInfo extends BaseEntity { @Excel(name = "工资系数") private BigDecimal wageCoefficient; + /** + * 岗位编码 + */ + @Excel(name = "岗位编码") + private String postCode; + + /** + * 岗位名称 + */ + @Excel(name = "岗位名称") + private String postName; + + public String getPostCode() { + return postCode; + } + + public void setPostCode(String postCode) { + this.postCode = postCode; + } + + public String getPostName() { + return postName; + } + + public void setPostName(String postName) { + this.postName = postName; + } + public BigDecimal getWageCoefficient() { return wageCoefficient; } diff --git a/os-mes/src/main/java/com/os/mes/prod/domain/ProdPlanInfo.java b/os-mes/src/main/java/com/os/mes/prod/domain/ProdPlanInfo.java index 1073dd7..65b2e57 100644 --- a/os-mes/src/main/java/com/os/mes/prod/domain/ProdPlanInfo.java +++ b/os-mes/src/main/java/com/os/mes/prod/domain/ProdPlanInfo.java @@ -1,5 +1,6 @@ package com.os.mes.prod.domain; +import java.math.BigDecimal; import java.util.Date; import com.fasterxml.jackson.annotation.JsonFormat; @@ -80,13 +81,13 @@ public class ProdPlanInfo extends BaseEntity { * 计划数量 */ @Excel(name = "计划数量") - private Long planAmount; + private BigDecimal planAmount; /** * 完成数量 */ @Excel(name = "完成数量") - private Long completeAmount; + private BigDecimal completeAmount; /** * 实际开始时间 @@ -228,19 +229,19 @@ public class ProdPlanInfo extends BaseEntity { return teamCode; } - public void setPlanAmount(Long planAmount) { + public void setPlanAmount(BigDecimal planAmount) { this.planAmount = planAmount; } - public Long getPlanAmount() { + public BigDecimal getPlanAmount() { return planAmount; } - public void setCompleteAmount(Long completeAmount) { + public void setCompleteAmount(BigDecimal completeAmount) { this.completeAmount = completeAmount; } - public Long getCompleteAmount() { + public BigDecimal getCompleteAmount() { return completeAmount; } diff --git a/os-mes/src/main/resources/mapper/mes/base/BaseStaffInfoMapper.xml b/os-mes/src/main/resources/mapper/mes/base/BaseStaffInfoMapper.xml index 247a46b..2a7fb97 100644 --- a/os-mes/src/main/resources/mapper/mes/base/BaseStaffInfoMapper.xml +++ b/os-mes/src/main/resources/mapper/mes/base/BaseStaffInfoMapper.xml @@ -22,6 +22,8 @@ + + @@ -41,9 +43,12 @@ bsi.create_time, bsi.update_by, bsi.update_time, - bsi.remark + bsi.remark, + bsi.post_code, + p.post_name from base_staff_info bsi left join base_team_members btm on btm.team_code = bsi.team_code + left join sys_post p on p.post_code = bsi.post_code @@ -84,6 +90,7 @@ update_time, remark, wage_coefficient, + post_code, #{staffId}, @@ -101,6 +108,7 @@ #{updateTime}, #{remark}, #{wageCoefficient}, + #{postCode}, @@ -122,6 +130,7 @@ update_time = #{updateTime}, remark = #{remark}, wage_coefficient = #{wageCoefficient}, + post_code = #{postCode}, where obj_id = #{objId} diff --git a/os-mes/src/main/resources/mapper/mes/record/RecordStaffAttendanceMapper.xml b/os-mes/src/main/resources/mapper/mes/record/RecordStaffAttendanceMapper.xml index a1f1469..04097aa 100644 --- a/os-mes/src/main/resources/mapper/mes/record/RecordStaffAttendanceMapper.xml +++ b/os-mes/src/main/resources/mapper/mes/record/RecordStaffAttendanceMapper.xml @@ -45,19 +45,19 @@ resultMap="RecordStaffAttendanceResult"> - and staff_id = #{staffId} - and attendance_type = #{attendanceType} - and team_code = #{teamCode} - and classes = #{classes} - and is_flag = #{isFlag} - and create_time = #{createTime} - and machine_code = #{machineCode} + and rsa.staff_id = #{staffId} + and rsa.attendance_type = #{attendanceType} + and rsa.team_code = #{teamCode} + and rsa.classes = #{classes} + and rsa.is_flag = #{isFlag} + and rsa.create_time = #{createTime} + and rsa.machine_code = #{machineCode}