blame | 历史 | 补丁 | 提交 | 提交对比 | ignore whitespace
guoyujie
2025-10-20 d878bcd48999cbb187b2e7c3a4ceb454630790bc 
 north-glass-erp/src/main/java/com/example/erp/service/pp/ReportService.java


@@ -4,6 +4,7 @@


import com.alibaba.fastjson.JSON;


import com.alibaba.fastjson.TypeReference;


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


import com.example.erp.tools.AreaComputed.*;




import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;


import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;


@@ -30,6 +31,7 @@


import java.util.stream.Collectors;




import static cn.hutool.core.convert.Convert.toDouble;


import static com.example.erp.tools.AreaComputed.computeArea;




@Service


@DS("pp")


@@ -659,6 +661,7 @@


        Integer offset = (pageNum - 1) * pageSize;


        Map<String, Object> map = new HashMap<>();


        String laminating = reportMapper.getLaminating(selectProcesses);




        map.put("data", reportMapper.teamOutputMp(offset, pageSize, selectTime1, selectTime2,selectProcesses,laminating, teamOutputDTO));


        map.put("process", productionSchedulingMapper.selectProcess());


        map.put("total", reportMapper.teamOutputPageTotal(offset, pageSize, selectTime1, selectTime2,selectProcesses,laminating, teamOutputDTO));