Merge remote-tracking branch 'origin/master'

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleapply/app/AppVehicleApplyVo.java

@@ -50,4 +50,7 @@ public class AppVehicleApplyVo implements Vo {
     private String payRemarks;
     @ApiModelProperty("采购系统")
     private String orgDeptName;
+
+    @ApiModelProperty("附件信息")
+    private List<String> fileList = new ArrayList<>();
 }

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/busvehicleapply/BusVehicleApplyService.java

@@ -34,7 +34,6 @@ import com.yxt.anrui.base.biz.basevehiclemodel.BaseVehicleModelService;
 import com.yxt.anrui.base.biz.busvehicleapplydetail.BusVehicleApplyDetailService;
 import com.yxt.anrui.base.biz.busvehicleapplysz.BusVehicleApplySzService;
 import com.yxt.anrui.base.biz.commonappendix.CommonAppendixService;
-import com.yxt.anrui.base.biz.commoncontract.CommonContractService;
 import com.yxt.anrui.base.common.enums.BillTypeEnum;
 import com.yxt.anrui.base.common.enums.DictCommonEnum;
 import com.yxt.anrui.base.common.enums.ManPurOrderType;
@@ -882,6 +881,18 @@ public class BusVehicleApplyService extends MybatisBaseService<BusVehicleApplyMa
         AppVehicleApplyVo vo = baseMapper.getVehicleApply(sid);
         List<AppVehicleApplyListVo> records = busVehicleApplyDetailService.getVehicleApply(sid);
         vo.setRecords(records);
+        List<CommonAppendixVo> commonAppendixVos = commonAppendixService.selByLinkSid(sid);
+        commonAppendixVos.removeAll(Collections.singleton(null));
+        List<String> fileList = new ArrayList<>();
+        if(!commonAppendixVos.isEmpty()){
+            for (CommonAppendixVo commonAppendixVo : commonAppendixVos) {
+                String filePath = commonAppendixVo.getFilePath();
+                String urlPrefix = fileUploadComponent.getUrlPrefix();
+                filePath = urlPrefix + filePath;
+                fileList.add(filePath);
+            }
+        }
+        vo.setFileList(fileList);
         return rb.success().setData(vo);
     }
 

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/order/OrderDetailsVo.java

@@ -92,4 +92,5 @@ public class OrderDetailsVo implements Vo {
     @ApiModelProperty("内部推荐人")
     private String recommender;
 
+
 }