|
@@ -470,13 +470,12 @@ public class SysImplementPlanManager {
|
|
|
|
|
|
}
|
|
|
|
|
|
- public SysImplementPlanVO.ToList findById(Long plainId) {
|
|
|
- SysImplementPlan p = implementPlanService.getById(plainId);
|
|
|
+ public SysImplementPlanVO.ToList findById(Long planId) {
|
|
|
+ SysImplementPlan p = implementPlanService.getById(planId);
|
|
|
SysImplementPlanVO.ToList copied = BeanUtil.copyProperties(p, SysImplementPlanVO.ToList.class);
|
|
|
|
|
|
// 设置承接人信息
|
|
|
// 获取承接人
|
|
|
-
|
|
|
Map<Integer, SysDept> consigneeMap = deptService.mapConsignee(new HashSet<>(Collections.singletonList(p.getConsigneeId())));
|
|
|
Map<String, Object> consigneeInfo = new HashMap<>(2);
|
|
|
consigneeInfo.put("consigneeId", p.getConsigneeId());
|
|
@@ -494,6 +493,16 @@ public class SysImplementPlanManager {
|
|
|
skuInfo.put("manufacturer", MapUtil.isEmpty(sku) ? "" : sku.get("ent_name"));
|
|
|
copied.setSkuInfo(skuInfo);
|
|
|
|
|
|
+ // planDtl
|
|
|
+
|
|
|
+ // 获取计划详情
|
|
|
+ List<SysImplPlanDetails> details = implPlanDetailsService.list(Wrappers.<SysImplPlanDetails>lambdaQuery()
|
|
|
+ .eq(SysImplPlanDetails::getPlanId, planId)
|
|
|
+ .orderByDesc(SysImplPlanDetails::getUpdateTime)
|
|
|
+ );
|
|
|
+ copied.setPlanDetails(CollUtil.isEmpty(details) ? null : details.get(0));
|
|
|
+
|
|
|
+
|
|
|
return copied;
|
|
|
}
|
|
|
}
|