anderx лет назад: 4
Родитель
Сommit
c21f8f79a7

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

@@ -508,9 +508,9 @@
      )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
-    from( select dg.name provinceName,y.name aName,sum(y.total_amount)totalAmount, sum(y.money)money
-    from (select c.province ,b.name ,x.money ,x.quantity,a.total_amount
+    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
+    from (select c.province ,b.name ,b.id,x.money ,x.quantity,a.total_amount
     from (select order_no ,sum(money)money,1 quantity from new_order_dun nod where status=1
     <if test="startDate!=null and endDate!=null">
     and start_time between #{startDate} and #{endDate}
@@ -527,7 +527,7 @@
     and b.id= #{aid}
       </if>
     )y left join district_glossory dg on y.province=dg.id
-    group by dg.name ,y.name)z
+    group by dg.name ,y.id,y.name)z
     order by
      <if test="sort=0">
        z.totalAmount

+ 9 - 0
src/main/java/com/goafanti/order/bo/OutSelectOrderDun.java

@@ -10,11 +10,20 @@ public class OutSelectOrderDun {
     private String provinceName;
     @Excel(name = "催收入")
     private String aName;
+    private String aid;
     @Excel(name = "签单额(万元)")
     private BigDecimal totalAmount;
     @Excel(name = "应收款(万元)")
     private BigDecimal money;
 
+    public String getAid() {
+        return aid;
+    }
+
+    public void setAid(String aid) {
+        this.aid = aid;
+    }
+
     public String getProvinceName() {
         return provinceName;
     }

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

@@ -276,12 +276,14 @@ public class AdminNewOrderApiController extends CertifyApiController {
 	
 	/**
 	 * 催款统计列表
+	 * @param newStatus 0旧催款 1新催款
+	 * @param aid 0查看自己 1查看别人
 	 */
 	@RequestMapping(value="/dunOrderNewList", method = RequestMethod.GET)
-	public Result dunOrderNewList(String name,String orderNo,String contractNo,String starTime,String endTime,Integer specially,
+	public Result dunOrderNewList(String name,String orderNo,String contractNo,String starTime,String endTime,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,specially,  adminName, depId,newStatus,pageNo, pageSize));
+		res.data(orderNewService.dunOrderNewList(name, orderNo,contractNo, starTime, endTime,aid,  adminName, depId,newStatus,pageNo, pageSize));
 		return res;
 	}
 	
@@ -494,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,Integer specially,String adminName,
+	public Result exportOrderDunData(String name,String orderNo,String contractNo,String starTime,String endTime,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, specially, adminName, depId,newStatus, pageNo, pageSize, response);
+ 			orderNewService.exportOrderDunData( name, orderNo,contractNo, starTime, endTime, aid, adminName, depId,newStatus, pageNo, pageSize, response);
 		} catch (Exception e) {
 			res.getError().add(buildError("格式不正确"));
 			return res;

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

@@ -114,7 +114,8 @@ public class AdminNewOrderDunApiController extends CertifyApiController {
 	@RequestMapping(value = "/selectOrderDunAll",method = RequestMethod.GET)
 	public Result selectOrderDunAll(String depId,String depName,String startDate ,String endDate){
 		Result res = new Result();
-		res.data(newOrderDunService.selectOrderDunAll(depId,startDate,endDate));
+		List<OutSelectOrderDunAll> list =newOrderDunService.selectOrderDunAll(depId,startDate,endDate);
+		res.data(list);
 		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, Integer specially,String adminName,String depId,
+	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);
 	/**
 	 * 新增催款记录
@@ -157,7 +157,7 @@ public interface OrderNewService {
 	
 	boolean checkORderTask(String orderNo);
 	
-	void exportOrderDunData(String name,String orderNo,String contractNo,String starTime,String endTime,Integer specially,String adminName,
+	void exportOrderDunData(String name,String orderNo,String contractNo,String starTime,String endTime,String aid,String adminName,
 			String depId,Integer newStatus,Integer pageNo,Integer pageSize,HttpServletResponse response) throws  Exception;
 	
 	int updateOrderOver(String orderNo);

+ 1 - 0
src/main/java/com/goafanti/order/service/impl/NewOrderDunServiceImpl.java

@@ -9,6 +9,7 @@ import org.apache.commons.beanutils.BeanUtils;
 import org.apache.commons.beanutils.ConvertUtils;
 import org.apache.commons.beanutils.converters.DateConverter;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.cache.annotation.Cacheable;
 import org.springframework.stereotype.Service;
 
 import com.goafanti.common.constant.AFTConstants;

+ 7 - 6
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,
-			Integer specially, String adminName,String depId,Integer newStatus,Integer pageNo, Integer pageSize) {
+			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;
@@ -825,10 +825,11 @@ public class OrderNewServiceImpl extends BaseMybatisDao<TOrderNewMapper> impleme
 		}else if (TokenManager.hasRole(AFTConstants.FINANCE_MANAGER)) {
 			i=2;
 			params.put("fid", TokenManager.getAdminId());
-		}
-		if (TokenManager.hasRole(AFTConstants.FINANCE_ADMIN)||TokenManager.hasRole(AFTConstants.VICE_CEO)||
+		}else if(TokenManager.hasRole(AFTConstants.FINANCE_ADMIN)||TokenManager.hasRole(AFTConstants.VICE_CEO)||
 				TokenManager.hasRole(AFTConstants.SUPERADMIN)||TokenManager.hasRole(AFTConstants.CED)||
-				TokenManager.hasRole(AFTConstants.APPROVAL_DECISION))i=3;
+				TokenManager.hasRole(AFTConstants.APPROVAL_DECISION)){
+			i=3;
+		}
 		if(i!=null)params.put("shiroType", i);
 		Pagination<outOrderDunListBo> p = (Pagination<outOrderDunListBo>)findPage("selectDunOrderNewListByPage", "selectDunOrderNewListCount", params, pageNo, pageSize);
 		return p;
@@ -1072,13 +1073,13 @@ public class OrderNewServiceImpl extends BaseMybatisDao<TOrderNewMapper> impleme
 	 * @throws IOException 
 	 */
 	@Override
-	public void exportOrderDunData(String name,String orderNo,String contractNo,String starTime,String endTime,Integer specially,String adminName,
+	public void exportOrderDunData(String name,String orderNo,String contractNo,String starTime,String endTime,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,
-					 specially,  adminName, depId,newStatus, pageNo,  pageSize).getList();
+					 aid,  adminName, depId,newStatus, pageNo,  pageSize).getList();
 			
     		String[] comment = {"合同编号","订单编号","客户名称","订单负责人","订单部门","订单状态","签单金额","应收款","已收款","拨款比例","结算状态","未收款","项目状态","催收科目","催款状态","催款启动时间","签单时间"};
     		String fileName ="催款信息记录表" + new SimpleDateFormat("yyyy-MM-dd HH:mm").format(new Date()) + ".xls";