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

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

@@ -57,6 +57,27 @@ public class ExportExcelApi {
             logger.error("IOException 导出公安网数据IO异常", e);
         }
     }
+    /**
+     * 导出公安网数据
+     */
+    @RequestMapping("printExcelDataGAT")
+    public void printExcelDataGAT(@RequestParam("list") List<Integer> list,HttpServletResponse response, HttpServletRequest requ) {
+        String remoteAddr = requ.getRemoteAddr();
+        MDC.put("ip", remoteAddr);
+        try {
+            List<Map<String, Object>> mapList = detailReceiptListService.selectPostDetailsGAT(list);
+            response.setContentType("application/x-download");
+            response.setCharacterEncoding("UTF-8");
+            //使用Servlet实现文件下载的时候，避免浏览器自动打开文件
+            ExportExcel.exportExcelDateGAT(mapList,response,requ);
+
+        } catch (Exception e) {
+            e.printStackTrace();
+            logger.error("导出GAT数据异常");
+            logger.error("IOException 导出GAT数据IO异常", e);
+        }
+    }
+
 
     /**
      * 导出交接单

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

@@ -145,6 +145,7 @@ public class FailedCardApi {
             for (Object o : jsonarray) {
                 JSONObject jsonObject = (JSONObject) o;
                 String name = ((JSONObject) o).getString("name");
+                String workGroup = ((JSONObject) o).getString("workGroup");//提交人所在工作组，废证属于提交人所在工作组
 
                 String result = failedCardService.selectSpecialCard(((JSONObject) o).getString("cardId"));
                 List<Map<String, Object>> idMap;
@@ -160,7 +161,7 @@ public class FailedCardApi {
                     int initiator = 5;
                     String acceptNo = idMap.get(0).get("ACCEPT_NO").toString();
                     Object taskId = idMap.get(0).get("TASK_ID");
-                    Object workGroup = idMap.get(0).get("WORK_GROUP");
+//                    Object workGroup = idMap.get(0).get("WORK_GROUP");
                     failedCardService.insertFailedCard(jsonObject.getString("failedCardReasonId"), replace(acceptNo), replace(taskId), String.valueOf(initiator), jsonObject.getString("note"), replace(workGroup), name);
                 }
                 }

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

@@ -269,7 +269,7 @@ public class LogApi {
                 //更新格口文件解析状态
 //                logService.updateGKState(gkId);
                 //生成解析日志
-                logService.insertIntoAnalysis(gkId, xmlId, postCount, String.valueOf(commonCount));
+                logService.insertIntoAnalysis(gkId, xmlId, postCount, String.valueOf(commonCount),getCurrentDate2String("yyyyMMddhhmmss"));
             }
         }catch (Exception e){
             logger.error("导入时间：" + printDate);

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

@@ -159,7 +159,7 @@ public class PersonPostApi {
                             List lists = (List)listStr.get(i);
                             rows=i;
                             String uploadNo = lists.get(1)+"";
-                            String note =lists.get(10)+"";
+                            String note =lists.get(9)+"："+lists.get(10);
                             List<Map<String, Object>> resultMap=personPostService.checkPersonalPost(uploadNo);
                             if (resultMap.size()>0){
                                 personPostService.cancelPostByAcceptNo(uploadNo, note, name);
@@ -202,6 +202,7 @@ public class PersonPostApi {
             String applicantName = jsonObject.getString("applicantName");
             String orderNumber = jsonObject.getString("orderNumber");
             String state = jsonObject.getString("state");
+            String district = jsonObject.getString("district");
             String latticeMouthInformation = jsonObject.getString("latticeMouthInformation");
             JSONArray jsonArray = (JSONArray) jsonObject.get("getToCounty");
             String startDate = replaceDate(jsonObject.getString("startDate"));
@@ -209,7 +210,7 @@ public class PersonPostApi {
             String emailNo = jsonObject.getString("emailNo");
             String notNull = jsonObject.getString("notNull");
             String printDate = stripNonDigits(jsonObject.getString("printDate"));
-            count = personPostService.findPersonalDataCount(applicantName, orderNumber, state, latticeMouthInformation, jsonArray, startDate,endDate, emailNo, notNull,printDate);
+            count = personPostService.findPersonalDataCount(applicantName, orderNumber, state, district,latticeMouthInformation, jsonArray, startDate,endDate, emailNo, notNull,printDate);
         } catch (Exception e) {
             logger.error("个人邮寄信息：" + jsonObject);
             logger.error("Exception 按条件查询个人邮寄信息异常", e);
@@ -235,6 +236,7 @@ public class PersonPostApi {
             String applicantName = jsonObject.getString("applicantName");
             String orderNumber = jsonObject.getString("orderNumber");
             String state = jsonObject.getString("state");
+            String district = jsonObject.getString("district");
             String latticeMouthInformation = jsonObject.getString("latticeMouthInformation");
             JSONArray jsonArray = (JSONArray) jsonObject.get("getToCounty");
             String startDate = replaceDate(jsonObject.getString("startDate"));
@@ -244,7 +246,7 @@ public class PersonPostApi {
             String emailNo = jsonObject.getString("emailNo");
             int notNull = Integer.parseInt((jsonObject.getString("notNull")));
             String printDate = stripNonDigits(jsonObject.getString("printDate"));
-            list = personPostService.findPersonalData(applicantName, orderNumber, state, latticeMouthInformation, jsonArray, startDate, endDate, firstIndex, pageSize, emailNo, notNull,printDate);
+            list = personPostService.findPersonalData(applicantName, orderNumber, state,district, latticeMouthInformation, jsonArray, startDate, endDate, firstIndex, pageSize, emailNo, notNull,printDate);
         } catch (Exception e) {
             logger.error("个人邮寄信息：" + jsonObject);
             logger.error("Exception 按条件查询个人邮寄信息异常", e);
@@ -320,7 +322,7 @@ public class PersonPostApi {
 
     @RequestMapping("download")
     public void exportExcel(HttpServletRequest request, HttpServletResponse response,
-                            @RequestParam("startDate") String startDate, @RequestParam("endDate") String endDate, @RequestParam("hasPrinted") String hasPrinted,
+                            @RequestParam("startDate") String startDate, @RequestParam("endDate") String endDate, @RequestParam("hasPrinted") String hasPrinted,@RequestParam("district") String district,
                             @RequestParam("djx") List<String> djx, @RequestParam("gkxx") String gkxx, @RequestParam("ddh") String ddh, @RequestParam("notNull") String notNull,
                             @RequestParam("sequence") String sequence, @RequestParam("sqrxm") String sqrxm, @RequestParam("emailNo") String emailNo,@RequestParam("printDate") String printDate) throws Exception {
         String remoteAddr = request.getRemoteAddr();
@@ -328,7 +330,7 @@ public class PersonPostApi {
         JSONArray jsonArray = new JSONArray();
         try {
             jsonArray = JSONArray.fromObject(djx);
-            List<PersonPostEntity> list = personPostService.downLoadReportForm(request, response, sqrxm, ddh, hasPrinted, gkxx, jsonArray, replaceDate(startDate),replaceDate(endDate), emailNo,stripNonDigits(printDate),notNull);
+            List<PersonPostEntity> list = personPostService.downLoadReportForm(request, response, sqrxm, ddh, hasPrinted,district, gkxx, jsonArray, replaceDate(startDate),replaceDate(endDate), emailNo,stripNonDigits(printDate),notNull);
             exportExcel(request, response, list);
         } catch (Exception e) {
             logger.error("上传时间：" + startDate + endDate + "类型普证-0，邮寄-9：" + hasPrinted + "格口信息：" + gkxx + "订单号：" + ddh + "申请人姓名：" + sqrxm + "运单号码：" + emailNo);
@@ -505,7 +507,7 @@ public class PersonPostApi {
             HSSFCellStyle style = wb.createCellStyle();
             style.setAlignment(HorizontalAlignment.CENTER);
             HSSFRow firstRow = sheet.createRow(0);
-            String[] rowTitle = {"订单号", "寄件人姓名", "寄件人电话2", "寄件人详细地址", "收件人姓名", "收件人电话2",
+            String[] rowTitle = {"订单号", "寄件人姓名", "寄件人电话2", "寄件人详细地址", "收件人姓名", "收件人手机号",
                     "收件人邮编", "邮件号", "内件性质", "重量", "长", "宽", "高", "收件人城市", "收件人区县", "收件人详细地址",
                     "回单标识", "回单运单号", "商品名称", "内件号", "内件名称"};
             for (int i = 0; i < rowTitle.length; i++) {
@@ -533,7 +535,7 @@ public class PersonPostApi {
             sheet.setColumnWidth(17, (int) ((14.64 + 0.72) * 256));
             sheet.setColumnWidth(18, (int) ((8.55 + 0.72) * 256));
             sheet.setColumnWidth(19, (int) ((6.64 + 0.72) * 256));
-            sheet.setColumnWidth(20, (int) ((8.55 + 0.72) * 256));
+            sheet.setColumnWidth(20, (int) ((19.55 + 0.72) * 256));
             for (int i = 0; i < records.size(); i++) {
                 HSSFRow row = sheet.createRow(i + 1);
                 PersonPostEntity personPostEntity = records.get(i);
@@ -567,6 +569,8 @@ public class PersonPostApi {
                 cell.setCellValue("6");
                 cell = row.createCell(17);
                 cell.setCellValue(personPostEntity.getBackWaybillNumber());
+                cell = row.createCell(20);
+                cell.setCellValue(personPostEntity.getLatticeMouthInformation());
             }
             SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy年MM月dd日生产导出");
             String fileName = simpleDateFormat.format(new Date()) + ".xls";

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

@@ -54,10 +54,12 @@ public class ReadXmlApi {
     @Consumes(MediaType.MULTIPART_FORM_DATA)
     @Produces(MediaType.APPLICATION_JSON)
     @Transactional(rollbackFor = Exception.class)
-    public boolean getXMLToCheck(@Context HttpServletResponse resp, @Context HttpServletRequest requ) {
+    public Map<String,Object> getXMLToCheck(@Context HttpServletResponse resp, HttpServletRequest requ) {
+        YXJSONResponse yxresp = new YXJSONResponse();
+        Map<String,Object> map = new HashMap<>();
+        List<String> errList = new ArrayList<>();
         String remoteAddr = requ.getRemoteAddr();
         MDC.put("ip", remoteAddr);
-        YXJSONResponse yxresp = new YXJSONResponse();
         resp.setCharacterEncoding("UTF-8");
         String filename = "";
         DiskFileItemFactory factory = new DiskFileItemFactory();
@@ -80,6 +82,7 @@ public class ReadXmlApi {
                 MultipartHttpServletRequest multiRequest = (MultipartHttpServletRequest) requ;
                 Iterator<String> iter = multiRequest.getFileNames();
                 while (iter.hasNext()) {
+                    System.out.println("开始获取整体文件信息！ "+new Date().getTime());
                     List<MultipartFile> fileRows = multiRequest.getFiles(iter.next().toString());
                     for (MultipartFile item : fileRows) {
                         try {
@@ -90,34 +93,47 @@ public class ReadXmlApi {
                             if (StringUtils.isBlank(filename)) {
                                 continue;
                             }
+                            logger.error("获取"+filename+"文件信息！ "+new Date().getTime());
                             InputStream in = item.getInputStream();
                             String str = YXStringUtils.inputStream2String(in, "utf-8");
                             in.close();
                             IDCardFactory idCardFactory = new IDCardFactory();
-                            idcardsFactory(idCardFactory.extractIDCard(str, date));
+                            logger.error("开始解析"+filename+"文件！ "+new Date().getTime());
+                            Map<String, Object> objectMap = idCardFactory.extractIDCard(str, date);
+                            logger.error("开始存储"+filename+"文件！ "+new Date().getTime());
+                            Boolean aBoolean = idcardsFactory(objectMap);
+                            logger.error("存储"+filename+"文件完成！ "+new Date().getTime());
+                            if (!aBoolean){
+                                errList.add("上传文件名：" + filename+"，文件上传失败");
+                                continue;
+                            }
                         } catch (UnsupportedEncodingException e) {
                             e.printStackTrace();
-                            logger.error("上传文件名" + filename);
+                            logger.error("上传文件名" + filename );
                             logger.error("UnsupportedEncodingException 上传文件时发现文件编码错误", e);
-                            yxresp.outPutError("UnsupportedEncodingException", "上传文件时发现文件编码错误:" + e.getMessage());
+//                            yxresp.outPutError("UnsupportedEncodingException", "上传文件时发现文件编码错误:" + e.getMessage());
+                            errList.add("上传文件名：" + filename+"，上传文件时发现文件编码错误");
                             continue;
                         } catch (IOException e) {
                             e.printStackTrace();
-                            logger.error("上传文件名" + filename);
+                            logger.error("上传文件名" + filename );
                             logger.error("IOException 上传文件时发生IO错误", e);
-                            yxresp.outPutError("IOException", "上传文件时发生IO错误:" + e.getMessage());
+//                            yxresp.outPutError("IOException", "上传文件时发生IO错误:" + e.getMessage());
+                            errList.add("上传文件名：" + filename+"，上传文件时发生IO错误");
                             continue;
                         } catch (DocumentException e) {
                             e.printStackTrace();
-                            logger.error("上传文件名" + filename);
-                            logger.error("DocumentException 上传文件时发生IO错误", e);
-                            yxresp.outPutError("DocumentException", "上传文件时发生IO错误:" + e.getMessage());
+                            logger.error("上传文件名" + filename );
+                            logger.error("DocumentException 上传文件时发生错误,非法XML文件", e);
+//                            yxresp.outPutError("DocumentException", "上传文件时发生IO错误:" + e.getMessage());
+                            errList.add("上传文件名：" + filename+"，上传文件时发生错误,非法XML文件");
                             continue;
                         } catch (Exception e) {
                             e.printStackTrace();
-                            logger.error("上传文件名" + filename);
-                            logger.error("Exception 上传文件时发生错误,非法XML文件", e);
-                            yxresp.outPutError("Exception", "上传文件时发生错误,非法XML文件:" + filename);
+                            logger.error("上传文件名" + filename );
+                            logger.error("Exception 上传文件时发生错误", e);
+//                            yxresp.outPutError("Exception", "上传文件时发生错误,非法XML文件:" + filename);
+                            errList.add("上传文件名：" + filename+"，上传文件时发生错误");
                             continue;
                         }
                     }
@@ -125,18 +141,25 @@ public class ReadXmlApi {
             }
         } catch (Exception e) {
             e.printStackTrace();
-            logger.error("上传文件名" + filename);
+            logger.error("上传文件名" + filename );
             logger.error("FileUploadException 文件上传发生异常", e);
-            yxresp.outPutError("FileUploadException", "文件上传发生异常:" + e.getMessage());
-        } finally {
-            return true;
+//            yxresp.outPutError("FileUploadException", "文件上传发生异常:" + e.getMessage());
+            errList.add("上传文件名：" + filename+"，上传文件时发生错误");
         }
-
+        if (errList.size() == 0){
+            map.put("msg","文件上传成功！");
+            map.put("code","200");
+        }else {
+            map.put("msg","文件上传失败！");
+            map.put("code","500");
+            map.put("errMsg",errList);
+        }
+        logger.error("所有文件上传完成！ "+new Date().getTime());
+        return map;
     }
 
     private Boolean idcardsFactory(Map<String, Object> map1) {
-        importXmlService.importPersonXml((List<PreproPersonDto>) map1.get("preproPerson"), (FilesEntity) map1.get("file"));
-        return true;
+        return importXmlService.importPersonXml((List<PreproPersonDto>) map1.get("preproPerson"), (FilesEntity) map1.get("file"));
     }
 
     /**

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

@@ -373,7 +373,7 @@ public class ReceiptApi {
                     map.put("msg", "交接单生成成功");
                 }else {
                     //-------------------已生成交接单-------------------
-                    map.put("msg","交接单已生成，操作人： "+resultProd.get(0).get("CHECK_NAME")+" 日期："+resultProd.get(0).get("CHECK_DATE"));
+                    map.put("msg","封签已生成，操作人： "+resultProd.get(0).get("CHECK_NAME")+" 复核日期："+resultProd.get(0).get("CHECK_DATE"));
                     //已经生成特证交接单，不做操作。
                     map.put("show", false);
                     map.put("state", 2);
@@ -791,12 +791,12 @@ public class ReceiptApi {
      * @return
      */
     @RequestMapping("queryPoliceDataByDownLoadDate")
