Commit b84da93f by “zcwang”

modify: 变更工单详情展示供应商名称

parent 7cf87fe5
Pipeline #44337 passed with stages
in 1 minute 38 seconds
...@@ -180,7 +180,7 @@ public class ChangeFlowBiz { ...@@ -180,7 +180,7 @@ public class ChangeFlowBiz {
public String createAndSubmit(ChangeFlowCreateReq changeFlowCreateReq) { public String createAndSubmit(ChangeFlowCreateReq changeFlowCreateReq) {
String uid = RequestLocalBean.getUid(); String uid = RequestLocalBean.getUid();
String name = RequestLocalBean.getName(); String name = RequestLocalBean.getName();
log.debug("[create] createReq={}, uid:{}, name:{}", JSON.toJSONString(changeFlowCreateReq), uid, name); log.info("[create] createReq={}, uid:{}, name:{}", JSON.toJSONString(changeFlowCreateReq), uid, name);
// 校验变更主体 // 校验变更主体
checkSubject(changeFlowCreateReq); checkSubject(changeFlowCreateReq);
Long parentChangeClassId = changeFlowCreateReq.getParentChangeClassId(); Long parentChangeClassId = changeFlowCreateReq.getParentChangeClassId();
...@@ -973,15 +973,15 @@ public class ChangeFlowBiz { ...@@ -973,15 +973,15 @@ public class ChangeFlowBiz {
changeFlowVO.setChangeCommander(changeRecord.getChangeCommander()); changeFlowVO.setChangeCommander(changeRecord.getChangeCommander());
String changeSupplier = changeRecord.getChangeSupplier(); String changeSupplier = changeRecord.getChangeSupplier();
changeFlowVO.setChangeSupplier(changeSupplier); changeFlowVO.setChangeSupplier(changeSupplier);
String changeSupplierView = ""; String changeSupplierName = "";
if (StringUtils.isNotBlank(changeSupplier)) { if (StringUtils.isNotBlank(changeSupplier)) {
List<SupplierSimpleRsp> supplierSimple = supplierService.getSupplierName(changeSupplier); List<SupplierSimpleRsp> supplierSimple = supplierService.getSupplierName(changeSupplier);
if (CollectionUtils.isNotEmpty(supplierSimple)) { if (CollectionUtils.isNotEmpty(supplierSimple)) {
SupplierSimpleRsp supplier = supplierSimple.get(0); SupplierSimpleRsp supplier = supplierSimple.get(0);
changeSupplierView = supplier.getSupplierId() + supplier.getSupplierName(); changeSupplierName = supplier.getSupplierName();
} }
} }
changeFlowVO.setChangeSupplierView(changeSupplierView); changeFlowVO.setChangeSupplierName(changeSupplierName);
changeFlowVO.setChangeReason(changeRecord.getChangeReason()); changeFlowVO.setChangeReason(changeRecord.getChangeReason());
changeFlowVO.setChangeContent(changeRecord.getChangeContent()); changeFlowVO.setChangeContent(changeRecord.getChangeContent());
changeFlowVO.setChangeRiskDesc(changeRecord.getChangeRiskDesc()); changeFlowVO.setChangeRiskDesc(changeRecord.getChangeRiskDesc());
......
...@@ -115,9 +115,9 @@ public class ChangeFlowVO { ...@@ -115,9 +115,9 @@ public class ChangeFlowVO {
*/ */
private String changeSupplier; private String changeSupplier;
/** /**
* 变更供应商详情展示,供应商id+供应商名称 * 变更供应商详情展示,供应商名称
*/ */
private String changeSupplierView; private String changeSupplierName;
/** /**
* 变更状态 * 变更状态
* @see ChangeStatusEnum * @see ChangeStatusEnum
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment