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

chenlu

2024-03-15 dbec8a881baf27254a13f1f9c7b0167b9f064ab5

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

@@ -471,4 +471,33 @@
            return false;
        }
    }

    public Map<String, Object> selectQualityTestingSv(Integer pageNum, Integer pageSize, java.sql.Date selectTime1, java.sql.Date selectTime2, Integer state, String processId, ReportingWork reportingWork) {
        Integer offset = (pageNum - 1) * pageSize;
        if (processId.equals("null")) {
            processId = "";
        }
        Map<String, Object> map = new HashMap<>();
        map.put("data", reportingWorkMapper.selectQualityTestingMp(offset, pageSize, selectTime1, selectTime2,state, processId, reportingWork));
        map.put("total", reportingWorkMapper.getQualityPageTotal(offset, pageSize, selectTime1, selectTime2,state, processId, reportingWork));

        return map;
    }

    public Boolean updateQualityStatusSv(String reportingWorkId,String username) {
        if (!reportingWorkId.isEmpty()) {
            reportingWorkMapper.updateQualityStatusMp(reportingWorkId,username);
            return true;
        } else {
            return false;
        }
    }

    public Map<String, Object> detailsQualitySv(String reportingWorkId,String processId,String thisProcess, ReportingWork reportingWork) {
        Map<String, Object> map = new HashMap<>();
        map.put("data", reportingWorkMapper.detailsQualityMp(reportingWorkId, reportingWork));
        map.put("basic",getReportingWorkBase(processId,thisProcess));
        System.out.println(map.get("basic"));
        return map;
    }
}