制证包管理添加删除

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

@@ -113,6 +113,11 @@ public class LogApi {
      }
 
 
+    /**
+     * 删除制证包及其数据
+     * @param fileId
+     * @return
+     */
      @RequestMapping("deleteFiles")
      @Transactional(rollbackFor = Exception.class)
      public boolean deleteFiles(@RequestParam("fileId")String fileId){

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

@@ -8,8 +8,20 @@ public class CountDataEntity {
     private Integer cardCount;
     private Integer commonCardCount;
     private Integer postCardCount;
+    private long fileId;
     private long state;
 
+
+    public long getFileId() {
+        return fileId;
+    }
+
+    public void setFileId(long fileId) {
+        this.fileId = fileId;
+    }
+
+
+
     public String getUploadDate() {
         return uploadDate;
     }

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

@@ -15,9 +15,10 @@ public interface FilesMapper {
     public long insertFiles(FilesEntity filesEntity);
 
 
+    //TODO 1111111111111
     @Select("<script> " +
-            "select * from (select upload_date upload_Date ,count(ID) package_Count,sum(sumCount) cardCount,sum(ordinaryCount) commonCardCount,sum(postCount) postCardCount ,rownum rn " +
-                    "from (SELECT FILES.upload_date,FILES.ID,count(prepro_person.JMSFZSLH) as sumCount, " +
+            "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 " +
@@ -25,7 +26,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, rownum" +
+                    "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);