Commit 710ff197a53b3a3965932639b44d2af05379d956
Merge remote-tracking branch 'origin/dev' into test
Showing
2 changed files
with
5 additions
and
0 deletions
fw-valhalla-domain/src/main/java/cn/fw/valhalla/domain/dto/LeaveAllocationDTO.java
| @@ -19,6 +19,9 @@ public class LeaveAllocationDTO { | @@ -19,6 +19,9 @@ public class LeaveAllocationDTO { | ||
| 19 | @NotNull(message = "分配方式不能为空") | 19 | @NotNull(message = "分配方式不能为空") |
| 20 | private Integer allocationType; | 20 | private Integer allocationType; |
| 21 | 21 | ||
| 22 | + /** | ||
| 23 | + * 指定人员id | ||
| 24 | + */ | ||
| 22 | private Long userId; | 25 | private Long userId; |
| 23 | 26 | ||
| 24 | /** | 27 | /** |
fw-valhalla-service/src/main/java/cn/fw/valhalla/service/bus/LeaveNeedDoBizService.java
| @@ -301,6 +301,8 @@ public class LeaveNeedDoBizService { | @@ -301,6 +301,8 @@ public class LeaveNeedDoBizService { | ||
| 301 | } | 301 | } |
| 302 | } | 302 | } |
| 303 | clearKey(key); | 303 | clearKey(key); |
| 304 | + BackLogItemDTO backLogItemDTO = new BackLogItemDTO(null, getLeave2doCode(), String.valueOf(leaveId), new Date()); | ||
| 305 | + todoRpcService.complete(backLogItemDTO); | ||
| 304 | } | 306 | } |
| 305 | 307 | ||
| 306 | private String getLockKey(final Long leaveId) { | 308 | private String getLockKey(final Long leaveId) { |