废证新增受理号、起始有效期。

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

@@ -77,6 +77,8 @@ public class FailedCardApi {
                     map.put("ID_NO", o.toString());
                     map.put("NAME", "查无此人");
                     map.put("SEX_NO", "-1");
+                    map.put("SEX_NO", "-1");
+                    map.put("ACCEPT_NO", "");
                     resultMap.add(map);
                 }
                 resultList.addAll(resultMap);

src/main/java/com/yxproject/start/mapper/FailedCardMapper.java

@@ -32,7 +32,8 @@ public interface FailedCardMapper {
             "PROD_CARD_T.SEX_NO,\n" +
             "PROD_CARD_T.ID_NO,\n" +
             "SPECIAL_CARD.SPECIAL_TYPE, " +
-            "FAILED_CARD_REASON_DIC.FAILED_CARD_REASON \n " +
+            "FAILED_CARD_REASON_DIC.FAILED_CARD_REASON " +
+            ",PROD_CARD_T.ACCEPT_NO ACCEPT_NO ,PROD_CARD_T.begin_date " +
             "FROM PRODYD_DBA.PROD_CARD_T@PRODYD_LINK\n" +
             "left join SPECIAL_CARD on PROD_CARD_T.ACCEPT_NO = SPECIAL_CARD.ACCEPT_NO " +
             "left join failed_card on PROD_CARD_T.ACCEPT_NO = failed_card.ACCEPT_NO " +

src/main/java/com/yxproject/start/mapper/GroupNoMapper.java

@@ -70,16 +70,16 @@ public interface GroupNoMapper {
             "PROD_GROUP_T.valid_count,\n" +
             "PROD_GROUP_T.invalid_count, \n" +
             "'000000' county_code\n" +
-            "from PRODYD_DBA.PROD_CARD_T@PROD_LINK \n" +
+            "from PRODYD_DBA.PROD_CARD_T@PRODYD_LINK \n" +
             "left join PREPRO_PERSON \n" +
             "on PREPRO_PERSON.JMSFZSLH = PROD_CARD_T.upload_no\n" +
-            "left join PRODYD_DBA.PROD_GROUP_T@PROD_LINK\n" +
+            "left join PRODYD_DBA.PROD_GROUP_T@PRODYD_LINK\n" +
             "on substr(PROD_CARD_T.accept_no,0,8) = PROD_GROUP_T.group_no \n" +
-            "left join PRODYD_DBA.PROD_GROUP_RELATION_T@PROD_LINK \n" +
+            "left join PRODYD_DBA.PROD_GROUP_RELATION_T@PRODYD_LINK \n" +
             "on PROD_GROUP_RELATION_T.group_no =PROD_GROUP_T.group_no \n" +
             "left join CARD_TYPE_DIC \n" +
             "on decode(substr(ORIGINAL_NO,3,2),'99',6,substr(ORIGINAL_NO,21,1)) = CARD_TYPE_DIC.CARD_TYPE_ID \n" +
-            "where   PROD_GROUP_T.group_no in  (#{groupNo}) ")
+            "where   PROD_GROUP_T.group_no in  (${groupNo}) ")
     public List<Map<String,Object>> selectGroupAtPRODUByGroupNo(@Param("groupNo") String groupNo);
 
     /**

src/main/resources/static/dialogs/confirmFailedCards.html

@@ -5,20 +5,24 @@
     <table class="table table-hover">
         <thead>
         <th>NO.</th>
+        <th>受理号</th>
         <th>身份证号</th>
         <th>姓名</th>
         <th>性别</th>
+        <th>起始有效期</th>
         <th>类型</th>
         </thead>
         <tbody>
         <tr ng-repeat="item in personInfo">
             <td>{{$index + 1}}</td>
+            <td>{{item.ACCEPT_NO}}</td>
             <td>{{item.ID_NO}}</td>
             <td ng-if="item.NAME=='查无此人'" style="color: red;">{{item.NAME}}</td>
             <td ng-if="item.NAME!='查无此人'">{{item.NAME}}</td>
             <td ng-if="item.SEX_NO==1">男</td>
             <td ng-if="item.SEX_NO==2">女</td>
             <td ng-if="item.SEX_NO==-1">错误</td>
+            <td>{{item.BEGIN_DATE}}</td>
             <td ng-if="item.SPECIAL_TYPE==2" class="text-danger">快证</td>
             <td ng-if="item.SPECIAL_TYPE==1" class="text-danger">余证</td>
             <td ng-if="item.FAILED_CARD_REASON!=null" class="text-danger">废证</td>

src/main/resources/static/js/service.js

@@ -561,14 +561,11 @@ angular.module('AvatarCheck.http', ['ngDialog', 'LocalStorageModule'])
                     success(response.data)
                 })
             },
-            getTaskListToCreate:function(groupNo1,groupNo2,date,success){
-                console.log($rootScope.loginData.roleList[0].process,groupNo1,groupNo2,date);
+            getTaskListToCreate:function(date,success){
                 $http({
                     method: 'GET',
                     url: "../TaskList/queryByCountyAtACCU"+urlTimeStamp(),
                     params:{
-                        groupNo1:groupNo1,
-                        groupNo2:groupNo2,
                         process:$rootScope.loginData.roleList[0].process,
                         date:date
                     }
@@ -577,7 +574,6 @@ angular.module('AvatarCheck.http', ['ngDialog', 'LocalStorageModule'])
                 })
             },
             getCreateHistoryTask:function(date,success){
-                console.log(date)
                 $http({
                     method: 'GET',
                     url: "../TaskList/queryHistoryTaskAtAuxiliary"+urlTimeStamp(),

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

@@ -64,7 +64,7 @@
                             身份证号:
                         </td>
                         <td>
-                            <input type="text" placeholder="请填写身份证号" class="{{$index}}" style="height: 34px;">
+                            <input type="text" placeholder="请填写身份证号" class="{{$index}}" style="height: 34px;width: 100%;">
                         </td>
                         <td>
                             废证原因:

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

@@ -29,7 +29,7 @@ angular.module('AvatarCheck.createTaskList', ['ngRoute', 'AvatarCheck.http', 'tm
         $scope.totalCardProd = 0;
         $scope.isHistory=0;
         //用于区分制证库保存或者受理库保存数据
-        $scope.type="ACCU";
+
         //查询制证库
         $scope.searchCurrentFromProd = function () {
             if(angular.isUndefined($scope.groupNo1)||angular.isUndefined($scope.groupNo2)){
@@ -50,7 +50,9 @@ angular.module('AvatarCheck.createTaskList', ['ngRoute', 'AvatarCheck.http', 'tm
                 $scope.type="PRODU";
             }
         };
+        //查询受理库
         $scope.searchCurrent = function(){
+            $scope.type="ACCU";
             $scope.totalCardProd = 0;
             $scope.selected = [];
             $scope.isHistory=0;
@@ -58,7 +60,7 @@ angular.module('AvatarCheck.createTaskList', ['ngRoute', 'AvatarCheck.http', 'tm
             if(date=='{{choseDate}}'){
                 date=$scope.choseDate;
             }
-            HttpService.getTaskListToCreate($scope.groupNo1,$scope.groupNo2,date,function(data){
+            HttpService.getTaskListToCreate(date,function(data){
                 $scope.cycleSheetData = data;
                 for(var i=0;i<$scope.cycleSheetData.length;i++){
                     $scope.totalCardProd = $scope.totalCardProd+$scope.cycleSheetData[i].typeSum;
@@ -71,7 +73,7 @@ angular.module('AvatarCheck.createTaskList', ['ngRoute', 'AvatarCheck.http', 'tm
 
                 console.log("当天：",$scope.cycleSheetData)
             })
-            $scope.type="PRODU";
+
         };
         if($rootScope.loginData.login==true){
             $scope.searchCurrent();

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

@@ -56,8 +56,9 @@
                             </thead>
                             <tbody ng-repeat="task in type.countyList">
                             <tr>
-                                <td ng-show="type.typeCode=='100'||(task.faileCount==0&&(task.countyValidCount-task.specialCount)==task.eWriteCount&&task.eWriteCount==task.recheckCount)">
-                                    <input type="checkbox" class="checkOneBox"
+                                <td >
+                                    <input ng-if="type.typeCode=='100'||(task.faileCount==0&&(task.countyValidCount-task.specialCount)==task.eWriteCount&&task.eWriteCount==task.recheckCount)"
+                                           type="checkbox" class="checkOneBox"
                                            ng-checked="isSelected(task)" value="{{task.taskId}}"
                                            ng-click="updateSelection($event,task)">
                                 </td>