-    public List<Map<String, Object>> queryPoliceDataByDownLoadDate(@RequestParam("startDate") String startDate,@RequestParam("endDate") String endDate, HttpServletRequest requ) {
+    public List<Map<String, Object>> queryPoliceDataByDownLoadDate(@RequestParam("startDate") String startDate,@RequestParam("endDate") String endDate,@RequestParam("gat") String gat, HttpServletRequest requ) {
         String remoteAddr = requ.getRemoteAddr();
         MDC.put("ip", remoteAddr);
         List <Map <String, Object>> policeData = new ArrayList <>();
         try {
-            policeData = receiptService.selectPoliceDataByDownLoadDate(replaceDate(startDate), replaceDate(endDate));
+            policeData = receiptService.selectPoliceDataByDownLoadDate(replaceDate(startDate), replaceDate(endDate),gat);
         }catch (Exception e) {
             logger.error("开始时间：" + startDate + "结束时间：" + endDate);
             logger.error("Exception 查询公安网数据(历史)异常", e);

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

@@ -458,7 +458,12 @@ public class TaskListApi {
                         specialCardService.saveSpecialCard(specialCardEntity);
                         for (GroupNoEntity groupNoEntity : groupNoEntities) {
                             if (groupNoEntity.getValidCount() == 1) {
-                                taskListService.deleteRedoTask(groupNoEntity.getTaskId());
+                                long newTaskId = taskEntity.getTaskId();
+                                long oldTaskId  = groupNoEntity.getTaskId();
+                                taskListService.updateTaskIdInDataAuditing(newTaskId,oldTaskId);
+                                if(groupNoService.selectGroupCount(oldTaskId) == 1){
+                                    taskListService.deleteRedoTask(oldTaskId);
+                                }
                                 break;
                             }
                         }

src/main/java/com/yxproject/start/entity/GATTrackEntity.java

+package com.yxproject.start.entity;
+
+import javax.persistence.*;
+import java.sql.Time;
+import java.util.Date;
+import java.util.Objects;
+
+@Entity
+@Table(name = "GAT_TRACK", schema = "YX", catalog = "")
+public class GATTrackEntity {
+
+    private String NO;//序号
+    private String UPLOAD_NO;//证件受理号
+    private String ID_CARD;//通行证号码
+    private String ID_NO;//公民身份号码
+    private String NAME;//姓名
+    private String UPLOAD_UNIT;//受理单位
+    private String DATA_HOME_UNIT;//数据归属单位代码
+    private String DATA_HOME_UNIT_NAME;//数据归属单位名称
+    private String APPLY_REASON;//申领原因
+    private String STATUS;//证件状态
+    private String ERROR_TYPE;//审核错误类型
+    private String UPLOAD_TIME;//受理时间
+    private String CARD_ACCEPT_TIME;//证件接收时间
+    private String PHONE;//联系电话
+    private String FILE_ID;//上传文件id
+
+
+    @Basic
+    @Column(name = "NO")
+    public String getNO() {
+        return NO;
+    }
+
+    public void setNO(String NO) {
+        this.NO = NO;
+    }
+
+    @Basic
+    @Column(name = "UPLOAD_NO")
+    public String getUPLOAD_NO() {
+        return UPLOAD_NO;
+    }
+
+    public void setUPLOAD_NO(String UPLOAD_NO) {
+        this.UPLOAD_NO = UPLOAD_NO;
+    }
+
+    @Basic
+    @Column(name = "ID_CARD")
+    public String getID_CARD() {
+        return ID_CARD;
+    }
+
+    public void setID_CARD(String ID_CARD) {
+        this.ID_CARD = ID_CARD;
+    }
+
+    @Basic
+    @Column(name = "ID_NO")
+    public String getID_NO() {
+        return ID_NO;
+    }
+
+    public void setID_NO(String ID_NO) {
+        this.ID_NO = ID_NO;
+    }
+
+    @Basic
+    @Column(name = "NAME")
+    public String getNAME() {
+        return NAME;
+    }
+
+    public void setNAME(String NAME) {
+        this.NAME = NAME;
+    }
+
+    @Basic
+    @Column(name = "UPLOAD_UNIT")
+    public String getUPLOAD_UNIT() {
+        return UPLOAD_UNIT;
+    }
+
+    public void setUPLOAD_UNIT(String UPLOAD_UNIT) {
+        this.UPLOAD_UNIT = UPLOAD_UNIT;
+    }
+
+    @Basic
+    @Column(name = "DATA_HOME_UNIT")
+    public String getDATA_HOME_UNIT() {
+        return DATA_HOME_UNIT;
+    }
+
+    public void setDATA_HOME_UNIT(String DATA_HOME_UNIT) {
+        this.DATA_HOME_UNIT = DATA_HOME_UNIT;
+    }
+
+    @Basic
+    @Column(name = "DATA_HOME_UNIT_NAME")
+    public String getDATA_HOME_UNIT_NAME() {
+        return DATA_HOME_UNIT_NAME;
+    }
+
+    public void setDATA_HOME_UNIT_NAME(String DATA_HOME_UNIT_NAME) {
+        this.DATA_HOME_UNIT_NAME = DATA_HOME_UNIT_NAME;
+    }
+
+    @Basic
+    @Column(name = "APPLY_REASON")
+    public String getAPPLY_REASON() {
+        return APPLY_REASON;
+    }
+
+    public void setAPPLY_REASON(String APPLY_REASON) {
+        this.APPLY_REASON = APPLY_REASON;
+    }
+
+    @Basic
+    @Column(name = "STATUS")
+    public String getSTATUS() {
+        return STATUS;
+    }
+
+    public void setSTATUS(String STATUS) {
+        this.STATUS = STATUS;
+    }
+
+    @Basic
+    @Column(name = "ERROR_TYPE")
+    public String getERROR_TYPE() {
+        return ERROR_TYPE;
+    }
+
+    public void setERROR_TYPE(String ERROR_TYPE) {
+        this.ERROR_TYPE = ERROR_TYPE;
+    }
+
+    @Basic
+    @Column(name = "UPLOAD_TIME")
+    public String getUPLOAD_TIME() {
+        return UPLOAD_TIME;
+    }
+
+    public void setUPLOAD_TIME(String UPLOAD_TIME) {
+        this.UPLOAD_TIME = UPLOAD_TIME;
+    }
+
+    @Basic
+    @Column(name = "CARD_ACCEPT_TIME")
+    public String getCARD_ACCEPT_TIME() {
+        return CARD_ACCEPT_TIME;
+    }
+
+    public void setCARD_ACCEPT_TIME(String CARD_ACCEPT_TIME) {
+        this.CARD_ACCEPT_TIME = CARD_ACCEPT_TIME;
+    }
+
+    @Basic
+    @Column(name = "PHONE")
+    public String getPHONE() {
+        return PHONE;
+    }
+
+    public void setPHONE(String PHONE) {
+        this.PHONE = PHONE;
+    }
+
+    @Id
+    @Column(name = "FILE_ID")
+    public String getFILE_ID() {
+        return FILE_ID;
+    }
+
+    public void setFILE_ID(String FILE_ID) {
+        this.FILE_ID = FILE_ID;
+    }
+
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) return true;
+        if (o == null || getClass() != o.getClass()) return false;
+        GATTrackEntity that = (GATTrackEntity) o;
+        return Objects.equals(NO, that.NO) && Objects.equals(UPLOAD_NO, that.UPLOAD_NO) && Objects.equals(ID_CARD, that.ID_CARD) && Objects.equals(ID_NO, that.ID_NO) && Objects.equals(NAME, that.NAME) && Objects.equals(UPLOAD_UNIT, that.UPLOAD_UNIT) && Objects.equals(DATA_HOME_UNIT, that.DATA_HOME_UNIT) && Objects.equals(DATA_HOME_UNIT_NAME, that.DATA_HOME_UNIT_NAME) && Objects.equals(APPLY_REASON, that.APPLY_REASON) && Objects.equals(STATUS, that.STATUS) && Objects.equals(ERROR_TYPE, that.ERROR_TYPE) && Objects.equals(UPLOAD_TIME, that.UPLOAD_TIME) && Objects.equals(CARD_ACCEPT_TIME, that.CARD_ACCEPT_TIME) && Objects.equals(PHONE, that.PHONE) && Objects.equals(FILE_ID, that.FILE_ID);
+    }
+
+    @Override
+    public int hashCode() {
+        return Objects.hash(NO, UPLOAD_NO, ID_CARD, ID_NO, NAME, UPLOAD_UNIT, DATA_HOME_UNIT, DATA_HOME_UNIT_NAME, APPLY_REASON, STATUS, ERROR_TYPE, UPLOAD_TIME, CARD_ACCEPT_TIME, PHONE, FILE_ID);
+    }
+}

src/main/java/com/yxproject/start/entity/GATTrackFileEntity.java

+package com.yxproject.start.entity;
+
+import javax.persistence.*;
+import java.util.Objects;
+
+/**
+ * @auther zhangyusheng
+ * 2019/3/1   10:39
+ */
+@Entity
+@Table(name = "FILE_NAME_DIC", schema = "YINGXIN", catalog = "")
+public class GATTrackFileEntity {
+    private String id;
+    private String upload_time;
+    private String time_ex;
+    private String time_en;
+    private String file_name;
+    @Id
+    @Column(name = "ID")
+    public String getId() {
+        return id;
+    }
+
+    public void setId(String id) {
+        this.id = id;
+    }
+    @Basic
+    @Column(name = "UPLOAD_TIME")
+    public String getUpload_time() {
+        return upload_time;
+    }
+
+    public void setUpload_time(String upload_time) {
+        this.upload_time = upload_time;
+    }
+    @Basic
+    @Column(name = "TIME_EX")
+    public String getTime_ex() {
+        return time_ex;
+    }
+    public void setTime_ex(String time_ex) {
+        this.time_ex = time_ex;
+    }
+    @Basic
+    @Column(name = "TIME_EN")
+    public String getTime_en() {
+        return time_en;
+    }
+
+    public void setTime_en(String time_en) {
+        this.time_en = time_en;
+    }
+    @Basic
+    @Column(name = "FILE_NAME")
+    public String getFile_name() {
+        return file_name;
+    }
+
+    public void setFile_name(String file_name) {
+        this.file_name = file_name;
+    }
+
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) return true;
+        if (o == null || getClass() != o.getClass()) return false;
+        GATTrackFileEntity that = (GATTrackFileEntity) o;
+        return Objects.equals(id, that.id) && Objects.equals(upload_time, that.upload_time) && Objects.equals(time_ex, that.time_ex) && Objects.equals(time_en, that.time_en) && Objects.equals(file_name, that.file_name);
+    }
+
+    @Override
+    public int hashCode() {
+        return Objects.hash(id, upload_time, time_ex, time_en, file_name);
+    }
+
+}

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

