20220122修改打卡

src/main/java/com/ccsens/defaultwbs/bean/dto/ClockingInDto.java

@@ -1,11 +1,13 @@
 package com.ccsens.defaultwbs.bean.dto;
 
+import cn.hutool.core.date.DateUtil;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import javax.validation.constraints.NotNull;
+import java.util.Date;
 import java.util.List;
 
 /**
@@ -28,6 +30,22 @@ public class ClockingInDto {
         private Long roleId;
         @ApiModelProperty("成员id数组")
         private List<Long> memberIdList;
+
+        public Long getStartTime() {
+            if(startTime.equals(endTime)){
+                Date date = new Date(startTime);
+                return DateUtil.beginOfDay(date).getTime();
+            }
+            return startTime;
+        }
+
+        public Long getEndTime() {
+            if(startTime.equals(endTime)){
+                Date date = new Date(endTime);
+                return DateUtil.endOfDay(date).getTime();
+            }
+            return endTime;
+        }
     }
 
     @Data

src/main/java/com/ccsens/defaultwbs/bean/vo/DeliverVo.java

@@ -47,6 +47,8 @@ public class DeliverVo {
         private String remark;
         @ApiModelProperty("是不是我(0-否,1-是)")
         private Byte isMine;
+        @ApiModelProperty("检查时间")
+        private Long checkTime;
     }
 
     @Data

src/main/java/com/ccsens/defaultwbs/service/ClockingInService.java

@@ -20,8 +20,10 @@ import com.ccsens.defaultwbs.util.DefaultCodeError;
 import com.ccsens.util.PoiUtil;
 import com.ccsens.util.PropUtil;
 import com.ccsens.util.exception.BaseException;
+import io.swagger.models.auth.In;
 import lombok.Data;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang.time.DateUtils;
 import org.apache.poi.ss.usermodel.Workbook;
 import org.apache.poi.xssf.usermodel.XSSFWorkbook;
 import org.springframework.core.io.DefaultResourceLoader;
@@ -82,23 +84,9 @@ public class ClockingInService implements IClockingInService {
         //1.查询全部
         List<Long> memberIdList = new ArrayList<>();
         Long userOfMemberId = memberDao.findUserOfMemberId(params.getProjectId(), userId);
-//        memberIdList.add(userOfMemberId);
-//        ProMember member = memberDao.queryMemberOfRole(userOfMemberId, params.getRoleId());
         List<ClockingInVo.ClockRecord> clockRecordList = clockingInDao.queryMembersOfClock(params.getProjectId(), userOfMemberId, params.getRoleId(),params.getMemberIdList());
         if (CollectionUtil.isEmpty(params.getMemberIdList())) {
-//               memberIdList.addAll(clockRecordList.stream().map(ClockingInVo.ClockRecord::getMemberId).collect(Collectors.toList()));
             for (ClockingInVo.ClockingInInfo clockingInInfo : list) {
-//                if (ObjectUtil.isNotNull(member)) {
-//                    ClockingInVo.ClockRecord clockRecord = new ClockingInVo.ClockRecord();
-//                    clockRecord.setMemberId(member.getId());
-//                    clockRecord.setMemberName(member.getName());
-//                    clockRecord.setMemberUserId(member.getUserId());
-//                    clockingInInfo.getRecordList().add(clockRecord);
-//                    if (member.getUserId().equals(clockRecord.getMemberUserId())) {
-//                        clockRecord.setIsMine((byte) 1);
-//                    }
-//                }
-
                 for (ClockingInVo.ClockRecord record : clockRecordList) {
                     ClockingInVo.ClockRecord otherClockRecord = new ClockingInVo.ClockRecord();
                     otherClockRecord.setMemberId(record.getMemberId());
@@ -108,20 +96,11 @@ public class ClockingInService implements IClockingInService {
                     clockingInInfo.getRecordList().add(otherClockRecord);
                     //添加成员id
                     memberIdList.add(record.getMemberId());
-//                    if (ObjectUtil.isNotNull(member)) {
-//                        if (member.getUserId().equals(otherClockRecord.getMemberUserId())) {
-//                            record.setIsMine((byte) 1);
-//                        }
-//                    }
-//
                 }
             }
         } else {
             //2.筛选成员
-//            List<ClockingInVo.ClockRecord> clockRecordList = clockingInDao.queryMemberByIdList(params.getMemberIdList(), params.getRoleId());
-//            List<ClockingInVo.ClockRecord> clockRecordList = clockingInDao.queryMembersOfClock(params.getProjectId(), userOfMemberId, params.getRoleId(),params.getMemberIdList());
             if (CollectionUtil.isNotEmpty(clockRecordList)) {
-//                memberIdList.addAll(clockRecordList.stream().map(ClockingInVo.ClockRecord::getMemberId).collect(Collectors.toList()));
                 for (ClockingInVo.ClockingInInfo clockingInInfo : list) {
                     for (ClockingInVo.ClockRecord clockRecord : clockRecordList) {
                         ClockingInVo.ClockRecord filterRecord = new ClockingInVo.ClockRecord();
@@ -129,9 +108,6 @@ public class ClockingInService implements IClockingInService {
                         filterRecord.setMemberName(clockRecord.getMemberName());
                         filterRecord.setMemberUserId(clockRecord.getMemberUserId());
                         filterRecord.setIsMine(clockRecord.getIsMine());
-//                        if (filterRecord.getMemberUserId().equals(userId)) {
-//                            filterRecord.setIsMine((byte) 1);
-//                        }
                         clockingInInfo.getRecordList().add(filterRecord);
                         //添加成员id
                         memberIdList.add(clockRecord.getMemberId());
@@ -196,10 +172,18 @@ public class ClockingInService implements IClockingInService {
         }
         //判断打卡时间是否在当前时间之前
         Date date = new Date();
-        if (date.getTime() < params.getDateTime()) {
-            log.info("系统时间：{}---打卡时间：{}",date.getTime(),params.getDateTime());
+        SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyyMMdd");
+        String now = simpleDateFormat.format(date);
+        String d = simpleDateFormat.format(new Date(params.getDateTime()));
+        if(Integer.parseInt(now) < Integer.parseInt(d)){
+            log.info("系统时间：{}---打卡时间：{}",now,d);
             throw new BaseException(CommonCodeError.DATE_ERROR);
         }
+
+//        if (date.getTime() < params.getDateTime()) {
+//            log.info("系统时间：{}---打卡时间：{}",date.getTime(),params.getDateTime());
+//            throw new BaseException(CommonCodeError.DATE_ERROR);
+//        }
         DateFormat df = new SimpleDateFormat("yyyy-MM-dd");
         String format = df.format(date);
         log.info("获取今天的日期：{}", format);

src/main/resources/application.yml

@@ -1,4 +1,4 @@
 spring:
   profiles:
-    active: test
-    include: common, util-test
+    active: prod
+    include: common, util-prod

src/main/resources/mapper_dao/PluDeliverDao.xml

@@ -18,6 +18,7 @@
             <result column="score" property="score"/>
             <result column="remark" property="remark"/>
             <result column="isMine" property="isMine"/>
+            <result column="checkTime" property="checkTime"/>
         </collection>
     </resultMap>
 
@@ -92,6 +93,7 @@
                 <result column="score" property="score"/>
                 <result column="remark" property="remark"/>
                 <result column="isMine" property="isMine"/>
+                <result column="checkTime" property="checkTime"/>
             </collection>
         </collection>
     </resultMap>