feat(emergency event): add paged filter query of the event

src/main/java/com/elephant/framework/galaxy/aroad/module/emergencyevent/mapper/EmergencyEventMapper.java

@@ -30,7 +30,8 @@ public interface EmergencyEventMapper extends BaseMapper<EmergencyEvent> {
     * @Author: songwenjie
     * @Date: 2019/5/15 
     */ 
-    boolean updateStatus(@Param("eventId")Integer enevtId,@Param("status")String status);
+    boolean updateStatus(@Param("eventId")Integer enevtId, @Param("newStatus")String newStatus,
+                         @Param("oldStatus") String oldStatus);
 
 
     /** 
@@ -40,7 +41,8 @@ public interface EmergencyEventMapper extends BaseMapper<EmergencyEvent> {
     * @Author: songwenjie
     * @Date: 2019/5/15 
     */ 
-    Page<EmergencyEvent> getEventPage (Page page,String reportingDept);
+    Page<EmergencyEvent> getEventPage (Page page,@Param("reportingDept") String reportingDept,
+                                       @Param("status") String status);
     
     /** 
     * @Description: 更新评估总结文档信息

src/main/java/com/elephant/framework/galaxy/aroad/module/emergencyevent/service/EmergencyEventService.java

@@ -37,7 +37,7 @@ public interface EmergencyEventService extends IService<EmergencyEvent> {
      * @Author: songwenjie
      * @Date: 2019/5/15
      */
-    boolean updateStatus(Integer eventId,String status);
+    boolean updateStatus(Integer eventId,String newStatus,String oldStatus);
 
     /**
      * @Description: 更新评估总结文档信息

src/main/java/com/elephant/framework/galaxy/aroad/module/emergencyevent/service/impl/EmergencyEventServiceImpl.java

@@ -37,10 +37,10 @@ public class EmergencyEventServiceImpl extends ServiceImpl<EmergencyEventMapper,
         int reportingDeptId = event.getReportingDeptId();
         boolean isProvince = deptService.isProvince(reportingDeptId);
         if(isProvince){
-            return baseMapper.getEventPage(page,null);
+            return baseMapper.getEventPage(page,null,event.getStatus());
         }
         String deptName = deptService.getDeptName(reportingDeptId);
-        return baseMapper.getEventPage(page,deptName);
+        return baseMapper.getEventPage(page,deptName,event.getStatus());
     }
 
     /** 
@@ -77,8 +77,8 @@ public class EmergencyEventServiceImpl extends ServiceImpl<EmergencyEventMapper,
     * @Author: songwenjie
     * @Date: 2019/5/15 
     */  
-    public boolean updateStatus(Integer eventId,String status){
-        return baseMapper.updateStatus(eventId,status);
+    public boolean updateStatus(Integer eventId,String newStatus,String oldStatus){
+        return baseMapper.updateStatus(eventId,newStatus,oldStatus);
     }
 
     /**

src/main/java/com/elephant/framework/galaxy/aroad/module/emergencyevent/service/impl/EvendealServiceImpl.java

@@ -39,10 +39,10 @@ public class EvendealServiceImpl extends ServiceImpl<EvendealMapper, Evendeal> i
 
         int dealType = eventdeal.getDealType();
         if(dealType == 0){
-            emergencyEventService.updateStatus(eventdeal.getEventId(),"已下达");
+            emergencyEventService.updateStatus(eventdeal.getEventId(),"已下达","未处理");
         }
         if(dealType == 1){
-            emergencyEventService.updateStatus(eventdeal.getEventId(),"已反馈");
+            emergencyEventService.updateStatus(eventdeal.getEventId(),"已反馈","已下达");
         }
 
         return save(eventdeal);

src/main/resources/mapper/emergencyevent/EmergencyEventMapper.xml

@@ -32,19 +32,24 @@
   </insert>
 
   <update id="updateStatus">
-     update emergency_event set status=#{status} where event_id=#{eventId}
+     update emergency_event set status=#{newStatus}
+     where event_id=#{eventId} and status = #{oldStatus}
   </update>
 
   <select id="getEventPage" resultMap="emergencyEventMap">
     select * from emergency_event
+    where 1=1
     <if test="reportingDept != null">
-        where reporting_dept = #{reportingDept}
+        and reporting_dept = #{reportingDept}
+    </if>
+    <if test="status != null">
+        and status = #{status}
     </if>
     order by reporting_time desc
   </select>
 
   <update id="updateFile">
-     update emergency_event set file_name=#{fileName},file_url=#{fileUrl}
+     update emergency_event set file_name=#{fileName},file_url=#{fileUrl},status=#{status}
      where event_id=#{eventId}
   </update>