@@ -12,7 +12,7 @@ public interface CartogramMapper {
     /**
      *制证量统计图
      */
-    @Select("select task.CARD_TYPE code,dic.CARD_TYPE,to_char(task.ISSUED_DATE,'MM') dd,sum(gro.VALID_COUNT) num\n" +
+    @Select("select task.CARD_TYPE code,dic.CARD_TYPE,to_char(task.ISSUED_DATE,'MM') dd,NVL(sum(gro.VALID_COUNT),0) num\n" +
             "                        from TASK task \n" +
             "                      LEFT join GROUP_NO gro\n" +
             "                       on task.TASK_ID=gro.TASK_ID\n" +

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

@@ -22,12 +22,11 @@ public interface DetailReceiptListMapper {
      */
     @Select("select DETAIL_RECEIPT_LIST.id,DETAIL_RECEIPT_LIST.ACCEPT_NO,DETAIL_RECEIPT_LIST.SIGN_GOVT,DETAIL_RECEIPT_LIST.NAME,DETAIL_RECEIPT_LIST.UPLOAD_NO,\n" +
             "DETAIL_RECEIPT_LIST.sex,DETAIL_RECEIPT_LIST.CARD_ID,DETAIL_RECEIPT_LIST.POLICE_CODE,DIC_UPLOAD_UNIT_T.UNIT_NAME POLICE_NAME,to_char(RECEIPT_LIST.CHECK_DATE,'yyyyMMdd') CHECK_DATE,\n" +
-            "RECEIPT_LIST.CHECK_NAME,RECEIPT_LIST.CARD_TYPE_ID,RECEIPT_LIST.OLD_CARD_TYPE_ID,PERSON_POST.WAYBILL_NUMBER,DETAIL_RECEIPT_LIST.note,RECEIPT_LIST.QR_CODE,PROD_APPLY_INFO_T.APPLY_PHONE \n" +
+            "RECEIPT_LIST.CHECK_NAME,RECEIPT_LIST.CARD_TYPE_ID,RECEIPT_LIST.OLD_CARD_TYPE_ID,PERSON_POST.WAYBILL_NUMBER,DETAIL_RECEIPT_LIST.note,RECEIPT_LIST.QR_CODE,DETAIL_RECEIPT_LIST.APPLY_PHONE " +
             "from DETAIL_RECEIPT_LIST \n" +
             "left join RECEIPT_LIST on DETAIL_RECEIPT_LIST.RECEIPT_ID = RECEIPT_LIST.ID\n" +
             "left join PERSON_POST on PERSON_POST.FIRST_WHITE = DETAIL_RECEIPT_LIST.UPLOAD_NO\n" +
             "left join PRODYD_DBA.DIC_UPLOAD_UNIT_T@PRODYD_LINK on DIC_UPLOAD_UNIT_T.UPLOAD_UNIT_NO = DETAIL_RECEIPT_LIST.POLICE_CODE\n" +
-            "LEFT JOIN PROD_DBA.PROD_APPLY_INFO_T@PROD_LINK ON PROD_APPLY_INFO_T.UPLOAD_NO = DETAIL_RECEIPT_LIST.UPLOAD_NO\n"+
             "where RECEIPT_LIST.id in (${str}) order by DETAIL_RECEIPT_LIST.ACCEPT_NO ")
     public List<Map<String, Object>> selectPostDetails(@Param("str") String str);
 
@@ -86,4 +85,18 @@ public interface DetailReceiptListMapper {
     @Update("UPDATE DETAIL_RECEIPT_LIST set RECEIPT_ID = #{reciptId},POLICE_CODE= #{policeCode} where id =#{id}")
     public boolean updateDetailReceiptList(@Param("id") long id, @Param("reciptId") long reciptId,@Param("policeCode")String policeCode);
 
+    /**
+     * 查询导出GAT制证数据
+     *
+     * @return
+     */
+    @Select("select dr.name,dr.sex,dr.CARD_ID,dr.ADDRESS,dr.SIGN_GOVT,dr.BEGIN_DATE,dr.EXPIRE_DATE,dr.GAT_ID,dic.CARD_TYPE,tr.PHONE\n" +
+            "From RECEIPT_LIST rl\n" +
+            "left join DETAIL_RECEIPT_LIST dr on dr.RECEIPT_ID=rl.ID\n" +
+            "left join GAT_TRACK tr on dr.UPLOAD_NO=tr.UPLOAD_NO\n" +
+            "left join CARD_TYPE_DIC dic on rl.CARD_TYPE_ID=dic.CARD_TYPE_ID\n" +
+            "where rl.ID in (${str}) order by dr.UPLOAD_NO ")
+    public List<Map<String, Object>> selectPostDetailsGAT(@Param("str") String str);
+
+
 }

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

 package com.yxproject.start.mapper;
 
 import com.yxproject.start.entity.FileNameDicEntity;
+import com.yxproject.start.entity.GATTrackEntity;
+import com.yxproject.start.entity.GATTrackFileEntity;
 import org.apache.ibatis.annotations.*;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * @auther zhangyusheng
@@ -77,4 +80,30 @@ public interface FileNameDicMapper {
 
     @Delete("DELETE FROM FILE_NAME_DIC WHERE FILE_ID = #{fileId}")
     public void deleteFileAndPostData(@Param("fileId") String fileId);
+
+    /**
+     * 保存GAT跟踪表文件名
+     *
+     * @param gatFile
+     * @return
+     */
+    @Insert("INSERT INTO GAT_TRACK_FILE (ID,UPLOAD_TIME,TIME_EX,TIME_EN,FILE_NAME) " +
+            "VALUES (GATTR_FILE_ID_SEQ.nextval,#{upload_time},#{time_ex},#{time_en},#{file_name})")
+    @Options(useGeneratedKeys = true, keyProperty = "id", keyColumn = "ID")
+    public void saveGatFileName(GATTrackFileEntity gatFile);
+
+    /**
+     * 按条件查询港澳台跟踪文件导入信息
+     * @return
+     */
+    @Select("select fi.FILE_NAME,fi.ID,fi.TIME_EN,fi.TIME_EX,fi.UPLOAD_TIME,count(*) NUMSTR \n" +
+            "from GAT_TRACK tr left join GAT_TRACK_FILE fi  on fi.ID=tr.FILE_ID  \n" +
+            "where substr(fi.UPLOAD_TIME,0,8) BETWEEN #{date_ex} and #{date_en}\n" +
+            "GROUP by fi.FILE_NAME,fi.ID,fi.TIME_EN,fi.TIME_EX,fi.UPLOAD_TIME")
+    public List<Map<String,Object>> queryGATTRFile(@Param("date_ex") String date_ex,@Param("date_en") String date_en);
+
+    @Delete("delete from GAT_TRACK\n" +
+            "where FILE_ID=#{fileId} ")
+    public void deleteByGATTrFileId(@Param("fileId") String fileId);
+
 }

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

@@ -40,6 +40,9 @@ public interface GroupNoMapper {
     @Update("update GROUP_NO set SPECIAL_CARD_COUNT = #{specialCardCount} where id = #{id}")
     public boolean updateGroupNoSpecialCount(GroupNoEntity groupNoEntity);
 
+    @Select("SELECT COUNT(*) FROM GROUP_NO WHERE TASK_ID = #{TaskId} ")
+    public int selectGroupCount(@Param("TaskId") long TaskId);
+
     /**
      * 查询组号列表
      * 受理库

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

@@ -71,8 +71,8 @@ public interface LogMapper {
      * @param postCardCount
      * @return
      */
-    @Insert("INSERT INTO ANALYSIS (FILE_DIC_ID,FILE_ID,COMMON_CARD_COUNT,POST_CARD_COUNT) VALUES (#{fileDic},#{fileId},#{commonCardCount},#{postCardCount})")
-    public boolean insertIntoAnalysis(@Param("fileDic")String fileDic,@Param("fileId")String fileId,@Param("commonCardCount")String commonCardCount,@Param("postCardCount")String postCardCount);
+    @Insert("INSERT INTO ANALYSIS (FILE_DIC_ID,FILE_ID,COMMON_CARD_COUNT,POST_CARD_COUNT,ANALYSIS_DATE) VALUES (#{fileDic},#{fileId},#{commonCardCount},#{postCardCount},#{analysisDate})")
+    public boolean insertIntoAnalysis(@Param("fileDic")String fileDic,@Param("fileId")String fileId,@Param("commonCardCount")String commonCardCount,@Param("postCardCount")String postCardCount,@Param("analysisDate")String analysisDate);
 
 
     //查询解析数据

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

 package com.yxproject.start.mapper;
 
+import com.yxproject.start.entity.GATTrackEntity;
 import com.yxproject.start.entity.PersonPostEntity;
 import org.apache.ibatis.annotations.*;
 
@@ -44,6 +45,8 @@ public interface PersonPostMapper {
             " <when test='orderNumber!=\"\"'> and  PERSON_POST.ORDER_NUMBER=${orderNumber} </when>" +
             " <if test='state== 0 '> and  PERSON_POST.print_date is null  </if>" +
             " <if test='state== 1 '> and  PERSON_POST.print_date is not null  </if>" +
+            " <when test='district== 1 '> and  PERSON_POST.FIRST_WHITE like '110018%'  </when>" +
+            " <when test='district== 0 '> and  SUBSTR(PERSON_POST.FIRST_WHITE,0,6) != '110018'  </when>" +
             " <if test='notNull== 1 '> and  PERSON_POST.state1=1 </if>" +
             " <if test='notNull== 0 '> and  PERSON_POST.state1=0 </if>" +
             " <if test='notNull== 3 '> and  PERSON_POST.state1=3 </if>" +
@@ -57,7 +60,7 @@ public interface PersonPostMapper {
             "WHERE RN BETWEEN ${pageSize} AND ${firstIndex}" +
             " order by rn " +
             "</script>")
-    public List <PersonPostEntity> findAllPersonalData( @Param("applicantName") String applicantName, @Param("orderNumber") String orderNumber, @Param("state") String state, @Param("latticeMouthInformation") String latticeMouthInformation, @Param("getToCounty") String getToCounty, @Param("startDate") String startDate,@Param("endDate") String endDate, @Param("firstIndex") long firstIndex, @Param("pageSize") long pageSize, @Param("emailNo") String emailNo, @Param("notNull") int notNull , @Param("printDate")  String printDate);
+    public List <PersonPostEntity> findAllPersonalData( @Param("applicantName") String applicantName, @Param("orderNumber") String orderNumber, @Param("state") String state,@Param("district") String district, @Param("latticeMouthInformation") String latticeMouthInformation, @Param("getToCounty") String getToCounty, @Param("startDate") String startDate,@Param("endDate") String endDate, @Param("firstIndex") long firstIndex, @Param("pageSize") long pageSize, @Param("emailNo") String emailNo, @Param("notNull") int notNull , @Param("printDate")  String printDate);
 
 
     @Select("select ID,FIRST_WHITE,APPLICANT_NAME,NOTE from person_post where FIRST_WHITE=#{uploadId}")
@@ -77,6 +80,8 @@ public interface PersonPostMapper {
             " <when test='orderNumber!=\"\"'> and  PERSON_POST.ORDER_NUMBER=#{orderNumber} </when>" +
             " <when test='state== 0 '> and  PERSON_POST.print_date is null  </when>" +
             " <when test='state== 1 '> and  PERSON_POST.print_date is not null  </when>" +
+            " <when test='district== 1 '> and  PERSON_POST.FIRST_WHITE like '110018%'  </when>" +
+            " <when test='district== 0 '> and  SUBSTR(PERSON_POST.FIRST_WHITE,0,6) != '110018'  </when>" +
             " <if test='notNull== 1 '> and  PERSON_POST.state1=1 </if>" +
             " <if test='notNull== 0 '> and  PERSON_POST.state1=0 </if>" +
             " <if test='notNull== 3 '> and  PERSON_POST.state1=3 </if>" +
@@ -86,7 +91,7 @@ public interface PersonPostMapper {
             " <when test='printDate!=\"\"'> and  to_char(PERSON_POST.print_Date,'yyyyMMdd')=${printDate} </when>" +
             " order by PERSON_POST.id " +
             "</script>")
-    public int findPersonalDataCount( @Param("applicantName")String applicantName,@Param("orderNumber") String orderNumber,@Param("state") String state,@Param("latticeMouthInformation") String latticeMouthInformation,@Param("getToCounty") String getToCounty,@Param("startDate") String startDate,@Param("endDate") String endDate, @Param("emailNo")String emailNo,@Param("notNull")String notNull,@Param("printDate")String printDate);
+    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") String getToCounty,@Param("startDate") String startDate,@Param("endDate") String endDate, @Param("emailNo")String emailNo,@Param("notNull")String notNull,@Param("printDate")String printDate);
 
 
 
@@ -132,6 +137,8 @@ public interface PersonPostMapper {
 //            " <when test='hasPrinted!=\"\"'> and  PERSON_POST.STATE=#{hasPrinted} </when>" +
             " <when test='hasPrinted== 0 '> and  PERSON_POST.print_date is null  </when>" +
             " <when test='hasPrinted== 1 '> and  PERSON_POST.print_date is not null  </when>" +
+            " <when test='district== 1 '> and  PERSON_POST.FIRST_WHITE like '110018%'  </when>" +
+            " <when test='district== 0 '> and  SUBSTR(PERSON_POST.FIRST_WHITE,0,6) != '110018'  </when>" +
             " <when test='gkxx!=\"\"'> and  PERSON_POST.LATTICE_MOUTH_INFORMATION=#{gkxx} </when>" +
             " <when test='emailNo!=\"\"'> and  PERSON_POST.WAYBILL_NUMBER=TO_NUMBER(#{emailNo}) </when>" +
             " <when test='str!=\"\"'> and  PERSON_POST.GET_TO_COUNTY  in ( ${str} ) </when>" +
@@ -140,7 +147,7 @@ public interface PersonPostMapper {
             " <when test='notNull!=\"\"'> and  PERSON_POST.state1=${notNull} </when>" +
             " order by PERSON_POST.id " +
             "</script>")
-    public List <PersonPostEntity> findAllPersonalDataNoPage( @Param("sqrxm") String sqrxm, @Param("ddh") String ddh, @Param("hasPrinted") String hasPrinted,
+    public List <PersonPostEntity> findAllPersonalDataNoPage( @Param("sqrxm") String sqrxm, @Param("ddh") String ddh, @Param("hasPrinted") String hasPrinted,@Param("district") String district,
                                                               @Param("gkxx") String gkxx, @Param("str") String str, @Param("startDate") String startDate,@Param("endDate") String endDate, @Param("emailNo") String emailNo,@Param("printDate") String printDate,@Param("notNull") String notNull );
 
     @Select("SELECT distinct first_White,applicant_Name,recipient_Name,nature_Of_The_Information,ACCEPT_THE_MATTER " +
@@ -167,7 +174,7 @@ public interface PersonPostMapper {
             "on pp.FILE_ID=fi.id \n" +
             "left join COUNTY_DIC cd\n" +
             "on substr(dwdm,0,6）=cd.COUNTY_CODE\n" +
-            "where TO_CHAR(fi.UPLOAD_DATE,'yyyyMMdd') BETWEEN #{strDate} AND #{endDate}\n" +
+            "where pp.YXQQSRQ BETWEEN #{strDate} AND #{endDate}\n" +
             "and pp.CARD_TYPE_ID=0\n" +
             "group by cd.COUNTYNAME,fi.DWDM,fi.dwmc,pp.CARD_TYPE_ID " +
             "order by fi.DWDM \n" +
@@ -180,7 +187,7 @@ public interface PersonPostMapper {
             "on pp.FILE_ID=fi.id \n" +
             "left join COUNTY_DIC cd\n" +
             "on substr(dwdm,0,6）=cd.COUNTY_CODE\n" +
-            "where TO_CHAR(fi.UPLOAD_DATE,'yyyyMMdd') BETWEEN #{strDate} AND #{endDate}\n" +
+            "where pp.YXQQSRQ BETWEEN #{strDate} AND #{endDate}\n" +
             "and pp.CARD_TYPE_ID=9\n" +
             "group by cd.COUNTYNAME,fi.DWDM,fi.dwmc,pp.CARD_TYPE_ID   ) datab\n" +
             "on dataa.DWDM=datab.DWDM")
@@ -222,5 +229,10 @@ public interface PersonPostMapper {
     public List<Map<String,Object>> findAllPoarInvalidOrder( @Param("sqrxm") String sqrxm, @Param("ddh") String ddh, @Param("hasPrinted") String hasPrinted,
                                                               @Param("gkxx") String gkxx, @Param("str") String str, @Param("startDate") String startDate,@Param("endDate") String endDate, @Param("emailNo") String emailNo,@Param("printDate") String printDate,@Param("notNull") String notNull );
 
+    @Insert("insert into GAT_TRACK " +
+            "(NO,UPLOAD_NO,ID_CARD,ID_NO,NAME,UPLOAD_UNIT,DATA_HOME_UNIT,DATA_HOME_UNIT_NAME,APPLY_REASON,STATUS,ERROR_TYPE,UPLOAD_TIME,CARD_ACCEPT_TIME,PHONE,FILE_ID) " +
+            "values " +
+            "(#{NO},#{UPLOAD_NO},#{ID_CARD},#{ID_NO},#{NAME},#{UPLOAD_UNIT},#{DATA_HOME_UNIT},#{DATA_HOME_UNIT_NAME},#{APPLY_REASON},#{STATUS},#{ERROR_TYPE},#{UPLOAD_TIME},#{CARD_ACCEPT_TIME},#{PHONE},#{FILE_ID})")
+    public boolean saveGATtr(GATTrackEntity gatTr);
 
 }

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

@@ -331,14 +331,17 @@ public interface ReceiptMapper {
             "where DOWNLOAD_DATE is null and to_char(receipt_date,'yyyyMMdd') BETWEEN #{startDate} and #{endDate} order by receipt_date")
     public List<Map<String, Object>> selectPoliceData(@Param("startDate") String startDate,@Param("endDate") String endDate);
 
-    @Select("select RECEIPT_LIST.id,QR_CODE,to_char(DOWNLOAD_DATE,'yyyyMMddHH24') receipt_date ,\n" +
+    @Select("<script> select RECEIPT_LIST.id,QR_CODE,to_char(DOWNLOAD_DATE,'yyyyMMddHH24') receipt_date ,\n" +
             "POLICE_CODE,FINISH_COUNT,RECEIPT_LIST.CARD_TYPE_ID,DIC_UPLOAD_UNIT_T.UNIT_NAME GAJG_MC,CARD_TYPE_DIC.CARD_TYPE\n" +
             "from RECEIPT_LIST \n" +
             "left join PRODYD_DBA.DIC_UPLOAD_UNIT_T@PRODYD_LINK on DIC_UPLOAD_UNIT_T.UPLOAD_UNIT_NO = RECEIPT_LIST.POLICE_CODE\n" +
             "left join CARD_TYPE_DIC  on RECEIPT_LIST.CARD_TYPE_ID = CARD_TYPE_DIC.CARD_TYPE_ID\n" +
-            "where to_char(DOWNLOAD_DATE,'yyyyMMdd') BETWEEN #{startDate} and #{endDate}" +
-            " order by receipt_date")
-    public List<Map<String, Object>> selectPoliceDataByDownLoadDate(@Param("startDate") String startDate,@Param("endDate") String endDate);
+            "where to_char(DOWNLOAD_DATE,'yyyyMMdd') BETWEEN #{startDate} and #{endDate} " +
+            "<if test = 'gat !=\"\"'> " +
+            "AND RECEIPT_LIST.CARD_TYPE_ID in (5,7) " +
+            " </if>" +
+            " order by receipt_date </script> ")
+    public List<Map<String, Object>> selectPoliceDataByDownLoadDate(@Param("startDate") String startDate,@Param("endDate") String endDate,@Param("gat") String gat);
 
     @Select("<script> select * from DETAIL_RECEIPT_LIST " +
             "where to_char(SUBMIT_DATE,'yyyyMMdd') between #{startDate} and #{endDate} " +
@@ -402,9 +405,11 @@ public interface ReceiptMapper {
     public List<Map<String, Object>> selectYJZ(@Param("groupNo")String groupNo);
 
     //生成交接单详单
-    @Insert("INSERT INTO DETAIL_RECEIPT_LIST(UPLOAD_NO,accept_no,name,POLICE_CODE,card_id,SIGN_GOVT,RECEIPT_ID,SEX)\n" +
-            "select UPLOAD_NO,ACCEPT_NO,NAME,#{policeCode},ID_NO,SIGN_GOVT,#{receiptId},SEX_NO\n" +
-            "from PRODYD_DBA.prod_card_t@PRODYD_LINK cardT \n" +
+    @Insert("INSERT INTO DETAIL_RECEIPT_LIST(UPLOAD_NO,accept_no,name,POLICE_CODE,card_id,SIGN_GOVT,RECEIPT_ID,SEX,APPLY_PHONE)\n" +
+            "select cardT.UPLOAD_NO,cardT.ACCEPT_NO,cardT.NAME,#{policeCode},cardT.ID_NO,cardT.SIGN_GOVT,#{receiptId},cardT.SEX_NO,applyInfo.APPLY_PHONE\n" +
+            "from PRODYD_DBA.prod_card_t@PRODYD_LINK cardT " +
+            "LEFT JOIN PRODYD_DBA.PROD_APPLY_INFO_T@PRODYD_LINK applyInfo \n" +
+            "ON applyInfo.ACCEPT_NO = cardT.ACCEPT_NO\n" +
             "where cardT.ACCEPT_NO not in \n" +
             "(select ACCEPT_NO from  SPECIAL_CARD \n" +
             "where GROUP_NO like #{groupNo}  " +
@@ -412,6 +417,20 @@ public interface ReceiptMapper {
             "and  cardT.ACCEPT_NO like #{groupNo}")
     public boolean createDetailReceiptList(@Param("receiptId")String receiptId,@Param("groupNo")String groupNo,@Param("policeCode")String policeCode);
 
+    //生成交接单详单——港澳台
+    @Insert("INSERT INTO DETAIL_RECEIPT_LIST(UPLOAD_NO,accept_no,name,POLICE_CODE,card_id,SIGN_GOVT,RECEIPT_ID,SEX,APPLY_PHONE,GAT_ID,ADDRESS,EXPIRE_DATE,BEGIN_DATE)\n" +
+            "select cardT.UPLOAD_NO,cardT.ACCEPT_NO,cardT.NAME,#{policeCode},cardT.ID_NO,cardT.SIGN_GOVT,#{receiptId},cardT.SEX_NO,applyInfo.APPLY_PHONE," +
+            "cardT.CARD_NO,cardT.ADDR1||cardT.ADDR2||cardT.ADDR3,CARDT.EXPIRE_DATE,CARDT.BEGIN_DATE \n" +
+            "from PRODYD_DBA.prod_card_t@PRODYD_LINK cardT " +
+            "LEFT JOIN PRODYD_DBA.PROD_APPLY_INFO_T@PRODYD_LINK applyInfo \n" +
+            "ON applyInfo.ACCEPT_NO = cardT.ACCEPT_NO\n" +
+            "where cardT.ACCEPT_NO not in \n" +
+            "(select ACCEPT_NO from  SPECIAL_CARD \n" +
+            "where GROUP_NO like #{groupNo}  " +
+            " AND SPECIAL_TYPE<> 1 ) \n" +
+            "and  cardT.ACCEPT_NO like #{groupNo}")
+    public boolean createDetailReceiptList_GAT(@Param("receiptId")String receiptId,@Param("groupNo")String groupNo,@Param("policeCode")String policeCode);
+
     //查询历史交接单详单是否存在
     @Select("select detail_receipt_list.UPLOAD_NO,detail_receipt_list.ACCEPT_NO,detail_receipt_list.NAME,\n" +
             "detail_receipt_list.POLICE_CODE,detail_receipt_list.CARD_ID ,detail_receipt_list.NOTE,\n" +

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

@@ -143,6 +143,7 @@ public interface SelectSerialNumberMapper {
             "COUNTY_DIC.COUNTYNAME,\n" +
             "COUNTY_DIC.COUNTY_CODE,\n" +
             "ACC_CARD_T.NAME,\n" +
+            "ACC_CARD_T.UPLOAD_NO,\n" +
             "ACC_CARD_T.ID_NO,\n" +
             "ACC_CARD_T.SEX_NO,\n" +
             "AU.UNIT_NAME AS GAJG1,\n" +
@@ -159,7 +160,7 @@ public interface SelectSerialNumberMapper {
     public List<Map<String,Object>> selectByAcceptNoOrCardIdFromACC(String id);
 
     @Select("SELECT PROD_CARD_T.ACCEPT_NO,COUNTY_DIC.COUNTYNAME,COUNTY_DIC.COUNTY_CODE,PROD_CARD_T.NAME,\n" +
-            "PROD_CARD_T.ID_NO,PROD_CARD_T.SEX_NO,\n" +
+            "PROD_CARD_T.ID_NO,PROD_CARD_T.UPLOAD_NO,PROD_CARD_T.SEX_NO,\n" +
             "decode(CHECK_DATE,  null,decode(ELECTRIC_WRITE_DATE, null,decode(DOWNLOAD_DATE, null,1,2,5)),6) state,\n" +
             "decode(CHECK_DATE,  null,decode(ELECTRIC_WRITE_DATE, null,decode(DOWNLOAD_DATE, null,EXPORT_DATE,DOWNLOAD_DATE,ELECTRIC_WRITE_DATE)),CHECK_DATE) Last_date,\n" +
             "AU.UNIT_NAME AS GAJG1," +

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

@@ -946,9 +946,9 @@ public interface TaskListMapper {
      *  辅助库 废证
      * @return
      */
-    @Select("select  FAILED_CARD.work_group,FAILED_CARD.FAILED_CARD_ID task_id,task.COUNTY_CODE,task.SUBMIT_DATE,task.SUBMIT_NAME,task.ISSUED_DATE,task.ISSUED_NAME,\n" +
+    @Select("select   NVL(FAILED_CARD.work_group,TASK.work_group) work_group,FAILED_CARD.FAILED_CARD_ID task_id,task.COUNTY_CODE,task.SUBMIT_DATE,task.SUBMIT_NAME,task.ISSUED_DATE,task.ISSUED_NAME,\n" +
             "FAILED_CARD.PRINT_DATE PRINT_OUT_DATE,'' PRINT_OUT_NAME,'废证' CARD_TYPE ,'100' CARD_TYPE_ID,COUNTY_DIC.COUNTYNAME, \n" +
-            "1 VALID_COUNT,0 INVALID_COUNT, 0 SPECIAL_CARD_COUNT,FAILED_CARD.ACCEPT_NO GROUP_NO ,FAILED_CARD.work_group from FAILED_CARD \n" +
+            "1 VALID_COUNT,0 INVALID_COUNT, 0 SPECIAL_CARD_COUNT,FAILED_CARD.ACCEPT_NO GROUP_NO from FAILED_CARD \n" +
             "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" +
@@ -1276,7 +1276,7 @@ public interface TaskListMapper {
             "task.submit_date,FAILED_CARD.failed_card_id task_id,'废证' CARD_TYPE,'100' CARD_TYPE_ID,COUNTY_DIC.COUNTY_CODE,\n" +
             "COUNTY_DIC.COUNTYNAME, 1 VALID_COUNT, 0 INVALID_COUNT,0 SPECIAL_CARD_COUNT,\n" +
             "FAILED_CARD.ACCEPT_NO group_No, 0 faileCount\n" +
-            ",FAILED_CARD.work_group,prod_card_t.id_no,prod_card_t.name,decode(ALLOT_DATE,null,decode(FINISH_DATE,null,decode(FAILED_CARD.POSITION_DATE,null,decode(PRINT_DATE,null,FAILED_CARD.SUBMIT_DATE,PRINT_DATE),FAILED_CARD.POSITION_DATE),FINISH_DATE),ALLOT_DATE) last_date " +
+            ",NVL(FAILED_CARD.work_group,TASK.work_group) work_group,prod_card_t.id_no,prod_card_t.name,decode(ALLOT_DATE,null,decode(FINISH_DATE,null,decode(FAILED_CARD.POSITION_DATE,null,decode(PRINT_DATE,null,FAILED_CARD.SUBMIT_DATE,PRINT_DATE),FAILED_CARD.POSITION_DATE),FINISH_DATE),ALLOT_DATE) last_date " +
             " 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" +
@@ -1286,7 +1286,7 @@ public interface TaskListMapper {
             "where  FAILED_CARD.STATE =#{process} and FAILED_CARD.STATE!=FAILED_CARD.INITIATOR \n" +
             "group by 0, substr(prod_card_t.upload_no,0,9), DIC_UPLOAD_UNIT_T.UNIT_NAME, task.submit_date, FAILED_CARD.failed_card_id, \n" +
             "'废证', '100', COUNTY_DIC.COUNTY_CODE, COUNTY_DIC.COUNTYNAME, 1, 0, 0, FAILED_CARD.ACCEPT_NO, 0\n" +
-            ",FAILED_CARD.work_group,prod_card_t.id_no,prod_card_t.name,decode(ALLOT_DATE,null,decode(FINISH_DATE,null,decode(FAILED_CARD.POSITION_DATE,null,decode(PRINT_DATE,null,FAILED_CARD.SUBMIT_DATE,PRINT_DATE),FAILED_CARD.POSITION_DATE),FINISH_DATE),ALLOT_DATE) order by FAILED_CARD.FAILED_CARD_ID")
+            ",NVL(FAILED_CARD.work_group,TASK.work_group) ,prod_card_t.id_no,prod_card_t.name,decode(ALLOT_DATE,null,decode(FINISH_DATE,null,decode(FAILED_CARD.POSITION_DATE,null,decode(PRINT_DATE,null,FAILED_CARD.SUBMIT_DATE,PRINT_DATE),FAILED_CARD.POSITION_DATE),FINISH_DATE),ALLOT_DATE) order by FAILED_CARD.FAILED_CARD_ID")
     public List<Map<String,Object>> selectByCountyAtAuxiliary_failed3(@Param("process") long process);
 
 
@@ -1610,21 +1610,54 @@ public interface TaskListMapper {
     @Delete("delete task where task_id = ${taskId}")
     public boolean deleteTaskByTaskId(@Param("taskId")long taskId);
 
-    @Select("select a.card_type,a.finish_date,sum(a.valid_count) valid_count,sum(decode(a.failed_count,null,0,a.failed_count)) failed_count from (\n" +
-            "  select task.TASK_ID,card_type,to_char(punching_date,'yyyyMMdd') finish_date ,FAILED_CARD.failed_count,\n" +
-            "  sum(decode(group_no.VALID_COUNT,null,1,group_no.VALID_COUNT-group_no.SPECIAL_CARD_COUNT)) valid_count\n" +
-            "  from  task \n" +
-            "    left join group_no on task.TASK_ID = group_no.TASK_ID\n" +
-            "    left join SPECIAL_CARD on task.TASK_ID = SPECIAL_CARD.TASK_ID\n" +
-            "    left join (select TASK_ID,count(FAILED_CARD.accept_no) failed_count \n" +
-            "              from FAILED_CARD \n" +
-            "              group by TASK_ID\n" +
-            "              ) FAILED_CARD on FAILED_CARD.TASK_ID = task.TASK_ID\n" +
-            "  where to_char(punching_date,'yyyyMMdd') BETWEEN #{startDate} and #{endDate}  \n" +
-            "  group by  task.TASK_ID, card_type, to_char(punching_date,'yyyyMMdd'),  FAILED_CARD.failed_count\n" +
-            "  ) a group by a.card_type, a.finish_date")
+    @Select("select * from (\n" +
+            " select  \n" +
+            " a.finish_date,\n" +
+            " sum(decode(card_type,5,a.valid_count)) \"ga\",\n" +
+            " sum(decode(card_type,7,a.valid_count)) \"tw\",\n" +
+            " sum(decode(card_type,8,a.valid_count)) \"yd\",\n" +
+            " sum(decode(card_type,9,a.valid_count)) \"yj\"\n" +
+            " from \n" +
+            " ( select task.TASK_ID,card_type,to_char(punching_date,'yyyyMMdd') finish_date,\n" +
+            " sum(decode(group_no.VALID_COUNT,null,1,group_no.VALID_COUNT-group_no.SPECIAL_CARD_COUNT)) valid_count\n" +
+            " from task \n" +
+            " left join group_no on task.TASK_ID = group_no.TASK_ID\n" +
+            " left join SPECIAL_CARD on task.TASK_ID = SPECIAL_CARD.TASK_ID \n" +
+            " where to_char(punching_date,'yyyyMMdd') BETWEEN #{startDate} and #{endDate}\n" +
+            " group by task.TASK_ID, card_type, to_char(punching_date,'yyyyMMdd') ) a\n" +
+            " group by a.finish_date ) a\n" +
+            " left join (\n" +
+            " select to_char(punching_date,'yyyyMMdd') finish_date,\n" +
+            " count(decode(card_type,5,card_type)) \"gaf\",\n" +
+            " count(decode(card_type,7,card_type)) \"twf\",\n" +
+            " count(decode(card_type,8,card_type)) \"ydf\",\n" +
+            " count(decode(card_type,9,card_type)) \"yjf\"\n" +
+            " from task\n" +
+            "left join (\n" +
+            " select TASK_ID,count(FAILED_CARD.accept_no) failed_count\n" +
+            " from FAILED_CARD group by TASK_ID\n" +
+            " ) FAILED_CARD on FAILED_CARD.TASK_ID = task.TASK_ID \n" +
+            " where to_char(punching_date,'yyyyMMdd') BETWEEN #{startDate} and #{endDate}\n" +
+            " group by   to_char(punching_date,'yyyyMMdd')\n" +
+            " ) b\n" +
+            " on a.finish_date=b.finish_date\n" +
+            " left join (\n" +
+            " select to_char(FINISH_DATE,'yyyyMMdd') finish_date,\n" +
+            " count(decode(card_type,5,card_type)) \"gab\",\n" +
+            " count(decode(card_type,7,card_type)) \"twb\",\n" +
+            " count(decode(card_type,8,card_type)) \"ydb\",\n" +
+            " count(decode(card_type,9,card_type)) \"yjb\"\n" +
+            " from FAILED_CARD \n" +
+            " left join task\n" +
+            " on task.TASK_ID=FAILED_CARD.TASK_ID\n" +
+            " where to_char(FINISH_DATE,'yyyyMMdd') \n" +
+            " BETWEEN  #{startDate} and #{endDate} \n" +
+            " group by to_char(FINISH_DATE,'yyyyMMdd') ) c\n" +
+            " on a.finish_date=c.finish_date" +
+            " order by a.finish_date")
     public List<Map<String, Object>> selectQualityCheckReport(@Param("startDate")String startDate,@Param("endDate") String endDate);
 
+
     @Select("select to_char(FINISH_DATE,'yyyyMMdd')FINISH_DATE,count(FAILED_CARD.accept_no) failed_count \n" +
             "from FAILED_CARD \n" +
             "where to_char(FINISH_DATE,'yyyyMMdd') BETWEEN #{startDate} and #{endDate} \n" +
@@ -1646,4 +1679,7 @@ public interface TaskListMapper {
     @Delete("DELETE FROM POLICE_DIC WHERE POLICE_CODE = #{policeCode}")
     public boolean deletePolice(String policeCode);
 
+    @Update("UPDATE DATA_AUDITING SET TASK_ID = #{newTaskId} WHERE TASK_ID = #{oldTaskId} ")
+    public boolean updateTaskIdInDataAuditing (@Param("newTaskId")long newTaskId,@Param("oldTaskId")long oldTaskId);
+
 }

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

@@ -17,4 +17,7 @@ public interface DetailReceiptListService {
     public List<DetailReceiptListEntity> selectDetailReceiptListEntityByCardId(String cardID);
 
     public boolean updateDetailReceiptList(DetailReceiptListEntity detailReceiptListEntity,long reciptId);
+
+    public List<Map<String,Object>> selectPostDetailsGAT(List<Integer> list);
+
 }

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

 package com.yxproject.start.service;
 
 import com.yxproject.start.entity.FileNameDicEntity;
+import com.yxproject.start.entity.GATTrackEntity;
+import com.yxproject.start.entity.GATTrackFileEntity;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * @auther zhangyusheng
@@ -38,4 +41,27 @@ public interface FileNameDicService {
      * @param fileId
      */
     public void deleteFileByFileId(String fileId);
+
+    /**
+     * 保存个人邮寄信息字典表
+     * @param gatFile
+     * @return
+     */
+    public void saveGatFile(GATTrackFileEntity gatFile);
+
+    /**
+     * 查询个人邮寄信息字典表
+     * @param date_ex 开始时间
+     * @param date_en 截至时间
+     * @return
+     */
+    public List<Map<String,Object>>  queryGATTRFile(String date_ex, String date_en);
+
+
+    /**
+     * 根据文件id删除GAT excel文件信息
+     * @param fileId
+     */
+    public void deleteByGATTrFileId(String fileId);
+
 }

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

@@ -14,5 +14,6 @@ public interface GroupNoService {
     public boolean saveGroupNo(GroupNoEntity groupNoEntity);
     public List<GroupNoEntity> selectGroupNoEntityByGroupNo(String groupNo);
     public boolean updateGroupNoSpecialCount(GroupNoEntity groupNoEntity);
+    public int selectGroupCount(long TaskId);
     public  List<Map<String, Object>> selectAcceptNo(String cardId);
 }

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

@@ -34,7 +34,7 @@ public interface LogService {
 
     public List<String> selectId(@Param("uploadTime")String uploadTime);
 
-    public boolean insertIntoAnalysis(@Param("fileDic")String fileDic,@Param("fileId")String fileId,@Param("commonCardCount")String commonCardCount,@Param("postCardCount")String postCardCount);
+    public boolean insertIntoAnalysis(@Param("fileDic")String fileDic,@Param("fileId")String fileId,@Param("commonCardCount")String commonCardCount,@Param("postCardCount")String postCardCount,@Param("analysisDate")String analysisDate);
 
     public List<Map<String,Object>> selectFileIdByUploadDate(@Param("uploadDate")String uploadDate);
 

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

 package com.yxproject.start.service;
 
 import com.yxproject.start.dto.ReadCardDto;
+import com.yxproject.start.entity.GATTrackEntity;
 import com.yxproject.start.entity.PersonPostEntity;
 import net.sf.json.JSONArray;
 import org.apache.ibatis.annotations.Param;
@@ -27,7 +28,7 @@ public interface PersonPostService {
 
     public boolean savePersonPost(List<PersonPostEntity> personPostEntities);
 
-    public List<PersonPostEntity> findPersonalData(@Param("applicantName") String applicantName,@Param("orderNumber") String orderNumber,@Param("state") String state,@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);
+    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);
 
     public boolean deletePersonalData(String applicantName,String orderNumber,String state,String latticeMouthInformation,List<String> getToCounty,String starDate,String endDate);
 
@@ -37,11 +38,11 @@ public interface PersonPostService {
 
     public boolean printPostList(int id, Date printDateTime);
 
-    public int findPersonalDataCount(String applicantName, String orderNumber, String state, String latticeMouthInformation, List<String> getToCounty, String startDate,String endDate, String emailNo,String notNull,String printDate);
+    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);
 
     public int findPersonalDataCountByImportDate(String starDate,String endDate);
 
-    public List<PersonPostEntity> downLoadReportForm(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 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);
 
     public Map<String,Object> selectNote(@Param("uploadId")String uploadId);
 
@@ -63,4 +64,5 @@ public interface PersonPostService {
 
     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);
 
+    public boolean saveGATTrack(List<GATTrackEntity> gatTR);
 }

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

@@ -90,7 +90,7 @@ public interface ReceiptService {
 
     public List<Map<String,Object>> selectPoliceData(String startDate,String endDate);
 
-    public List<Map<String,Object>> selectPoliceDataByDownLoadDate(String startDate,String endDate);
+    public List<Map<String,Object>> selectPoliceDataByDownLoadDate(String startDate,String endDate,String gat);
 
     public List<Map<String,Object>> selectQrCodeByCardID(String id,String beginDate,String expireDate);
 

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

@@ -125,4 +125,6 @@ public interface TaskListService {
     public boolean updatePolice(String policeCode,String policeName,String newPoliceCode);
 
     public boolean deletePolice(String policeCode);
+
+    public boolean updateTaskIdInDataAuditing (long newTaskId,long oldTaskId);
 }

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

@@ -73,4 +73,17 @@ public class DetailReceiptListServiceImpl implements DetailReceiptListService {
     public boolean updateDetailReceiptList(DetailReceiptListEntity detailReceiptListEntity, long reciptId) {
         return detailReceiptListMapper.updateDetailReceiptList(detailReceiptListEntity.getId(), reciptId,detailReceiptListEntity.getPoliceCode());
     }
+
+    @Override
+    public List<Map<String, Object>> selectPostDetailsGAT(List<Integer> stringList) {
+        String str = "";
+        for (int i = 0; i < stringList.size(); i++) {
+            if (i == stringList.size() - 1) {
+                str += stringList.get(i);
+            } else {
+                str += stringList.get(i) + ",";
+            }
+        }
+        return detailReceiptListMapper.selectPostDetailsGAT(str);
+    }
 }

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

 package com.yxproject.start.service.impl;
 
 import com.yxproject.start.entity.FileNameDicEntity;
+import com.yxproject.start.entity.GATTrackEntity;
+import com.yxproject.start.entity.GATTrackFileEntity;
 import com.yxproject.start.mapper.FileNameDicMapper;
 import com.yxproject.start.mapper.PersonPostMapper;
 import com.yxproject.start.service.FileNameDicService;
@@ -9,6 +11,7 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * @auther zhangyusheng
@@ -22,6 +25,7 @@ public class FileNameDicServiceImpl implements FileNameDicService {
     private PersonPostMapper personPostMapper;
 
     @Override
+    @Transactional(rollbackFor = Exception.class)
     public void saveFileNameDic(FileNameDicEntity fileNameDicEntity) {
         fileNameDicMapper.saveFileNameDic(fileNameDicEntity);
     }
@@ -41,5 +45,22 @@ public class FileNameDicServiceImpl implements FileNameDicService {
         personPostMapper.deletePersonPostByFileId(fileId);
         fileNameDicMapper.deleteFileAndPostData(fileId);
     }
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void saveGatFile(GATTrackFileEntity gatFile) {
+        fileNameDicMapper.saveGatFileName(gatFile);
+    }
+
+    @Override
+    public  List<Map<String,Object>>  queryGATTRFile(String date_ex, String date_en) {
+        return fileNameDicMapper.queryGATTRFile(date_ex,date_en );
+    }
+    @Override
+    @Transactional
+    public void deleteByGATTrFileId(String fileId) {
+        fileNameDicMapper.deleteByGATTrFileId(fileId);
+    }
 
 }
+
+

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

@@ -47,6 +47,11 @@ public class GroupNoServiceImpl implements GroupNoService {
         return groupNoMapper.updateGroupNoSpecialCount(groupNoEntity);
     }
 
+    @Override
+    public int selectGroupCount(long TaskId) {
+        return groupNoMapper.selectGroupCount(TaskId);
+    }
+
     @Override
     public List<Map<String, Object>> selectAcceptNo(String cardId) {
         return groupNoMapper.selectAcceptNo(cardId);

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

@@ -7,12 +7,14 @@ import com.yxproject.start.entity.PreproPersonEntity;
 import com.yxproject.start.mapper.FilesMapper;
 import com.yxproject.start.mapper.PreproPersonMapper;
 import com.yxproject.start.service.ImportXmlService;
+import org.apache.log4j.Logger;
 import org.dom4j.Document;
 import org.dom4j.DocumentHelper;
 import org.dom4j.Element;
 import org.dom4j.io.OutputFormat;
 import org.dom4j.io.XMLWriter;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.jdbc.UncategorizedSQLException;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
@@ -29,6 +31,9 @@ import java.util.List;
  */
 @Service
 public class ImportXmlServiceImpl implements ImportXmlService {
+
+    Logger logger= Logger.getLogger(ImportXmlServiceImpl.class);
+
     @Autowired
     private PreproPersonMapper preproPersonMapper;
     @Autowired
@@ -43,7 +48,11 @@ public class ImportXmlServiceImpl implements ImportXmlService {
     @Override
     @Transactional(rollbackFor = Exception.class)
     public boolean importPersonXml( List<PreproPersonDto> preproPersonDtos, FilesEntity filesEntity) {
-        long l = filesMapper.insertFiles(filesEntity);
+        try {
+            long l = filesMapper.insertFiles(filesEntity);
+        }catch (UncategorizedSQLException e){
+            return false;
+        }
         SimpleDateFormat fo = new SimpleDateFormat("yyyyMMddhhmm");
         String uploadDate = fo.format(new Date());
         for (PreproPersonDto preproPersonDto : preproPersonDtos) {
@@ -79,10 +88,20 @@ public class ImportXmlServiceImpl implements ImportXmlService {
                 writer.close();
             } catch (IOException e) {
                 e.printStackTrace();
+                return false;
             }
-            preproPersonDto.setTpPath(url);
-            preproPersonMapper.savePreproPersonEntity(preproPersonDto);
+            try {
+                preproPersonDto.setTpPath(url);
+                boolean b = preproPersonMapper.savePreproPersonEntity(preproPersonDto);
+                if (!b){
+                    logger.error(preproPersonDto.getFileId()+"存儲失敗！");
+                }
 //            preproPersonMapper.savePreproPersonCLOB(preproPersonDto);
+            }catch (Exception e){
+                e.printStackTrace();
+                return false;
+            }
+
         }
         return true;
     }

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

@@ -111,8 +111,8 @@ public class LogServiceImpl implements LogService {
     }
 
     @Override
-    public boolean insertIntoAnalysis(String fileDic, String fileId, String commonCardCount, String postCardCount) {
-        logMapper.insertIntoAnalysis(fileDic,fileId,commonCardCount,postCardCount);
+    public boolean insertIntoAnalysis(String fileDic, String fileId, String commonCardCount, String postCardCount,String analysisDate) {
+        logMapper.insertIntoAnalysis(fileDic,fileId,commonCardCount,postCardCount,analysisDate);
         return true;
     }
 

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

 package com.yxproject.start.service.impl;
 
 import com.yxproject.start.dto.ReadCardDto;
+import com.yxproject.start.entity.GATTrackEntity;
 import com.yxproject.start.entity.PersonPostEntity;
 import com.yxproject.start.mapper.FileNameDicMapper;
 import com.yxproject.start.mapper.PersonPostMapper;
@@ -52,7 +53,7 @@ public class PersonPostServiceImpl implements PersonPostService {
         return true;
     }
     @Override
-    public List<PersonPostEntity> findPersonalData(String applicantName, String orderNumber, String state, String latticeMouthInformation, List<String> getToCounty, String startDate, String endDate, String firstIndex, String pageSize, String emailNo, int notNull, String printDate) {
+    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) {
         String str = "";
         long firstIndexLong = Long.valueOf(firstIndex);
         long pageSizeLong = Long.valueOf(pageSize);
@@ -63,7 +64,7 @@ public class PersonPostServiceImpl implements PersonPostService {
                 str += "'" + getToCounty.get(i) + "',";
             }
         }
-        List<PersonPostEntity> list = personPostMapper.findAllPersonalData(applicantName, orderNumber, state, latticeMouthInformation, str, startDate, endDate, firstIndexLong * pageSizeLong, (firstIndexLong - 1) * pageSizeLong + 1, emailNo, notNull, printDate);
+        List<PersonPostEntity> list = personPostMapper.findAllPersonalData(applicantName, orderNumber, state,district, latticeMouthInformation, str, startDate, endDate, firstIndexLong * pageSizeLong, (firstIndexLong - 1) * pageSizeLong + 1, emailNo, notNull, printDate);
         return list;
     }
 
@@ -96,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("latticeMouthInformation") String latticeMouthInformation, @Param("getToCounty") List<String> getToCounty, @Param("startDate") String startDate, @Param("endDate") String endDate, String emailNo, String notNull, String printDate) {
+    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) {
         String str = "";
         for (int i = 0; i < getToCounty.size(); i++) {
             if (i == getToCounty.size() - 1) {
@@ -105,7 +106,7 @@ public class PersonPostServiceImpl implements PersonPostService {
                 str += "'" + getToCounty.get(i) + "',";
             }
         }
-        int count = personPostMapper.findPersonalDataCount(applicantName, orderNumber, state, latticeMouthInformation, str, startDate, endDate, emailNo, notNull, printDate);
+        int count = personPostMapper.findPersonalDataCount(applicantName, orderNumber, state, district,latticeMouthInformation, str, startDate, endDate, emailNo, notNull, printDate);
         return count;
     }
 
@@ -116,7 +117,7 @@ public class PersonPostServiceImpl implements PersonPostService {
     }
 
     @Override
-    public List<PersonPostEntity> downLoadReportForm(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 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) {
         String str = "";
         for (int i = 0; i < jsonArray.size(); i++) {
             if (i == jsonArray.size() - 1) {
@@ -125,7 +126,7 @@ public class PersonPostServiceImpl implements PersonPostService {
                 str += "'" + jsonArray.get(i) + "',";
             }
         }
-        List<PersonPostEntity> list = personPostMapper.findAllPersonalDataNoPage(sqrxm, ddh, hasPrinted, gkxx, str, starDate, endDate, emailNo, printDate, notNull);
+        List<PersonPostEntity> list = personPostMapper.findAllPersonalDataNoPage(sqrxm, ddh, hasPrinted,district, gkxx, str, starDate, endDate, emailNo, printDate, notNull);
 
         return list;
     }
@@ -205,4 +206,13 @@ public class PersonPostServiceImpl implements PersonPostService {
 
         return list;
     }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public boolean saveGATTrack(List<GATTrackEntity> gatTR) {
+        for (GATTrackEntity gat : gatTR) {
+            personPostMapper.saveGATtr(gat);
+        }
+        return true;
+    }
 }

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

@@ -90,10 +90,10 @@ public class ReceiptServiceImpl implements ReceiptService {
     @Override
     public boolean updateReceiptList(String receiptId, String checkName, Date date) {
         receiptMapper.updateReceiptList(receiptId, checkName, date);
-        String taskId = receiptMapper.selectTaskId(receiptId);
-        if (taskId!=null){
-            receiptMapper.updateTaskListWithZJSJ(taskId,checkName,date);
-        }
+//        String taskId = receiptMapper.selectTaskId(receiptId);
+//        if (taskId!=null){
+//            receiptMapper.updateTaskListWithZJSJ(taskId,checkName,date);
+//        }
         return true;
     }
     @Override
@@ -329,8 +329,8 @@ public class ReceiptServiceImpl implements ReceiptService {
     }
 
     @Override
-    public List<Map<String, Object>> selectPoliceDataByDownLoadDate(String startDate, String endDate) {
-        List<Map<String, Object>> list = receiptMapper.selectPoliceDataByDownLoadDate(startDate, endDate);
+    public List<Map<String, Object>> selectPoliceDataByDownLoadDate(String startDate, String endDate,String gat) {
+        List<Map<String, Object>> list = receiptMapper.selectPoliceDataByDownLoadDate(startDate, endDate,gat);
         Map<String, Object> dateMap= new LinkedHashMap<>();
         for (Map<String, Object> map :list){
             if (dateMap.containsKey(map.get("RECEIPT_DATE")+"")){
@@ -518,7 +518,12 @@ public class ReceiptServiceImpl implements ReceiptService {
     ;
     @Override
     public boolean createDetailReceiptList(String receiptId,String groupNo,String policeCode) {
-        receiptMapper.createDetailReceiptList(receiptId,groupNo,policeCode);
+        if (groupNo.substring(0,1).equals("E")){
+            receiptMapper.createDetailReceiptList(receiptId,groupNo,policeCode);
+        }else {
+            receiptMapper.createDetailReceiptList_GAT(receiptId,groupNo,policeCode);
+        }
+
         return true;
     }
     private String createGroupNoMiss(List<String> c, List<String> nsList) {

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

@@ -13,10 +13,7 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import java.math.BigDecimal;
-import java.util.ArrayList;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 
 @Service
 public class TaskListServiceImpl implements TaskListService {
@@ -426,7 +423,7 @@ public class TaskListServiceImpl implements TaskListService {
             List<Map<String, Object>> mapList_fast = taskListMapper.selectByCountyAtAuxiliary_fast4(process, process - 1);
             //查询余证组号列表 在辅助库、制证库中
             List<Map<String, Object>> mapList_remaind = taskListMapper.selectByCountyAtAuxiliary_remaind4(process, process - 1);
-            //查询余证组号列表 在辅助库、制证库中
+            //查询廢证组号列表 在辅助库、制证库中
             List<Map<String, Object>> mapList_failed = taskListMapper.selectByCountyAtAuxiliary_failed3(process - 1);
             list = formateMap5(mapList_common);
             list.addAll(formateMap5(mapList_fast));
@@ -509,7 +506,7 @@ public class TaskListServiceImpl implements TaskListService {
         List<Map<String, Object>> mapList_fast = taskListMapper.selectByCountyAtAuxiliary_fast2(process, process - 1, Long.valueOf(workGroup));
         //查询余证组号列表 在辅助库、制证库中
         List<Map<String, Object>> mapList_remaind = taskListMapper.selectByCountyAtAuxiliary_remaind2(process, process - 1, Long.valueOf(workGroup));
-        //查询余证组号列表 在辅助库、制证库中
+        //查询廢证组号列表 在辅助库、制证库中
         List<Map<String, Object>> mapList_failed = taskListMapper.selectByCountyAtAuxiliary_failed2(process - 1, Long.valueOf(workGroup));
 
         list = formateMap2(mapList_common);
@@ -559,7 +556,7 @@ public class TaskListServiceImpl implements TaskListService {
         List<Map<String, Object>> mapList_fast = taskListMapper.selectByCountyAtAuxiliary_fast5(process, process - 1);
         //查询余证组号列表 在辅助库、制证库中
         List<Map<String, Object>> mapList_remaind = taskListMapper.selectByCountyAtAuxiliary_remaind5(process, process - 1);
-        //查询余证组号列表 在辅助库、制证库中
+        //查询廢证组号列表 在辅助库、制证库中
         List<Map<String, Object>> mapList_failed = taskListMapper.selectByCountyAtAuxiliary_failed5(process - 1);
 
         list = formateMap2(mapList_common);
@@ -1253,72 +1250,37 @@ public class TaskListServiceImpl implements TaskListService {
     @Override
     public List<Map<String, Object>> selectQualityCheckReport(String startDate, String endDate) {
         List<Map<String, Object>> mapList = taskListMapper.selectQualityCheckReport(startDate, endDate);
-        List<Map<String, Object>> maps = taskListMapper.selectQualityCheckReportBu(startDate, endDate);
-        Map<String,Object> dateMap = new LinkedHashMap<>();
-        Map<String,Object> stringObjectMap = new LinkedHashMap<>();
-        stringObjectMap.put("VALID_COUNT",0);
-        stringObjectMap.put("FAILED_COUNT",0);
-        int count =0;
-        int failedCount =0;
-        int buCount =0;
-
-        for (Map<String,Object> map  :mapList){
-            count+=Integer.valueOf(map.get("VALID_COUNT")+"");
-            failedCount+=Integer.valueOf(map.get("FAILED_COUNT")+"");
-            if (dateMap.containsKey(map.get("FINISH_DATE").toString())){
-                Map<String,Object> objectMap =(Map<String, Object>)dateMap.get(map.get("FINISH_DATE").toString());
-                objectMap.put(map.get("CARD_TYPE").toString(),map);
-                dateMap.put(map.get("FINISH_DATE").toString(),objectMap);
-            }else {
-                Map<String,Object> objectMap = new LinkedHashMap<>();
-                objectMap.put("0",stringObjectMap);
-                objectMap.put("1",stringObjectMap);
-                objectMap.put("2",stringObjectMap);
-                objectMap.put("5",stringObjectMap);
-                objectMap.put("6",stringObjectMap);
-                objectMap.put("7",stringObjectMap);
-                objectMap.put("8",stringObjectMap);
-                objectMap.put("9",stringObjectMap);
-                objectMap.put("bu",stringObjectMap);
-                objectMap.put(map.get("CARD_TYPE").toString(),map);
-                dateMap.put(map.get("FINISH_DATE").toString(),objectMap);
-            }
-        }
-        for (Map<String,Object> map :maps){
-            buCount+=Integer.valueOf(map.get("FAILED_COUNT")+"");
+        int[] type_count=new int[12];
+        Map<String, Object> countMap = new LinkedHashMap<>();
+        for (Map<String,Object> map  :mapList) {
+            type_count[0] =type_count[0]+(map.get("ga")==null?0:Integer.valueOf(map.get("ga")+""));
+            type_count[1] =type_count[1]+(map.get("gaf")==null?0:Integer.valueOf(map.get("gaf")+""));
+            type_count[2] =type_count[2]+(map.get("gab")==null?0:Integer.valueOf(map.get("gab")+""));
+            type_count[3] =type_count[3]+(map.get("tw")==null?0:Integer.valueOf(map.get("tw")+""));
+            type_count[4] =type_count[4]+(map.get("twf")==null?0:Integer.valueOf(map.get("twf")+""));
+            type_count[5] =type_count[5]+(map.get("twb")==null?0:Integer.valueOf(map.get("twb")+""));
+            type_count[6] =type_count[6]+(map.get("yd")==null?0:Integer.valueOf(map.get("yd")+""));;
+            type_count[7] =type_count[7]+(map.get("ydf")==null?0:Integer.valueOf(map.get("ydf")+"")); ;
+            type_count[8] =type_count[8]+(map.get("ydb")==null?0:Integer.valueOf(map.get("ydb")+"")); ;
+            type_count[9] =type_count[9]+(map.get("yj")==null?0:Integer.valueOf(map.get("yj")+""));;
+            type_count[10] =type_count[10]+(map.get("yjf")==null?0:Integer.valueOf(map.get("yjf")+"")); ;
+            type_count[11] =type_count[11]+(map.get("yjb")==null?0:Integer.valueOf(map.get("yjb")+"")); ;
         }
-        for (String date :dateMap.keySet()){
-
-            for (Map<String,Object> map :maps){
-                if (date.equals(map.get("FINISH_DATE").toString())){
-                    Map<String,Object> objectMap =(Map<String, Object>)dateMap.get(date);
-                    objectMap.put("bu",map);
-                    dateMap.put(map.get("FINISH_DATE").toString(),objectMap);
-                }
-            }
-        }
-        for (String date :dateMap.keySet()){
-            Map<String,Object> objectMap =(Map<String, Object>)dateMap.get(date);
-            List<Map<String,Object>> list = new ArrayList<>();
-            for (String cardType:objectMap.keySet()){
-                list.add((Map<String, Object>)objectMap.get(cardType));
-            }
-            dateMap.put(date,list);
-        }
-        Map<String,Object> objectMap = new LinkedHashMap<>();
-        objectMap.put("validCount",count);
-        objectMap.put("failedCount",failedCount);
-        objectMap.put("buCount",buCount);
-        dateMap.put("合计",objectMap);
-
-        List<Map<String,Object>> list = new ArrayList<>();
-        for(String date:dateMap.keySet()){
-            Map<String,Object> map = new LinkedHashMap<>();
-            map.put("date",date);
-            map.put("list",dateMap.get(date));
-            list.add(map);
-        }
-        return list;
+        countMap.put("ga",type_count[0]);
+        countMap.put("gaf",type_count[1]);
+        countMap.put("gab",type_count[2]);
+        countMap.put("tw",type_count[3]);
+        countMap.put("twf",type_count[4]);
+        countMap.put("twb",type_count[5]);
+        countMap.put("yd",type_count[6]);
+        countMap.put("ydf",type_count[7]);
+        countMap.put("ydb",type_count[8]);
+        countMap.put("yj",type_count[9]);
+        countMap.put("yjf",type_count[10]);
+        countMap.put("yjb",type_count[11]);
+        countMap.put("FINISH_DATE","合计");
+        mapList.add(countMap);
+        return mapList;
     }
 
     @Override
@@ -1346,6 +1308,11 @@ public class TaskListServiceImpl implements TaskListService {
         return taskListMapper.deletePolice(policeCode);
     }
 
+    @Override
+    public boolean updateTaskIdInDataAuditing (long newTaskId,long oldTaskId){
+        return taskListMapper.updateTaskIdInDataAuditing(newTaskId,oldTaskId);
+    }
+
 //    private String createGroupNoMiss(List<String> c, List<String> nsList) {
 //        try {
 //            String groupNo = "";

src/main/java/com/yxproject/start/utils/ExportExcel.java

@@ -46,6 +46,8 @@ public  class ExportExcel {
         sheet.setColumnWidth(11, 30 * 110);
         sheet.setColumnWidth(12, 30 * 110);
         sheet.setColumnWidth(13, 30 * 110);
+        sheet.setColumnWidth(14, 30 * 110);
+        sheet.setColumnWidth(15, 30 * 110);
         //第三步创建行row:添加表头0行
         HSSFRow row = sheet.createRow(0);
         HSSFCellStyle style = wb.createCellStyle();//样式
@@ -122,7 +124,6 @@ public  class ExportExcel {
             cell.setCellValue("null".equals(mapList.get(i).get("NOTE")+"")?"":mapList.get(i).get("NOTE")+"");
             cell = row.createCell(15);         //设定值
             cell.setCellValue("null".equals(mapList.get(i).get("APPLY_PHONE")+"")?"":mapList.get(i).get("APPLY_PHONE")+"");
-
         }
 
         HSSFSheet sheet1 = wb.createSheet("公安网信息交接表");
@@ -380,6 +381,122 @@ public  class ExportExcel {
     }
 
 
+    /**
+     * 导出公安网信息GAT
+     * @param mapList 公安网信息
+     */
+    public static void exportExcelDateGAT(List<Map<String,Object>> mapList, HttpServletResponse response, HttpServletRequest request){
+        //第一步创建workbook
+        HSSFWorkbook wb = new HSSFWorkbook();
+        SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd");
+        HSSFSheet sheet = wb.createSheet("GAT_TRACK");
+        sheet.setColumnWidth(0, 30 * 110);
+        sheet.setColumnWidth(1, 30 * 110);
+        sheet.setColumnWidth(2, 40 * 110);
+        sheet.setColumnWidth(3, 50 * 110);
+        sheet.setColumnWidth(4, 80 * 110);
+        sheet.setColumnWidth(5, 40 * 110);
+        sheet.setColumnWidth(6, 30 * 110);
+        sheet.setColumnWidth(7, 30 * 110);
+        sheet.setColumnWidth(8, 30 * 110);
+        sheet.setColumnWidth(9, 30 * 110);
+        sheet.setColumnWidth(10, 30 * 110);
+        //第三步创建行row:添加表头0行
+        HSSFRow row = sheet.createRow(0);
+        HSSFCellStyle style = wb.createCellStyle();//样式
+        style.setWrapText(true);//设置自动换行
+        HSSFFont font = wb.createFont();
+        font.setFontHeightInPoints((short) 12);
+        style.setFont(font);
+        row = sheet.createRow(0);                     //创建下标为0的单元格
+        row.setHeightInPoints(Short.parseShort("20"));//设置行高
+        HSSFCell cell = row.createCell(0);         //设定值
+        cell.setCellValue("姓名");
+        cell = row.createCell(1);         //设定值
+        cell.setCellValue("性别");
+        cell = row.createCell(2);         //设定值
+        cell.setCellValue("出生日期");
+        cell = row.createCell(3);         //设定值
+        cell.setCellValue("证件号码");
+        cell = row.createCell(4);         //设定值
+        cell.setCellValue("住址");
+        cell = row.createCell(5);         //设定值
+        cell.setCellValue("签发机关");
+        cell = row.createCell(6);         //设定值
+        cell.setCellValue("起始有效期");
+        cell = row.createCell(7);         //设定值
+        cell.setCellValue("截至有效期");
+        cell = row.createCell(8);         //设定值
+        cell.setCellValue("通行证号");
+        cell = row.createCell(9);         //设定值
+        cell.setCellValue("证件类型");
+        cell = row.createCell(10);         //设定值
+        cell.setCellValue("联系电话");
+        String sex="";
+        for (int i =0;i<mapList.size();i++){
+            row = sheet.createRow(i + 1);
+            cell = row.createCell(0);         //设定值
+            cell.setCellValue("null".equals(mapList.get(i).get("NAME")+"")?"":mapList.get(i).get("NAME")+"");
+            cell = row.createCell(1);         //设定值
+            sex="null".equals(mapList.get(i).get("SEX")+"")?"":mapList.get(i).get("SEX")+"";
+            cell.setCellValue(sex.equals("2")?"女":"男");
+            cell = row.createCell(2);         //设定值
+            cell.setCellValue("null".equals(mapList.get(i).get("CARD_ID")+"")?"":mapList.get(i).get("CARD_ID").toString().substring(6,13));
+            cell = row.createCell(3);         //设定值
+            cell.setCellValue("null".equals(mapList.get(i).get("CARD_ID")+"")?"":mapList.get(i).get("CARD_ID")+"");
+            cell = row.createCell(4);         //设定值
+            cell.setCellValue("null".equals(mapList.get(i).get("ADDRESS")+"")?"":mapList.get(i).get("ADDRESS")+"");
+            cell = row.createCell(5);         //设定值
+            cell.setCellValue("null".equals(mapList.get(i).get("SIGN_GOVT")+"")?"":mapList.get(i).get("SIGN_GOVT")+"");
+            cell = row.createCell(6);         //设定值
+            cell.setCellValue("null".equals(mapList.get(i).get("BEGIN_DATE")+"")?"":mapList.get(i).get("BEGIN_DATE")+"");
+            cell = row.createCell(7);         //设定值
+            cell.setCellValue("null".equals(mapList.get(i).get("EXPIRE_DATE")+"")?"":mapList.get(i).get("EXPIRE_DATE")+"");
+            cell = row.createCell(8);         //设定值
+            cell.setCellValue("null".equals(mapList.get(i).get("GAT_ID")+"")?"":mapList.get(i).get("GAT_ID")+"");
+            cell = row.createCell(9);         //设定值
+            cell.setCellValue("null".equals(mapList.get(i).get("CARD_TYPE")+"")?"":mapList.get(i).get("CARD_TYPE")+"");
+            cell = row.createCell(10);         //设定值
+            cell.setCellValue("null".equals(mapList.get(i).get("PHONE")+"")?"":mapList.get(i).get("PHONE")+"");
+        }
+        //第六步将生成excel文件保存到指定路径下
+        try {
+            String fileName = "GAT_info_"+getCurrentDate2String("yyyy-MM-dd")+"_"+mapList.size() + ".xls";
+            String rtn = "";
+            fileName = URLEncoder.encode(fileName, "UTF8");
+            String userAgent = request.getHeader("User-Agent");
+            /*针对IE或者以IE为内核的浏览器：*/
+            if (userAgent != null) {
+                userAgent = userAgent.toLowerCase();
+                /*IE浏览器，只能采用URLEncoder编码*/
+                if (userAgent.contains("msie")) {
+                    rtn = "filename=\"" + fileName + "\"";
+                }
+                /*Opera浏览器只能采用filename**/
+                else if (userAgent.contains("opera")) {
+                    rtn = "filename*=UTF-8''" + fileName;
+                }
+                /*Safari浏览器，只能采用ISO编码的中文输出*/
+                else if (userAgent.contains("safari")) {
+                    rtn = "filename=\"" + new String(fileName.getBytes(StandardCharsets.UTF_8), "ISO8859-1") + "\"";
+                }
+                /* FireFox浏览器，可以使用MimeUtility或filename*或ISO编码的中文输出*/
+                else if (userAgent.contains("mozilla")) {
+                    rtn = "filename*=UTF-8''" + fileName;
+                }
+            }
+            response.setContentType("application/vnd.ms-excel");
+            response.setHeader("Content-Disposition", "attachment;" + rtn);
+            response.setCharacterEncoding("UTF-8");
+            OutputStream fout =  response.getOutputStream();
+            wb.write(fout);
+            fout.flush();
+            fout.close();
+        } catch (IOException e) {
+            e.printStackTrace();
+        }
+    }
+
 
 
 }

src/main/java/com/yxproject/start/utils/ReadExcel.java

@@ -129,6 +129,64 @@ public class ReadExcel {
                         String cellinfo = sheet.getCell(j, i).getContents();
 //                        if(cellinfo.isEmpty()){
 //                            continue;
+//                        }
+                        innerList.add(cellinfo);
+                    }
+                    outerList.add(i, innerList);
+                }
+                return outerList;
+            }
+        } catch (FileNotFoundException e) {
+            e.printStackTrace();
+        } catch (BiffException e) {
+            e.printStackTrace();
+        } catch (IOException e) {
+            e.printStackTrace();
+        }
+        return null;
+    }
+
+    // 去读Excel的方法readExcel，该方法的入口参数为一个File对象
+    public List readExcelGAT(File file) {
+        try {
+//            // 创建输入流，读取Excel
+//            InputStream is = new FileInputStream(file.getAbsolutePath());
+            // jxl提供的Workbook类
+            Workbook wb = Workbook.getWorkbook(file);
+            // Excel的页签数量
+            int sheet_size = wb.getNumberOfSheets();
+            for (int index = 0; index < sheet_size; index++) {
+                List<List> outerList=new ArrayList<List>();
+                // 每个页签创建一个Sheet对象
+                Sheet sheet = wb.getSheet(index);
+                // sheet.getRows()返回该页的总行数
+                for (int i = 0; i < sheet.getRows(); i++) {
+                    List innerList=new ArrayList();
+                    String columns0 = sheet.getCell(0,i).getContents();
+                    String columns1 = sheet.getCell(1,i).getContents();
+                    String columns2 = sheet.getCell(2,i).getContents();
+                    String columns3 = sheet.getCell(3,i).getContents();
+                    String columns4 = sheet.getCell(4,i).getContents();
+                    String columns5 = sheet.getCell(5,i).getContents();
+                    String columns6 = sheet.getCell(6,i).getContents();
+                    String columns7 = sheet.getCell(7,i).getContents();
+                    String columns8 = sheet.getCell(8,i).getContents();
+                    String columns9 = sheet.getCell(9,i).getContents();
+                    String columns10 = sheet.getCell(10,i).getContents();
+                    String columns11 = sheet.getCell(11,i).getContents();
+                    String columns12 = sheet.getCell(12,i).getContents();
+                    String columns13 = sheet.getCell(13,i).getContents();
+                    if (columns0.equals("")&&columns1.equals("")&&columns2.equals("")&&columns3.equals("")&&
+                            columns4.equals("")&&columns5.equals("")&&columns6.equals("")&&columns7.equals("")&&
+                            columns8.equals("")&&columns9.equals("")&&columns10.equals("")&&columns11.equals("")&&columns12.equals("")&&
+                            columns13.equals("")){
+                        continue;
+                    }
+                    // sheet.getColumns()返回该页的总列数
+                    for (int j = 0; j < sheet.getColumns(); j++) {
+                        String cellinfo = sheet.getCell(j, i).getContents();
+//                        if(cellinfo.isEmpty()){
+//                            continue;
 //                        }
                         innerList.add(cellinfo);
                     }

src/main/resources/static/index.html

@@ -213,7 +213,7 @@
 <script src="views/insertCardBody/insertCardBody.js"></script>
 <script src="views/filmManagement/filmManagement.js"></script>
 <script src="views/cardReport/cardReport.js"></script>
-<script src="views/filmReport/filmReport.js"></script>
+<!--<script src="views/filmReport/filmReport.js"></script>-->
 <script src="views/dataCheckReport/dataCheckReport.js"></script>
 <script src="views/blank/blank.js"></script>
 <script src="views/addBackCard/addBackCard.js"></script>
@@ -225,6 +225,7 @@
 <script src="views/machinePackageImport/machinePackageImport.js"></script>
 <script src="views/addAuditFailure/addAuditFailure.js"></script>
 <script src="views/historyTagPrint/historyTagPrint.js"></script>
+<script src="views/gatTrack/gatTrack.js"></script>
 
 </body>
 </html>
\ No newline at end of file

src/main/resources/static/js/app.js

@@ -37,7 +37,7 @@ angular.module('AvatarCheck', [
     'AvatarCheck.insertFilm',
     'AvatarCheck.insertCardBody',
     'AvatarCheck.filmManagement',
-    'AvatarCheck.filmReport',
+    // 'AvatarCheck.filmReport',
     "AvatarCheck.dataCheckReport",
     'AvatarCheck.cardReport',
     'AvatarCheck.addBackCard',
@@ -49,7 +49,8 @@ angular.module('AvatarCheck', [
     "AvatarCheck.machinePackageImport",
     "AvatarCheck.historyTagPrint",
     'AvatarCheck.blank',
-    'AvatarCheck.addAuditFailure'
+    'AvatarCheck.addAuditFailure',
+    'AvatarCheck.gatTrack'
 ]).config(['$locationProvider', '$routeProvider', 'localStorageServiceProvider', '$qProvider',function ($locationProvider, $routeProvider, localStorageServiceProvider, $qProvider) {
         $locationProvider.hashPrefix('!');
         $routeProvider.otherwise({redirectTo: '/blank'});
@@ -214,9 +215,9 @@ angular.module('AvatarCheck', [
         if($location.path()=="/cardReport"){
             $rootScope.tab = '/cardReport';
         }
-        if($location.path()=="/filmReport"){
-            $rootScope.tab = '/filmReport';
-        }
+        // if($location.path()=="/filmReport"){
+        //     $rootScope.tab = '/filmReport';
+        // }
         if($location.path()=="/dataCheckReport"){
             $rootScope.tab = '/dataCheckReport';
         }
@@ -238,6 +239,9 @@ angular.module('AvatarCheck', [
         if($location.path()=="/machinePackageImport"){
             $rootScope.tab = '/machinePackageImport';
         }
+        if($location.path()=="/gatTrack"){
+            $rootScope.tab = '/gatTrack';
+        }
 
 
 

src/main/resources/static/js/service.js

@@ -1123,14 +1123,14 @@ angular.module('AvatarCheck.http', ['ngDialog', 'LocalStorageModule'])
                     success(response.data)
                 })
             },
-            getHistoryGongan:function(startDate,endDate,success){
-                console.log(startDate,endDate);
+            getHistoryGongan:function(startDate,endDate,str,success){
                 $http({
                     method: 'GET',
                     url: "../ReceiptApi/queryPoliceDataByDownLoadDate"+urlTimeStamp(),
                     params:{
                         startDate:startDate,
-                        endDate:endDate
+                        endDate:endDate,
+                        gat:str
                     }
                 }).then(function successCallback(response) {
                     success(response.data)
@@ -2028,5 +2028,40 @@ angular.module('AvatarCheck.http', ['ngDialog', 'LocalStorageModule'])
                     success(response.data)
                 })
             },
+            uploadGATFile:function(date1,date2,fd,success){
+                $http({
+                    method: 'POST',
+                    url: "../ReadExcel/ReadGATTrack?formStartTime="+date1+"&formDeadLine="+date2,
+                    data: fd,
+                    headers: {'Content-Type': undefined},
+                    transformRequest: angular.identity
+                }).then(function successCallback(response) {
+                    success(response.data)
+                })
+            },
+            selectGATTrack:function(date_ex,date_en,success){
+              $http({
+                    method: 'GET',
+                    url: "../ReadExcel/queryGATTrack"+urlTimeStamp(),
+                    params:{
+                        date_ex:date_ex,
+                        date_en:date_en
+                    }
+                }).then(function successCallback(response) {
+                    success(response.data)
+                })
+            },deleteByGATTrFileId:function(fileId,success){
+                console.log(fileId)
+                $http({
+                    method: 'GET',
+                    url: "../ReadExcel/deleteByGATTrFileId"+urlTimeStamp(),
+                    params:{
+                        fileId:fileId
+                    }
+                }).then(function successCallback(response) {
+                    console.log(response.data)
+                    success(response.data)
+                })
+            },
         }
     });
\ No newline at end of file

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

@@ -107,7 +107,8 @@ angular.module('AvatarCheck.addFailed', ['ngRoute', 'AvatarCheck.http'])
                     json.note=result[i][1];
                     json.failedCardReasonId=result[i][2];
                     json.initiator = $rootScope.loginData.roleList[0].process;
-                    json.name=$rootScope.loginData.name
+                    json.name=$rootScope.loginData.name;
+                    json.workGroup= $rootScope.loginData.workGroup;
                     list.push(json)
                 }
             }

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

 <div class="content row">
+
       <div class="col-md-12" style="margin-top:20px;">
           <div class="row">
               <!-- /.col -->
@@ -7,12 +8,15 @@
                       <div class="box-header" style="border-bottom: 1px solid #e0e0e0;">
                           <strong>公安网反馈信息</strong>
                           <div class="box-tools pull-right" >
-                              <span>交接日期：</span>
+                             <span>交接日期：</span>
                               <input type="text" style="height: 30px;margin-right: 10px;border-radius: 4px;background-color: #eee;cursor: not-allowed;border: 1px solid #ccc;" ng-model="choseDate1" id="datepicker1" readonly/>
                               <span>至</span>
                               <input type="text" style="height: 30px;margin-right: 10px;border-radius: 4px;background-color: #eee;cursor: not-allowed;border: 1px solid #ccc;" ng-model="choseDate" id="datepicker2" readonly/>
-                              <button type="button" class="btn btn-primary pull-right" style="height: 30px;line-height: 17px;margin-left: 10px;" ng-click="searchHistory()">查询历史</button>
-                              <button type="button" class="btn btn-primary pull-right" style="height: 30px;line-height: 17px;" ng-click="doSearchGongan()">查询</button>
+
+                              <button type="button" class="btn btn-primary pull-right" style="height: 30px;line-height: 17px;margin-left: 5px;" ng-click="searchHistory('')">查询历史</button>
+                              <button type="button" class="btn btn-primary pull-right" style="height: 30px;line-height: 17px;margin-left: 5px;" ng-click="doSearchGongan()">查询</button>
+                              <button type="button" class="btn btn-success pull-right" style="height: 30px;line-height: 17px;margin-left: 5px;" ng-click="searchHistory('gat')" ng-if="process==9">查询港澳台历史</button>
+
                           </div>
                           <!-- /.box-tools -->
                       </div>
@@ -132,6 +136,9 @@
                                 <div class="pull-right" style="margin-left: 10px;">
                                     <button class="btn btn-primary" ng-click="downloadGongan()">下载公安网反馈信息</button>
                                 </div>
+                                <div class="pull-right" style="margin-left: 10px;" ng-if="process==9">
+                                    <button class="btn btn-success" ng-click="downloadGonganGAT()">下载港澳台信息</button>
+                                </div>
                             </div>
                             <div ng-if="gonganHistoryData.length==0">
                               <h4>暂无数据</h4>

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

@@ -53,7 +53,6 @@ angular.module('AvatarCheck.downloadGongan', ['ngRoute', 'AvatarCheck.http'])
                         listStr += json.list[i]
                     }
                 }
-                console.log($rootScope.loginData.name)
                 var url = '../exportExcel/printExcelData?name='+$rootScope.loginData.name+"&isHistory="+$scope.isHistory+"&list="+listStr;
                 var a = document.createElement("a");
                 document.body.appendChild(a);
@@ -62,7 +61,23 @@ angular.module('AvatarCheck.downloadGongan', ['ngRoute', 'AvatarCheck.http'])
                 $scope.doSearchGongan();
             }
         };
-
+        $scope.downloadGonganGAT = function(){
+            var listStr ="";
+            var checks = $(".checkPoliceBox:checked");
+            for (var i=0;i<checks.length;i++){
+                listStr+=checks[i].value+","
+            }
+            if(checks.length==0){
+                MessageService.showAlert("请选择要下载的分局或派出所")
+            }else{
+                var url = '../exportExcel/printExcelDataGAT?list='+listStr;
+                var a = document.createElement("a");
+                document.body.appendChild(a);
+                a.href = encodeURI(url);
+                a.click();
+                $scope.doSearchGongan();
+            }
+        };
         $scope.taskId=-1;
         $scope.showPoliceList = function(index) {
             if($scope.taskId==-1){
@@ -113,18 +128,18 @@ angular.module('AvatarCheck.downloadGongan', ['ngRoute', 'AvatarCheck.http'])
                         $scope.gonganData[i].isActive=false;
                     }
                 }
-                console.log($scope.gonganData,"点击查询公安网反馈");
             })
         };
         if($rootScope.loginData.login==true){
             $scope.doSearchGongan();
+            $scope.process= $rootScope.loginData.roleList[0].process;
         }
 
-        $scope.searchHistory = function () {
+        $scope.searchHistory = function (str) {
             $scope.isHistory = 1;
             var startDate=$('#datepicker1').val();
             var endDate=$('#datepicker2').val();
-            HttpService.getHistoryGongan(startDate,endDate,function(data){
+            HttpService.getHistoryGongan(startDate,endDate, str,function(data){
                 $scope.gonganHistoryData=data;
                 for(var i=0;i<$scope.gonganHistoryData.length;i++){
                     if(i==$scope.currentTab){
@@ -133,16 +148,16 @@ angular.module('AvatarCheck.downloadGongan', ['ngRoute', 'AvatarCheck.http'])
                         $scope.gonganHistoryData[i].isActive=false;
                     }
                 }
-                console.log($scope.gonganHistoryData);
             })
+
+
+
         }
 
 
         $scope.checkAllPolice = function ($event,date) {
-            console.log(date)
             var checkAllPolice = $event.target;
             var checkbox =document.getElementsByName("checkPolice"+date);
-            console.log(checkbox.length);
             for(var i=0;i<checkbox.length;i++){
                 if(checkAllPolice.checked) {
                     checkbox[i].checked = true;

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

+<div class="content row">
+
+    <div class="col-md-12" style="margin-top:20px;">
+        <div class="box">
+            <strong class="box-header">港澳台跟踪文件上传</strong>
+            <div class="box-primary">
+                <table class="table table-bordered text-center">
+                    <tr>
+                        <td>文件起始日期：</td>
+                        <td>
+                            <div class="input-group date">
+                                <div class="input-group-addon">
+                                    <i class="fa fa-calendar"></i>
+                                </div>
+                                <input type="text"
+                                       class="form-control pull-right"
+                                       ng-model="choseDate"
+                                       id="datepicker1" readonly/>
+                            </div>
+                        </td>
+                        <td> 文件截止日期：</td>
+                        <td>
+                            <div class="input-group date">
+                                <div class="input-group-addon">
+                                    <i class="fa fa-calendar"></i>
+                                </div>
+                                <input type="text"
+                                       class="form-control pull-right"
+                                       ng-model="choseDate" id="datepicker2" readonly/>
+                            </div>
+                        </td>
+                    </tr>
+                    <tr>
+                        <td>选择Excel文件：</td>
+                        <td colspan="2">
+                            <input type="file"
+                                   id="id_file_photo_for_check"
+                                   class="file"
+                                   data-show-preview="false"
+                                   data-allowed-file-extensions='["XLS","xls","XLSX","xlsx"]'
+                                   multiple/>
+                        </td>
+                        <td>
+                            <div style="float: left">
+                                <button class="btn btn-primary" ng-click="uploadExcel()">上传</button>
+                            </div>
+                        </td>
+                    </tr>
+                </table>
+            </div>
+        </div>
+
+        <div class="box ">
+            <strong class="box-header with-border">跟踪文件管理</strong>
+            <div class="box box-primary" style="margin-bottom: 0;">
+                <table class="table table-bordered text-center" style="margin-bottom: 0;">
+                    <tr>
+                        <td>上传时间:</td>
+                        <td>
+                            <div class="input-group date">
+                                <div class="input-group-addon">
+                                    <i class="fa fa-calendar"></i>
+                                </div>
+                                <input type="text"
+                                       class="form-control pull-right"
+                                       id="datepicker3" ng-model="choseDate" readonly/>
+                                <span class="input-group-addon"><span class="glyphicon glyphicon-remove"></span></span>
+                            </div>
+                        </td>
+                        <td>
+                            <div class="input-group date">
+                                <div class="input-group-addon">
+                                    <i class="fa fa-calendar"></i>
+                                </div>
+                                <input type="text"
+                                       class="form-control pull-right"
+                                       id="datepicker" ng-model="choseDate" readonly/>
+                                <span class="input-group-addon"><span class="glyphicon glyphicon-remove"></span></span>
+                            </div>
+                        </td>
+
+                        <td>
+                            <button class="btn btn-primary" ng-click="getGATTrack()">查询</button>
+                        </td>
+                    </tr>
+                </table>
+            </div>
+            <div class="box-info" style="padding-top: 0;">
+                <table class="table table-bordered text-center">
+                    <thead>
+                    <tr>
+                        <th>NO.</th>
+                        <th>文件起始日期</th>
+                        <th>文件截至日期</th>
+                        <th>文件名</th>
+                        <th>数量</th>
+                        <th>上传时间</th>
+                        <th>操作</th>
+                    </tr>
+                    </thead>
+                    <tbody>
+                    <tr ng-repeat="item in GATTrack|orderBy:'ID'">
+                        <td>{{$index + 1}}</td>
+                        <td>{{item.TIME_EX | myDateFilter}}</td>
+                        <td>{{item.TIME_EN | myDateFilter}}</td>
+                        <td>{{item.FILE_NAME}}</td>
+                        <td class="text-blue">{{item.NUMSTR}}</td>
+                        <td>{{item.UPLOAD_TIME | myDateFilter}}</td>
+                        <td>
+                            <button class="btn btn-danger" ng-disabled="(item.UPLOAD_TIME | limitTo:8:0)!=thisDate"
+                                    ng-click="deleteGATTrack(item.ID,item.UPLOAD_TIME,item.NUMSTR)">删除
+                            </button>
+                        </td>
+                    </tr>
+                    </tbody>
+                </table>
+                <div class="box-body" ng-if="GATTrack.length==0"><h4>暂无记录</h4></div>
+
+            </div>
+        </div>
+    </div>
+</div>
+

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

+'use strict';
+
+angular.module('AvatarCheck.gatTrack', ['ngRoute', 'AvatarCheck.http', 'tm.pagination'])
+    .config(['$routeProvider', function ($routeProvider) {
+        $routeProvider.when('/gatTrack', {
+            templateUrl: 'views/gatTrack/gatTrack.html' + urlTimeStamp(),
+            controller: 'gatTrackCtrl',
+            cache: false
+        });
+    }])
+
+    .controller('gatTrackCtrl', function ($scope, $rootScope, $timeout, HttpService, $filter, $interval, MessageService, ngDialog) {
+
+        $("#id_file_photo_for_check").fileinput({
+            language: 'zh',
+            showUpload: false,
+            showCaption: true,
+            maxFileCount: 1024,
+            showPreview: true,
+            maxFileSize: 1024 * 30
+        });
+        $('#datepicker1').datetimepicker({
+            minView: "month", //选择日期后，不会再跳转去选择时分秒
+            language: 'zh-CN',
+            format: 'yyyy-MM-dd',
+            todayBtn: 1,
+            autoclose: 1
+        });
+        $('#datepicker2').datetimepicker({
+            minView: "month", //选择日期后，不会再跳转去选择时分秒
+            language: 'zh-CN',
+            format: 'yyyy-MM-dd',
+            todayBtn: 1,
+            autoclose: 1
+        });
+        $('#datepicker3').datetimepicker({
+            minView: "month", //选择日期后，不会再跳转去选择时分秒
+            language: 'zh-CN',
+            format: 'yyyy-MM-dd',
+            todayBtn: 1,
+            autoclose: 1
+        });
+        $('#datepicker').datetimepicker({
+            minView: "month", //选择日期后，不会再跳转去选择时分秒
+            language: 'zh-CN',
+            format: 'yyyy-MM-dd',
+            todayBtn: 1,
+            autoclose: 1
+        });
+        //清除的代码
+        $(".glyphicon-remove").click(function(){
+            $($($(this).parent()).prev()).val("");
+        })
+
+        $scope.choseDate = $filter("date")(new Date(), "yyyy-MM-dd");
+        $scope.thisDate = $filter("date")(new Date(), "yyyyMMdd");
+
+        $scope.getGATTrack = function(){
+            var date1=$("#datepicker3").val()
+            var date2=$("#datepicker").val()
+            if (date1==""){
+                date1=$scope.choseDate;
+            }
+            if (date2==""){
+                date2=$scope.choseDate;
+            }
+            HttpService.selectGATTrack(date1,date2,function (data) {
+                $scope.GATTrack=data.respData;
+                console.log($scope.GATTrack)
+            })
+        }
+        $scope.getGATTrack();
+        var getGAT= $scope.getGATTrack;
+        $scope.uploadExcel = function () {
+            var fd = new FormData();
+            var files = document.querySelector('input#id_file_photo_for_check').files;
+            if(files.length==0){
+                MessageService.showAlert("请选择上传的文件...")
+            }else{
+                for(var i in files){
+                    fd.append('file', files[i]);
+                }
+                ngDialog.openConfirm({
+                    template: 'dialogs/alert.html' + urlTimeStamp(),
+                    width: 600,
+                    cache: false,
+                    closeByDocument:false,
+                    controller: ['$scope', function ($scope) {
+                        $scope.wrongMsg =-1;
+                        $scope.msgText = "上传中，请稍等..."
+                        var date1=$("#datepicker1").val()
+                        var date2=$("#datepicker2").val()
+                        if (date1==""){
+                            date1=$scope.choseDate;
+                        }
+                        if (date2==""){
+                            date2=$scope.choseDate;
+                        }
+                        HttpService.uploadGATFile(date1,date2,fd,function (data) {
+                            $scope.msgText =data.msg;
+                            getGAT();
+                        })
+                    }]
+                });
+
+            }
+        }
+
+        $scope.deleteGATTrack = function(fileid,date,total){
+            ngDialog.open({
+                template: 'dialogs/confirm.html' + urlTimeStamp(),
+                width: 600,
+                cache: false,
+                closeByDocument:false,
+                controller: ['$scope', function ($scope) {
+                    $scope.wrongMsg =-1;
+                    $scope.total = total;
+                    $scope.importDate = $filter('myDateFilter')(date, 'yyyy-MM-dd');
+                    $scope.fileid=fileid;
+                    $scope.confirmDelete = function () {
+                        HttpService.deleteByGATTrFileId(fileid, function (data) {
+                            // MessageService.showAlert(data.msg);
+                            if(data.msg){
+                                $scope.closeThisDialog();
+                                getGAT();
+                            }else{
+                                $scope.wrongMsg ="删除失败";
+                            }
+
+                        })
+                    };
+
+                }]
+            });
+        }
+
+    });
\ No newline at end of file

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

@@ -54,9 +54,6 @@ angular.module('AvatarCheck.historyTagPrint', ['ngRoute', 'AvatarCheck.http', 't
                             $scope.tagPrintHistoryData[i].show = true;
                             //给当前封签加上选中样式
                             $scope.tagPrintHistoryData[i].styleClass="bg-info";
-                            console.log($scope.tagPrintHistoryData[i].show);
-                            console.log($scope.tagPrintHistoryData[i].styleClass);
-                            console.log($scope.tagPrintHistoryData[i]);
                             //展示详单页面
                             $scope.showDetail($scope.tagPrintHistoryData[i]);
                         }

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

@@ -27,48 +27,49 @@
                                         <thead>
                                         <tr>
                                             <th style="text-align: center;">日期</th>
-                                            <th style="text-align: center;" colspan="2">快证</th>
-                                            <th style="text-align: center;" colspan="2">重做登记</th>
-                                            <th style="text-align: center;" colspan="2">港澳证</th>
-                                            <th style="text-align: center;" colspan="2">台湾证</th>
-                                            <th style="text-align: center;" colspan="2">异地证</th>
-                                            <th style="text-align: center;" colspan="2">补证</th>
+                                            <th style="text-align: center;" colspan="3">港澳证</th>
+                                            <th style="text-align: center;" colspan="3">台湾证</th>
+                                            <th style="text-align: center;" colspan="3">异地证</th>
+                                            <th style="text-align: center;" colspan="3">异地证邮寄</th>
                                         </tr>
                                         <tr class="tr">
                                             <td></td>
                                             <td>成品</td>
                                             <td class="text-danger">废品</td>
+                                            <td class="text-success">补证</td>
                                             <td>成品</td>
                                             <td class="text-danger">废品</td>
+                                            <td class="text-success">补证</td>
                                             <td>成品</td>
                                             <td class="text-danger">废品</td>
+                                            <td class="text-success">补证</td>
                                             <td>成品</td>
                                             <td class="text-danger">废品</td>
-                                            <td>成品</td>
-                                            <td class="text-danger">废品</td>
-                                            <td>数量</td>
+                                            <td class="text-success">补证</td>
+
                                         </tr>
                                         </thead>
-                                        <tbody ng-repeat="item in qualityCheckReportList | orderBy:date" style="border-top: 1px solid #f4f4f4;">
-                                        <tr ng-if="item.date!='合计'">
-                                            <td>{{item.date | myDateFilter}}</td>
-                                            <td>{{item.list[1].VALID_COUNT}}</td>
-                                            <td>{{item.list[1].FAILED_COUNT}}</td>
-                                            <td>{{item.list[2].VALID_COUNT}}</td>
-                                            <td>{{item.list[2].FAILED_COUNT}}</td>
-                                            <td>{{item.list[3].VALID_COUNT}}</td>
-                                            <td>{{item.list[3].FAILED_COUNT}}</td>
-                                            <td>{{item.list[5].VALID_COUNT}}</td>
-                                            <td>{{item.list[5].FAILED_COUNT}}</td>
-                                            <td>{{item.list[6].VALID_COUNT}}</td>
-                                            <td>{{item.list[6].FAILED_COUNT}}</td>
-                                            <td>{{item.list[8].FAILED_COUNT}}</td>
+                                        <tbody ng-repeat="item in qualityCheckReportList" style="border-top: 1px solid #f4f4f4;">
+                                        <tr>
+                                            <td>{{item.FINISH_DATE}}</td>
+                                            <td>{{item.ga}}</td>
+                                            <td>{{item.gaf}}</td>
+                                            <td>{{item.gab}}</td>
+                                            <td>{{item.tw}}</td>
+                                            <td>{{item.twf}}</td>
+                                            <td>{{item.twb}}</td>
+                                            <td>{{item.yd}}</td>
+                                            <td>{{item.ydf}}</td>
+                                            <td>{{item.ydb}}</td>
+                                            <td>{{item.yj}}</td>
+                                            <td>{{item.yjf}}</td>
+                                            <td>{{item.yjb}}</td>
                                         </tr>
-                                        <tr ng-if="item.date=='合计'" class="bg-gray">
-                                            <td>{{item.date}}：</td>
+                                        <tr ng-if="item.date=='total'" class="bg-gray">
+                                            <td>合计</td>
                                             <td colspan="4">成品证：{{item.list.validCount}}</td>
                                             <td colspan="4">废品证：{{item.list.failedCount}}</td>
-                                            <td colspan="3">补证：{{item.list.buCount}}</td>
+                                            <td colspan="5">补证：{{item.list.buCount}}</td>
                                         </tr>
                                         </tbody>
                                     </table>

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

@@ -175,69 +175,70 @@ angular.module('AvatarCheck.receitp', ['ngRoute', 'AvatarCheck.http'])
             if(json.list.length==0){
                 MessageService.showAlert("请选择要打印的分局或派出所")
             }else{
-                HttpService.printReceitpData(json,function (data) {
-                    if($scope.isHistory==0){
-                        $scope.doSearchReceitp();
-                    }else if($scope.isHistory==1){
-                        $scope.searchHistory();
-                    }else{
-                        getData();
-                    }
-                    $scope.receitpDataToPrint = data;
-                    for(var i=0;i<$scope.receitpDataToPrint.list[0].countyList.length;i++){
-                        for (var j=0;j<$scope.receitpDataToPrint.list[0].countyList[i].policeList.length;j++){
-                            $scope.receitpDataToPrint.list[0].countyList[i].policeList[j].id=j+1;
+                var LODOP = getLodop();
+                if( $scope.priterNum==100){
+                    $scope.priterNum=LODOP.SELECT_PRINTER();
+                }else {
+                    HttpService.printReceitpData(json,function (data) {
+                        if($scope.isHistory==0){
+                            $scope.doSearchReceitp();
+                        }else if($scope.isHistory==1){
+                            $scope.searchHistory();
+                        }else{
+                            getData();
                         }
-                    }
-                    $scope.result = [];
-                    for(var i=0;i<$scope.receitpDataToPrint.list[0].countyList.length;i++){
-                        for (var j=0;j<$scope.receitpDataToPrint.list[0].countyList[i].policeList.length;j+=34){
-                            var json = {};
-                            if(($scope.receitpDataToPrint.list[0].countyList[i].policeList.length-j)>34){
-                                json.value = 1
-                            }else{
-                                json.value = 0;
+                        $scope.receitpDataToPrint = data;
+                        for(var i=0;i<$scope.receitpDataToPrint.list[0].countyList.length;i++){
+                            for (var j=0;j<$scope.receitpDataToPrint.list[0].countyList[i].policeList.length;j++){
+                                $scope.receitpDataToPrint.list[0].countyList[i].policeList[j].id=j+1;
                             }
-                            json.county = $scope.receitpDataToPrint.list[0].countyList[i].countyName;
-                            json.total = $scope.receitpDataToPrint.list[0].countyList[i].countyValidCount;
-                            json.policeList = $scope.receitpDataToPrint.list[0].countyList[i].policeList.slice(j,j+34);
-                            $scope.result.push(json);
                         }
-                    }
-
-                    $timeout(function () {
-                        for (var i=0;i<$scope.result.length;i++){
-                            var LODOP = getLodop();
-                            LODOP.SET_LICENSES("", "15F0BE661E7F32F37491843CB2510905", "C94CEE276DB2187AE6B65D56B3FC2848", "");
-                            //初始化
-                            LODOP.PRINT_INIT("打印交接单");
-                            LODOP.SET_PRINT_PAGESIZE(1, 0, 0, "A4");
-                            LODOP.ADD_PRINT_TEXT(10, 0, "100%", 20, "北京市公安局证件制作管理中心交接岗位");
-                            // LODOP.SET_PRINT_STYLEA(1, "Bold", 1);
-                            LODOP.SET_PRINT_STYLEA(1, "Alignment", 2);
-                            LODOP.SET_PRINT_STYLEA(1, "FontSize", 16);
-                            LODOP.ADD_PRINT_TEXT(35, 0, "100%", 20, $scope.result[i].county +"证件交接单");
-                            // LODOP.SET_PRINT_STYLEA(2, "Bold", 1);
-                            LODOP.SET_PRINT_STYLEA(2, "Alignment", 2);
-                            LODOP.SET_PRINT_STYLEA(2, "FontSize", 16);
-                            LODOP.ADD_PRINT_TEXT(70, 20, "100%", 20, "交接日期："+$scope.receitpDataToPrint.date);
-                            LODOP.SET_PRINT_STYLEA(3, "FontSize", 12);
-                            LODOP.ADD_PRINT_TEXT(90, 20, "100%", 20, "送至：");
-                            LODOP.SET_PRINT_STYLEA(4, "FontSize", 10);
-                            LODOP.ADD_PRINT_TABLE(110, "2mm",740, "100%", document.getElementById("divPrint"+i).innerHTML);
-
-                            // LODOP.SET_PRINT_STYLEA(5, "Bold", 0);
-                            LODOP.SET_PRINT_STYLEA(5, "HOrient", 2);
-                            LODOP.SET_PRINT_STYLEA(5, "Vorient", 3);
-                            if( $scope.priterNum==100){
-                                $scope.priterNum=LODOP.SELECT_PRINTER();
-                            }else {
+                        $scope.result = [];
+                        for(var i=0;i<$scope.receitpDataToPrint.list[0].countyList.length;i++){
+                            for (var j=0;j<$scope.receitpDataToPrint.list[0].countyList[i].policeList.length;j+=34){
+                                var json = {};
+                                if(($scope.receitpDataToPrint.list[0].countyList[i].policeList.length-j)>34){
+                                    json.value = 1
+                                }else{
+                                    json.value = 0;
+                                }
+                                json.county = $scope.receitpDataToPrint.list[0].countyList[i].countyName;
+                                json.total = $scope.receitpDataToPrint.list[0].countyList[i].countyValidCount;
+                                json.policeList = $scope.receitpDataToPrint.list[0].countyList[i].policeList.slice(j,j+34);
+                                $scope.result.push(json);
+                            }
+                        }
+                        $timeout(function () {
+                            for (var i=0;i<$scope.result.length;i++){
+
+                                LODOP.SET_LICENSES("", "15F0BE661E7F32F37491843CB2510905", "C94CEE276DB2187AE6B65D56B3FC2848", "");
+                                //初始化
+                                LODOP.PRINT_INIT("打印交接单");
+                                LODOP.SET_PRINT_PAGESIZE(1, 0, 0, "A4");
+                                LODOP.ADD_PRINT_TEXT(10, 0, "100%", 20, "北京市公安局证件制作管理中心交接岗位");
+                                // LODOP.SET_PRINT_STYLEA(1, "Bold", 1);
+                                LODOP.SET_PRINT_STYLEA(1, "Alignment", 2);
+                                LODOP.SET_PRINT_STYLEA(1, "FontSize", 16);
+                                LODOP.ADD_PRINT_TEXT(35, 0, "100%", 20, $scope.result[i].county +"证件交接单");
+                                // LODOP.SET_PRINT_STYLEA(2, "Bold", 1);
+                                LODOP.SET_PRINT_STYLEA(2, "Alignment", 2);
+                                LODOP.SET_PRINT_STYLEA(2, "FontSize", 16);
+                                LODOP.ADD_PRINT_TEXT(70, 20, "100%", 20, "交接日期："+$scope.receitpDataToPrint.date);
+                                LODOP.SET_PRINT_STYLEA(3, "FontSize", 12);
+                                LODOP.ADD_PRINT_TEXT(90, 20, "100%", 20, "送至：");
+                                LODOP.SET_PRINT_STYLEA(4, "FontSize", 10);
+                                LODOP.ADD_PRINT_TABLE(110, "2mm",740, "100%", document.getElementById("divPrint"+i).innerHTML);
+
+                                // LODOP.SET_PRINT_STYLEA(5, "Bold", 0);
+                                LODOP.SET_PRINT_STYLEA(5, "HOrient", 2);
+                                LODOP.SET_PRINT_STYLEA(5, "Vorient", 3);
 //                             LODOP.PREVIEW();
                                 LODOP.PRINT();
                             }
-                        }
+                        })
                     })
-                })
+                }
+
             }
 
 

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

@@ -74,6 +74,7 @@
                             <th>起始有效期</th>
                             <th>终止有效期</th>
                             <th>上报受理单位</th>
+                            <th>上报受理号</th>
                         </tr>
                         </thead>
                         <tbody>
@@ -92,6 +93,7 @@
                             <td ng-if="item.EXPIRE_DATE=='长期'">{{item.EXPIRE_DATE}}</td>
                             <td ng-if="item.EXPIRE_DATE!='长期'">{{item.EXPIRE_DATE | myDateFilter}}</td>
                             <td>{{item.GAJG1}}</td>
+                            <td>{{item.UPLOAD_NO}}</td>
                         </tr>
                         </tbody>
                     </table>
@@ -124,6 +126,7 @@
                             <th>起始有效期</th>
                             <th>终止有效期</th>
                             <th>上报受理单位</th>
+                            <th>上报受理号</th>
                         </tr>
                         </thead>
                         <tbody>
@@ -142,6 +145,7 @@
                             <td ng-if="item.EXPIRE_DATE=='长期'">{{item.EXPIRE_DATE}}</td>
                             <td ng-if="item.EXPIRE_DATE!='长期'">{{item.EXPIRE_DATE | myDateFilter}}</td>
                             <td>{{item.GAJG1}}</td>
+                            <td>{{item.UPLOAD_NO}}</td>
                         </tr>
                         </tbody>
                     </table>

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

@@ -135,14 +135,12 @@ angular.module('AvatarCheck.tagPrint', ['ngRoute', 'AvatarCheck.http', 'tm.pagin
                         }
                     }
                 }else if(data.state===2){
-                 MessageService.showAlert(data.msg+"复核人："+data.checkName+" 复核时间："+data.checkDate)
-                    getPoliceListDataNotChecked();
-                    getDetailListById(data.id);
+                    MessageService.showAlert(data.msg);
                 }else{
                     MessageService.showAlert("无该证件的制证记录");
                     $scope.json.isShow=false;
-                    getPoliceListDataNotChecked();
-                    getDetailListById(data.id);
+                    // getPoliceListDataNotChecked();
+                    // getDetailListById(data.id);
                 }
             })
         }
@@ -158,6 +156,7 @@ angular.module('AvatarCheck.tagPrint', ['ngRoute', 'AvatarCheck.http', 'tm.pagin
                     }
                     if(count===$scope.json.policeCardsList.length){
                         MessageService.showAlert("身份证号:"+idcard+" 在本组中不存在");
+                        break;
                     }
                     // if(bgCount==2&&$scope.json.policeCardsList.length>=2){
                     //     $scope.PreviewMytableRotate();

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

@@ -57,7 +57,7 @@
                             <tbody ng-repeat="task in type.countyList">
                             <tr>
                                 <td >
-                                    <input ng-if="type.typeCode=='100'||(task.faileCount==0&&task.countyValidCount==task.eWriteCount)"
+                                    <input ng-if="type.typeCode=='100'||(task.faileCount==0)"
                                            type="checkbox" class="checkOneBox"
                                            ng-checked="isSelected(task)" value="{{task.taskId}}"
                                            ng-click="updateSelection($event,task)">

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

@@ -123,8 +123,15 @@
                               <span class="input-group-addon"><span class="glyphicon glyphicon-remove"></span></span>
                           </div>
                       </td>
-                        <td></td>
-                        <td></td>
+                      <td>受理区县:</td>
+                      <td style="text-align: left;">
+                          <select class="form-control select2" id="district"
+                                  ng-model="district">
+                              <option value="">--请选择受理区县--</option>
+                              <option value="1">密云</option>
+                              <option value="0">其他（除密云外所有区县）</option>
+                          </select>
+                      </td>
                         <td colspan="2">
                            <div style="float: left">
                               <button class="btn btn-primary" style="margin-right: 7px;" ng-click="doQuery()">查询</button>

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

@@ -87,6 +87,11 @@ angular.module('AvatarCheck.uploadExcelAndSearch', ['ngRoute', 'AvatarCheck.http
             }else {
                 json.state=$("#print").val();
             }
+            if ($("#district").val() == '') {
+                json.district=-1;
+            }else {
+                json.district=$("#district").val() ;
+            }
             if(angular.isUndefined($scope.emailNo)){
                 json.emailNo = ''
             }else{
@@ -146,6 +151,11 @@ angular.module('AvatarCheck.uploadExcelAndSearch', ['ngRoute', 'AvatarCheck.http
             }else {
                 json.state=$("#print").val();
             }
+            if ($("#district").val() == '') {
+                json.district=-1;
+            }else {
+                json.district=$("#district").val() ;
+            }
             if(angular.isUndefined($scope.emailNo)){
                 json.emailNo = ''
             }else{
@@ -235,6 +245,11 @@ angular.module('AvatarCheck.uploadExcelAndSearch', ['ngRoute', 'AvatarCheck.http
             }else{
                 url = url + 'djx=&';
             }
+            if ($("#district").val() != '') {
+                url = url + 'district=' + $("#district").val()  + '&';
+            }else {
+                url = url + 'district=-1&';
+            }
             if(angular.isUndefined($scope.emailNo)){
                 url = url + 'emailNo=&';
             }else{

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

@@ -151,15 +151,16 @@ angular.module('AvatarCheck.xmlAndSearch', ['ngRoute', 'AvatarCheck.http', 'tm.p
                     closeByDocument:false,
                     controller: ['$scope', function ($scope) {
                         $scope.wrongMsg =-1;
-                        $scope.msgText = "上传中，请稍等..."
+                        $scope.msgText = "/////上传中，请稍等.../////"
                         HttpService.uploadPackage(fd,function (data) {
-                            if(data){
-                                $scope.closeThisDialog();
-                                getData();
-                                // MessageService.showAlert("上传成功")
+                            if(angular.equals(data.code,"200")){
+                                // $scope.closeThisDialog();
+                                $scope.msgText = "上传成功！";
                             }else{
-                                $scope.wrongMsg = "上传失败"
+                                $scope.msgText="";
+                                $scope.wrongMsg = data.errMsg;
                             }
+                            getData();//获取导入数据信息
                         })
                     }]
                 });