Commit a6576852 by “zcwang”

modify: 导出字段优化

parent 2143e24b
Pipeline #44752 passed with stages
in 1 minute 47 seconds
...@@ -276,7 +276,7 @@ public class ChangeFlowExportCallback implements DesCallbackService { ...@@ -276,7 +276,7 @@ public class ChangeFlowExportCallback implements DesCallbackService {
for (ChangeExecRecord changeExecRecord : changeExecRecords) { for (ChangeExecRecord changeExecRecord : changeExecRecords) {
// 组装通用信息,除商品信息,行动项以外其他字段一致 // 组装通用信息,除商品信息,行动项以外其他字段一致
ChangeFlowExcelDTO changeFlowExcelDTO = this.obtainCommon(record, changeSubjectEnum, orgMap); ChangeFlowExcelDTO changeFlowExcelDTO = this.obtainCommon(record, changeSubjectEnum, orgMap);
String changeSupplier = record.getChangeSupplier(); String changeSupplier = StringUtils.isBlank(record.getChangeSupplier()) ? "" : record.getChangeSupplier();
String changeSupplierName = ""; String changeSupplierName = "";
if (StringUtils.isNotBlank(changeSupplier)) { if (StringUtils.isNotBlank(changeSupplier)) {
List<SupplierSimpleRsp> supplierSimple = supplierService.getSupplierName(changeSupplier); List<SupplierSimpleRsp> supplierSimple = supplierService.getSupplierName(changeSupplier);
...@@ -285,7 +285,8 @@ public class ChangeFlowExportCallback implements DesCallbackService { ...@@ -285,7 +285,8 @@ public class ChangeFlowExportCallback implements DesCallbackService {
changeSupplierName = supplier.getSupplierName(); changeSupplierName = supplier.getSupplierName();
} }
} }
changeFlowExcelDTO.setSupplier(changeSupplier + changeSupplierName); changeFlowExcelDTO.setSupplier(
StringUtils.isBlank(changeSupplier) ? "/" : changeSupplier + changeSupplierName);
changeFlowExcelDTO.setChangeItem(null); changeFlowExcelDTO.setChangeItem(null);
changeFlowExcelDTO.setSPUId(null); changeFlowExcelDTO.setSPUId(null);
changeFlowExcelDTO.setQcCategory(null); changeFlowExcelDTO.setQcCategory(null);
......
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