feat(emergency plan): add emergency plan paging and parametric query function

src/main/java/com/elephant/framework/galaxy/aroad/module/emergencyplan/controller/EmergencyPlanController.java

@@ -39,7 +39,7 @@ public class EmergencyPlanController extends BaseController  {
    */
   @GetMapping("/page")
   public R getEmergencyPlanPage(Page page, EmergencyPlan emergencyPlan) {
-    return  new R<>(emergencyPlanService.getPlanPage(page,emergencyPlan.getPlanKeyword()));
+    return  new R<>(emergencyPlanService.getPlanPage(page,emergencyPlan));
   }
 
 

src/main/java/com/elephant/framework/galaxy/aroad/module/emergencyplan/mapper/EmergencyPlanMapper.java

@@ -22,5 +22,5 @@ public interface EmergencyPlanMapper extends BaseMapper<EmergencyPlan> {
     * @Author: songwenjie 
     * @Date: 2019/4/25 
     */ 
-    IPage<EmergencyPlanDto> getPlanPage(Page page,String planKeyword);
+    IPage<EmergencyPlanDto> getPlanPage(Page page,EmergencyPlan emergencyPlan);
 }

src/main/java/com/elephant/framework/galaxy/aroad/module/emergencyplan/service/EmergencyPlanService.java

@@ -39,5 +39,5 @@ public interface EmergencyPlanService extends IService<EmergencyPlan> {
      * @Author: songwenjie
      * @Date: 2019/4/25
      */
-    IPage<EmergencyPlanDto> getPlanPage(Page page, String planKeyword);
+    IPage<EmergencyPlanDto> getPlanPage(Page page, EmergencyPlan emergencyPlan);
 }

src/main/java/com/elephant/framework/galaxy/aroad/module/emergencyplan/service/impl/EmergencyPlanServiceImpl.java

@@ -75,7 +75,7 @@ public class EmergencyPlanServiceImpl extends ServiceImpl<EmergencyPlanMapper, E
      * @Author: songwenjie
      * @Date: 2019/4/25
      */
-    public IPage<EmergencyPlanDto> getPlanPage(Page page, String planKeyword){
-        return baseMapper.getPlanPage(page,planKeyword);
+    public IPage<EmergencyPlanDto> getPlanPage(Page page, EmergencyPlan emergencyPlan){
+        return baseMapper.getPlanPage(page,emergencyPlan);
     }
 }

src/main/resources/mapper/emergencyplan/EmergencyPlanMapper.xml

@@ -53,10 +53,17 @@
               `publisher_id`
             from
                emergency_plan
-            <if test="planKeyword != null">
-                  <where>
-                        plan_keyword like concat('%',#{planKeyword},'%')
-                  </where>
+          <where>
+            1 = 1
+            <if test="emergencyPlan.planKeyword != null">
+                and plan_keyword like concat('%',#{emergencyPlan.planKeyword},'%')
             </if>
+            <if test="emergencyPlan.planName != null">
+                and plan_name like concat('%',#{emergencyPlan.planName},'%')
+            </if>
+            <if test="emergencyPlan.publishDept != null">
+                and publish_dept like concat('%',#{emergencyPlan.publishDept},'%')
+            </if>
+          </where>
       </select>
 </mapper>