tt

VisualInspection/view/statistics/change_attendance.html

@@ -70,15 +70,15 @@
                         <th class="m28"  rowspan="2">29</th>
                         <th class="m28 m29"  rowspan="2">30</th>
                         <th class="m28 m29 m30"  rowspan="2">31</th>
-                        <th  rowspan="2">1</th>
-                        <th  rowspan="2">2</th>
-                        <th  rowspan="2">3</th>
-                        <th rowspan="2">4</th>
-                        <th  rowspan="2">5</th>
-                        <th  rowspan="2">6</th>
-                        <th  rowspan="2">7</th>
-                        <th rowspan="2">8</th>
-                        <th  rowspan="2">9</th>
+                        <th  rowspan="2">01</th>
+                        <th  rowspan="2">02</th>
+                        <th  rowspan="2">03</th>
+                        <th rowspan="2">04</th>
+                        <th  rowspan="2">05</th>
+                        <th  rowspan="2">06</th>
+                        <th  rowspan="2">07</th>
+                        <th rowspan="2">08</th>
+                        <th  rowspan="2">09</th>
                         <th rowspan="2">10</th>
                         <th  rowspan="2">11</th>
                         <th rowspan="2">12</th>

VisualInspection/view/statistics/common_attendance.html

@@ -70,15 +70,15 @@
                         <th class="m28"  rowspan="2">29</th>
                         <th class="m28 m29"  rowspan="2">30</th>
                         <th class="m28 m29 m30"  rowspan="2">31</th>
-                        <th  rowspan="2">1</th>
-                        <th  rowspan="2">2</th>
-                        <th  rowspan="2">3</th>
-                        <th rowspan="2">4</th>
-                        <th  rowspan="2">5</th>
-                        <th  rowspan="2">6</th>
-                        <th  rowspan="2">7</th>
-                        <th rowspan="2">8</th>
-                        <th  rowspan="2">9</th>
+                        <th  rowspan="2">01</th>
+                        <th  rowspan="2">02</th>
+                        <th  rowspan="2">03</th>
+                        <th rowspan="2">04</th>
+                        <th  rowspan="2">05</th>
+                        <th  rowspan="2">06</th>
+                        <th  rowspan="2">07</th>
+                        <th rowspan="2">08</th>
+                        <th  rowspan="2">09</th>
                         <th rowspan="2">10</th>
                         <th  rowspan="2">11</th>
                         <th rowspan="2">12</th>

VisualInspection_server/src/main/java/com/xintong/visualinspection/bean/StatisticsBo.java

@@ -51,16 +51,15 @@ public class StatisticsBo {
 		if((o2.getChecked_num()+o2.getChecked_m_num())!=0){
 			b = (o2.getCheck_all_score()+o2.getCheck_all_m_score()) /(o2.getChecked_num()+o2.getChecked_m_num()+0.00);
 		}
-		int numA = this.getChecked_num();
-		int numB = o2.getChecked_num();
+	
 		if (a > b ) {
 			return 1;
 		} else if (a < b) {
 			return -1;
 		} else {
-			if(numA>numB){
-				return -1;
-			}else if(numA<numB){
+			if(this.getChecked_num() == 0 && o2.getChecked_num()!=0 ){
+				return -1 ;
+			}else if(o2.getChecked_num() ==0 && this.getChecked_num() != 0){
 				return 1;
 			}else{
 				return 0;