|
|
@@ -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 = {"合同编号","订单编号","客户名称","订单负责人","订单部门","订单状态","签单金额","应收款","已收款","拨款比例","结算状态","未收款","项目状态","催收科目","催款状态","催款启动时间","签单时间"};
|