|
@@ -838,7 +838,7 @@ public class AdminApiController extends CertifyApiController {
|
|
|
* 企业参与国家标准或行业标准制定情况明细列表
|
|
* 企业参与国家标准或行业标准制定情况明细列表
|
|
|
*/
|
|
*/
|
|
|
@RequestMapping(value = "/standard", method = RequestMethod.POST)
|
|
@RequestMapping(value = "/standard", method = RequestMethod.POST)
|
|
|
- public Result standard(String uid, String standardName, String standardNumber, Integer standardLevel,
|
|
|
|
|
|
|
+ public Result standard(Integer year, String uid, String standardName, String standardNumber, Integer standardLevel,
|
|
|
Integer participateWay, String pageNo, String pageSize) {
|
|
Integer participateWay, String pageNo, String pageSize) {
|
|
|
Result res = new Result();
|
|
Result res = new Result();
|
|
|
if (StringUtils.isBlank(uid)) {
|
|
if (StringUtils.isBlank(uid)) {
|
|
@@ -857,7 +857,7 @@ public class AdminApiController extends CertifyApiController {
|
|
|
if (StringUtils.isNumeric(pageNo)) {
|
|
if (StringUtils.isNumeric(pageNo)) {
|
|
|
pNo = Integer.parseInt(pageNo);
|
|
pNo = Integer.parseInt(pageNo);
|
|
|
}
|
|
}
|
|
|
- res.setData(orgStandardService.listOrgStandard(standardName, standardNumber, standardLevel, participateWay, pNo,
|
|
|
|
|
|
|
+ res.setData(orgStandardService.listOrgStandard(year, standardName, standardNumber, standardLevel, participateWay, pNo,
|
|
|
pSize, uid));
|
|
pSize, uid));
|
|
|
return res;
|
|
return res;
|
|
|
}
|
|
}
|