制证包管理更改

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

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

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

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

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

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

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

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

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

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