|
|
@@ -1,40 +1,12 @@
|
|
|
package com.goafanti.order.service.impl;
|
|
|
|
|
|
-import java.math.BigDecimal;
|
|
|
-import java.util.*;
|
|
|
-
|
|
|
-import javax.annotation.Resource;
|
|
|
-
|
|
|
import com.goafanti.admin.service.DepartmentService;
|
|
|
-import com.goafanti.common.model.*;
|
|
|
-import com.goafanti.order.bo.*;
|
|
|
-import org.apache.commons.lang3.StringUtils;
|
|
|
-import org.apache.poi.ss.usermodel.Cell;
|
|
|
-import org.apache.poi.ss.usermodel.CellType;
|
|
|
-import org.apache.poi.ss.usermodel.Row;
|
|
|
-import org.apache.poi.ss.usermodel.Sheet;
|
|
|
-import org.apache.poi.ss.usermodel.Workbook;
|
|
|
-import org.apache.poi.ss.util.CellRangeAddress;
|
|
|
-import org.apache.poi.xssf.usermodel.XSSFCell;
|
|
|
-import org.apache.poi.xssf.usermodel.XSSFCellStyle;
|
|
|
-import org.apache.poi.xssf.usermodel.XSSFRow;
|
|
|
-import org.apache.poi.xssf.usermodel.XSSFSheet;
|
|
|
-import org.apache.poi.xssf.usermodel.XSSFWorkbook;
|
|
|
-import org.springframework.beans.factory.annotation.Autowired;
|
|
|
-import org.springframework.stereotype.Service;
|
|
|
-import org.springframework.web.multipart.MultipartFile;
|
|
|
-
|
|
|
import com.goafanti.common.bo.Error;
|
|
|
import com.goafanti.common.constant.AFTConstants;
|
|
|
-import com.goafanti.common.dao.TOrderBillNewMapper;
|
|
|
-import com.goafanti.common.dao.TOrderBonusMapper;
|
|
|
-import com.goafanti.common.dao.TOrderLogMapper;
|
|
|
-import com.goafanti.common.dao.TOrderMidMapper;
|
|
|
-import com.goafanti.common.dao.TOrderNewMapper;
|
|
|
-import com.goafanti.common.dao.TOrderTaskMapper;
|
|
|
-import com.goafanti.common.dao.TemporaryReceivablesMapper;
|
|
|
+import com.goafanti.common.dao.*;
|
|
|
import com.goafanti.common.enums.OrderLogProcess;
|
|
|
import com.goafanti.common.error.BusinessException;
|
|
|
+import com.goafanti.common.model.*;
|
|
|
import com.goafanti.common.utils.DateUtils;
|
|
|
import com.goafanti.common.utils.ExcelUtils;
|
|
|
import com.goafanti.common.utils.ExportExcelUtil;
|
|
|
@@ -42,16 +14,19 @@ import com.goafanti.common.utils.LoggerUtils;
|
|
|
import com.goafanti.core.mybatis.BaseMybatisDao;
|
|
|
import com.goafanti.core.mybatis.page.Pagination;
|
|
|
import com.goafanti.core.shiro.token.TokenManager;
|
|
|
-import com.goafanti.order.enums.ApprovalNewState;
|
|
|
-import com.goafanti.order.enums.BonusSubject;
|
|
|
-import com.goafanti.order.enums.LiquidationNewState;
|
|
|
-import com.goafanti.order.enums.ProcessStatus;
|
|
|
-import com.goafanti.order.enums.ReceivablesStatus;
|
|
|
-import com.goafanti.order.enums.TransactionSubject;
|
|
|
-import com.goafanti.order.service.FundManageOrderService;
|
|
|
-import com.goafanti.order.service.OrderBillService;
|
|
|
-import com.goafanti.order.service.OrderInvoiceService;
|
|
|
+import com.goafanti.order.bo.*;
|
|
|
+import com.goafanti.order.enums.*;
|
|
|
import com.goafanti.order.service.OrderReceivablesService;
|
|
|
+import org.apache.commons.lang3.StringUtils;
|
|
|
+import org.apache.poi.ss.usermodel.*;
|
|
|
+import org.apache.poi.ss.util.CellRangeAddress;
|
|
|
+import org.apache.poi.xssf.usermodel.*;
|
|
|
+import org.springframework.beans.factory.annotation.Autowired;
|
|
|
+import org.springframework.stereotype.Service;
|
|
|
+import org.springframework.web.multipart.MultipartFile;
|
|
|
+
|
|
|
+import java.math.BigDecimal;
|
|
|
+import java.util.*;
|
|
|
|
|
|
@Service
|
|
|
public class OrderReceivablesServiceImpl extends BaseMybatisDao<TemporaryReceivablesMapper> implements OrderReceivablesService{
|
|
|
@@ -524,7 +499,7 @@ public class OrderReceivablesServiceImpl extends BaseMybatisDao<TemporaryReceiva
|
|
|
switch (comment[i]) {
|
|
|
// String[] comment = {"编号","订单编号","开票金额(万元)","申请时间","开票状态"};
|
|
|
case "编号": o = ob.getId().toString(); break;
|
|
|
- case "订单编号": o = ob.getOrderno(); break;
|
|
|
+ case "订单编号": o = ob.getOrderNo(); break;
|
|
|
case "开票金额(万元)": o = ob.getAmount().toString(); break;
|
|
|
case "申请时间": o = ob.getCreateTime(); break;
|
|
|
case "开票状态":
|