anderx 6 anos atrás
pai
commit
11a1d7d5d3

+ 7 - 1
src/main/java/com/goafanti/common/mapper/TOrderBonusMapper.xml

@@ -378,7 +378,7 @@
   		left join admin oa on oa.id = o.salesman_id
   		left join admin ga on ga.id = b.grant_by 
   		where  b.grant_type = 1
-  		<if test="fids != null">
+  		<if test="fids != null and fids.size > 0">
   		and b.grant_by in
   		<foreach collection="fids" item="id" open="(" separator="," close=")">
   		 #{id}
@@ -473,6 +473,12 @@
 	left join `user` u on o.buyer_id = u.id
 	left join admin ad on b.grant_by = ad.id
 	where b.grant_type = 0
+	<if test="fids != null and fids.size > 0">
+  		and b.grant_by in
+  		<foreach collection="fids" item="id" open="(" separator="," close=")">
+  		 #{id}
+  		</foreach>
+  	</if>
 	<if test="b.grantBy != null">
 	and b.grant_by = #{b.grantBy,jdbcType=VARCHAR}
 	</if>

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

@@ -69,7 +69,6 @@ public class OrderBonusStatisticsApiController extends CertifyApiController {
 	 @RequestMapping(value="/saleBonusStatistics", method = RequestMethod.GET)
 	 public Result saleBonusStatistics(TOrderBonusBo bonusBo, Integer pageNo, Integer pageSize){
 		 Result res = new Result();
-		 bonusBo.setGrantBy(TokenManager.getAdminId());
 		 res.setData(orderBonusServiceImpl.saleBonusStatistics(bonusBo, pageNo, pageSize));
 		 return res;
 	 }
@@ -101,7 +100,6 @@ public class OrderBonusStatisticsApiController extends CertifyApiController {
 	 @RequestMapping(value="/technicianBonusStatistics", method = RequestMethod.GET)
 	 public Result technicianBonusStatistics(TOrderBonusBo bonusBo,Integer pageNo, Integer pageSize){
 		 Result res = new Result();
-		 
 		 res.setData(orderBonusServiceImpl.technicianBonusStatistics(bonusBo, pageNo, pageSize));
 		 return res;
 	 }

+ 9 - 1
src/main/java/com/goafanti/order/service/impl/OrderBonusServiceImpl.java

@@ -72,8 +72,8 @@ public class OrderBonusServiceImpl extends BaseMybatisDao<TOrderBonusMapper> imp
 		}else if (TokenManager.hasRole(AFTConstants.FINANCE_MANAGER)) {
 			fids=adminMapper.selectBySuperId(TokenManager.getAdminId());
 		}
-		params.put("b", newBo);
 		params.put("fids", fids);
+		params.put("b", newBo);
 		Pagination<OrderListBo> data = (Pagination<OrderListBo>)findPage("technicianBonusList", "technicianBonusCount", params, pageNo, pageSize);
 		return data;
 	}
@@ -84,6 +84,14 @@ public class OrderBonusServiceImpl extends BaseMybatisDao<TOrderBonusMapper> imp
 	@Override
 	public Pagination<TOrderBonusBo> saleBonusStatistics(TOrderBonusBo newBo, Integer pageNo, Integer pageSize) {
 		Map<String, Object> params = new HashMap<String, Object>();
+		
+		List<String> fids=new ArrayList<>();
+		if (TokenManager.hasRole(AFTConstants.FINANCE)) {
+			newBo.setGrantBy(TokenManager.getAdminId());
+		}else if (TokenManager.hasRole(AFTConstants.FINANCE_MANAGER)) {
+			fids=adminMapper.selectBySuperId(TokenManager.getAdminId());
+		}
+		params.put("fids", fids);
 		params.put("b", newBo);
 		Pagination<TOrderBonusBo> data = (Pagination<TOrderBonusBo>)findPage("saleBonusList", "saleBonusCount", params, pageNo, pageSize);