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

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

@@ -65,7 +65,8 @@ public class FailedCardApi {
         for (Object o:jsonarray){
             JSONObject jsonObject =(JSONObject)o;
                Map<String,Object> idMap= failedCardService.selectCountIdByCardId(jsonObject.getString("cardId"));
-               failedCardService.insertFailedCard(jsonObject.getString("failedCardReasonId"),idMap.get("ACCEPT_NO").toString(),idMap.get("TASK_ID").toString(),jsonObject.getString("initiator"),jsonObject.getString("note"));
+              int initiator = Integer.parseInt(jsonObject.getString("initiator"))-2;
+               failedCardService.insertFailedCard(jsonObject.getString("failedCardReasonId"),idMap.get("ACCEPT_NO").toString(),idMap.get("TASK_ID").toString(), String.valueOf(initiator),jsonObject.getString("note"));
                    }
         return true;
     }

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

@@ -88,12 +88,12 @@ public class LogApi {
 
     /**
      * 根据导入时间查询解析数据
-     * @param filesId
+     * @param uploadDate
      * @return resultList
      */
      @RequestMapping("selectAnalysisData")
-     public List<Map<String,Object>> selectAnalysisData(@RequestParam("filesId")String filesId){
-         List<Map<String,Object>> resultList = logService.selectAnalysisData(filesId);
+     public List<Map<String,Object>> selectAnalysisData(@RequestParam("uploadDate")String uploadDate){
+         List<Map<String,Object>> resultList = logService.selectAnalysisData(uploadDate);
          return resultList;
      }
 

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

@@ -135,9 +135,45 @@ public class ReadXmlApi {
     @RequestMapping("queryPersonXML")
     public String queryPersonXMLCount(@RequestParam("importDate") String importDate,@RequestParam("currPage") String currPage,@RequestParam("pageSize") String pageSize,  HttpServletResponse resp) {
         List<CountDataEntity> countDataEntities = importXmlService.queryPersonXml(replaceDate(importDate),Long.valueOf(currPage)*Long.valueOf(pageSize) ,(Long.valueOf(currPage)-1)*Long.valueOf(pageSize)+1);
+
+        Map<String,Object> map = new LinkedHashMap<>();
+        for (int i=0;i<countDataEntities.size();i++){
+            if(map!=null && map.containsKey(countDataEntities.get(i).getUploadDate()+"")){
+                List list=(List) map.get(countDataEntities.get(i).getUploadDate()+"");
+                list.add(countDataEntities.get(i));
+                map.put(countDataEntities.get(i).getUploadDate()+"",list);
+            }else {
+                List list = new ArrayList();
+                list.add(countDataEntities.get(i));
+                map.put(countDataEntities.get(i).getUploadDate()+"",list);
+            }
+        }
+        List<Map<String,Object>> mapList = new ArrayList<>();
+        for (String date: map.keySet()){
+            Map<String,Object> dateMap =  new LinkedHashMap<>();
+            List<CountDataEntity> list=(List) map.get(date);
+            int dateCount = 0;
+            int commonCount = 0;
+            int postCount = 0;
+            for (CountDataEntity countDataEntity :list){
+                dateCount+=countDataEntity.getCardCount();
+                commonCount+=countDataEntity.getCommonCardCount();
+                postCount+= countDataEntity.getPostCardCount();
+            }
+            dateMap.put("dateCount",dateCount);
+            dateMap.put("commonCount",commonCount);
+            dateMap.put("postCount",postCount);
+            dateMap.put("packageCount",list.size());
+            dateMap.put("date",date);
+            mapList.add(dateMap);
+        }
+        Map<String,Object> resultMap = new HashMap<>();
+        resultMap.put("mapList",mapList);
+        resultMap.put("count",mapList.size());
+
         YXJSONResponse yxjsonResponse = new YXJSONResponse();
         resp.setCharacterEncoding("UTF-8");
-        yxjsonResponse.outPutSuccess(countDataEntities);
+        yxjsonResponse.outPutSuccess(resultMap);
         return yxjsonResponse.toJSONString();
     }
 
@@ -155,7 +191,6 @@ public class ReadXmlApi {
         yxjsonResponse.outPutSuccess(i+"");
         return yxjsonResponse.toJSONString();
     }
-
     private String replaceDate(String str){
         return str.replace("-","");
     }

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

@@ -15,18 +15,11 @@ public interface FilesMapper {
     public long insertFiles(FilesEntity filesEntity);
 
 
-    //TODO 1111111111111
     @Select("<script> " +
-            "select * from (select upload_date upload_Date,count(FILE_ID) package_Count,sum(sumCount) cardCount,FILE_ID,sum(ordinaryCount) commonCardCount,sum(postCount) postCardCount ,rownum rn " +
-                    "from (SELECT FILES.upload_date,FILE_ID,count(prepro_person.JMSFZSLH) as sumCount, " +
-                    "sum(decode(PREPRO_PERSON.CARD_TYPE_ID,0,1,0)) as ordinaryCount ,sum(decode(PREPRO_PERSON.CARD_TYPE_ID,9,1,0)) as postCount " +
-                    " FROM PREPRO_PERSON " +
-                    "left join FILES on PREPRO_PERSON.FILE_ID = FILES.ID " +
-                    "where " +"1=1" +
-                    "<if test=\"importDate !=null\">"+
-                    " and  to_char(FILES.UPLOAD_DATE,'yyyyMMdd')= #{importDate}" +
-                    "</if> "+
-                    "group by FILES.upload_date,FILE_ID)  group by upload_date,rownum, FILE_ID" +
+            "select * from (select upload_date upload_Date,count(FILE_ID) package_Count,sum(sumCount) cardCount,FILE_ID,sum(ordinaryCount) commonCardCount,sum(postCount) postCardCount ,rownum rn from (SELECT FILES.upload_date,FILE_ID,count(prepro_person.JMSFZSLH) as sumCount, sum(decode(PREPRO_PERSON.CARD_TYPE_ID,0,1,0)) as ordinaryCount ,sum(decode(PREPRO_PERSON.CARD_TYPE_ID,9,1,0)) as postCount \n" +
+            "FROM PREPRO_PERSON left join FILES on PREPRO_PERSON.FILE_ID = FILES.ID \n" +
+            "where 1=1  and  to_char(FILES.UPLOAD_DATE,'yyyyMMdd')= #{importDate} \n" +
+            "group by FILES.upload_date,FILE_ID)  group by upload_date, rownum, FILE_ID" +
                     ") where rn BETWEEN  #{minNum} and #{maxNum} </script>")
     public List<CountDataEntity> selectFiles(@Param("importDate") String importDate,@Param("maxNum")long maxNum,@Param("minNum")long minNum);
 

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

@@ -18,9 +18,9 @@ public interface LogMapper {
             "left join FILES on  PREPRO_PERSON.FILE_ID =FILES.ID\n" +
             "LEFT JOIN PERSON_POST ON PERSON_POST.FIRST_WHITE = PREPRO_PERSON.JMSFZSLH\n" +
             "LEFT JOIN FILE_NAME_DIC ON FILE_NAME_DIC.FILE_ID=PERSON_POST.FILE_ID\n" +
-            "where FILES.ID =#{filesId}" +
+            "where FILES.ID =#{uploadDate}" +
             "")
-    public List<Map<String,Object>> selectAnalysisData(@Param("filesId") String filesId);
+    public List<Map<String,Object>> selectAnalysisData(@Param("uploadDate") String uploadDate);
 
 
     @Update("UPDATE PREPRO_PERSON SET CARD_TYPE_ID =9 \n" +

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

@@ -3,9 +3,6 @@ package com.yxproject.start.service;
 
 import com.yxproject.start.entity.CountyDicEntity;
 import org.apache.ibatis.annotations.Param;
-
-import javax.xml.crypto.Data;
-import java.util.Date;
 import java.util.List;
 import java.util.Map;
 

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

@@ -11,7 +11,7 @@
         <div class="box-primary">
             <form ng-submit="createInputs()" style="padding-left: 15px;">
                 <span style="font-size:20px;">废证数量:</span>
-                <input style="margin-top:20px;height: 30px;" type="text" ng-model="failedCount">
+                <input style="margin-top:20px;height: 30px;" type="number" ng-model="failedCount">
                 <input type="submit" class="btn btn-primary" value="确定">
                 <span style="font-size:14px;color: red;" ng-if="errMsglb">{{errMsglb}}</span>
             </form>

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

@@ -12,8 +12,12 @@ angular.module('AvatarCheck.addFailed', ['ngRoute', 'AvatarCheck.http'])
     .controller('addFailedCtrl', function ($scope, $rootScope, $timeout, HttpService, ngDialog, MessageService, $filter) {
 
         $scope.createInputs = function(){
+            var count = $scope.failedCount;
+            if(count>10){
+                count=10;
+            }
             $scope.arr = [];
-            for (var i=0;i<$scope.failedCount;i++){
+            for (var i=0;i<count;i++){
                 $scope.arr.push(i);
             }
         }

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

@@ -14,7 +14,7 @@
         <div class="box-primary">
             <form ng-submit="createInputs()" style="padding-left: 15px;">
                 <span style="font-size:20px;">余证数量:</span>
-                <input style="margin-top:20px;height: 30px;" type="text" ng-model="restCount">
+                <input style="margin-top:20px;height: 30px;" type="number" ng-model="restCount">
                 <input type="submit" class="btn btn-primary" value="确定">
                 <span style="font-size:14px;color: red;" ng-if="errMsglb">{{errMsglb}}</span>
             </form>

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

@@ -12,8 +12,12 @@ angular.module('AvatarCheck.addRest', ['ngRoute', 'AvatarCheck.http'])
     .controller('addRestCtrl', function ($scope, $rootScope, $timeout, HttpService, ngDialog, MessageService, $filter) {
 
         $scope.createInputs = function(){
+            var count = $scope.restCount;
+            if(count>10){
+                count=10;
+            }
             $scope.arr = [];
-            for (var i=0;i<$scope.restCount;i++){
+            for (var i=0;i<count;i++){
                 $scope.arr.push(i);
             }
         }

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

@@ -11,7 +11,7 @@
         <div class="box-primary">
             <form ng-submit="createInputs()" style="padding-left: 15px;">
                 <span style="font-size:20px;">证件数量:</span>
-                <input style="margin-top:20px;height: 30px;" type="text" ng-model="tagCount">
+                <input style="margin-top:20px;height: 30px;" type="number" ng-model="tagCount">
                 <input type="submit" class="btn btn-primary" value="确定">
                 <span style="font-size:14px;color: red;" ng-if="errMsglb">{{errMsglb}}</span>
             </form>

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

@@ -12,8 +12,12 @@ angular.module('AvatarCheck.addTag', ['ngRoute', 'AvatarCheck.http'])
     .controller('addTagCtrl', function ($scope, $rootScope, $timeout, HttpService, ngDialog, MessageService, $filter) {
 
         $scope.createInputs = function(){
+            var count = $scope.tagCount;
+            if(count>10){
+                count=10;
+            }
             $scope.arr = [];
-            for (var i=0;i<$scope.tagCount;i++){
+            for (var i=0;i<count;i++){
                 $scope.arr.push(i);
             }
         }

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

@@ -43,7 +43,7 @@
                                       <td></td>
                                   </tr>
                                   <tr ng-repeat="police in item.policeList">
-                                      <td><input type="checkbox" class="checkPolice{{item.countyCode}}"></td>
+                                      <td></td>
                                       <td>{{$index+1}}</td>
                                       <td>{{police.policeCode}}</td>
                                       <td>{{police.policeName}}</td>

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

@@ -55,16 +55,16 @@ angular.module('AvatarCheck.receitp', ['ngRoute', 'AvatarCheck.http'])
             }
         }
 
-        $scope.checkAllPolice = function($event,countyCode) {
-            var checkAllPolice = $event.target;
-            var checkPolice =$(".checkPolice"+countyCode);
-            for (var i=0;i<checkPolice.length;i++){
-                if(checkAllPolice.checked) {
-                    checkPolice[i].checked = true;
-                }else {
-                    checkPolice[i].checked = false;
-                }
-            }
-        }
+        // $scope.checkAllPolice = function($event,countyCode) {
+        //     var checkAllPolice = $event.target;
+        //     var checkPolice =$(".checkPolice"+countyCode);
+        //     for (var i=0;i<checkPolice.length;i++){
+        //         if(checkAllPolice.checked) {
+        //             checkPolice[i].checked = true;
+        //         }else {
+        //             checkPolice[i].checked = false;
+        //         }
+        //     }
+        // }
 
     });
\ No newline at end of file

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

@@ -336,16 +336,16 @@ angular.module('AvatarCheck.task', ['ngRoute', 'AvatarCheck.http'])
 
         $scope.goes = function(){
             var checks = $(".checkOneBox:checked");
-            var arr = [];
-            var failedArr=[];
-            for (var i=0;i<checks.length;i++){
-                if(checks[i].value.length<11){
-                    failedArr.push(checks[i].value)
-                }else{
-                    arr.push(checks[i].value)
+            if(checks.length>0){
+                var arr = [];
+                var failedArr=[];
+                for (var i=0;i<checks.length;i++){
+                    if(checks[i].value.length<11){
+                        failedArr.push(checks[i].value)
+                    }else{
+                        arr.push(checks[i].value)
+                    }
                 }
-            }
-            if(arr.length>0){
                 var json={
                     process:$rootScope.loginData.roleList[0].process,
                     name:$rootScope.loginData.name,

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

@@ -82,11 +82,11 @@
                     <tbody>
                     <tr ng-repeat="item in xmlPackageData">
                         <td>{{$index+1}}</td>
-                        <td>{{item.uploadDate | date:'yyyy-MM-dd HH:mm:ss'}}</td>
+                        <td>{{item.date}}</td>
                         <td>{{item.packageCount}}</td>
-                        <td>{{item.cardCount}}</td>
-                        <td>{{item.commonCardCount}}</td>
-                        <td>{{item.postCardCount}}</td>
+                        <td>{{item.dateCount}}</td>
+                        <td>{{item.commonCount}}</td>
+                        <td>{{item.postCount}}</td>
                         <td>
                             <button class="btn btn-primary" ng-click="analysis(item.uploadDate,item.packageCount,item.fileId)">解析</button>
                             <button class="btn btn-danger" ng-click="deleteDataById(item.uploadDate,item.packageCount,item.fileId)">删除</button>

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

@@ -73,15 +73,12 @@ angular.module('AvatarCheck.xmlAndSearch', ['ngRoute', 'AvatarCheck.http', 'tm.p
             perPageOptions: [10, 20, 30, 40, 50]
         };
         $scope.getXmlPackage = function(){
-            HttpService.selectXmlPackageCount($("#datepicker").val(),function(data){
-                $scope.paginationConf.totalItems = data.respData.string;
-                console.log($scope.paginationConf.totalItems,"$scope.paginationConf.totalItems")
-            })
             if($scope.paginationConf.currentPage==0){
                 $scope.paginationConf.currentPage=1;
             }
             HttpService.selectXmlPackage($("#datepicker").val(),$scope.paginationConf.currentPage,$scope.paginationConf.itemsPerPage,function(data){
-                $scope.xmlPackageData = data.respData;
+                $scope.paginationConf.totalItems=data.respData.count;
+                $scope.xmlPackageData = data.respData.mapList;
                 console.log($scope.xmlPackageData,"$scope.xmlPackageData")
             })
         }