ソースを参照

查询BUG修改

anderx 3 年 前
コミット
18f8b8c121

+ 89 - 65
src/main/java/com/goafanti/common/mapper/TemporaryReceivablesMapper.xml

@@ -92,7 +92,7 @@
       This element is automatically generated by MyBatis Generator, do not modify.
       This element is automatically generated by MyBatis Generator, do not modify.
       This element was generated on Mon Oct 14 11:33:48 CST 2019.
       This element was generated on Mon Oct 14 11:33:48 CST 2019.
     -->
     -->
-    id, order_no, corporate_name, amount, receivables_time, aid, remarks, status, create_time, 
+    id, order_no, corporate_name, amount, receivables_time, aid, remarks, status, create_time,
     financial_pay_no
     financial_pay_no
   </sql>
   </sql>
   <select id="selectByExample" parameterType="com.goafanti.common.model.TemporaryReceivablesExample" resultMap="BaseResultMap">
   <select id="selectByExample" parameterType="com.goafanti.common.model.TemporaryReceivablesExample" resultMap="BaseResultMap">
@@ -120,7 +120,7 @@
       This element is automatically generated by MyBatis Generator, do not modify.
       This element is automatically generated by MyBatis Generator, do not modify.
       This element was generated on Mon Oct 14 11:33:48 CST 2019.
       This element was generated on Mon Oct 14 11:33:48 CST 2019.
     -->
     -->
-    select 
+    select
     <include refid="Base_Column_List" />
     <include refid="Base_Column_List" />
     from temporary_receivables
     from temporary_receivables
     where id = #{id,jdbcType=INTEGER}
     where id = #{id,jdbcType=INTEGER}
@@ -151,13 +151,13 @@
       This element is automatically generated by MyBatis Generator, do not modify.
       This element is automatically generated by MyBatis Generator, do not modify.
       This element was generated on Mon Oct 14 11:33:48 CST 2019.
       This element was generated on Mon Oct 14 11:33:48 CST 2019.
     -->
     -->
-    insert into temporary_receivables (id, order_no, corporate_name, 
-      amount, receivables_time, aid, 
-      remarks, status, create_time, 
+    insert into temporary_receivables (id, order_no, corporate_name,
+      amount, receivables_time, aid,
+      remarks, status, create_time,
       financial_pay_no)
       financial_pay_no)
