Merge remote-tracking branch 'origin/master'

luodangjia

2025-01-02 fc5cda9c324a91948dd964e91960623b41baf293

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

@@ -7,6 +7,7 @@
import com.sinata.common.utils.BeanUtils;
import com.sinata.common.utils.StringUtils;
import com.sinata.system.domain.MwCheckoutRecord;
import com.sinata.system.domain.dto.CollectTotalUpDto;
import com.sinata.system.domain.query.CheckoutRecordQuery;
import com.sinata.system.domain.query.DisposalReportQuery;
import com.sinata.system.domain.query.MwCheckoutRecordItemQuery;
@@ -16,6 +17,7 @@
import com.sinata.system.domain.vo.MwCheckoutRecordVO;
import com.sinata.system.domain.vo.MwCollectRecordVO;
import com.sinata.system.domain.vo.MwMedicalWasteBoxVO;
import com.sinata.system.domain.vo.MwTransitCarWarningVO;
import com.sinata.system.domain.vo.MwTransitRecordVO;
import com.sinata.system.domain.vo.TransformVO;
import com.sinata.system.mapper.MwCheckoutRecordMapper;
@@ -27,6 +29,8 @@
import javax.servlet.http.HttpServletResponse;
import java.io.IOException;
import java.net.URLEncoder;
import java.time.LocalDate;
import java.util.Collections;
import java.util.List;

/**
@@ -79,6 +83,31 @@
        String fileName = URLEncoder.encode("转运记录", "UTF-8").replaceAll("\\+", "%20");
        response.setHeader("Content-disposition", "attachment;filename*=utf-8''" + fileName + ".xlsx");
        FastExcel.write(response.getOutputStream(), MwCheckoutRecordExcelVO.class).sheet("转运记录").doWrite(mwCheckoutRecordExcelVOS);
    }

    @Override
    public List<CollectTotalUpDto> totalUp(LocalDate date, Long departmentId) {
        return this.baseMapper.totalUp(date,departmentId);
    }
    @Override
    public List<CollectTotalUpDto> totalUp4(Long departmentId) {
        return this.baseMapper.totalUp4(departmentId);
    }
    @Override
    public List<CollectTotalUpDto> totalUp2(LocalDate date1,LocalDate date2, Long departmentId) {
        return this.baseMapper.totalUp2(date1,date2,departmentId);
    }
    @Override
    public List<CollectTotalUpDto> totalUp5( Long departmentId) {
        return this.baseMapper.totalUp5(departmentId);
    }
    @Override
    public List<CollectTotalUpDto> totalUp3(LocalDate date1,LocalDate date2, Long departmentId) {
        return this.baseMapper.totalUp3(date1,date2,departmentId);
    }
    @Override
    public List<CollectTotalUpDto> totalUp1( Long outId) {
        return this.baseMapper.totalUp1(outId);
    }

    /**
@@ -166,4 +195,14 @@
        String treeCode = sysDepartmentService.getTreeCodeByDepartmentId(query.getDepartmentId());
        return baseMapper.getRegulationReportList(query, treeCode);
    }

    /**
     * 车辆转运异常预警
     *
     * @return
     */
    @Override
    public List<MwTransitCarWarningVO> queryWarningList() {
        return baseMapper.queryWarningList();
    }
}