修改打卡接口

common/src/main/java/com/ccsens/common/api/TaskController.java

@@ -76,4 +76,12 @@
 //        List<CClockingInVo.ClockingInInfo> clockingInInfos = clockingInService.queryClockingIn(params.getParam(), params.getUserId());
 //        return JsonResponse.newInstance().ok(clockingInInfos);
 //    }
+//
+//    @MustLogin
+//    @ApiOperation(value = "打卡", notes = "")
+//    @RequestMapping(value = "/punch", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"})
+//    public JsonResponse punchTheClock(@ApiParam @Validated @RequestBody QueryDto<CClockingInDto.PunchTheClock> params) throws Exception{
+//        clockingInService.punchTheClock(params.getParam(), params.getUserId());
+//        return JsonResponse.newInstance().ok();
+//    }
 //}

common/src/main/java/com/ccsens/common/bean/dto/CClockingInDto.java

@@ -36,7 +36,7 @@ public class CClockingInDto {
         private Long id;
         @JsonFormat(pattern = "yyyy-MM-dd")
         @ApiModelProperty("打卡日期")
-        private Date dateTime;
+        private Long dateTime;
         @NotNull(message = "成员id不能为空")
         @ApiModelProperty("考勤信息中的成员id")
         private Long memberId;

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

@@ -116,14 +116,14 @@ public class ClockingInService implements IClockingInService {
     public void punchTheClock(CClockingInDto.PunchTheClock params, Long userId) {
         //判断选择打卡的成员和当前用户是否匹配
         ProMember proMember = memberDao.selectByPrimaryKey(params.getMemberId());
-        if(ObjectUtil.isNull(proMember) || proMember.getUserId().equals(userId)){
+        if(ObjectUtil.isNull(proMember) || !proMember.getUserId().equals(userId)){
             throw new BaseException(CommonCodeError.MEMBER_NOT_MINE);
         }
         //验证打卡日期是否是今天
-        DateFormat df = new SimpleDateFormat("yy-MM-dd");
+        DateFormat df = new SimpleDateFormat("yyyy-MM-dd");
         String format = df.format(new Date());
         log.info("获取今天的日期：{}",format);
-        if(!format.equalsIgnoreCase(params.getDateTime().toString())){
+        if(!format.equalsIgnoreCase(df.format(new Date(params.getDateTime())))){
             throw new BaseException(CommonCodeError.DATE_ERROR);
         }
         //判断是否有打卡记录

common/src/main/resources/application.yml

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