push

src/main/java/com/yxproject/start/api/FailedCardApi.java

@@ -84,7 +84,7 @@ public class FailedCardApi {
             } else {
                 idMap = failedCardService.selectCountIdByCardId(jsonObject.getString("cardId"));
             }
-            int initiator = Integer.parseInt(jsonObject.getString("initiator")) - 1;
+            int initiator = 5;
             failedCardService.insertFailedCard(jsonObject.getString("failedCardReasonId"), idMap.get("ACCEPT_NO").toString(), idMap.get("TASK_ID").toString(), String.valueOf(initiator), jsonObject.getString("note"),idMap.get("WORK_GROUP").toString());
         }
         return true;

src/main/java/com/yxproject/start/service/impl/TaskListServiceImpl.java

@@ -1122,6 +1122,7 @@ public class TaskListServiceImpl implements TaskListService {
                     workGroup = countyMap.get("WORK_GROUP") + "";
                     typeSum += Integer.valueOf(countyMap.get("VALID_COUNT") + "");
                     typeSum -= Integer.valueOf(countyMap.get("SPECIAL_CARD_COUNT") + "");
+//                    typeSum -= Integer.valueOf(countyMap.get("FAILECOUNT") + "");
                     validCount += Integer.valueOf(countyMap.get("VALID_COUNT") + "");
                     invalidCount += Integer.valueOf(countyMap.get("INVALID_COUNT") + "");
                     specialCount += Integer.valueOf(countyMap.get("SPECIAL_CARD_COUNT") + "");

src/main/resources/static/views/task/task.js

@@ -114,7 +114,7 @@ angular.module('AvatarCheck.task', ['ngRoute', 'AvatarCheck.http'])
             var action = (checkbox.checked ? 'add' : 'remove');
             console.log(task)
             for (var i = 0; i < task.length; i++) {
-                if(task[i].faileCount==0){
+                if((task[i].countyValidCount-task[i].specialCount)==task[i].downloadCount){
                     var contact = task[i];
                     updateSelected(action, contact);
                 }else{
@@ -468,8 +468,12 @@ angular.module('AvatarCheck.task', ['ngRoute', 'AvatarCheck.http'])
             var checkbox = $event.target;
             var action = (checkbox.checked ? 'add' : 'remove');
             for (var i = 0; i < task.length; i++) {
-                var contact = task[i];
-                updateSelected(action, contact);
+                if((task[i].countyValidCount-task[i].specialCount)==task[i].eWriteCount){
+                    var contact = task[i];
+                    updateSelected(action, contact);
+                }else{
+                    continue;
+                }
             }
         };
         $scope.isSelected = function (task) {

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

@@ -48,13 +48,13 @@
                </thead>
                <tbody ng-repeat="task in type.countyList | orderBy:countyCode:desc">
                      <tr>
-                       <td ng-if="task.faileCount==0&&(task.countyValidCount-task.specialCount)==task.eWriteCount"><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"></td>
+                       <td ng-if="(task.countyValidCount-task.specialCount-task.faileCount)==task.eWriteCount"><input type="checkbox" class="checkOneBox" ng-checked="isSelected(task)" value="{{task.taskId}}" ng-click="updateSelection($event,task)"></td>
+                       <td ng-if="(task.countyValidCount-task.specialCount-task.faileCount)!=task.eWriteCount"></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">{{task.groupList.length}}</td>
                        <td class="mailbox-subject">{{task.groupNum}}</td>
-                       <td class="mailbox-subject">{{task.countyValidCount-task.specialCount}}</td>
+                       <td class="mailbox-subject">{{task.countyValidCount-task.specialCount-task.faileCount}}</td>
                        <td class="mailbox-subject">{{task.eWriteCount}}</td>
                          <td class="mailbox-subject">{{task.checkCount}}</td>
                        <td class="mailbox-subject">{{task.specialCount}}</td>

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

@@ -53,15 +53,15 @@
                   </thead>
                   <tbody ng-repeat="task in type.countyList | orderBy:countyCode:desc">
                   <tr>
-                    <td ng-if="task.faileCount==0&&(task.countyValidCount-task.specialCount)==task.downloadCount"><input type="checkbox" id="checkOneBox" class="checkOneBox" ng-checked="isSelected(task)" value="{{task.taskId}}" name="{{task.countyValidCount-task.specialCount}}"  ng-click="updateSelection($event,task)"></td>
-                    <td ng-if="task.faileCount>0||(task.countyValidCount-task.specialCount)!=task.downloadCount"></td>
+                    <td ng-if="(task.countyValidCount-task.specialCount-task.faileCount)<=task.downloadCount"><input type="checkbox" id="checkOneBox" class="checkOneBox" ng-checked="isSelected(task)" value="{{task.taskId}}" name="{{task.countyValidCount-task.specialCount}}"  ng-click="updateSelection($event,task)"></td>
+                    <td ng-if="(task.countyValidCount-task.specialCount-task.faileCount)!=task.downloadCount"></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">{{task.groupList.length}}</td>
                     <td class="mailbox-subject">{{task.groupNum}}</td>
                     <td class="mailbox-subject">{{task.countyValidCount}}</td>
                     <td class="mailbox-subject">{{task.downloadCount}}</td>
-                    <td class="mailbox-subject">{{task.countyValidCount-task.specialCount}}</td>
+                    <td class="mailbox-subject">{{task.countyValidCount-task.specialCount-task.faileCount}}</td>
                     <td class="mailbox-attachment">{{task.specialCount}}</td>
                     <td ng-if="task.faileCount!=0" class="mailbox-subject" style="color: red;">{{task.faileCount}}</td>
                     <td ng-if="task.faileCount==0" class="mailbox-subject">{{task.faileCount}}</td>