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

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

@@ -161,7 +161,7 @@ public class TaskListApi {
     /**
      * 查询任务单详情
      * (辅助库)
-     *（下发、膜打印）
+     *（下发、数据核验、膜打印）
      * @param process 工序
      * @param resp
      * @return

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

@@ -138,7 +138,7 @@ public interface TaskListMapper {
             "from group_no left join task on group_no.task_id= task.TASK_ID\n" +
             "left join CARD_TYPE_DIC on CARD_TYPE_DIC.CARD_TYPE_ID = task.CARD_TYPE\n" +
             "left join COUNTY_DIC  on COUNTY_DIC.COUNTY_CODE = task.COUNTY_CODE\n" +
-            "left join (select task_id, nvl(count(*),0) faileCount from FAILED_CARD where FAILED_CARD.state <#{process2} and FAILED_CARD.state != FAILED_CARD.INITIATOR   group by task_id ) fc on fc.TASK_ID = task.TASK_ID\n" +
+            "left join (select task_id, nvl(count(*),0) faileCount from FAILED_CARD where FAILED_CARD.state =#{process2} and FAILED_CARD.state != FAILED_CARD.INITIATOR   group by task_id ) fc on fc.TASK_ID = task.TASK_ID\n" +
             "where task.TASK_STATE_ID = #{process} order by group_no.GROUP_NO")
     public List<Map<String,Object>> selectByCountyAtAuxiliary_common(@Param("process") long process,@Param("process2") long process2);
 
@@ -325,7 +325,7 @@ public interface TaskListMapper {
             "from group_no left join task on group_no.task_id= task.TASK_ID\n" +
             "left join CARD_TYPE_DIC on CARD_TYPE_DIC.CARD_TYPE_ID = task.CARD_TYPE\n" +
             "left join COUNTY_DIC  on COUNTY_DIC.COUNTY_CODE = task.COUNTY_CODE\n" +
-            "left join (select task_id, nvl(count(*),0) faileCount from FAILED_CARD  where FAILED_CARD.state < #{process2} and FAILED_CARD.state != FAILED_CARD.INITIATOR  \n" +
+            "left join (select task_id, nvl(count(*),0) faileCount from FAILED_CARD  where FAILED_CARD.state =#{process2} and FAILED_CARD.state != FAILED_CARD.INITIATOR  \n" +
             "group by task_id ) fc \n" +
             "on fc.TASK_ID = task.TASK_ID\n" +
             "left join prod_trace_t@PROD_LINK on SUBSTR(prod_trace_t.ACCEPT_NO,0,8) = group_no.GROUP_NO\n" +
@@ -349,7 +349,7 @@ public interface TaskListMapper {
             "from SPECIAL_CARD left join task on SPECIAL_CARD.task_id= task.TASK_ID\n" +
             "left join CARD_TYPE_DIC on CARD_TYPE_DIC.CARD_TYPE_ID = task.CARD_TYPE\n" +
             "left join COUNTY_DIC  on COUNTY_DIC.COUNTY_CODE = task.COUNTY_CODE\n" +
-            "left join (select task_id,nvl(count(*),0) faileCount from FAILED_CARD where FAILED_CARD.state <#{process2} and FAILED_CARD.state != FAILED_CARD.INITIATOR   group by task_id ) fc on fc.TASK_ID = task.TASK_ID\n" +
+            "left join (select task_id,nvl(count(*),0) faileCount from FAILED_CARD where FAILED_CARD.state =#{process2} and FAILED_CARD.state != FAILED_CARD.INITIATOR   group by task_id ) fc on fc.TASK_ID = task.TASK_ID\n" +
             "where SPECIAL_CARD.SPECIAL_TYPE =2 and task.TASK_STATE_ID = #{process} order by SPECIAL_CARD.ACCEPT_NO")
     public List<Map<String,Object>> selectByCountyAtAuxiliary_fast(@Param("process") long process,@Param("process2") long process2);
 
@@ -510,7 +510,7 @@ public interface TaskListMapper {
             "from SPECIAL_CARD left join task on SPECIAL_CARD.task_id= task.TASK_ID\n" +
             "left join CARD_TYPE_DIC on CARD_TYPE_DIC.CARD_TYPE_ID = task.CARD_TYPE\n" +
             "left join COUNTY_DIC  on COUNTY_DIC.COUNTY_CODE = task.COUNTY_CODE\n" +
-            "left join (select task_id,nvl(count(*),0) faileCount from FAILED_CARD where FAILED_CARD.state <#{process2} and FAILED_CARD.state != FAILED_CARD.INITIATOR   group by task_id ) fc on fc.TASK_ID = task.TASK_ID\n" +
+            "left join (select task_id,nvl(count(*),0) faileCount from FAILED_CARD where FAILED_CARD.state =#{process2} and FAILED_CARD.state != FAILED_CARD.INITIATOR   group by task_id ) fc on fc.TASK_ID = task.TASK_ID\n" +
             "where SPECIAL_CARD.SPECIAL_TYPE =1 and task.TASK_STATE_ID = #{process} order by SPECIAL_CARD.ACCEPT_NO")
     public List<Map<String,Object>> selectByCountyAtAuxiliary_remaind(@Param("process") long process,@Param("process2") long process2);
 
@@ -525,7 +525,7 @@ public interface TaskListMapper {
             "0 faileCount from FAILED_CARD left join task on FAILED_CARD.task_id= task.TASK_ID\n" +
             "left join CARD_TYPE_DIC on CARD_TYPE_DIC.CARD_TYPE_ID = task.CARD_TYPE\n" +
             "left join COUNTY_DIC  on COUNTY_DIC.COUNTY_CODE = task.COUNTY_CODE\n" +
-            "where FAILED_CARD.state <#{process2} and FAILED_CARD.state != FAILED_CARD.INITIATOR    order by FAILED_CARD.ACCEPT_NO")
+            "where FAILED_CARD.state =#{process2} and FAILED_CARD.state != FAILED_CARD.INITIATOR    order by FAILED_CARD.ACCEPT_NO")
     public List<Map<String,Object>> selectByCountyAtAuxiliary_failed(@Param("process2") long process2);
 
     /**

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

@@ -135,7 +135,7 @@ public class TaskListServiceImpl implements TaskListService {
         for (Map o : maps) {
             // 组合JSON
             if (typeMap != null && typeMap.containsKey(o.get("CARD_TYPE") + "")) {
-                List<Map<String, Object>> mapList = (List<Map<String, Object>>) typeMap.get(o.get("CARD_TYPE"));
+                List<Map<String, Object>> mapList = (List<Map<String, Object>>) typeMap.get(o.get("CARD_TYPE")+"");
                 mapList.add(o);
                 typeMap.put(o.get("CARD_TYPE") + "", mapList);
             } else {
@@ -174,11 +174,17 @@ public class TaskListServiceImpl implements TaskListService {
                 int invalidCount = 0;
                 String countyName = null;
                 Object submitDate = null;
+                long dealFlag = 3;
                 List<Map<String, Object>> countyMapList = mapList.get(county);
                 for (Map<String, Object> countyMap : countyMapList) {
                     submitDate = countyMap.get("SUBMIT_DATE");
                     countyName = countyMap.get("COUNTYNAME") + "";
                     typeName = countyMap.get("CARD_TYPE_ID") + "";
+                    if (Long.valueOf(countyMap.get("DEAL_FLAG") + "")<dealFlag){
+                        dealFlag = Long.valueOf(countyMap.get("DEAL_FLAG") + "");
+                    }else {
+
+                    }
                     typeSum += Integer.valueOf(countyMap.get("VALID_COUNT") + "");
                     validCount += Integer.valueOf(countyMap.get("VALID_COUNT") + "");
                     invalidCount += Integer.valueOf(countyMap.get("INVALID_COUNT") + "");
@@ -206,6 +212,7 @@ public class TaskListServiceImpl implements TaskListService {
                     countyMapGroup.put("groupNum", createGroupNo(c, nsList));
                 }
                 countyMapGroup.put("countyCode", county);
+                countyMapGroup.put("dealFlag", dealFlag);
                 countyMapGroup.put("groupList", countyMapList);
                 countyMapGroup.put("saveDate", submitDate);
                 countyMapGroup.put("countyName", countyName);
@@ -246,7 +253,7 @@ public class TaskListServiceImpl implements TaskListService {
     /**
      * 查询任务单详情
      * 辅助库
-     * (下发、数据核验)
+     * (下发、膜打印)
      *
      * @param process 查询工序
      * @return

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

@@ -43,7 +43,7 @@
                                <div class="input-group-addon">
                                  <i class="fa fa-calendar"></i>
                                </div>
-                               <input type="text" class="form-control pull-right" ng-value="choseDate" id="datepicker"  readonly/>
+                               <input type="text" class="form-control pull-right"  id="datepicker" readonly/>
                                <span class="input-group-addon"><span class="glyphicon glyphicon-remove"></span></span>
                          </div>
                     </td>
@@ -75,8 +75,8 @@
                         <td>{{item.FILE_NAME}}</td>
                         <td>{{item.ANALYSIS_DATE | myDateFilter}}</td>
                         <td>{{item.RECORD_NUMBER}}</td>
-                        <td>{{item.PUCOUNT}}</td>
-                        <td>{{item.YOUCOUNT}}</td>
+                        <td>{{item.COMMON_CARD_COUNT}}</td>
+                        <td>{{item.POST_CARD_COUNT}}</td>
                     </tr>
 
                     </tbody>

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

@@ -24,7 +24,7 @@ angular.module('AvatarCheck.analysisLog', ['ngRoute', 'AvatarCheck.http', 'tm.pa
             $($($(this).parent()).prev()).val("");
         })
 
-
+        // $scope.choseDate = $filter("date")(new Date(), "yyyy-MM-dd");
 
         $scope.paginationConf = {
             currentPage: 1,
@@ -34,6 +34,7 @@ angular.module('AvatarCheck.analysisLog', ['ngRoute', 'AvatarCheck.http', 'tm.pa
 
 
         $scope.getAnalyseLog = function(){
+            console.log($('#datepicker').val());
             HttpService.selectAnalyseLogCount($scope.oldPackageName,$("#datepicker").val(),function (data) {
                 $scope.paginationConf.totalItems = data;
                 console.log($scope.paginationConf.totalItems)

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

@@ -48,7 +48,7 @@
                    <td><input type="text" class="form-control" ng-model="sljg" placeholder="受理机关"></td>
                    <td>制证类型:</td>
                    <td style="text-align: left;">
-                      <select class="form-control select2" id="county" ng-model="typeCode">
+                      <select class="form-control select2" id="cardType">
                               <option value="">--请选择制证类型--</option>
                               <option value="{{type.cardTypeId}}" ng-repeat="type in typeList">{{type.cardType}}</option>
                       </select>

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

@@ -85,6 +85,7 @@ angular.module('AvatarCheck.cardProdPackage', ['ngRoute', 'AvatarCheck.http', 't
         var getCountAndDownloadUrl = function (url) {
             var date = $("#datepicker").val();
             var packageType = $("#packageType").val();
+            var cardType=$("#cardType").val();
             if(angular.isUndefined($scope.uploadNo)){
                 url = url + 'uploadNo=&';
             }else{
@@ -110,10 +111,10 @@ angular.module('AvatarCheck.cardProdPackage', ['ngRoute', 'AvatarCheck.http', 't
             }else{
                 url = url + 'SSXQDM=' + $scope.sljg + '&';
             }
-            if(angular.isUndefined($scope.typeCode)){
+            if(cardType==''){
                 url = url + 'cardType=&';
             }else{
-                url = url + 'cardType=' + $scope.typeCode + '&';
+                url = url + 'cardType=' + cardType + '&';
             }
             if(angular.isUndefined(packageType)){
                 url = url + 'state=&';
@@ -121,8 +122,7 @@ angular.module('AvatarCheck.cardProdPackage', ['ngRoute', 'AvatarCheck.http', 't
                 url = url + 'state=' + packageType + '&';
             }
             if (date==''){
-                date=$filter("date")(new Date(), "yyyy-MM-dd");
-                url = url + 'uploadDate=' + date + '&';
+                url = url + 'uploadDate=&';
             }else{
                 url = url + 'uploadDate=' + date + '&';
             }
@@ -133,6 +133,7 @@ angular.module('AvatarCheck.cardProdPackage', ['ngRoute', 'AvatarCheck.http', 't
             var a = document.createElement("a");
             document.body.appendChild(a);
             a.href = encodeURI(getCountAndDownloadUrl(url));
+            console.log(encodeURI(getCountAndDownloadUrl(url)))
             a.click();
         }
 

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

@@ -31,6 +31,7 @@ angular.module('AvatarCheck.createTaskList', ['ngRoute', 'AvatarCheck.http', 'tm
 
         $scope.isHistory=0;
         $scope.searchCurrent = function(){
+            $rootScope.cardsTotal = 0;
             $scope.isHistory=0;
             HttpService.getTaskListToCreate($('#datepicker').val(),function(data){
                 $scope.cycleSheetData = data;
@@ -232,6 +233,7 @@ angular.module('AvatarCheck.createTaskList', ['ngRoute', 'AvatarCheck.http', 'tm
                     $scope.searchCurrent();
                     $scope.selected=[];
                     $rootScope.selectedGroup=[];
+                    $rootScope.cardsTotal = 0;
                 })
             }else{
                 MessageService.showAlert("请选择创建任务单的组")

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

@@ -27,7 +27,7 @@
                               </ul>
                           </a>
                       </li>
-                      <li class="pull-right" style="padding-right: 20px;"><h5>已选择数量：{{cardsTotal}}</h5></li>
+                      <li class="pull-right" style="padding-right: 20px;"><h4>已选择数量：{{cardsTotal}}</h4></li>
                     </ul>
                 </div>
           <div ng-repeat="type in cycleSheetData track by $index" class="table-responsive mailbox-messages" ng-show="currentTab==$index">

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

@@ -24,8 +24,10 @@ angular.module('AvatarCheck.dispatchTask', ['ngRoute', 'AvatarCheck.http', 'tm.p
 
         $scope.choseDate = $filter("date")(new Date(), "yyyy-MM-dd");
 
+
         $scope.isHistory=0;
         $scope.searchTaskList = function(){
+            $rootScope.cardsTotal = 0;
             $scope.isHistory=0;
             HttpService.getTaskListByProcess(function(data){
                 $scope.cycleSheetData = data;
@@ -178,6 +180,7 @@ angular.module('AvatarCheck.dispatchTask', ['ngRoute', 'AvatarCheck.http', 'tm.p
                 HttpService.updateTaskListProcess(json,function(data){
                     $scope.searchTaskList();
                     MessageService.showAlert("下发完成")
+                    $rootScope.cardsTotal = 0;
                 })
             }else{
                 MessageService.showAlert("请选择下发的任务单")

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

@@ -30,8 +30,25 @@ angular.module('AvatarCheck.xmlAndSearch', ['ngRoute', 'AvatarCheck.http', 'tm.p
         
         $scope.choseDate = $filter("date")(new Date(), "yyyy-MM-dd");
 
+        $scope.paginationConf = {
+            currentPage: 1,
+            itemsPerPage: 10,
+            perPageOptions: [10, 20, 30, 40, 50]
+        };
+        $scope.getXmlPackage = function(){
+            if($scope.paginationConf.currentPage==0){
+                $scope.paginationConf.currentPage=1;
+            }
+            HttpService.selectXmlPackage($("#datepicker").val(),$scope.paginationConf.currentPage,$scope.paginationConf.itemsPerPage,function(data){
+                $scope.paginationConf.totalItems=data.respData.count;
+                $scope.xmlPackageData = data.respData.mapList;
+                console.log($scope.xmlPackageData,"$scope.xmlPackageData")
+            })
+        }
+        // 通过$watch currentPage和itemperPage 当他们一变化的时候，重新获取数据条目
+        $scope.$watch('paginationConf.currentPage +paginationConf.itemsPerPage', $scope.getXmlPackage);
 
-
+        var getData =  $scope.getXmlPackage;
         $scope.analysis = function (uploadDate,packageCount) {
             ngDialog.open({
                 template: 'dialogs/analysisDialog.html' + urlTimeStamp(),
@@ -48,7 +65,9 @@ angular.module('AvatarCheck.xmlAndSearch', ['ngRoute', 'AvatarCheck.http', 'tm.p
                         console.log(uploadDate)
                         HttpService.analyseToUpdateIfPostCard(fileid,uploadDate,function(data){
                             if(data){
+                                $scope.closeThisDialog();
                                 MessageService.showAlert("解析完成")
+                                getData();
                             }
                         })
                     }
@@ -66,7 +85,6 @@ angular.module('AvatarCheck.xmlAndSearch', ['ngRoute', 'AvatarCheck.http', 'tm.p
                 for(var i in files){
                     fd.append('file', files[i]);
                 }
-                var getData =  $scope.getXmlPackage;
                 ngDialog.openConfirm({
                     template: 'dialogs/alert.html' + urlTimeStamp(),
                     width: 600,
@@ -89,23 +107,7 @@ angular.module('AvatarCheck.xmlAndSearch', ['ngRoute', 'AvatarCheck.http', 'tm.p
         }
 
 
-        $scope.paginationConf = {
-            currentPage: 1,
-            itemsPerPage: 10,
-            perPageOptions: [10, 20, 30, 40, 50]
-        };
-        $scope.getXmlPackage = function(){
-            if($scope.paginationConf.currentPage==0){
-                $scope.paginationConf.currentPage=1;
-            }
-            HttpService.selectXmlPackage($("#datepicker").val(),$scope.paginationConf.currentPage,$scope.paginationConf.itemsPerPage,function(data){
-                $scope.paginationConf.totalItems=data.respData.count;
-                $scope.xmlPackageData = data.respData.mapList;
-                console.log($scope.xmlPackageData,"$scope.xmlPackageData")
-            })
-        }
-        // 通过$watch currentPage和itemperPage 当他们一变化的时候，重新获取数据条目
-        $scope.$watch('paginationConf.currentPage +paginationConf.itemsPerPage', $scope.getXmlPackage);
+
 
 
         var reGet = $scope.getXmlPackage;