|
|
@@ -700,15 +700,16 @@ public class OrderProjectApiController extends CertifyApiController {
|
|
|
|
|
|
/**
|
|
|
* 项目暂停列表
|
|
|
- *
|
|
|
+ * @param shiroType 0=我的列表 1=审核列表
|
|
|
*/
|
|
|
@RequestMapping(value = "/selectProjectStop" ,method = RequestMethod.GET)
|
|
|
public Result selectProjectStop(String orderNo,String userName,String depId,String contractNo, String projectName,Integer status,
|
|
|
- String startTime, String endTime, String receiverId, Integer pageNo,Integer pageSize){
|
|
|
+ String startTime, String endTime, String receiverId,
|
|
|
+ Integer shiroType,Integer pageNo,Integer pageSize){
|
|
|
Result res = new Result();
|
|
|
|
|
|
return res.data(orderProjectService.selectProjectStop( orderNo, userName, depId, contractNo,
|
|
|
- projectName, status,startTime,endTime,receiverId, pageNo, pageSize));
|
|
|
+ projectName, status,startTime,endTime,receiverId, shiroType,pageNo, pageSize));
|
|
|
}
|
|
|
|
|
|
/**
|
|
|
@@ -717,10 +718,10 @@ public class OrderProjectApiController extends CertifyApiController {
|
|
|
*/
|
|
|
@RequestMapping(value = "/selectProjectStop/export" ,method = RequestMethod.GET)
|
|
|
public Result selectProjectSotpExport(String orderNo,String userName,String depId,String contractNo, String projectName,Integer status,
|
|
|
- String startTime, String endTime, String receiverId, Integer pageNo,Integer pageSize){
|
|
|
+ String startTime, String endTime, String receiverId,Integer shiroType, Integer pageNo,Integer pageSize){
|
|
|
NewExcelUtil newExcelUtil=new NewExcelUtil(OutselectProjectSotpBo.class);
|
|
|
Pagination<?> p = orderProjectService.selectProjectStop(orderNo, userName, depId, contractNo,
|
|
|
- projectName, status, startTime, endTime, receiverId, pageNo, pageSize);
|
|
|
+ projectName, status, startTime, endTime, receiverId, shiroType, pageNo, pageSize);
|
|
|
List<OutselectProjectSotp> list = (List<OutselectProjectSotp>) p.getList();
|
|
|
List<OutselectProjectSotpBo> list2=new ArrayList<>();
|
|
|
for (OutselectProjectSotp use : list) {
|