Merge branch 'dev' into 'master'

dev - master 48

See merge request !444

quality-review/src/main/java/com/ruoyi/domain/CarReviewTask.java

@@ -178,4 +178,7 @@ public class CarReviewTask implements Serializable {
     @ApiModelProperty("企业名称")
     private String enterpriseName;
 
+    @ApiModelProperty("版本")
+    private String version;
+
 }

quality-review/src/main/java/com/ruoyi/domain/Standard.java

@@ -64,4 +64,10 @@ public class Standard {
     @ApiModelProperty("展示状态")
     private Long status;
 
+    @ApiModelProperty("原始版本")
+    private String originalVersion;
+
+    @ApiModelProperty("最新版本")
+    private String currentVersion;
+
 }

quality-review/src/main/java/com/ruoyi/domain/SystemReviewTask.java

@@ -182,4 +182,7 @@ public class SystemReviewTask {
     @ApiModelProperty("企业名称")
     private String enterpriseName;
 
+    @ApiModelProperty("版本")
+    private String version;
+
 }

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

@@ -6,6 +6,7 @@ import com.ruoyi.domain.ReviewDetails;
 import com.ruoyi.domain.ReviewKeyPoint;
 import com.ruoyi.domain.SystemReviewTask;
 import com.ruoyi.web.request.ReviewFindListRequest;
+import com.ruoyi.web.response.DeleteDetailsResponse;
 import com.ruoyi.web.response.ResultCountResponse;
 import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Repository;
@@ -34,4 +35,6 @@ public interface ReviewDetailsMapper extends BaseMapper<ReviewDetails> {
 
     // 查询细则列表
     List<ReviewDetails> findDetailsList(ReviewFindListRequest request);
+    // 查询细则列表
+    List<DeleteDetailsResponse> getDeleteDetailsResponseByStandardId(@Param("standardId") Long standardId);
 }

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

@@ -45,6 +45,11 @@ public interface ReviewEnterpriseArchiveMapper extends BaseMapper<ReviewEnterpri
 
     // 批量新增车企文件
     public int insertEnterprise(List<EnterpriseImportFileVO> list);
+
+    /*
+    * 修改车企文件信息
+    * */
+    void updateByTaskId(ReviewEnterpriseArchive reviewEnterpriseArchive);
 }
 
 

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

@@ -46,4 +46,31 @@ public interface ReviewStandardMapper extends BaseMapper<ReviewStandard> {
      * 标准内容库新界面接口
      * */
     List<ReviewStandardChapterListResponse> findChaptersByStandard(@Param("request") StandardListNewRequest request);
+
+    // 获取标准信息
+    ReviewStandardResponseNew selectReviewStandardById(@Param("key") Long key);
+
+
+    /*
+     * 查询当前标准下的所有id集合
+     * */
+    List<Long> getIdList(@Param("getUseCaseRequestNew") GetUseCaseRequestNew getUseCaseRequestNew);
+
+    /*
+     * 查询当前标准下的所有要点id集合
+     * */
+    List<Long> getKeypointIdList(@Param("getKeypointListRequest") GetKeypointListRequest getKeypointListRequest);
+
+    /*
+    * 获取要点id列表
+    * */
+    List<KeypointList> getKeypointListByIdList(@Param("idList") List<Long> idList);
+
+    List<Long> getDetailsIdList(@Param("deleteDetailsRequest") DeleteDetailsRequest deleteDetailsRequest);
+
+    // 获取所有要点ID列表
+    List<Long> getDelKeypointIdList(@Param("deleteDetailsRequest") DeleteDetailsRequest deleteDetailsRequest);
+
+    // 获取与 KeypointList 关联的 DeleteDetails
+    List<DeleteDetails> getDeleteDetailsByKeypointId(@Param("id") Long id);
 }

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

@@ -2,10 +2,24 @@ package com.ruoyi.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.ruoyi.domain.ReviewUsecase;
+import com.ruoyi.web.request.GetUseCaseRequest;
+import com.ruoyi.web.request.ReviewKeyPointListRequest;
+import com.ruoyi.web.response.UseCaseResponseDTO;
+import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Repository;
 
+import java.util.List;
+
 @Repository
 public interface ReviewUsecaseMapper extends BaseMapper<ReviewUsecase> {
 
     ReviewUsecase getById(Long reviewUsecaseId);
+
+
+
+
+    /*
+     * 查询所有测试用例
+     * */
+    List<UseCaseResponseDTO> getUseCaseListByIdList(@Param("idList") List<Long> idList);
 }

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

@@ -26,4 +26,6 @@ public interface StandardMapper extends BaseMapper<Standard> {
      * @return
      */
     List<Standard> findStandardList(StandardListRequest request);
+
+    Standard getById(@Param("standardId") Long standardId);
 }

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

@@ -3,10 +3,17 @@ package com.ruoyi.service;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.ruoyi.domain.ReviewDetails;
 import com.ruoyi.domain.ReviewKeyPoint;
