规则修改适配

YeeAmosFireAutoSysService/src/main/java/com/yeejoin/amos/fas/business/dao/repository/IContingencyOriginalDataDao.java

@@ -25,6 +25,12 @@ public interface IContingencyOriginalDataDao  extends BaseDao<ContingencyOrigina
     @Modifying(clearAutomatically = true)
     @Query(value = "update contingency_original_data c set c.confirm = ?1,c.runstep=?2 ,c.step_state=?3 where c.batch_No = ?4",nativeQuery = true)
     int updateByButton(String confirm,Boolean runstep,String stepState,String batchNo);
+    
+
+    @Transactional
+    @Modifying(clearAutomatically = true)
+    @Query(value = "update contingency_original_data c set c.step = ?1 where c.batch_No = ?2",nativeQuery = true)
+    int updateByButtonStep(String step,String batchNo);
 
 
 }

YeeAmosFireAutoSysService/src/main/java/com/yeejoin/amos/fas/business/service/impl/ContingencyInstanceImpl.java

@@ -115,7 +115,7 @@ public class ContingencyInstanceImpl /*extends GenericManagerImpl<ContingencyPla
     }
 
 
-    public void fire(String batchNo, String stepCode, String contingencyPlanId, String buttonCode, String buttonState, String stepStateOnbutton) throws Exception {
+    public  void fire(String batchNo, String stepCode, String contingencyPlanId, String buttonCode, String buttonState, String stepStateOnbutton) throws Exception {
         //火灾误报
 
         ContingencyOriginalData contingencyOriginalData = iContingencyOriginalDataDao.findByBatchNo(batchNo);
@@ -157,7 +157,7 @@ public class ContingencyInstanceImpl /*extends GenericManagerImpl<ContingencyPla
                     contingencyOriginalData.getRunstep(),
                     contingencyOriginalData.getStepState(),
                     contingencyOriginalData.getBatchNo());
-            //setButtonExecuted(batchNo,contingencyPlanId, buttonCode,buttonState);
+//            setButtonExecuted(batchNo,contingencyPlanId, buttonCode,buttonState);
 
             //使用原始数据触发规则
 
@@ -272,7 +272,6 @@ public class ContingencyInstanceImpl /*extends GenericManagerImpl<ContingencyPla
 
 	@Override
 	public void updateStep(String step, String batchNo) {
-		// TODO Auto-generated method stub
-		
+		 iContingencyOriginalDataDao.updateByButtonStep(step,batchNo);	
 	}
 }