push

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

@@ -51,7 +51,7 @@ public class ExportXMLApi {
         String dateTime = DateFormatUtils.format(new Date(), "yyyyMMddHH");
         //使用Servlet实现文件下载的时候，避免浏览器自动打开文件
         String fout = null;
-        List<PreproPersonEntity> preproPersonEntities = preproPersonService.selectAllPreproPerson(uploadNo, IDCard, oldFile, newFile, SSXQDM, cardType, state, uploadDate);
+        List<PreproPersonEntity> preproPersonEntities = preproPersonService.selectAllPreproPerson(uploadNo, IDCard, oldFile, newFile, SSXQDM, cardType, state, replaceDate(uploadDate));
 
         if (preproPersonEntities.size()>0){
            //todo 查询制证数据包信息
@@ -273,4 +273,15 @@ public class ExportXMLApi {
         if (str == null) return "";
         else return str;
     }
+
+    /**
+     * 去除字符串中中线
+     *
+     * @param str
+     * @return
+     */
+    private String replaceDate(String str) {
+        return str.replace("-", "");
+    }
+
 }

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

@@ -28,9 +28,9 @@ public class queryPreproPerson {
     @RequestMapping("queryPreproPerson")
 //    @RequiresPermissions("userInfo.add")//权限管理;
     public Map<String,Object> printXmlData(@RequestParam("uploadNo") String uploadNo, @RequestParam("IDCard")String IDCard,@RequestParam("oldFile") String oldFile, @RequestParam("newFile")String newFile, @RequestParam("SSXQDM")String SSXQDM, @RequestParam("cardType")String cardType, @RequestParam("state")String state, @RequestParam("uploadDate")String uploadDate,@RequestParam("currPage")String currPage,@RequestParam("pageSize")String pageSize, HttpServletResponse response){
-        List<PreproPersonEntity> preproPersonEntities = preproPersonService.selectPreproPerson(uploadNo, IDCard, oldFile, newFile, SSXQDM, cardType, state, uploadDate,currPage,pageSize);
+        List<PreproPersonEntity> preproPersonEntities = preproPersonService.selectPreproPerson(uploadNo, IDCard, oldFile, newFile, SSXQDM, cardType, state, replaceDate(uploadDate),currPage,pageSize);
         Map<String,Object> map = new LinkedHashMap<>();
-        List<PreproPersonEntity> preproPersonEntityList = preproPersonService.selectPreproPersonCount(uploadNo, IDCard, oldFile, newFile, SSXQDM, cardType, state, uploadDate);
+        List<PreproPersonEntity> preproPersonEntityList = preproPersonService.selectPreproPersonCount(uploadNo, IDCard, oldFile, newFile, SSXQDM, cardType, state, replaceDate(uploadDate));
         map.put("total",preproPersonEntityList.size());
         int youSum =0;
         int puSum=0;
@@ -68,4 +68,16 @@ public class queryPreproPerson {
         map.put("msg","成功更新制证数据是否有效");
         return map;
     }
+
+    /**
+     * 去除字符串中中线
+     *
+     * @param str
+     * @return
+     */
+    private String replaceDate(String str) {
+        return str.replace("-", "");
+    }
+
+
 }