|
|
@@ -86,9 +86,10 @@ public class OrderProjectApiController extends CertifyApiController {
|
|
|
* 任务派单查询
|
|
|
*/
|
|
|
@RequestMapping(value="/selectTaskList" ,method = RequestMethod.GET)
|
|
|
- public Result selectTaskList(String name,String orderNo,String taskId,Integer taskStatus,String adminName,Integer specially ,String depId ,Integer pageNo,Integer pageSize){
|
|
|
+ public Result selectTaskList(String name,String orderNo,String taskId,Integer taskStatus,String adminName,Integer specially ,String depId,String thchId
|
|
|
+ ,Integer pageNo,Integer pageSize){
|
|
|
Result res=new Result();
|
|
|
- res.setData(orderProjectService.selectTaskList( name, orderNo, taskId, taskStatus, adminName,specially , depId ,pageNo, pageSize));
|
|
|
+ res.setData(orderProjectService.selectTaskList( name, orderNo, taskId, taskStatus, adminName,specially , depId,thchId ,pageNo, pageSize));
|
|
|
return res;
|
|
|
}
|
|
|
|
|
|
@@ -98,11 +99,11 @@ public class OrderProjectApiController extends CertifyApiController {
|
|
|
* 经理查询订单
|
|
|
*/
|
|
|
@RequestMapping(value="/managerSelect" ,method = RequestMethod.GET)
|
|
|
- public Result managerSelect(String name,String orderNo,String contractNo,String cid,String projectType,
|
|
|
+ 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){
|
|
|
Result res=new Result();
|
|
|
- res.setData(orderProjectService.managerSelect( name, orderNo, contractNo, cid, projectType,
|
|
|
+ res.setData(orderProjectService.managerSelect( name, orderNo, contractNo, cid, projectType,thchId,
|
|
|
depId, techDepId , declarationBatch ,commodityPrice,startTime, endTime , pageNo, pageSize));
|
|
|
return res;
|
|
|
}
|
|
|
@@ -112,12 +113,12 @@ public class OrderProjectApiController extends CertifyApiController {
|
|
|
* 经理查询订单
|
|
|
*/
|
|
|
@RequestMapping(value="/exportManagerSelect" ,method = RequestMethod.GET)
|
|
|
- public Result exportManagerSelect(String name,String orderNo,String contractNo,String cid,String projectType,
|
|
|
+ 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){
|
|
|
@SuppressWarnings("unchecked")
|
|
|
List<managerListBo> list=(List<managerListBo>) orderProjectService.managerSelect( name, orderNo, contractNo,
|
|
|
- cid, projectType,depId, techDepId , declarationBatch ,commodityPrice,startTime, endTime , pageNo, pageSize).getList();
|
|
|
+ cid, projectType,thchId,depId, techDepId , declarationBatch ,commodityPrice,startTime, endTime , pageNo, pageSize).getList();
|
|
|
NewExcelUtil<managerListBo> excel=new NewExcelUtil<>(managerListBo.class);
|
|
|
return excel.exportExcel(list, "企业项目查询列表", uploadPath);
|
|
|
}
|
|
|
@@ -327,12 +328,12 @@ public class OrderProjectApiController extends CertifyApiController {
|
|
|
* @throws IOException
|
|
|
*/
|
|
|
@RequestMapping(value = "/exportMyTaskList", method = RequestMethod.GET)
|
|
|
- public Result exportMyTaskList(HttpServletResponse response,inuptTaskHoursListBo ib, Integer pageNo, Integer pageSize) {
|
|
|
+ public Result exportMyTaskList(inuptTaskHoursListBo ib, Integer pageNo, Integer pageSize) {
|
|
|
if(pageSize==null)pageSize=999999;
|
|
|
@SuppressWarnings("unchecked")
|
|
|
List<TOrderTaskListBo> list=(List<TOrderTaskListBo>) orderProjectService.taskHoursList(ib, pageNo, pageSize).getList();
|
|
|
NewExcelUtil<TOrderTaskListBo> excel=new NewExcelUtil<>(TOrderTaskListBo.class);
|
|
|
- return excel.exportExcel(list, "工时信息记录表", response);
|
|
|
+ return excel.exportExcel(list, "工时信息记录表",uploadPath);
|
|
|
}
|
|
|
|
|
|
/**
|