上传员工绩效表

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

@@ -2,6 +2,11 @@ package com.ruoyi.web.controller.oa;
 
 import java.util.List;
 import javax.servlet.http.HttpServletResponse;
+
+import com.ruoyi.oa.domain.CmcPerformanceStaff;
+import com.ruoyi.oa.domain.CmcProject;
+import com.ruoyi.oa.service.ICmcProjectService;
+import com.ruoyi.system.service.ISysUserService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -15,10 +20,10 @@ import com.ruoyi.common.annotation.Log;
 import com.ruoyi.common.core.controller.BaseController;
 import com.ruoyi.common.core.domain.AjaxResult;
 import com.ruoyi.common.enums.BusinessType;
-import com.ruoyi.oa.domain.CmcPerformanceStaff;
 import com.ruoyi.oa.service.ICmcPerformanceStaffService;
 import com.ruoyi.common.utils.poi.ExcelUtil;
 import com.ruoyi.common.core.page.TableDataInfo;
+import org.springframework.web.multipart.MultipartFile;
 
 /**
  * cmc员工绩效Controller
@@ -33,6 +38,12 @@ public class CmcPerformanceStaffController extends BaseController
     @Autowired
     private ICmcPerformanceStaffService cmcPerformanceStaffService;
 
+    @Autowired
+    private ISysUserService userService;
+
+    @Autowired
+    private ICmcProjectService projectService;
+
     /**
      * 查询cmc员工绩效列表
      */
@@ -65,6 +76,52 @@ public class CmcPerformanceStaffController extends BaseController
         return success(cmcPerformanceStaffService.selectCmcPerformanceStaffByPerformanceStaffId(performanceStaffId));
     }
 
+    /**
+     * 上传员工绩效excel文件
+     */
+    @PostMapping("/uploadSheet")
+    public AjaxResult uploadPerformanceStaffSheet(MultipartFile file) throws Exception {
+        if (file.isEmpty()) {
+            return AjaxResult.error("文件内容为空！");
+        }
+        else {
+            ExcelUtil<CmcPerformanceStaff> util = new ExcelUtil<CmcPerformanceStaff>(CmcPerformanceStaff.class);
+            List<CmcPerformanceStaff> performanceStaffList = util.importExcel(file.getInputStream());
+            for (CmcPerformanceStaff performanceStaff : performanceStaffList) {
+                performanceStaff.setUserId(userService.selectUserByNickName(performanceStaff.getNickName()).getUserId());
+                CmcProject cmcProject = new CmcProject();
+                cmcProject.setProjectNumber(performanceStaff.getProjectNumber());
+                if (performanceStaff.getProjectNumber() != null && !performanceStaff.getProjectNumber().equals("0"))
+                    if (projectService.selectCmcProjectByProjectNumbers(cmcProject).size() > 0)
+                        performanceStaff.setProjectId(projectService.selectCmcProjectByProjectNumbers(cmcProject).get(0).getProjectId());
+                else
+                    performanceStaff.setProjectId("0");
+                CmcPerformanceStaff staff = new CmcPerformanceStaff();
+                staff.setUserId(performanceStaff.getUserId());
+                staff.setProjectId(performanceStaff.getProjectId());
+                staff.setWorkType(performanceStaff.getWorkType());
+                staff.setContent(performanceStaff.getContent());
+                staff.setPerformanceMonth(performanceStaff.getPerformanceMonth());
+                List<CmcPerformanceStaff> staffList = cmcPerformanceStaffService.selectCmcPerformanceStaffList(staff);
+                if (staffList.size() > 0) {
+                    staff.setPerformanceStaffId(performanceStaffList.get(0).getPerformanceStaffId());
+                    staff.setContent(performanceStaff.getContent());
+                    staff.setPrice(performanceStaff.getPrice());
+                    staff.setPerformance(performanceStaff.getPerformance());
+                    staff.setCoefficient(performanceStaff.getCoefficient());
+                    staff.setScaleGrade(performanceStaff.getScaleGrade());
+                    staff.setUnit(performanceStaff.getUnit());
+                    staff.setWorkload(performanceStaff.getWorkload());
+                    staff.setRemark(performanceStaff.getRemark());
+                    cmcPerformanceStaffService.updateCmcPerformanceStaff(staff);
+                }
+                else
+                    cmcPerformanceStaffService.insertCmcPerformanceStaff(performanceStaff);
+            }
+            return AjaxResult.success("上传成功");
+        }
+    }
+
     /**
      * 新增cmc员工绩效
      */

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

@@ -30,7 +30,7 @@ public class CmcPerformanceStaff extends BaseEntity
     private String projectName;
 
     /** 员工姓名 */