+import com.ruoyi.web.request.DeleteDetailsRequest;
+import com.ruoyi.web.response.DeleteDetailsResponse;
 
 import java.util.List;
 
 public interface ReviewDetailsService extends IService<ReviewDetails> {
 
     List<ReviewDetails> findByKeyPointsList(List<ReviewKeyPoint> reviewKeyPointList);
+
+    /*
+     * 删除细则按钮
+     * */
+    List<DeleteDetailsResponse> getDeleteDetailsResponseList(DeleteDetailsRequest deleteDetailsRequest);
 }

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

@@ -50,4 +50,9 @@ public interface ReviewEnterpriseArchiveService extends IService<ReviewEnterpris
      * @param reviewEnterpriseArchive
      */
     void editEnterpriseArchive(ReviewEnterpriseArchive reviewEnterpriseArchive);
+
+    /*
+    * 删除车企文件接口
+    * */
+    void deleteById(Long id);
 }

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

@@ -88,4 +88,23 @@ public interface ReviewStandardService extends IService<ReviewStandard> {
      * */
     ReviewStandardListNewResponse getListNew(StandardListNewRequest request);
 
+    /*
+     * 查询当前标准下的所有id集合
+     * */
+    List<Long> getIdList(GetUseCaseRequestNew getUseCaseRequestNew);
+
+    /*
+    * 查询当前标准下的所有要点id集合
+    * */
+    List<Long> getKeypointIdList(GetKeypointListRequest getKeypointListRequest);
+
+    /*
+     * 新增细则按钮
+     * */
+    List<AddDetailsResponse> getKeypointListByIds(List<Long> idList);
+
+    /*
+     * 删除细则按钮
+     * */
+    List<Long> getDetailsIdList(DeleteDetailsRequest deleteDetailsRequest);
 }

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

+package com.ruoyi.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.ruoyi.web.request.GetUseCaseRequest;
+import com.ruoyi.web.request.ReviewKeyPointListRequest;
+import com.ruoyi.web.response.GetUseCaseResponse;
+import com.ruoyi.web.response.UseCaseResponseDTO;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+
+public interface ReviewUsecaseService {
+
+
+    /*
+     * 查询所有测试用例
+     * */
+    List<GetUseCaseResponse> getUseCaseListByIds(List<Long> idList);
+}

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

@@ -4,11 +4,18 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.ruoyi.domain.ReviewDetails;
 import com.ruoyi.domain.ReviewKeyPoint;
 import com.ruoyi.mapper.ReviewDetailsMapper;
+import com.ruoyi.mapper.ReviewStandardMapper;
 import com.ruoyi.service.ReviewDetailsService;
+import com.ruoyi.service.ReviewStandardService;
+import com.ruoyi.web.request.DeleteDetailsRequest;
+import com.ruoyi.web.response.*;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.util.ArrayList;
 import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
 
 @Service
 public class ReviewDetailsServiceImpl extends ServiceImpl<ReviewDetailsMapper, ReviewDetails> implements ReviewDetailsService {
@@ -16,8 +23,69 @@ public class ReviewDetailsServiceImpl extends ServiceImpl<ReviewDetailsMapper, R
     @Autowired
     private ReviewDetailsMapper reviewDetailsMapper;
 
+    @Autowired
+    private ReviewStandardMapper reviewStandardMapper;
+
     @Override
     public List<ReviewDetails> findByKeyPointsList(List<ReviewKeyPoint> reviewKeyPointList) {
         return reviewDetailsMapper.findByKeyPointList(reviewKeyPointList);
     }
+
+    /*
+     * 删除细则按钮
+     * */
+    @Override
+    public List<DeleteDetailsResponse> getDeleteDetailsResponseList(DeleteDetailsRequest deleteDetailsRequest) {
+        // 获取所有要点ID列表
+        List<Long> idList = reviewStandardMapper.getDelKeypointIdList(deleteDetailsRequest);
+
+        // 获取所有的细则列表
+        List<KeypointList> keypointLists = reviewStandardMapper.getKeypointListByIdList(idList);
+
+        // 将要点列表按reviewStandardId分组
+        Map<Long, List<KeypointList>> groupKeypoint = keypointLists.stream()
+                .collect(Collectors.groupingBy(KeypointList::getReviewStandardId));
+
+        // 创建返回结果列表
+        List<DeleteDetailsResponse> deleteDetailsResponseList = new ArrayList<>();
+        for (Map.Entry<Long, List<KeypointList>> entry : groupKeypoint.entrySet()) {
+            // 获取标准信息
+            ReviewStandardResponseNew reviewStandardResponseNew = reviewStandardMapper.selectReviewStandardById(entry.getKey());
+
+            // 处理标准信息为null的情况
+            if (reviewStandardResponseNew == null) {
+                continue;
+            }
+
+            // 组装 DeleteDetailsResponse
+            DeleteDetailsResponse deleteDetailsResponse = new DeleteDetailsResponse();
+            deleteDetailsResponse.setId(reviewStandardResponseNew.getId());
+            deleteDetailsResponse.setChapter(reviewStandardResponseNew.getChapter());
+            deleteDetailsResponse.setText(reviewStandardResponseNew.getText());
+            deleteDetailsResponse.setStandardId(reviewStandardResponseNew.getStandardId());
+            deleteDetailsResponse.setStandardNo(reviewStandardResponseNew.getStandardNo());
+
+            // 组装 DeleteDetailsList
+            List<DeleteDetailsList> deleteDetailsLists = new ArrayList<>();
+            for (KeypointList keypoint : entry.getValue()) {
+                DeleteDetailsList deleteDetailsList = new DeleteDetailsList();
+                deleteDetailsList.setId(keypoint.getId());
+                deleteDetailsList.setText(keypoint.getText());
+                deleteDetailsList.setReviewStandardId(keypoint.getReviewStandardId());
+
+                // 获取与 KeypointList 关联的 DeleteDetails
+                List<DeleteDetails> deleteDetails = reviewStandardMapper.getDeleteDetailsByKeypointId(keypoint.getId());
+                deleteDetailsList.setDeleteDetailsList(deleteDetails);
+
+                deleteDetailsLists.add(deleteDetailsList);
+            }
+
+            deleteDetailsResponse.setDeleteDetailsLists(deleteDetailsLists);
+
+            // 添加到返回列表
+            deleteDetailsResponseList.add(deleteDetailsResponse);
+        }
+
+        return deleteDetailsResponseList;
+    }
 }

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

