Merge branch 'songyuanshuo' into 'dev'

/review/standard/list接口修改

See merge request !438

quality-review/src/main/java/com/ruoyi/mapper/ReviewStandardMapper.java

@@ -3,10 +3,7 @@ package com.ruoyi.mapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.ruoyi.domain.ReviewKeyPoint;
 import com.ruoyi.domain.ReviewStandard;
-import com.ruoyi.web.request.ReviewFindListRequest;
-import com.ruoyi.web.request.ReviewStandardListByPageRequest;
-import com.ruoyi.web.request.ReviewStandardListRequest;
-import com.ruoyi.web.request.StandardListNewRequest;
+import com.ruoyi.web.request.*;
 import com.ruoyi.web.response.*;
 import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Repository;

quality-review/src/main/java/com/ruoyi/service/ReviewStandardService.java

@@ -87,4 +87,5 @@ public interface ReviewStandardService extends IService<ReviewStandard> {
      * 标准内容库新界面接口
      * */
     ReviewStandardListNewResponse getListNew(StandardListNewRequest request);
+
 }

quality-review/src/main/java/com/ruoyi/service/impl/ReviewStandardServiceImpl.java

@@ -94,8 +94,10 @@ public class ReviewStandardServiceImpl extends ServiceImpl<ReviewStandardMapper,
         ReviewStandard reviewStandard = ReviewStandard.builder().id(id).build();
         List<ReviewStandard> reviewStandardList = new ArrayList<>();
         reviewStandardList.add(reviewStandard);
+
         // 查询审查要点
         List<ReviewKeyPoint> reviewKeyPointList = reviewKeyPointService.findByStandardList(reviewStandardList);
+
         // 查询审查细则
         List<ReviewDetails> reivewDetailsList = reviewDetailsService.findByKeyPointsList(reviewKeyPointList);
         // 查询审查场景

quality-review/src/main/java/com/ruoyi/web/ReviewStandardController.java

@@ -40,7 +40,7 @@ public class ReviewStandardController extends BaseController {
     @Anonymous
     @ApiOperation("分页查询标准(检验内容库)")
     @PostMapping("/list")
-    public TableDataInfo<ReviewStandardResponse> listByPage(@Validated @RequestBody ReviewStandardListByPageRequest request) {
+    public TableDataInfo<ReviewStandardResponse> listByPage(@RequestBody ReviewStandardListByPageRequest request) {
         startPage(request);
         List<ReviewStandardResponse> list = reviewStandardService.listByPage(request);
         return getDataTable(list);

quality-review/src/main/resources/mapper/ReviewStandardMapper.xml

@@ -116,4 +116,5 @@
     </select>
 
 
+
 </mapper>