diff --git a/laws-modules/src/main/java/com/jero/modules/projectLibrary/controller/LawsAssessResultsController.java b/laws-modules/src/main/java/com/jero/modules/projectLibrary/controller/LawsAssessResultsController.java index 221e804f..7dfc45f4 100644 --- a/laws-modules/src/main/java/com/jero/modules/projectLibrary/controller/LawsAssessResultsController.java +++ b/laws-modules/src/main/java/com/jero/modules/projectLibrary/controller/LawsAssessResultsController.java @@ -2,11 +2,14 @@ package com.jero.modules.projectLibrary.controller; import javax.servlet.http.HttpServletRequest; import com.jero.common.api.vo.Result; +import com.jero.common.exception.JeroBootException; +import com.jero.modules.laws.common.constant.ResultCommon; import com.jero.modules.projectLibrary.entity.LawsAssessResults; import com.jero.modules.projectLibrary.service.ILawsAssessResultsService; import com.baomidou.mybatisplus.core.metadata.IPage; import lombok.extern.slf4j.Slf4j; import com.jero.common.system.base.controller.JeroController; +import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; import io.swagger.annotations.Api; @@ -31,14 +34,38 @@ public class LawsAssessResultsController extends JeroController> queryPageList(LawsAssessResults lawsAssessResults, @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, HttpServletRequest req) { + String standardId = lawsAssessResults.getStandardId(); + String projectId = lawsAssessResults.getProjectId(); + if (StringUtils.isBlank(standardId)){ + throw new JeroBootException("标准ID不能为空"); + } + if (StringUtils.isBlank(projectId)){ + throw new JeroBootException("项目ID不能为空"); + } IPage pageList = lawsAssessResultsService.queryPage(lawsAssessResults, pageNo, pageSize, req); return Result.OK(pageList); } + + + /** + * 通过id查询 + */ + @AutoLog(value = "项目库详情页-评估结果历史-通过id查询-符合/不符合项") + @ApiOperation(value="项目库详情页-评估结果历史-通过id查询-符合/不符合项", notes="项目库详情页-评估结果历史-通过id查询-符合/不符合项") + @GetMapping(value = "/queryById") + public Result queryById(@RequestParam(name="id",required=true) String id) { + LawsAssessResults lawsAssessResults = lawsAssessResultsService.queryById(id); + if(lawsAssessResults==null) { + throw new JeroBootException(ResultCommon.NO_CORRESPONDING_DATA_FOUND); + } + return Result.OK(lawsAssessResults); + } + }