getByKeyword

src/main/java/com/zglc/fm/dao/master/FaultDao.java

@@ -24,7 +24,7 @@ public interface FaultDao extends Mapper<FaultEntity> {
 
     List<FaultEntity> findByName(@Param("fault_name") String name);
 
-//    List<FaultEntity> findByMultiple(@Param("major") String major,@Param("name") String name);
+    List<FaultEntity> findByMultiple(FaultFind faultFind);
     List<FaultEntity> findByBookName(@Param("aircraftType") String aircraftType,@Param("major") String major,@Param("name") String name);
     List<FaultEntity> findByFaultName(@Param("aircraftType") String aircraftType,@Param("major") String major,@Param("name") String name);
     List<FaultEntity> findByAuthor(@Param("aircraftType") String aircraftType,@Param("major") String major,@Param("name") String name);

src/main/java/com/zglc/fm/entity/FaultFind.java

@@ -17,6 +17,16 @@ public class FaultFind {
 
     private Integer type;
 
+    private String fault_name;
+
+    private String book_name;
+
+    private String author;
+
+    private String department;
+
+    private String description;
+
     private String beginTime;
 
     private String finishTime;

src/main/java/com/zglc/fm/service/FaultService.java

@@ -239,7 +239,7 @@ public class FaultService {
     public List<FaultEntity> findByKeyword(FaultFind faultFind) {
         List<FaultEntity> lst =  new ArrayList<>();
         switch (faultFind.getType()){
-//            case 0:lst = faultDao.findByMultiple( faultFind.getAircraftType(),faultFind.getMajor(),"%" + faultFind.getKeyword() + "%");break;//全部查询
+            case 0:lst = faultDao.findByMultiple(faultFind);break;//全部查询
             case 1:lst = faultDao.findByBookName(faultFind.getAircraftType(),faultFind.getMajor(),"%" + faultFind.getKeyword() + "%");break;//教材名称
             case 2:lst = faultDao.findByFaultName(faultFind.getAircraftType(),faultFind.getMajor(),"%" + faultFind.getKeyword() + "%");break;//案例名称
             case 3:lst = faultDao.findByAuthor(faultFind.getAircraftType(),faultFind.getMajor(),"%" + faultFind.getKeyword() + "%");break;//作者名称

src/main/resources/mapping/master/FaultDao.xml

@@ -95,10 +95,37 @@
         and aircraft_type = #{aircraftType}
     </select>
 
-    <select id="findByMultiple" parameterType="String" resultMap="faultMap">
-            select *  from t_fault where  (book_name like #{name} and major_type = #{major})
-            or  (fault_name like #{name} and major_type = #{major})
 
+    <select id="findByMultiple" parameterType="com.zglc.fm.entity.FaultFind" resultMap="faultMap">
+        select *
+        from t_fault where 1=1
+        <if test="major !=null">
+            and major_type = #{major}
+        </if>
+        <if test="aircraftType !=null">
+            and aircraft_type = #{aircraftType}
+        </if>
+        <if test="book_name !=null">
+            and book_name like #{book_name}
+        </if>
+        <if test="fault_name !=null">
+            and fault_name like #{fault_name}
+        </if>
+        <if test="author !=null">
+            and author like #{author}
+        </if>
+        <if test="department !=null">
+            and department like #{department}
+        </if>
+        <if test="description !=null">
+            and description like #{description}
+        </if>
+        <if test="beginTime != null">
+            and fault_time <![CDATA[>=]]> #{beginTime}
+        </if>
+        <if test="finishTime !=null">
+            and fault_time <![CDATA[<=]]> #{finishTime}
+        </if>
     </select>
 
     <select id="findByFaultTime" parameterType="com.zglc.fm.entity.FaultFind" resultMap="faultMap">