| | |
|---|
| | | } else { |
|---|
| | | dataList = glassOptimizeMapper.directOptimization(projectNo); |
|---|
| | | } |
|---|
| | | List<Map<String, Object>> tempDataList = null; |
|---|
| | | if (Integer.parseInt(stringObjectMap.get("optimize_state").toString())==1) { |
|---|
| | | tempDataList = glassOptimizeMapper.optimizeTemp(projectNo); |
|---|
| | | } |
|---|
| | | |
|---|
| | | // 获取磨量配置数据 |
|---|
| | | List<Map<String, Object>> grindingTrimmingList = glassOptimizeMapper.getGrindingOptimize(username); |
|---|
| | |
|---|
| | | } |
|---|
| | | } |
|---|
| | | } |
|---|
| | | if (tempDataList != null && !tempDataList.isEmpty()) { |
|---|
| | | dataList.addAll(tempDataList); |
|---|
| | | } |
|---|
| | | map.put("optimizeState", Integer.parseInt(stringObjectMap.get("optimize_state").toString())); |
|---|
| | | map.put("data", dataList); |
|---|
| | | map.put("project", glassOptimizeMapper.selectProjectCount(projectNo)); |
|---|
