modify: 导出字段优化

yanxuan-qc-change-system-biz/src/main/java/com/netease/mail/yanxuan/change/biz/callback/ChangeFlowExportCallback.java

@@ -33,6 +33,7 @@ import com.netease.mail.yanxuan.change.biz.service.change.ChangeTypeService;
 import com.netease.mail.yanxuan.change.biz.service.rpc.ItemService;
 import com.netease.mail.yanxuan.change.biz.service.rpc.IusService;
 import com.netease.mail.yanxuan.change.biz.service.rpc.QCService;
+import com.netease.mail.yanxuan.change.biz.service.rpc.SupplierService;
 import com.netease.mail.yanxuan.change.common.enums.BusinessFormEnum;
 import com.netease.mail.yanxuan.change.common.enums.ChangeLevelEnum;
 import com.netease.mail.yanxuan.change.common.enums.ChangeResultEnum;
@@ -58,6 +59,7 @@ import com.netease.mail.yanxuan.change.integration.flow.UserQueryDTO;
 import com.netease.mail.yanxuan.change.integration.flow.ius.req.IusDepartmentReq;
 import com.netease.mail.yanxuan.change.integration.flow.ius.rsp.IusUserInfoRsp;
 import com.netease.mail.yanxuan.change.integration.flow.ius.rsp.SecondaryDepartments;
+import com.netease.mail.yanxuan.change.integration.flow.supplier.rsp.SupplierSimpleRsp;
 import com.netease.mail.yanxuan.change.integration.item.SimplePhyCateGoryResultCo;
 import com.netease.mail.yanxuan.change.integration.item.meta.SpuTO;
 import com.netease.mail.yanxuan.change.integration.item.param.BatchQuerySpuInfoParam;
@@ -95,6 +97,9 @@ public class ChangeFlowExportCallback implements DesCallbackService {
     @Autowired
     private IusService iusService;
 
+    @Autowired
+    private SupplierService supplierService;
+
     @Override
     public ExcelTitle queryExcelTitle(CallbackQueryReq req) {
         log.info("[op: change flow export callback queryExcelTitle] req={}", JSON.toJSONString(req));
@@ -272,7 +277,16 @@ public class ChangeFlowExportCallback implements DesCallbackService {
                     for (ChangeExecRecord changeExecRecord : changeExecRecords) {
                         // 组装通用信息，除商品信息，行动项以外其他字段一致
                         ChangeFlowExcelDTO changeFlowExcelDTO = this.obtainCommon(record, changeSubjectEnum, orgMap);
-                        changeFlowExcelDTO.setSupplier(StringUtils.isBlank(record.getChangeSupplier())? "/": record.getChangeSupplier());
+                        String changeSupplier = record.getChangeSupplier();
+                        String changeSupplierName = "";
+                        if (StringUtils.isNotBlank(changeSupplier)) {
+                            List<SupplierSimpleRsp> supplierSimple = supplierService.getSupplierName(changeSupplier);
+                            if (CollectionUtils.isNotEmpty(supplierSimple)) {
+                                SupplierSimpleRsp supplier = supplierSimple.get(0);
+                                changeSupplierName = supplier.getSupplierName();
+                            }
+                        }
+                        changeFlowExcelDTO.setSupplier(changeSupplier + changeSupplierName);
                         changeFlowExcelDTO.setChangeItem(null);
                         changeFlowExcelDTO.setSPUId(null);
                         changeFlowExcelDTO.setQcCategory(null);