提交 3abca5af authored 作者: 吕本才's avatar 吕本才

refactor(temporary): 重构临时活动任务打卡逻辑 -id赋值修改

上级 5cbd8228
...@@ -28,7 +28,7 @@ public class TemporaryActivityTaskClockCoreController { ...@@ -28,7 +28,7 @@ public class TemporaryActivityTaskClockCoreController {
*/ */
@PostMapping("/clock") @PostMapping("/clock")
public R clock(@RequestBody TemporaryActivityTaskClockReq clockVo) { public R clock(@RequestBody TemporaryActivityTaskClockReq clockVo) {
service.clock(clockVo); service.taskClock(clockVo);
return R.success(); return R.success();
} }
......
...@@ -92,7 +92,7 @@ public class EmployeeCoreTemClockServiceImpl implements EmployeeCoreTemClockServ ...@@ -92,7 +92,7 @@ public class EmployeeCoreTemClockServiceImpl implements EmployeeCoreTemClockServ
temporaryActivityPhotoDao.updateStatus(tpw,StatusType.INVALID.getType()); temporaryActivityPhotoDao.updateStatus(tpw,StatusType.INVALID.getType());
TemporaryTaskClockDto updateTaskClockDto = new TemporaryTaskClockDto(); TemporaryTaskClockDto updateTaskClockDto = new TemporaryTaskClockDto();
updateTaskClockDto.setId(clockDto.getId()) updateTaskClockDto.setClockId(clockDto.getId())
.setIsDelete(FlagType.YES.getType()); .setIsDelete(FlagType.YES.getType());
taskClockDao.updateTaskClock(updateTaskClockDto); taskClockDao.updateTaskClock(updateTaskClockDto);
return clockDto.getPlanId(); return clockDto.getPlanId();
......
...@@ -18,7 +18,7 @@ public interface TemporaryActivityTaskClockService extends IService<TemporaryAct ...@@ -18,7 +18,7 @@ public interface TemporaryActivityTaskClockService extends IService<TemporaryAct
List<TemporaryActivityTaskClockDO> listByUserId(); List<TemporaryActivityTaskClockDO> listByUserId();
void clock(TemporaryActivityTaskClockReq clockVo); void taskClock(TemporaryActivityTaskClockReq clockVo);
TemporaryActivityTaskClockRes queryByMyTaskType(Integer taskType); TemporaryActivityTaskClockRes queryByMyTaskType(Integer taskType);
} }
...@@ -145,7 +145,7 @@ public class TemporaryActivityTaskClockServiceImpl extends ServiceImpl<Temporary ...@@ -145,7 +145,7 @@ public class TemporaryActivityTaskClockServiceImpl extends ServiceImpl<Temporary
* @param clockVo * @param clockVo
*/ */
@Override @Override
public void clock(TemporaryActivityTaskClockReq clockVo) { public void taskClock(TemporaryActivityTaskClockReq clockVo) {
TemporaryActivityTaskClockDO taskClockDO = temporaryActivityTaskClockDao.selectById(clockVo.getId()); TemporaryActivityTaskClockDO taskClockDO = temporaryActivityTaskClockDao.selectById(clockVo.getId());
if (taskClockDO == null) { if (taskClockDO == null) {
throw new IllegalArgumentException("打卡任务不存在"); throw new IllegalArgumentException("打卡任务不存在");
...@@ -161,7 +161,6 @@ public class TemporaryActivityTaskClockServiceImpl extends ServiceImpl<Temporary ...@@ -161,7 +161,6 @@ public class TemporaryActivityTaskClockServiceImpl extends ServiceImpl<Temporary
} }
} }
BeanUtils.copyProperties(clockVo, taskClockDO); BeanUtils.copyProperties(clockVo, taskClockDO);
// 更新 任务状态为未完成,打卡时间为当前时间 // 更新 任务状态为未完成,打卡时间为当前时间
taskClockDO.setTaskStatus(ActivityClockTaskStatus.COMPLETED.getType()); taskClockDO.setTaskStatus(ActivityClockTaskStatus.COMPLETED.getType());
taskClockDO.setClockTime(new Date()); taskClockDO.setClockTime(new Date());
...@@ -169,7 +168,7 @@ public class TemporaryActivityTaskClockServiceImpl extends ServiceImpl<Temporary ...@@ -169,7 +168,7 @@ public class TemporaryActivityTaskClockServiceImpl extends ServiceImpl<Temporary
temporaryActivityTaskClockDao.update(taskClockDO); temporaryActivityTaskClockDao.update(taskClockDO);
TemporaryActivityPhotoDto dto = new TemporaryActivityPhotoDto(); TemporaryActivityPhotoDto dto = new TemporaryActivityPhotoDto();
dto.setClockId(taskClockDO.getId()) dto.setClockId(taskClockDO.getClockId())
.setTemporaryId(taskClockDO.getTemporaryId()) .setTemporaryId(taskClockDO.getTemporaryId())
.setReportedId(taskClockDO.getReportedId()) .setReportedId(taskClockDO.getReportedId())
.setType(clockVo.getTaskType()); .setType(clockVo.getTaskType());
......
...@@ -162,6 +162,9 @@ public class TemporaryActivityTaskClockSocketHandler extends TextWebSocketHandle ...@@ -162,6 +162,9 @@ public class TemporaryActivityTaskClockSocketHandler extends TextWebSocketHandle
return 0; return 0;
} }
return 1; return 1;
}else{
log.warn("用户[" + userId + "]不存在链接" );
} }
return 0; return 0;
} }
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论