|
|
@@ -677,15 +677,15 @@ public class OrderProjectApiController extends CertifyApiController {
|
|
|
* 项目暂停审核
|
|
|
*
|
|
|
*/
|
|
|
- @RequestMapping(value = "/examineProjectSotp" ,method = RequestMethod.POST)
|
|
|
- public Result examineProjectSotp(@Validated InputTaskSoptLog in,BindingResult bindingResult){
|
|
|
+ @RequestMapping(value = "/examineProjectStop" ,method = RequestMethod.POST)
|
|
|
+ public Result examineProjectStop(@Validated InputTaskStopLog in,BindingResult bindingResult){
|
|
|
Result res = new Result();
|
|
|
if (bindingResult.hasErrors()) {
|
|
|
res.getError().add(buildErrorByMsg(bindingResult.getFieldError().getDefaultMessage(),
|
|
|
ParamUtils.getParamName(in,bindingResult.getFieldError().getField())));
|
|
|
return res;
|
|
|
}
|
|
|
- return res.data(orderProjectService.pushExamineProjectSotp( in));
|
|
|
+ return res.data(orderProjectService.examineProjectStop( in));
|
|
|
}
|
|
|
|
|
|
|
|
|
@@ -693,14 +693,14 @@ public class OrderProjectApiController extends CertifyApiController {
|
|
|
* 项目暂停日志列表
|
|
|
*
|
|
|
*/
|
|
|
- @RequestMapping(value = "/projectSotpList" ,method = RequestMethod.GET)
|
|
|
- public Result projectSotpList(Integer taskSoptId){
|
|
|
+ @RequestMapping(value = "/projectStopList" ,method = RequestMethod.GET)
|
|
|
+ public Result projectStopList(Integer taskStopId){
|
|
|
Result res = new Result();
|
|
|
- if (taskSoptId==null){
|
|
|
+ if (taskStopId==null){
|
|
|
res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR,"项目暂停编号","项目暂停编号"));
|
|
|
return res;
|
|
|
}
|
|
|
- return res.data(orderProjectService.projectSotpList( taskSoptId));
|
|
|
+ return res.data(orderProjectService.projectStopList( taskStopId));
|
|
|
}
|
|
|
|
|
|
|
|
|
@@ -712,12 +712,12 @@ public class OrderProjectApiController extends CertifyApiController {
|
|
|
* 项目暂停列表
|
|
|
*
|
|
|
*/
|
|
|
- @RequestMapping(value = "/selectProjectSotp" ,method = RequestMethod.GET)
|
|
|
- public Result selectProjectSotp(String orderNo,String userName,String depId,String contractNo, String projectName,Integer status,
|
|
|
+ @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){
|
|
|
Result res = new Result();
|
|
|
|
|
|
- return res.data(orderProjectService.selectProjectSotp( orderNo, userName, depId, contractNo,
|
|
|
+ return res.data(orderProjectService.selectProjectStop( orderNo, userName, depId, contractNo,
|
|
|
projectName, status,startTime,endTime,receiverId, pageNo, pageSize));
|
|
|
}
|
|
|
|
|
|
@@ -725,11 +725,11 @@ public class OrderProjectApiController extends CertifyApiController {
|
|
|
* 项目暂停列表
|
|
|
*
|
|
|
*/
|
|
|
- @RequestMapping(value = "/selectProjectSotp/export" ,method = RequestMethod.GET)
|
|
|
+ @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){
|
|
|
NewExcelUtil newExcelUtil=new NewExcelUtil(OutselectProjectSotpBo.class);
|
|
|
- Pagination<?> p = orderProjectService.selectProjectSotp(orderNo, userName, depId, contractNo,
|
|
|
+ Pagination<?> p = orderProjectService.selectProjectStop(orderNo, userName, depId, contractNo,
|
|
|
projectName, status, startTime, endTime, receiverId, pageNo, pageSize);
|
|
|
List<OutselectProjectSotp> list = (List<OutselectProjectSotp>) p.getList();
|
|
|
List<OutselectProjectSotpBo> list2=new ArrayList<>();
|