Procházet zdrojové kódy

流水查看优化

Signed-off-by: anderx <312518615@qq.com>
anderx před 5 roky
rodič
revize
cd972d5644

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

@@ -523,19 +523,25 @@
   </select>
   <!-- 查看自己创建的流水数据 -->
   <select id="myBillList" parameterType="Map" resultType="com.goafanti.common.model.TOrderBillNew">
-  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.remarks,o.contract_no contractNo,
-  	b.transaction_subject as transactionSubject, b.transaction_channel as transactionChannel, b.delete_sign deleteSign,
-  	date_format(b.financial_pay_time,'%Y-%m-%d') as financialPayTimes,b.financial_pay_no as financialPayNo,date_format(b.refund_time,'%Y-%m-%d') refundTimes,
-  	b.creater, ad.name as createrName, o.salesman_id as saleId, oa.name as saleName,b.type,date_format(b.delete_time,'%Y-%m-%d %H:%I:%S') as deleteTimes
-  	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
-  	left join admin ad on b.creater = ad.id
-  	left join t_order_new o on o.order_no = b.order_no
-  	left join admin oa on oa.id = o.salesman_id
-  	where 1=1 
+	   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,
+		tm.buyer_name as payerName, b.remarks, o.contract_no contractNo, b.transaction_subject as transactionSubject,
+		b.transaction_channel as transactionChannel, b.delete_sign deleteSign, date_format(b.financial_pay_time, '%Y-%m-%d') as financialPayTimes,
+		b.financial_pay_no as financialPayNo, date_format(b.refund_time, '%Y-%m-%d') refundTimes, b.creater, ad.name as createrName,
+		tm.salesman_name saleName, b.type, date_format(b.delete_time, '%Y-%m-%d %H:%I:%S') as deleteTimes
+		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 
+		left join admin ad on b.creater = ad.id
+		left join t_order_new o on o.order_no = b.order_no
+		left join t_order_mid tm on tm.order_no=b.order_no
+	  	where 1=1 
+	  	<if test="fids != null and fids.size > 0">
+  		and ,o.finance_id in
+  		<foreach collection="fids" item="id" open="(" separator="," close=")">
+  		 #{id}
+  		</foreach>
+  		</if>
   	<if test="b.orderNo != null and b.orderNo != &quot;&quot;">
   	and b.order_no = #{b.orderNo,jdbcType=VARCHAR}
   	</if>
@@ -547,7 +553,7 @@
   	</if>
   	<if test="b.payerName != null and b.payerName != &quot;&quot;">
   	<bind name="nn" value="'%' + b.payerName + '%'" />
-  	and u.nickname like #{nn,jdbcType=VARCHAR}
+  	and tm.buyer_name like #{nn,jdbcType=VARCHAR}
   	</if>
   	<if test="b.payeeName != null and b.payeeName != &quot;&quot;">
   	<bind name="n" value="'%' + b.payeeName + '%'" />
@@ -567,13 +573,20 @@
 	</if>
   </select>
   <select id="myBillCount" parameterType="Map" resultType="java.lang.Integer">
-  select count(*)
-  	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
-  	left join t_order_new o on o.order_no = b.order_no
-  	left join admin oa on oa.id = o.salesman_id
-  	where 1=1 
+  	select count(*)
+  	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 
+		left join admin ad on b.creater = ad.id
+		left join t_order_new o on o.order_no = b.order_no
+		left join t_order_mid tm on tm.order_no=b.order_no
+	  	where 1=1
+	<if test="fids != null and fids.size > 0">
+  		and ,o.finance_id in
+  		<foreach collection="fids" item="id" open="(" separator="," close=")">
+  		 #{id}
+  		</foreach>
+  	</if>
   	<if test="b.orderNo != null and b.orderNo != &quot;&quot;">
   	and b.order_no = #{b.orderNo,jdbcType=VARCHAR}
   	</if>
@@ -585,7 +598,7 @@
 	</if>
   	<if test="b.payerName != null and b.payerName != &quot;&quot;">
   	<bind name="nn" value="'%' + b.payerName + '%'" />
-  	and u.nickname like #{nn,jdbcType=VARCHAR}
+  	and tm.buyer_name like #{nn,jdbcType=VARCHAR}
   	</if>
   	<if test="b.payeeName != null and b.payeeName != &quot;&quot;">
   	<bind name="n" value="'%' + b.payeeName + '%'" />

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

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

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

