Merge remote-tracking branch 'origin/master'

luoyisheng

2025-04-01 9eaf711b027f60a67a33cb5259e06c21bab620d7

Merge remote-tracking branch 'origin/master'

 medicalWaste-admin/src/main/java/com/sinata/web/controller/applet/AppLoginController.java

@@ -21,6 +21,7 @@
import com.sinata.system.domain.SysDepartment;
import com.sinata.system.domain.SysUserRole;
import com.sinata.system.domain.dto.UserInfoDTO;
import com.sinata.system.enums.DepartmentEnum;
import com.sinata.system.mapper.SysUserRoleMapper;
import com.sinata.system.service.ISysMenuService;
import com.sinata.system.service.ISysRoleService;
@@ -41,6 +42,7 @@
import javax.annotation.Resource;
import java.util.List;
import java.util.Map;
import java.util.Objects;
import java.util.Random;
import java.util.Set;

@@ -230,6 +232,16 @@
        userInfoDTO.setNickName(user.getNickName());
        userInfoDTO.setDepartment(byId2);
        userInfoDTO.setRoles(roles);
        if (byId2.getOrgType().equals(DepartmentEnum.REGULATORY_UNIT.getCode())) {
            SysDepartment department = departmentService.getById(byId2.getParentId());
            if (Objects.nonNull(department)) {
                userInfoDTO.setCurrentDepartmentId(department.getId());
                userInfoDTO.setCurrentDepartmentName(department.getDepartmentName());
            }
        } else {
            userInfoDTO.setCurrentDepartmentId(byId2.getId());
            userInfoDTO.setCurrentDepartmentName(byId2.getDepartmentName());
        }
        SysUserRole sysUserRole = sysUserRoleMapper.selectOne(Wrappers.<SysUserRole>lambdaQuery().eq(SysUserRole::getUserId, user.getUserId()));
        if (sysUserRole != null) {
            SysRole byId = roleService.getById(sysUserRole.getRoleId());

 medicalWaste-admin/src/main/java/com/sinata/web/controller/backend/MwCheckoutRecordController.java

@@ -108,7 +108,7 @@
    /**
     * 运输记录详情
     *
     * @param id
     * @param query
     * @return
     */
    @ApiOperation("运输记录详情")

 medicalWaste-admin/src/main/java/com/sinata/web/controller/backend/MwCollectRecordController.java

@@ -86,7 +86,7 @@
    @ApiOperation("删除")
    @DeleteMapping("/{id}")
    public R<?> remove(@ApiParam(name = "id", value = "医废追溯id", required = true) @PathVariable("id") Long id) {
        collectRecordService.removeById(id);
        collectRecordService.delete(id);
        return R.ok();
    }


 medicalWaste-admin/src/main/java/com/sinata/web/controller/backend/system/SysDepartmentController.java

@@ -55,7 +55,7 @@
     *
     * @return
     */
    @ApiOperation(value = "获取全部/区域/医疗机构/处置单位/监管单位树-搜索框用", notes = "0：全部 1：区域 2：医疗机构 3：处置单位 4：监管单位 5：医疗机构、监管单位")
    @ApiOperation(value = "获取全部/区域/医疗机构/处置单位/监管单位树-搜索框用", notes = "0：全部 1：区域 2：医疗机构 3：处置单位 4：监管单位 5：医疗机构、处置单位 6：医疗机构、监管单位 7：处置单位、监管单位")
    @GetMapping("/departmentSearchTree")
    @ApiImplicitParam(name = "type", value = "查询类型", required = true)
    public R<List<SysDepartmentVO>> getDepartmentSearchTree(@RequestParam(value = "type", required = true) @NotNull(message = "类型不能为空") Integer type) {

 medicalWaste-system/src/main/java/com/sinata/system/config/AutoColumnWidthStrategy.java

New file
@@ -0,0 +1,49 @@
package com.sinata.system.config;

import cn.idev.excel.metadata.Head;
import cn.idev.excel.metadata.data.WriteCellData;
import cn.idev.excel.write.metadata.holder.WriteSheetHolder;
import cn.idev.excel.write.style.column.AbstractColumnWidthStyleStrategy;
import org.apache.poi.ss.usermodel.Cell;

import java.util.HashMap;
import java.util.List;
import java.util.Map;

public class AutoColumnWidthStrategy extends AbstractColumnWidthStyleStrategy {
    private final Map<Integer, Map<Integer, Integer>> cache = new HashMap<>();

    @Override
    protected void setColumnWidth(WriteSheetHolder writeSheetHolder, List<WriteCellData<?>> cellDataList, Cell cell,
                                  Head head, Integer relativeRowIndex, Boolean isHead) {
        boolean needSetWidth = isHead || !cellDataList.isEmpty();
        if (needSetWidth) {
            Map<Integer, Integer> maxWidthMap = cache.computeIfAbsent(writeSheetHolder.getSheetNo(), k -> new HashMap<>());
            int columnWidth = calculateWidth(cellDataList, cell, isHead);
            if (columnWidth > 0) {
                columnWidth = Math.min(columnWidth, 255); // 最大支持255字符
                if (columnWidth > maxWidthMap.getOrDefault(cell.getColumnIndex(), 0)) {
                    maxWidthMap.put(cell.getColumnIndex(), columnWidth);
                    writeSheetHolder.getSheet().setColumnWidth(cell.getColumnIndex(), columnWidth * 256);
                }
            }
        }
    }

    // 计算单元格内容长度（按字节）
    private int calculateWidth(List<WriteCellData<?>> cellDataList, Cell cell, boolean isHead) {
        if (isHead) {
            return cell.getStringCellValue().getBytes().length;
        } else {
            WriteCellData<?> cellData = cellDataList.get(0);
            switch (cellData.getType()) {
                case STRING:
                    return cellData.getStringValue().getBytes().length;
                case NUMBER:
                    return cellData.getNumberValue().toString().getBytes().length;
                default:
                    return -1;
            }
        }
    }
}

 medicalWaste-system/src/main/java/com/sinata/system/domain/dto/UserInfoDTO.java

@@ -1,7 +1,5 @@
package com.sinata.system.domain.dto;

import com.baomidou.mybatisplus.annotation.TableField;
import com.sinata.common.annotation.Excel;
import com.sinata.common.core.domain.entity.SysRole;
import com.sinata.system.domain.SysDepartment;
import io.swagger.annotations.ApiModelProperty;
@@ -18,4 +16,8 @@
    @ApiModelProperty("单位名称")
    private SysDepartment department;
    private SysRole role;
    @ApiModelProperty("当前区域id")
    private Long currentDepartmentId;
    @ApiModelProperty("当前区域名称")
    private String currentDepartmentName;
}

 medicalWaste-system/src/main/java/com/sinata/system/domain/vo/MwCheckoutRecordExcelVO.java

@@ -1,5 +1,6 @@
package com.sinata.system.domain.vo;

import cn.idev.excel.annotation.ExcelIgnore;
import cn.idev.excel.annotation.ExcelProperty;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
@@ -20,38 +21,39 @@
    private static final long serialVersionUID = -851971023455890457L;

    @ApiModelProperty("记录id")
    @ExcelIgnore
    private Long id;

    @ExcelProperty(value = "转运时间", index = 1)
    @ExcelProperty(value = "转运时间", index = 0)
    private Date checkoutTime;


    @ApiModelProperty("医院名称")
    @ExcelProperty(value = "医院名称", index = 2)
    @ExcelProperty(value = "医院名称", index = 1)
    private String hospitalName;

    @ApiModelProperty("箱数")
    @ExcelProperty(value = "箱数", index = 3)
    @ExcelProperty(value = "箱数", index = 2)
    private Integer boxNum;

    @ApiModelProperty("袋数")
    @ExcelProperty(value = "袋数", index = 4)
    @ExcelProperty(value = "袋数", index = 3)
    private Integer bagNum;

    @ApiModelProperty("总重量")
    @ExcelProperty(value = "重量", index = 5)
    @ExcelProperty(value = "重量", index = 4)
    private BigDecimal totalWeight;

    @ApiModelProperty("司机姓名")
    @ExcelProperty(value = "司机姓名", index = 6)
    @ExcelProperty(value = "司机姓名", index = 5)
    private String driverName;

    @ApiModelProperty("车牌号")
    @ExcelProperty(value = "车牌号", index = 7)
    @ExcelProperty(value = "车牌号", index = 6)
    private String licensePlateNumber;

    @ApiModelProperty("转运线路")
    @ExcelProperty(value = "转运路线", index = 8)
    @ExcelProperty(value = "转运路线", index = 7)
    private String routeName;

}

 medicalWaste-system/src/main/java/com/sinata/system/mapper/MwMicroEquipmentRecordItemMapper.java

@@ -2,7 +2,12 @@

import com.sinata.system.domain.MwMicroEquipmentRecordItem;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.sinata.system.domain.query.DisposalReportQuery;
import com.sinata.system.domain.vo.MwCollectRecordVO;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;

import java.util.List;

/**
 * <p>
@@ -14,5 +19,12 @@
 */
@Mapper
public interface MwMicroEquipmentRecordItemMapper extends BaseMapper<MwMicroEquipmentRecordItem> {

    /**
     * 获取小型微波设备使用记录列表
     *
     * @param query
     * @param treeCode
     * @return
     */
    List<MwCollectRecordVO> getRegulationReportList(@Param("query") DisposalReportQuery query, @Param("treeCode") String treeCode);
}

 medicalWaste-system/src/main/java/com/sinata/system/service/MwCollectRecordService.java

@@ -19,7 +19,6 @@
import java.io.IOException;
import java.time.LocalDate;
import java.util.List;
import java.util.List;

