Browse Source

催款统计表开发

anderx 4 years ago
parent
commit
bb9585c643

+ 6 - 4
src/main/java/com/goafanti/common/mapper/NewOrderDunMapper.xml

@@ -501,12 +501,14 @@
       and start_time between #{startDate} and #{endDate}
      </if>
       group by order_no)x left join t_order_new a on x.order_no=a.order_no left join admin b on a.salesman_id =b.id
-       left join department c on b.department_id =c.id
+       left join department c on b.department_id =c.id where  a.delete_sign in(0,2)
     <if test="depId!=null">
-      where b.department_id = #{depId}
+      and b.department_id = #{depId}
     </if>
      )y group by y.province)z left join district_glossory dg on z.province=dg.id
   </select>
+
+
   <select id="selectOrderDun" resultType="com.goafanti.order.bo.OutSelectOrderDun">
     select  z.provinceName,z.aName,z.totalAmount,z.money,z.aid
     from( select dg.name provinceName,y.id aid,y.name aName,sum(y.total_amount)totalAmount, sum(y.money)money
@@ -516,9 +518,9 @@
     and start_time between #{startDate} and #{endDate}
     </if>
     group by order_no)x left join t_order_new a on x.order_no=a.order_no left join admin b on a.salesman_id =b.id
-    left join department c on b.department_id =c.id
+    left join department c on b.department_id =c.id where  a.delete_sign in(0,2)
     <if test="depId !=null">
-    where b.department_id = #{depId}
+    and b.department_id = #{depId}
     </if>
       <if test="province !=null">
     and c.province= #{province}

+ 8 - 2
src/main/java/com/goafanti/common/mapper/TOrderNewMapper.xml

@@ -1068,7 +1068,7 @@ left join department d on o.order_dep = d.id   left join t_order_mid a on o.orde
 	</if>
 	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 t_order_mid tm on b.order_no=tm.order_no left join department dep on b.order_dep=dep.id
-	where  b.delete_sign != 1
+	where  b.delete_sign in (0,2)
 	<if test="shiroType == 1 and fid !=null">
   	 and tm.finance_id= #{fid,jdbcType=VARCHAR}
   	</if>
@@ -1090,6 +1090,9 @@ left join department d on o.order_dep = d.id   left join t_order_mid a on o.orde
   	<if test="depId != null">
   	and b.order_dep= #{depId,jdbcType=VARCHAR}
   	</if>
+	<if test="dunStatus != null">
+    and  a.status= #{dunStatus}
+    </if>
   	<if test="aid != null">
   	and b.salesman_id= #{aid,jdbcType=VARCHAR}
   	</if>
@@ -1113,7 +1116,7 @@ left join department d on o.order_dep = d.id   left join t_order_mid a on o.orde
 	</if>
 	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 t_order_mid tm on b.order_no=tm.order_no
-	where  b.delete_sign != 1
+	where  b.delete_sign in (0,2)
 	<if test="shiroType == 1 and fid !=null">
   	 and tm.finance_id= #{fid,jdbcType=VARCHAR}
   	</if>
@@ -1135,6 +1138,9 @@ left join department d on o.order_dep = d.id   left join t_order_mid a on o.orde
   	<if test="depId != null">
   	and b.order_dep= #{depId,jdbcType=VARCHAR}
   	</if>
+     <if test="dunStatus != null">
+       and  a.status= #{dunStatus}
+     </if>
   	<if test="aid != null">
   	and b.salesman_id= #{aid,jdbcType=VARCHAR}
   	</if>

+ 5 - 5
src/main/java/com/goafanti/order/controller/AdminNewOrderApiController.java

