change - 人员信息加岗位

os-admin/src/main/java/com/os/web/controller/system/SysPostController.java

@@ -45,6 +45,16 @@ public class SysPostController extends BaseController
         List<SysPost> list = postService.selectPostList(post);
         return getDataTable(list);
     }
+
+    /**
+     * 获取岗位下拉框列表
+     */
+    @GetMapping("/getPostList")
+    public AjaxResult getPostList(SysPost post)
+    {
+        List<SysPost> list = postService.selectPostList(post);
+        return success(list);
+    }
     
     @Log(title = "岗位管理", businessType = BusinessType.EXPORT)
     @PreAuthorize("@ss.hasPermi('system:post:export')")

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;
     }

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;
     }
 

os-mes/src/main/resources/mapper/mes/base/BaseStaffInfoMapper.xml

@@ -22,6 +22,8 @@
         <result property="updateTime" column="update_time"/>
         <result property="remark" column="remark"/>
         <result property="wageCoefficient" column="wage_coefficient"/>
+        <result property="postCode" column="post_code"/>
+        <result property="postName" column="post_name"/>
     </resultMap>
 
     <sql id="selectBaseStaffInfoVo">
@@ -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
     </sql>
 
     <select id="selectBaseStaffInfoList" parameterType="BaseStaffInfo" resultMap="BaseStaffInfoResult">
@@ -58,6 +63,7 @@
             <if test="sex != null  and sex != ''">and bsi.sex = #{sex}</if>
             <if test="passWord != null  and passWord != ''">and bsi.pass_word = #{passWord}</if>
             <if test="delFlag != null  and delFlag != ''">and bsi.del_flag = #{delFlag}</if>
+            <if test="postCode != null  and postCode != ''">and bsi.post_code = #{postCode}</if>
         </where>
     </select>
 
@@ -84,6 +90,7 @@
             <if test="updateTime != null">update_time,</if>
             <if test="remark != null">remark,</if>
             <if test="wageCoefficient != null">wage_coefficient,</if>
+            <if test="postCode != null">post_code,</if>
         </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="staffId != null and staffId != ''">#{staffId},</if>
@@ -101,6 +108,7 @@
             <if test="updateTime != null">#{updateTime},</if>
             <if test="remark != null">#{remark},</if>
             <if test="wageCoefficient != null">#{wageCoefficient},</if>
+            <if test="postCode != null">#{postCode},</if>
         </trim>
     </insert>
 
@@ -122,6 +130,7 @@
             <if test="updateTime != null">update_time = #{updateTime},</if>
             <if test="remark != null">remark = #{remark},</if>
             <if test="wageCoefficient != null">wage_coefficient = #{wageCoefficient},</if>
+            <if test="postCode != null">post_code = #{postCode},</if>
         </trim>
         where obj_id = #{objId}
     </update>

os-mes/src/main/resources/mapper/mes/record/RecordStaffAttendanceMapper.xml

@@ -45,19 +45,19 @@
             resultMap="RecordStaffAttendanceResult">
         <include refid="selectRecordStaffAttendanceVo"/>
         <where>
-            <if test="staffId != null  and staffId != ''">and staff_id = #{staffId}</if>
+            <if test="staffId != null  and staffId != ''">and rsa.staff_id = #{staffId}</if>
-            <if test="attendanceType != null  and attendanceType != ''">and attendance_type = #{attendanceType}</if>
+            <if test="attendanceType != null  and attendanceType != ''">and rsa.attendance_type = #{attendanceType}</if>
-            <if test="teamCode != null  and teamCode != ''">and team_code = #{teamCode}</if>
+            <if test="teamCode != null  and teamCode != ''">and rsa.team_code = #{teamCode}</if>
-            <if test="classes != null  and classes != ''">and classes = #{classes}</if>
+            <if test="classes != null  and classes != ''">and rsa.classes = #{classes}</if>
-            <if test="isFlag != null  and isFlag != ''">and is_flag = #{isFlag}</if>
+            <if test="isFlag != null  and isFlag != ''">and rsa.is_flag = #{isFlag}</if>
-            <if test="createTime != null ">and create_time = #{createTime}</if>
+            <if test="createTime != null ">and rsa.create_time = #{createTime}</if>
-            <if test="machineCode != null  and machineCode != ''">and machine_code = #{machineCode}</if>
+            <if test="machineCode != null  and machineCode != ''">and rsa.machine_code = #{machineCode}</if>
         </where>
     </select>
 
     <select id="selectRecordStaffAttendanceByObjId" parameterType="Long" resultMap="RecordStaffAttendanceResult">
         <include refid="selectRecordStaffAttendanceVo"/>
-        where obj_id = #{objId}
+        where rsa.obj_id = #{objId}
     </select>
 
     <insert id="insertRecordStaffAttendance" parameterType="RecordStaffAttendance" useGeneratedKeys="true"