/**
 * <p>
@@ -123,4 +122,11 @@
     * @return
     */
    DepartmentTagInfoVO getTagInfo(Long id);

    /**
     * 删除医废
     *
     * @param id
     */
    void delete(Long id);
}

 medicalWaste-system/src/main/java/com/sinata/system/service/MwMicroEquipmentRecordItemService.java

@@ -2,6 +2,10 @@

import com.sinata.system.domain.MwMicroEquipmentRecordItem;
import com.baomidou.mybatisplus.extension.service.IService;
import com.sinata.system.domain.query.DisposalReportQuery;
import com.sinata.system.domain.vo.MwCollectRecordVO;

import java.util.List;

/**
 * <p>
@@ -12,5 +16,11 @@
 * @since 2024-12-02
 */
public interface MwMicroEquipmentRecordItemService extends IService<MwMicroEquipmentRecordItem> {

    /**
     * 获取微波设备使用记录列表
     *
     * @param query
     * @return
     */
    List<MwCollectRecordVO> getRegulationReportList(DisposalReportQuery query);
}

 medicalWaste-system/src/main/java/com/sinata/system/service/biz/StaticsService.java

@@ -6,6 +6,7 @@
import com.sinata.common.core.domain.entity.SysDictData;
import com.sinata.common.utils.CollUtils;
import com.sinata.common.utils.DateUtils;
import com.sinata.system.config.AutoColumnWidthStrategy;
import com.sinata.system.domain.MwCollectRecord;
import com.sinata.system.domain.MwWarningRecord;
import com.sinata.system.domain.SysDepartment;
@@ -19,13 +20,12 @@
import com.sinata.system.domain.vo.MwMedicalWasteBoxVO;
import com.sinata.system.domain.vo.SysDictDataVO;
import com.sinata.system.domain.vo.TransformVO;
import com.sinata.system.enums.DepartmentEnum;
import com.sinata.system.enums.MedicalWasteStatusEnum;
import com.sinata.system.service.ISysDictDataService;
import com.sinata.system.service.MwCheckoutRecordService;
import com.sinata.system.service.MwCollectRecordService;
import com.sinata.system.service.MwDisposalHandleRecordService;
import com.sinata.system.service.MwDisposalRecordService;
import com.sinata.system.service.MwMicroEquipmentRecordItemService;
import com.sinata.system.service.MwWarningRecordService;
import com.sinata.system.service.SysDepartmentService;
import com.sinata.system.utils.ImageToBase64;
@@ -60,6 +60,7 @@
    private final HttpServletResponse response;
    private final MwDisposalRecordService mwDisposalRecordService;
    private final MwDisposalHandleRecordService mwDisposalHandleRecordService;
    private final MwMicroEquipmentRecordItemService mwMicroEquipmentRecordItemService;



@@ -82,8 +83,8 @@
        }
        vo.setLegend(wasteTypeList.stream().map(SysDictDataVO::getDictLabel).collect(Collectors.toList()));
        vo.getLegend().add("小计");
        List<MwCollectRecord> collectRecordList = mwCollectRecordService.lambdaQuery().eq(query.getReportType().equals(1), MwCollectRecord::getStatus, MedicalWasteStatusEnum.TEMPORARILY_STORED.getCode())
                .ne(query.getReportType().equals(2), MwCollectRecord::getStatus, MedicalWasteStatusEnum.TEMPORARILY_STORED.getCode())
        List<MwCollectRecord> collectRecordList = mwCollectRecordService.lambdaQuery()/*.eq(query.getReportType().equals(1), MwCollectRecord::getStatus, MedicalWasteStatusEnum.TEMPORARILY_STORED.getCode())
                .ne(query.getReportType().equals(2), MwCollectRecord::getStatus, MedicalWasteStatusEnum.TEMPORARILY_STORED.getCode())*/
                .eq(MwCollectRecord::getDepartmentId, query.getDepartmentId())
                .between(query.getReportType().equals(1), MwCollectRecord::getCollectTime, query.getStartTime(), query.getEndTime())
                .between(query.getReportType().equals(2), MwCollectRecord::getCheckoutTime, query.getStartTime(), query.getEndTime())
@@ -143,6 +144,60 @@
            }
            list.add(itemVO);
        }
        // 添加合计行
        if (!list.isEmpty()) {
            DepartmentReportItemVO totalRow = new DepartmentReportItemVO();
            totalRow.setName("合计");
            totalRow.setData(new ArrayList<>());

            // 计算各类型废物的数量和重量总计
            for (SysDictDataVO sysDictDataVO : wasteTypeList) {
                BigDecimal totalTypeCount = BigDecimal.ZERO;
                BigDecimal totalTypeWeight = BigDecimal.ZERO;

                for (DepartmentReportItemVO item : list) {
                    // 每种废物类型占用两列(数量和重量)
                    int index = wasteTypeList.indexOf(sysDictDataVO);
                    int countIndex = index * 2;
                    int weightIndex = countIndex + 1;

                    if (countIndex < item.getData().size()) {
                        totalTypeCount = totalTypeCount.add(item.getData().get(countIndex));
                    }
                    if (weightIndex < item.getData().size()) {
                        totalTypeWeight = totalTypeWeight.add(item.getData().get(weightIndex));
                    }
                }

                totalRow.getData().add(totalTypeCount);
                totalRow.getData().add(totalTypeWeight);
            }

            // 计算总的数量和重量
            BigDecimal finalTotalCount = BigDecimal.ZERO;
            BigDecimal finalTotalWeight = BigDecimal.ZERO;

            for (DepartmentReportItemVO item : list) {
                int totalCountIndex = item.getData().size() - 2;
                int totalWeightIndex = item.getData().size() - 1;

                if (totalCountIndex >= 0 && totalWeightIndex >= 0) {
                    finalTotalCount = finalTotalCount.add(item.getData().get(totalCountIndex));
                    finalTotalWeight = finalTotalWeight.add(item.getData().get(totalWeightIndex));
                }
            }

            totalRow.getData().add(finalTotalCount);
            totalRow.getData().add(finalTotalWeight);

            // 超时标记处理（如果有）
            if (query.getDateType().equals(1)) {
                totalRow.setOverTimeFlag("—"); // 合计行不显示超时标记
            }

            // 将合计行添加到列表开头
            list.add(0, totalRow);
        }
        vo.setList(list);
        return vo;
    }
@@ -166,6 +221,7 @@
        FastExcel.write(response.getOutputStream())
                .head(head)
                .autoCloseStream(Boolean.TRUE)
                .registerWriteHandler(new AutoColumnWidthStrategy())
                .sheet("医院报表")
                .doWrite(getHospitalReportStaticsData(query));
    }
