blame | 历史 | 补丁 | 提交 | 提交对比 | ignore whitespace
chenlu
2025-07-15 f2cf77197569122886ec25da20b15996d053fde2 
 north-glass-erp/src/main/java/com/example/erp/service/pp/ReportService.java


@@ -4,22 +4,17 @@


import com.baomidou.dynamic.datasource.annotation.DS;




import com.example.erp.dto.pp.*;


import com.example.erp.entity.pp.DamageDetails;


import com.example.erp.entity.pp.Report;


import com.example.erp.mapper.pp.FlowCardMapper;


import com.example.erp.mapper.pp.ProductionSchedulingMapper;


import com.example.erp.mapper.pp.ReportMapper;


import com.example.erp.mapper.sd.OrderProcessDetailMapper;


import org.springframework.beans.factory.annotation.Autowired;


import org.springframework.context.annotation.Bean;


import org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor;


import org.springframework.stereotype.Service;


import org.springframework.util.StringUtils;




import java.sql.Date;


import java.time.LocalDate;


import java.util.*;


import java.util.concurrent.Executor;


import java.util.function.Function;


import java.util.stream.Collectors;




@@ -482,7 +477,7 @@


        return reportMapper.exportYieldMp(date,process);


    }




    public Map<String, Object> teamOutputSv(Integer pageNum, Integer pageSize, Date selectTime1, Date selectTime2, String selectProcesses, TeamOutputDTO teamOutputDTO) {


    public Map<String, Object> teamOutputSv(Integer pageNum, Integer pageSize, String selectTime1, String selectTime2, String selectProcesses, TeamOutputDTO teamOutputDTO) {


        if (selectProcesses.equals("全部")){


            selectProcesses="";


        }