Pārlūkot izejas kodu

Revert "排序处理"

This reverts commit e2570203d2bf1d9e6c5019cf3367b50041c82aa2.
wangjianguo 9 gadi atpakaļ
vecāks
revīzija
1db4320c15

+ 6 - 8
VisualInspection_server/src/main/java/com/xintong/visualinspection/service/impl/StatisticsServiceImpl.java

@@ -106,12 +106,10 @@ public class StatisticsServiceImpl extends BaseService implements StatisticsServ
 		lists.sort(new Comparator<StatisticsBo>() {
 			@Override
 			public int compare(StatisticsBo o1, StatisticsBo o2) {
-				if (o1.getCheck_all_score() > o2.getCheck_all_score()) {
+				if (o1.getCheck_all_score() >= o2.getCheck_all_score()) {
 					return 1;
-				} else if (o1.getCheck_all_score() < o2.getCheck_all_score()) {
+				} else {
 					return -1;
-				}else{
-					return 0;
 				}
 			}
 		});
@@ -194,7 +192,7 @@ public class StatisticsServiceImpl extends BaseService implements StatisticsServ
 		List<StatisticsBo> listStatistic = getEmployeeCheckedInfo(obj);
 		// 处理数据
 		//Integer[] emp_assess = new Integer[listStatistic.size()];
-		/*for (int i = 0; i < listStatistic.size(); i++) {
+		for (int i = 0; i < listStatistic.size(); i++) {
 			StatisticsBo st = new StatisticsBo();
 			st = listStatistic.get(i);
 			try {
@@ -203,11 +201,11 @@ public class StatisticsServiceImpl extends BaseService implements StatisticsServ
 			} catch (Exception e) {
 				e.printStackTrace();
 			}
-			List<Integer> checked_score_list = st.getChecked_score();
+			/*List<Integer> checked_score_list = st.getChecked_score();
 			for (int j = 0; j < checked_score_list.size(); i++) {
 				emp_assess[j] = checked_score_list.get(i);
-			}
-		}*/
+			}*/
+		}
 
 		String path = "D:/file20170606.xls";
 		try (InputStream is = this.getClass().getResourceAsStream("/employee_order.xls")) {

BIN
VisualInspection_server/src/main/resources/employee_order.xls