Merge remote-tracking branch 'origin/dev' into dev

src/main/resources/static/views/task/taskListSorting.html

@@ -56,11 +56,10 @@
                             </thead>
                             <tbody ng-repeat="task in type.countyList | orderBy:countyCode:desc">
                             <tr>
-                                <td ng-if="task.faileCount==0"><input type="checkbox" class="checkOneBox"
-                                                                      ng-checked="isSelected(task)"
-                                                                      value="{{task.taskId}}"
-                                                                      ng-click="updateSelection($event,task)"></td>
-                                <td ng-if="task.faileCount>0"></td>
+                                <td ng-if="task.faileCount==0&&(task.countyValidCount-task.specialCount)==task.eWriteCount&&task.eWriteCount==task.recheckCount">
+                                    <input type="checkbox" class="checkOneBox" ng-checked="isSelected(task)" value="{{task.taskId}}"
+                                        ng-click="updateSelection($event,task)"></td>
+                                <td ng-if="task.faileCount>0||(task.countyValidCount-task.specialCount)!=task.eWriteCount||task.eWriteCount!=task.recheckCount"></td>
                                 <td class="mailbox-star"><b>{{task.taskId}}</b></td>
                                 <td class="mailbox-subject">{{task.saveDate| date:'yyyy-MM-dd'}}</td>
                                 <td class="mailbox-subject"><a>{{task.countyName}}</a></td>