| | |
|---|
| | | if (selectProcesses.equals("全部")){ |
|---|
| | | selectProcesses=""; |
|---|
| | | } |
|---|
| | | String laminating = reportMapper.getLaminating(selectProcesses); |
|---|
| | | Map<String, Object> map = new HashMap<>(); |
|---|
| | | List<WorkInProgressDTO> dataList2 =reportMapper.workInProgressMpdataList2(offset, pageSize, orderId, inputProject, selectProcesses, workInProgressDTO); |
|---|
| | | if (optionVal.equals("1")){ |
|---|
| | |
|---|
| | | } else { |
|---|
| | | //没有选择分组 |
|---|
| | | //map.put("data", reportMapper.workInProgressMp(offset, pageSize, orderId, inputProject, selectProcesses, workInProgressDTO)); |
|---|
| | | List<WorkInProgressDTO> dataList1 =reportMapper.workInProgressMpdataList1(offset, pageSize, orderId, inputProject, selectProcesses, workInProgressDTO); |
|---|
| | | List<WorkInProgressDTO> dataList1 =reportMapper.workInProgressMpdataList1(offset, pageSize, orderId, inputProject, selectProcesses,laminating, workInProgressDTO); |
|---|
| | | mergeTeamsGroupsName(dataList1, dataList2); |
|---|
| | | map.put("data",dataList1); |
|---|
| | | //map.put("total", reportMapper.workInProgressTotal(offset, pageSize, orderId, inputProject, selectProcesses, workInProgressDTO)); |
|---|