-    @Excel(name = "员工姓名")
+    @Excel(name = "姓名")
     private String nickName;
     private Long userId;
 
@@ -47,13 +47,17 @@ public class CmcPerformanceStaff extends BaseEntity
     private String scaleGrade;
 
     /** 工作量 */
-    @Excel(name = "工作量")
+    @Excel(name = "工作量/工天")
     private Double workload;
 
     /** 单位 */
     @Excel(name = "单位")
     private String unit;
 
+    /** 单价 */
+    @Excel(name = "单价")
+    private BigDecimal price;
+
     /** 系数 */
     @Excel(name = "系数")
     private Double coefficient;
@@ -64,9 +68,13 @@ public class CmcPerformanceStaff extends BaseEntity
 
     /** 月份 */
     @JsonFormat(pattern = "yyyy-MM-dd")
-    @Excel(name = "月份", width = 30, dateFormat = "yyyy-MM-dd")
+    @Excel(name = "统计月份", width = 30, dateFormat = "yyyy-MM-dd")
     private Date performanceMonth;
 
+    /** 备注 */
+    @Excel(name = "备注")
+    private String remark;
+
     private SysUser user;
 
     private CmcProject project;
@@ -89,6 +97,15 @@ public class CmcPerformanceStaff extends BaseEntity
     {
         return projectId;
     }