@@ -292,7 +292,14 @@ public class ReviewEnterpriseArchiveServiceImpl extends ServiceImpl<ReviewEnterp
             reviewEnterpriseArchive.setPhoto(photo);
             reviewEnterpriseArchive.setPhotoName(photoName);
         }
-        reviewEnterpriseArchiveService.updateById(reviewEnterpriseArchive);
+        //mybatis-plus如果值为null的话不更改 这里自己写一个
+        reviewEnterpriseArchiveMapper.updateByTaskId(reviewEnterpriseArchive);
+        //reviewEnterpriseArchiveService.updateById(reviewEnterpriseArchive);
+    }
+
+    @Override
+    public void deleteById(Long id) {
+        reviewEnterpriseArchiveMapper.deleteById(id);
     }
 }
 

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

@@ -97,11 +97,23 @@ public class ReviewStandardServiceImpl extends ServiceImpl<ReviewStandardMapper,
 
         // 查询审查要点
         List<ReviewKeyPoint> reviewKeyPointList = reviewKeyPointService.findByStandardList(reviewStandardList);
-
+        if (reviewKeyPointList.size() == 0){
+            return ReviewStandardInspectionContentResponse.builder().keyPointList(new ArrayList<>()).build();
+        }
         // 查询审查细则
         List<ReviewDetails> reivewDetailsList = reviewDetailsService.findByKeyPointsList(reviewKeyPointList);
+        if (reivewDetailsList.size() == 0){
+            List<ReviewKeyPoint> keyPoints = buildKeyPoint(reviewKeyPointList, new ArrayList<>());
+            return ReviewStandardInspectionContentResponse.builder().keyPointList(keyPoints).build();
+        }
         // 查询审查场景
         List<ReviewScene> reviewSceneList = reviewSceneService.findByDetailsList(reivewDetailsList);
+        if (reviewSceneList.size() == 0){
+            List<ReviewDetails> reviewDetails = buildDetails(reivewDetailsList, reviewSceneList);
+            List<ReviewKeyPoint> keyPoints = buildKeyPoint(reviewKeyPointList, reviewDetails);
+            ReviewStandardInspectionContentResponse response = ReviewStandardInspectionContentResponse.builder().keyPointList(keyPoints).build();
+            return response;
+        }
         // 调用方法把数据变为树状结构
         List<ReviewDetails> reviewDetails = buildDetails(reivewDetailsList, reviewSceneList);
         List<ReviewKeyPoint> keyPoints = buildKeyPoint(reviewKeyPointList, reviewDetails);
@@ -491,4 +503,60 @@ public class ReviewStandardServiceImpl extends ServiceImpl<ReviewStandardMapper,
 
         return response;
     }
