修改查询XML制证信息

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

@@ -25,7 +25,7 @@ public interface FilesMapper {
                     "<if test=\"importDate !=null\">"+
                     " and  to_char(FILES.UPLOAD_DATE,'yyyyMMdd')= #{importDate}" +
                     "</if> "+
-                    "group by FILES.upload_date,FILES.ID)  group by upload_date" +
+                    "group by FILES.upload_date,FILES.ID)  group by upload_date, rownum" +
                     ") where rn BETWEEN  #{minNum} and #{maxNum} </script>")
     public List<CountDataEntity> selectFiles(@Param("importDate") String importDate,@Param("maxNum")long maxNum,@Param("minNum")long minNum);
 
@@ -46,8 +46,7 @@ public interface FilesMapper {
                    " and  to_char(FILES.UPLOAD_DATE,'yyyyMMdd')= #{importDate}" +
                    "</if>"+
                     " group by FILES.upload_date,FILES.ID)a" +
-            " group by a.upload_date " +
-            "select * from PREPRO_PERSON"+
+            " group by a.upload_date, rownum " +
             "</script>"})
     public List<CountDataEntity> selectFilesCount(@Param("importDate") String importDate);
 

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

@@ -72,7 +72,9 @@ public class TaskListServiceImpl implements TaskListService {
             List<Map<String,Object>> typeList = new ArrayList<>();
             List<Map<String,Object>> mapList = (List<Map<String,Object>>)typeMap.get(type);
             int typeSum =0;
+            String typeCode = null;
             for (Map o:mapList) {
+                typeCode=o.get("CARD_TYPE_ID").toString();
                 typeSum+=Integer.valueOf(o.get("VALID_COUNT") + "");
                 Map<String,Object> countyMap = new LinkedHashMap<>();
                 if (countyMap !=null&countyMap.containsKey(o.get("COUNTYNAME")+"")){
@@ -93,11 +95,13 @@ public class TaskListServiceImpl implements TaskListService {
                     countyMap.put("countyInvalidCount",Integer.valueOf(o.get("INVALID_COUNT")+""));
                 }
                 countyMap.put("countyList",o);
+                countyMap.put("saveDate",o.get("SUBMIT_DATE"));
                 typeList.add(countyMap);
             }
             typeMapList.put("typeName",type);
+            typeMapList.put("typeCode",typeCode);
             typeMapList.put("typeSum",typeSum);
-            typeMapList.put("typeList",typeList);
+            typeMapList.put("countyList",typeList);
             list.add(typeMapList);