|
|
|
|
@ -1676,15 +1676,15 @@ public class EntrustServiceImpl extends BaseServiceImpl<EntrustMapper, Entrust> |
|
|
|
|
for (int i = 0; i < arrVOList.size() / 3; i++) { |
|
|
|
|
Map<String, Object> map = new HashMap<>(); |
|
|
|
|
map.put("num1", arrVOList.get(i).getNum()); |
|
|
|
|
map.put("value1", arrVOList.get(i).getValue()); |
|
|
|
|
map.put("value1", arrVOList.get(i).getLog2()); |
|
|
|
|
map.put("result1", arrVOList.get(i).getResult()); |
|
|
|
|
|
|
|
|
|
map.put("num2", arrVOList.get(arrVOList.size() / 3 + i).getNum()); |
|
|
|
|
map.put("value2", arrVOList.get(arrVOList.size() / 3 + i).getValue()); |
|
|
|
|
map.put("value2", arrVOList.get(arrVOList.size() / 3 + i).getLog2()); |
|
|
|
|
map.put("result2", arrVOList.get(arrVOList.size() / 3 + i).getResult()); |
|
|
|
|
|
|
|
|
|
map.put("num3", arrVOList.get(arrVOList.size() / 3 * 2 + i).getNum()); |
|
|
|
|
map.put("value3", arrVOList.get(arrVOList.size() / 3 * 2 + i).getValue()); |
|
|
|
|
map.put("value3", arrVOList.get(arrVOList.size() / 3 * 2 + i).getLog2()); |
|
|
|
|
map.put("result3", arrVOList.get(arrVOList.size() / 3 * 2 + i).getResult()); |
|
|
|
|
resultList1.add(map); |
|
|
|
|
} |
|
|
|
|
@ -1693,28 +1693,28 @@ public class EntrustServiceImpl extends BaseServiceImpl<EntrustMapper, Entrust> |
|
|
|
|
if (arrVOList.size() % 3 == 1) { |
|
|
|
|
Map<String, Object> map = new HashMap<>(); |
|
|
|
|
map.put("num1", arrVOList.get(i).getNum()); |
|
|
|
|
map.put("value1", arrVOList.get(i).getValue()); |
|
|
|
|
map.put("value1", arrVOList.get(i).getLog2()); |
|
|
|
|
map.put("result1", arrVOList.get(i).getResult()); |
|
|
|
|
if (i < arrVOList.size() / 3) { |
|
|
|
|
map.put("num2", arrVOList.get(arrVOList.size() / 3 + i + 1).getNum()); |
|
|
|
|
map.put("value2", arrVOList.get(arrVOList.size() / 3 + i + 1).getValue()); |
|
|
|
|
map.put("value2", arrVOList.get(arrVOList.size() / 3 + i + 1).getLog2()); |
|
|
|
|
map.put("result2", arrVOList.get(arrVOList.size() / 3 + i + 1).getResult()); |
|
|
|
|
map.put("num3", arrVOList.get(arrVOList.size() / 3 * 2 + i + 1).getNum()); |
|
|
|
|
map.put("value3", arrVOList.get(arrVOList.size() / 3 * 2 + i + 1).getValue()); |
|
|
|
|
map.put("value3", arrVOList.get(arrVOList.size() / 3 * 2 + i + 1).getLog2()); |
|
|
|
|
map.put("result3", arrVOList.get(arrVOList.size() / 3 * 2 + i + 1).getResult()); |
|
|
|
|
} |
|
|
|
|
resultList1.add(map); |
|
|
|
|
} else if (arrVOList.size() % 3 == 2) { |
|
|
|
|
Map<String, Object> map = new HashMap<>(); |
|
|
|
|
map.put("num1", arrVOList.get(i).getNum()); |
|
|
|
|
map.put("value1", arrVOList.get(i).getValue()); |
|
|
|
|
map.put("value1", arrVOList.get(i).getLog2()); |
|
|
|
|
map.put("result1", arrVOList.get(i).getResult()); |
|
|
|
|
map.put("num2", arrVOList.get(arrVOList.size() / 3 + i + 1).getNum()); |
|
|
|
|
map.put("value2", arrVOList.get(arrVOList.size() / 3 + i + 1).getValue()); |
|
|
|
|
map.put("value2", arrVOList.get(arrVOList.size() / 3 + i + 1).getLog2()); |
|
|
|
|
map.put("result2", arrVOList.get(arrVOList.size() / 3 + i + 1).getResult()); |
|
|
|
|
if (i < arrVOList.size() / 3) { |
|
|
|
|
map.put("num3", arrVOList.get(arrVOList.size() / 3 * 2 + i + 2).getNum()); |
|
|
|
|
map.put("value3", arrVOList.get(arrVOList.size() / 3 * 2 + i + 2).getValue()); |
|
|
|
|
map.put("value3", arrVOList.get(arrVOList.size() / 3 * 2 + i + 2).getLog2()); |
|
|
|
|
map.put("result3", arrVOList.get(arrVOList.size() / 3 * 2 + i + 2).getResult()); |
|
|
|
|
} |
|
|
|
|
resultList1.add(map); |
|
|
|
|
|