查询站点的检验时长调整

zss

2024-12-19 78965e1795d42d6a0c4d6f233838ebe06c28da76

查询站点的检验时长调整

 inspect-server/src/main/java/com/yuanchu/mom/mapper/InsOrderUserMapper.java

@@ -24,4 +24,6 @@


    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);
}

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

@@ -33,5 +33,5 @@
    Map<Object, Double> manHourByPerson(String startTime, String endTime,String sonLaboratory);

    //查询站点的检验时长
    IPage<InsOrderUserDto> timeByStation(String startTime, String endTime, Page page, String sonLaboratory);
    Map<String, IPage<InsOrderUserDto>> timeByStation(String startTime, String endTime, Page page, String sonLaboratory);
}

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

@@ -420,12 +420,23 @@
    }

    @Override
    public IPage<InsOrderUserDto> timeByStation(String startTime, String endTime, Page page, String sonLaboratory) {
    public Map<String, IPage<InsOrderUserDto>> timeByStation(String startTime, String endTime, Page page, String sonLaboratory) {
        DateTimeFormatter format = DateTimeFormatter.ofPattern("yyyy-MM-dd");
        LocalDateTime start = LocalDate.parse(startTime, format).atStartOfDay();
        LocalDateTime end = LocalDate.parse(endTime, format).atTime(23, 59, 59);
        Map<String, IPage<InsOrderUserDto>> map = new HashMap<>();
        //查询这个时间内所有检验任务
        IPage<InsOrderUserDto> insOrderUserDtoIPage = insOrderUserMapper.selectInsOrderUserDto(start,end,sonLaboratory, page);
        return insOrderUserDtoIPage;
        if (ObjectUtils.isNotEmpty(sonLaboratory)) {
            IPage<InsOrderUserDto> insOrderUserDtoIPage = insOrderUserMapper.selectInsOrderUserDto(start, end, sonLaboratory, page);
            map.put(sonLaboratory, insOrderUserDtoIPage);
        }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);
            }
        }
        return map;
    }
}

 inspect-server/src/main/resources/mapper/InsOrderUserMapper.xml

@@ -31,4 +31,15 @@
        where ios.laboratory = #{sonLaboratory}
          and ios.create_time BETWEEN #{start} AND #{end}
    </select>
    <select id="selectInsOrderUserDto2" resultType="com.yuanchu.mom.dto.InsOrderUserDto">
        select iou.num,
               ios.laboratory                                               sonLaboratory,
               sample_code,
               sample                                                       sampleName,
               IFNULL(TIMESTAMPDIFF(HOUR, iou.ins_time, submit_time), 0) AS hours
        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}
    </select>
</mapper>