次破报表添加厚度以及相关功能

chenlu

7 天以前 947622a11997e34a92b5b74bc5982aba21562240

 north-glass-erp/src/main/java/com/example/erp/service/pp/ReportService.java

@@ -15,9 +15,11 @@
import com.example.erp.entity.pp.Report;
import com.example.erp.mapper.pp.*;
import com.example.erp.mapper.sd.*;
import com.fasterxml.jackson.annotation.JsonFormat;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.util.StringUtils;
import org.springframework.web.bind.annotation.RequestBody;

import javax.annotation.PreDestroy;
import javax.annotation.Resource;
@@ -973,12 +975,22 @@
        return map;
    }

    public List exportCrossProcessBreakingSv(List<LocalDate> dates) {
    public List exportCrossProcessBreakingSv(List<String> dates) {
        DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");

        List<LocalDateTime> dateTimeList = dates.stream()
                .map(s -> LocalDateTime.parse(s, formatter))
                .collect(Collectors.toList());
        return reportMapper.exportCrossProcessBreakingMp(dates);
    }

    public List exportNotCrossProcessBreakingSv(List<LocalDate> dates) {
        return reportMapper.exportNotCrossProcessBreakingMp(dates);
    public List exportNotCrossProcessBreakingSv(List<String> dates) {
        DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");

        List<LocalDateTime> dateTimeList = dates.stream()
                .map(s -> LocalDateTime.parse(s, formatter))
                .collect(Collectors.toList());
        return reportMapper.exportNotCrossProcessBreakingMp(dateTimeList);
    }

    //    public List exportTeamOutputSv(Map<String, Object> dates) {
@@ -990,9 +1002,15 @@
//        String laminating = reportMapper.getLaminating(process);
//        return reportMapper.exportTeamOutputMp(date,process,laminating);
//    }
    public List exportDamageReportSv(Map<String, Object> dates) {
        List<LocalDate> date= (List<LocalDate>) dates.get("date");
        return reportMapper.exportDamageReportMp(date);
    public List exportDamageReportSv(List<String> dates) {
        DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");

        List<LocalDateTime> dateTimeList = dates.stream()
                .map(s -> LocalDateTime.parse(s, formatter))
                .collect(Collectors.toList());

        // 这里用 LocalDateTime 去调用 mapper
        return reportMapper.exportDamageReportMp(dateTimeList);
    }

    public List exportOrderPlanDecompositionSv(List<LocalDate> dates) {