Merge branch 'master_chujiang_0731' into master_quotation

@@ -277,6 +277,8 @@ public class BusinessDataExportHandler implements ExportHandler {
                     dataMap.put("officeClerk", reviewer.getOfficeClerk());
                     dataMap.put("officeClerk", reviewer.getOfficeClerk());
                     // 办事处主管
                     // 办事处主管
                     dataMap.put("officeSupervisor", reviewer.getOfficeSupervisor());
                     dataMap.put("officeSupervisor", reviewer.getOfficeSupervisor());
+                    // 合同类型
+                    dataMap.put("contractType", handleContractType(orderInfo.getContractType()));
                     ExcelUtil.processTemplate(workbook, dataMap);
                     ExcelUtil.processTemplate(workbook, dataMap);
 
 
                     String createTime = orderInfo.getCreateTime().format(dateTimeFormatter);
                     String createTime = orderInfo.getCreateTime().format(dateTimeFormatter);
@@ -326,6 +328,20 @@ public class BusinessDataExportHandler implements ExportHandler {
         }
         }
     }
     }
 
 
+    private String handleContractType(String contractType) {
+        String result = "";
+        if ("DISTRIB_STD".equals(contractType) || "DIST_STOCK_CONTRACT".equals(contractType)
+                || "DRAFT_DIST_AGMT".equals(contractType)) {
+            result = "经销";
+        } else if ("INTL_STD_CONTRACT".equals(contractType) || "INTL_INVENTORY_AGMT".equals(contractType)
+                || "INTL_OPEN_SPEC_AGMT".equals(contractType)) {
+            result = "外贸";
+        } else if ("PROCESS_STD_AGMT".equals(contractType)) {
+            result = "加工";
+        }
+        return result;
+    }
+
     private int setCellValue(Workbook workbook, Sheet sheet, int rowIndex, List<ReceiptLedgerReportDetail> detailList) {
     private int setCellValue(Workbook workbook, Sheet sheet, int rowIndex, List<ReceiptLedgerReportDetail> detailList) {
         if (CollectionUtils.isEmpty(detailList)) {
         if (CollectionUtils.isEmpty(detailList)) {
             return rowIndex;
             return rowIndex;