| | |
|---|
| | | map.put("process", productionSchedulingMapper.selectProcess()); |
|---|
| | | return map; |
|---|
| | | } |
|---|
| | | |
|---|
| | | public Map<String, Object> selectProcessCompletedSv(Date selectTime1, Date selectTime2, String orderId, String inputProject, String selectProcesses, Report report) { |
|---|
| | | if ("null".equals(orderId)) { |
|---|
| | | orderId = ""; |
|---|
| | | } |
|---|
| | | if ("null".equals(inputProject)) { |
|---|
| | | inputProject = ""; |
|---|
| | | } |
|---|
| | | Map<String, Object> map = new HashMap<>(); |
|---|
| | | String laminating = reportMapper.getLaminating(selectProcesses); |
|---|
| | | map.put("data", reportMapper.selectProcessCompletedMp(selectTime1, selectTime2, orderId, inputProject, selectProcesses,laminating, report)); |
|---|
| | | map.put("process", productionSchedulingMapper.selectProcess()); |
|---|
| | | map.put("footSum" ,reportMapper.processToBeCompletedFootSum(selectTime1, selectTime2, orderId, inputProject, selectProcesses, report)); |
|---|
| | | |
|---|
| | | return map; |
|---|
| | | } |
|---|
| | | } |
|---|