@@ -225,40 +281,92 @@
            vo.setDepartmentName(department.getDepartmentName());
        }
        SysDepartment region = sysDepartmentService.getDepartmentByParentId(department.getParentId());
        List<SysDepartment> hospitalList = sysDepartmentService.lambdaQuery().likeRight(SysDepartment::getTreeCode, region.getTreeCode()).eq(SysDepartment::getOrgType, DepartmentEnum.MEDICAL_INSTITUTION.getCode()).list();
        if (CollUtils.isNotEmpty(hospitalList)) {
            List<TransformVO> checkoutRecordVOList = mwCheckoutRecordService.getCheckoutRecordList(query, region.getTreeCode());
            if (CollUtils.isNotEmpty(checkoutRecordVOList)) {
                //查询医废类型
                List<SysDictData> wasteTypeList = sysDictDataService.lambdaQuery().in(SysDictData::getDictCode, query.getWasteTypeCodeList()).orderByDesc(SysDictData::getDictCode).list();
                if (CollUtils.isNotEmpty(wasteTypeList)) {
                    vo.setLegend(wasteTypeList.stream().map(SysDictData::getDictLabel).collect(Collectors.toList()));
                    vo.getLegend().add("小计");
                    List<DepartmentReportItemVO> list = new ArrayList<>();
                    for (TransformVO transformVO : checkoutRecordVOList) {
                        BigDecimal totalCount = BigDecimal.ZERO;
                        BigDecimal totalWeight = BigDecimal.ZERO;
                        DepartmentReportItemVO departmentReportItemVO = new DepartmentReportItemVO();
                        departmentReportItemVO.setName(transformVO.getHospitalName());
                        departmentReportItemVO.setData(new ArrayList<>());
                        departmentReportItemVO.setDriverName(transformVO.getDriverName());
                        departmentReportItemVO.setHospitalSignature(ImageToBase64.convertImageToBase64(transformVO.getHospitalSignature()));
                        departmentReportItemVO.setHandoverTime(transformVO.getCheckoutTime());
                        for (SysDictData sysDictData : wasteTypeList) {
                            BigDecimal count = BigDecimal.valueOf(transformVO.getCollectRecordList().stream().filter(item -> item.getWasteType().equals(sysDictData.getDictCode())).count());
                            BigDecimal weight = transformVO.getCollectRecordList().stream().filter(item -> item.getWasteType().equals(sysDictData.getDictCode())).map(MwMedicalWasteBoxVO::getTotalWeight).reduce(BigDecimal.ZERO, BigDecimal::add);
                            departmentReportItemVO.getData().add(count);
                            departmentReportItemVO.getData().add(weight);
                            totalCount = totalCount.add(count);
                            totalWeight = totalWeight.add(weight);
                        }
                        departmentReportItemVO.getData().add(totalCount);
                        departmentReportItemVO.getData().add(totalWeight);
                        list.add(departmentReportItemVO);
                    }
                    vo.setList(list);
        //List<SysDepartment> hospitalList = sysDepartmentService.lambdaQuery().likeRight(SysDepartment::getTreeCode, region.getTreeCode()).eq(SysDepartment::getOrgType, DepartmentEnum.MEDICAL_INSTITUTION.getCode()).list();
        List<TransformVO> checkoutRecordVOList = mwCheckoutRecordService.getCheckoutRecordList(query, region.getTreeCode());
        //查询医废类型
        List<SysDictData> wasteTypeList = sysDictDataService.lambdaQuery().in(SysDictData::getDictCode, query.getWasteTypeCodeList())
                .orderByDesc(SysDictData::getDictCode).list();
        if (CollUtils.isNotEmpty(wasteTypeList)) {
            vo.setLegend(wasteTypeList.stream().map(SysDictData::getDictLabel).collect(Collectors.toList()));
            vo.getLegend().add("小计");

            List<DepartmentReportItemVO> list = new ArrayList<>();

            // 处理各医院数据
            for (TransformVO transformVO : checkoutRecordVOList) {
                BigDecimal totalCount = BigDecimal.ZERO;
                BigDecimal totalWeight = BigDecimal.ZERO;
                DepartmentReportItemVO departmentReportItemVO = new DepartmentReportItemVO();
                departmentReportItemVO.setName(transformVO.getHospitalName());
                departmentReportItemVO.setData(new ArrayList<>());
                departmentReportItemVO.setDriverName(transformVO.getDriverName());
                departmentReportItemVO.setHospitalSignature(ImageToBase64.convertImageToBase64(transformVO.getHospitalSignature()));
                departmentReportItemVO.setHandoverTime(transformVO.getCheckoutTime());
                for (SysDictData sysDictData : wasteTypeList) {
                    BigDecimal count = BigDecimal.valueOf(transformVO.getCollectRecordList().stream().filter(item -> item.getWasteType().equals(sysDictData.getDictCode())).count());
                    BigDecimal weight = transformVO.getCollectRecordList().stream().filter(item -> item.getWasteType().equals(sysDictData.getDictCode())).map(MwMedicalWasteBoxVO::getTotalWeight).reduce(BigDecimal.ZERO, BigDecimal::add);
                    departmentReportItemVO.getData().add(count);
                    departmentReportItemVO.getData().add(weight);
                    totalCount = totalCount.add(count);
                    totalWeight = totalWeight.add(weight);
                }
                departmentReportItemVO.getData().add(totalCount);
                departmentReportItemVO.getData().add(totalWeight);
                list.add(departmentReportItemVO);
            }

            // 添加合计行
            if (!list.isEmpty()) {
                DepartmentReportItemVO totalRow = new DepartmentReportItemVO();
                totalRow.setName("合计");
                totalRow.setData(new ArrayList<>());

                // 计算各类型废物的总数量和总重量
                for (SysDictData sysDictData : wasteTypeList) {
                    BigDecimal totalTypeCount = BigDecimal.ZERO;
                    BigDecimal totalTypeWeight = BigDecimal.ZERO;

                    for (DepartmentReportItemVO item : list) {
                        // 获取当前废物类型在数据列表中的索引位置
                        int index = wasteTypeList.indexOf(sysDictData);
                        // 每个废物类型占两列(数量和重量)
                        int countIndex = index * 2;
                        int weightIndex = countIndex + 1;

                        if (countIndex < item.getData().size()) {
                            totalTypeCount = totalTypeCount.add(item.getData().get(countIndex));
                        }
                        if (weightIndex < item.getData().size()) {
                            totalTypeWeight = totalTypeWeight.add(item.getData().get(weightIndex));
                        }
                    }

                    totalRow.getData().add(totalTypeCount);
                    totalRow.getData().add(totalTypeWeight);
                }

                // 计算总的数量和重量
                BigDecimal finalTotalCount = BigDecimal.ZERO;
                BigDecimal finalTotalWeight = BigDecimal.ZERO;

                for (DepartmentReportItemVO item : list) {
                    int totalCountIndex = item.getData().size() - 2;
                    int totalWeightIndex = item.getData().size() - 1;

                    if (totalCountIndex >= 0 && totalWeightIndex >= 0) {
                        finalTotalCount = finalTotalCount.add(item.getData().get(totalCountIndex));
                        finalTotalWeight = finalTotalWeight.add(item.getData().get(totalWeightIndex));
                    }
                }

                totalRow.getData().add(finalTotalCount);
                totalRow.getData().add(finalTotalWeight);

                // 将合计行添加到列表开头
                list.add(0, totalRow);
            }

            vo.setList(list);
        }
        return vo;
    }
@@ -276,6 +384,7 @@
        FastExcel.write(response.getOutputStream())
                .head(head)
                .autoCloseStream(Boolean.TRUE)
                .registerWriteHandler(new AutoColumnWidthStrategy())
                .sheet("转运联单")
                .doWrite(getTransformReportStaticsData(query));
    }
@@ -314,7 +423,8 @@
     */
    private List<List<String>> transformReportHead(List<Long> wasteTypeCodeList) {
        //查询医废类型
        List<SysDictData> wasteTypeList = sysDictDataService.lambdaQuery().in(SysDictData::getDictCode, wasteTypeCodeList).list();
        List<SysDictData> wasteTypeList = sysDictDataService.lambdaQuery().in(SysDictData::getDictCode, wasteTypeCodeList)
                .orderByDesc(SysDictData::getDictCode).list();
        List<List<String>> headTitles = Lists.newArrayList();
        headTitles.add(Lists.newArrayList("医院名称", "医院名称"));
        wasteTypeList.forEach(item -> {
@@ -359,7 +469,8 @@
        }
        List<String> dateList = DateUtils.getDayBetween(query.getStartTime(), query.getEndTime(), query.getDateType());
        //查询医废类型
        List<SysDictData> wasteTypeList = sysDictDataService.lambdaQuery().in(SysDictData::getDictCode, query.getWasteTypeCodeList()).list();
        List<SysDictData> wasteTypeList = sysDictDataService.lambdaQuery().in(SysDictData::getDictCode, query.getWasteTypeCodeList())
                .orderByDesc(SysDictData::getDictCode).list();
        if (CollUtils.isNotEmpty(wasteTypeList)) {
            List<String> legend = wasteTypeList.stream().map(SysDictData::getDictLabel).collect(Collectors.toList());
            vo.setLegend(legend);
@@ -385,6 +496,47 @@
                }
                list.add(departmentReportItemVO);
            }

            // 添加合计行
            if (!list.isEmpty()) {
                DepartmentReportItemVO totalRow = new DepartmentReportItemVO();
                totalRow.setName("合计");
                totalRow.setData(new ArrayList<>());

                // 计算各类型废物的接收总量
                for (SysDictData sysDictData : wasteTypeList) {
                    BigDecimal totalReceiveWeight = BigDecimal.ZERO;

                    for (DepartmentReportItemVO item : list) {
                        int index = wasteTypeList.indexOf(sysDictData);
                        if (index < item.getData().size()) {
                            totalReceiveWeight = totalReceiveWeight.add(item.getData().get(index));
                        }
                    }

                    totalRow.getData().add(totalReceiveWeight);
                }

                // 计算各类型废物的处置总量
                for (SysDictData sysDictData : wasteTypeList) {
                    BigDecimal totalDisposalWeight = BigDecimal.ZERO;

                    for (DepartmentReportItemVO item : list) {
                        int index = wasteTypeList.indexOf(sysDictData);
                        // 处置量数据在接收量数据之后，所以索引需要加上wasteTypeList的大小
                        int disposalIndex = wasteTypeList.size() + index;
                        if (disposalIndex < item.getData().size()) {
                            totalDisposalWeight = totalDisposalWeight.add(item.getData().get(disposalIndex));
                        }
                    }

                    totalRow.getData().add(totalDisposalWeight);
                }

                // 将合计行添加到列表开头
                list.add(0, totalRow);
            }

            vo.setList(list);
        }
        return vo;
@@ -409,6 +561,7 @@
        FastExcel.write(response.getOutputStream())
                .head(head)
                .autoCloseStream(Boolean.TRUE)
                .registerWriteHandler(new AutoColumnWidthStrategy())
                .sheet("处置报表")
                .doWrite(getDisposalReportStaticsData(query));
    }
