Merge branch 'master' of http://10.153.19.25:10101/r/ERP_override

guoyujie

2025-10-23 cc8efc81d2d35bed40e47d0a5b0920a4b6f8095f

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

@@ -336,7 +336,7 @@
        if ("null".equals(optionVal)) {
            optionVal = ("");
        }
        if (selectProcesses.equals("全部")){
        if (selectProcesses.equals("all")){
            selectProcesses="";
        }
        String laminating = reportMapper.getLaminating(selectProcesses);
@@ -618,7 +618,7 @@

    public List exportWorkInProgressSv(Map<String, Object> dates) {
        String process= (String) dates.get("processes");
        if (process.equals("全部")){
        if (process.equals("all")){
            process="";
        }
        String inputVal= (String) dates.get("inputVal");
@@ -655,7 +655,7 @@
    }

    public Map<String, Object> teamOutputSv(Integer pageNum, Integer pageSize, String selectTime1, String selectTime2, String selectProcesses, TeamOutputDTO teamOutputDTO) {
        if (selectProcesses.equals("全部")){
        if (selectProcesses.equals("all")){
            selectProcesses="";
        }
        Integer offset = (pageNum - 1) * pageSize;
@@ -687,7 +687,7 @@
    public List exportTeamOutputSv(Map<String, Object> dates) {
        List<LocalDate> date= (List<LocalDate>) dates.get("date");
        String process= (String) dates.get("processes");
        if (process.equals("全部")){
        if (process.equals("all")){
            process="";
        }
        String laminating = reportMapper.getLaminating(process);
@@ -728,7 +728,7 @@
        if ("null".equals(optionVal)) {
            optionVal = "";
        }
        if ("全部".equals(selectProcesses)) {
        if ("all".equals(selectProcesses)) {
            selectProcesses = "";
        }

@@ -806,7 +806,7 @@

    public List exportWorkInProgressCombinationSv(Map<String, Object> dates) {
        String process= (String) dates.get("processes");
        if (process.equals("全部")){
        if (process.equals("all")){
            process="";
        }
        String inputVal= (String) dates.get("inputVal");