Merge remote-tracking branch 'origin/master'

attendance-performance-manager-ui/admin/src/views/Home.vue

@@ -32,7 +32,7 @@
                 </div>
                 <div class="item">
                   <div>出勤率</div>
-                  <div>{{ homeStat.attendRadio }}%</div>
+                  <div>{{ homeStat.attendRadio }}</div>
                 </div>
                 <div class="item">
                   <div>请假人数</div>

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

@@ -26,7 +26,7 @@
 -->
 
           <!-- 处理异常状态 -->
-          <el-select v-model="dealParams.errorStatus">
+          <el-select v-model="dealParams.processResult">
             <el-option
               v-for="($label, $value) in dict.errorStatus"
               :key="$value"
@@ -36,7 +36,7 @@
             </el-option>
           </el-select>
           <!-- 早退/迟到 -->
-          <el-input
+          <!-- <el-input
             style="width:220px"
             placeholder="请输入数字"
             :maxlength="4"
@@ -48,17 +48,17 @@
             type="number"
           >
             <template slot="append">分钟</template>
-          </el-input>
+          </el-input> -->
         </div>
         <div class="mt10">
-          <span>处理结果：</span>
+          <span>备注：</span>
           <el-input
-            placeholder="请输入处理结果"
+            placeholder="请输入备注"
             type="textarea"
             show-word-limit
             class="mt10"
             :maxlength="50"
-            v-model="dealParams.processResult"
+            v-model="dealParams.remark"
           ></el-input>
         </div>
       </div>
@@ -96,7 +96,7 @@ export default {
         remark: "",
         errorStatus: null,
         durtion: 0,
-        processResult: "",
+        processResult: null,
         recordErrorEntities: [], //处理员工
         processStatus: 1, //处理状态
       },