@@ -272,9 +272,9 @@ public class FundManagerOrderApiController extends CertifyApiController {
 	 * @return
 	 */
 	@RequestMapping(value="/myBillList", method = RequestMethod.GET)
-	public Result myBillList(TOrderBillNew billNew,Integer whoType ,Integer pageNo, Integer pageSize){
+	public Result myBillList(TOrderBillNew billNew ,Integer pageNo, Integer pageSize){
 		Result res = new Result();
-		res.setData(orderBillServiceImpl.myBillList(billNew,whoType, pageNo, pageSize));
+		res.setData(orderBillServiceImpl.myBillList(billNew, pageNo, pageSize));
 		return res;
 	}
 
@@ -289,7 +289,7 @@ public class FundManagerOrderApiController extends CertifyApiController {
 		return res;
 	}
 	/**
-	 * 查看部门的流水
+	 * 查看部门的流水(并入查看自己)
 	 * @param billNew
 	 * @param pageNo
 	 * @param pageSize
@@ -298,7 +298,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, 1,pageNo, pageSize));
+		res.setData(orderBillServiceImpl.myBillList(billNew,pageNo, pageSize));
 		return res;
 	}
 	

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

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

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

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

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

@@ -1,5 +1,6 @@
 package com.goafanti.order.service.impl;
 
+import java.util.ArrayList;
 import java.util.Date;
 import java.util.HashMap;
 import java.util.List;
@@ -10,6 +11,8 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 
+import com.goafanti.common.constant.AFTConstants;
+import com.goafanti.common.dao.AdminMapper;
 import com.goafanti.common.dao.TOrderBillNewMapper;
 import com.goafanti.common.dao.TOrderNewMapper;
 import com.goafanti.common.model.TOrderBillNew;
@@ -29,17 +32,24 @@ public class OrderBillServiceImpl extends BaseMybatisDao<TOrderBillNewMapper> im
 	private TOrderBillNewMapper billNewMapper;
 	@Autowired
 	private TOrderNewMapper	tOrderNewMapper;
+	@Autowired
+	private AdminMapper	adminMapper;
 	@Value(value = "${upload.path}")
 	private String	uploadPath = null;
 
 
 	@SuppressWarnings("unchecked")
 	@Override
-	public Pagination<TOrderBillNew> myBillList(TOrderBillNew billNew,Integer whoType,
+	public Pagination<TOrderBillNew> myBillList(TOrderBillNew billNew,
 			Integer pageNo, Integer pageSize) {
 		Map<String, Object> params = new HashMap<String, Object>();
-		if(whoType==null)whoType=0;
-		if (whoType==0) billNew.setCreater(TokenManager.getAdminId());
+		List<String>fids= new ArrayList<>();
+		if (TokenManager.hasRole(AFTConstants.FINANCE)) {
+			fids.add(TokenManager.getAdminId());
+		}else if (TokenManager.hasRole(AFTConstants.FINANCE_MANAGER)) {
+			fids=adminMapper.selectBySuperId(TokenManager.getAdminId());
+		}
+		params.put("fids", fids);
 		params.put("b", billNew);
 		return (Pagination<TOrderBillNew>)findPage("myBillList", "myBillCount", params, pageNo, pageSize);
 	}

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

@@ -557,13 +557,13 @@ public class OrderReceivablesServiceImpl extends BaseMybatisDao<TemporaryReceiva
 		
 		@SuppressWarnings("unchecked")
 		@Override
-		public void exportMyBill(HttpServletResponse response, TOrderBillNew billNew,Integer whoType, Integer pageSize, Integer pageNo)throws Exception {
+		public void exportMyBill(HttpServletResponse response, TOrderBillNew billNew, Integer pageSize, Integer pageNo)throws Exception {
 
 			 OutputStream out = response.getOutputStream();
 				if(pageSize==null||pageSize<0)pageSize=9999;
 				if(pageNo==null||pageNo<0)pageNo=1;
 				
-				List<TOrderBillNew>list=(List<TOrderBillNew>) orderBillService.myBillList(billNew, whoType,pageNo, pageSize).getList();
+				List<TOrderBillNew>list=(List<TOrderBillNew>) orderBillService.myBillList(billNew,pageNo, pageSize).getList();
 		    	try {
 		    		//设计表头
 		    		String[] comment = {"订单编号","合同编号","收款时间","财务流水时间","财务流水号","金额(万元)","收款方","付款方","流水科目","平台流水号","收款类型","备注"};