diff --git a/src/main/java/com/ydw/bat/wkflow/business_auth/LawsUserInfoService.java b/src/main/java/com/ydw/bat/wkflow/business_auth/LawsUserInfoService.java index 599ab5e8..21292bcb 100644 --- a/src/main/java/com/ydw/bat/wkflow/business_auth/LawsUserInfoService.java +++ b/src/main/java/com/ydw/bat/wkflow/business_auth/LawsUserInfoService.java @@ -227,4 +227,7 @@ public interface LawsUserInfoService { @GetMapping("lawss/activiti/selectOnlineFile") ResponseMessage selectOnlineFile(@RequestParam("onlineFileId") String onlineFileId,@RequestParam("standName") String standName,@RequestParam("key") String key); + + @GetMapping("lawss/sarBussionessStand/updateStandStatus") + ResponseMessage changeStandStatus(String standId, String standCode, String standtextStatus); } diff --git a/src/main/java/com/ydw/bat/wkflow/listener/aboliish/ProcessStep6After.java b/src/main/java/com/ydw/bat/wkflow/listener/aboliish/ProcessStep6After.java index 4e1c930d..2d1f71bb 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/aboliish/ProcessStep6After.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/aboliish/ProcessStep6After.java @@ -9,6 +9,7 @@ import com.ydw.bat.wkflow.business_main.datas.service.IBusProcessNewService; import com.ydw.bat.wkflow.business_main.datas.service.IDatasService; import com.ydw.bat.wkflow.business_mq.service.CreateMQService; import com.ydw.bat.wkflow.util.SpringContextUtil; +import org.activiti.engine.ActivitiException; import org.activiti.engine.delegate.DelegateTask; import org.activiti.engine.delegate.TaskListener; import org.apache.commons.lang.StringUtils; @@ -43,17 +44,23 @@ public class ProcessStep6After implements TaskListener { delegateTask.setVariable("bafzFlag","0"); //入库"3lqnlgmgcn" if ("废止".equals(object.getString("nextStatus"))) { - SarBussionessStand sarBussionessStand = new SarBussionessStand(); - sarBussionessStand.setTextStatusBuss(object.getString("standtextStatus")); - sarBussionessStand.setId(object.getString("standId")); - SimpleDateFormat dateFormat=new SimpleDateFormat("yyyy-MM-dd"); - Map bussAttrInfoMap = lawsUserInfoService.getBussAttrInfo(object.getString("standId")); - if(bussAttrInfoMap != null){ - bussAttrInfoMap.replace("FZRQBUSS",dateFormat.format(new Date())); +// SarBussionessStand sarBussionessStand = new SarBussionessStand(); +// sarBussionessStand.setTextStatusBuss(object.getString("standtextStatus")); +// sarBussionessStand.setId(object.getString("standId")); +// SimpleDateFormat dateFormat=new SimpleDateFormat("yyyy-MM-dd"); +// Map bussAttrInfoMap = lawsUserInfoService.getBussAttrInfo(object.getString("standId")); +// if(bussAttrInfoMap != null){ +// bussAttrInfoMap.replace("FZRQBUSS",dateFormat.format(new Date())); +// } +// String as = JSONObject.toJSONString(bussAttrInfoMap); +// sarBussionessStand.setSarStandAttrEOStr(as); +// lawsUserInfoService.updateSarBussionessStand(sarBussionessStand); + + // 变更标准状态 + ResponseMessage result = lawsUserInfoService.changeStandStatus(object.getString("standId"), object.getString("standCode"), object.getString("standtextStatus")); + if(!result.getData()){ + throw new ActivitiException("标准状态变更失败"); } - String as = JSONObject.toJSONString(bussAttrInfoMap); - sarBussionessStand.setSarStandAttrEOStr(as); - lawsUserInfoService.updateSarBussionessStand(sarBussionessStand); } }else { delegateTask.setVariable("bafzFlag","1");