|
|
|
|
@ -690,8 +690,10 @@ public class PdaSaveServiceImpl extends BaseServiceImpl<WorkPlanMapper, WorkPlan |
|
|
|
|
yieldOrder.setPrimaryCraft(rr.getDeptcode()); |
|
|
|
|
yieldOrder.setStatus(YieldOrderEnum.STATUS_APS.getCode()); |
|
|
|
|
yieldOrder.setReceiveStatus(YieldOrderEnum.RECEIVE_STATUS_YES.getCode()); |
|
|
|
|
List<User> users = userClient.listByNameNolike(rr.getRecman()); |
|
|
|
|
yieldOrder.setReceiveUser(CollectionUtils.isNotEmpty(users) ? users.get(0).getId() : AuthUtil.getUserId()); |
|
|
|
|
if (StringUtils.isNotBlank(rr.getRecman())) { |
|
|
|
|
List<User> users = userClient.listByNameNolike(rr.getRecman()); |
|
|
|
|
yieldOrder.setReceiveUser(CollectionUtils.isNotEmpty(users) ? users.get(0).getId() : AuthUtil.getUserId()); |
|
|
|
|
} |
|
|
|
|
yieldOrder.setReceiveTime(new Date()); |
|
|
|
|
yieldOrder.setReworkCode(rr.getRedono()); |
|
|
|
|
yieldOrder.setReworkNo((long) rr.getSeqno()); |
|
|
|
|
|