Merge branch 'dev' of…

Merge branch 'dev' of http://121.22.111.250:8000/zhangyusheng/YX_IDENT_beijing_auxiliary_YD into dev

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

@@ -349,6 +349,7 @@ public class TaskListApi {
         try {
             jsonObject = JSONObject.fromObject(str);
             String name = jsonObject.getString("name");
+            String type = jsonObject.getString("type");
             JSONArray jsonGroup = jsonObject.getJSONArray("groupList");
             //生成某几个组的区县任务单
             if (jsonGroup.size() > 0) {
@@ -363,9 +364,15 @@ public class TaskListApi {
                             groupNo += "'" + groupList.get(i) + "'";
                         }
                     }
-                    List<Map<String, Object>> objects = taskListService.selectGroupAtACCU(groupNo);
+                    List<Map<String, Object>> objects ;
+                    if (type.equals("PRODU")){
+                        objects = taskListService.selectGroupAtPRODU(groupNo);
+                    }else {
+                        objects= taskListService.selectGroupAtACCU(groupNo);
+                    }
                     boolean b = taskListService.saveTask(objects, name, 0 + "", groupNo);
 
+
                 }
             }
             map.put("msg", "成功生成任务单");

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

@@ -58,6 +58,29 @@ public interface GroupNoMapper {
             "ACC_GROUP_T.deal_flag =3 and" +
             " ACC_GROUP_T.group_no in  (${groupNo} ) ")
     public List<Map<String,Object>> selectGroupAtACCUByGroupNo(@Param("groupNo") String groupNo);
+    /**
+     * 查询组号列表
+     * 制证库
+     * @param groupNo 组号信息
+     * @return
+     */
+    //todo
+    @Select("select DISTINCT decode(substr(ORIGINAL_NO,3,2),'99',6,substr(ORIGINAL_NO,21,1)) card_type_id, \n" +
+            "PROD_GROUP_T.group_no ,\n" +
+            "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" +
+            "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" +
+            "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" +
+            "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}) ")
+    public List<Map<String,Object>> selectGroupAtPRODUByGroupNo(@Param("groupNo") String groupNo);
 
     /**
      * 查询证件的受理号

src/main/java/com/yxproject/start/service/TaskListService.java

@@ -41,6 +41,8 @@ public interface TaskListService {
 
     public List<Map<String,Object>> selectGroupAtACCU(String date,String typeCode,String countyCode);
 
+    public List<Map<String,Object>> selectGroupAtPRODU(String groupNo);
+
     public List<Map<String,Object>> selectGroupAtACCU(String groupNo);
 
     public boolean saveTask(TaskEntity taskEntity);

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

@@ -698,7 +698,17 @@ public class TaskListServiceImpl implements TaskListService {
     public List<Map<String, Object>> selectGroupAtACCU(String groupNo) {
         return groupNoMapper.selectGroupAtACCUByGroupNo(groupNo);
     }
-
+    /**
+     * 查询组号信息
+     * 制证库
+     *
+     * @param groupNo 受理组号
+     * @return
+     */
+    @Override
+    public List<Map<String, Object>> selectGroupAtPRODU(String groupNo) {
+        return groupNoMapper.selectGroupAtPRODUByGroupNo(groupNo);
+    }
     /**
      * 保存任务单详情
      *

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

@@ -28,6 +28,9 @@ 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)){
                 MessageService.showAlert("组号不能为空")
@@ -44,6 +47,7 @@ angular.module('AvatarCheck.createTaskList', ['ngRoute', 'AvatarCheck.http', 'tm
                     }
                     console.log("制证库查询：",$scope.cycleSheetData)
                 })
+                $scope.type="PRODU";
             }
         };
         $scope.searchCurrent = function(){
@@ -67,6 +71,7 @@ angular.module('AvatarCheck.createTaskList', ['ngRoute', 'AvatarCheck.http', 'tm
 
                 console.log("当天：",$scope.cycleSheetData)
             })
+            $scope.type="PRODU";
         };
         if($rootScope.loginData.login==true){
             $scope.searchCurrent();
@@ -246,6 +251,7 @@ angular.module('AvatarCheck.createTaskList', ['ngRoute', 'AvatarCheck.http', 'tm
                     }
                     var map = {
                         name:$rootScope.loginData.name,
+                        type:$scope.type,
                         groupList:groupList
                     }
                     console.log(map)

src/main/resources/static/views/historyCards/historyBack.html

@@ -6,8 +6,9 @@
 </style>
 <div class="content row">
     <div class="col-md-12" style="margin-top:20px;">
+        <div class="box ">
+        <strong class="box-header ">补证添加</strong>
             <div class="box box-primary">
-        <strong class="box-header with-border">补证添加</strong>
             <table class="table table-bordered" style="margin-bottom:10px;">
                 <tr>
                     <td width="200px">
@@ -71,6 +72,7 @@
                 </div>
             </div>
             </div>
+        </div>
         <div class="box">
             <div class="box-header">
                 <strong>补证提交详情</strong>

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

@@ -56,9 +56,7 @@
                             </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)">-->
-                                <td>
+                                <td ng-show="type.typeCode=='100'||(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)">

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

@@ -132,7 +132,7 @@
         <div class="box-header with-border"><strong>邮寄单详情</strong>
                 (<span style="color:#0b93d5;">每页显示{{paginationConf.itemsPerPage}}条/共
                     {{paginationConf.totalItems}}条</span>)</div>
-                <div class="box-info" style="padding: 7px;">
+                <div class="box-info" style="padding: 7px;padding-top: 0px;">
                     <table class="table table-bordered table-hover" ng-if="postData.length>0">
                         <thead>
                         <tr>