@@ -277,13 +277,13 @@ public class AdminNewOrderApiController extends CertifyApiController {
 	/**
 	 * 催款统计列表
 	 * @param newStatus 0旧催款 1新催款
-	 * @param aid 0查看自己 1查看别人
+	 * @param specially 0查看自己 1查看别人
 	 */
 	@RequestMapping(value="/dunOrderNewList", method = RequestMethod.GET)
-	public Result dunOrderNewList(String name,String orderNo,String contractNo,String starTime,String endTime,String aid,
+	public Result dunOrderNewList(String name,String orderNo,String contractNo,String starTime,String endTime,Integer specially,String aid,
 			String adminName,String depId,Integer newStatus,Integer pageNo,Integer pageSize){
 		Result res=new Result();
-		res.data(orderNewService.dunOrderNewList(name, orderNo,contractNo, starTime, endTime,aid,  adminName, depId,newStatus,pageNo, pageSize));
+		res.data(orderNewService.dunOrderNewList(name, orderNo,contractNo, starTime, endTime,specially,aid,  adminName, depId,newStatus,pageNo, pageSize));
 		return res;
 	}
 	
@@ -496,11 +496,11 @@ public class AdminNewOrderApiController extends CertifyApiController {
 	 * @throws IOException 
 	 */
 	@RequestMapping(value = "/exportOrderDunData", method = RequestMethod.GET)
-	public Result exportOrderDunData(String name,String orderNo,String contractNo,String starTime,String endTime,String aid,String adminName,
+	public Result exportOrderDunData(String name,String orderNo,String contractNo,String starTime,String endTime,Integer specially, String aid,String adminName,
 			String depId,Integer newStatus,Integer pageNo,Integer pageSize,HttpServletResponse response){
 		 Result res = new Result();
  		try {
- 			orderNewService.exportOrderDunData( name, orderNo,contractNo, starTime, endTime, aid, adminName, depId,newStatus, pageNo, pageSize, response);
+ 			orderNewService.exportOrderDunData( name, orderNo,contractNo, starTime, endTime,specially, aid, adminName, depId,newStatus, pageNo, pageSize, response);
 		} catch (Exception e) {
 			res.getError().add(buildError("格式不正确"));
 			return res;

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

@@ -99,7 +99,7 @@ public interface OrderNewService {
 	 * @param pageSize
 	 * @return
 	 */
-	Pagination<outOrderDunListBo> dunOrderNewList(String name, String orderNo,String contractNo, String starTime, String endTime, String aid,String adminName,String depId,
+	Pagination<outOrderDunListBo> dunOrderNewList(String name, String orderNo,String contractNo, String starTime, String endTime,Integer specially, String aid,String adminName,String depId,
 			Integer newStatus,Integer pageNo, Integer pageSize);
 	/**
 	 * 新增催款记录
@@ -157,7 +157,7 @@ public interface OrderNewService {
 	
 	boolean checkORderTask(String orderNo);
 	
-	void exportOrderDunData(String name,String orderNo,String contractNo,String starTime,String endTime,String aid,String adminName,
+	void exportOrderDunData(String name,String orderNo,String contractNo,String starTime,String endTime,Integer specially,String aid,String adminName,
 			String depId,Integer newStatus,Integer pageNo,Integer pageSize,HttpServletResponse response) throws  Exception;
 	
 	int updateOrderOver(String orderNo);

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

@@ -803,7 +803,7 @@ public class OrderNewServiceImpl extends BaseMybatisDao<TOrderNewMapper> impleme
 	@SuppressWarnings("unchecked")
 	@Override
 	public Pagination<outOrderDunListBo> dunOrderNewList(String name, String orderNo,String contractNo, String starTime, String endTime,
-			String  aid, String adminName,String depId,Integer newStatus,Integer pageNo, Integer pageSize) {
+			Integer specially,String  aid, String adminName,String depId,Integer newStatus,Integer pageNo, Integer pageSize) {
 		Map<String, Object> params = new HashMap<String, Object>();
 		if(pageSize==null||pageSize<0)pageSize=10;
 		if(pageNo==null||pageNo<0)pageNo=1;
@@ -816,6 +816,10 @@ public class OrderNewServiceImpl extends BaseMybatisDao<TOrderNewMapper> impleme
 		if (StringUtils.isNotBlank(contractNo)) params.put("contractNo", contractNo);
 		if (StringUtils.isNotBlank(starTime)) params.put("starTime", starTime);
 		if (StringUtils.isNotBlank(endTime)) params.put("endTime", endTime+" 23:59:59");
+		if (specially==null){params.put("specially", 0);}
+		else {
+			params.put("specially", specially);
+		}
 		Integer i=null;
 		if(TokenManager.hasRole(AFTConstants.SALESMAN)) {
 			params.put("aid", TokenManager.getAdminId());
@@ -829,6 +833,12 @@ public class OrderNewServiceImpl extends BaseMybatisDao<TOrderNewMapper> impleme
 				TokenManager.hasRole(AFTConstants.SUPERADMIN)||TokenManager.hasRole(AFTConstants.CED)||
 				TokenManager.hasRole(AFTConstants.APPROVAL_DECISION)){
 			i=3;
+
+		}
+		if (specially==1){
+			params.put("aid", aid);
+			params.put("dunStatus", 1);
+
 		}
 		if(i!=null)params.put("shiroType", i);
 		Pagination<outOrderDunListBo> p = (Pagination<outOrderDunListBo>)findPage("selectDunOrderNewListByPage", "selectDunOrderNewListCount", params, pageNo, pageSize);
@@ -1073,12 +1083,12 @@ public class OrderNewServiceImpl extends BaseMybatisDao<TOrderNewMapper> impleme
 	 * @throws IOException 
 	 */
 	@Override
-	public void exportOrderDunData(String name,String orderNo,String contractNo,String starTime,String endTime,String aid,String adminName,
+	public void exportOrderDunData(String name,String orderNo,String contractNo,String starTime,String endTime,Integer specially,String aid,String adminName,
 			String depId,Integer newStatus,Integer pageNo,Integer pageSize,HttpServletResponse response) throws Exception  {
 		OutputStream out = response.getOutputStream();
 		try {
 			@SuppressWarnings("unchecked")
-			List<outOrderDunListBo> list=(List<outOrderDunListBo>) dunOrderNewList( name,  orderNo, contractNo, starTime,  endTime,
+			List<outOrderDunListBo> list=(List<outOrderDunListBo>) dunOrderNewList( name,  orderNo, contractNo, starTime,  endTime,specially,
 					 aid,  adminName, depId,newStatus, pageNo,  pageSize).getList();
 			
     		String[] comment = {"合同编号","订单编号","客户名称","订单负责人","订单部门","订单状态","签单金额","应收款","已收款","拨款比例","结算状态","未收款","项目状态","催收科目","催款状态","催款启动时间","签单时间"};