修改统计表结构

attendance-performance-manager/src/main/java/com/mortals/xhx/module/dept/model/DeptPerformStatEntity.java

@@ -11,7 +11,7 @@ import lombok.Data;
 * 部门绩效分数统计实体对象
 *
 * @author zxfei
-* @date 2023-07-11
+* @date 2023-07-14
 */
 @Data
 public class DeptPerformStatEntity extends DeptPerformStatVo {
@@ -31,6 +31,16 @@ public class DeptPerformStatEntity extends DeptPerformStatVo {
     @Excel(name = "部门绩效总分数")
     private BigDecimal totalScore;
     /**
+    * 部门绩效加分总分数汇总
+    */
+    @Excel(name = "部门绩效加分总分数汇总")
+    private BigDecimal totalAddScore;
+    /**
+    * 部门绩效减分总分数汇总
+    */
+    @Excel(name = "部门绩效减分总分数汇总")
+    private BigDecimal totalSubScore;
+    /**
     * 考勤绩效指标增加分数
     */
     private BigDecimal attendScoreAdd;
@@ -41,19 +51,27 @@ public class DeptPerformStatEntity extends DeptPerformStatVo {
     /**
     * 评价绩效指标增加分数
     */
-    private BigDecimal assessScoreAdd;
+    private BigDecimal reviewScoreAdd;
     /**
     * 评价绩效指标扣减分数
     */
-    private BigDecimal assessScoreSub;
+    private BigDecimal reviewScoreSub;
+    /**
+    * 投诉绩效指标增加分数
+    */
+    private BigDecimal complainScoreAdd;
+    /**
+    * 投诉绩效指标扣减分数
+    */
+    private BigDecimal complainScoreSub;
     /**
     * 办件绩效指标增加分数
     */
-    private BigDecimal workScoreAdd;
+    private BigDecimal goworkScoreAdd;
     /**
     * 办件绩效指标扣减分数
     */
-    private BigDecimal workScoreSub;
+    private BigDecimal goworkScoreSub;
     /**
     * 效能绩效指标增加分数
     */
@@ -71,6 +89,11 @@ public class DeptPerformStatEntity extends DeptPerformStatVo {
     */
     private BigDecimal otherScoreSub;
     /**
+    * 部门绩效平均分数，根据部门所属人数平均
+    */
+    @Excel(name = "部门绩效平均分数，根据部门所属人数平均")
+    private BigDecimal averageScore;
+    /**
     * 备注
     */
     private String remark;
@@ -86,29 +109,6 @@ public class DeptPerformStatEntity extends DeptPerformStatVo {
     * 日
     */
     private Integer day;
-    /**
-    * 部门绩效加分总分数汇总
-    */
-    @Excel(name = "部门绩效加分总分数汇总")
-    private BigDecimal totalAddScore;
-    /**
-    * 部门绩效减分总分数汇总
-    */
-    @Excel(name = "部门绩效减分总分数汇总")
-    private BigDecimal totalSubScore;
-    /**
-    * 投诉绩效指标增加分数
-    */
-    private BigDecimal complainScoreAdd;
-    /**
-    * 投诉绩效指标扣减分数
-    */
-    private BigDecimal complainScoreSub;
-    /**
-    * 部门绩效平均分数，根据部门所属人数平均
-    */
-    @Excel(name = "部门绩效平均分数，根据部门所属人数平均")
-    private BigDecimal averageScore;
     @Override
     public int hashCode() {
          return this.getId().hashCode();
@@ -133,17 +133,25 @@ public class DeptPerformStatEntity extends DeptPerformStatVo {
 
             this.totalScore = new BigDecimal(0);
 
+            this.totalAddScore = new BigDecimal(0);
+
+            this.totalSubScore = new BigDecimal(0);
+
             this.attendScoreAdd = new BigDecimal(0);
 
             this.attendScoreSub = new BigDecimal(0);
 
-            this.assessScoreAdd = new BigDecimal(0);
+            this.reviewScoreAdd = new BigDecimal(0);
 
-            this.assessScoreSub = new BigDecimal(0);
+            this.reviewScoreSub = new BigDecimal(0);
 
-            this.workScoreAdd = new BigDecimal(0);
+            this.complainScoreAdd = new BigDecimal(0);
+
+            this.complainScoreSub = new BigDecimal(0);
+
+            this.goworkScoreAdd = new BigDecimal(0);
 
-            this.workScoreSub = new BigDecimal(0);
+            this.goworkScoreSub = new BigDecimal(0);
 
             this.effectScoreAdd = new BigDecimal(0);
 
@@ -153,6 +161,8 @@ public class DeptPerformStatEntity extends DeptPerformStatVo {
 
             this.otherScoreSub = new BigDecimal(0);
 
+            this.averageScore = new BigDecimal(0);
+
             this.remark = "";
 
             this.year = -1;
@@ -160,15 +170,5 @@ public class DeptPerformStatEntity extends DeptPerformStatVo {
             this.month = -1;
 
             this.day = -1;
-
-            this.totalAddScore = new BigDecimal(0);
-
-            this.totalSubScore = new BigDecimal(0);
-
-            this.complainScoreAdd = new BigDecimal(0);
-
-            this.complainScoreSub = new BigDecimal(0);
-
-            this.averageScore = new BigDecimal(0);
     }
 }
\ No newline at end of file

attendance-performance-manager/src/main/java/com/mortals/xhx/module/dept/model/vo/DeptPerformStatVo.java

@@ -11,7 +11,7 @@ import java.util.Date;
 * 部门绩效分数统计视图对象
 *
 * @author zxfei
-* @date 2023-07-11
+* @date 2023-07-14
 */
 @Data
 public class DeptPerformStatVo extends BaseEntityLong {

attendance-performance-manager/src/main/java/com/mortals/xhx/module/staff/model/StaffPerformStatEntity.java

 package com.mortals.xhx.module.staff.model;
-
 import java.math.BigDecimal;
-import java.util.Date;
 import java.util.List;
 import java.util.ArrayList;
-
-import cn.hutool.core.date.DateUtil;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.mortals.framework.annotation.Excel;
 import com.mortals.framework.model.BaseEntityLong;
 import com.mortals.xhx.module.staff.model.vo.StaffPerformStatVo;
 import lombok.Data;
-
 /**
- * 员工绩效统计实体对象
- *
- * @author zxfei
- * @date 2023-07-13
- */
+* 员工绩效统计实体对象
+*
+* @author zxfei
+* @date 2023-07-14
+*/
 @Data
 public class StaffPerformStatEntity extends StaffPerformStatVo {
     private static final long serialVersionUID = 1L;
 
     /**
-     * 部门id号
-     */
+    * 部门id号
+    */
     private Long staffId;
     /**
-     * 部门名称
-     */
+    * 部门名称
+    */
     private String staffName;
     /**
-     * 员工绩效总分数
-     */
+    * 员工绩效总分数
+    */
     @Excel(name = "员工绩效总分数")
     private BigDecimal totalScore;
     /**
-     * 员工绩效加分总分数汇总
-     */
+    * 员工绩效加分总分数汇总
+    */
     @Excel(name = "员工绩效加分总分数汇总")
     private BigDecimal totalAddScore;
     /**
-     * 员工绩效减分总分数汇总
-     */
+    * 员工绩效减分总分数汇总
+    */
     @Excel(name = "员工绩效减分总分数汇总")
     private BigDecimal totalSubScore;
     /**
-     * 考勤绩效指标增加分数
-     */
+    * 考勤绩效指标增加分数
+    */
     private BigDecimal attendScoreAdd;
     /**
-     * 考勤绩效指标扣减分数
-     */
+    * 考勤绩效指标扣减分数
+    */
     private BigDecimal attendScoreSub;
     /**
-     * 评价绩效指标增加分数
-     */
-    private BigDecimal assessScoreAdd;
+    * 评价绩效指标增加分数
+    */
+    private BigDecimal reviewScoreAdd;
     /**
-     * 评价绩效指标扣减分数
-     */
-    private BigDecimal assessScoreSub;
+    * 评价绩效指标扣减分数
+    */
+    private BigDecimal reviewScoreSub;
     /**
-     * 投诉绩效指标增加分数
-     */
+    * 投诉绩效指标增加分数
+    */
     private BigDecimal complainScoreAdd;
     /**
-     * 投诉绩效指标扣减分数
-     */
+    * 投诉绩效指标扣减分数
+    */
     private BigDecimal complainScoreSub;
     /**
-     * 办件绩效指标增加分数
-     */
-    private BigDecimal workScoreAdd;
+    * 办件绩效指标增加分数
+    */
+    private BigDecimal goworkScoreAdd;
     /**
-     * 办件绩效指标扣减分数
-     */
-    private BigDecimal workScoreSub;
+    * 办件绩效指标扣减分数
+    */
+    private BigDecimal goworkScoreSub;
     /**
-     * 效能绩效指标增加分数
-     */
+    * 效能绩效指标增加分数
+    */
     private BigDecimal effectScoreAdd;
     /**
-     * 效能绩效指标扣减分数
-     */
+    * 效能绩效指标扣减分数
+    */
     private BigDecimal effectScoreSub;
     /**
-     * 其它绩效指标增加分数
-     */
+    * 其它绩效指标增加分数
+    */
     private BigDecimal otherScoreAdd;
     /**
-     * 其它绩效指标扣减分数
-     */
+    * 其它绩效指标扣减分数
+    */
     private BigDecimal otherScoreSub;
     /**
-     * 备注
-     */
+    * 备注
+    */
     private String remark;
     /**
-     * 年
-     */
+    * 年
+    */
     private Integer year;
     /**
-     * 月
-     */
+    * 月
+    */
     private Integer month;
     /**
-     * 日
-     */
+    * 日
+    */
     private Integer day;
-
     @Override
     public int hashCode() {
-        return this.getId().hashCode();
+         return this.getId().hashCode();
     }
-
     @Override
     public boolean equals(Object obj) {
         if (obj == null) return false;
         if (obj instanceof StaffPerformStatEntity) {
             StaffPerformStatEntity tmp = (StaffPerformStatEntity) obj;
             if (this.getId() == tmp.getId()) {
-                return true;
+                 return true;
             }
         }
         return false;
     }
 
-    public void initAttrValue() {
+    public void initAttrValue(){
 
-        this.staffId = 0L;
+            this.staffId = 0L;
 
-        this.staffName = "";
+            this.staffName = "";
 
-        this.totalScore = new BigDecimal(0);
+            this.totalScore = new BigDecimal(0);
 
-        this.totalAddScore = new BigDecimal(0);
+            this.totalAddScore = new BigDecimal(0);
 
-        this.totalSubScore = new BigDecimal(0);
+            this.totalSubScore = new BigDecimal(0);
 
-        this.attendScoreAdd = new BigDecimal(0);
+            this.attendScoreAdd = new BigDecimal(0);
 
-        this.attendScoreSub = new BigDecimal(0);
+            this.attendScoreSub = new BigDecimal(0);
 
-        this.assessScoreAdd = new BigDecimal(0);
+            this.reviewScoreAdd = new BigDecimal(0);
 
-        this.assessScoreSub = new BigDecimal(0);
+            this.reviewScoreSub = new BigDecimal(0);
 
-        this.complainScoreAdd = new BigDecimal(0);
+            this.complainScoreAdd = new BigDecimal(0);
 
-        this.complainScoreSub = new BigDecimal(0);
+            this.complainScoreSub = new BigDecimal(0);
 
-        this.workScoreAdd = new BigDecimal(0);
+            this.goworkScoreAdd = new BigDecimal(0);
 
-        this.workScoreSub = new BigDecimal(0);
+            this.goworkScoreSub = new BigDecimal(0);
 
-        this.effectScoreAdd = new BigDecimal(0);
+            this.effectScoreAdd = new BigDecimal(0);
 
-        this.effectScoreSub = new BigDecimal(0);
+            this.effectScoreSub = new BigDecimal(0);
 
-        this.otherScoreAdd = new BigDecimal(0);
+            this.otherScoreAdd = new BigDecimal(0);
 
-        this.otherScoreSub = new BigDecimal(0);
+            this.otherScoreSub = new BigDecimal(0);
 
-        this.remark = "";
+            this.remark = "";
 
-        this.year = DateUtil.year(new Date());
+            this.year = -1;
 
-        this.month = DateUtil.month(new Date()) + 1;
+            this.month = -1;
 
-        this.day = DateUtil.dayOfMonth(new Date());
+            this.day = -1;
     }
 }
\ No newline at end of file

attendance-performance-manager/src/main/java/com/mortals/xhx/module/staff/model/StaffPerformSummaryEntity.java

@@ -11,7 +11,7 @@ import lombok.Data;
 * 员工绩效统计实体对象
 *
 * @author zxfei
-* @date 2023-07-05
+* @date 2023-07-14
 */
 @Data
 public class StaffPerformSummaryEntity extends StaffPerformSummaryVo {
@@ -44,11 +44,15 @@ public class StaffPerformSummaryEntity extends StaffPerformSummaryVo {
     /**
     * 评价绩效指标分数
     */
-    private BigDecimal assessScore;
+    private BigDecimal reviewScore;
+    /**
+    * 投诉绩效指标分数
+    */
+    private BigDecimal complainScore;
     /**
     * 办件绩效分数
     */
-    private BigDecimal workScore;
+    private BigDecimal goworkScore;
     /**
     * 效能绩效分数
     */
@@ -107,9 +111,11 @@ public class StaffPerformSummaryEntity extends StaffPerformSummaryVo {
 
             this.attendScore = new BigDecimal(0);
 
-            this.assessScore = new BigDecimal(0);
+            this.reviewScore = new BigDecimal(0);
+
+            this.complainScore = new BigDecimal(0);
 
-            this.workScore = new BigDecimal(0);
+            this.goworkScore = new BigDecimal(0);
 
             this.effectScore = new BigDecimal(0);
 
@@ -125,4 +131,4 @@ public class StaffPerformSummaryEntity extends StaffPerformSummaryVo {
 
             this.month = -1;
     }
-}
+}
\ No newline at end of file

attendance-performance-manager/src/main/java/com/mortals/xhx/module/staff/model/vo/StaffPerformStatVo.java

@@ -11,7 +11,7 @@ import java.util.Date;
 * 员工绩效统计视图对象
 *
 * @author zxfei
-* @date 2023-07-11
+* @date 2023-07-14
 */
 @Data
 public class StaffPerformStatVo extends BaseEntityLong {

attendance-performance-manager/src/main/java/com/mortals/xhx/module/staff/model/vo/StaffPerformSummaryVo.java

@@ -11,9 +11,9 @@ import java.util.Date;
 * 员工绩效统计视图对象
 *
 * @author zxfei
-* @date 2023-07-05
+* @date 2023-07-14
 */
 @Data
 public class StaffPerformSummaryVo extends BaseEntityLong {
 
-}
+}
\ No newline at end of file

db/add.sql

@@ -540,3 +540,104 @@ PRIMARY KEY  (`id`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='员工绩效统计';
 
 
+
+-- ----------------------------
+2023-7-14
+-- ----------------------------
+
+-- ----------------------------
+-- 部门绩效分数统计表
+-- ----------------------------
+DROP TABLE IF EXISTS `mortals_xhx_dept_perform_stat`;
+CREATE TABLE mortals_xhx_dept_perform_stat(
+    `id` bigint(20) NOT NULL  AUTO_INCREMENT   COMMENT '主键ID，主键，自增长',
+    `deptId` bigint(20)    DEFAULT '0'  COMMENT '部门id号',
+    `deptName` varchar(64)      COMMENT '部门名称',
+    `totalScore` decimal(10,2) NOT NULL     COMMENT '部门绩效总分数',
+    `totalAddScore` decimal(10,2) NOT NULL     COMMENT '部门绩效加分总分数汇总',
+    `totalSubScore` decimal(10,2) NOT NULL     COMMENT '部门绩效减分总分数汇总',
+    `attendScoreAdd` decimal(10,2)      COMMENT '考勤绩效指标增加分数',
+    `attendScoreSub` decimal(10,2)      COMMENT '考勤绩效指标扣减分数',
+    `reviewScoreAdd` decimal(10,2)      COMMENT '评价绩效指标增加分数',
+    `reviewScoreSub` decimal(10,2)      COMMENT '评价绩效指标扣减分数',
+    `complainScoreAdd` decimal(10,2)      COMMENT '投诉绩效指标增加分数',
+    `complainScoreSub` decimal(10,2)      COMMENT '投诉绩效指标扣减分数',
+    `goworkScoreAdd` decimal(10,2)      COMMENT '办件绩效指标增加分数',
+    `goworkScoreSub` decimal(10,2)      COMMENT '办件绩效指标扣减分数',
+    `effectScoreAdd` decimal(10,2)      COMMENT '效能绩效指标增加分数',
+    `effectScoreSub` decimal(10,2)      COMMENT '效能绩效指标扣减分数',
+    `otherScoreAdd` decimal(10,2)      COMMENT '其它绩效指标增加分数',
+    `otherScoreSub` decimal(10,2)      COMMENT '其它绩效指标扣减分数',
+    `averageScore` decimal(10,2) NOT NULL     COMMENT '部门绩效平均分数，根据部门所属人数平均',
+    `remark` varchar(255)      COMMENT '备注',
+    `year` int(9) NOT NULL     COMMENT '年',
+    `month` tinyint(2) NOT NULL     COMMENT '月',
+    `day` tinyint(2) NOT NULL     COMMENT '日',
+    `createTime` datetime      COMMENT '创建时间',
+    `createUserId` bigint(20)      COMMENT '创建人id',
+    `updateTime` datetime      COMMENT '更新时间',
+    `updateUserId` bigint(20)      COMMENT '更新人id',
+PRIMARY KEY  (`id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='部门绩效分数统计';
+-- ----------------------------
+-- 员工绩效统计表
+-- ----------------------------
+DROP TABLE IF EXISTS `mortals_xhx_staff_perform_stat`;
+CREATE TABLE mortals_xhx_staff_perform_stat(
+    `id` bigint(20) NOT NULL  AUTO_INCREMENT   COMMENT '主键ID，主键，自增长',
+    `staffId` bigint(20)    DEFAULT '0'  COMMENT '部门id号',
+    `staffName` varchar(64)      COMMENT '部门名称',
+    `totalScore` decimal(10,2) NOT NULL     COMMENT '员工绩效总分数',
+    `totalAddScore` decimal(10,2) NOT NULL     COMMENT '员工绩效加分总分数汇总',
+    `totalSubScore` decimal(10,2) NOT NULL     COMMENT '员工绩效减分总分数汇总',
+    `attendScoreAdd` decimal(10,2)      COMMENT '考勤绩效指标增加分数',
+    `attendScoreSub` decimal(10,2)      COMMENT '考勤绩效指标扣减分数',
+    `reviewScoreAdd` decimal(10,2)      COMMENT '评价绩效指标增加分数',
+    `reviewScoreSub` decimal(10,2)      COMMENT '评价绩效指标扣减分数',
+    `complainScoreAdd` decimal(10,2)      COMMENT '投诉绩效指标增加分数',
+    `complainScoreSub` decimal(10,2)      COMMENT '投诉绩效指标扣减分数',
+    `goworkScoreAdd` decimal(10,2)      COMMENT '办件绩效指标增加分数',
+    `goworkScoreSub` decimal(10,2)      COMMENT '办件绩效指标扣减分数',
+    `effectScoreAdd` decimal(10,2)      COMMENT '效能绩效指标增加分数',
+    `effectScoreSub` decimal(10,2)      COMMENT '效能绩效指标扣减分数',
+    `otherScoreAdd` decimal(10,2)      COMMENT '其它绩效指标增加分数',
+    `otherScoreSub` decimal(10,2)      COMMENT '其它绩效指标扣减分数',
+    `remark` varchar(255)      COMMENT '备注',
+    `year` int(9) NOT NULL     COMMENT '年',
+    `month` tinyint(2) NOT NULL     COMMENT '月',
+    `day` tinyint(2) NOT NULL     COMMENT '日',
+    `createTime` datetime      COMMENT '创建时间',
+    `createUserId` bigint(20)      COMMENT '创建人id',
+    `updateTime` datetime      COMMENT '更新时间',
+    `updateUserId` bigint(20)      COMMENT '更新人id',
+PRIMARY KEY  (`id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='员工绩效统计';
+-- ----------------------------
+-- 员工绩效统计表
+-- ----------------------------
+DROP TABLE IF EXISTS `mortals_xhx_staff_perform_summary`;
+CREATE TABLE mortals_xhx_staff_perform_summary(
+    `id` bigint(20) NOT NULL  AUTO_INCREMENT   COMMENT '主键ID，主键，自增长',
+    `staffId` bigint(20)    DEFAULT '0'  COMMENT '人员id',
+    `workNum` varchar(64)      COMMENT '工号',
+    `staffName` varchar(512)      COMMENT '人员名称',
+    `deptId` bigint(20)    DEFAULT '0'  COMMENT '部门id号',
+    `deptName` varchar(64)      COMMENT '部门名称',
+    `attendScore` decimal(10,2)      COMMENT '考勤绩效指标分数',
+    `reviewScore` decimal(10,2)      COMMENT '评价绩效指标分数',
+    `complainScore` decimal(10,2)      COMMENT '投诉绩效指标分数',
+    `goworkScore` decimal(10,2)      COMMENT '办件绩效分数',
+    `effectScore` decimal(10,2)      COMMENT '效能绩效分数',
+    `otherScore` decimal(10,2)      COMMENT '其它绩效分数',
+    `errorScore` decimal(10,2)      COMMENT '累计异常分数',
+    `totalScore` decimal(10,2)      COMMENT '当月得分数',
+    `remark` varchar(255)      COMMENT '备注',
+    `year` int(9) NOT NULL     COMMENT '年',
+    `month` tinyint(2) NOT NULL     COMMENT '月',
+    `createTime` datetime      COMMENT '创建时间',
+    `createUserId` bigint(20)      COMMENT '创建人id',
+    `updateTime` datetime      COMMENT '更新时间',
+    `updateUserId` bigint(20)      COMMENT '更新人id',
+PRIMARY KEY  (`id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='员工绩效统计';
+