温红权 8 jaren geleden
bovenliggende
commit
932bff35bf

+ 1 - 1
VisualInspection/js/other_check/other_check.js

@@ -930,8 +930,8 @@ function static() {
                 '<td rowspan=2>道管</td>' +
                 '<td rowspan=2>站名</td>' +
                 '<td rowspan=2>存在问题特情数量</td>' +
-                '<td colspan=' + (names.length + 1) + '>联网中心特情稽查存在问题数量</td>' +
                 '<td colspan=' + (names.length + 1) + '>内部特情稽查存在问题数量</td>' +
+                '<td colspan=' + (names.length + 1) + '>联网中心特情稽查存在问题数量</td>' +
                 '<td rowspan=2>合计扣分</td>' +
                 '                </tr>' +
                 '                <tr>' +

+ 2 - 1
VisualInspection_server/src/main/java/com/xintong/visualinspection/service/impl/CheckOtherServiceImpl.java

@@ -208,8 +208,9 @@ public class CheckOtherServiceImpl  extends BaseService implements CheckOtherSer
                     }
                 }
                 HashMap<String,HashMap<String,Integer>> map = new HashMap<>();
-                map.put("1",s1);
                 map.put("2",s2);
+                map.put("1",s1);
+
                 otherCheckStatistics1.setScoretypemap(map);
                 otherCheckStatistics1.setTotalScore(totalscore);
                 otherCheckStatistics1.setTotalcheck(totalcheck);

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