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

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

@@ -15,6 +15,18 @@ import java.util.List;
 public class InfoManagementApi {
     @Autowired
     private InfoManagementService infoManagementService;
+
+    /**
+     * 按条件查询制证信息数据
+     * @param beginFileName
+     * @param endFileName
+     * @param gajgMc
+     * @param beginDate
+     * @param endDate
+     * @param currPage
+     * @param pageSize
+     * @return
+     */
     @RequestMapping("selectInfoManagement")
     public List<NewFilesEntity>selectInfoManagement(@Param("beginFileName")String beginFileName, @Param("endFileName")String endFileName, @Param("gajgMc") String gajgMc, @Param("beginDate")String beginDate, @Param("endDate")String endDate, @RequestParam("currPage")String currPage, @RequestParam("pageSize")String pageSize){
         List<NewFilesEntity> resultList = infoManagementService.selectInfoManagement(beginFileName, endFileName, gajgMc, replaceDate(beginDate), replaceDate(endDate), Long.valueOf(currPage),Long.valueOf(pageSize));
@@ -22,17 +34,38 @@ public class InfoManagementApi {
     }
 
 
+    /**
+     * 查询制证信息数据条数
+     * @param beginFileName
+     * @param endFileName
+     * @param gajgMc
+     * @param beginDate
+     * @param endDate
+     * @return
+     */
     @RequestMapping("selectCount")
     public long selectCount(@Param("beginFileName")String beginFileName, @Param("endFileName")String endFileName, @Param("gajgMc") String gajgMc, @Param("beginDate")String beginDate, @Param("endDate")String endDate){
       long count=  infoManagementService.count(beginFileName,endFileName,gajgMc,replaceDate(beginDate),replaceDate(endDate));
       return count;
     }
 
-
-
+    /**
+     * 删除制证信息数据
+     * @param beginFileName
+     * @param endFileName
+     * @param gajgMc
+     * @param beginDate
+     * @param endDate
+     * @return
+     */
+    @RequestMapping("deleteInfo")
+    public boolean deleteInfo(@Param("beginFileName")String beginFileName, @Param("endFileName")String endFileName, @Param("gajgMc") String gajgMc, @Param("beginDate")String beginDate, @Param("endDate")String endDate){
+       boolean result=  infoManagementService.deleteInfo(beginFileName,endFileName,gajgMc,beginDate,endDate);
+       return result;
+    }
 
     /**
-     * 去除字符串中中线
+     * 去除字符串中线
      * @param str
      * @return
      */

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

 package com.yxproject.start.mapper;
 
 import com.yxproject.start.entity.NewFilesEntity;
+import org.apache.ibatis.annotations.Delete;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Select;
@@ -50,6 +51,23 @@ public interface InfoManagementMapper {
 
 
 
+    @Delete("<script> " +
+            "delete from PREPRO_PERSON \n" +
+            "where PREPRO_PERSON.NEW_FILE_ID=(\n" +
+            "select * from new_files \n" +
+            "where 1=1\n" +
+            "<if test='beginFileName != \"\" '>" +
+            "and (NEW_FILE_NAME between(#{beginFileName})and (#{endFileName}))\n" +
+            "</if>" +
+            "<if test='gajgMc != \"\" '>" +
+            "and DWMC=#{gajgMc}\n" +
+            "</if>" +
+            "<if test='beginDate != \"\" '>" +
+            "and (subStr(CREATE_DATE,0,8) between(#{beginDate})and(#{endDate}))"+
+            "</if>" +
+            "select )" +
+            " </script>")
+    public boolean deleteInfo(@Param("beginFileName")String beginFileName, @Param("endFileName")String endFileName, @Param("gajgMc") String gajgMc, @Param("beginDate")String beginDate, @Param("endDate")String endDate);
 
 
 }

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

@@ -97,6 +97,7 @@ public interface PersonPostMapper {
     @Select("SELECT count(*) FROM FILE_NAME_DIC a LEFT JOIN PERSON_POST b on a.FILE_ID=b.FILE_ID WHERE substr(a.UPLOAD_DATE,0,8)=#{date} AND b.PRINT_DATE IS NULL")
     public int selectPersonalDataCountByImportDate(@Param("date")String date);
 
+
     @Select("<script> " +
             "SELECT PERSON_POST.*" +
             " FROM PERSON_POST " +

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

@@ -8,7 +8,8 @@ import java.util.List;
 public interface InfoManagementService {
     public List<NewFilesEntity> selectInfoManagement(@Param("beginFileName")String beginFileName, @Param("endFileName")String endFileName, @Param("gajgMc") String gajgMc, @Param("beginDate")String beginDate, @Param("endDate")String endDate,@Param("begin")long begin,@Param("end")long end);
 
-
     public long count(@Param("beginFileName")String beginFileName, @Param("endFileName")String endFileName, @Param("gajgMc") String gajgMc, @Param("beginDate")String beginDate, @Param("endDate")String endDate);
 
+    public boolean deleteInfo(@Param("beginFileName")String beginFileName, @Param("endFileName")String endFileName, @Param("gajgMc") String gajgMc, @Param("beginDate")String beginDate, @Param("endDate")String endDate);
+
 }

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

@@ -27,4 +27,10 @@ public class InfoManagementServiceImpl implements InfoManagementService {
        long  count= infoManagementMapper.count(beginFileName,endFileName,gajgMc,beginDate,endDate);
         return count;
     }
+
+    @Override
+    public boolean deleteInfo(String beginFileName, String endFileName, String gajgMc, String beginDate, String endDate) {
+        infoManagementMapper.deleteInfo(beginFileName,endFileName,gajgMc,beginDate,endDate);
+        return true;
+    }
 }