--no commit message

com.zrqx.resource/src/main/java/com/zrqx/resource/bg/mapper/audiolibrary/AudioLibraryMapper.java

@@ -10,7 +10,6 @@ import com.zrqx.core.form.resource.bg.audiolibrary.QueryAudioLibraryForm;
 import com.zrqx.core.mapper.BaseMapper;
 import com.zrqx.core.model.resource.audiolibrary.AudioLibrary;
 import com.zrqx.core.vo.resource.audiolibrary.AudioLibraryListVO;
-import com.zrqx.resource.bg.mapper.MapperConstants;
 /**
  * 音频库
  */
@@ -20,27 +19,21 @@ public interface AudioLibraryMapper extends BaseMapper<AudioLibrary> {
 			+ "from res_Audio_Library a left join res_Audio_Library_Diy_Type ad "
 			+ "on a.id = ad.audioid "
 			+ "where 1=1 "
-			+ " eq(a.nationsType,form.nationsType) "
-			+ " like(ad.code,form.diyTypeCode) "
-			
-			/*+ "<if test='form.diyTypeId != null and form.diyTypeId.size > 0'>"  
-			+ "and ad.dtId in "
-			+ " <foreach collection=\"form.diyTypeId\" index=\"index\" item=\"id\" open=\"(\" separator=\",\" close=\")\">" 
-			+ "#{id}" 
-			+ "</foreach>" 
-			+ "</if>" */
-			
-			+ " like(a.name,form.name) "
-			+ " like(a.source,form.source) "
-		    + " eq(a.status,form.status) "
-		     
-		    //+ "<if test = '" + NOTBLANK + "(form.beginTime)'>"
-		    //+ "and a.uploadTime &gt;= concat(#{form.beginTime}, ' 00:00:00' )"
-		    //+ "</if>"
-		    //+ "<if test = '" + NOTBLANK + "(form.endTime)'>"
-		    //+ "and a.uploadTime &lt;= concat(#{form.endTime}, ' 23:59:59')"
-		    //+ "</if>"
-			+ MapperConstants.DATETIME_QUERY_CONDITION
+			+ "<if test = '" + NOTBLANK + "(form.diyTypeCode)'>"  
+		    + " and ad.code like concat(#{form.diyTypeCode},'%') "                  
+		    + "</if>"
+			+ "<if test = '" + NOTBLANK + "(form.name)'>"  
+		    + " and a.name like concat('%',#{form.name},'%') "
+		    + "</if>" 
+		    + "<if test='form.status != null'>"  
+		    + " and a.status = #{form.status}"
+		    + "</if>" 
+		    + " <if test = '" + NOTBLANK + "(form.beginTime)'> "
+            + " and a.uploadTime &gt;= concat(#{form.beginTime}, ' 00:00:00' ) "
+            + " </if> "
+            + " <if test = '" + NOTBLANK + "(form.endTime)'> "
+            + " and a.uploadTime &lt;= concat(#{form.endTime}, ' 23:59:59') "
+            + " </if> "
 		    + " order by a.uploadTime desc "
 		    + "</script>")
 	List<AudioLibraryListVO> query(@Param("form")QueryAudioLibraryForm form);