+
+    /*
+     * 查询当前标准下的所有id集合
+     * */
+    @Override
+    public List<Long> getIdList(GetUseCaseRequestNew getUseCaseRequestNew) {
+        return reviewStandardMapper.getIdList(getUseCaseRequestNew);
+    }
+
+    /*
+     * 查询当前标准下的所有要点id集合
+     * */
+    @Override
+    public List<Long> getKeypointIdList(GetKeypointListRequest getKeypointListRequest) {
+        return reviewStandardMapper.getKeypointIdList(getKeypointListRequest);
+    }
+
+    @Override
+    public List<AddDetailsResponse> getKeypointListByIds(List<Long> idList) {
+        //获取所有要点
+        List<KeypointList> keypointLists = reviewStandardMapper.getKeypointListByIdList(idList);
+
+        //按reviewStandard 分组
+        Map<Long,List<KeypointList>> groupKeypoint = keypointLists.stream()
+                .collect(Collectors.groupingBy(KeypointList::getReviewStandardId));
+        //创建返回结果列表
+        List<AddDetailsResponse> addDetailsResponseList = new ArrayList<>();
+        for (Map.Entry<Long,List<KeypointList>> entry : groupKeypoint.entrySet()) {
+            //获取标准信息
+            ReviewStandardResponseNew reviewStandardResponseNew = reviewStandardMapper.selectReviewStandardById(entry.getKey());
+
+            //处理标准信息为null的情况
+            if(reviewStandardResponseNew == null){
+                continue;
+            }
+
+            //组装
+            AddDetailsResponse addDetailsResponse = new AddDetailsResponse();
+            addDetailsResponse.setChapter(reviewStandardResponseNew.getChapter());
+            addDetailsResponse.setId(reviewStandardResponseNew.getId());
+            addDetailsResponse.setText(reviewStandardResponseNew.getText());
+            addDetailsResponse.setStandardId(reviewStandardResponseNew.getStandardId());
+            addDetailsResponse.setStandardNo(reviewStandardResponseNew.getStandardNo());
+            addDetailsResponse.setKeypointList(entry.getValue());
+
+
+            //添加到返回列表
+            addDetailsResponseList.add(addDetailsResponse);
+        }
+        return addDetailsResponseList;
+    }
+
+    @Override
+    public List<Long> getDetailsIdList(DeleteDetailsRequest deleteDetailsRequest) {
+        return reviewStandardMapper.getDetailsIdList(deleteDetailsRequest);
+    }
 }

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

+package com.ruoyi.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.ruoyi.mapper.ReviewStandardMapper;
+import com.ruoyi.mapper.ReviewUsecaseMapper;
+import com.ruoyi.service.ReviewUsecaseService;
+import com.ruoyi.web.request.GetUseCaseRequest;
+import com.ruoyi.web.request.ReviewKeyPointListRequest;
+import com.ruoyi.web.response.GetUseCaseResponse;
+import com.ruoyi.web.response.ReviewStandardResponse;
+import com.ruoyi.web.response.ReviewStandardResponseNew;
+import com.ruoyi.web.response.UseCaseResponseDTO;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+
+@Service
+public class ReviewUsecaseServiceImpl implements ReviewUsecaseService {
+    @Autowired
+    private ReviewUsecaseMapper reviewUsecaseMapper;
+
+    @Autowired
+    private ReviewStandardMapper reviewStandardMapper;
+
+    /*
+     * 查询所有测试用例
+     * */
+    @Override
+    public List<GetUseCaseResponse> getUseCaseListByIds(List<Long> idList) {
+        if (idList.size() == 0){
+            return new ArrayList<>();
+        }
+        //获取所有测试用例
+        List<UseCaseResponseDTO> useCaseResponseDTOList = reviewUsecaseMapper.getUseCaseListByIdList(idList);
+        // 按 reviewStandardId 分组
+        Map<Long, List<UseCaseResponseDTO>> groupedUseCases = useCaseResponseDTOList.stream()
+                .collect(Collectors.groupingBy(UseCaseResponseDTO::getReviewStandardId));
+        // 创建返回结果列表
+        List<GetUseCaseResponse> getUseCaseResponseList = new ArrayList<>();
+        for (Map.Entry<Long, List<UseCaseResponseDTO>> entry : groupedUseCases.entrySet()) {
+            // 获取标准信息
+            ReviewStandardResponseNew reviewStandardResponse = reviewStandardMapper.selectReviewStandardById(entry.getKey());
+
+            // 处理标准信息为 null 的情况
+            if (reviewStandardResponse == null) {
+                // 如果标准信息为 null，则跳过该条记录，或者根据需求处理
+                continue;
+            }
+
+            // 组装 GetUseCaseResponse 对象
+            GetUseCaseResponse getUseCaseResponse = new GetUseCaseResponse();
+            getUseCaseResponse.setId(reviewStandardResponse.getId());
+            getUseCaseResponse.setText(reviewStandardResponse.getText());
+            getUseCaseResponse.setStandardId(reviewStandardResponse.getStandardId());
+            getUseCaseResponse.setStandardNo(reviewStandardResponse.getStandardNo());
+            getUseCaseResponse.setUseCaseResponseDTOList(entry.getValue());
+
+            // 添加到返回列表
+            getUseCaseResponseList.add(getUseCaseResponse);
+        }
+        return getUseCaseResponseList;
+    }
+}

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

@@ -83,6 +83,8 @@ public class StrategyCarReviewTaskPending implements StrategyCarReviewTask, Init
 
     @Autowired
     private ISysUserService sysUserService;
+    @Autowired
+    private StandardMapper standardMapper;
 
     // PENDING状态下
     // 1.standard字段查询当前最新问卷
@@ -147,6 +149,11 @@ public class StrategyCarReviewTaskPending implements StrategyCarReviewTask, Init
             setDetailsResult(standardTree, results,carReviewTask);
             carReviewTask.setStandard(standardTree);
 
+            //问卷全部完成，那么设置任务的版本
+            Long standardId = carReviewTask.getStandardId();
+            Standard standard = standardMapper.getById(standardId);
+            carReviewTask.setVersion(standard.getCurrentVersion());
+            carReviewTaskMapper.updateById(carReviewTask);
             // 4. 修改任务状态为 SIGNED 待签字
             carReviewTask.setTaskStatus(CarReviewTask.TASK_STATUS_SIGNED);
 

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

