bug修改

mitao

2025-04-02 1fd9e721593f0d22d16cdbac6b341553b1168cf7

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

@@ -217,8 +217,6 @@
        vo.setLegend(wasteTypeList.stream().map(SysDictDataVO::getDictLabel).collect(Collectors.toList()));
        vo.getLegend().add("小计");
        String treeCode = sysDepartmentService.getTreeCodeByDepartmentId(query.getDepartmentId());
        List<SysDictData> medicalWasteTypeList = sysDictDataService.lambdaQuery().eq(SysDictData::getDictType, "medical_waste_type").orderByDesc(SysDictData::getDictCode).list();

        List<MwMicroEquipmentStaticsVO> staticsData = baseMapper.getStaticsData(query, treeCode);
        SimpleDateFormat sdf = new SimpleDateFormat(DateUtils.YYYY_MM_DD_HH_MM_SS);
        switch (query.getDateType()) {
@@ -241,7 +239,7 @@
            SimpleDateFormat finalSdf = sdf;
            BigDecimal totalWeight = BigDecimal.ZERO;
            BigDecimal totalCount = BigDecimal.ZERO;
            for (SysDictData sysDictData : medicalWasteTypeList) {
            for (SysDictDataVO sysDictData : wasteTypeList) {
                BigDecimal weight = staticsData.stream().filter(e -> e.getWasteType().equals(sysDictData.getDictCode())
                        && finalSdf.format(e.getUseTime()).equals(date)
                ).map(MwMicroEquipmentStaticsVO::getWeight).reduce(BigDecimal.ZERO, BigDecimal::add).setScale(2, RoundingMode.HALF_UP);
@@ -264,13 +262,13 @@
            totalRow.setData(new ArrayList<>());

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

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

@@ -314,7 +312,7 @@
    @Override
    public void staticsExport(MwMicroEquipmentStaticsQuery query, HttpServletResponse response) throws IOException {

        List<List<String>> head = head();
        List<List<String>> head = head(query);
        System.out.println(JSONObject.toJSONString(head));
        // 这里注意 有同学反应使用swagger 会导致各种问题，请直接用浏览器或者用postman
        response.setContentType("application/vnd.openxmlformats-officedocument.spreadsheetml.sheet");
@@ -357,16 +355,26 @@
     *
     * @return
     */
    private List<List<String>> head() {
    private List<List<String>> head(MwMicroEquipmentStaticsQuery query) {
        List<SysDictData> medicalWasteTypeList = sysDictDataService.lambdaQuery().eq(SysDictData::getDictType, "medical_waste_type").list();
        List<List<String>> headTitles = Lists.newArrayList();
        headTitles.add(Lists.newArrayList("日期"));
        SysDepartment department = sysDepartmentService.getById(query.getDepartmentId());
        MwMicroEquipment microEquipment = mwMicroEquipmentService.getById(query.getEquipmentId());
        //修改代码判断department不为空才拼接
        String title = "";
        if (Objects.nonNull(department) && Objects.nonNull(microEquipment)) {
            title = department.getDepartmentName() + microEquipment.getEquipmentName() + "处置报表";
        } else {
            title = "处置报表";
        }
        headTitles.add(Lists.newArrayList(title, "日期", "日期"));
        String finalTitle = title;
        medicalWasteTypeList.forEach(item -> {
            headTitles.add(Lists.newArrayList(item.getDictLabel(), "总重量（KG）"));
            headTitles.add(Lists.newArrayList(item.getDictLabel(), "总数量"));
            headTitles.add(Lists.newArrayList(finalTitle, item.getDictLabel(), "总重量（KG）"));
            headTitles.add(Lists.newArrayList(finalTitle, item.getDictLabel(), "总数量"));
        });
        headTitles.add(Lists.newArrayList("小计", "总重量（KG）"));
        headTitles.add(Lists.newArrayList("小计", "总数量"));
        headTitles.add(Lists.newArrayList(title, "小计", "总重量（KG）"));
        headTitles.add(Lists.newArrayList(title, "小计", "总数量"));
        return headTitles;
    }