From b3e68ed85b391b97e00472ada4cec08efe42638b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=A7=9C=E7=8E=89=E7=90=A6?=
 <7507756+jiang_yuqi@user.noreply.gitee.com>
Date: Sun, 19 May 2024 09:59:17 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ruoyi/api/labour/controller/LabourApiController.java    | 6 +++---
 ruoyi-ui/src/views/statistics/statisticsProject/index.vue   | 2 +-
 .../yanzhu/jh/project/controller/ProjectViewController.java | 1 -
 3 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/ruoyi-admin/src/main/java/com/ruoyi/api/labour/controller/LabourApiController.java b/ruoyi-admin/src/main/java/com/ruoyi/api/labour/controller/LabourApiController.java
index 587e345d..8f511a38 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/api/labour/controller/LabourApiController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/api/labour/controller/LabourApiController.java
@@ -484,6 +484,7 @@ public class LabourApiController extends BaseController {
                 SurProjectAttendanceData surProjectAttendanceData =  JSONObject.parseObject(req.getData(), SurProjectAttendanceData.class);
                 //30秒内未重复请求
                 if(Convert.toBool(redisCache.getCacheObject(CACHEKEY+surProjectAttendanceData.getWorkerId()),true)){
+                    redisCache.setCacheObject(CACHEKEY+surProjectAttendanceData.getWorkerId(),false,30, TimeUnit.SECONDS);
                     //判断base64图片
                     if(StringUtils.isNotEmpty(surProjectAttendanceData.getScanPhotoBase64())){
                         String filePath = FileUploadUtils.uploadImages(RuoYiConfig.getUploadPath(), MultipartFileUtils.base64ToMultipartFile(surProjectAttendanceData.getScanPhotoBase64()));
@@ -544,7 +545,7 @@ public class LabourApiController extends BaseController {
                             //进出门逻辑判断
                             //if(Objects.equals("L",surProjectAttendanceData.getAttendanceType())){
                             //surProjectAttendanceData.setAttendanceOutTime(labourDataVo.getAttendanceTime());
-                                surProjectAttendanceData.setAttendanceTime(labourDataVo.getAttendanceTime());
+                            surProjectAttendanceData.setAttendanceTime(labourDataVo.getAttendanceTime());
                             //}
                             surProjectAttendanceData.setCfgid(sysApplyConfig.getCfgId());
                             surProjectAttendanceData.setAppId(sysApplyConfig.getAppId());
@@ -573,7 +574,6 @@ public class LabourApiController extends BaseController {
                             list.add(surProjectAttendanceData);
                             surProjectAttendanceDataService.batchSurProjectAttendanceData(list);
                         }
-                        redisCache.setCacheObject(CACHEKEY+surProjectAttendanceData.getWorkerId(),false,30, TimeUnit.SECONDS);
                     }else{
                         String messages = validateSet.stream()
                                 .map(ConstraintViolation::getMessage)
@@ -643,6 +643,7 @@ public class LabourApiController extends BaseController {
                     for(SurProjectAttendanceData surProjectAttendanceData:surProjectAttendanceDataList){
                         //30秒内未重复请求
                         if(Convert.toBool(redisCache.getCacheObject(CACHEKEY+surProjectAttendanceData.getWorkerId()),true)){
+                            redisCache.setCacheObject(CACHEKEY+surProjectAttendanceData.getWorkerId(),false,30, TimeUnit.SECONDS);
                             //判断base64图片
                             if(StringUtils.isNotEmpty(surProjectAttendanceData.getScanPhotoBase64())){
                                 String filePath = FileUploadUtils.uploadImages(RuoYiConfig.getUploadPath(), MultipartFileUtils.base64ToMultipartFile(surProjectAttendanceData.getScanPhotoBase64()));
@@ -722,7 +723,6 @@ public class LabourApiController extends BaseController {
                                 surProjectAttendanceData.setCreateTime(new Date());
                                 saveList.add(surProjectAttendanceData);
                             }
-                            redisCache.setCacheObject(CACHEKEY+surProjectAttendanceData.getWorkerId(),false,30, TimeUnit.SECONDS);
                         }
                     }
                     if(StringUtils.isNotEmpty(saveList)){
diff --git a/ruoyi-ui/src/views/statistics/statisticsProject/index.vue b/ruoyi-ui/src/views/statistics/statisticsProject/index.vue
index f776daab..56ad0916 100644
--- a/ruoyi-ui/src/views/statistics/statisticsProject/index.vue
+++ b/ruoyi-ui/src/views/statistics/statisticsProject/index.vue
@@ -441,7 +441,7 @@ export default {
     objectSpanMethod({ row, column, rowIndex, columnIndex }) {
       // column.property是表头的key
       let _row = 1;
-      if ([0, 4, 6, 7, 11, 12, 13, 14, 19, 20, 21, 22, 26].includes(columnIndex)) {
+      if ([0, 4, 6, 7, 11, 12, 13, 14, 19, 20, 21, 22].includes(columnIndex)) {
         var spanArr = this.getSpanArr(column.property);
         _row = spanArr[rowIndex];
       }
diff --git a/yanzhu-jh/src/main/java/com/yanzhu/jh/project/controller/ProjectViewController.java b/yanzhu-jh/src/main/java/com/yanzhu/jh/project/controller/ProjectViewController.java
index 50999e51..482d3d97 100644
--- a/yanzhu-jh/src/main/java/com/yanzhu/jh/project/controller/ProjectViewController.java
+++ b/yanzhu-jh/src/main/java/com/yanzhu/jh/project/controller/ProjectViewController.java
@@ -654,7 +654,6 @@ public class ProjectViewController extends BaseBuildNodeController{
                         sheet.addMergedRegion(new CellRangeAddress(rowNum-(1+trindex), rowNum - 1, 20, 20));//单元格合并
                         sheet.addMergedRegion(new CellRangeAddress(rowNum-(1+trindex), rowNum - 1, 21, 21));//单元格合并
                         sheet.addMergedRegion(new CellRangeAddress(rowNum-(1+trindex), rowNum - 1, 22, 22));//单元格合并
-                        sheet.addMergedRegion(new CellRangeAddress(rowNum-(1+trindex), rowNum - 1, 26, 26));//单元格合并
                     }
                     trindex=0;
                 }else{