个人和部门统计添加字段

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-05-16
+* @date 2023-07-11
 */
 @Data
 public class DeptPerformStatEntity extends DeptPerformStatVo {
@@ -28,6 +28,7 @@ public class DeptPerformStatEntity extends DeptPerformStatVo {
     /**
     * 部门绩效总分数
     */
+    @Excel(name = "部门绩效总分数")
     private BigDecimal totalScore;
     /**
     * 考勤绩效指标增加分数
@@ -85,6 +86,29 @@ 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();
@@ -136,5 +160,15 @@ 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

 package com.mortals.xhx.module.dept.model.vo;
-import com.mortals.framework.annotation.Excel;
 import com.mortals.framework.model.BaseEntityLong;
 import com.mortals.xhx.module.dept.model.DeptPerformStatEntity;
-
-import java.math.BigDecimal;
 import java.util.ArrayList;
 import java.util.List;
 import lombok.Data;
+import com.mortals.framework.annotation.Excel;
+import java.math.BigDecimal;
+import java.util.Date;
 /**
 * 部门绩效分数统计视图对象
 *
 * @author zxfei
-* @date 2023-05-16
+* @date 2023-07-11
 */
 @Data
 public class DeptPerformStatVo extends BaseEntityLong {
 
-        /**
-        * 部门绩效总分数
-        */
-        @Excel(name = "部门绩效总分数")
-        private BigDecimal totalScore;
-
-
 }
\ No newline at end of file

attendance-performance-manager/src/main/java/com/mortals/xhx/module/feedback/model/vo/FeedbackVo.java

@@ -16,4 +16,6 @@ import java.util.Date;
 @Data
 public class FeedbackVo extends BaseEntityLong {
 
+    private List<Long> staffList;
+
 }
\ No newline at end of file

attendance-performance-manager/src/main/java/com/mortals/xhx/module/perform/model/PerformPerposeStaffStatEntity.java

@@ -11,7 +11,7 @@ import lombok.Data;
 * 员工目标统计实体对象
 *
 * @author zxfei
-* @date 2023-05-16
+* @date 2023-07-11
 */
 @Data
 public class PerformPerposeStaffStatEntity extends PerformPerposeStaffStatVo {

attendance-performance-manager/src/main/java/com/mortals/xhx/module/perform/model/PerformPerposeStaffStatQuery.java

@@ -7,7 +7,7 @@ import com.mortals.xhx.module.perform.model.PerformPerposeStaffStatEntity;
 * 员工目标统计查询对象
 *
 * @author zxfei
-* @date 2023-05-16
+* @date 2023-07-11
 */
 public class PerformPerposeStaffStatQuery extends PerformPerposeStaffStatEntity {
     /** 开始 主键ID，主键，自增长 */

attendance-performance-manager/src/main/java/com/mortals/xhx/module/perform/model/vo/PerformPerposeStaffStatVo.java

@@ -4,15 +4,16 @@ import com.mortals.xhx.module.perform.model.PerformPerposeStaffStatEntity;
 import java.util.ArrayList;
 import java.util.List;
 import lombok.Data;
+import com.mortals.framework.annotation.Excel;
+import java.math.BigDecimal;
+import java.util.Date;
 /**
 * 员工目标统计视图对象
 *
 * @author zxfei
-* @date 2023-05-16
+* @date 2023-07-11
 */
 @Data
 public class PerformPerposeStaffStatVo extends BaseEntityLong {
 
-
-
 }
\ No newline at end of file

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

@@ -11,7 +11,7 @@ import lombok.Data;
 * 员工绩效统计实体对象
 *
 * @author zxfei
-* @date 2023-05-17
+* @date 2023-07-11
 */
 @Data
 public class StaffPerformStatEntity extends StaffPerformStatVo {
@@ -26,10 +26,23 @@ public class StaffPerformStatEntity extends StaffPerformStatVo {
     */
     private String deptName;
     /**
-    * 部门绩效总分数
+    * 员工绩效总分数
     */
+    @Excel(name = "员工绩效总分数")
     private BigDecimal totalScore;
     /**
+    * 备注
+    */
+    private String remark;
+    /**
+    * 年
+    */
+    private Integer year;
+    /**
+    * 月
+    */
+    private Integer month;
+    /**
     * 考勤绩效指标增加分数
     */
     private BigDecimal attendScoreAdd;
@@ -70,21 +83,27 @@ public class StaffPerformStatEntity extends StaffPerformStatVo {
     */
     private BigDecimal otherScoreSub;
     /**
-    * 备注
+    * 日
     */
-    private String remark;
+    private Integer day;
     /**
-    * 年
+    * 员工绩效加分总分数汇总
     */
-    private Integer year;
+    @Excel(name = "员工绩效加分总分数汇总")
+    private BigDecimal totalAddScore;
     /**
-    * 月
+    * 员工绩效减分总分数汇总
     */
-    private Integer month;
+    @Excel(name = "员工绩效减分总分数汇总")
+    private BigDecimal totalSubScore;
     /**
-    * 日
+    * 投诉绩效指标增加分数
     */
-    private Integer day;
+    private BigDecimal complainScoreAdd;
+    /**
+    * 投诉绩效指标扣减分数
+    */
+    private BigDecimal complainScoreSub;
     @Override
     public int hashCode() {
          return this.getId().hashCode();
@@ -109,6 +128,12 @@ public class StaffPerformStatEntity extends StaffPerformStatVo {
 
             this.totalScore = new BigDecimal(0);
 
+            this.remark = "";
+
+            this.year = -1;
+
+            this.month = -1;
+
             this.attendScoreAdd = new BigDecimal(0);
 
             this.attendScoreSub = new BigDecimal(0);
@@ -129,12 +154,14 @@ public class StaffPerformStatEntity extends StaffPerformStatVo {
 
             this.otherScoreSub = new BigDecimal(0);
 
-            this.remark = "";
+            this.day = -1;
 
-            this.year = -1;
+            this.totalAddScore = new BigDecimal(0);
 
-            this.month = -1;
+            this.totalSubScore = new BigDecimal(0);
 
-            this.day = -1;
+            this.complainScoreAdd = new BigDecimal(0);
+
+            this.complainScoreSub = new BigDecimal(0);
     }
 }
\ No newline at end of file

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

 package com.mortals.xhx.module.staff.model.vo;
-import com.mortals.framework.annotation.Excel;
 import com.mortals.framework.model.BaseEntityLong;
 import com.mortals.xhx.module.staff.model.StaffPerformStatEntity;
-
-import java.math.BigDecimal;
 import java.util.ArrayList;
 import java.util.List;
 import lombok.Data;
+import com.mortals.framework.annotation.Excel;
+import java.math.BigDecimal;
+import java.util.Date;
 /**
 * 员工绩效统计视图对象
 *
 * @author zxfei
-* @date 2023-05-17
+* @date 2023-07-11
 */
 @Data
 public class StaffPerformStatVo extends BaseEntityLong {
 
-        /**
-        * 部门绩效总分数
-        */
-        @Excel(name = "部门绩效总分数")
-        private BigDecimal totalScore;
-
-
 }
\ No newline at end of file

db/add.sql

@@ -403,3 +403,20 @@ ALTER TABLE mortals_xhx_check_effect_record ADD COLUMN `subAddType` tinyint(1)
 ALTER TABLE mortals_xhx_perform_other_record ADD COLUMN `subAddType` tinyint(1)    DEFAULT '1'  COMMENT '增减类型(1.增加,2.扣除)' AFTER deductTime;
 
 ALTER TABLE mortals_xhx_check_other_record ADD COLUMN `subAddType` tinyint(1)    DEFAULT '1'  COMMENT '增减类型(1.增加,2.扣除)' AFTER deductTime;
+
+
+-- ----------------------------
+2023-7-10  2
+-- ----------------------------
+
+
+ALTER TABLE mortals_xhx_dept_perform_stat ADD COLUMN `totalAddScore` decimal(10,2) DEFAULT 0.0     COMMENT '部门绩效加分总分数汇总' AFTER otherScoreSub;
+ALTER TABLE mortals_xhx_dept_perform_stat ADD COLUMN `totalSubScore` decimal(10,2) DEFAULT 0.0     COMMENT '部门绩效减分总分数汇总' AFTER totalAddScore;
+ALTER TABLE mortals_xhx_dept_perform_stat ADD COLUMN `complainScoreAdd` decimal(10,2) DEFAULT 0.0     COMMENT '投诉绩效指标增加分数' AFTER totalSubScore;
+ALTER TABLE mortals_xhx_dept_perform_stat ADD COLUMN `complainScoreSub` decimal(10,2) DEFAULT 0.0     COMMENT '投诉绩效指标扣减分数' AFTER complainScoreAdd;
+ALTER TABLE mortals_xhx_dept_perform_stat ADD COLUMN `averageScore` decimal(10,2) DEFAULT 0.0    COMMENT '部门绩效平均分数，根据部门所属人数平均' AFTER complainScoreSub;
+
+ALTER TABLE mortals_xhx_staff_perform_stat ADD COLUMN `totalAddScore` decimal(10,2) DEFAULT 0.0     COMMENT '员工绩效加分总分数汇总' AFTER otherScoreSub;
+ALTER TABLE mortals_xhx_staff_perform_stat ADD COLUMN `totalSubScore` decimal(10,2) DEFAULT 0.0     COMMENT '员工绩效减分总分数汇总' AFTER totalAddScore;
+ALTER TABLE mortals_xhx_staff_perform_stat ADD COLUMN `complainScoreAdd` decimal(10,2) DEFAULT 0.0     COMMENT '员工绩效指标增加分数' AFTER totalSubScore;
+ALTER TABLE mortals_xhx_staff_perform_stat ADD COLUMN `complainScoreSub` decimal(10,2) DEFAULT 0.0     COMMENT '员工绩效指标扣减分数' AFTER complainScoreAdd;