Browse Source

财务导出BUG修复

Signed-off-by: anderx <312518615@qq.com>
anderx 6 years ago
parent
commit
9fda11d0a2

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

@@ -1083,15 +1083,12 @@
 	o.process_status as processStatus, ifnull(b.amount, 0) as actuallyTotalAmount, o.contract_no as contractNo, o.approval, 
 	a.salesman_name as sellerName, o.salesman_id as sellerId, o.buyer_id as buyerId, o.liquidation_status as liquidationStatus ,too.amount outsourceAmount,
 	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, d.name as departmentName, f.transaction_amount finalReceivables ,
-	date_format(f.create_time, '%Y-%m-%d %H:%i:%s')finalReceivablesTime, g.invoiceAmount from t_order_new o 
+	e.name as outsourceName, 0 as companyId, d.name as departmentName, a.final_receivables finalReceivables ,
+	date_format(a.`final_Receivables_time`, '%Y-%m-%d %H:%i:%s')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 t_order_mid a on o.order_no=a.order_no 
 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 x1.order_no,max(create_time) create_time,max(transaction_amount)transaction_amount from 
-(select x.order_no,x.create_time,x.transaction_amount from t_order_bill_new x right join (select order_no, max(create_time) maxTime from t_order_bill_new group by order_no)y
-	on  x.order_no=y.order_no and x.create_time=y.maxTime)x1 group by x1.order_no ) f on o.order_no = f.order_no left join t_order_outsource too on o.order_no=too.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
+left join t_order_outsource too on o.order_no=too.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 (approval = 0 or approval = 2) and outsource=  #{o.outsource,jdbcType=INTEGER}	
   	 	<if test="o.processStatus == 3">
 	  	and o.process_status = #{o.processStatus,jdbcType=INTEGER}

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

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

+ 4 - 4
src/main/java/com/goafanti/order/controller/FundManagerOrderApiController.java

