修改考勤汇总

attendance-performance-manager/src/main/java/com/mortals/xhx/module/check/service/impl/CheckAttendRecordServiceImpl.java

@@ -75,11 +75,11 @@ public class CheckAttendRecordServiceImpl extends AbstractCRUDServiceImpl<CheckA
     protected void saveAfter(CheckAttendRecordEntity entity, Context context) throws AppException {
         //发送钉钉通知信息
         if (SubMethodEnum.系统自动.getValue() == entity.getSubMethod()) {
-            AttendPostServiceThread attendPostServiceThread = new AttendPostServiceThread(entity);
-            ThreadPool.getInstance().execute(attendPostServiceThread);
-           //sendCheckDingTalk(entity);
+/*            AttendPostServiceThread attendPostServiceThread = new AttendPostServiceThread(entity);
+            ThreadPool.getInstance().execute(attendPostServiceThread);*/
+           sendCheckDingTalk(entity);
         }
-     /*   try {
+        try {
             StaffCheckSummaryQuery query = new StaffCheckSummaryQuery();
             query.setStaffId(entity.getStaffId());
             query.setCheckTimeStart(DateUtils.getStrDate(entity.getCheckTime()));
@@ -87,7 +87,7 @@ public class CheckAttendRecordServiceImpl extends AbstractCRUDServiceImpl<CheckA
             summaryCheck(query);
         } catch (Exception e) {
             log.error("汇总已审核的核查记录出错", e);
-        }*/
+        }
     }
 
     @Override
@@ -132,17 +132,16 @@ public class CheckAttendRecordServiceImpl extends AbstractCRUDServiceImpl<CheckA
 
 
 
-      //  sendCheckDingTalk(entity);
+
         try {
             CheckAttendRecordEntity temp = this.get(entity.getId());
             if (temp != null) {
-
-                AttendPostServiceThread attendPostServiceThread = new AttendPostServiceThread(entity);
-                ThreadPool.getInstance().execute(attendPostServiceThread);
-
-/*                StaffCheckSummaryQuery query = new StaffCheckSummaryQuery();
+/*                AttendPostServiceThread attendPostServiceThread = new AttendPostServiceThread(entity);
+                ThreadPool.getInstance().execute(attendPostServiceThread);*/
+                sendCheckDingTalk(entity);
+                StaffCheckSummaryQuery query = new StaffCheckSummaryQuery();
                 query.setStaffId(temp.getStaffId());
-                summaryCheck(query);*/
+                summaryCheck(query);
             }
         } catch (Exception e) {
             log.error("汇总已审核的核查记录出错", e);

attendance-performance-manager/src/main/java/com/mortals/xhx/module/staff/model/StaffPerformSummaryEntity.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.StaffPerformSummaryVo;
 import lombok.Data;
 /**
-* 员工绩效统计实体对象
-*
-* @author zxfei
-* @date 2023-07-14
-*/
+ * 员工绩效统计实体对象
+ *
+ * @author zxfei
+ * @date 2023-07-18
+ */
 @Data
 public class StaffPerformSummaryEntity extends StaffPerformSummaryVo {
     private static final long serialVersionUID = 1L;
@@ -24,10 +27,12 @@ public class StaffPerformSummaryEntity extends StaffPerformSummaryVo {
     /**
      * 工号
      */
+    @Excel(name = "工号")
     private String workNum;
     /**
      * 人员名称
      */
+    @Excel(name = "人员名称")
     private String staffName;
     /**
      * 部门id号
@@ -36,38 +41,47 @@ public class StaffPerformSummaryEntity extends StaffPerformSummaryVo {
     /**
      * 部门名称
      */
+    @Excel(name = "部门名称")
     private String deptName;
     /**
      * 考勤绩效指标分数
      */
+    @Excel(name = "考勤绩效指标分数")
     private BigDecimal attendScore;
     /**
      * 评价绩效指标分数
      */
+    @Excel(name = "评价绩效指标分数")
     private BigDecimal reviewScore;
     /**
      * 投诉绩效指标分数
      */
+    @Excel(name = "投诉绩效指标分数")
     private BigDecimal complainScore;
     /**
      * 办件绩效分数
      */
+    @Excel(name = "办件绩效分数")
     private BigDecimal goworkScore;
     /**
      * 效能绩效分数
      */
+    @Excel(name = "效能绩效分数")
     private BigDecimal effectScore;
     /**
      * 其它绩效分数
      */
+    @Excel(name = "其它绩效分数")
     private BigDecimal otherScore;
     /**
      * 累计异常分数
      */
+    @Excel(name = "累计异常分数")
     private BigDecimal errorScore;
     /**
      * 当月得分数
      */
+    @Excel(name = "当月得分数")
     private BigDecimal totalScore;
     /**
      * 备注
@@ -76,10 +90,12 @@ public class StaffPerformSummaryEntity extends StaffPerformSummaryVo {
     /**
      * 年
      */
+    @Excel(name = "年")
     private Integer year;
     /**
      * 月
      */
+    @Excel(name = "月")
     private Integer month;
     @Override
     public int hashCode() {
@@ -127,8 +143,8 @@ public class StaffPerformSummaryEntity extends StaffPerformSummaryVo {
 
         this.remark = "";
 
-            this.year = -1;
+        this.year = DateUtil.year(new Date());
 
-            this.month = -1;
+        this.month = DateUtil.month(new Date())+1;
     }
 }
\ No newline at end of file