|
|
@ -66,20 +66,18 @@ public class UserTaskCompleteEventHandler extends BaseApplicationService { |
|
|
if (Objects.isNull(userTaskComplete)) { |
|
|
if (Objects.isNull(userTaskComplete)) { |
|
|
userTaskComplete = UserTaskComplete.init(mq.getUserId(), taskTemplate.getId(), tuple.get(0), tuple.get(1)); |
|
|
userTaskComplete = UserTaskComplete.init(mq.getUserId(), taskTemplate.getId(), tuple.get(0), tuple.get(1)); |
|
|
UserSubTaskComplete userSubTaskComplete = UserSubTaskComplete.init(subTaskTemplate.getId()); |
|
|
UserSubTaskComplete userSubTaskComplete = UserSubTaskComplete.init(subTaskTemplate.getId()); |
|
|
|
|
|
userSubTaskComplete.commit(mq.getCommitCount(), subTaskTemplate.getRequiredCount()); |
|
|
userTaskComplete.setInsertSubList(Collections.singletonList(userSubTaskComplete)); |
|
|
userTaskComplete.setInsertSubList(Collections.singletonList(userSubTaskComplete)); |
|
|
} else { |
|
|
} else { |
|
|
if (!userTaskComplete.getCompleteStatus()) { |
|
|
if (!userTaskComplete.getCompleteStatus()) { |
|
|
UserSubTaskComplete userSubTaskComplete = userTaskCompleteQueryService.querySubBy(userTaskComplete.getId(), subTaskTemplate.getId()); |
|
|
UserSubTaskComplete userSubTaskComplete = userTaskCompleteQueryService.querySubBy(userTaskComplete.getId(), subTaskTemplate.getId()); |
|
|
if (Objects.isNull(userSubTaskComplete)) { |
|
|
if (Objects.isNull(userSubTaskComplete)) { |
|
|
userSubTaskComplete = UserSubTaskComplete.init(subTaskTemplate.getId()); |
|
|
userSubTaskComplete = UserSubTaskComplete.init(subTaskTemplate.getId()); |
|
|
|
|
|
userSubTaskComplete.commit(mq.getCommitCount(), subTaskTemplate.getRequiredCount()); |
|
|
userTaskComplete.setInsertSubList(Collections.singletonList(userSubTaskComplete)); |
|
|
userTaskComplete.setInsertSubList(Collections.singletonList(userSubTaskComplete)); |
|
|
} else { |
|
|
} else { |
|
|
if (!userSubTaskComplete.getCompleteStatus()) { |
|
|
if (!userSubTaskComplete.getCompleteStatus()) { |
|
|
userSubTaskComplete.setCompleteCount(userSubTaskComplete.getCompleteCount() + mq.getCommitCount()); |
|
|
|
|
|
userSubTaskComplete.setCompleteStatus(userSubTaskComplete.getCompleteCount() >= subTaskTemplate.getRequiredCount()); |
|
|
|
|
|
if (userSubTaskComplete.getCompleteStatus()) { |
|
|
|
|
|
userSubTaskComplete.setCompleteTime(LocalDateTime.now()); |
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
userSubTaskComplete.commit(mq.getCommitCount(), subTaskTemplate.getRequiredCount()); |
|
|
userTaskComplete.setUpdateSubList(Collections.singletonList(userSubTaskComplete)); |
|
|
userTaskComplete.setUpdateSubList(Collections.singletonList(userSubTaskComplete)); |
|
|
} |
|
|
} |
|
|
} |
|
|
} |
|
|
|