部分报表导出，修改报工新增后质检状态不正确问题，修改报工编辑后查询数据错误问题

chenlu

2024-05-28 18b4be9e6b7e8319c2e02b20b9f9b0a422c352a5

 north-glass-erp/src/main/java/com/example/erp/mapper/pp/ReportMapper.java

@@ -1,9 +1,9 @@
package com.example.erp.mapper.pp;


import com.example.erp.dto.pp.*;
import com.example.erp.entity.pp.DamageDetails;
import com.example.erp.entity.pp.Report;
import com.example.erp.entity.sd.Order;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;

@@ -29,7 +29,7 @@
    List<Map<String, String>> processToBeCompletedMp(Date selectTime1, Date selectTime2, String orderId,
                                                     String inputProject, String selectProcesses, Report report);

    List<Map<String, String>> selectDamageReportMp(Date selectTime1, Date selectTime2, Report report);
    List<DamageReportDTO> selectDamageReportMp(Integer offset, Integer pageSize, Date selectTime1, Date selectTime2, DamageReportDTO damageReportDTO);

    List<Map<String, String>> splittingDetailsOutsideMp(String orderId, Report report);

@@ -45,7 +45,18 @@

    List<Map<String, String>> rawMaterialRequisitionMp(Date selectTime1, Date selectTime2, Report report);

    List<DamageDetails> exportCrossProcessBreakingMp(List<LocalDate> dates);
    List<CrossProcessBreakingDTO> exportCrossProcessBreakingMp(List<LocalDate> dates);

    Map<String, Integer> getDamageReportPageTotal(Integer offset, Integer pageSize, Date selectTime1, Date selectTime2, DamageReportDTO damageReportDTO);

    List<DamageReportDTO> exportDamageReportMp(List<LocalDate> dates);

    List<OrderPlanDecompositionDTO> exportOrderPlanDecompositionMp(List<LocalDate> dates);

    List<ProcessToBeCompletedDTO> exportProcessToBeCompletedMp(List<LocalDate> date, String process, String inputVal, String project);

    List<WorkInProgressDTO> exportWorkInProgressMp(List<LocalDate> date, String process, String inputVal, String project);


//    Map<String, Integer> getWorkInProgressTotal(
//                                                @Param("selectTime1") Date selectTime1, @Param("selectTime2") Date selectTime2,