@@ -270,13 +270,13 @@ public class FundManagerOrderApiController extends CertifyApiController {
 	 * @param billNew
 	 * @param pageNo
 	 * @param pageSize
+	 * @param type 0自己 1所有
 	 * @return
 	 */
 	@RequestMapping(value="/myBillList", method = RequestMethod.GET)
-	public Result myBillList(TOrderBillNew billNew, Integer pageNo, Integer pageSize){
+	public Result myBillList(TOrderBillNew billNew,Integer whoType ,Integer pageNo, Integer pageSize){
 		Result res = new Result();
-		billNew.setCreater(TokenManager.getAdminId());
-		res.setData(orderBillServiceImpl.myBillList(billNew, pageNo, pageSize));
+		res.setData(orderBillServiceImpl.myBillList(billNew,whoType, pageNo, pageSize));
 		return res;
 	}
 
@@ -290,7 +290,7 @@ public class FundManagerOrderApiController extends CertifyApiController {
 	@RequestMapping(value="/deptBillList", method = RequestMethod.GET)
 	public Result deptBillList(TOrderBillNew billNew, Integer pageNo, Integer pageSize){
 		Result res = new Result();
-		res.setData(orderBillServiceImpl.myBillList(billNew, pageNo, pageSize));
+		res.setData(orderBillServiceImpl.myBillList(billNew, 1,pageNo, pageSize));
 		return res;
 	}
 	

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

@@ -12,9 +12,10 @@ public interface OrderBillService {
 	 * @param billNew
 	 * @param pageNo
 	 * @param pageSize
+	 * @param pageSize2 
 	 * @return
 	 */
-	Pagination<TOrderBillNew> myBillList(TOrderBillNew billNew, Integer pageNo, Integer pageSize);
+	Pagination<TOrderBillNew> myBillList(TOrderBillNew billNew, Integer whoType, Integer pageNo, Integer pageSize);
 	
 	/**
 	 * 导出流水数据

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

@@ -37,7 +37,7 @@ public interface OrderReceivablesService {
 
 	void exportInvoice(HttpServletResponse response, String orderNo, Integer pageSize, Integer pageNo)throws Exception;
 
-	void exportMyBill(HttpServletResponse response, String orderNo, Integer pageSize, Integer pageNo)throws Exception;
+	void exportMyBill(HttpServletResponse response, String orderNo,Integer whoType, Integer pageSize, Integer pageNo)throws Exception;
 
 
 }

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

@@ -17,6 +17,7 @@ import com.goafanti.common.utils.ExportExcelUtil;
 import com.goafanti.common.utils.StringUtils;
 import com.goafanti.core.mybatis.BaseMybatisDao;
 import com.goafanti.core.mybatis.page.Pagination;
+import com.goafanti.core.shiro.token.TokenManager;
 import com.goafanti.order.service.OrderBillService;
 
 @Service
@@ -30,9 +31,11 @@ public class OrderBillServiceImpl extends BaseMybatisDao<TOrderBillNewMapper> im
 
 	@SuppressWarnings("unchecked")
 	@Override
-	public Pagination<TOrderBillNew> myBillList(TOrderBillNew billNew,
+	public Pagination<TOrderBillNew> myBillList(TOrderBillNew billNew,Integer whoType,
 			Integer pageNo, Integer pageSize) {
 		Map<String, Object> params = new HashMap<String, Object>();
+		if(whoType==null)whoType=0;
+		if (whoType==0) billNew.setCreater(TokenManager.getAdminId());
 		params.put("b", billNew);
 		return (Pagination<TOrderBillNew>)findPage("myBillList", "myBillCount", params, pageNo, pageSize);
 	}

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

@@ -570,22 +570,22 @@ public class OrderReceivablesServiceImpl extends BaseMybatisDao<TemporaryReceiva
 		
 		@SuppressWarnings("unchecked")
 		@Override
-		public void exportMyBill(HttpServletResponse response, String orderNo, Integer pageSize, Integer pageNo)throws Exception {
+		public void exportMyBill(HttpServletResponse response, String orderNo,Integer whoType, Integer pageSize, Integer pageNo)throws Exception {
 
 			 OutputStream out = response.getOutputStream();
 				if(pageSize==null||pageSize<0)pageSize=9999;
 				if(pageNo==null||pageNo<0)pageNo=1;
 				TOrderBillNew billNew=new TOrderBillNew();
 				billNew.setOrderNo(orderNo);
-				List<TOrderBillNew>list=(List<TOrderBillNew>) orderBillService.myBillList(billNew, pageNo, pageSize).getList();
+				List<TOrderBillNew>list=(List<TOrderBillNew>) orderBillService.myBillList(billNew, whoType,pageNo, pageSize).getList();
 		    	try {
 		    		//设计表头
+		    		if(orderNo==null)orderNo="";
 		    		String[] comment = {"订单编号","合同编号","收款时间","财务流水时间","财务流水号","金额(万元)","收款方","付款方","流水科目","平台流水号","收款类型","备注"};
 		    		String fileName = orderNo+"流水记录列表" + new SimpleDateFormat("yyyy-MM-dd HH:mm").format(new Date()) + ".xls";
 		    		//type 0 收款 1开票 2流水
 		    		XSSFWorkbook wb =exportTemplateInfoS(comment,"流水记录",list,2);
 		    		//根据列表编写文档
-					
 		    		//返回名称及参数
 					 response.addHeader("Content-Disposition", "attachment;filename="  + new String(fileName.getBytes(),"iso-8859-1"));  
 					 response.setContentType("application/octet-stream;charset=utf-8");

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

@@ -1,13 +1,13 @@
 #Driver
 jdbc.driverClassName=com.mysql.jdbc.Driver
 #本地
-jdbc.url=jdbc\:mysql\://localhost\:3306/aft?useUnicode\=true&characterEncoding\=UTF-8&autoReconnect\=true&useSSL\=false
-jdbc.username=dev
-jdbc.password=123456
+#jdbc.url=jdbc\:mysql\://localhost\:3306/aft?useUnicode\=true&characterEncoding\=UTF-8&autoReconnect\=true&useSSL\=false
+#jdbc.username=dev
+#jdbc.password=123456
 #测试
-#jdbc.url=jdbc:mysql://101.37.32.31:3306/aft_fz?useUnicode=true&characterEncoding=UTF-8&autoReconnect=true&useSSL=false
-#jdbc.username=root
-#jdbc.password=aftdev
+jdbc.url=jdbc:mysql://101.37.32.31:3306/aft_fz?useUnicode=true&characterEncoding=UTF-8&autoReconnect=true&useSSL=false
+jdbc.username=root
+jdbc.password=aftdev
 #\u68c0\u6d4b\u6570\u636e\u5e93\u94fe\u63a5\u662f\u5426\u6709\u6548\uff0c\u5fc5\u987b\u914d\u7f6e
 jdbc.validationQuery=SELECT 'x'
 #\u521d\u59cb\u8fde\u63a5\u6570