|
|
@@ -103,10 +103,10 @@ public class OrderProjectApiController extends CertifyApiController {
|
|
|
@RequestMapping(value="/managerSelect" ,method = RequestMethod.GET)
|
|
|
public Result managerSelect(String name,String orderNo,String contractNo,String cid,String projectType,String thchId,
|
|
|
String depId,String techDepId ,Integer declarationBatch ,String commodityPrice,String startTime,
|
|
|
- String endTime,Integer pageNo,Integer pageSize){
|
|
|
+ String endTime,String type,Integer pageNo,Integer pageSize){
|
|
|
Result res=new Result();
|
|
|
res.setData(orderProjectService.managerSelect( name, orderNo, contractNo, cid, projectType,thchId,
|
|
|
- depId, techDepId , declarationBatch ,commodityPrice,startTime, endTime , pageNo, pageSize));
|
|
|
+ depId, techDepId , declarationBatch ,commodityPrice,startTime, endTime,type , pageNo, pageSize));
|
|
|
return res;
|
|
|
}
|
|
|
|
|
|
@@ -117,10 +117,10 @@ public class OrderProjectApiController extends CertifyApiController {
|
|
|
@RequestMapping(value="/exportManagerSelect" ,method = RequestMethod.GET)
|
|
|
public Result exportManagerSelect(String name,String orderNo,String contractNo,String cid,String projectType,String thchId,
|
|
|
String depId,String techDepId ,Integer declarationBatch ,String commodityPrice,String startTime,
|
|
|
- String endTime,Integer pageNo,Integer pageSize){
|
|
|
+ String endTime,String type,Integer pageNo,Integer pageSize){
|
|
|
@SuppressWarnings("unchecked")
|
|
|
List<managerListBo> list=(List<managerListBo>) orderProjectService.managerSelect( name, orderNo, contractNo,
|
|
|
- cid, projectType,thchId,depId, techDepId , declarationBatch ,commodityPrice,startTime, endTime , pageNo, pageSize).getList();
|
|
|
+ cid, projectType,thchId,depId, techDepId , declarationBatch ,commodityPrice,startTime, endTime ,type, pageNo, pageSize).getList();
|
|
|
NewExcelUtil<managerListBo> excel=new NewExcelUtil<>(managerListBo.class);
|
|
|
return excel.exportExcel(list, "企业项目查询列表", uploadPath);
|
|
|
}
|