员工绩效表增加绩效审批id

oa-back/ruoyi-admin/src/main/java/com/ruoyi/web/controller/oa/CmcPerformanceStaffController.java

@@ -80,7 +80,7 @@ public class CmcPerformanceStaffController extends BaseController
      * 上传员工绩效excel文件
      */
     @PostMapping("/uploadSheet")
-    public AjaxResult uploadPerformanceStaffSheet(MultipartFile file) throws Exception {
+    public AjaxResult uploadPerformanceStaffSheet(MultipartFile file, String performanceId) throws Exception {
         if (file.isEmpty()) {
             return AjaxResult.error("文件内容为空！");
         }
@@ -88,6 +88,7 @@ public class CmcPerformanceStaffController extends BaseController
             ExcelUtil<CmcPerformanceStaff> util = new ExcelUtil<CmcPerformanceStaff>(CmcPerformanceStaff.class);
             List<CmcPerformanceStaff> performanceStaffList = util.importExcel(file.getInputStream());
             for (CmcPerformanceStaff performanceStaff : performanceStaffList) {
+                performanceStaff.setPerformanceId(performanceId);
                 performanceStaff.setUserId(userService.selectUserByNickName(performanceStaff.getNickName()).getUserId());
                 CmcProject cmcProject = new CmcProject();
                 cmcProject.setProjectNumber(performanceStaff.getProjectNumber());
@@ -98,6 +99,7 @@ public class CmcPerformanceStaffController extends BaseController
                     performanceStaff.setProjectId("0");
                 CmcPerformanceStaff staff = new CmcPerformanceStaff();
                 staff.setUserId(performanceStaff.getUserId());
+                staff.setPerformanceId(performanceStaff.getPerformanceId());
                 staff.setProjectId(performanceStaff.getProjectId());
                 staff.setWorkType(performanceStaff.getWorkType());
                 staff.setContent(performanceStaff.getContent());

oa-back/ruoyi-system/src/main/java/com/ruoyi/oa/domain/CmcPerformanceStaff.java

@@ -22,6 +22,9 @@ public class CmcPerformanceStaff extends BaseEntity
     /** 员工绩效id */
     private Long performanceStaffId;
 
+    /** 绩效审批id */
+    private String performanceId;
+
     /** 项目id */
     private String projectId;
     @Excel(name = "项目编号")
@@ -88,6 +91,15 @@ public class CmcPerformanceStaff extends BaseEntity
     {
         return performanceStaffId;
     }
+    public void setPerformanceId(String performanceId)
+    {
+        this.performanceId = performanceId;
+    }
+
+    public String getPerformanceId()
+    {
+        return performanceId;
+    }
     public void setProjectId(String projectId) 
     {
         this.projectId = projectId;
@@ -240,6 +252,7 @@ public class CmcPerformanceStaff extends BaseEntity
     public String toString() {
         return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
             .append("performanceStaffId", getPerformanceStaffId())
+            .append("performanceId", getPerformanceId())
             .append("projectId", getProjectId())
             .append("userId", getUserId())
             .append("workType", getWorkType())

oa-back/ruoyi-system/src/main/resources/mapper/oa/CmcPerformanceStaffMapper.xml

@@ -6,6 +6,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     
     <resultMap type="CmcPerformanceStaff" id="CmcPerformanceStaffResult">
         <result property="performanceStaffId"    column="performance_staff_id"    />
+        <result property="performanceId"    column="performance_id"    />
         <result property="projectId"    column="project_id"    />
         <result property="projectNumber"    column="project_number"    />
         <result property="userId"    column="user_id"    />
@@ -36,7 +37,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </resultMap>
 
     <sql id="selectCmcPerformanceStaffVo">
-        select ps.performance_staff_id, ps.project_id, p.project_number, p.project_name, ps.user_id, u.nick_name, ps.work_type, ps.content, ps.scale_grade, ps.workload, ps.unit, ps.price,
+        select ps.performance_staff_id, ps.performance_id, ps.project_id, p.project_number, p.project_name, ps.user_id, u.nick_name, ps.work_type, ps.content, ps.scale_grade, ps.workload, ps.unit, ps.price,
                ps.coefficient, ps.performance, ps.performance_month, ps.remark from cmc_performance_staff as ps
         left join cmc_project as p on p.project_id = ps.project_id
         left join sys_user as u on u.user_id = ps.user_id
@@ -45,6 +46,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <select id="selectCmcPerformanceStaffList" parameterType="CmcPerformanceStaff" resultMap="CmcPerformanceStaffResult">
         <include refid="selectCmcPerformanceStaffVo"/>
         <where>  
+            <if test="performanceId != null  and performanceId != ''"> and ps.performance_id = #{performanceId}</if>
             <if test="projectId != null  and projectId != ''"> and ps.project_id = #{projectId}</if>
             <if test="userId != null "> and ps.user_id = #{userId}</if>
             <if test="workType != null  and workType != ''"> and ps.work_type = #{workType}</if>
@@ -66,6 +68,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <insert id="insertCmcPerformanceStaff" parameterType="CmcPerformanceStaff" useGeneratedKeys="true" keyProperty="performanceStaffId">
         insert into cmc_performance_staff
         <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="performanceId != null">performance_id,</if>
             <if test="projectId != null">project_id,</if>
             <if test="userId != null">user_id,</if>
             <if test="workType != null">work_type,</if>
@@ -80,6 +83,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="remark != null">remark,</if>
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="performanceId != null">#{performanceId},</if>
             <if test="projectId != null">#{projectId},</if>
             <if test="userId != null">#{userId},</if>
             <if test="workType != null">#{workType},</if>
@@ -98,6 +102,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <update id="updateCmcPerformanceStaff" parameterType="CmcPerformanceStaff">
         update cmc_performance_staff
         <trim prefix="SET" suffixOverrides=",">
+            <if test="performanceId != null">performance_id = #{performanceId},</if>
             <if test="projectId != null">project_id = #{projectId},</if>
             <if test="userId != null">user_id = #{userId},</if>
             <if test="workType != null">work_type = #{workType},</if>