修改库房打签 去掉北京市公安局

修改xml解析 适配包头中添加的北京市公安局-异地首申由本地系统生成xml，但是在异地辅助系统中解析生成制证包，并且在异地系统中制证

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

@@ -225,7 +225,8 @@ public class ExportXMLApi {
         Element DWDM = PACKAGEHEAD.addElement("DWDM");
         DWDM.setText(filesEntity.getDwdm());
         Element DWMC = PACKAGEHEAD.addElement("DWMC");
-        if (preproPersonEntities.get(0).getCardTypeId() == 10) {
+        // 判断是否为异地首申普和异地首申邮 如果是则需要在单位名称上添加【北京市公安局】
+        if (preproPersonEntities.get(0).getCardTypeId() == 10 || preproPersonEntities.get(0).getCardTypeId() == 11) {
             DWMC.setText("北京市公安局" + filesEntity.getDwmc());
         } else {
             DWMC.setText(filesEntity.getDwmc());

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

@@ -204,6 +204,8 @@ public class PersonPostApi {
             jsonObject = JSONObject.fromObject(jsonStr);
             String applicantName = jsonObject.getString("applicantName");
             String orderNumber = jsonObject.getString("orderNumber");
+            String jmsfzslh = jsonObject.getString("jmsfzslh");
+            String idCard = jsonObject.getString("idCard");
             String state = jsonObject.getString("state");
             String district = jsonObject.getString("district");
             String latticeMouthInformation = jsonObject.getString("latticeMouthInformation");
@@ -214,7 +216,7 @@ public class PersonPostApi {
             String notNull = jsonObject.getString("notNull");
             String printDate = stripNonDigits(jsonObject.getString("printDate"));
             Long gk = jsonObject.getLong("gk");
-            count = personPostService.findPersonalDataCount(applicantName, orderNumber, state, district,latticeMouthInformation, jsonArray, startDate,endDate, emailNo, notNull,printDate, gk);
+            count = personPostService.findPersonalDataCount(applicantName, orderNumber, jmsfzslh, idCard, state, district,latticeMouthInformation, jsonArray, startDate,endDate, emailNo, notNull,printDate, gk);
         } catch (Exception e) {
             logger.error("个人邮寄信息：" + jsonObject);
             logger.error("Exception 按条件查询个人邮寄信息异常", e);
@@ -239,6 +241,8 @@ public class PersonPostApi {
             jsonObject = JSONObject.fromObject(jsonStr);
             String applicantName = jsonObject.getString("applicantName");
             String orderNumber = jsonObject.getString("orderNumber");
+            String jmsfzslh = jsonObject.getString("jmsfzslh");
+            String idCard = jsonObject.getString("idCard");
             String state = jsonObject.getString("state");
             String district = jsonObject.getString("district");
             String latticeMouthInformation = jsonObject.getString("latticeMouthInformation");
@@ -251,7 +255,7 @@ public class PersonPostApi {
             int notNull = Integer.parseInt((jsonObject.getString("notNull")));
             String printDate = stripNonDigits(jsonObject.getString("printDate"));
             Long gk = jsonObject.getLong("gk");
-            list = personPostService.findPersonalData(applicantName, orderNumber, state,district, latticeMouthInformation, jsonArray, startDate, endDate, firstIndex, pageSize, emailNo, notNull,printDate, gk);
+            list = personPostService.findPersonalData(applicantName, orderNumber, jmsfzslh, idCard, state, district, latticeMouthInformation, jsonArray, startDate, endDate, firstIndex, pageSize, emailNo, notNull,printDate, gk);
         } catch (Exception e) {
             logger.error("个人邮寄信息：" + jsonObject);
             logger.error("Exception 按条件查询个人邮寄信息异常", e);

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

@@ -25,49 +25,49 @@ public interface PersonPostService {
      * @param creatTime
      * @return
      */
-    public boolean updateIsPost(String fileId,String creatTime);
+    boolean updateIsPost(String fileId, String creatTime);
 
-    public boolean savePersonPost(List<PersonPostEntity> personPostEntities);
+    boolean savePersonPost(List<PersonPostEntity> personPostEntities);
 
-    public List<PersonPostEntity> findPersonalData(@Param("applicantName") String applicantName,@Param("orderNumber") String orderNumber,@Param("state") String state,@Param("district") String district,@Param("latticeMouthInformation") String latticeMouthInformation,@Param("getToCounty") List<String> getToCounty,@Param("startDate") String startDate,@Param("endDate") String endDate,@Param("firstIndex") String firstIndex,@Param("pageSize") String pageSize, String emailNo,int notNull,String printDate, Long gk);
+    List<PersonPostEntity> findPersonalData(@Param("applicantName") String applicantName, @Param("orderNumber") String orderNumber, @Param("jmsfzslh") String jmsfzslh, @Param("idCard") String idCard, String state, @Param("district") String district, @Param("latticeMouthInformation") String latticeMouthInformation, @Param("getToCounty") List<String> getToCounty, @Param("startDate") String startDate, @Param("endDate") String endDate, @Param("firstIndex") String firstIndex, @Param("pageSize") String pageSize, String emailNo, int notNull, String printDate, Long gk);
 
-    public boolean deletePersonalData(String applicantName,String orderNumber,String state,String latticeMouthInformation,List<String> getToCounty,String starDate,String endDate);
+    boolean deletePersonalData(String applicantName, String orderNumber, String state, String latticeMouthInformation, List<String> getToCounty, String starDate, String endDate);
 
-    public boolean deletePersonalDataByImportDate(String startDate, String endDate);
+    boolean deletePersonalDataByImportDate(String startDate, String endDate);
 
-    public List<PersonPostEntity> getPostInfo(ReadCardDto readCardDto);
+    List<PersonPostEntity> getPostInfo(ReadCardDto readCardDto);
 
-    public boolean printPostList(int id, Date printDateTime);
+    boolean printPostList(int id, Date printDateTime);
 
-    public int findPersonalDataCount(String applicantName, String orderNumber, String state,String district, String latticeMouthInformation, List<String> getToCounty, String startDate,String endDate, String emailNo,String notNull,String printDate, Long gk);
+    int findPersonalDataCount(String applicantName, String orderNumber, String jmsfzslh, String idCard, String state, String district, String latticeMouthInformation, List<String> getToCounty, String startDate, String endDate, String emailNo, String notNull, String printDate, Long gk);
 
-    public int findPersonalDataCountByImportDate(String starDate,String endDate);
+    int findPersonalDataCountByImportDate(String starDate, String endDate);
 
-    public List<PersonPostEntity> downLoadReportForm(HttpServletRequest request,HttpServletResponse response,String sqrxm, String ddh, String hasPrinted,String district, String gkxx, JSONArray jsonArray,String starDate,String endDate,String emailNo,String printDate,String notNull, Long gk);
+    List<PersonPostEntity> downLoadReportForm(HttpServletRequest request, HttpServletResponse response, String sqrxm, String ddh, String hasPrinted, String district, String gkxx, JSONArray jsonArray, String starDate, String endDate, String emailNo, String printDate, String notNull, Long gk);
 
-    public Map<String,Object> selectNote(@Param("uploadId")String uploadId);
+    Map<String,Object> selectNote(@Param("uploadId") String uploadId);
 
-    public boolean addNote(@Param("uploadNo")String uploadNo,@Param("note")String note);
+    boolean addNote(@Param("uploadNo") String uploadNo, @Param("note") String note);
 
-    public List<Map<String, Object>> checkPersonalPost(String uploadNo);
+    List<Map<String, Object>> checkPersonalPost(String uploadNo);
 
-    public boolean cancelPostByAcceptNo(String uploadNo,String remarks,String name);
+    boolean cancelPostByAcceptNo(String uploadNo, String remarks, String name);
 
-    public List<Map<String,Object>> selectCancelPost(String beginDate,String endDate);
+    List<Map<String,Object>> selectCancelPost(String beginDate, String endDate);
 
-    public PersonPostEntity findPersonalDataByAcceptNo(String acceptNo);
+    PersonPostEntity findPersonalDataByAcceptNo(String acceptNo);
 
-    public List<Map<String, Object>> downloadUploadInfo(HttpServletRequest request,HttpServletResponse response,String  startDate,String  endDate);
+    List<Map<String, Object>> downloadUploadInfo(HttpServletRequest request, HttpServletResponse response, String startDate, String endDate);
 
-    public int findWaybillNumber( @Param("fileID") String fileID);
+    int findWaybillNumber(@Param("fileID") String fileID);
 
-    public int findBackWaybillNumber( @Param("fileID") String fileID);
+    int findBackWaybillNumber(@Param("fileID") String fileID);
 
-    public List<Map<String,Object>> downLoadInvalidOrder(HttpServletRequest request,HttpServletResponse response,String sqrxm, String ddh, String hasPrinted, String gkxx, JSONArray jsonArray,String starDate,String endDate,String emailNo,String printDate,String notNull);
+    List<Map<String,Object>> downLoadInvalidOrder(HttpServletRequest request, HttpServletResponse response, String sqrxm, String ddh, String hasPrinted, String gkxx, JSONArray jsonArray, String starDate, String endDate, String emailNo, String printDate, String notNull);
 
-    public boolean saveGATTrack(List<GATTrackEntity> gatTR);
+    boolean saveGATTrack(List<GATTrackEntity> gatTR);
 
-    public List<PersonPostDto> getPostInfoAtMachine(ReadCardDto readCardDto);
+    List<PersonPostDto> getPostInfoAtMachine(ReadCardDto readCardDto);
 
-    public boolean updatePrintDateAtMachine(int id, Date printDateTime);
+    boolean updatePrintDateAtMachine(int id, Date printDateTime);
 }

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

@@ -54,7 +54,7 @@ public class PersonPostServiceImpl implements PersonPostService {
         return true;
     }
     @Override
-    public List<PersonPostEntity> findPersonalData(String applicantName, String orderNumber, String state,String district, String latticeMouthInformation, List<String> getToCounty, String startDate, String endDate, String firstIndex, String pageSize, String emailNo, int notNull, String printDate, Long gk) {
+    public List<PersonPostEntity> findPersonalData(String applicantName, String orderNumber, String jmsfzslh, String idCard, String state,String district, String latticeMouthInformation, List<String> getToCounty, String startDate, String endDate, String firstIndex, String pageSize, String emailNo, int notNull, String printDate, Long gk) {
         StringBuilder str = new StringBuilder();
         long firstIndexLong = Long.parseLong(firstIndex);
         long pageSizeLong = Long.parseLong(pageSize);
@@ -65,7 +65,7 @@ public class PersonPostServiceImpl implements PersonPostService {
                 str.append("'").append(getToCounty.get(i)).append("',");
             }
         }
-        return personPostMapper.findAllPersonalData(applicantName, orderNumber, state,district, latticeMouthInformation, str.toString(), startDate, endDate, firstIndexLong * pageSizeLong, (firstIndexLong - 1) * pageSizeLong + 1, emailNo, notNull, printDate, gk);
+        return personPostMapper.findAllPersonalData(applicantName, orderNumber, jmsfzslh, idCard, state,district, latticeMouthInformation, str.toString(), startDate, endDate, firstIndexLong * pageSizeLong, (firstIndexLong - 1) * pageSizeLong + 1, emailNo, notNull, printDate, gk);
     }
 
     @Override
@@ -97,7 +97,7 @@ public class PersonPostServiceImpl implements PersonPostService {
     }
 
     @Override
-    public int findPersonalDataCount(@Param("applicantName") String applicantName, @Param("orderNumber") String orderNumber, @Param("state") String state,@Param("district") String district, @Param("latticeMouthInformation") String latticeMouthInformation, @Param("getToCounty") List<String> getToCounty, @Param("startDate") String startDate, @Param("endDate") String endDate, String emailNo, String notNull, String printDate, Long gk) {
+    public int findPersonalDataCount(@Param("applicantName") String applicantName, @Param("orderNumber") String orderNumber, @Param("jmsfzslh") String jmsfzslh, @Param("idCard") String idCard, @Param("state") String state,@Param("district") String district, @Param("latticeMouthInformation") String latticeMouthInformation, @Param("getToCounty") List<String> getToCounty, @Param("startDate") String startDate, @Param("endDate") String endDate, String emailNo, String notNull, String printDate, Long gk) {
         StringBuilder str = new StringBuilder();
         for (int i = 0; i < getToCounty.size(); i++) {
             if (i == getToCounty.size() - 1) {
@@ -106,7 +106,7 @@ public class PersonPostServiceImpl implements PersonPostService {
                 str.append("'").append(getToCounty.get(i)).append("',");
             }
         }
-        return personPostMapper.findPersonalDataCount(applicantName, orderNumber, state, district,latticeMouthInformation, str.toString(), startDate, endDate, emailNo, notNull, printDate, gk);
+        return personPostMapper.findPersonalDataCount(applicantName, orderNumber, jmsfzslh, idCard, state, district,latticeMouthInformation, str.toString(), startDate, endDate, emailNo, notNull, printDate, gk);
     }
 
     @Override

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

@@ -4,42 +4,53 @@
         text-align: center;
         vertical-align: middle !important;
     }
+
     .select2-search__field {
         height: 30px;
     }
+
     .ul li {
         cursor: pointer;
     }
+
     .page-list .pagination {
         float: left;
     }
+
     .page-list .pagination span {
         cursor: pointer;
     }
+
     .page-list .pagination .separate span {
         cursor: default;
         border-top: none;
         border-bottom: none;
     }
+
     .page-list .pagination .separate span:hover {
         background: none;
     }
+
     .page-list .page-total {
         float: left;
         margin: 25px 20px;
     }
+
     .page-list .page-total input,
     .page-list .page-total select {
         height: 26px;
         border: 1px solid #ddd;
     }
+
     .page-list .page-total input {
         width: 40px;
         padding-left: 3px;
     }
+
     .page-list .page-total select {
         width: 50px;
     }
+
     .page-list:after {
         display: block;
         clear: both;
@@ -235,6 +246,24 @@
                         </td>
                     </tr>
                     <tr>
+                        <td>受理号:</td>
+                        <td>
+                            <input
+                                    type="text"
+                                    class="form-control"
+                                    ng-model="jmsfzslh"
+                                    placeholder="居民身份证受理号"
+                            />
+                        </td>
+                        <td>身份证号:</td>
+                        <td>
+                            <input
+                                    type="text"
+                                    class="form-control"
+                                    ng-model="idCard"
+                                    placeholder="身份证号"
+                            />
+                        </td>
                         <td colspan="2">
                             <div style="float: left">
                                 <button
@@ -301,7 +330,7 @@
                     </thead>
                     <tbody>
                     <tr ng-repeat="item in postData">
-              <td>{{$index+1}}</td>
+                        <td>{{$index + 1}}</td>
                         <td>{{item.orderNumber}}</td>
                         <td>{{item.waybillNumber}} - {{item.backWaybillNumber}}</td>
                         <td>{{item.firstWhite}}</td>

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

@@ -82,6 +82,16 @@ angular.module('AvatarCheck.uploadExcelAndSearch', ['ngRoute', 'AvatarCheck.http
             }else{
                 json.orderNumber='';
             }
+            if (angular.isDefined($scope.jmsfzslh)) {
+                json.jmsfzslh = $scope.jmsfzslh
+            }else {
+                json.jmsfzslh = '';
+            }
+            if (angular.isDefined($scope.idCard)) {
+                json.idCard = $scope.idCard
+            }else {
+                json.idCard = '';
+            }
             if ($("#print").val() == '') {
                 json.state=-1;
             }else {
@@ -152,6 +162,16 @@ angular.module('AvatarCheck.uploadExcelAndSearch', ['ngRoute', 'AvatarCheck.http
             }else{
                 json.orderNumber='';
             }
+            if (angular.isDefined($scope.jmsfzslh)) {
+                json.jmsfzslh = $scope.jmsfzslh
+            }else {
+                json.jmsfzslh = '';
+            }
+            if (angular.isDefined($scope.idCard)) {
+                json.idCard = $scope.idCard
+            }else {
+                json.idCard = '';
+            }
             if ($("#print").val() == '') {
                 json.state=-1;
             }else {