From cc802f45612132f6890ce6d45dfe1851eb31047e Mon Sep 17 00:00:00 2001
From: ma <1062634917@qq.com>
Date: Tue, 31 Aug 2021 10:58:52 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=A1=E6=A0=B8=E8=80=83=E5=8B=A4=E4=BF=A1?=
 =?UTF-8?q?=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../common/bean/dto/CClockingInDto.java       |  7 ++++
 .../common/service/ClockingInService.java     | 36 +++++++++++++++++--
 .../common/service/IClockingInService.java    |  2 +-
 .../main/java/com/ccsens/util/PoiUtil.java    |  8 +++--
 4 files changed, 47 insertions(+), 6 deletions(-)

diff --git a/common/src/main/java/com/ccsens/common/bean/dto/CClockingInDto.java b/common/src/main/java/com/ccsens/common/bean/dto/CClockingInDto.java
index 30955715..92cbcecb 100644
--- a/common/src/main/java/com/ccsens/common/bean/dto/CClockingInDto.java
+++ b/common/src/main/java/com/ccsens/common/bean/dto/CClockingInDto.java
@@ -50,8 +50,12 @@ public class CClockingInDto {
     @Data
     @ApiModel("检查人审核打卡")
     public static class Audit{
+        @NotNull(message = "打卡信息错误")
         @ApiModelProperty("打卡记录id")
         private Long id;
+        @NotNull(message = "项目信息错误")
+        @ApiModelProperty("项目id")
+        private Long projectId;
         @ApiModelProperty("审批类型(0-修改,1-驳回)")
         private Byte type;
         @ApiModelProperty("早打卡时间")
@@ -63,6 +67,9 @@ public class CClockingInDto {
     @Data
     @ApiModel("导出打卡记录")
     public static class ExportRecord{
+        @NotNull(message = "项目信息错误")
+        @ApiModelProperty("项目id")
+        private Long projectId;
         @ApiModelProperty("开始时间")
         private Long startTime;
         @ApiModelProperty("结束时间")
diff --git a/common/src/main/java/com/ccsens/common/service/ClockingInService.java b/common/src/main/java/com/ccsens/common/service/ClockingInService.java
index 38ad920d..6b4f682c 100644
--- a/common/src/main/java/com/ccsens/common/service/ClockingInService.java
+++ b/common/src/main/java/com/ccsens/common/service/ClockingInService.java
@@ -159,11 +159,43 @@ public class ClockingInService implements IClockingInService {
 
     @Override
     public void auditRecord(CClockingInDto.Audit params, Long userId) {
-
+        ProClockingIn record = clockingInDao.selectByPrimaryKey(params.getId());
+        Long userOfMemberId = memberDao.findUserOfMemberId(params.getProjectId(), userId);
+        if (!record.getCheckerId().equals(userOfMemberId)) {
+            throw new BaseException(CommonCodeError.NO_POWER);
+        }
+        //修改
+        if (0 == params.getType()) {
+            ProClockingIn proClockingIn = new ProClockingIn();
+            proClockingIn.setId(params.getId());
+            if (ObjectUtil.isNotNull(params.getMorning())) {
+                proClockingIn.setMorning(params.getMorning());
+            }
+            if (ObjectUtil.isNotNull(params.getNight())) {
+                proClockingIn.setNight(params.getNight());
+            }
+            clockingInDao.updateByPrimaryKeySelective(proClockingIn);
+        }
+        //驳回
+        if (1 == params.getType()) {
+            ProClockingIn proClockingIn = new ProClockingIn();
+            if (ObjectUtil.isNotNull(params.getMorning())) {
+                proClockingIn.setMorningStatus((byte)2);
+            }
+            if (ObjectUtil.isNotNull(params.getNight())) {
+                proClockingIn.setNightStatus((byte)2);
+            }
+            clockingInDao.updateByPrimaryKeySelective(proClockingIn);
+        }
     }
 
     @Override
-    public CClockingInVo.ExcelUrl exportRecord(CClockingInDto.ExportRecord params, Long userId) {
+    public CClockingInVo.ExcelUrl exportRecord(CClockingInDto.QueryClockingIn params, Long userId) {
+        log.info("开始调用查询考勤方法");
+        List<CClockingInVo.ClockingInInfo> clockingInInfos = queryClockingIn(params, userId);
+        log.info("调用查询考勤方法结束{}",clockingInInfos);
+
+
         return null;
     }
 }
diff --git a/common/src/main/java/com/ccsens/common/service/IClockingInService.java b/common/src/main/java/com/ccsens/common/service/IClockingInService.java
index 7c22ebaa..b5aa4efd 100644
--- a/common/src/main/java/com/ccsens/common/service/IClockingInService.java
+++ b/common/src/main/java/com/ccsens/common/service/IClockingInService.java
@@ -38,5 +38,5 @@ public interface IClockingInService {
      * @param userId 当前用户userId
      * @return excel的路径
      */
-    CClockingInVo.ExcelUrl exportRecord(CClockingInDto.ExportRecord params,Long userId);
+    CClockingInVo.ExcelUrl exportRecord(CClockingInDto.QueryClockingIn params,Long userId);
 }
diff --git a/util/src/main/java/com/ccsens/util/PoiUtil.java b/util/src/main/java/com/ccsens/util/PoiUtil.java
index 8ad84bba..0bd7c4cd 100644
--- a/util/src/main/java/com/ccsens/util/PoiUtil.java
+++ b/util/src/main/java/com/ccsens/util/PoiUtil.java
@@ -640,8 +640,9 @@ public class PoiUtil {
 
         PoiUtilCell poiUtilCell = new PoiUtilCell();
         poiUtilCell.setValue("111222333");
-        /*poiUtilCell.setColspan(2);
-        poiUtilCell.setRowspan(1);*/
+        poiUtilCell.setColspan(2);
+        poiUtilCell.setRowspan(1);
+
         PoiUtilCell poiUtilCell1 = new PoiUtilCell();
         poiUtilCell1.setValue("1112222");
         PoiUtilCell poiUtilCell3 = new PoiUtilCell();
@@ -655,10 +656,11 @@ public class PoiUtil {
         List<PoiUtilCell> cells = new ArrayList<>();
         cells.add(poiUtilCell);
         cells.add(poiUtilCell1);
+        cells.add(poiUtilCell1);
         cells.add(poiUtilCell3);
 
         cells.add(poiUtilCell2);
-
+        List<PoiUtilCell> cells2 = new ArrayList<>();
         List<List<PoiUtilCell>> list = new ArrayList<>();
         list.add(cells);