计算月度绩效

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

@@ -55,6 +55,15 @@ public class CmcPerformanceStaffController extends BaseController
         return getDataTable(list);
     }
 
+    /**
+     * 获取cmc员工绩效详细信息
+     */
+    @GetMapping(value = "/monthPerformance")
+    public AjaxResult getMonthPerformanceList(String performanceId, String deptId)
+    {
+        return success(cmcPerformanceStaffService.selectMonthPerformanceList(performanceId, deptId));
+    }
+
     /**
      * 导出cmc员工绩效列表
      */
@@ -109,7 +118,7 @@ public class CmcPerformanceStaffController extends BaseController
                     staff.setPerformanceStaffId(performanceStaffList.get(0).getPerformanceStaffId());
                     staff.setContent(performanceStaff.getContent());
                     staff.setPrice(performanceStaff.getPrice());
-                    staff.setPerformance(performanceStaff.getPerformance());
+                    staff.setProducePerformance(performanceStaff.getProducePerformance());
                     staff.setCoefficient(performanceStaff.getCoefficient());
                     staff.setScaleGrade(performanceStaff.getScaleGrade());
                     staff.setUnit(performanceStaff.getUnit());

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

@@ -20,7 +20,7 @@ public class CmcPerformanceStaff extends BaseEntity
     private static final long serialVersionUID = 1L;
 
     /** 员工绩效id */
-    private Long performanceStaffId;
+    private Integer performanceStaffId;
 
     /** 绩效审批id */
     private String performanceId;
@@ -65,9 +65,13 @@ public class CmcPerformanceStaff extends BaseEntity
     @Excel(name = "系数")
     private Double coefficient;
 
-    /** 绩效 */
-    @Excel(name = "绩效")
-    private BigDecimal performance;
+    /** 生产绩效 */
+    @Excel(name = "生产绩效")
+    private BigDecimal producePerformance;
+
+    /** 管理绩效 */
+    @Excel(name = "管理绩效")
+    private BigDecimal managePerformance;
 
     /** 月份 */
     @JsonFormat(pattern = "yyyy-MM-dd")
@@ -82,12 +86,12 @@ public class CmcPerformanceStaff extends BaseEntity
 
     private CmcProject project;
 
-    public void setPerformanceStaffId(Long performanceStaffId) 
+    public void setPerformanceStaffId(Integer performanceStaffId)
     {
         this.performanceStaffId = performanceStaffId;
     }
 
-    public Long getPerformanceStaffId() 
+    public Integer getPerformanceStaffId()
     {
         return performanceStaffId;
     }
@@ -211,14 +215,23 @@ public class CmcPerformanceStaff extends BaseEntity
     {
         return coefficient;
     }
-    public void setPerformance(BigDecimal performance)
+    public void setProducePerformance(BigDecimal producePerformance)
+    {
+        this.producePerformance = producePerformance;
+    }
+
+    public BigDecimal getProducePerformance()
+    {
+        return producePerformance;
+    }
+    public void setManagePerformance(BigDecimal managePerformance)
     {
-        this.performance = performance;
+        this.managePerformance = managePerformance;
     }
 
