|
@@ -8,6 +8,7 @@ import java.util.*;
|
|
|
|
|
|
|
|
import javax.servlet.http.HttpServletResponse;
|
|
import javax.servlet.http.HttpServletResponse;
|
|
|
|
|
|
|
|
|
|
+import com.alibaba.fastjson.JSON;
|
|
|
import com.goafanti.admin.service.DepartmentService;
|
|
import com.goafanti.admin.service.DepartmentService;
|
|
|
import com.goafanti.common.dao.*;
|
|
import com.goafanti.common.dao.*;
|
|
|
import com.goafanti.common.enums.UserFields;
|
|
import com.goafanti.common.enums.UserFields;
|
|
@@ -494,7 +495,7 @@ public class OrderChangeServiceImpl extends BaseMybatisDao<NewOrderChangeMapper>
|
|
|
@SuppressWarnings("unchecked")
|
|
@SuppressWarnings("unchecked")
|
|
|
@Override
|
|
@Override
|
|
|
public Pagination<NewOderCahngeListBo> selectOrderChangeList(String userName,Integer processState,Integer timeType,String startTime,String endTime,
|
|
public Pagination<NewOderCahngeListBo> selectOrderChangeList(String userName,Integer processState,Integer timeType,String startTime,String endTime,
|
|
|
- List<String> deps,String salesmanName,Integer complete,String orderNo, String contractNo,Integer type,Integer pageSize, Integer pageNo) {
|
|
|
|
|
|
|
+ String deps,String salesmanName,Integer complete,String orderNo, String contractNo,Integer type,Integer pageSize, Integer pageNo) {
|
|
|
Map<String, Object> parameter=new HashMap<String, Object>();
|
|
Map<String, Object> parameter=new HashMap<String, Object>();
|
|
|
if(pageSize==null||pageSize<0)pageSize=10;
|
|
if(pageSize==null||pageSize<0)pageSize=10;
|
|
|
if(pageNo==null||pageNo<0)pageNo=1;
|
|
if(pageNo==null||pageNo<0)pageNo=1;
|
|
@@ -520,8 +521,9 @@ public class OrderChangeServiceImpl extends BaseMybatisDao<NewOrderChangeMapper>
|
|
|
}
|
|
}
|
|
|
parameter.put("deps",myDep);
|
|
parameter.put("deps",myDep);
|
|
|
}else {
|
|
}else {
|
|
|
- if (!deps.isEmpty()) {
|
|
|
|
|
- parameter.put("deps",deps);
|
|
|
|
|
|
|
+ if (deps!=null) {
|
|
|
|
|
+ List<String>ls= JSON.parseArray(deps,String.class);
|
|
|
|
|
+ parameter.put("deps",ls);
|
|
|
}
|
|
}
|
|
|
}
|
|
}
|
|
|
if (StringUtils.isNotBlank(salesmanName)) parameter.put("salesmanName", salesmanName);
|
|
if (StringUtils.isNotBlank(salesmanName)) parameter.put("salesmanName", salesmanName);
|
|
@@ -824,7 +826,8 @@ public class OrderChangeServiceImpl extends BaseMybatisDao<NewOrderChangeMapper>
|
|
|
@SuppressWarnings("unchecked")
|
|
@SuppressWarnings("unchecked")
|
|
|
@Override
|
|
@Override
|
|
|
public void exportMyChange(HttpServletResponse response, String userName, Integer processState, Integer timeType,
|
|
public void exportMyChange(HttpServletResponse response, String userName, Integer processState, Integer timeType,
|
|
|
- String startTime, String endTime, List<String> deps, String salesmanName, Integer complete,String orderNo, String contractNo,Integer type,Integer pageSize,Integer pageNo) throws IOException {
|
|
|
|
|
|
|
+ String startTime, String endTime, String deps, String salesmanName, Integer complete,String orderNo, String contractNo,
|
|
|
|
|
+ Integer type,Integer pageSize,Integer pageNo) throws IOException {
|
|
|
OutputStream out = response.getOutputStream();
|
|
OutputStream out = response.getOutputStream();
|
|
|
List<NewOderCahngeListBo>list=(List<NewOderCahngeListBo>) selectOrderChangeList( userName, processState, timeType, startTime, endTime,
|
|
List<NewOderCahngeListBo>list=(List<NewOderCahngeListBo>) selectOrderChangeList( userName, processState, timeType, startTime, endTime,
|
|
|
deps, salesmanName, complete, orderNo, contractNo, type, pageSize, pageNo).getList();
|
|
deps, salesmanName, complete, orderNo, contractNo, type, pageSize, pageNo).getList();
|