增加解析后的数据统计中异地首申相关数据

修改异地首申邮寄的xml包中回馈信息为制证中心

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

@@ -140,7 +140,7 @@ public class ExportXMLApi {
                             List<PreproPersonDto> preproPersonEntityList1 = (List<PreproPersonDto>) list1;
                             List<FilesEntity> filesEntities = filesService.selectFilesEntityById(preproPersonEntityList1.get(0).getFileId().toString());
                             FilesEntity filesEntity = new FilesEntity();
-                            if (preproPersonEntityList1.get(0).getCardTypeId() == 9) {
+                            if (preproPersonEntityList1.get(0).getCardTypeId() == 9 || preproPersonEntityList1.get(0).getCardTypeId() == 11) {
                                 filesEntity.setVersionCode("3.00");
                                 filesEntity.setCreateTime(getCurrentDate2String("yyyyMMddhhmmss"));
                                 filesEntity.setDwmc("北京市公安局人口管理总队证件管理大队");

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

@@ -44,6 +44,8 @@ public class queryPreproPerson {
             map.put("total", preproPersonEntityList.size());
             int youSum = 0;
             int puSum = 0;
+            int yidishoushenpuSum = 0; //异地首申普
+            int yidishoushenyouSum = 0; //异地首申邮
             int invaildCount = 0;
             for (Map<String, Object> map1 : preproPersonEntityList) {
                 if ("9".equals(map1.get("CARD_TYPE_ID") + "")) {
@@ -51,6 +53,8 @@ public class queryPreproPerson {
                 } else if ("0".equals(map1.get("CARD_TYPE_ID") + "")) {
                     puSum++;
                 }
+                if ("10".equals(map1.get("CARD_TYPE_ID") + "")) yidishoushenpuSum++;
+                if ("11".equals(map1.get("CARD_TYPE_ID") + "")) yidishoushenyouSum++;
                 if ("0".equals(map1.get("IS_VALID") + "")) {
                     invaildCount++;
                 }
@@ -58,6 +62,8 @@ public class queryPreproPerson {
             map.put("list", preproPersonEntities);
             map.put("youSum", youSum);
             map.put("puSum", puSum);
+            map.put("ydsspuSum", yidishoushenpuSum);
+            map.put("ydssyouSum", yidishoushenyouSum);
             map.put("invaildCount", invaildCount);
         } catch (Exception e) {
             logger.error("oldFile：" + uploadNo + "公民身份号码：" + IDCard + "包号：" + oldFile + "文件名：" + newFile + "签发机关：" + SSXQDM + "制证类型代码（9邮寄0大批）：" + cardType + "是否有效（1有效，0无效）：" + state + "上传时间：" +  replaceDate(uploadDate1) + replaceDate(uploadDate2) + "页数：" + currPage + "条数：" + pageSize + "生成时间：" + downloadState);

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

@@ -112,7 +112,7 @@
             (<span style="color:#0b93d5;">每页显示{{paginationConf.itemsPerPage}}条/共
             {{paginationConf.totalItems}}条</span>)
             <div class="pull-right">
-                <span style="color:#9f191f;"><span style="margin-right: 15px;">普通证：{{simpleCardCount}}</span><span style="margin-right: 15px;">邮寄证：{{postCardCount}}</span><span>禁用数：{{forbiddenCount}}</span></span>
+                <span style="color:#9f191f;"><span style="margin-right: 15px;">普通证：{{simpleCardCount}}</span><span style="margin-right: 15px;">邮寄证：{{postCardCount}}</span><span style="margin-right: 15px;">异地首申普：{{ydSsSimpleCount}}</span><span style="margin-right: 15px;">异地首申邮：{{ydSsPostCount}}</span><span style="margin-right: 15px;">禁用数：{{forbiddenCount}}</span></span>
             </div>
         </div>
         <div class="box-info" style="padding: 7px; padding-top: 0px;">

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

@@ -95,6 +95,8 @@ angular.module('AvatarCheck.cardProdPackage', ['ngRoute', 'AvatarCheck.http', 't
                     $scope.paginationConf.totalItems=data.total;
                     $scope.simpleCardCount = data.puSum;
                     $scope.postCardCount = data.youSum;
+                    $scope.ydSsSimpleCount = data.ydsspuSum;
+                    $scope.ydSsPostCount = data.ydssyouSum;
                     $scope.forbiddenCount= data.invaildCount;
                     $scope.packageData = data.list;
                     console.log(data)

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

@@ -45,13 +45,13 @@ angular.module("AvatarCheck.dataCheckReport",['ngRoute', 'AvatarCheck.http'])
             var date1 = $("#datepicker1").val();
             var date2 = $("#datepicker2").val();
             var cardType = $("#cardType").val();
-            if(cardType==''){
+            if(cardType===''){
                 cardType = -1;
             }
-            if(date1=='{{choseDate}}'){
+            if(date1==='{{choseDate}}'){
                 date1=$filter("date")(new Date(), "yyyy-MM-dd")
             }
-            if(date2=='{{choseDate}}'){
+            if(date2==='{{choseDate}}'){
                 date2=$filter("date")(new Date(), "yyyy-MM-dd")
             }
             HttpService.queryDataCheckReport(date1,date2,$scope.policeCode,$scope.policeName,cardType,function (data) {
@@ -59,7 +59,7 @@ angular.module("AvatarCheck.dataCheckReport",['ngRoute', 'AvatarCheck.http'])
                 console.log($scope.dataCheckList);
             })
         };
-        if($rootScope.loginData.login==true){
+        if($rootScope.loginData.login===true){
             getTypeList();
             $scope.searchReportData();
         }