@@ -443,7 +596,8 @@
     */
    private List<List<String>> disposalReportHead(List<Long> wasteTypeCodeList) {
        //查询医废类型
        List<SysDictData> wasteTypeList = sysDictDataService.lambdaQuery().in(SysDictData::getDictCode, wasteTypeCodeList).list();
        List<SysDictData> wasteTypeList = sysDictDataService.lambdaQuery().in(SysDictData::getDictCode, wasteTypeCodeList)
                .orderByDesc(SysDictData::getDictCode).list();
        List<List<String>> headTitles = Lists.newArrayList();
        headTitles.add(Lists.newArrayList("日期"));
        wasteTypeList.forEach(item -> {
@@ -473,6 +627,8 @@
        List<MwCollectRecordVO> checkoutRecordList = mwCheckoutRecordService.getRegulationReportList(query);
        //医废处置量
        List<MwCollectRecordVO> disposalRecordList = mwDisposalRecordService.getRegulationReportList(query);
        List<MwCollectRecordVO> microEquipmentRecordList = mwMicroEquipmentRecordItemService.getRegulationReportList(query);
        disposalRecordList.addAll(microEquipmentRecordList);
        SimpleDateFormat sdf = new SimpleDateFormat(DateUtils.YYYY_MM_DD_HH_MM_SS);
        switch (query.getDateType()) {
            case 1:
@@ -487,7 +643,8 @@
        }
        List<String> dateList = DateUtils.getDayBetween(query.getStartTime(), query.getEndTime(), query.getDateType());
        //查询医废类型
        List<SysDictData> wasteTypeList = sysDictDataService.lambdaQuery().in(SysDictData::getDictCode, query.getWasteTypeCodeList()).list();
        List<SysDictData> wasteTypeList = sysDictDataService.lambdaQuery().in(SysDictData::getDictCode, query.getWasteTypeCodeList())
                .orderByDesc(SysDictData::getDictCode).list();
        if (CollUtils.isNotEmpty(wasteTypeList)) {
            vo.setLegend(wasteTypeList.stream().map(SysDictData::getDictLabel).collect(Collectors.toList()));
            vo.setList(new ArrayList<>());
@@ -515,6 +672,63 @@
                }
                list.add(departmentReportItemVO);
            }

            // 添加合计行
            if (!list.isEmpty()) {
                DepartmentReportItemVO totalRow = new DepartmentReportItemVO();
                totalRow.setName("合计");
                totalRow.setData(new ArrayList<>());

                // 计算各类型废物的产生总量
                for (SysDictData sysDictData : wasteTypeList) {
                    BigDecimal totalGeneratedWeight = BigDecimal.ZERO;

                    for (DepartmentReportItemVO item : list) {
                        int index = wasteTypeList.indexOf(sysDictData);
                        if (index < item.getData().size()) {
                            totalGeneratedWeight = totalGeneratedWeight.add(item.getData().get(index));
                        }
                    }

                    totalRow.getData().add(totalGeneratedWeight);
                }

                // 计算各类型废物的转移总量
                for (SysDictData sysDictData : wasteTypeList) {
                    BigDecimal totalTransferWeight = BigDecimal.ZERO;

                    for (DepartmentReportItemVO item : list) {
                        int index = wasteTypeList.indexOf(sysDictData);
                        // 转移量数据在产生量数据之后，所以索引需要加上wasteTypeList的大小
                        int transferIndex = wasteTypeList.size() + index;
                        if (transferIndex < item.getData().size()) {
                            totalTransferWeight = totalTransferWeight.add(item.getData().get(transferIndex));
                        }
                    }

                    totalRow.getData().add(totalTransferWeight);
                }

                // 计算各类型废物的处置总量
                for (SysDictData sysDictData : wasteTypeList) {
                    BigDecimal totalDisposalWeight = BigDecimal.ZERO;

                    for (DepartmentReportItemVO item : list) {
                        int index = wasteTypeList.indexOf(sysDictData);
                        // 处置量数据在产生量和转移量数据之后，所以索引需要加上wasteTypeList的大小的2倍
                        int disposalIndex = wasteTypeList.size() * 2 + index;
                        if (disposalIndex < item.getData().size()) {
                            totalDisposalWeight = totalDisposalWeight.add(item.getData().get(disposalIndex));
                        }
                    }

                    totalRow.getData().add(totalDisposalWeight);
                }

                // 将合计行添加到列表开头
                list.add(0, totalRow);
            }

            vo.setList(list);
        }
        return vo;
@@ -533,6 +747,7 @@
        FastExcel.write(response.getOutputStream())
                .head(head)
                .autoCloseStream(Boolean.TRUE)
                .registerWriteHandler(new AutoColumnWidthStrategy())
                .sheet("监管报表")
                .doWrite(getRegulationReportStaticsData(query));
    }
@@ -567,7 +782,8 @@
     */
    private List<List<String>> regulationReportHead(List<Long> wasteTypeCodeList) {
        //查询医废类型
        List<SysDictData> wasteTypeList = sysDictDataService.lambdaQuery().in(SysDictData::getDictCode, wasteTypeCodeList).list();
        List<SysDictData> wasteTypeList = sysDictDataService.lambdaQuery().in(SysDictData::getDictCode, wasteTypeCodeList)
                .orderByDesc(SysDictData::getDictCode).list();
        List<List<String>> headTitles = Lists.newArrayList();
        headTitles.add(Lists.newArrayList("日期"));
        wasteTypeList.forEach(item -> {

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

@@ -9,6 +9,7 @@
import com.sinata.common.utils.CollUtils;
import com.sinata.common.utils.DateUtils;
import com.sinata.common.utils.StringUtils;
import com.sinata.system.config.AutoColumnWidthStrategy;
import com.sinata.system.domain.MwCheckoutRecord;
import com.sinata.system.domain.dto.CollectTotalUpDto;
import com.sinata.system.domain.query.CheckoutRecordQuery;
@@ -85,7 +86,10 @@
        // 这里URLEncoder.encode可以防止中文乱码 当然和easyexcel没有关系
        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);
        FastExcel.write(response.getOutputStream(), MwCheckoutRecordExcelVO.class)
                .registerWriteHandler(new AutoColumnWidthStrategy())
                .sheet("转运记录")
                .doWrite(mwCheckoutRecordExcelVOS);
    }

    @Override

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

@@ -4,7 +4,9 @@
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.exception.ServiceException;
import com.sinata.common.utils.StringUtils;
import com.sinata.system.config.AutoColumnWidthStrategy;
import com.sinata.system.domain.MedicalWasteStaticsVO;
import com.sinata.system.domain.MwCollectRecord;
import com.sinata.system.domain.dto.CollectCarTotalUpDto;
@@ -17,6 +19,7 @@
import com.sinata.system.domain.vo.MedicalWasteProcessVO;
import com.sinata.system.domain.vo.MwCollectRecordVO;
import com.sinata.system.domain.vo.MwCollectRecordWarningVO;
import com.sinata.system.enums.MedicalWasteStatusEnum;
import com.sinata.system.mapper.MwCollectRecordMapper;
import com.sinata.system.service.MwCollectRecordService;
import com.sinata.system.service.SysDepartmentService;
@@ -27,7 +30,6 @@
import java.io.IOException;
import java.net.URLEncoder;
import java.time.LocalDate;
import java.util.Collections;
import java.util.List;
import java.util.Objects;

@@ -130,7 +132,9 @@
        // 这里URLEncoder.encode可以防止中文乱码 当然和easyexcel没有关系
        String fileName = URLEncoder.encode("医废收集记录", "UTF-8").replaceAll("\\+", "%20");
        response.setHeader("Content-disposition", "attachment;filename*=utf-8''" + fileName + ".xlsx");
        FastExcel.write(response.getOutputStream(), MwCollectRecordVO.class).sheet("医废收集记录").doWrite(vo);
        FastExcel.write(response.getOutputStream(), MwCollectRecordVO.class)
                .registerWriteHandler(new AutoColumnWidthStrategy())
                .sheet("医废收集记录").doWrite(vo);
    }

    /**
@@ -214,4 +218,20 @@
    public DepartmentTagInfoVO getTagInfo(Long id) {
        return baseMapper.getTagInfo(id);
    }

    /**
     * 删除医废
     *
     * @param id
     */
    @Override
    public void delete(Long id) {
        MwCollectRecord collectRecord = getById(id);
        if (Objects.nonNull(collectRecord)) {
            if (!collectRecord.getStatus().equals(MedicalWasteStatusEnum.TEMPORARILY_STORED.getCode())) {
                throw new ServiceException("该医废已被转运，不能删除");
            }
            removeById(id);
        }
    }
}

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

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

import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.sinata.system.domain.MwMicroEquipmentRecordItem;
import com.sinata.system.domain.query.DisposalReportQuery;
import com.sinata.system.domain.vo.MwCollectRecordVO;
import com.sinata.system.mapper.MwMicroEquipmentRecordItemMapper;
import com.sinata.system.service.MwMicroEquipmentRecordItemService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.sinata.system.service.SysDepartmentService;
import lombok.RequiredArgsConstructor;
import org.springframework.context.annotation.Lazy;
import org.springframework.stereotype.Service;

import java.util.List;

/**
 * <p>
@@ -15,6 +22,13 @@
 * @since 2024-12-02
 */
@Service
@RequiredArgsConstructor(onConstructor_ = @Lazy)
public class MwMicroEquipmentRecordItemServiceImpl extends ServiceImpl<MwMicroEquipmentRecordItemMapper, MwMicroEquipmentRecordItem> implements MwMicroEquipmentRecordItemService {
    private final SysDepartmentService sysDepartmentService;

    @Override
    public List<MwCollectRecordVO> getRegulationReportList(DisposalReportQuery query) {
        String treeCode = sysDepartmentService.getTreeCodeByDepartmentId(query.getDepartmentId());
        return baseMapper.getRegulationReportList(query, treeCode);
    }
}

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

