主单查询子单接口开发
This commit is contained in:
parent
f874c268da
commit
a9fcc6bba9
|
|
@ -590,4 +590,36 @@ public class OrderMasterController extends BaseController {
|
||||||
orderMasterService.cancelAgree(orderMasterId, agree);
|
orderMasterService.cancelAgree(orderMasterId, agree);
|
||||||
return AjaxResult.success();
|
return AjaxResult.success();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@PostMapping("/app/getDetailListByMasterId")
|
||||||
|
@ResponseBody
|
||||||
|
public AjaxResult getDetailListByMasterId(@RequestBody Long orderMasterId) {
|
||||||
|
try {
|
||||||
|
List<OrderStandardDetail> orderStandardDetails = new ArrayList<>();
|
||||||
|
List<OrderDetail> detailList = orderDetailService.selectByOrderMasterId(orderMasterId);
|
||||||
|
detailList.forEach(detail -> {
|
||||||
|
// 师傅信息
|
||||||
|
Worker worker = workerService.selectById(detail.getWorkerId());
|
||||||
|
|
||||||
|
WorkerCertification workerRealInfo = null;
|
||||||
|
String workerName = "";
|
||||||
|
if (worker != null) {
|
||||||
|
// 师傅实名信息
|
||||||
|
workerRealInfo = workerCertificationService.selectByWorkerId(detail.getWorkerId());
|
||||||
|
workerName = workerRealInfo == null ? worker.getName() : workerRealInfo.getName();
|
||||||
|
}
|
||||||
|
|
||||||
|
OrderStandardDetail detailRes = new OrderStandardDetail();
|
||||||
|
detailRes.setOrderDetailId(detail.getId());
|
||||||
|
detailRes.setOrderDetailCode(detail.getCode());
|
||||||
|
detailRes.setWorkerName(workerName);
|
||||||
|
detailRes.setRemark(workerName + "(" + detail.getCode() + ")");
|
||||||
|
orderStandardDetails.add(detailRes);
|
||||||
|
});
|
||||||
|
return AjaxResult.success(orderStandardDetails);
|
||||||
|
} catch (Exception e) {
|
||||||
|
e.printStackTrace();
|
||||||
|
return AjaxResult.error(ExceptionUtil.getExceptionMessage(e));
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue