Browse Source

订单流水查询修改

anderx 6 years ago
parent
commit
37ae2fce2b

+ 3 - 3
src/main/java/com/goafanti/common/mapper/TOrderBillNewMapper.xml

@@ -491,12 +491,12 @@
   </select>
   <!-- 查看自己创建的流水数据 -->
   <select id="myBillList" parameterType="Map" resultType="com.goafanti.common.model.TOrderBillNew">
-  select 
+ select 
   	b.bill_no as billNo, b.order_no as orderNo, b.transaction_amount as transactionAmount,date_format(b.create_time,'%Y-%m-%d %H:%I:%S') as createTimes,
   	b.payer_id as payerId, b.payee_id as payeeId, u.nickname as payerName, a.nickname as payeeName, 
   	b.transaction_subject as transactionSubject, b.transaction_channel as transactionChannel, 
-  	b.financial_pay_time as financialPayTime,b.financial_pay_no as financialPayNo,
-  	b.creater, ad.name as createrName, o.salesman_id as saleId, oa.name as saleName
+  	date_format(b.financial_pay_time,'%Y-%m-%d') as financialPayTimes,b.financial_pay_no as financialPayNo,
+  	b.creater, ad.name as createrName, o.salesman_id as saleId, oa.name as saleName,b.type
   	from t_order_bill_new b
   	left join `user` u on b.payer_id = u.id
   	left join `user` a on b.payee_id = a.id

+ 11 - 10
src/main/java/com/goafanti/common/mapper/TOrderNewMapper.xml

@@ -1079,22 +1079,23 @@
   </select>
   <!-- 财务专员查看需要待收款的数据 -->
   <select id="financeList" parameterType="Map" resultType="com.goafanti.order.bo.OrderListBo">
-    	 select  o.order_no as orderNo, o.sign_time as signTime, u.nickname as buyerName, o.order_status as orderStatus,
+  select  o.order_no as orderNo, o.sign_time as signTime, u.nickname as buyerName, o.order_status as orderStatus,
    o.process_status as processStatus,ifnull(b.amount,0) as actuallyTotalAmount, o.contract_no as contractNo,o.approval,
   a.name as sellerName, o.salesman_id as sellerId, o.buyer_id as buyerId, o.liquidation_status as liquidationStatus , 
-  o.first_amount as signFirstPayment, o.total_amount as signTotalAmount,o.create_time as createTime,e.name as outsourceName,
-  0 as companyId, "湖南科德信息咨询有限公司" as companyName,d.name as departmentName from t_order_new o left join department d 
-  on o.order_dep=d.id left join `user` u on o.buyer_id = u.id left join admin a on o.salesman_id = a.id left join 
-  (select sum(transaction_amount) as amount ,order_no from t_order_bill_new group by order_no ) b on b.order_no = o.order_no 
-  left join (select order_no,max(name) as name from outsource_organization group by order_no) e 
-  on o.order_no=e.order_no where delete_sign != 1 and outsource=#{o.outsource,jdbcType=INTEGER}
+  o.first_amount as signFirstPayment, o.total_amount as signTotalAmount,date_format(o.create_time, '%Y-%m-%d %H:%i:%s') as createTime,e.name as outsourceName,
+  0 as companyId, "湖南科德信息咨询有限公司" as companyName,d.name as departmentName,f.transaction_amount finalReceivables ,
+  f.finalReceivablesTime,g.invoiceAmount  from t_order_new o left join department d   on o.order_dep=d.id left join `user` u on o.buyer_id = u.id 
+  left join admin a on o.salesman_id = a.id left join (select sum(transaction_amount) as amount ,order_no from t_order_bill_new group by order_no ) b
+  on b.order_no = o.order_no left join (select order_no,max(name) as name from outsource_organization group by order_no) e 
+  on o.order_no=e.order_no left join (select transaction_amount ,order_no,date_format(max(create_time), '%Y-%m-%d %H:%i:%s')finalReceivablesTime from t_order_bill_new group by order_no) f 
+  on o.order_no=f.order_no left join (select order_no ,sum(amount) invoiceAmount  from t_order_invoice where status=2 group by order_no ) g
+  on o.order_no=g.order_no  where delete_sign != 1 and outsource=  #{o.outsource,jdbcType=INTEGER}
   	 	<if test="o.processStatus == 3">
-	  	and process_status = #{o.processStatus,jdbcType=INTEGER}
+	  	and o.process_status = #{o.processStatus,jdbcType=INTEGER}
 	  	</if>
 	  	<if test="o.processStatus == 4">
-	  	and process_status &gt;= #{o.processStatus,jdbcType=INTEGER}
+	  	and o.process_status &gt;= #{o.processStatus,jdbcType=INTEGER}
 	  	</if>
-  		and process_status
   		and (approval = 0 or approval = 2)
 	  	and o.finance_id = #{o.financeId,jdbcType=VARCHAR}
   		<if test="o.orderStatus != null and o.orderStatus != &quot;&quot;">

+ 3 - 3
src/main/java/com/goafanti/common/model/TOrderBillNew.java

@@ -387,10 +387,10 @@ public class TOrderBillNew {
     private String saleId;
     private String saleName;
     private String departmentName;
-    private String createTimes;
+	private String createTimes;
     
     public String getFinancialPayTimes() {
-		return financialPayTimes;
+		return this.financialPayTimes;
 	}
 
 	public void setFinancialPayTimes(String financialPayTimes) {
@@ -470,7 +470,7 @@ public class TOrderBillNew {
 	}
 
 	public String getCreateTimes() {
-		return this.createTimes;
+		return this.createTimes; 
 	}
 
 	public void setCreateTimes(String createTimes) {

+ 26 - 0
src/main/java/com/goafanti/order/bo/OrderListBo.java

@@ -76,7 +76,33 @@ public class OrderListBo {
 	private Integer outsource;
 	/** 外包名称*/
 	private String outsourceName;
+	/** 最后收款 */
+	private String finalReceivables;
+	/** 最后收款 时间*/
+	private String finalReceivablesTime;
+	/** 开票金额 */
+	private String invoiceAmount;
 	
+	
+	
+	public String getFinalReceivables() {
+		return finalReceivables;
+	}
+	public void setFinalReceivables(String finalReceivables) {
+		this.finalReceivables = finalReceivables;
+	}
+	public String getFinalReceivablesTime() {
+		return finalReceivablesTime;
+	}
+	public void setFinalReceivablesTime(String finalReceivablesTime) {
+		this.finalReceivablesTime = finalReceivablesTime;
+	}
+	public String getInvoiceAmount() {
+		return invoiceAmount;
+	}
+	public void setInvoiceAmount(String invoiceAmount) {
+		this.invoiceAmount = invoiceAmount;
+	}
 	public String getOrderNo() {
 		return orderNo;
 	}

+ 2 - 2
src/main/java/com/goafanti/order/controller/AdminOrderReceivablesApiController.java

@@ -190,10 +190,10 @@ public class AdminOrderReceivablesApiController extends CertifyApiController {
      * @return
      */
     @RequestMapping(value = "/exportTemplate" , method = RequestMethod.GET)
-    public Result exportTemplate(HttpServletResponse response,OrderListBo o)  {
+    public Result exportTemplate(HttpServletResponse response,OrderListBo o,Integer pageSize ,Integer pageNo)  {
     	Result res=new Result();
 			try {
-				orderReceivablesService.exportTemplate( response, o);
+				orderReceivablesService.exportTemplate( response, o,pageSize,pageNo);
 			} catch (Exception e) {
 				res.getError().add(buildError("格式不正确"));
 				e.printStackTrace();

+ 2 - 1
src/main/java/com/goafanti/order/service/OrderReceivablesService.java

@@ -34,6 +34,7 @@ public interface OrderReceivablesService {
 	Map<String, Object> getCountlistReceivables(ReceivablesListBo rl, Integer status, String adminName, String adminDepId,
 			String orderDepId);
 
-	void exportTemplate(HttpServletResponse response,OrderListBo o)throws Exception;
+	void exportTemplate(HttpServletResponse response,OrderListBo o, Integer pageSize, Integer pageNo)throws Exception;
+
 
 }

+ 1 - 8
src/main/java/com/goafanti/order/service/impl/OrderBillServiceImpl.java

@@ -34,14 +34,7 @@ public class OrderBillServiceImpl extends BaseMybatisDao<TOrderBillNewMapper> im
 			Integer pageNo, Integer pageSize) {
 		Map<String, Object> params = new HashMap<String, Object>();
 		params.put("b", billNew);
-		Pagination<TOrderBillNew> data = (Pagination<TOrderBillNew>)findPage("myBillList", "myBillCount", params, pageNo, pageSize);
-		List<TOrderBillNew> l=(List<TOrderBillNew>) data.getList();
-		for (TOrderBillNew t : l) {
-			if (t.getFinancialPayTime()!=null) {
-				t.setFinancialPayTimes(DateFormatUtils.format(t.getFinancialPayTime(), AFTConstants.YYYYMMDD));
-			}
-		}
-		return data;
+		return (Pagination<TOrderBillNew>)findPage("myBillList", "myBillCount", params, pageNo, pageSize);
 	}
 
 

+ 11 - 8
src/main/java/com/goafanti/order/service/impl/OrderReceivablesServiceImpl.java

@@ -420,19 +420,23 @@ public class OrderReceivablesServiceImpl extends BaseMybatisDao<TemporaryReceiva
 	}
 		@SuppressWarnings("unchecked")
 		@Override
-		public void exportTemplate(HttpServletResponse response,OrderListBo order) throws Exception {
+		public void exportTemplate(HttpServletResponse response,OrderListBo order, Integer pageSize, Integer pageNo) throws Exception {
 			 OutputStream out = response.getOutputStream();
-			//财务专员自己的id
+			 	//	财务专员自己的id
 				order.setFinanceId(TokenManager.getAdminId());
 				//order.setProcessStatus(3);//分配给自己 改为前端 传3未分配  4已分配
 				order.setOrderStatus(2);//营销管理员审核通过
-				List<OrderListBo> list=(List<OrderListBo>) fundManageOrderService.financeList(order, 1, 9999).getList();
+				if(pageSize==null||pageSize<0)pageSize=9999;
+				if(pageNo==null||pageNo<0)pageNo=1;
+				List<OrderListBo> list=(List<OrderListBo>) fundManageOrderService.financeList(order, pageNo, pageSize).getList();
 		    	try {
 		    		//设计表头
 		    		String[] comment = {"订单编号", "合同编号","客户名称","订单部门","订单负责人","签单日期","下单日期", 
-							"签单金额(万元)", "已开票金额(万元)", "已收金额(万元)","最近收款(万元)","结算状态","订单流程","是否特批"};
+							"签单金额(万元)", "已开票金额(万元)", "已收金额(万元)","最近收款(万元)","最近收款时间","结算状态","订单流程","是否特批"};
 		    		String fileName = "收款结算列表" + new SimpleDateFormat("yyyy-MM-dd HH:mm").format(new Date()) + ".xls";
 		    		XSSFWorkbook wb =exportTemplateInfoS(comment,"收款结算",list);
+		    		//根据列表编写文档
+					
 		    		//返回名称及参数
 					 response.addHeader("Content-Disposition", "attachment;filename="  + new String(fileName.getBytes(),"iso-8859-1"));  
 					 response.setContentType("application/octet-stream;charset=utf-8");
@@ -477,9 +481,7 @@ public class OrderReceivablesServiceImpl extends BaseMybatisDao<TemporaryReceiva
 				c.setCellValue(comment[i]);
 				c.setCellStyle(style2);
 			}
-			//根据列表编写文档
 			addSettlementReceivablesList(comment, list, sheet);
-			
 			return wb;
 		}
 		private static void addSettlementReceivablesList(String[] comment, List<OrderListBo> list, XSSFSheet sheet) {
@@ -500,9 +502,10 @@ public class OrderReceivablesServiceImpl extends BaseMybatisDao<TemporaryReceiva
 					case "签单日期": o = ob.getSignTime(); break;
 					case "下单日期": o = ob.getCreateTime(); break;
 					case "签单金额(万元)":o=ob.getSignTotalAmount();break;
-					case "已开票金额(万元)":o="";break;
+					case "已开票金额(万元)":o=ob.getInvoiceAmount();break;
 					case "已收金额(万元)":o=ob.getActuallyTotalAmount();break;
-					case "最近收款(万元)":o="";break;
+					case "最近收款(万元)":o=ob.getFinalReceivables();break;
+					case "最近收款时间":o=ob.getFinalReceivablesTime();break;
 					case "结算状态":o=LiquidationNewState.getValueByCode(ob.getLiquidationStatus());break;
 					case "订单流程":o=ProcessStatus.getValueByCode(ob.getProcessStatus());break;
 					case "是否特批":o=ApprovalNewState.getValueByCode(ob.getApproval());break;

+ 4 - 4
src/main/resources/props/config_local.properties

@@ -60,12 +60,12 @@ template.cacheable=false
 portal.host=//sf.jishutao.com/portal/2.0.6
 avatar.upload.host=//sb.jishutao.com/upload
 #连接开发
-#static.host=//sb.jishutao.com/1.1.22
-#avatar.host=//sb.jishutao.com
+static.host=//sb.jishutao.com/1.1.22
+avatar.host=//sb.jishutao.com
 
 #连测试
-avatar.host=//static.jishutao.com
-static.host=//static.jishutao.com/1.1.22
+#avatar.host=//static.jishutao.com
+#static.host=//static.jishutao.com/1.1.22
 
 upload.path=F:/data/public/upload
 upload.private.path=F:/data/private/upload