+    public void setProjectNumber(String projectNumber)
+    {
+        this.projectNumber = projectNumber;
+    }
+
+    public String getProjectNumber()
+    {
+        return projectNumber;
+    }
     public void setProject(CmcProject project)
     {
         this.project = project;
@@ -109,6 +126,15 @@ public class CmcPerformanceStaff extends BaseEntity
     {
         return userId;
     }
+    public void setNickName(String nickName)
+    {
+        this.nickName = nickName;
+    }
+
+    public String getNickName()
+    {
+        return nickName;
+    }
     public void setUser(SysUser user)
     {
         this.user = user;
@@ -173,24 +199,42 @@ public class CmcPerformanceStaff extends BaseEntity
     {
         return coefficient;
     }
-    public void setPerformance(BigDecimal performance) 
+    public void setPerformance(BigDecimal performance)
     {
         this.performance = performance;
     }
 
-    public BigDecimal getPerformance() 
+    public BigDecimal getPerformance()
     {
         return performance;
     }
-    public void setPerformacneMonth(Date performanceMonth) 
+    public void setPrice(BigDecimal price)
+    {
+        this.price = price;
+    }
+
+    public BigDecimal getPrice()
+    {
+        return price;
+    }
+    public void setPerformanceMonth(Date performanceMonth) 
     {
         this.performanceMonth = performanceMonth;
     }
 
-    public Date getPerformacneMonth() 
+    public Date getPerformanceMonth() 
     {
         return performanceMonth;
     }
+    public String getRemark()
+    {
+        return remark;
+    }
+
+    public void setRemark(String remark)
+    {
+        this.remark = remark;
+    }
 
     @Override
     public String toString() {
@@ -203,9 +247,10 @@ public class CmcPerformanceStaff extends BaseEntity
             .append("scaleGrade", getScaleGrade())
             .append("workload", getWorkload())
             .append("unit", getUnit())
+            .append("price", getPrice())
             .append("coefficient", getCoefficient())
             .append("performance", getPerformance())
-            .append("performanceMonth", getPerformacneMonth())
+            .append("performanceMonth", getPerformanceMonth())
             .append("remark", getRemark())
             .toString();
     }

oa-back/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysUserMapper.java

@@ -51,6 +51,14 @@ public interface SysUserMapper
      */
     public SysUser selectUserByUserName(String userName);
 
+    /**
+     * 通过姓名查询用户
+     *
+     * @param nickName 姓名
+     * @return 用户对象信息
+     */
+    public SysUser selectUserByNickName(String nickName);
+
     /**
      * 通过用户ID查询用户
      * 

oa-back/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysUserService.java

@@ -50,6 +50,14 @@ public interface ISysUserService
      */
     public SysUser selectUserByUserName(String userName);
 
+    /**
+     * 通过姓名查询用户
+     *
+     * @param nickName 姓名
+     * @return 用户对象信息
+     */
+    public SysUser selectUserByNickName(String nickName);
+
     /**
      * 通过用户ID查询用户
      * 

oa-back/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java

@@ -125,6 +125,18 @@ public class SysUserServiceImpl implements ISysUserService
         return userMapper.selectUserByUserName(userName);
     }
 
+    /**
+     * 通过姓名查询用户
+     *
+     * @param nickName 姓名
+     * @return 用户对象信息
+     */
+    @Override
+    public SysUser selectUserByNickName(String nickName)
+    {
+        return userMapper.selectUserByNickName(nickName);
+    }
+
     /**
      * 通过用户ID查询用户
      * 

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

@@ -7,12 +7,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <resultMap type="CmcPerformanceStaff" id="CmcPerformanceStaffResult">
         <result property="performanceStaffId"    column="performance_staff_id"    />
         <result property="projectId"    column="project_id"    />
+        <result property="projectNumber"    column="project_number"    />
         <result property="userId"    column="user_id"    />
+        <result property="nickName"    column="nick_name"    />
         <result property="workType"    column="work_type"    />
         <result property="content"    column="content"    />
         <result property="scaleGrade"    column="scale_grade"    />
         <result property="workload"    column="workload"    />
         <result property="unit"    column="unit"    />
+        <result property="price"    column="price"    />
         <result property="coefficient"    column="coefficient"    />
         <result property="performance"    column="performance"    />
         <result property="performanceMonth"    column="performance_month"    />
@@ -33,7 +36,8 @@ 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.coefficient, ps.performance, ps.performance_month, ps.remark from cmc_performance_staff as ps
+        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,
+               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
     </sql>
@@ -69,6 +73,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="scaleGrade != null">scale_grade,</if>
             <if test="workload != null">workload,</if>
             <if test="unit != null">unit,</if>
+            <if test="price != null">price,</if>
             <if test="coefficient != null">coefficient,</if>
             <if test="performance != null">performance,</if>
             <if test="performanceMonth != null">performance_month,</if>
@@ -82,6 +87,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="scaleGrade != null">#{scaleGrade},</if>
             <if test="workload != null">#{workload},</if>
             <if test="unit != null">#{unit},</if>
+            <if test="price != null">#{price},</if>
             <if test="coefficient != null">#{coefficient},</if>
             <if test="performance != null">#{performance},</if>
             <if test="performanceMonth != null">#{performanceMonth},</if>
@@ -99,6 +105,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="scaleGrade != null">scale_grade = #{scaleGrade},</if>
             <if test="workload != null">workload = #{workload},</if>
             <if test="unit != null">unit = #{unit},</if>
+            <if test="price != null">price = #{price},</if>
             <if test="coefficient != null">coefficient = #{coefficient},</if>
             <if test="performance != null">performance = #{performance},</if>
             <if test="performanceMonth != null">performance_month = #{performanceMonth},</if>

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

@@ -234,7 +234,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 	    <include refid="selectUserVo"/>
 		where u.user_name = #{userName} and u.del_flag = '0'
 	</select>
-	
+
+	<select id="selectUserByNickName" parameterType="String" resultMap="SysUserResult">
+	    <include refid="selectUserVo"/>
+		where u.nick_name = #{nickName} and u.del_flag = '0'
+	</select>
+
 	<select id="selectUserById" parameterType="Long" resultMap="SysUserResult">
 		<include refid="selectUserVo"/>
 		where u.user_id = #{userId}

oa-back/sql/sq.sql

@@ -8,9 +8,10 @@ CREATE TABLE `cmc_performance_staff`  (
   `scale_grade` varchar(20)DEFAULT NULL COMMENT '比例尺',
   `workload` double NULL COMMENT '工作量',
   `unit` varchar(10)DEFAULT NULL COMMENT '单位',
+  `price` decimal(10, 2)NULL COMMENT '单价',
   `coefficient` double NULL COMMENT '系数',
   `performance` decimal(10, 2)NULL COMMENT '绩效',
   `performance_month` date NULL COMMENT '月份',
   `remark` varchar(255)DEFAULT NULL COMMENT '备注',
   PRIMARY KEY (`performance_staff_id`) USING BTREE
-) ENGINE = InnoDB comment 'cmc员工绩效表';
+) ENGINE = InnoDB comment 'cmc员工绩效表'; 

oa-ui/src/api/oa/performance/performanceStaff.js

@@ -0,0 +1,44 @@
+import request from '@/utils/request'
+
+// 查询cmc员工绩效列表
+export function listPerformanceStaff(query) {
+  return request({
+    url: '/oa/performanceStaff/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询cmc员工绩效详细
+export function getPerformanceStaff(performanceStaffId) {
+  return request({
+    url: '/oa/performanceStaff/' + performanceStaffId,
+    method: 'get'
+  })
+}
+
+// 新增cmc员工绩效
+export function addPerformanceStaff(data) {
+  return request({
+    url: '/oa/performanceStaff',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改cmc员工绩效
+export function updatePerformanceStaff(data) {
+  return request({
+    url: '/oa/performanceStaff',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除cmc员工绩效
+export function delPerformanceStaff(performanceStaffId) {
+  return request({
+    url: '/oa/performanceStaff/' + performanceStaffId,
+    method: 'delete'
+  })
+}