|
@@ -1,26 +1,6 @@
|
|
|
package com.goafanti.order.controller;
|
|
package com.goafanti.order.controller;
|
|
|
|
|
|
|
|
|
|
|
|
|
-
|
|
|
|
|
-
|
|
|
|
|
-
|
|
|
|
|
-
|
|
|
|
|
-import java.util.HashMap;
|
|
|
|
|
-import java.util.List;
|
|
|
|
|
-import java.util.Map;
|
|
|
|
|
-
|
|
|
|
|
-import javax.annotation.Resource;
|
|
|
|
|
-import javax.servlet.http.HttpServletRequest;
|
|
|
|
|
-import javax.servlet.http.HttpServletResponse;
|
|
|
|
|
-
|
|
|
|
|
-import org.apache.commons.lang3.StringUtils;
|
|
|
|
|
-import org.springframework.beans.factory.annotation.Value;
|
|
|
|
|
-import org.springframework.web.bind.annotation.RequestMapping;
|
|
|
|
|
-import org.springframework.web.bind.annotation.RequestMethod;
|
|
|
|
|
-import org.springframework.web.bind.annotation.RequestParam;
|
|
|
|
|
-import org.springframework.web.bind.annotation.RestController;
|
|
|
|
|
-import org.springframework.web.multipart.MultipartFile;
|
|
|
|
|
-
|
|
|
|
|
import com.goafanti.admin.service.AttachmentService;
|
|
import com.goafanti.admin.service.AttachmentService;
|
|
|
import com.goafanti.common.bo.Error;
|
|
import com.goafanti.common.bo.Error;
|
|
|
import com.goafanti.common.bo.Result;
|
|
import com.goafanti.common.bo.Result;
|
|
@@ -37,10 +17,25 @@ import com.goafanti.order.bo.OrderListBo;
|
|
|
import com.goafanti.order.bo.ReceivablesListBo;
|
|
import com.goafanti.order.bo.ReceivablesListBo;
|
|
|
import com.goafanti.order.bo.TOrderInvoiceBo;
|
|
import com.goafanti.order.bo.TOrderInvoiceBo;
|
|
|
import com.goafanti.order.bo.TemporaryReceivablesBo;
|
|
import com.goafanti.order.bo.TemporaryReceivablesBo;
|
|
|
|
|
+import com.goafanti.order.enums.ApprovalTypeEnums;
|
|
|
import com.goafanti.order.service.FundManageOrderService;
|
|
import com.goafanti.order.service.FundManageOrderService;
|
|
|
import com.goafanti.order.service.OrderBillService;
|
|
import com.goafanti.order.service.OrderBillService;
|
|
|
import com.goafanti.order.service.OrderInvoiceService;
|
|
import com.goafanti.order.service.OrderInvoiceService;
|
|
|
import com.goafanti.order.service.OrderReceivablesService;
|
|
import com.goafanti.order.service.OrderReceivablesService;
|
|
|
|
|
+import org.apache.commons.lang3.StringUtils;
|
|
|
|
|
+import org.springframework.beans.factory.annotation.Value;
|
|
|
|
|
+import org.springframework.web.bind.annotation.RequestMapping;
|
|
|
|
|
+import org.springframework.web.bind.annotation.RequestMethod;
|
|
|
|
|
+import org.springframework.web.bind.annotation.RequestParam;
|
|
|
|
|
+import org.springframework.web.bind.annotation.RestController;
|
|
|
|
|
+import org.springframework.web.multipart.MultipartFile;
|
|
|
|
|
+
|
|
|
|
|
+import javax.annotation.Resource;
|
|
|
|
|
+import javax.servlet.http.HttpServletRequest;
|
|
|
|
|
+import javax.servlet.http.HttpServletResponse;
|
|
|
|
|
+import java.util.HashMap;
|
|
|
|
|
+import java.util.List;
|
|
|
|
|
+import java.util.Map;
|
|
|
|
|
|
|
|
@RestController
|
|
@RestController
|
|
|
@RequestMapping(value = "/api/admin/receivables")
|
|
@RequestMapping(value = "/api/admin/receivables")
|
|
@@ -217,6 +212,21 @@ public class AdminOrderReceivablesApiController extends CertifyApiController {
|
|
|
Pagination<OrderListBo> p=(Pagination<OrderListBo>) fundManageOrderService.financeList(o, pageNo, pageSize).get("pagination");
|
|
Pagination<OrderListBo> p=(Pagination<OrderListBo>) fundManageOrderService.financeList(o, pageNo, pageSize).get("pagination");
|
|
|
@SuppressWarnings("unchecked")
|
|
@SuppressWarnings("unchecked")
|
|
|
List<OrderListBo> list=(List<OrderListBo>)p.getList() ;
|
|
List<OrderListBo> list=(List<OrderListBo>)p.getList() ;
|
|
|
|
|
+ for (OrderListBo e : list) {
|
|
|
|
|
+ if (e.getType()!=null){
|
|
|
|
|
+ String[] split = e.getType().split(",");
|
|
|
|
|
+ StringBuffer str=new StringBuffer();
|
|
|
|
|
+ for (String s : split) {
|
|
|
|
|
+ if (s.equals("0")){
|
|
|
|
|
+ str.append(e.getTypeExplain()).append(",");
|
|
|
|
|
+ }else {
|
|
|
|
|
+ String desc = ApprovalTypeEnums.getDesc(Integer.parseInt(s));
|
|
|
|
|
+ str.append(desc).append(",");
|
|
|
|
|
+ }
|
|
|
|
|
+ }
|
|
|
|
|
+ e.setType(str.substring(0,str.length()-1));
|
|
|
|
|
+ }
|
|
|
|
|
+ }
|
|
|
NewExcelUtil<OrderListBo>excel=new NewExcelUtil<>(OrderListBo.class);
|
|
NewExcelUtil<OrderListBo>excel=new NewExcelUtil<>(OrderListBo.class);
|
|
|
return excel.exportExcel(list,"订单回款列表",uploadPath);
|
|
return excel.exportExcel(list,"订单回款列表",uploadPath);
|
|
|
}
|
|
}
|