push

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

@@ -30,19 +30,19 @@ public class queryPreproPerson {
     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<Map<String, Object>> preproPersonEntities = preproPersonService.selectPreproPerson(uploadNo, IDCard, oldFile, newFile, SSXQDM, cardType, state, replaceDate(uploadDate),currPage,pageSize);
         Map<String,Object> map = new LinkedHashMap<>();
-        //todo 
-        List<PreproPersonEntity> preproPersonEntityList = preproPersonService.selectPreproPersonCount(uploadNo, IDCard, oldFile, newFile, SSXQDM, cardType, state, replaceDate(uploadDate));
+        //todo
+        List<Map<String, Object>> preproPersonEntityList = preproPersonService.selectPreproPerson(uploadNo, IDCard, oldFile, newFile, SSXQDM, cardType, state, replaceDate(uploadDate));
         map.put("total",preproPersonEntityList.size());
         int youSum =0;
         int puSum=0;
         int invaildCount = 0;
-        for (PreproPersonEntity preproPersonEntity :preproPersonEntityList){
-            if (preproPersonEntity.getCardTypeId()!=null&&preproPersonEntity.getCardTypeId()==9){
+        for (Map<String, Object> map1 :preproPersonEntityList){
+            if ("9".equals(map1.get("CARD_TYPE_ID"))){
                 youSum++;
-            }else if (preproPersonEntity.getCardTypeId()!=null&&preproPersonEntity.getCardTypeId()==0){
+            }else if ("0".equals(map1.get("CARD_TYPE_ID"))){
                 puSum++;
             }
-            if (preproPersonEntity.getIsValid()==0){
+            if ("0".equals(map1.get("IS_VALID")+"")){
                 invaildCount++;
             }
 

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

@@ -25,7 +25,7 @@ public interface PreproPersonMapper {
 
 
       /*按条件查询制证数据*/
-    @Select({"<script> select JMSFZSLH,xm,XBDM,GMSFHM,CARD_TYPE,IS_VALID,SOURCE_FILE_NAME,NEW_FILE_NAME  from (select a.*,rownum rn from(select * from PREPRO_PERSON left join files on PREPRO_PERSON.FILE_ID = files.ID left join NEW_FILES on PREPRO_PERSON.FILE_ID = NEW_FILES.ID left join CARD_TYPE_DIC on CARD_TYPE_DIC.CARD_TYPE_ID = PREPRO_PERSON.CARD_TYPE_ID " +
+    @Select({"<script> select *  from (select a.*,rownum rn from(select JMSFZSLH,xm,XBDM,GMSFHM,CARD_TYPE,PREPRO_PERSON.CARD_TYPE_ID,IS_VALID,SOURCE_FILE_NAME,NEW_FILE_NAME from PREPRO_PERSON left join files on PREPRO_PERSON.FILE_ID = files.ID left join NEW_FILES on PREPRO_PERSON.FILE_ID = NEW_FILES.ID left join CARD_TYPE_DIC on CARD_TYPE_DIC.CARD_TYPE_ID = PREPRO_PERSON.CARD_TYPE_ID " +
             "<where> " +
             " 1=1" +
             "<if test='uploadNo != null '>" +
@@ -54,6 +54,40 @@ public interface PreproPersonMapper {
             " </if>  </where>"+
                     ") a ) where rn between #{minNum} and #{maxNum} </script>"})
     public List<Map<String,Object>> selectPreproPerson(@Param("uploadNo") String uploadNo, @Param("IDCard") String IDCard, @Param("oldFile") String oldFile, @Param("newFile") String newFile, @Param("SSXQDM") String SSXQDM, @Param("cardType") String cardType, @Param("state") String state, @Param("uploadDate") String uploadDate, @Param("minNum") long minNum, @Param("maxNum") long maxNum);
+
+    /*按条件查询制证数据*/
+    @Select({"<script> select JMSFZSLH,xm,XBDM,GMSFHM,CARD_TYPE,PREPRO_PERSON.CARD_TYPE_ID,IS_VALID,SOURCE_FILE_NAME,NEW_FILE_NAME from PREPRO_PERSON left join files on PREPRO_PERSON.FILE_ID = files.ID left join NEW_FILES on PREPRO_PERSON.FILE_ID = NEW_FILES.ID left join CARD_TYPE_DIC on CARD_TYPE_DIC.CARD_TYPE_ID = PREPRO_PERSON.CARD_TYPE_ID " +
+            "<where> " +
+            " 1=1" +
+            "<if test='uploadNo != null '>" +
+            "and PREPRO_PERSON.JMSFZSLH = #{uploadNo}" +
+            "</if>" +
+            " <if test='IDCard != null '> "+
+            "and GMSFHM = #{IDCard} "+
+            "</if> "+
+            " <if test='oldFile != null '> "+
+            "and files.SOURCE_FILE_NAME =#{oldFile} "+
+            " </if> "+
+            " <if test='newFile != null '> "+
+            "and  NEW_FILES.NEW_FILE_NAME = #{newFile}"+
+            " </if> "+
+            " <if test='SSXQDM != null '> "+
+            "and PREPRO_PERSON.SSXQDM =#{SSXQDM}"+
+            " </if>"+
+            " <if test='cardType != null  '>"+
+            " and PREPRO_PERSON.CARD_TYPE_ID =#{cardType}"+
+            " </if> "+
+            " <if test='state != null '>"+
+            " and  PREPRO_PERSON.state = #{state}"+
+            " </if>  "+
+            " <if test='uploadDate != null '>"+
+            " and to_char(UPLOAD_DATE,'yyyyMMdd') = #{uploadDate}"+
+            " </if>  </where>"+
+            " </script>"})
+    public List<Map<String,Object>> selectPreproPerson1(@Param("uploadNo") String uploadNo, @Param("IDCard") String IDCard, @Param("oldFile") String oldFile, @Param("newFile") String newFile, @Param("SSXQDM") String SSXQDM, @Param("cardType") String cardType, @Param("state") String state, @Param("uploadDate") String uploadDate);
+
+
+
     /*按条件查询制证数据*/
     @Select({"<script>" +
             "select *  from PREPRO_PERSON left join files on PREPRO_PERSON.FILE_ID = files.ID left join NEW_FILES on PREPRO_PERSON.FILE_ID = NEW_FILES.ID " +

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

@@ -19,8 +19,9 @@ public interface PreproPersonService {
 
     public List<Map<String, Object>> selectPreproPerson(String uploadNo, String IDCard, String oldFile, String newFile, String SSXQDM, String cardType, String state, String uploadDate,String currPage,String pageSize);
 
-    public List<PreproPersonEntity> selectAllPreproPerson(String uploadNo, String IDCard, String oldFile, String newFile, String SSXQDM, String cardType, String state, String uploadDate);
+    public List<Map<String, Object>> selectPreproPerson(String uploadNo, String IDCard, String oldFile, String newFile, String SSXQDM, String cardType, String state, String uploadDate);
 
+    public List<PreproPersonEntity> selectAllPreproPerson(String uploadNo, String IDCard, String oldFile, String newFile, String SSXQDM, String cardType, String state, String uploadDate);
 
     public List<PreproPersonEntity> selectPreproPersonCount(String uploadNo, String IDCard, String oldFile, String newFile, String SSXQDM, String cardType, String state, String uploadDate);
 

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

@@ -44,6 +44,25 @@ public class PreproPersonServiceImpl implements PreproPersonService {
         return mapList;
     }
 
+    /**
+     * 分页查询制证数据详细信息数量
+     * @param uploadNo
+     * @param IDCard
+     * @param oldFile
+     * @param newFile
+     * @param SSXQDM
+     * @param cardType
+     * @param state
+     * @param uploadDate
+     * @return
+     */
+    @Override
+    public List<Map<String, Object>> selectPreproPerson(String uploadNo, String IDCard, String oldFile, String newFile, String SSXQDM, String cardType, String state, String uploadDate) {
+        List<Map<String, Object>> mapList = preproPersonMapper.selectPreproPerson1(replace(uploadNo), replace(IDCard), replace(oldFile), replace(newFile), replace(SSXQDM), replace(cardType), replace(state), replace(uploadDate));
+        return mapList;
+    }
+
+
     /**
      * 查询全部制证详细信息
      * @param uploadNo