Merge remote-tracking branch 'origin/master'

attendance-performance-manager-ui/admin/src/views/staff/drawershow.vue

@@ -100,7 +100,7 @@
             >
             </el-switch>
           </div>
-          <div class="history">
+          <!-- <div class="history">
             <span>其他授权：</span>
             <el-switch
               :active-value="1"
@@ -108,7 +108,7 @@
               v-model="form.otherCheck"
             >
             </el-switch>
-          </div>
+          </div> -->
         </div>
 
         <form-buttons

attendance-performance-manager-ui/admin/src/views/staff/perform/summary/dialogshow.vue

 <template>
   <!-- 弹出框表单 -->
-  <el-dialog :title="title" :visible.sync="open" width="50%" append-to-body>
+  <el-dialog
+    :title="title"
+    :visible.sync="open"
+    width="50%"
+    height="300px"
+    append-to-body
+  >
     <div class="userName">
       <div class="user-left">
         <div class="user-name">
@@ -19,47 +25,52 @@
         <div class="m">{{ form.month }}月得分</div>
       </div>
     </div>
-    <div
-      class="userName user-t-item "
-      :class="{ t2: item.subAddType == 1, t1: item.subAddType == 2 }"
-      v-for="item in list"
-      :key="item.id"
-    >
-      <div class="user-left">
-        <div class="user-name">
-          {{ dictVal("checkType", item.checkType) }}
-        </div>
-        <div class="user-info">
-          <span class="user-i">绩效规则：{{ item.ruleName }}</span>
-        </div>
-        <div class="user-info">
-          <span class="user-i"
-            >{{
-              item.subAddType == 1
-                ? "加分方式："
-                : item.subAddType == 2
-                ? "扣分方式："
-                : "方式："
-            }}{{ util_formatter("subMethod", item.subMethod) }}</span
-          >
-        </div>
-        <div class="user-info">
-          <span class="user-i">核查时间：{{ momentVal(item.checkTime) }}</span>
-        </div>
-        <div class="user-info" v-if="item.auditStatus == 2">
-          <span class="user-i"
-            >核查结果：{{ item.subAddType == 1 ? "+" : "-"
-            }}{{ item.score }}（{{ item.checkResult }}）</span
-          >
+    <div class="dialog_box">
+      <div
+        class="userName user-t-item "
+        :class="{ t2: item.subAddType == 1, t1: item.subAddType == 2 }"
+        v-for="item in list"
+        :key="item.id"
+      >
+        <div class="user-left">
+          <div class="user-name">
+            {{ dictVal("checkType", item.checkType) }}
+          </div>
+          <div class="user-info">
+            <span class="user-i">绩效规则：{{ item.ruleName }}</span>
+          </div>
+          <div class="user-info">
+            <span class="user-i"
+              >{{
+                item.subAddType == 1
+                  ? "加分方式："
+                  : item.subAddType == 2
+                  ? "扣分方式："
+                  : "方式："
+              }}{{ util_formatter("subMethod", item.subMethod) }}</span
+            >
+          </div>
+          <div class="user-info">
+            <span class="user-i"
+              >核查时间：{{ momentVal(item.updateTime) }}</span
+            >
+          </div>
+          <div class="user-info" v-if="item.auditStatus == 2">
+            <span class="user-i"
+              >核查结果：{{ item.subAddType == 1 ? "+" : "-"
+              }}{{ item.score }}（{{ item.checkResult }}）</span
+            >
+          </div>
         </div>
-      </div>
-      <div class="user-right">
-        <div class="n">
-          {{ item.subAddType == 1 ? "+" : "-"
-          }}{{ item.auditStatus == 2 ? 0 : item.score }}
+        <div class="user-right">
+          <div class="n">
+            {{ item.subAddType == 1 ? "+" : "-"
+            }}{{ item.auditStatus == 2 ? 0 : item.score }}
+          </div>
         </div>
       </div>
     </div>
+
     <!-- <el-form ref="form" :model="form" :rules="rules" label-width="120px">
             <el-row>
                 <Field label="人员id" prop="staffId" v-model="form.staffId" placeholder="请输入人员id" />
@@ -286,4 +297,12 @@ export default {
     color: rgba(27, 198, 167, 1);
   }
 }
+
+/deep/.el-dialog__body {
+  height: 650px;
+  .dialog_box {
+    height: 85%;
+    overflow-y: auto;
+  }
+}
 </style>

attendance-performance-manager-ui/admin/src/views/staff/perform/summary/list.vue

@@ -204,4 +204,8 @@ export default {
   color: #409eff;
   font-weight: 600;
 }
+::v-deep.el-dialog__wrapper {
+  overflow: hidden;
+  top: -50px;
+}
 </style>

attendance-performance-manager/src/main/java/com/mortals/xhx/daemon/applicationservice/StaffCheckSummaryService.java

 package com.mortals.xhx.daemon.applicationservice;
 
+import cn.hutool.core.date.DateUtil;
 import com.mortals.framework.service.ICacheService;
 import com.mortals.framework.springcloud.service.IApplicationStartedService;
+import com.mortals.framework.util.StringUtils;
 import com.mortals.xhx.common.code.CheckTypeEnum;
 import com.mortals.xhx.module.check.model.vo.StaffCheckSummaryQuery;
 import com.mortals.xhx.module.check.service.*;
@@ -10,6 +12,8 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 import org.springframework.util.ObjectUtils;
 
+import java.util.Date;
+
 import static com.mortals.xhx.common.key.RedisKey.KEY_CHECK_SUMMARY_CACHE;
 
 /***
@@ -44,6 +48,11 @@ public class StaffCheckSummaryService implements IApplicationStartedService {
                     try {
                         StaffCheckSummaryQuery query = cacheService.brpop(KEY_CHECK_SUMMARY_CACHE,60, StaffCheckSummaryQuery.class);
                         if(!ObjectUtils.isEmpty(query)){
+                            if(StringUtils.isNotEmpty(query.getCheckTimeStart())){
+                                Date date = DateUtil.parse(query.getCheckTimeStart(),"yyyy-MM-dd");
+                                query.setCheckTimeStart(DateUtil.beginOfMonth(date).toDateStr());
+                                query.setCheckTimeEnd(DateUtil.endOfMonth(date).toDateStr());
+                            }
                             if(query.getCheckType() == CheckTypeEnum.考勤绩效.getValue()){
                                 checkAttendRecordService.summaryCheck(query);
                             }
@@ -100,4 +109,5 @@ public class StaffCheckSummaryService implements IApplicationStartedService {
     public int getOrder() {
         return 30;
     }
+
 }

attendance-performance-manager/src/main/java/com/mortals/xhx/module/check/model/vo/CheckAllRecordVo.java

@@ -87,4 +87,6 @@ public class CheckAllRecordVo extends BaseEntityLong {
      */
     private Integer auditStatus;
 
+    private Date updateTime;
+
 }