-    public BigDecimal getPerformance()
+    public BigDecimal getManagePerformance()
     {
-        return performance;
+        return managePerformance;
     }
     public void setPrice(BigDecimal price)
     {
@@ -262,7 +275,8 @@ public class CmcPerformanceStaff extends BaseEntity
             .append("unit", getUnit())
             .append("price", getPrice())
             .append("coefficient", getCoefficient())
-            .append("performance", getPerformance())
+            .append("producePerformance", getProducePerformance())
+            .append("managePerformance", getManagePerformance())
             .append("performanceMonth", getPerformanceMonth())
             .append("remark", getRemark())
             .toString();

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

@@ -27,6 +27,15 @@ public interface CmcPerformanceStaffMapper
      */
     public List<CmcPerformanceStaff> selectCmcPerformanceStaffList(CmcPerformanceStaff cmcPerformanceStaff);
 
+    /**
+     * 查询cmc员工月度绩效列表
+     *
+     * @param performanceId 绩效审批id
+     * @param deptId 部门id
+     * @return cmc员工绩效集合
+     */
+    public List<CmcPerformanceStaff> selectMonthPerformanceList(String performanceId, String deptId);
+
     /**
      * 新增cmc员工绩效
      * 

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

@@ -27,6 +27,15 @@ public interface ICmcPerformanceStaffService
      */
     public List<CmcPerformanceStaff> selectCmcPerformanceStaffList(CmcPerformanceStaff cmcPerformanceStaff);
 
+    /**
+     * 查询cmc员工月度绩效列表
+     *
+     * @param performanceId 绩效审批id
+     * @param deptId 部门id
+     * @return cmc员工绩效集合
+     */
+    public List<CmcPerformanceStaff> selectMonthPerformanceList(String performanceId, String deptId);
+
     /**
      * 新增cmc员工绩效
      * 

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

@@ -43,6 +43,19 @@ public class CmcPerformanceStaffServiceImpl implements ICmcPerformanceStaffServi
         return cmcPerformanceStaffMapper.selectCmcPerformanceStaffList(cmcPerformanceStaff);
     }
 
+    /**
+     * 查询cmc员工月度绩效列表
+     *
+     * @param performanceId 绩效审批id
+     * @param deptId 部门id
+     * @return cmc员工绩效集合
+     */
+    @Override
+    public List<CmcPerformanceStaff> selectMonthPerformanceList(String performanceId, String deptId)
+    {
+        return cmcPerformanceStaffMapper.selectMonthPerformanceList(performanceId, deptId);
+    }
+
     /**
      * 新增cmc员工绩效
      * 

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

@@ -18,7 +18,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="unit"    column="unit"    />
         <result property="price"    column="price"    />
         <result property="coefficient"    column="coefficient"    />
-        <result property="performance"    column="performance"    />
+        <result property="producePerformance"    column="produce_performance"    />
+        <result property="managePerformance"    column="manage_performance"    />
         <result property="performanceMonth"    column="performance_month"    />
         <result property="remark"    column="remark"    />
         <association property="project"    javaType="CmcProject"         resultMap="CmcProjectResult" />
@@ -38,7 +39,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
     <sql id="selectCmcPerformanceStaffVo">
         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
+               ps.coefficient, ps.produce_performance, ps.manage_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>
@@ -55,11 +56,50 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="workload != null "> and ps.workload = #{workload}</if>
             <if test="unit != null  and unit != ''"> and ps.unit = #{unit}</if>
             <if test="coefficient != null "> and ps.coefficient = #{coefficient}</if>
-            <if test="performance != null "> and ps.performance = #{performance}</if>
+            <if test="producePerformance != null "> and ps.produce_performance = #{producePerformance}</if>
             <if test="performanceMonth != null "> and Month(ps.performance_month) = Month(#{performanceMonth})</if>
         </where>
     </select>
-    
+
+    <select id="selectMonthPerformanceList" parameterType="String" resultMap="CmcPerformanceStaffResult">
+        select avg(t1.produce_performance) * 1.6 as manage_performance, t2.produce_performance, t2.user_id, t2.performance_month
+        from
+        (select sum(ps.produce_performance) as produce_performance, u.nick_name, p.post_name, ps.user_id, ps.performance_month from cmc_performance_staff as ps
+        left join sys_user as u on u.user_id = ps.user_id
+        left join sys_user_post as up on u.user_id = up.user_id
+        left join sys_post as p on p.post_id = up.post_id
+        where p.post_name != '主任' and p.post_name != '副主任' and ps.performance_id = #{param1} and u.dept_id = #{param2}
+        group by user_id) as t1,
+        (select sum(ps.produce_performance) as produce_performance, u.nick_name, p.post_name, ps.user_id, ps.performance_month from cmc_performance_staff as ps
+        left join sys_user as u on u.user_id = ps.user_id
+        left join sys_user_post as up on u.user_id = up.user_id
+        left join sys_post as p on p.post_id = up.post_id
+        where p.post_name = '主任' and ps.performance_id = '1' and u.dept_id = 111
+        group by user_id) as t2
+        union all
+        select avg(t1.produce_performance) * 1.2 as manage_performance, t2.produce_performance, t2.user_id, t2.performance_month
+        from
+        (select sum(ps.produce_performance) as produce_performance, u.nick_name, p.post_name, ps.user_id, ps.performance_month from cmc_performance_staff as ps
+        left join sys_user as u on u.user_id = ps.user_id
+        left join sys_user_post as up on u.user_id = up.user_id
+        left join sys_post as p on p.post_id = up.post_id
+        where p.post_name != '主任' and p.post_name != '副主任' and ps.performance_id = #{param1} and u.dept_id = #{param2}
+        group by user_id) as t1,
+        (select sum(ps.produce_performance) as produce_performance, u.nick_name, p.post_name, ps.user_id, ps.performance_month from cmc_performance_staff as ps
+        left join sys_user as u on u.user_id = ps.user_id
+        left join sys_user_post as up on u.user_id = up.user_id
+        left join sys_post as p on p.post_id = up.post_id
+        where p.post_name = '副主任' and ps.performance_id = '1' and u.dept_id = 111
+        group by user_id) as t2
+        union all
+        select ps.produce_performance * 0 as manage_performance, sum(ps.produce_performance) as produce_performance, ps.user_id, ps.performance_month from cmc_performance_staff as ps
+        left join sys_user as u on u.user_id = ps.user_id
+        left join sys_user_post as up on u.user_id = up.user_id
+        left join sys_post as p on p.post_id = up.post_id
+        where p.post_name != '主任' and p.post_name != '副主任' and ps.performance_id = #{param1} and u.dept_id = #{param2}
+        group by user_id
+    </select>
+
     <select id="selectCmcPerformanceStaffByPerformanceStaffId" parameterType="Long" resultMap="CmcPerformanceStaffResult">
         <include refid="selectCmcPerformanceStaffVo"/>
         where performance_staff_id = #{performanceStaffId}
@@ -78,7 +118,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <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="producePerformance != null">produce_performance,</if>
             <if test="performanceMonth != null">performance_month,</if>
             <if test="remark != null">remark,</if>
          </trim>
@@ -93,7 +133,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <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="producePerformance != null">#{produce_performance},</if>
             <if test="performanceMonth != null">#{performanceMonth},</if>
             <if test="remark != null">#{remark},</if>
          </trim>
@@ -112,7 +152,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <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="producePerformance != null">produce_performance = #{producePerformance},</if>
             <if test="performanceMonth != null">performance_month = #{performanceMonth},</if>
             <if test="remark != null">remark = #{remark},</if>
         </trim>

oa-back/sql/sq.sql

@@ -1,6 +1,7 @@
 DROP TABLE IF EXISTS `cmc_performance_staff`;
 CREATE TABLE `cmc_performance_staff`  (
   `performance_staff_id` int NOT NULL AUTO_INCREMENT COMMENT '员工绩效id',
+  `performance_id` char(19)DEFAULT NULL COMMENT '绩效审批id',
   `project_id` char(19)DEFAULT NULL COMMENT '项目id',
   `user_id` bigint NULL COMMENT '员工id',
   `work_type` char(2)DEFAULT NULL COMMENT '作业类别',
@@ -10,7 +11,8 @@ CREATE TABLE `cmc_performance_staff`  (
   `unit` varchar(10)DEFAULT NULL COMMENT '单位',
   `price` decimal(10, 2)NULL COMMENT '单价',
   `coefficient` double NULL COMMENT '系数',
-  `performance` decimal(10, 2)NULL COMMENT '绩效',
+  `manage_performance` decimal(10, 2)NULL COMMENT '管理绩效',
+  `produce_performance` decimal(10, 2)NULL COMMENT '生产绩效',
   `performance_month` date NULL COMMENT '月份',
   `remark` varchar(255)DEFAULT NULL COMMENT '备注',
   PRIMARY KEY (`performance_staff_id`) USING BTREE

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

@@ -1,3 +1,9 @@
+/*
+ * @Author: wrh
+ * @Date: 2025-06-05 11:11:47
+ * @LastEditors: wrh
+ * @LastEditTime: 2025-06-05 17:14:54
+ */
 import request from '@/utils/request'
 
 // 查询cmc员工绩效列表
@@ -42,3 +48,12 @@ export function delPerformanceStaff(performanceStaffId) {
     method: 'delete'
   })
 }
+
+// 删除cmc员工绩效
+export function getMonthPerformanceList() {
+  return request({
+    url: '/oa/monthPerformance',
+    method: 'get',
+    params: query
+  })
+}