commit

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

@@ -24,21 +24,61 @@ public interface PreproPersonMapper {
 
 
     /*按条件查询制证数据*/
-    @Select("select * from PREPRO_PERSON \n" +
-            "left join files on PREPRO_PERSON.FILE_ID = files.ID\n" +
-            "left join NEW_FILES on PREPRO_PERSON.FILE_ID = NEW_FILES.ID " +
-            "where 1=1 " +
-            " <where>" +
-            " <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 files.CREAT_TIME = #{uploadDate} </if> " +
-            " </where>")
-    public List<PreproPersonEntity> 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);
+    @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 "+
+            "<where> " +
+            " 1=1" +
+                    "<if test='uploadNo != null '>"+
+                    "and PREPRO_PERSON.JMSFZSLH = #{uploadNo}"+
+                    "</if>"+
+//                    "<if test='uploadNo != "''" '>"+
+//                    "and PREPRO_PERSON.JMSFZSLH = #{uploadNo}"+
+//                    "</if>"+
+            " <if test='IDCard != null '> ",
+            "and GMSFHM = #{IDCard} ",
+            "</if> " ,
+//            " <if test='IDCard != '' '> ",
+//            "and GMSFHM = #{IDCard} ",
+//            "</if> " ,
+            " <if test='oldFile != null '> ",
+            "and files.SOURCE_FILE_NAME =#{oldFile} ",
+            " </if> " ,
+//            " <if test='oldFile != '' '> ",
+//            "and files.SOURCE_FILE_NAME =#{oldFile} ",
+//            " </if> " ,
+            " <if test='newFile != null'> ",
+            "and  NEW_FILES.NEW_FILE_NAME = #{newFile}",
+            " </if> " ,
+//            " <if test='newFile != '' '> ",
+//            "and  NEW_FILES.NEW_FILE_NAME = #{newFile}",
+//            " </if> " ,
+            " <if test='SSXQDM != null '> ",
+            "and PREPRO_PERSON.SSXQDM =#{SSXQDM}",
+            " </if>" ,
+//            " <if test='SSXQDM != '' '> ",
+//            "and PREPRO_PERSON.SSXQDM =#{SSXQDM}",
+//            " </if>   " ,
+            " <if test='cardType != null  '>",
+            " and PREPRO_PERSON.CARD_TYPE_ID =#{cardType}",
+            " </if> " ,
+//            " <if test='cardType != '' '>",
+//            " and PREPRO_PERSON.CARD_TYPE_ID =#{cardType}",
+//            " </if> " ,
+            " <if test='state != null'>",
+            " and  PREPRO_PERSON.state = #{state}",
+            " </if>  " ,
+//            " <if test='state != '' '>",
+//            " and  PREPRO_PERSON.state = #{state}",
+//            " </if>  " ,
+            " <if test='uploadDate != null '>",
+            " and files.CREAT_TIME = #{uploadDate}",
+            " </if> ",
+//            " <if test='uploadDate != '' '>",
+//            " and files.CREAT_TIME = #{uploadDate}",
+//            " </if> ",
+            "</where>"+
+            "</script>"})
+    public List<PreproPersonEntity> selectPreproPerson(@Param("uploadNo")String uploadNo, @Param("IDCard")String IDCard, @Param("oldFile")String oldFile, @Param("newFile")String newFile, @Param("SSXQDM")String SSXQDM, @Param("cardType")long cardType, @Param("state")String state, @Param("uploadDate")String uploadDate);
 
     /*修改标记制证数据状态*/
     @Update("UPDATE PREPRO_PERSON SET STATE = #{state} WHERE JMSFZSLH=#{acceptNo}")

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

@@ -24,7 +24,7 @@ public class PreproPersonServiceImpl implements PreproPersonService {
     }
     @Override
     public List<PreproPersonEntity> selectPreproPerson(String uploadNo, String IDCard, String oldFile, String newFile, String SSXQDM, String cardType, String state, String uploadDate) {
-        List<PreproPersonEntity> preproPersonEntities = preproPersonMapper.selectPreproPerson(null, null, null, null, null, 0+"", null, null);
+        List<PreproPersonEntity> preproPersonEntities = preproPersonMapper.selectPreproPerson("", "", "", "", "", 0, "", "");
         return preproPersonEntities;
     }
 }