@@ -146,17 +146,17 @@ export default {
     },
     // 保存
     saveForm() {
-      if (this.dealParams.errorStatus == "") {
+      if (this.dealParams.processResult == "") {
         this.$message.error("请选择处理结果");
         return;
       }
-      this.dealParams.errorStatus = this.dealParams.errorStatus;
+      this.dealParams.processResult = this.dealParams.processResult;
       if (
         this.duration &&
         (this.dealParams.errorStatus == "1" ||
           this.dealParams.errorStatus == "2")
       ) {
-        this.dealParams.errorStatus =
+        this.dealParams.processResult =
           this.dict.errorStatus[this.dealParams.errorStatus] +
           this.duration +
           "分钟";

attendance-performance-manager/src/main/java/com/mortals/xhx/base/login/web/LoginController.java

@@ -304,13 +304,4 @@ public class LoginController extends BaseCRUDJsonBodyMappingController<UserServi
     }
 
 
-    @RequestMapping("parseToken")
-    public IUser parseToken() throws Exception {
-        IUser userEntity = authTokenService.getLoginUser(request);
-        if (!ObjectUtils.isEmpty(userEntity)) {
-            authTokenService.verifyToken(userEntity);
-            return userEntity;
-        }
-        return null;
-    }
 }

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

@@ -3,6 +3,7 @@ package com.mortals.xhx.module.attendance.service.impl;
 import cn.hutool.core.date.DateUnit;
 import cn.hutool.core.date.DateUtil;
 import com.mortals.framework.model.PageInfo;
+import com.mortals.framework.util.DataUtil;
 import com.mortals.xhx.busiz.h5.req.AttendSaveReq;
 import com.mortals.xhx.busiz.h5.web.ApiWebPerformController;
 import com.mortals.xhx.common.code.ErrorStatusEnum;
@@ -81,39 +82,51 @@ public class AttendanceRecordErrorServiceImpl extends AbstractCRUDServiceImpl<At
         if (YesNoEnum.YES.getValue() == entity.getProcessStatus()) {
             //判断后打绩效
             String ruleCode = "";
-            if (ErrorStatusEnum.早退.getValue() == entity.getErrorStatus()) {
-                //判断时间差定义
-                Long earlyMin = DateUtil.between(entity.getErrorDateTime(), entity.getGoOffDateTime(), DateUnit.MINUTE);
+            if (ErrorStatusEnum.早退.getValue() == DataUtil.converStr2Int(entity.getProcessResult(), 3)) {
 
-                if (earlyMin >= 0L && earlyMin < 5L) {
+                if (ObjectUtils.isEmpty(entity.getErrorDateTime()) || ObjectUtils.isEmpty(entity.getGoOffDateTime())) {
                     //早退5分钟内
                     ruleCode = "ATTEND1002";
                 }
-                if (earlyMin >= 5L && earlyMin < 60L) {
-                    //早退5分钟内
-                    ruleCode = "ATTEND1004";
+                if (!ObjectUtils.isEmpty(entity.getErrorDateTime()) && !ObjectUtils.isEmpty(entity.getGoOffDateTime())) {
+                    //判断时间差定义
+                    Long earlyMin = DateUtil.between(entity.getErrorDateTime(), entity.getGoOffDateTime(), DateUnit.MINUTE);
+
+                    if (earlyMin >= 0L && earlyMin < 5L) {
+                        //早退5分钟内
+                        ruleCode = "ATTEND1002";
+                    }
+                    if (earlyMin >= 5L && earlyMin < 60L) {
+                        //早退5分钟内
+                        ruleCode = "ATTEND1004";
+                    }
+                    if (earlyMin >= 60L) {
+                        //早退5分钟内
+                        ruleCode = "ATTEND1006";
+                    }
                 }
-                if (earlyMin >= 60L) {
+            } else if (ErrorStatusEnum.迟到.getValue() == DataUtil.converStr2Int(entity.getProcessResult(), 3)) {
+                if (ObjectUtils.isEmpty(entity.getErrorDateTime()) || ObjectUtils.isEmpty(entity.getGoOffDateTime())) {
                     //早退5分钟内
-                    ruleCode = "ATTEND1006";
-                }
-            } else if (ErrorStatusEnum.迟到.getValue() == entity.getErrorStatus()) {
-
-                Long lateMin = DateUtil.between(entity.getErrorDateTime(), entity.getGoOffDateTime(), DateUnit.MINUTE);
-                if (lateMin >= 0L && lateMin < 5L) {
-                    //迟到5分钟内
                     ruleCode = "ATTEND1001";
                 }
-                if (lateMin >= 5L && lateMin < 60L) {
-                    //迟到5-60
-                    ruleCode = "ATTEND1003";
+                if (!ObjectUtils.isEmpty(entity.getErrorDateTime()) && !ObjectUtils.isEmpty(entity.getGoOffDateTime())) {
+
+                    Long lateMin = DateUtil.between(entity.getErrorDateTime(), entity.getGoOffDateTime(), DateUnit.MINUTE);
+                    if (lateMin >= 0L && lateMin < 5L) {
+                        //迟到5分钟内
+                        ruleCode = "ATTEND1001";
+                    }
+                    if (lateMin >= 5L && lateMin < 60L) {
+                        //迟到5-60
+                        ruleCode = "ATTEND1003";
+                    }
+                    if (lateMin >= 60L) {
+                        //迟到60分钟以上
+                        ruleCode = "ATTEND1005";
+                    }
                 }
-                if (lateMin >= 60L) {
-                    //迟到60分钟以上
-                    ruleCode = "ATTEND1005";
-                }
-
-            } else if (ErrorStatusEnum.缺卡.getValue() == entity.getErrorStatus()) {
+            } else if (ErrorStatusEnum.缺卡.getValue() == DataUtil.converStr2Int(entity.getProcessResult(), 3)) {
                 ruleCode = "ATTEND1007";
             }
             if (!ObjectUtils.isEmpty(ruleCode)) {
@@ -130,7 +143,7 @@ public class AttendanceRecordErrorServiceImpl extends AbstractCRUDServiceImpl<At
                 attendSaveReq.setHappenTime(entity.getErrorDateTime());
                 attendSaveReq.setRuleCode(ruleCode);
                 attendSaveReq.setStaffId(entity.getStaffId());
-                attendRecordService.saveAttend(attendSaveReq,context);
+                attendRecordService.saveAttend(attendSaveReq, context);
             }
         }
     }