-    values (#{id,jdbcType=INTEGER}, #{orderNo,jdbcType=VARCHAR}, #{corporateName,jdbcType=VARCHAR}, 
-      #{amount,jdbcType=DECIMAL}, #{receivablesTime,jdbcType=TIMESTAMP}, #{aid,jdbcType=VARCHAR}, 
-      #{remarks,jdbcType=VARCHAR}, #{status,jdbcType=INTEGER}, #{createTime,jdbcType=TIMESTAMP}, 
+    values (#{id,jdbcType=INTEGER}, #{orderNo,jdbcType=VARCHAR}, #{corporateName,jdbcType=VARCHAR},
+      #{amount,jdbcType=DECIMAL}, #{receivablesTime,jdbcType=TIMESTAMP}, #{aid,jdbcType=VARCHAR},
+      #{remarks,jdbcType=VARCHAR}, #{status,jdbcType=INTEGER}, #{createTime,jdbcType=TIMESTAMP},
       #{financialPayNo,jdbcType=VARCHAR})
       #{financialPayNo,jdbcType=VARCHAR})
   </insert>
   </insert>
   <insert id="insertSelective" parameterType="com.goafanti.common.model.TemporaryReceivables">
   <insert id="insertSelective" parameterType="com.goafanti.common.model.TemporaryReceivables">
@@ -363,25 +363,25 @@
       financial_pay_no = #{financialPayNo,jdbcType=VARCHAR}
       financial_pay_no = #{financialPayNo,jdbcType=VARCHAR}
     where id = #{id,jdbcType=INTEGER}
     where id = #{id,jdbcType=INTEGER}
   </update>
   </update>
-  
+
    <delete id="deleteByids" parameterType="java.util.List">
    <delete id="deleteByids" parameterType="java.util.List">
     delete from temporary_receivables
     delete from temporary_receivables
-    where id in 
-	 <foreach close=")" collection="list" index="index" item="item" open="(" separator=",">   
-            #{item}   
+    where id in
+	 <foreach close=")" collection="list" index="index" item="item" open="(" separator=",">
+            #{item}
          </foreach>
          </foreach>
   </delete>
   </delete>
    <delete id="deleteByaid" parameterType="java.lang.String">
    <delete id="deleteByaid" parameterType="java.lang.String">
     delete from temporary_receivables
     delete from temporary_receivables
-    where aid = #{aid} 
+    where aid = #{aid}
   </delete>
   </delete>
   <delete id="deleteNormalByaid">
   <delete id="deleteNormalByaid">
   delete from temporary_receivables
   delete from temporary_receivables
     where aid = #{aid} and status &lt; 2
     where aid = #{aid} and status &lt; 2
   </delete>
   </delete>
   <select id="selectByaid" resultMap="BaseResultMap">
   <select id="selectByaid" resultMap="BaseResultMap">
-  
-    select 
+
+    select
     <include refid="Base_Column_List" />
     <include refid="Base_Column_List" />
     from temporary_receivables
     from temporary_receivables
     where aid = #{aid,jdbcType=INTEGER}
     where aid = #{aid,jdbcType=INTEGER}
@@ -391,15 +391,15 @@
     b.total_amount totalAmount,d.name depName,a.status ,b.settlement_amount settlementAmount,
     b.total_amount totalAmount,d.name depName,a.status ,b.settlement_amount settlementAmount,
 	a.financial_pay_no financialPayNo,a.amount,date_format(a.receivables_time, '%Y-%m-%d')receivablesTimes,
 	a.financial_pay_no financialPayNo,a.amount,date_format(a.receivables_time, '%Y-%m-%d')receivablesTimes,
 	date_format(a.create_time, '%Y-%m-%d %H:%i:%S')createTimes,a.remarks,c.username
 	date_format(a.create_time, '%Y-%m-%d %H:%i:%S')createTimes,a.remarks,c.username
-	from temporary_receivables a left join t_order_new b on a.order_no=b.order_no left join user c on b.buyer_id=c.id 
-	left join department d on b.order_dep=d.id left join admin e on b.salesman_id=e.id 
+	from temporary_receivables a left join t_order_new b on a.order_no=b.order_no left join user c on b.buyer_id=c.id
+	left join department d on b.order_dep=d.id left join admin e on b.salesman_id=e.id
 	where 1=1
 	where 1=1
 	<if test="aid != null">
 	<if test="aid != null">
 	and  a.aid= #{aid}
 	and  a.aid= #{aid}
 	</if>
 	</if>
 	<if test="contractNo != null">
 	<if test="contractNo != null">
 	b.contract_no like concat('%',#{contractNo},'%')
 	b.contract_no like concat('%',#{contractNo},'%')
-	</if> 
+	</if>
 	<if test="orderNo != null">
 	<if test="orderNo != null">
 	and a.order_no = #{orderNo}
 	and a.order_no = #{orderNo}
 	</if>
 	</if>
@@ -412,11 +412,17 @@
 	<if test="corporateName != null">
 	<if test="corporateName != null">
 	and a.corporate_name like concat('%',#{corporateName},'%')
 	and a.corporate_name like concat('%',#{corporateName},'%')
 	</if>
 	</if>
-	<if test="orderDepId != null">
-	and b.order_dep= #{orderDepId}
+	<if test="orderDeps != null">
+	and b.order_dep in
+        <foreach close=")" collection="orderDeps" item="depId" open="(" separator=",">
+            #{depId}
+        </foreach>
 	</if>
 	</if>
-	<if test="adminDepId != null">
-	and  e.department_id= #{adminDepId}
+	<if test="adminDeps != null">
+	and  e.department_id in
+        <foreach close=")" collection="adminDeps" item="depId" open="(" separator=",">
+            #{depId}
+        </foreach>
 	</if>
 	</if>
 	<if test="status != null">
 	<if test="status != null">
 	and a.status= #{status}
 	and a.status= #{status}
@@ -428,14 +434,14 @@
   </select>
   </select>
   <select id="selectReceivablesCount"  resultType="java.lang.Integer">
   <select id="selectReceivablesCount"  resultType="java.lang.Integer">
   	select count(*) from temporary_receivables a left join t_order_new b on a.order_no=b.order_no left join user c on b.buyer_id=c.id left join department d on b.order_dep=d.id
   	select count(*) from temporary_receivables a left join t_order_new b on a.order_no=b.order_no left join user c on b.buyer_id=c.id left join department d on b.order_dep=d.id
-	left join admin e on b.salesman_id=e.id 
+	left join admin e on b.salesman_id=e.id
 	where 1=1
 	where 1=1
 	<if test="aid != null">
 	<if test="aid != null">
 	and  a.aid= #{aid}
 	and  a.aid= #{aid}
 	</if>
 	</if>
 	<if test="contractNo != null">
 	<if test="contractNo != null">
 	b.contract_no like concat('%',#{contractNo},'%')
 	b.contract_no like concat('%',#{contractNo},'%')
-	</if> 
+	</if>
 	<if test="orderNo != null">
 	<if test="orderNo != null">
 	and a.order_no = #{orderNo}
 	and a.order_no = #{orderNo}
 	</if>
 	</if>
@@ -448,26 +454,32 @@
 	<if test="corporateName != null">
 	<if test="corporateName != null">
 	and a.corporate_name like concat('%',#{corporateName},'%')
 	and a.corporate_name like concat('%',#{corporateName},'%')
 	</if>
 	</if>
-	<if test="orderDepId != null">
-	and b.order_dep= #{orderDepId}
-	</if>
-	<if test="adminDepId != null">
-	and  e.department_id= #{adminDepId}
-	</if>
+      <if test="orderDeps != null">
+          and b.order_dep in
+          <foreach close=")" collection="orderDeps" item="depId" open="(" separator=",">
+              #{depId}
+          </foreach>
+      </if>
+      <if test="adminDeps != null">
+          and  e.department_id in
+          <foreach close=")" collection="adminDeps" item="depId" open="(" separator=",">
+              #{depId}
+          </foreach>
+      </if>
 	<if test="status != null">
 	<if test="status != null">
 	and a.status= #{status}
 	and a.status= #{status}
 	</if>
 	</if>
   </select>
   </select>
   <select id="getCountlistReceivablesAmount" parameterType="Map" resultType="java.lang.String">
   <select id="getCountlistReceivablesAmount" parameterType="Map" resultType="java.lang.String">
-  select  ifnull(sum(a.amount),0) amount from temporary_receivables a left join t_order_new b on a.order_no=b.order_no 
-	left join user c on b.buyer_id=c.id left join department d on b.order_dep=d.id left join admin e on b.salesman_id=e.id 
+  select  ifnull(sum(a.amount),0) amount from temporary_receivables a left join t_order_new b on a.order_no=b.order_no
+	left join user c on b.buyer_id=c.id left join department d on b.order_dep=d.id left join admin e on b.salesman_id=e.id
 	where 1=1
 	where 1=1
 	<if test="aid != null">
 	<if test="aid != null">
 	and  a.aid= #{aid}
 	and  a.aid= #{aid}
 	</if>
 	</if>
 	<if test="contractNo != null">
 	<if test="contractNo != null">
 	and b.contract_no like concat('%',#{contractNo},'%')
 	and b.contract_no like concat('%',#{contractNo},'%')
-	</if> 
+	</if>
 	<if test="orderNo != null">
 	<if test="orderNo != null">
 	and a.order_no = #{orderNo}
 	and a.order_no = #{orderNo}
 	</if>
 	</if>
@@ -480,28 +492,34 @@
 	<if test="corporateName != null">
 	<if test="corporateName != null">
 	and a.corporate_name like concat('%',#{corporateName},'%')
 	and a.corporate_name like concat('%',#{corporateName},'%')
 	</if>
 	</if>
-	<if test="orderDepId != null">
-	and b.order_dep= #{orderDepId}
-	</if>
-	<if test="adminDepId != null">
-	and  e.department_id= #{adminDepId}
-	</if>
+      <if test="orderDeps != null">
+          and b.order_dep in
+          <foreach close=")" collection="orderDeps" item="depId" open="(" separator=",">
+              #{depId}
+          </foreach>
+      </if>
+      <if test="adminDeps != null">
+          and  e.department_id in
+          <foreach close=")" collection="adminDeps" item="depId" open="(" separator=",">
+              #{depId}
+          </foreach>
+      </if>
 	<if test="status != null">
 	<if test="status != null">
 	and a.status= #{status}
 	and a.status= #{status}
 	</if>
 	</if>
 	</select>
 	</select>
-	
+
 	<select id="getCountlistReceivablesTotalAmount" parameterType="Map" resultType="java.lang.String">
 	<select id="getCountlistReceivablesTotalAmount" parameterType="Map" resultType="java.lang.String">
-  select ifnull(sum(x.total_amount),0) from (select  b.order_no,b.total_amount  from temporary_receivables a 
-  left join t_order_new b on a.order_no=b.order_no left join user c on b.buyer_id=c.id left join department d on b.order_dep=d.id 
-	left join admin e on b.salesman_id=e.id 
+  select ifnull(sum(x.total_amount),0) from (select  b.order_no,b.total_amount  from temporary_receivables a
+  left join t_order_new b on a.order_no=b.order_no left join user c on b.buyer_id=c.id left join department d on b.order_dep=d.id
+	left join admin e on b.salesman_id=e.id
 	where 1=1
 	where 1=1
 	<if test="aid != null">
 	<if test="aid != null">
 	and  a.aid= #{aid}
 	and  a.aid= #{aid}
 	</if>
 	</if>
 	<if test="contractNo != null">
 	<if test="contractNo != null">
 	and b.contract_no like concat('%',#{contractNo},'%')
 	and b.contract_no like concat('%',#{contractNo},'%')
-	</if> 
+	</if>
 	<if test="orderNo != null">
 	<if test="orderNo != null">
 	and a.order_no = #{orderNo}
 	and a.order_no = #{orderNo}
 	</if>
 	</if>
@@ -514,43 +532,49 @@
 	<if test="corporateName != null">
 	<if test="corporateName != null">
 	and a.corporate_name like concat('%',#{corporateName},'%')
 	and a.corporate_name like concat('%',#{corporateName},'%')
 	</if>
 	</if>
-	<if test="orderDepId != null">
-	and b.order_dep= #{orderDepId}
-	</if>
-	<if test="adminDepId != null">
-	and  e.department_id= #{adminDepId}
-	</if>
+        <if test="orderDeps != null">
+            and b.order_dep in
+            <foreach close=")" collection="orderDeps" item="depId" open="(" separator=",">
+                #{depId}
+            </foreach>
+        </if>
+        <if test="adminDeps != null">
+            and  e.department_id in
+            <foreach close=")" collection="adminDeps" item="depId" open="(" separator=",">
+                #{depId}
+            </foreach>
+        </if>
 	<if test="status != null">
 	<if test="status != null">
-	and a.status= #{status} 
+	and a.status= #{status}
 	</if>
 	</if>
 	group by b.order_no)x
 	group by b.order_no)x
 	</select>
 	</select>
-  
+
     <insert id="insertBatch" parameterType="com.goafanti.common.model.TemporaryReceivables">
     <insert id="insertBatch" parameterType="com.goafanti.common.model.TemporaryReceivables">
     insert into temporary_receivables (id, order_no, corporate_name, amount, receivables_time,
     insert into temporary_receivables (id, order_no, corporate_name, amount, receivables_time,
      aid, remarks, status, create_time, financial_pay_no) values
      aid, remarks, status, create_time, financial_pay_no) values
       <foreach item="item" index="index" collection="list" separator=",">
       <foreach item="item" index="index" collection="list" separator=",">
-      (#{item.id,jdbcType=INTEGER}, #{item.orderNo,jdbcType=VARCHAR}, #{item.corporateName,jdbcType=VARCHAR}, 
-      #{item.amount,jdbcType=DECIMAL}, #{item.receivablesTime,jdbcType=TIMESTAMP}, #{item.aid,jdbcType=VARCHAR}, 
-      #{item.remarks,jdbcType=VARCHAR}, #{item.status,jdbcType=INTEGER}, #{item.createTime,jdbcType=TIMESTAMP}, 
+      (#{item.id,jdbcType=INTEGER}, #{item.orderNo,jdbcType=VARCHAR}, #{item.corporateName,jdbcType=VARCHAR},
+      #{item.amount,jdbcType=DECIMAL}, #{item.receivablesTime,jdbcType=TIMESTAMP}, #{item.aid,jdbcType=VARCHAR},
+      #{item.remarks,jdbcType=VARCHAR}, #{item.status,jdbcType=INTEGER}, #{item.createTime,jdbcType=TIMESTAMP},
       #{item.financialPayNo,jdbcType=VARCHAR})
       #{item.financialPayNo,jdbcType=VARCHAR})
     </foreach>
     </foreach>
   </insert>
   </insert>
-  
+
   <update id="updateRepeatOrderNo" >
   <update id="updateRepeatOrderNo" >
-	update temporary_receivables x ,(select a.order_no,a.amount,a.receivables_time,a.nickname 
-	from (select a.order_no,a.corporate_name,a.amount,a.receivables_time,b.nickname,count(1) counts 
-	from temporary_receivables a left join (select x1.order_no,y1.nickname from t_order_new x1 
-	left join user y1 on x1.buyer_id=y1.id )b on a.order_no=b.order_no where a.corporate_name=b.nickname 
-	group by a.order_no,a.corporate_name,a.amount,a.receivables_time)a where a.counts>1 )y set x.status=1 
-	where x.order_no=y.order_no and x.amount=y.amount and x.receivables_time=y.receivables_time 
+	update temporary_receivables x ,(select a.order_no,a.amount,a.receivables_time,a.nickname
+	from (select a.order_no,a.corporate_name,a.amount,a.receivables_time,b.nickname,count(1) counts
+	from temporary_receivables a left join (select x1.order_no,y1.nickname from t_order_new x1
+	left join user y1 on x1.buyer_id=y1.id )b on a.order_no=b.order_no where a.corporate_name=b.nickname
+	group by a.order_no,a.corporate_name,a.amount,a.receivables_time)a where a.counts>1 )y set x.status=1
+	where x.order_no=y.order_no and x.amount=y.amount and x.receivables_time=y.receivables_time
 	and x.corporate_name=y.nickname and x.aid= #{aid}
 	and x.corporate_name=y.nickname and x.aid= #{aid}
   </update>
   </update>
   <select id="selectReceivablesNumberRepeats"  parameterType="com.goafanti.common.model.TemporaryReceivables" resultType="java.lang.Integer">
   <select id="selectReceivablesNumberRepeats"  parameterType="com.goafanti.common.model.TemporaryReceivables" resultType="java.lang.Integer">
    select  count(*) from t_order_bill_new a left join user b on a.payer_id=b.id
    select  count(*) from t_order_bill_new a left join user b on a.payer_id=b.id
-	where a.order_no= #{orderNo} 
+	where a.order_no= #{orderNo}
 	and b.nickname= #{corporateName}
 	and b.nickname= #{corporateName}
-	and a.transaction_amount= #{amount} 
+	and a.transaction_amount= #{amount}
 	and a.financial_pay_time= #{receivablesTime}
 	and a.financial_pay_time= #{receivablesTime}
   </select>
   </select>
-</mapper>
+</mapper>

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

@@ -123,13 +123,13 @@ public class AdminOrderReceivablesApiController extends CertifyApiController {
 	}
 	}
 
 
 	@RequestMapping(value ="/listReceivables",method = RequestMethod.GET)
 	@RequestMapping(value ="/listReceivables",method = RequestMethod.GET)
-	public Result listReceivables(ReceivablesListBo rl,Integer status,String adminName,String adminDepId,String orderDepId,Integer pageSize,Integer pageNo){
+	public Result listReceivables(ReceivablesListBo rl,Integer status,String adminName,String adminDeps,String orderDeps,Integer pageSize,Integer pageNo){
 		Result res = new Result();
 		Result res = new Result();
 		Map<String, Object>map =new HashMap<>();
 		Map<String, Object>map =new HashMap<>();
 		//列表数据
 		//列表数据
-		map.put("pagination", orderReceivablesService.listReceivables(  rl,status,adminName,  adminDepId, orderDepId, pageSize, pageNo));
+		map.put("pagination", orderReceivablesService.listReceivables(  rl,status,adminName,  adminDeps, orderDeps, pageSize, pageNo));
 		//统计数据
 		//统计数据
-		map.put("count",orderReceivablesService.getCountlistReceivables(  rl,status,adminName,  adminDepId, orderDepId));
+		map.put("count",orderReceivablesService.getCountlistReceivables(  rl,status,adminName,  adminDeps, orderDeps));
 		res.data(map);
 		res.data(map);
 		return res;
 		return res;
 	}
 	}

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

@@ -24,12 +24,12 @@ public interface OrderReceivablesService {
 
 
 	void batchListReceivables(MultipartFile file);
 	void batchListReceivables(MultipartFile file);
 
 
-	Pagination<ReceivablesListBo> listReceivables(ReceivablesListBo rl,Integer status,String adminName, String adminDepId, String orderDepId, Integer pageSize,
+	Pagination<ReceivablesListBo> listReceivables(ReceivablesListBo rl,Integer status,String adminName, String adminDeps, String orderDeps, Integer pageSize,
 			Integer pageNo);
 			Integer pageNo);
 
 
 
 
-	Map<String, Object> getCountlistReceivables(ReceivablesListBo rl, Integer status, String adminName, String adminDepId,
-			String orderDepId);
+	Map<String, Object> getCountlistReceivables(ReceivablesListBo rl, Integer status, String adminName, String adminDeps,
+			String orderDeps);
 
 
 
 
 
 

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

@@ -10,6 +10,7 @@ import java.util.UUID;
 
 
 import javax.annotation.Resource;
 import javax.annotation.Resource;
 
 
+import com.goafanti.admin.service.DepartmentService;
 import com.goafanti.order.bo.*;
 import com.goafanti.order.bo.*;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.poi.ss.usermodel.Cell;
 import org.apache.poi.ss.usermodel.Cell;
@@ -87,6 +88,8 @@ public class OrderReceivablesServiceImpl extends BaseMybatisDao<TemporaryReceiva
 
 
 	@Resource
 	@Resource
 	private OrderBillService	orderBillService;
 	private OrderBillService	orderBillService;
+	@Autowired
+	private DepartmentService	departmentService;
 
 
 	@Override
 	@Override
 	public int addReceivables(TemporaryReceivablesBo t) {
 	public int addReceivables(TemporaryReceivablesBo t) {
@@ -273,20 +276,12 @@ public class OrderReceivablesServiceImpl extends BaseMybatisDao<TemporaryReceiva
 	}
 	}
 	@SuppressWarnings("unchecked")
 	@SuppressWarnings("unchecked")
 	@Override
 	@Override
-	public Pagination<ReceivablesListBo> listReceivables(ReceivablesListBo rl,Integer status,String adminName, String adminDepId, String orderDepId, Integer pageSize,
+	public Pagination<ReceivablesListBo> listReceivables(ReceivablesListBo rl,Integer status,String adminName, String adminDeps, String orderDeps, Integer pageSize,
 			Integer pageNo) {
 			Integer pageNo) {
 		Map<String,Object> parameter=new HashMap<String, Object>();
 		Map<String,Object> parameter=new HashMap<String, Object>();
 		if(pageSize==null||pageSize<1)pageSize=10;
 		if(pageSize==null||pageSize<1)pageSize=10;
 		if(pageNo==null||pageNo<1)pageNo=1;
 		if(pageNo==null||pageNo<1)pageNo=1;
-		if(StringUtils.isNotBlank(rl.getContractNo()))parameter.put("contractNo", rl.getContractNo());
-		if(StringUtils.isNotBlank(rl.getOrderNo()))parameter.put("orderNo", rl.getOrderNo());
-		if(StringUtils.isNotBlank(rl.getNickname()))parameter.put("nickname", rl.getNickname());
-		if(StringUtils.isNotBlank(rl.getCorporateName()))parameter.put("corporateName", rl.getCorporateName());
-		if(StringUtils.isNotBlank(adminName))parameter.put("adminName", adminName);
-		if(StringUtils.isNotBlank(adminDepId))parameter.put("adminDepId", adminDepId);
-		if(StringUtils.isNotBlank(orderDepId))parameter.put("orderDepId", orderDepId);
-		if(null!=status)parameter.put("status", status);
-		if(StringUtils.isNotBlank(TokenManager.getAdminId()))parameter.put("aid", TokenManager.getAdminId());
+		addParemeter(rl, status, adminName, adminDeps, orderDeps, parameter);
 		Pagination<ReceivablesListBo> p=(Pagination<ReceivablesListBo>) findPage("selectReceivablesList", "selectReceivablesCount", parameter, pageNo, pageSize);
 		Pagination<ReceivablesListBo> p=(Pagination<ReceivablesListBo>) findPage("selectReceivablesList", "selectReceivablesCount", parameter, pageNo, pageSize);
 		List<ReceivablesListBo> list=(List<ReceivablesListBo>) p.getList();
 		List<ReceivablesListBo> list=(List<ReceivablesListBo>) p.getList();
 
 
@@ -307,19 +302,27 @@ public class OrderReceivablesServiceImpl extends BaseMybatisDao<TemporaryReceiva
 		return p;
 		return p;
 	}
 	}
 
 
+	private void addParemeter(ReceivablesListBo rl, Integer status, String adminName, String adminDeps, String orderDeps, Map<String, Object> parameter) {
+		if(StringUtils.isNotBlank(rl.getContractNo())) parameter.put("contractNo", rl.getContractNo());
+		if(StringUtils.isNotBlank(rl.getOrderNo())) parameter.put("orderNo", rl.getOrderNo());
+		if(StringUtils.isNotBlank(rl.getNickname())) parameter.put("nickname", rl.getNickname());
+		if(StringUtils.isNotBlank(rl.getCorporateName())) parameter.put("corporateName", rl.getCorporateName());
+		if(StringUtils.isNotBlank(adminName)) parameter.put("adminName", adminName);
+		if(StringUtils.isNotBlank(adminDeps)){
+			parameter.put("adminDeps", departmentService.parseArray(adminDeps));
+		}
+		if(StringUtils.isNotBlank(orderDeps)){
+			parameter.put("orderDeps", departmentService.parseArray(orderDeps));
+		}
+		if(null!= status) parameter.put("status", status);
+		if(StringUtils.isNotBlank(TokenManager.getAdminId())) parameter.put("aid", TokenManager.getAdminId());
+	}
+
 	@Override
 	@Override
 	public Map<String, Object> getCountlistReceivables(ReceivablesListBo rl, Integer status, String adminName,
 	public Map<String, Object> getCountlistReceivables(ReceivablesListBo rl, Integer status, String adminName,
-			String adminDepId, String orderDepId) {
+			String adminDeps, String orderDeps) {
 		Map<String,Object> parameter=new HashMap<String, Object>();
 		Map<String,Object> parameter=new HashMap<String, Object>();
-		if(StringUtils.isNotBlank(rl.getContractNo()))parameter.put("contractNo", rl.getContractNo());
-		if(StringUtils.isNotBlank(rl.getOrderNo()))parameter.put("orderNo", rl.getOrderNo());
-		if(StringUtils.isNotBlank(rl.getNickname()))parameter.put("nickname", rl.getNickname());
-		if(StringUtils.isNotBlank(rl.getCorporateName()))parameter.put("corporateName", rl.getCorporateName());
-		if(StringUtils.isNotBlank(adminName))parameter.put("adminName", adminName);
-		if(StringUtils.isNotBlank(adminDepId))parameter.put("adminDepId", adminDepId);
-		if(StringUtils.isNotBlank(orderDepId))parameter.put("orderDepId", orderDepId);
-		if(null!=status)parameter.put("status", status);
-		if(StringUtils.isNotBlank(TokenManager.getAdminId()))parameter.put("aid", TokenManager.getAdminId());
+		addParemeter(rl, status, adminName, adminDeps, orderDeps, parameter);
 		//计算回收表的订单总金额与当前总收款额。
 		//计算回收表的订单总金额与当前总收款额。
 		Map<String,Object> map=new HashMap<String, Object>();
 		Map<String,Object> map=new HashMap<String, Object>();
 		map.put("totalAmount", new BigDecimal(temporaryReceivablesMapper.getCountlistReceivablesTotalAmount(parameter)).stripTrailingZeros() );
 		map.put("totalAmount", new BigDecimal(temporaryReceivablesMapper.getCountlistReceivablesTotalAmount(parameter)).stripTrailingZeros() );