@@ -73,6 +73,9 @@ public class StrategySystemReviewTaskPending implements StrategySystemReviewTask
     @Autowired
     private ISysUserService sysUserService;
 
+    @Autowired
+    private StandardMapper standardMapper;
+
     @Override
     public void doStart(SystemReviewTask systemReviewTask) {
         throw new ServiceException("不能开始一个已经开始的任务", HttpStatus.ERROR);
@@ -110,6 +113,11 @@ public class StrategySystemReviewTaskPending implements StrategySystemReviewTask
 
             systemReviewTask.setStandard(standardTree);
 
+            //问卷全部完成，那么设置任务的版本
+            Long standardId = systemReviewTask.getStandardId();
+            Standard standard = standardMapper.getById(standardId);
+            systemReviewTask.setVersion(standard.getCurrentVersion());
+            systemReviewTaskMapper.updateById(systemReviewTask);
             // 4. 修改任务状态为 SIGNED 待签字
             systemReviewTask.setTaskStatus(SystemReviewTask.STATUS_SIGNED);
 

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

@@ -1184,7 +1184,7 @@ public class TaskServiceImpl extends ServiceImpl<TaskMapper, Task>implements Tas
                     map.put("verbose", "BASIC");
 
                     //以post形式请求接口
-                    String result= HttpUtil.post("https://10.12.48.78:8090/DescribeProjectTestResult", JSONObject.toJSONString(map));
+                    String result= HttpUtil.post("https://10.12.48.78:8096/DescribeProjectTestResult", JSONObject.toJSONString(map));
 
                     JSONObject jsonObject = JSONObject.parseObject(result);
 

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

@@ -42,7 +42,7 @@ public class TestRecordsServiceImpl extends ServiceImpl<TestRecordsMapper, TestR
         map.put("verbose", "ALL");
 
         //以post形式请求接口
-        String result= HttpUtil.post("https://10.12.48.78:8090/DescribeProjectTestResult",JSONObject.toJSONString(map));
+        String result= HttpUtil.post("https://10.12.48.78:8096/DescribeProjectTestResult",JSONObject.toJSONString(map));
 
         JSONObject jsonObject = JSONObject.parseObject(result);
 

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

@@ -96,6 +96,15 @@ public class ReviewEnterpriseArchiveController extends BaseController {
         reviewEnterpriseArchiveService.editEnterpriseArchive(reviewEnterpriseArchive);
         return R.ok();
     }
+    @ApiOperation("删除车企文件")
+    @Trace
+    @Tags({@Tag(key = "param", value = "arg[0]"), @Tag(key = "result", value = "returnedObj")})
+    @Log(title = "删除车企文件", businessType = BusinessType.UPDATE)
+    @RequestMapping(method = RequestMethod.POST, value = "/delete")
+    public R<String> deleteEnterpriseArchive(@Validated @RequestBody ReviewEnterpriseArchiveGetInfoRequest request) {
+        reviewEnterpriseArchiveService.deleteById(request.getId());
+        return R.ok();
+    }
 
     @ApiOperation("预览企业留档文件")
     @Trace

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

@@ -9,7 +9,11 @@ import com.ruoyi.common.enums.BusinessType;
 import com.ruoyi.common.utils.bean.BeanUtils;
 import com.ruoyi.domain.ReviewKeyPoint;
 import com.ruoyi.domain.ReviewSceneChangeTask;
+import com.ruoyi.mapper.ReviewUsecaseMapper;
+import com.ruoyi.service.ReviewDetailsService;
 import com.ruoyi.service.ReviewSceneChangeTaskService;
+import com.ruoyi.service.ReviewStandardService;
+import com.ruoyi.service.ReviewUsecaseService;
 import com.ruoyi.web.request.ReviewSceneChangeTaskCreateRequest;
 import com.ruoyi.web.request.ReviewSceneChangeTaskPassRequest;
 import com.ruoyi.web.response.*;
@@ -22,10 +26,7 @@ import org.apache.skywalking.apm.toolkit.trace.Tags;
 import org.apache.skywalking.apm.toolkit.trace.Trace;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 import java.util.List;
 
@@ -37,6 +38,15 @@ public class ReviewSceneChangeTaskController extends BaseController {
     @Autowired
     private ReviewSceneChangeTaskService reviewSceneChangeTaskService;
 
+    @Autowired
+    private ReviewUsecaseService reviewUsecaseService;
+
+    @Autowired
+    private ReviewStandardService reviewStandardService;
+
+    @Autowired
+    private ReviewDetailsService reviewDetailsService;
+
     @ApiOperation("新建场景变更任务")
     @Trace
     @Tags({@Tag(key = "param", value = "arg[0]"), @Tag(key = "result", value = "returnedObj")})
@@ -231,4 +241,46 @@ public class ReviewSceneChangeTaskController extends BaseController {
         Long id = Long.parseLong(request.getId());
         return R.ok(reviewSceneChangeTaskService.getReviewerOpinion(id));
     }
+
+    /*
+    * 查询测试用例
+    * */
+    @ApiOperation("查询所有测试用例")
+    @Trace
+    @Tags({@Tag(key = "param", value = "arg[0]"), @Tag(key = "result", value = "returnedObj")})
+    @Log(title = "查询所有测试用例", businessType = BusinessType.UPDATE)
+    @RequestMapping(method = RequestMethod.POST, value = "/getUseCaseListAll")
+    public R<List<GetUseCaseResponse>> getUseCaseListAll(@RequestBody GetUseCaseRequestNew GetUseCaseRequestNew){
+        List<Long> idList = reviewStandardService.getIdList(GetUseCaseRequestNew);
+        List<GetUseCaseResponse> getUseCaseResponseList = reviewUsecaseService.getUseCaseListByIds(idList);
+        return R.ok(getUseCaseResponseList);
+    }
+
+    /*
+    * 新增细则按钮
+    * */
+    @ApiOperation("新增细则按钮")
+    @Trace
+    @Tags({@Tag(key = "param", value = "arg[0]"), @Tag(key = "result", value = "returnedObj")})
+    @Log(title = "新增细则按钮", businessType = BusinessType.UPDATE)
+    @RequestMapping(method = RequestMethod.POST, value = "/getKeypointListAll")
+    public R<List<AddDetailsResponse>> getDetailsListNew(@RequestBody GetKeypointListRequest getKeypointListRequest){
+        List<Long> idList = reviewStandardService.getKeypointIdList(getKeypointListRequest);
+        List<AddDetailsResponse> addDetailsResponseList = reviewStandardService.getKeypointListByIds(idList);
+        return R.ok(addDetailsResponseList);
+    }
+
+    /*
+     * 删除细则按钮
+     * */
+    @ApiOperation("删除细则按钮")
+    @Trace
+    @Tags({@Tag(key = "param", value = "arg[0]"), @Tag(key = "result", value = "returnedObj")})
+    @Log(title = "删除细则按钮", businessType = BusinessType.UPDATE)
+    @RequestMapping(method = RequestMethod.POST, value = "/deleteKeypointListAll")
+    public R<List<DeleteDetailsResponse>> deleteKeypointListAll(@RequestBody DeleteDetailsRequest deleteDetailsRequest){
+        List<DeleteDetailsResponse> responseList = reviewDetailsService.getDeleteDetailsResponseList(deleteDetailsRequest);
+        return R.ok(responseList);
+    }
+
 }

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

 package com.ruoyi.web;
 
-import com.ruoyi.common.annotation.Anonymous;
 import com.ruoyi.common.annotation.Log;
 import com.ruoyi.common.core.controller.BaseController;
 import com.ruoyi.common.core.domain.R;

quality-review/src/main/java/com/ruoyi/web/request/DeleteDetailsRequest.java

+package com.ruoyi.web.request;
+
+import io.swagger.annotations.ApiModel;
+import lombok.Data;
+
+@Data
+@ApiModel(value = "DeleteDetailsRequest" ,description = "获取细则列表请求request")
+public class DeleteDetailsRequest {
+    private Long standardId;
+
+    private String standardNo;
+
+    private String type;
+}

quality-review/src/main/java/com/ruoyi/web/request/GetKeypointListRequest.java

+package com.ruoyi.web.request;
+
+import io.swagger.annotations.ApiModel;
+import lombok.Data;
+
+@Data
+@ApiModel(value = "GetKeypointListRequest" ,description = "获取要点列表请求request")
+public class GetKeypointListRequest {
+    private Long standardId;
+
+    private String standardNo;
+
+    private String type;
+}

quality-review/src/main/java/com/ruoyi/web/request/GetUseCaseRequest.java

+package com.ruoyi.web.request;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+@ApiModel(value = "GetUseCaseRequest" ,description = "获取测试用例列表请求request")
+public class GetUseCaseRequest {
+
+    @ApiModelProperty("标准id")
+    private String reviewStandardId;
+}

quality-review/src/main/java/com/ruoyi/web/request/GetUseCaseRequestNew.java

+package com.ruoyi.web.request;
+
+import io.swagger.annotations.ApiModel;
+import lombok.Data;
+
+@Data
+@ApiModel(value = "GetUseCaseRequestNew" ,description = "获取测试用例列表请求request")
+public class GetUseCaseRequestNew {
+
+    private Long standardId;
+
+    private String standardNo;
+
+    private String type;
+}

quality-review/src/main/java/com/ruoyi/web/response/AddDetailsResponse.java

+package com.ruoyi.web.response;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.List;
+
+@ApiModel(value = "AddDetailsResponse", description = "新增细则按钮响应数据")
+@Data
+public class AddDetailsResponse {
+
+    @ApiModelProperty("id")
+    private Long id;
+    @ApiModelProperty("章节")
+    private String chapter;
+    @ApiModelProperty("标准内容")
+    private String text;
+    @ApiModelProperty("标准id")
+    private Long standardId;
+    @ApiModelProperty("标准编号")
+    private String standardNo;
+    @ApiModelProperty("标准下keypoint集合")
+    private List<KeypointList> keypointList;
+}

quality-review/src/main/java/com/ruoyi/web/response/DeleteDetails.java

+package com.ruoyi.web.response;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@ApiModel(value = "DeleteDetails", description = "新增细则按钮响应数据")
+@Data
+public class DeleteDetails {
+    @ApiModelProperty("要点id")
+    private Long id;
+
+    @ApiModelProperty("要点内容")
+    private String text;
+
+    @ApiModelProperty("标准id")
+    private Long reviewKeypointId;
+}

quality-review/src/main/java/com/ruoyi/web/response/DeleteDetailsList.java

+package com.ruoyi.web.response;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.List;
+
+@ApiModel(value = "DeleteDetailsList", description = "新增细则按钮响应数据")
+@Data
+public class DeleteDetailsList {
+    @ApiModelProperty("要点id")
+    private Long id;
+
+    @ApiModelProperty("要点内容")
+    private String text;
+
+    @ApiModelProperty("标准id")
+    private Long reviewStandardId;
+
+    @ApiModelProperty("细则集合")
+    private List<DeleteDetails> deleteDetailsList;
+}

quality-review/src/main/java/com/ruoyi/web/response/DeleteDetailsResponse.java

+package com.ruoyi.web.response;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.List;
+
+@ApiModel(value = "DeleteDetailsResponse", description = "删除细则按钮响应数据")
+@Data
+public class DeleteDetailsResponse {
+    @ApiModelProperty("id")
+    private Long id;
+    @ApiModelProperty("章节")
+    private String chapter;
+    @ApiModelProperty("标准内容")
+    private String text;
+    @ApiModelProperty("标准id")
+    private Long standardId;
+    @ApiModelProperty("标准编号")
+    private String standardNo;
+
+    @ApiModelProperty("标准下details集合")
+    private List<DeleteDetailsList> deleteDetailsLists;
+}

quality-review/src/main/java/com/ruoyi/web/response/GetUseCaseResponse.java

+package com.ruoyi.web.response;
+
+import io.swagger.annotations.ApiModel;
+import lombok.Data;
+
+import java.util.List;
+
+@ApiModel(value = "GetUseCaseResponse", description = "查询测试用例")
+@Data
+public class GetUseCaseResponse {
+
+    private Long id;
+    private String text;
+    private Long standardId;
+
+    private String standardNo;
+
+    private List<UseCaseResponseDTO> useCaseResponseDTOList;
+}

quality-review/src/main/java/com/ruoyi/web/response/KeypointList.java

+package com.ruoyi.web.response;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@ApiModel(value = "KeypointList", description = "要点列表")
+@Data
+public class KeypointList {
+
+    @ApiModelProperty("要点id")
+    private Long id;
+
+    @ApiModelProperty("要点内容")
+    private String text;
+
+    @ApiModelProperty("标准id")
+    private Long reviewStandardId;
+}

quality-review/src/main/java/com/ruoyi/web/response/ReviewStandardResponseNew.java

+package com.ruoyi.web.response;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+@ApiModel
+public class ReviewStandardResponseNew {
+    @ApiModelProperty("ID")
+    @JsonFormat(shape = JsonFormat.Shape.STRING)
+    private Long id;
+
+    /**
+     * 章节
+     */
+    @ApiModelProperty("章节")
+    private String chapter;
+
+    /**
+     * 文本内容
+     */
+    @ApiModelProperty("文本内容")
+    private String text;
+
+    /**
+     * 测试方法(车型试验专有)
+     */
+    @ApiModelProperty("测试方法(车型试验专有)")
+    private String testMethod;
+
+    @ApiModelProperty("标准名称")
+    private String name;
+
+    @ApiModelProperty("标准号")
+    private String standardNo;
+
+    @ApiModelProperty("标准id")
+    private Long standardId;
+}

quality-review/src/main/java/com/ruoyi/web/response/UseCaseResponseDTO.java

+package com.ruoyi.web.response;
+
+import io.swagger.annotations.ApiModel;
+import lombok.Data;
+
+@ApiModel(value = "UseCaseResponseDTO", description = "测试用例DTO")
+@Data
+public class UseCaseResponseDTO {
+
+    private Long id;
+
+    private String usecaseId;
+
+    private String usecaseDescribe;
+
+    private Long reviewStandardId;
+}

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

@@ -83,4 +83,21 @@
             </if>
         </where>
     </select>
+    <select id="getDeleteDetailsResponseByStandardId"
+            resultType="com.ruoyi.web.response.DeleteDetailsResponse">
+        select
+            s.id,
+            s.chapter,
+            s.text,
+            s.standard_id as standardId,
+            s.standard_no as standardNo
+        FROM
+            t_review_standard s
+        JOIN
+            t_review_keypoint k on s.id
+        JOIN
+            t_review_details d on k.id
+        where s.standard_id = #{standardId}
+    </select>
+
 </mapper>

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

@@ -18,6 +18,17 @@
             <result property="createBy" column="create_by" jdbcType="VARCHAR"/>
             <result property="createTime" column="create_time" jdbcType="TIMESTAMP"/>
     </resultMap>
+    <update id="updateByTaskId">
+        update t_review_enterprise_archive
+        set photo_name = #{photoName},
+            photo=#{photo},
+            file_name=#{fileName},
+            version=#{version},
+            publish_date=#{publishDate},
+            status=#{status},
+            identify_number=#{identifyNumber}
+        where id = #{id}
+    </update>
 
 
     <select id="findByTaskId" resultType="com.ruoyi.domain.ReviewEnterpriseArchive">
@@ -67,7 +78,7 @@
         where task_id = #{taskId}
     </select>
     <select id="findEnterpriseArchiveByTaskId" resultType="com.ruoyi.domain.ReviewEnterpriseArchive">
-        SELECT id, enterprise_name, file_name, version, publish_date, status, identify_number, storage, photo, task_id, create_by, create_time
+        SELECT id, enterprise_name, file_name, version, publish_date, status, identify_number, storage, photo, task_id, create_by, create_time,photo_name
         FROM t_review_enterprise_archive
         <where>
             task_id = #{taskId}

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

@@ -58,8 +58,12 @@
             <if test="name != null and text != ''">and name like concat('%',#{name}, '%')</if>
             <if test="standardNo != null and standardNo != ''">and standard_no like concat('%',#{standardNo},'%')</if>
         </where>
+        /*ORDER BY
+            chapter*/
         ORDER BY
-            chapter
+        CAST(SUBSTRING_INDEX(chapter, '.', 1) AS UNSIGNED),
+        CAST(SUBSTRING_INDEX(SUBSTRING_INDEX(chapter, '.', 2), '.', -1) AS UNSIGNED),
+        CAST(SUBSTRING_INDEX(SUBSTRING_INDEX(chapter, '.', 3), '.', -1) AS UNSIGNED)
     </select>
 
     <select id="selectTestInspectionContent"
@@ -114,7 +118,45 @@
         WHERE standard_no = #{request.standardNo}
         AND standard_id = #{request.standardId}
     </select>
+    <select id="selectReviewStandardById" resultType="com.ruoyi.web.response.ReviewStandardResponseNew">
+        select id,standard_id,standard_no,text,chapter
+        from t_review_standard
+        where id = #{key}
+    </select>
 
+    <select id="getIdList" resultType="java.lang.Long">
+        select id
+        from t_review_standard
+        where standard_no = #{getUseCaseRequestNew.standardNo} and type = #{getUseCaseRequestNew.type} and standard_id = #{getUseCaseRequestNew.standardId}
+    </select>
+    <select id="getKeypointIdList" resultType="java.lang.Long">
+        select id
+        from t_review_standard
+        where standard_no = #{getKeypointListRequest.standardNo} and standard_id = #{getKeypointListRequest.standardId} and type = #{getKeypointListRequest.type}
+    </select>
+    <select id="getKeypointListByIdList" resultType="com.ruoyi.web.response.KeypointList">
+        select
+            id,text,review_standard_id
+        from t_review_keypoint
+        where t_review_keypoint.review_standard_id IN
+        <foreach item="id" collection="idList" open="(" separator="," close=")">
+            #{id}
+        </foreach>
+    </select>
+    <select id="getDetailsIdList" resultType="java.lang.Long">
+        select review_keypoint_id
+        from t_review_details
 
+    </select>
+    <select id="getDelKeypointIdList" resultType="java.lang.Long">
+        select id
+        from t_review_standard
+        where standard_no = #{deleteDetailsRequest.standardNo} and standard_id = #{deleteDetailsRequest.standardId} and type = #{deleteDetailsRequest.type}
+    </select>
+    <select id="getDeleteDetailsByKeypointId" resultType="com.ruoyi.web.response.DeleteDetails">
+        select id, text, review_keypoint_id
+        from t_review_details
+        where review_keypoint_id = #{id}
+    </select>
 
 </mapper>

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

@@ -14,4 +14,19 @@
         from t_review_usecase
         where id = #{id}
     </select>
+
+    <select id="getUseCaseListByIdList" resultType="com.ruoyi.web.response.UseCaseResponseDTO">
+        SELECT
+        u.id,
+        u.usecase_id AS usecaseId,
+        u.usecase_describe AS usecaseDescribe,
+        u.review_standard_id AS reviewStandardId
+        FROM
+        t_review_usecase u
+        WHERE
+        u.review_standard_id IN
+        <foreach item="id" collection="idList" open="(" separator="," close=")">
+            #{id}
+        </foreach>
+    </select>
 </mapper>

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

@@ -62,4 +62,9 @@
             </if>
         </where>
     </select>
+    <select id="getById" resultType="com.ruoyi.domain.Standard">
+        select *
+        from t_standard
+        where id = #{standardId}
+    </select>
 </mapper>

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

@@ -28,7 +28,7 @@
     </select>
     <select id="countResult" resultType="java.lang.Long">
         SELECT COUNT(*) FROM t_test_records
-        WHERE project_id = #{projectId}
+        WHERE project_id = #{projectId} and test_result != 'IGNORED'
         GROUP BY project_id
     </select>