Merge remote-tracking branch 'origin/master'

luoyisheng

2025-03-26 555ff988376b8650455547d0b6ff7f12f4ae2c63

 medicalWaste-system/src/main/java/com/sinata/system/service/impl/MwCheckoutRecordServiceImpl.java

@@ -1,10 +1,13 @@
package com.sinata.system.service.impl;

import cn.hutool.core.date.DateUtil;
import cn.idev.excel.FastExcel;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.sinata.common.entity.PageDTO;
import com.sinata.common.utils.BeanUtils;
import com.sinata.common.utils.CollUtils;
import com.sinata.common.utils.DateUtils;
import com.sinata.common.utils.StringUtils;
import com.sinata.system.domain.MwCheckoutRecord;
import com.sinata.system.domain.dto.CollectTotalUpDto;
@@ -13,6 +16,7 @@
import com.sinata.system.domain.query.MwCheckoutRecordItemQuery;
import com.sinata.system.domain.query.MwTransitRecordQuery;
import com.sinata.system.domain.query.TransformQuery;
import com.sinata.system.domain.query.TransitRecordQuery;
import com.sinata.system.domain.vo.MwCheckoutRecordExcelVO;
import com.sinata.system.domain.vo.MwCheckoutRecordVO;
import com.sinata.system.domain.vo.MwCollectRecordVO;
@@ -30,7 +34,6 @@
import java.io.IOException;
import java.net.URLEncoder;
import java.time.LocalDate;
import java.util.Collections;
import java.util.List;

/**
@@ -94,8 +97,8 @@
        return this.baseMapper.totalUp4(departmentId);
    }
    @Override
    public List<CollectTotalUpDto> totalUp2(LocalDate date1,LocalDate date2, Long departmentId) {
        return this.baseMapper.totalUp2(date1,date2,departmentId);
    public List<CollectTotalUpDto> totalUp2(LocalDate date,Long departmentId) {
        return this.baseMapper.totalUp2(date,departmentId);
    }
    @Override
    public List<CollectTotalUpDto> totalUp5( Long departmentId) {
@@ -117,12 +120,12 @@
    /**
     * 转运记录详情
     *
     * @param departmentId
     * @param id
     * @return
     */
    @Override
    public MwCheckoutRecordVO hospitalDetail(Long departmentId) {
        return baseMapper.hospitalDetail(departmentId);
    public MwCheckoutRecordVO hospitalDetail(Long id) {
        return baseMapper.hospitalDetail(id);
    }

    /**
@@ -149,6 +152,14 @@
        if (StringUtils.isBlank(treeCode)) {
            return PageDTO.empty(0L, 0L);
        }
        if (CollUtils.isNotEmpty(query.getStartTime())) {
            query.setStartTimeStart(DateUtil.parse(query.getStartTime().get(0), DateUtils.YYYY_MM_DD_HH_MM_SS));
            query.setStartTimeEnd(DateUtil.parse(query.getStartTime().get(1), DateUtils.YYYY_MM_DD_HH_MM_SS));
        }
        if (CollUtils.isNotEmpty(query.getEndTime())) {
            query.setEndTimeStart(DateUtil.parse(query.getEndTime().get(0), DateUtils.YYYY_MM_DD_HH_MM_SS));
            query.setEndTimeEnd(DateUtil.parse(query.getEndTime().get(1), DateUtils.YYYY_MM_DD_HH_MM_SS));
        }
        Page<MwTransitRecordVO> page = baseMapper.transitPageList(new Page<>(query.getPageCurr(), query.getPageSize()), query, treeCode);
        return PageDTO.of(page);
    }
@@ -160,8 +171,8 @@
     * @return
     */
    @Override
    public MwTransitRecordVO transitDetail(Long id) {
        return baseMapper.transitDetail(id);
    public MwTransitRecordVO transitDetail(TransitRecordQuery query) {
        return baseMapper.transitDetail(query);
    }

    /**
@@ -171,8 +182,8 @@
     * @return
     */
    @Override
    public PageDTO<MwMedicalWasteBoxVO> transitDetailPageList(MwTransitRecordQuery query) {
        Page<MwMedicalWasteBoxVO> page = baseMapper.transitDetailPageList(new Page<>(query.getPageCurr(), query.getPageSize()), query.getId());
    public PageDTO<MwMedicalWasteBoxVO> transitDetailPageList(TransitRecordQuery query) {
        Page<MwMedicalWasteBoxVO> page = baseMapper.transitDetailPageList(new Page<>(query.getPageCurr(), query.getPageSize()), query);
        return PageDTO.of(page);
    }