废证所属工作组，改为提交人

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

@@ -145,6 +145,7 @@ public class FailedCardApi {
             for (Object o : jsonarray) {
                 JSONObject jsonObject = (JSONObject) o;
                 String name = ((JSONObject) o).getString("name");
+                String workGroup = ((JSONObject) o).getString("workGroup");//提交人所在工作组，废证属于提交人所在工作组
 
                 String result = failedCardService.selectSpecialCard(((JSONObject) o).getString("cardId"));
                 List<Map<String, Object>> idMap;
@@ -160,7 +161,7 @@ public class FailedCardApi {
                     int initiator = 5;
                     String acceptNo = idMap.get(0).get("ACCEPT_NO").toString();
                     Object taskId = idMap.get(0).get("TASK_ID");
-                    Object workGroup = idMap.get(0).get("WORK_GROUP");
+//                    Object workGroup = idMap.get(0).get("WORK_GROUP");
                     failedCardService.insertFailedCard(jsonObject.getString("failedCardReasonId"), replace(acceptNo), replace(taskId), String.valueOf(initiator), jsonObject.getString("note"), replace(workGroup), name);
                 }
                 }

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

@@ -159,7 +159,7 @@ public class PersonPostApi {
                             List lists = (List)listStr.get(i);
                             rows=i;
                             String uploadNo = lists.get(1)+"";
-                            String note =lists.get(10)+"";
+                            String note =lists.get(9)+"："+lists.get(10);
                             List<Map<String, Object>> resultMap=personPostService.checkPersonalPost(uploadNo);
                             if (resultMap.size()>0){
                                 personPostService.cancelPostByAcceptNo(uploadNo, note, name);

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

@@ -107,7 +107,8 @@ angular.module('AvatarCheck.addFailed', ['ngRoute', 'AvatarCheck.http'])
                     json.note=result[i][1];
                     json.failedCardReasonId=result[i][2];
                     json.initiator = $rootScope.loginData.roleList[0].process;
-                    json.name=$rootScope.loginData.name
+                    json.name=$rootScope.loginData.name;
+                    json.workGroup= $rootScope.loginData.workGroup;
                     list.push(json)
                 }
             }

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

@@ -213,6 +213,11 @@ angular.module('AvatarCheck.searchCardMsg', ['ngRoute', 'AvatarCheck.http'])
             $rootScope.tab = '/searchCardMsg';
             $rootScope.close = 1;
             $scope.postMsgDetail = [];
+            postData = {
+                idCard: '',
+                startDate: '',
+                endDate: ''
+            }
             subSomething();
         };
         $scope.endReading = function () {