@@ -12,6 +12,7 @@
import com.sinata.common.utils.DateUtils;
import com.sinata.common.utils.SecurityUtils;
import com.sinata.common.utils.StringUtils;
import com.sinata.system.config.AutoColumnWidthStrategy;
import com.sinata.system.domain.MwCollectRecord;
import com.sinata.system.domain.MwMicroEquipment;
import com.sinata.system.domain.MwMicroEquipmentRecord;
@@ -118,7 +119,9 @@
        // 这里URLEncoder.encode可以防止中文乱码 当然和easyexcel没有关系
        String fileName = URLEncoder.encode("微波设备使用记录", "UTF-8").replaceAll("\\+", "%20");
        response.setHeader("Content-disposition", "attachment;filename*=utf-8''" + fileName + ".xlsx");
        FastExcel.write(response.getOutputStream(), MwCollectRecordVO.class).sheet("微波设备使用记录").doWrite(list);
        FastExcel.write(response.getOutputStream(), MwCollectRecordVO.class)
                .registerWriteHandler(new AutoColumnWidthStrategy())
                .sheet("微波设备使用记录").doWrite(list);
    }

    /**
@@ -253,6 +256,57 @@
            departmentReportItemVO.getData().add(totalCount);
            result.add(departmentReportItemVO);
        }

        // 添加合计行
        if (!result.isEmpty()) {
            DepartmentReportItemVO totalRow = new DepartmentReportItemVO();
            totalRow.setName("合计");
            totalRow.setData(new ArrayList<>());

            // 计算各类型废物的重量和数量总计
            for (SysDictData sysDictData : medicalWasteTypeList) {
                BigDecimal totalTypeWeight = BigDecimal.ZERO;
                BigDecimal totalTypeCount = BigDecimal.ZERO;

                for (DepartmentReportItemVO item : result) {
                    // 每种废物类型占用两列(重量和数量)
                    int index = medicalWasteTypeList.indexOf(sysDictData);
                    int weightIndex = index * 2;
                    int countIndex = weightIndex + 1;

                    if (weightIndex < item.getData().size()) {
                        totalTypeWeight = totalTypeWeight.add(item.getData().get(weightIndex));
                    }
                    if (countIndex < item.getData().size()) {
                        totalTypeCount = totalTypeCount.add(item.getData().get(countIndex));
                    }
                }

                totalRow.getData().add(totalTypeWeight);
                totalRow.getData().add(totalTypeCount);
            }

            // 计算总的重量和数量
            BigDecimal finalTotalWeight = BigDecimal.ZERO;
            BigDecimal finalTotalCount = BigDecimal.ZERO;

            for (DepartmentReportItemVO item : result) {
                int totalWeightIndex = item.getData().size() - 2;
                int totalCountIndex = item.getData().size() - 1;

                if (totalWeightIndex >= 0 && totalCountIndex >= 0) {
                    finalTotalWeight = finalTotalWeight.add(item.getData().get(totalWeightIndex));
                    finalTotalCount = finalTotalCount.add(item.getData().get(totalCountIndex));
                }
            }

            totalRow.getData().add(finalTotalWeight);
            totalRow.getData().add(finalTotalCount);

            // 将合计行添加到列表开头
            result.add(0, totalRow);
        }

        vo.setList(result);
        return vo;
    }
@@ -272,6 +326,7 @@
        FastExcel.write(response.getOutputStream())
                .head(head)
                .autoCloseStream(Boolean.TRUE)
                .registerWriteHandler(new AutoColumnWidthStrategy())
                .sheet("处置分析报表")
                .doWrite(getStaticsReportData(query));
    }

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

@@ -7,6 +7,7 @@
import com.sinata.common.exception.ServiceException;
import com.sinata.common.utils.BeanUtils;
import com.sinata.common.utils.StringUtils;
import com.sinata.system.config.AutoColumnWidthStrategy;
import com.sinata.system.domain.MwStagingRoom;
import com.sinata.system.domain.dto.MwStagingRoomDTO;
import com.sinata.system.domain.excel.MwCheckoutRecordExcel;
@@ -136,7 +137,9 @@
        // 这里URLEncoder.encode可以防止中文乱码 当然和easyexcel没有关系
        String fileName = URLEncoder.encode("暂存间入库记录", "UTF-8").replaceAll("\\+", "%20");
        response.setHeader("Content-disposition", "attachment;filename*=utf-8''" + fileName + ".xlsx");
        FastExcel.write(response.getOutputStream(), MwStorageRecordVO.class).sheet("暂存间入库记录").doWrite(list);
        FastExcel.write(response.getOutputStream(), MwStorageRecordVO.class)
                .registerWriteHandler(new AutoColumnWidthStrategy())
                .sheet("暂存间入库记录").doWrite(list);
    }

    /**
@@ -180,7 +183,10 @@
        response.setCharacterEncoding("utf-8");
        String fileName = URLEncoder.encode("暂存间出库记录", "UTF-8").replaceAll("\\+", "%20");
        response.setHeader("Content-disposition", "attachment;filename*=utf-8''" + fileName + ".xlsx");
        FastExcel.write(response.getOutputStream(), MwCheckoutRecordExcel.class).sheet("暂存间出库记录").doWrite(mwCheckoutRecordExcels);
        FastExcel.write(response.getOutputStream(), MwCheckoutRecordExcel.class)
                .registerWriteHandler(new AutoColumnWidthStrategy())
                .sheet("暂存间出库记录")
                .doWrite(mwCheckoutRecordExcels);
    }

    @Override

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

@@ -5,11 +5,14 @@
import com.sinata.common.entity.PageDTO;
import com.sinata.common.exception.ServiceException;
import com.sinata.common.utils.BeanUtils;
import com.sinata.common.utils.CollUtils;
import com.sinata.common.utils.StringUtils;
import com.sinata.system.domain.MwTransitRoute;
import com.sinata.system.domain.MwTransitRouteCar;
import com.sinata.system.domain.MwTransitRoutePoints;
import com.sinata.system.domain.SysDepartment;
import com.sinata.system.domain.dto.MwTransitRouteDTO;
import com.sinata.system.domain.dto.MwTransitRoutePointsDTO;
import com.sinata.system.domain.query.MwTransitRouteQuery;
import com.sinata.system.domain.vo.MwTransitRouteVO;
import com.sinata.system.mapper.MwTransitRouteMapper;
@@ -83,6 +86,8 @@
    @Override
    @Transactional(rollbackFor = Exception.class)
    public void add(MwTransitRouteDTO dto) {
        //校验医院是否有关联线路
        validateHospitalUnique(dto);
        MwTransitRoute mwTransitRoute = BeanUtils.copyBean(dto, MwTransitRoute.class);
        mwTransitRoute.setHospitalQuantity(dto.getHostpitalList().size());
        save(mwTransitRoute);
@@ -100,6 +105,19 @@
        mwTransitRouteCarService.saveBatch(mwTransitRouteCars);
    }

    private void validateHospitalUnique(MwTransitRouteDTO dto) {
        //医院id列表
        List<Long> departmentIdList = dto.getHostpitalList().stream().map(MwTransitRoutePointsDTO::getDepartmentId).collect(Collectors.toList());
        List<MwTransitRoutePoints> list = mwTransitRoutePointsService.lambdaQuery()
                .in(MwTransitRoutePoints::getDepartmentId, departmentIdList)
                .ne(Objects.nonNull(dto.getId()), MwTransitRoutePoints::getRouteId, dto.getId())
                .list();
        if (CollUtils.isNotEmpty(list)) {
            SysDepartment department = sysDepartmentService.getById(list.get(0).getDepartmentId());
            throw new ServiceException(department.getDepartmentName() + "已关联转运线路！");
        }
    }

    /**
     * 编辑
     *
@@ -112,6 +130,7 @@
        if (Objects.isNull(dto.getId())) {
            throw new ServiceException("线路id不能为空");
        }
        validateHospitalUnique(dto);
        MwTransitRoute mwTransitRoute = BeanUtils.copyBean(dto, MwTransitRoute.class);
        mwTransitRoute.setHospitalQuantity(dto.getHostpitalList().size());
        updateById(mwTransitRoute);

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

@@ -6,6 +6,7 @@
import com.sinata.common.entity.PageDTO;
import com.sinata.common.utils.SecurityUtils;
import com.sinata.common.utils.StringUtils;
import com.sinata.system.config.AutoColumnWidthStrategy;
import com.sinata.system.domain.MwWarningRecord;
import com.sinata.system.domain.query.MwWarningRecordQuery;
import com.sinata.system.domain.vo.MwWarningRecordVO;
@@ -75,6 +76,7 @@
        response.setHeader("Content-disposition", "attachment;filename*=utf-8''" + fileName + ".xlsx");

        FastExcel.write(response.getOutputStream(), MwWarningRecordVO.class)
                .registerWriteHandler(new AutoColumnWidthStrategy())
                .sheet("预警信息")
                .doWrite(list);
    }

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

@@ -92,6 +92,12 @@
            case 5:
                childrenMap = getChildrenDepartmentByOrgType(myDepartment, Arrays.asList(DepartmentEnum.REGION.getCode(), DepartmentEnum.MEDICAL_INSTITUTION.getCode(), DepartmentEnum.DISPOSAL_UNIT.getCode()));
                break;
            case 6:
                childrenMap = getChildrenDepartmentByOrgType(myDepartment, Arrays.asList(DepartmentEnum.REGION.getCode(), DepartmentEnum.MEDICAL_INSTITUTION.getCode(), DepartmentEnum.REGULATORY_UNIT.getCode()));
                break;
            case 7:
                childrenMap = getChildrenDepartmentByOrgType(myDepartment, Arrays.asList(DepartmentEnum.REGION.getCode(), DepartmentEnum.DISPOSAL_UNIT.getCode(), DepartmentEnum.REGULATORY_UNIT.getCode()));
                break;
            default:
                childrenMap = getChildrenDepartmentByOrgType(myDepartment, null);
        }

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

@@ -133,6 +133,7 @@
        Page<SysDictData> result = this.lambdaQuery()
                .like(StringUtils.isNotBlank(query.getKeyword()), SysDictData::getDictLabel, query.getKeyword())
                .eq(StringUtils.isNotBlank(query.getDictType()), SysDictData::getDictType, query.getDictType())
                .orderByDesc(SysDictData::getDictCode)
                .page(new Page<>(query.getPageCurr(), query.getPageSize()));
        List<String> dictTypeList = result.getRecords().stream().map(SysDictData::getDictType).distinct().collect(Collectors.toList());
        if (CollUtils.isNotEmpty(dictTypeList)) {

 medicalWaste-system/src/main/resources/mapper/system/MwCheckoutRecordMapper.xml

@@ -46,18 +46,19 @@
        SELECT mcr.ID,
        mcr.CHECKOUT_TIME,
        mcr.HOSPITAL_NAME,
        SUM(mcr.BOX_NUM) AS boxNum,
        SUM(mcr.BAG_NUM) AS bagNum,
        SUM(mcr.TOTAL_WEIGHT) AS totalWeight,
        mcr.BOX_NUM,
        mcr.BAG_NUM,
        mcr.TOTAL_WEIGHT,
        mcr.DEPARTMENT_ID,
        su.NICK_NAME AS driverName,
        mtc.LICENSE_PLATE_NUMBER
        mtc.LICENSE_PLATE_NUMBER,
        mtr.ROUTE_NAME
        FROM MW_CHECKOUT_RECORD mcr
        LEFT JOIN SYS_USER su
        ON mcr.DRIVER_ID = su.USER_ID
        LEFT JOIN MW_TRANSIT_CAR mtc
        ON mcr.CAR_ID = mtc.ID
        LEFT JOIN SYS_DEPARTMENT sd
        ON mcr.DEPARTMENT_ID = sd.ID
        LEFT JOIN SYS_USER su ON mcr.DRIVER_ID = su.USER_ID
        LEFT JOIN MW_TRANSIT_CAR MTC ON mcr.CAR_ID = mtc.ID
        LEFT JOIN MW_TRANSIT_ROUTE_POINTS mtrp ON mcr.DEPARTMENT_ID = mtrp.DEPARTMENT_ID
        LEFT JOIN MW_TRANSIT_ROUTE mtr ON mtrp.ROUTE_ID = mtr.ID
        LEFT JOIN SYS_DEPARTMENT sd ON mcr.DEPARTMENT_ID = sd.ID
        <where>
            mcr.DEL_FLAG = 0
            <if test="treeCode != null and treeCode != ''">
@@ -74,216 +75,204 @@
        SELECT mcr.ID,
        mcr.CHECKOUT_TIME,
        mcr.HOSPITAL_NAME,
        SUM(mcr.BOX_NUM) AS boxNum,
        SUM(mcr.BAG_NUM) AS bagNum,
        SUM(mcr.TOTAL_WEIGHT) AS totalWeight,
        mcr.BOX_NUM,
        mcr.BAG_NUM,
        mcr.TOTAL_WEIGHT,
        mcr.DEPARTMENT_ID,
        su.NICK_NAME AS driverName,
        mtc.LICENSE_PLATE_NUMBER
        mtc.LICENSE_PLATE_NUMBER,
        mtr.ROUTE_NAME
        FROM MW_CHECKOUT_RECORD mcr
        LEFT JOIN SYS_USER su
        ON mcr.DRIVER_ID = su.USER_ID
        LEFT JOIN MW_TRANSIT_CAR mtc
        ON mcr.CAR_ID = mtc.ID
        LEFT JOIN SYS_DEPARTMENT sd
        ON mcr.DEPARTMENT_ID = sd.ID
        LEFT JOIN SYS_USER su ON mcr.DRIVER_ID = su.USER_ID
        LEFT JOIN MW_TRANSIT_CAR MTC ON mcr.CAR_ID = mtc.ID
        LEFT JOIN MW_TRANSIT_ROUTE_POINTS mtrp ON mcr.DEPARTMENT_ID = mtrp.DEPARTMENT_ID
        LEFT JOIN MW_TRANSIT_ROUTE mtr ON mtrp.ROUTE_ID = mtr.ID
        LEFT JOIN SYS_DEPARTMENT sd ON mcr.DEPARTMENT_ID = sd.ID
        <where>
            mcr.ID = #{id}
        </where>
        GROUP BY mcr.ID
    </select>
    <select id="hospitalDetailPage" resultType="com.sinata.system.domain.vo.MwMedicalWasteBoxVO">
        SELECT mcr2.BOX_ID AS id,
        mcr2.BOX_NUMBER,
        mcr2.WASTE_TYPE_STR,
        su.NICK_NAME AS COLLECT_USER_NAME,
        mcr1.BAG_NUM AS bagNum,
        mcr1.TOTAL_WEIGHT,
        (SELECT MAX(mcr_inner.BOX_TIME)
        FROM MW_COLLECT_RECORD mcr_inner
        WHERE mcr_inner.BOX_ID = mcr2.BOX_ID) AS BOX_TIME
        FROM MW_CHECKOUT_RECORD mcr1
        LEFT JOIN
        MW_CHECKOUT_RECORD_ITEM mcri ON mcr1.ID = mcri.CHECKOUT_RECORD_ID
        LEFT JOIN
        MW_COLLECT_RECORD mcr2 ON mcri.COLLECT_RECORD_ID = mcr2.ID
        LEFT JOIN SYS_USER su ON mcr2.COLLECT_USER_ID = su.USER_ID
        LEFT JOIN SYS_DEPARTMENT sd ON su.DEPARTMENT_ID = sd.ID
        SELECT MCR.BOX_NUMBER,
        MCR.WASTE_TYPE_STR,
        COUNT(MCR.ID) AS BAG_NUM,
        SUM(MCR.WEIGHT) AS TOTAL_WEIGHT,
        SU.NICK_NAME AS COLLECT_USER_NAME,
        MAX(MCR.BOX_TIME) AS BOX_TIME
        FROM MW_CHECKOUT_RECORD_ITEM MCRI
        LEFT JOIN MW_COLLECT_RECORD MCR ON MCRI.COLLECT_RECORD_ID = MCR.ID
        LEFT JOIN SYS_USER SU ON MCR.COLLECT_USER_ID = SU.USER_ID
        <where>
            mcr1.DEL_FLAG = 0
            MCR.DEL_FLAG = 0
            <if test="departmentId != null and departmentId != ''">
                AND mcr1.ID = #{departmentId}
                AND MCRI.CHECKOUT_RECORD_ID = #{departmentId}
            </if>
        </where>
        GROUP BY mcr2.BOX_ID
        ORDER BY mcr2.CREATE_TIME DESC
        GROUP BY MCR.BOX_NUMBER
        ORDER BY MCR.CREATE_TIME DESC
    </select>
    <select id="transitPageList" resultType="com.sinata.system.domain.vo.MwTransitRecordVO">
        SELECT ID,
        CAR_ID,
        DEPARTMENT_NAME,
        LICENSE_PLATE_NUMBER,
        NICK_NAME,
        SUM(WEIGHT) AS weight,
        COUNT(COLLECT_RECORD_ID) AS bagNum,
        RECEIVE_TIME AS endTime,
        transitDate,
        STATUS,
        DEL_FLAG,
        MIN(BOX_TIME) AS startTime,
        COUNT(DISTINCT BOX_NUMBER) AS boxNum
        FROM (SELECT DISTINCT MTR.ID,
        MCR2.CAR_ID,
        SD.DEPARTMENT_NAME,
        MTC.LICENSE_PLATE_NUMBER,
        SU.NICK_NAME,
        MCR2.BOX_NUM,
        MCR.BOX_TIME,
        MCR2.TOTAL_WEIGHT,
        MDR.RECEIVE_TIME,
        MCR.STATUS,
        SELECT
        MTR.ID,
        MCR.CAR_ID,
        MAX(SD.DEPARTMENT_NAME) AS DEPARTMENT_NAME,
        MAX(MTC.LICENSE_PLATE_NUMBER) AS LICENSE_PLATE_NUMBER,
        MAX(SU.NICK_NAME) AS NICK_NAME,
        SUM(MCR.WEIGHT) AS weight,
        COUNT(DISTINCT MCR.ID) AS bagNum,
        MAX(MDR.RECEIVE_TIME) AS endTime,
        TRUNC(MCR2.CHECKOUT_TIME) AS transitDate,
        SD.TREE_CODE,
        MCR.ID AS COLLECT_RECORD_ID,
        MCR.WEIGHT,
        MCR2.DEL_FLAG,
        MCR.BOX_NUMBER
        MAX(MCR.STATUS) AS STATUS,
        MAX(MCR2.DEL_FLAG) AS DEL_FLAG,
        MIN(MCR.BOX_TIME) AS startTime,
        COUNT(DISTINCT MCR.BOX_NUMBER) AS boxNum
        FROM MW_CHECKOUT_RECORD MCR2
        LEFT JOIN MW_CHECKOUT_RECORD_ITEM MCRI
        INNER JOIN MW_CHECKOUT_RECORD_ITEM MCRI
        ON MCRI.CHECKOUT_RECORD_ID = MCR2.ID
        LEFT JOIN MW_COLLECT_RECORD MCR
        AND MCR2.DEL_FLAG = 0
        INNER JOIN MW_COLLECT_RECORD MCR
        ON MCR.ID = MCRI.COLLECT_RECORD_ID
        LEFT JOIN MW_DISPOSAL_RECORD_ITEM MDRI ON MDRI.COLLECT_RECORD_ID = MCRI.COLLECT_RECORD_ID
        LEFT JOIN MW_DISPOSAL_RECORD MDR ON MDR.ID = MDRI.DISPOSAL_RECORD_ID
        LEFT JOIN MW_TRANSIT_CAR MTC ON MCR.CAR_ID = MTC.ID
        LEFT JOIN SYS_USER SU ON MCR.DRIVER_ID = SU.USER_ID
        LEFT JOIN SYS_DEPARTMENT SD ON SD.ID = MDR.DEPARTMENT_ID
        LEFT JOIN (SELECT * FROM MW_TRANSIT_ROUTE GROUP BY DEPARTMENT_ID) MTR
        ON MTR.DEPARTMENT_ID = MDR.DEPARTMENT_ID) AS T
        LEFT JOIN MW_DISPOSAL_RECORD_ITEM MDRI
        ON MDRI.COLLECT_RECORD_ID = MCR.ID
        LEFT JOIN MW_DISPOSAL_RECORD MDR
        ON MDR.ID = MDRI.DISPOSAL_RECORD_ID
        LEFT JOIN MW_TRANSIT_CAR MTC
        ON MTC.ID = MCR.CAR_ID
        LEFT JOIN SYS_USER SU
        ON SU.USER_ID = MCR.DRIVER_ID
        LEFT JOIN SYS_DEPARTMENT SD
        ON SD.ID = MDR.DEPARTMENT_ID
        LEFT JOIN (
        SELECT DEPARTMENT_ID, MIN(ID) AS ID
        FROM MW_TRANSIT_ROUTE
        GROUP BY DEPARTMENT_ID
        ) MTR ON MTR.DEPARTMENT_ID = SD.ID
        <where>
            T.DEL_FLAG = 0
            <if test="treeCode != null and treeCode != null">
                AND T.TREE_CODE LIKE CONCAT(#{treeCode},'%')
            <if test="treeCode != null">
                AND SD.TREE_CODE LIKE CONCAT(#{treeCode},'%')
            </if>
            <if test="query.licensePlateNumber != null and query.licensePlateNumber != ''">
                AND T.LICENSE_PLATE_NUMBER LIKE CONCAT('%',#{query.licensePlateNumber},'%')
            <if test="query.licensePlateNumber != null">
                AND MTC.LICENSE_PLATE_NUMBER LIKE CONCAT('%',#{query.licensePlateNumber},'%')
            </if>
            <if test="query.status != null and (query.status == 3 or query.status == 4)">
                AND T.STATUS in(3,4)
                AND MCR.STATUS IN (3,4)
            </if>
            <if test="query.startTimeStart != null and query.startTimeEnd != null">
                AND T.BOX_TIME BETWEEN #{query.startTimeStart} AND #{query.startTimeEnd}
                AND MCR.BOX_TIME BETWEEN #{query.startTimeStart} AND #{query.startTimeEnd}
            </if>
            <if test="query.endTimeStart != null and query.endTimeEnd != null">
                AND T.RECEIVE_TIME BETWEEN #{query.endTimeStart} AND #{query.endTimeEnd}
                AND MDR.RECEIVE_TIME BETWEEN #{query.endTimeStart} AND #{query.endTimeEnd}
            </if>
        </where>
        GROUP BY T.transitDate, T.ID, T.CAR_ID, T.NICK_NAME
        ORDER BY T.transitDate DESC
        GROUP BY
        TRUNC(MCR2.CHECKOUT_TIME),
        MTR.ID,
        MCR.CAR_ID,
        SU.NICK_NAME
        ORDER BY transitDate DESC
    </select>
    <select id="transitDetail" resultType="com.sinata.system.domain.vo.MwTransitRecordVO">
        SELECT ID,
        CAR_ID,
        DEPARTMENT_NAME,
        LICENSE_PLATE_NUMBER,
        NICK_NAME,
        SUM(WEIGHT) AS weight,
        COUNT(COLLECT_RECORD_ID) AS bagNum,
        RECEIVE_TIME AS endTime,
        transitDate,
        STATUS
        FROM (SELECT DISTINCT MTR.ID,
        MCR2.CAR_ID,
        SD.DEPARTMENT_NAME,
        MTC.LICENSE_PLATE_NUMBER,
        SU.NICK_NAME,
        MCR2.BOX_NUM,
        MCR.BOX_TIME,
        MCR2.TOTAL_WEIGHT,
        MDR.RECEIVE_TIME,
        MCR.STATUS,
        SELECT
        MTR.ID,
        MCR.CAR_ID,
        MAX(SD.DEPARTMENT_NAME) AS DEPARTMENT_NAME,
        MAX(MTC.LICENSE_PLATE_NUMBER) AS LICENSE_PLATE_NUMBER,
        MAX(SU.NICK_NAME) AS NICK_NAME,
        SUM(MCR.WEIGHT) AS weight,
        COUNT(DISTINCT MCR.ID) AS bagNum,
        MAX(MDR.RECEIVE_TIME) AS endTime,
        TRUNC(MCR2.CHECKOUT_TIME) AS transitDate,
        SD.TREE_CODE,
        MCR.ID AS COLLECT_RECORD_ID,
        MCR.WEIGHT
        MAX(MCR.STATUS) AS STATUS,
        MAX(MCR2.DEL_FLAG) AS DEL_FLAG,
        MIN(MCR.BOX_TIME) AS startTime,
        COUNT(DISTINCT MCR.BOX_NUMBER) AS boxNum
        FROM MW_CHECKOUT_RECORD MCR2
        LEFT JOIN MW_CHECKOUT_RECORD_ITEM MCRI
        INNER JOIN MW_CHECKOUT_RECORD_ITEM MCRI
        ON MCRI.CHECKOUT_RECORD_ID = MCR2.ID
        LEFT JOIN MW_COLLECT_RECORD MCR
        AND MCR2.DEL_FLAG = 0
        INNER JOIN MW_COLLECT_RECORD MCR
        ON MCR.ID = MCRI.COLLECT_RECORD_ID
        LEFT JOIN MW_DISPOSAL_RECORD_ITEM MDRI ON MDRI.COLLECT_RECORD_ID = MCRI.COLLECT_RECORD_ID
        LEFT JOIN MW_DISPOSAL_RECORD MDR ON MDR.ID = MDRI.DISPOSAL_RECORD_ID
        LEFT JOIN MW_TRANSIT_CAR MTC ON MCR.CAR_ID = MTC.ID
        LEFT JOIN SYS_USER SU ON MCR.DRIVER_ID = SU.USER_ID
        LEFT JOIN SYS_DEPARTMENT SD ON SD.ID = MDR.DEPARTMENT_ID
        LEFT JOIN (SELECT * FROM MW_TRANSIT_ROUTE GROUP BY DEPARTMENT_ID) MTR
        ON MTR.DEPARTMENT_ID = MDR.DEPARTMENT_ID) AS T
        LEFT JOIN MW_DISPOSAL_RECORD_ITEM MDRI
        ON MDRI.COLLECT_RECORD_ID = MCR.ID
        LEFT JOIN MW_DISPOSAL_RECORD MDR
        ON MDR.ID = MDRI.DISPOSAL_RECORD_ID
        LEFT JOIN MW_TRANSIT_CAR MTC
        ON MTC.ID = MCR.CAR_ID
        LEFT JOIN SYS_USER SU
        ON SU.USER_ID = MCR.DRIVER_ID
        LEFT JOIN SYS_DEPARTMENT SD
        ON SD.ID = MDR.DEPARTMENT_ID
        LEFT JOIN (
        SELECT DEPARTMENT_ID, MIN(ID) AS ID
        FROM MW_TRANSIT_ROUTE
        GROUP BY DEPARTMENT_ID
        ) MTR ON MTR.DEPARTMENT_ID = SD.ID
        <where>
            T.ID = #{query.id} AND T.CAR_ID = #{query.carId} AND T.transitDate = #{query.transitDate}
            MTR.ID = #{query.id} AND MCR.CAR_ID = #{query.carId} AND TRUNC(MCR2.CHECKOUT_TIME) = #{query.transitDate}
        </where>
    </select>
    <select id="transitDetailPageList" resultType="com.sinata.system.domain.vo.MwMedicalWasteBoxVO">
        SELECT ID,
        CAR_ID,
        DEPARTMENT_NAME,
        LICENSE_PLATE_NUMBER,
        NICK_NAME,
        COUNT(COLLECT_RECORD_ID) AS bagNum,
        SUM(WEIGHT) AS totalWeight,
        RECEIVE_TIME AS endTime,
        transitDate,
        STATUS,CHECK_OUT_ID,
        HOSPITAL_NAME,
        BOX_NUMBER,
        WASTE_TYPE_STR
        FROM (SELECT DISTINCT MTR.ID,
        MCR2.CAR_ID,
        SD.DEPARTMENT_NAME,
        MTC.LICENSE_PLATE_NUMBER,
        SU.NICK_NAME,
        MCR.BOX_TIME,
        MDR.RECEIVE_TIME,
        MCR.STATUS,
        SELECT
        MTR.ID,
        MCR.CAR_ID,
        MAX(SD.DEPARTMENT_NAME) AS DEPARTMENT_NAME,
        MAX(MTC.LICENSE_PLATE_NUMBER) AS LICENSE_PLATE_NUMBER,
        MAX(SU.NICK_NAME) AS NICK_NAME,
        COUNT(DISTINCT MCR.ID) AS bagNum,
        SUM(MCR.WEIGHT) AS totalWeight,
        MAX(MDR.RECEIVE_TIME) AS endTime,
        TRUNC(MCR2.CHECKOUT_TIME) AS transitDate,
        SD.TREE_CODE,
        MAX(MCR.STATUS) AS STATUS,
        MCR2.ID AS CHECK_OUT_ID,
        MCR.ID AS COLLECT_RECORD_ID,
        MCR.WEIGHT,
        MCR.HOSPITAL_NAME,
        MCR.BOX_NUMBER,
        MCR.WASTE_TYPE_STR
        MAX(MCR.HOSPITAL_NAME) AS HOSPITAL_NAME,
        COUNT(DISTINCT MCR.BOX_NUMBER) AS BOX_NUMBER,
        MAX(MCR.WASTE_TYPE_STR) AS WASTE_TYPE_STR
        FROM MW_CHECKOUT_RECORD MCR2
        LEFT JOIN MW_CHECKOUT_RECORD_ITEM MCRI
        INNER JOIN MW_CHECKOUT_RECORD_ITEM MCRI
        ON MCRI.CHECKOUT_RECORD_ID = MCR2.ID
        LEFT JOIN MW_COLLECT_RECORD MCR
        INNER JOIN MW_COLLECT_RECORD MCR
        ON MCR.ID = MCRI.COLLECT_RECORD_ID
        LEFT JOIN MW_DISPOSAL_RECORD_ITEM MDRI ON MDRI.COLLECT_RECORD_ID = MCRI.COLLECT_RECORD_ID
        LEFT JOIN MW_DISPOSAL_RECORD MDR ON MDR.ID = MDRI.DISPOSAL_RECORD_ID
        LEFT JOIN MW_TRANSIT_CAR MTC ON MCR.CAR_ID = MTC.ID
        LEFT JOIN SYS_USER SU ON MCR.DRIVER_ID = SU.USER_ID
        LEFT JOIN SYS_DEPARTMENT SD ON SD.ID = MDR.DEPARTMENT_ID
        LEFT JOIN (SELECT * FROM MW_TRANSIT_ROUTE GROUP BY DEPARTMENT_ID) MTR
        ON MTR.DEPARTMENT_ID = MDR.DEPARTMENT_ID) AS T
        LEFT JOIN MW_DISPOSAL_RECORD_ITEM MDRI
        ON MDRI.COLLECT_RECORD_ID = MCR.ID
        LEFT JOIN MW_DISPOSAL_RECORD MDR
        ON MDR.ID = MDRI.DISPOSAL_RECORD_ID
        LEFT JOIN MW_TRANSIT_CAR MTC
        ON MTC.ID = MCR.CAR_ID
        LEFT JOIN SYS_USER SU
        ON SU.USER_ID = MCR.DRIVER_ID
        LEFT JOIN SYS_DEPARTMENT SD
        ON SD.ID = MDR.DEPARTMENT_ID
        LEFT JOIN MW_TRANSIT_ROUTE MTR
        ON MTR.DEPARTMENT_ID = SD.ID
        <where>
            T.ID = #{query.id}
            AND T.CAR_ID = #{query.carId}
            AND T.transitDate = #{query.transitDate}
            MTR.ID = #{query.id}
            AND MCR.CAR_ID = #{query.carId}
            AND TRUNC(MCR2.CHECKOUT_TIME) = #{query.transitDate}
        </where>
        GROUP BY
        MTR.ID,
        MCR.CAR_ID,
        TRUNC(MCR2.CHECKOUT_TIME),
        MCR2.ID
    </select>
    <select id="hospitalTransitList" resultType="com.sinata.system.domain.vo.MwCheckoutRecordVO">
        SELECT mcr.ID,
        mcr.CHECKOUT_TIME,
        mcr.HOSPITAL_NAME,
        SUM(mcr.BOX_NUM) AS boxNum,
        SUM(mcr.BAG_NUM) AS bagNum,
        SUM(mcr.TOTAL_WEIGHT) AS totalWeight,
        mcr.BOX_NUM,
        mcr.BAG_NUM,
        mcr.TOTAL_WEIGHT,
        mcr.DEPARTMENT_ID,
        su.NICK_NAME AS driverName,
        mtc.LICENSE_PLATE_NUMBER
        mtc.LICENSE_PLATE_NUMBER,
        mtr.ROUTE_NAME
        FROM MW_CHECKOUT_RECORD mcr
        LEFT JOIN SYS_USER su
        ON mcr.DRIVER_ID = su.USER_ID
        LEFT JOIN MW_TRANSIT_CAR mtc
        ON mcr.CAR_ID = mtc.ID
        LEFT JOIN SYS_DEPARTMENT sd
        ON mcr.DEPARTMENT_ID = sd.ID
        LEFT JOIN SYS_USER su ON mcr.DRIVER_ID = su.USER_ID
        LEFT JOIN MW_TRANSIT_CAR MTC ON mcr.CAR_ID = mtc.ID
        LEFT JOIN MW_TRANSIT_ROUTE_POINTS mtrp ON mcr.DEPARTMENT_ID = mtrp.DEPARTMENT_ID
        LEFT JOIN MW_TRANSIT_ROUTE mtr ON mtrp.ROUTE_ID = mtr.ID
        LEFT JOIN SYS_DEPARTMENT sd ON mcr.DEPARTMENT_ID = sd.ID
        <where>
            mcr.DEL_FLAG = 0
            <if test="treeCode != null and treeCode != ''">
@@ -292,14 +281,9 @@
            <if test="query.checkoutTimeStart != null and query.checkoutTimeEnd!=null">
                AND mcr.CHECKOUT_TIME BETWEEN #{query.checkoutTimeStart} AND #{query.checkoutTimeEnd}
            </if>
            <if test="query.ids != null and ids.size() > 0">
                AND mcr.ID IN
                <foreach collection="query.ids" item="id" separator="," open="(" close=")">
                    #{id}
                </foreach>
            </if>
        </where>
        GROUP BY mcr.DEPARTMENT_ID
        GROUP BY mcr.ID
        ORDER BY mcr.CHECKOUT_TIME DESC
    </select>
    <select id="totalUp" resultType="com.sinata.system.domain.dto.CollectTotalUpDto">
        SELECT WASTE_TYPE as wasteType,WASTE_TYPE_STR as wasteTypeStr,COUNT(DISTINCT BOX_NUMBER ) as boxNum ,COUNT(1)as num,sum(WEIGHT) as weight from MEDICAL_WASTE.MW_COLLECT_RECORD
@@ -398,8 +382,8 @@
        LEFT JOIN MW_DISPOSAL_RECORD_ITEM MDRI ON MDRI.COLLECT_RECORD_ID = MCR.ID
        LEFT JOIN MW_DISPOSAL_RECORD MDR ON MDR.ID = MDRI.DISPOSAL_RECORD_ID
        <where>
            <if test="query.departmentId != null">
                AND MDR.DEPARTMENT_ID = #{query.departmentId}
            <if test="treeCode != null and treeCode !=''">
                AND SD.TREE_CODE LIKE CONCAT(#{treeCode},'%')
            </if>
            <if test="query.startTime != null and query.endTime != null">
                AND MCR.CHECKOUT_TIME BETWEEN #{query.startTime} AND #{query.endTime}

 medicalWaste-system/src/main/resources/mapper/system/MwCollectRecordMapper.xml

@@ -148,7 +148,7 @@
        LEFT JOIN MW_DISPOSAL_HANDLE_RECORD_ITEM mdhri ON mdhri.COLLECT_RECORD_ID= mcr.ID
        LEFT JOIN MW_DISPOSAL_HANDLE_RECORD mdhr ON mdhr.ID= mdhri.DISPOSAL_HANDLE_RECORD_ID
        LEFT JOIN SYS_USER su3 ON su3.USER_ID = mdr.RECEIVER_ID
        LEFT JOIN SYS_USER su4 ON su4.USER_ID = mdr.DISPOSAL_USER_ID
        LEFT JOIN SYS_USER su4 ON su4.USER_ID = mdhr.DISPOSAL_USER_ID
        LEFT JOIN MW_TRANSIT_CAR mtc ON mtc.ID = mcr2.CAR_ID
        <where>
            mcr.ID = #{id}
@@ -346,7 +346,7 @@
        <where>
            MCR.DEL_FLAG = 0
            <if test="treeCode != null and treeCode != ''">
                and SD.TREE_CODE = #{treeCode}
                and SD.TREE_CODE LIKE CONCAT(#{treeCode},'%')
            </if>
            <if test="query.startTime != null and query.endTime != null">
                and MCR.COLLECT_TIME between #{query.startTime} and #{query.endTime}

 medicalWaste-system/src/main/resources/mapper/system/MwDisposalRecordMapper.xml

@@ -130,8 +130,9 @@
        MCR.WEIGHT,
        MDHR.DISPOSAL_TIME AS collectTime
        FROM MW_DISPOSAL_HANDLE_RECORD MDHR
        LEFT JOIN MW_COLLECT_RECORD MCR ON MCR.DISPOSAL_HANDLE_RECORD_ID = MDHR.ID
        LEFT JOIN SYS_DEPARTMENT SD ON SD.ID = MDHR.DEPARTMENT_ID
        INNER JOIN MW_DISPOSAL_HANDLE_RECORD_ITEM MDHRI ON MDHRI.DISPOSAL_HANDLE_RECORD_ID = MDHR.ID
        INNER JOIN MW_COLLECT_RECORD MCR ON MDHRI.COLLECT_RECORD_ID = MCR.ID
        INNER JOIN SYS_DEPARTMENT SD ON SD.ID = MDHR.DEPARTMENT_ID
        <where>
            MDHR.DEL_FLAG = 0
            <if test="treeCode != null and treeCode != ''">

 medicalWaste-system/src/main/resources/mapper/system/MwMicroEquipmentRecordItemMapper.xml

@@ -13,5 +13,28 @@
    <sql id="Base_Column_List">
        ID, EQUIPMENT_RECORD_ID, COLLECT_RECORD_ID
    </sql>
    <select id="getRegulationReportList" resultType="com.sinata.system.domain.vo.MwCollectRecordVO"
            parameterType="com.sinata.system.domain.query.DisposalReportQuery">
        SELECT MCR.ID, MCR.WASTE_TYPE, MCR.WEIGHT, MMER.USE_TIME AS collectTime
        FROM MW_MICRO_EQUIPMENT_RECORD MMER INNER JOIN MW_MICRO_EQUIPMENT_RECORD_ITEM MMERI on MMER.ID =
        MMERI.EQUIPMENT_RECORD_ID
        INNER JOIN MW_COLLECT_RECORD MCR ON MCR.ID = MMERI.COLLECT_RECORD_ID
        INNER JOIN SYS_DEPARTMENT SD ON SD.ID = MCR.DEPARTMENT_ID
        <where>
            MMER.DEL_FLAG = 0
            <if test="treeCode != null and treeCode != ''">
                AND SD.TREE_CODE LIKE CONCAT(#{treeCode}, '%')
            </if>
            <if test="query.startTime != null and query.endTime != null">
                AND MMER.USE_TIME BETWEEN #{query.startTime} AND #{query.endTime}
            </if>
            <if test="query.wasteTypeCodeList != null and query.wasteTypeCodeList.size()>0">
                AND MCR.WASTE_TYPE IN
                <foreach collection="query.wasteTypeCodeList" item="wasteType" separator="," open="(" close=")">
                    #{wasteType}
                </foreach>
            </if>
        </where>
    </select>

</mapper>