zss
2024-12-19 b2e4ff967a45951e154a55d0eafc428d68442517
查询站点的检验时长2.0
已修改4个文件
23 ■■■■■ 文件已修改
inspect-server/src/main/java/com/yuanchu/mom/controller/ReportController.java 7 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
inspect-server/src/main/java/com/yuanchu/mom/mapper/InsOrderUserMapper.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
inspect-server/src/main/java/com/yuanchu/mom/service/impl/ReportServiceImpl.java 8 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
inspect-server/src/main/resources/mapper/InsOrderUserMapper.xml 6 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
inspect-server/src/main/java/com/yuanchu/mom/controller/ReportController.java
@@ -9,10 +9,7 @@
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.AllArgsConstructor;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import org.springframework.web.bind.annotation.*;
@RestController
@AllArgsConstructor
@@ -70,7 +67,7 @@
    @ValueClassify("统计图表")
    @ApiOperation(value = "查询站点的检验时长")
    @GetMapping("/timeByStation")
    @PostMapping("/timeByStation")
    public Result timeByStation(String startTime, String endTime, Page page,String sonLaboratory){
        return Result.success(reportService.timeByStation(startTime,endTime,page,sonLaboratory));
    }
inspect-server/src/main/java/com/yuanchu/mom/mapper/InsOrderUserMapper.java
@@ -25,5 +25,5 @@
    IPage<InsOrderUserDto> selectInsOrderUserDto(@Param("start") LocalDateTime start, @Param("end") LocalDateTime end, @Param("sonLaboratory") String sonLaboratory, Page page);
    IPage<InsOrderUserDto> selectInsOrderUserDto2(@Param("id") Integer id, Page page);
    IPage<InsOrderUserDto> selectInsOrderUserDto2(@Param("ids") List<Integer> ids, Page page);
}
inspect-server/src/main/java/com/yuanchu/mom/service/impl/ReportServiceImpl.java
@@ -432,9 +432,11 @@
        }else {
            List<InsOrderState> insOrderStates = insOrderStateMapper.selectList(Wrappers.<InsOrderState>lambdaQuery()
                    .between(InsOrderState::getCreateTime, start, end));
            for (InsOrderState insOrderState : insOrderStates) {
                IPage<InsOrderUserDto> insOrderUserDtoIPage = insOrderUserMapper.selectInsOrderUserDto2(insOrderState.getId(), page);
                map.put(insOrderState.getLaboratory(), insOrderUserDtoIPage);
            Map<String, List<InsOrderState>> listMap = insOrderStates.stream().collect(Collectors.groupingBy(InsOrderState::getLaboratory));
            for (Map.Entry<String, List<InsOrderState>> entry : listMap.entrySet()) {
                List<Integer> ids = entry.getValue().stream().map(InsOrderState::getId).collect(Collectors.toList());
                IPage<InsOrderUserDto> insOrderUserDtoIPage = insOrderUserMapper.selectInsOrderUserDto2(ids, new Page(1,9));
                map.put(entry.getKey(), insOrderUserDtoIPage);
            }
        }
        return map;
inspect-server/src/main/resources/mapper/InsOrderUserMapper.xml
@@ -40,6 +40,10 @@
        from ins_order_user iou
                 left join ins_order_state ios on iou.ins_order_state_id = ios.id
                 left join ins_sample isa on ios.ins_sample_id = isa.id
        where ios.id= #{id}
        where 1=1
        and ios.id in
        <foreach collection="ids" open="(" close=")" item="id" separator=",">
            #{id}
        </foreach>
    </select>
</mapper>