月度绩效自动生成

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

@@ -3,6 +3,7 @@ package com.ruoyi.oa.domain;
 import java.math.BigDecimal;
 import java.util.Date;
 import com.fasterxml.jackson.annotation.JsonFormat;
+import com.ruoyi.common.core.domain.entity.SysDept;
 import com.ruoyi.common.core.domain.entity.SysUser;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
@@ -36,6 +37,7 @@ public class CmcPerformanceStaff extends BaseEntity
     @Excel(name = "姓名")
     private String nickName;
     private Long userId;
+    private String deptName;
 
     /** 作业类别 */
     @Excel(name = "作业类别")
@@ -84,6 +86,8 @@ public class CmcPerformanceStaff extends BaseEntity
 
     private SysUser user;
 
+    private SysDept dept;
+
     private CmcProject project;
 
     public void setPerformanceStaffId(Integer performanceStaffId)
@@ -161,6 +165,16 @@ public class CmcPerformanceStaff extends BaseEntity
     {
         return user;
     }
+    public void setDept(SysDept dept)
+    {
+        this.dept = dept;
+        this.deptName = dept == null ? "" : dept.getDeptName();
+    }
+
+    public SysDept getDept()
+    {
+        return dept;
+    }
     public void setWorkType(String workType) 
     {
         this.workType = workType;

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

@@ -24,6 +24,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="remark"    column="remark"    />
         <association property="project"    javaType="CmcProject"         resultMap="CmcProjectResult" />
         <association property="user"    javaType="SysUser"         resultMap="SysUserResult" />
+        <association property="dept"    javaType="SysDept"         resultMap="SysDeptResult" />
     </resultMap>
 
     <resultMap type="SysUser" id="SysUserResult">
@@ -37,11 +38,17 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <result property="projectName"    column="project_name"    />
     </resultMap>
 
+    <resultMap type="SysDept" id="SysDeptResult">
+    <result property="deptId"    column="dept_id"    />
+    <result property="deptName"    column="dept_name"    />
+    </resultMap>
+
     <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,
+        select ps.performance_staff_id, ps.performance_id, ps.project_id, p.project_number, p.project_name, ps.user_id, u.nick_name, d.dept_name, ps.work_type, ps.content, ps.scale_grade, ps.workload, ps.unit, ps.price,
                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
+        left join sys_dept as d on d.dept_id = u.dept_id
     </sql>
 
     <select id="selectCmcPerformanceStaffList" parameterType="CmcPerformanceStaff" resultMap="CmcPerformanceStaffResult">
@@ -62,7 +69,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </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.nick_name, t2.dept_name, t2.performance_month
+        select cast(avg(t1.produce_performance) * 1.6 as decimal(10,2)) as manage_performance, t2.produce_performance, t2.user_id, t2.nick_name, t2.dept_name, t2.performance_month
         from
         (select sum(ps.produce_performance) as produce_performance, u.nick_name, d.dept_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
@@ -79,7 +86,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         where p.post_name = '主任' and ps.performance_id = #{param1} and u.dept_id = #{param2}
         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.nick_name, t2.dept_name, t2.performance_month
+        select cast(avg(t1.produce_performance) * 1.2 as decimal(10,2)) as manage_performance, t2.produce_performance, t2.user_id, t2.nick_name, t2.dept_name, t2.performance_month
         from
         (select sum(ps.produce_performance) as produce_performance, u.nick_name, d.dept_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

oa-ui/src/views/flowable/form/performance/performanceForm.vue

@@ -126,7 +126,7 @@
         <div class="table-title">绩效统计表</div>
         <el-table :data="performanceTableData" style="width: 100%">
           <el-table-column prop="nickName" label="姓名" />
-          <el-table-column prop="deptName" label="部门" />
+          <el-table-column prop="dept.deptName" label="部门" />
           <el-table-column prop="producePerformance" label="生产绩效" />
           <el-table-column prop="managePerformance" label="管理绩效" />
           <el-table-column prop="performanceMonth" label="统计月份">