inspect-server/src/main/java/com/yuanchu/mom/controller/InsReportController.java

@@ -153,8 +153,8 @@
    @ValueAuth
    @ApiOperation(value = "查出该订单下每个样品下每个站点的检验次数")
    @GetMapping("/getInsOrderStateCount")
    public Result getInsOrderStateCount(Integer id,Integer sampleId){
        return Result.success(insReportService.getInsOrderStateCount(id,sampleId));
    public Result getInsOrderStateCount(Integer id){
        return Result.success(insReportService.getInsOrderStateCount(id));
    }

    //取消2.26

 inspect-server/src/main/java/com/yuanchu/mom/service/InsReportService.java

@@ -47,5 +47,5 @@
    int isReport(InsReportDto insReportDto);

    //查出该订单下每个样品下每个站点下的检验次数
    List<InsOrderStateDto> getInsOrderStateCount(Integer id,Integer sampleId);
    List<InsOrderStateDto> getInsOrderStateCount(Integer id);
}

 inspect-server/src/main/java/com/yuanchu/mom/service/impl/InsReportServiceImpl.java

@@ -382,14 +382,16 @@

    //查出该订单下每个站点下的检验次数
    @Override
    public List<InsOrderStateDto> getInsOrderStateCount(Integer id, Integer sampleId) {
    public List<InsOrderStateDto> getInsOrderStateCount(Integer id) {
        List<InsOrderStateDto> insOrderStateDtos = new ArrayList<>();
        InsSample insSample = insSampleMapper.selectById(sampleId);
        InsOrderStateDto insOrderStateDto = new InsOrderStateDto();
        insOrderStateDto.setInsSample(insSample);
        List<InsOrderState> insOrderStates = insOrderStateMapper.getInsOrderStateCount(id, insSample.getId());
        insOrderStateDto.setInsOrderStates(insOrderStates);
        insOrderStateDtos.add(insOrderStateDto);
        List<InsSample> insSamples = insSampleMapper.selectList(Wrappers.<InsSample>lambdaQuery().eq(InsSample::getInsOrderId,id));
        for (InsSample insSample : insSamples) {
            InsOrderStateDto insOrderStateDto = new InsOrderStateDto();
            insOrderStateDto.setInsSample(insSample);
            List<InsOrderState> insOrderStates = insOrderStateMapper.getInsOrderStateCount(id, insSample.getId());
            insOrderStateDto.setInsOrderStates(insOrderStates);
            insOrderStateDtos.add(insOrderStateDto);
        }

        return insOrderStateDtos;
    }