活动打卡接口

esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiActUserRelationController.java

@@ -111,21 +111,6 @@ public class ApiActUserRelationController {
         appActUserClockLogDTO.setUserId(tokenDto.getUserId());
         return actUserRelationService.activityClock(appActUserClockLogDTO);
 
-       /* ArrayList<String> imgList = new ArrayList<String>();
-        imgList.add("http://123232323223");
-        imgList.add("http://12323232342423423");
-        EpdcAppActUserClockLogDTO epdcAppActUserClockLogDTO = new EpdcAppActUserClockLogDTO();
-        epdcAppActUserClockLogDTO.setActId("122");
-        epdcAppActUserClockLogDTO.setClockAddress("打卡描述");
-        epdcAppActUserClockLogDTO.setClockLatitude(new BigDecimal(123.122));
-        epdcAppActUserClockLogDTO.setClockLongitude(new BigDecimal(123.122));
-        epdcAppActUserClockLogDTO.setClockType("0");
-        epdcAppActUserClockLogDTO.setImages(imgList);
-        epdcAppActUserClockLogDTO.setClockAddress("山东省青岛市市北区台东路");
-        AppActUserClockLogDTO appActUserClockLogDTO = ConvertUtils.sourceToTarget(epdcAppActUserClockLogDTO, AppActUserClockLogDTO.class);
-        appActUserClockLogDTO.setUserId("3f6448adbfbe736dde333f057a956012");
-        return actUserRelationService.activityClock(appActUserClockLogDTO);*/
-
     }
 
     /**

esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/service/impl/ActUserClockLogServiceImpl.java

@@ -238,6 +238,9 @@ public class ActUserClockLogServiceImpl extends BaseServiceImpl<ActUserClockLogD
         //查询人员活动关系Id
         ActUserRelationDTO actUserRelationDTO = actUserRelationService.getActUserRelationId(appActUserClockLogDTO.getUserId(),appActUserClockLogDTO.getActId());
         ActUserClockLogDTO actUserClockLogDTO = ConvertUtils.sourceToTarget(appActUserClockLogDTO, ActUserClockLogDTO.class);
+        if(actUserRelationDTO.getId() == null){
+            return new Result().error("打卡失败");
+        }
         actUserClockLogDTO.setActUserId(actUserRelationDTO.getId());
         actUserClockLogDTO.setClockTime(new Date());
         //存储打卡日志