feat: bug #55699 手机端点击同意没效果 相同问题

This commit is contained in:
396572590@qq.com
2022-07-15 17:38:07 +08:00
parent a0a24f8e3f
commit 478165b659
4 changed files with 66 additions and 25 deletions
@@ -9,6 +9,8 @@ import com.ydw.bat.wkflow.business_main.datas.service.IBusProcessNameService;
import com.ydw.bat.wkflow.business_main.datas.service.IBusProcessNewService; 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_main.datas.service.IDatasService;
import com.ydw.bat.wkflow.util.SpringContextUtil; import com.ydw.bat.wkflow.util.SpringContextUtil;
import net.sf.json.JSONArray;
import net.sf.json.util.JSONTokener;
import org.activiti.engine.delegate.DelegateTask; import org.activiti.engine.delegate.DelegateTask;
import org.activiti.engine.delegate.TaskListener; import org.activiti.engine.delegate.TaskListener;
@@ -55,17 +57,26 @@ public class ProcessStep1After implements TaskListener {
String username = delegateTask.getVariable("prcCreateUserName", String.class); String username = delegateTask.getVariable("prcCreateUserName", String.class);
String prcName = ""; String prcName = "";
String type=object.getString("type"); String type=object.getString("type");
if ("5".equals(type)){ String bussSort = "";
prcName=object.getString("bussSort")+"-"+object.getString("esName")+"-计划立项"; Object json = new JSONTokener(object.getString("bussSort")).nextValue();
}else if ("2".equals(type)){ if(json instanceof JSONArray) {
prcName=object.getJSONArray("bussSort").get(0).toString()+"-"+object.getString("esName")+"-计划延期"; bussSort = object.getJSONArray("bussSort").get(0).toString();
}else if ("1".equals(type)){ }else{
prcName=object.getString("bussSort")+"-"+object.getString("esName")+"-计划合并"; bussSort = object.getString("bussSort");
}else if ("3".equals(type)){
prcName=object.getJSONArray("bussSort").get(0).toString()+"-"+object.getString("esName")+"-计划取消";
}else {
prcName=object.getJSONArray("bussSort").get(0).toString()+"-"+object.getString("renameEs")+"-计划更名";
} }
if ("5".equals(type)){
prcName=bussSort+"-"+object.getString("esName")+"-计划立项";
}else if ("2".equals(type)){
prcName=bussSort+"-"+object.getString("esName")+"-计划延期";
}else if ("1".equals(type)){
prcName=bussSort+"-"+object.getString("esName")+"-计划合并";
}else if ("3".equals(type)){
prcName=bussSort+"-"+object.getString("esName")+"-计划取消";
}else {
prcName=bussSort+"-"+object.getString("renameEs")+"-计划更名";
}
QueryWrapper queryWrapper2 = new QueryWrapper(); QueryWrapper queryWrapper2 = new QueryWrapper();
queryWrapper2.eq("PRC_ID", delegateTask.getProcessInstanceId()); queryWrapper2.eq("PRC_ID", delegateTask.getProcessInstanceId());
BusProcessName one1 = busProcessNameService.getOne(queryWrapper2); BusProcessName one1 = busProcessNameService.getOne(queryWrapper2);
@@ -9,6 +9,8 @@ import com.ydw.bat.wkflow.business_main.datas.service.IBusProcessNameService;
import com.ydw.bat.wkflow.business_main.datas.service.IBusProcessNewService; 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_main.datas.service.IDatasService;
import com.ydw.bat.wkflow.util.SpringContextUtil; import com.ydw.bat.wkflow.util.SpringContextUtil;
import net.sf.json.JSONArray;
import net.sf.json.util.JSONTokener;
import org.activiti.engine.delegate.DelegateTask; import org.activiti.engine.delegate.DelegateTask;
import org.activiti.engine.delegate.TaskListener; import org.activiti.engine.delegate.TaskListener;
@@ -51,16 +53,24 @@ public class ProcessStep3After implements TaskListener {
delegateTask.setVariable("count",null); delegateTask.setVariable("count",null);
} }
String type=object.getString("type"); String type=object.getString("type");
String bussSort = "";
Object json = new JSONTokener(object.getString("bussSort")).nextValue();
if(json instanceof JSONArray) {
bussSort = object.getJSONArray("bussSort").get(0).toString();
}else{
bussSort = object.getString("bussSort");
}
if ("5".equals(type)){ if ("5".equals(type)){
prcName=object.getString("bussSort")+"-"+object.getString("esName")+"-计划立项"; prcName=bussSort+"-"+object.getString("esName")+"-计划立项";
}else if ("2".equals(type)){ }else if ("2".equals(type)){
prcName=object.getJSONArray("bussSort").get(0).toString()+"-"+object.getString("esName")+"-计划延期"; prcName=bussSort+"-"+object.getString("esName")+"-计划延期";
}else if ("1".equals(type)){ }else if ("1".equals(type)){
prcName=object.getString("bussSort")+"-"+object.getString("esName")+"-计划合并"; prcName=bussSort+"-"+object.getString("esName")+"-计划合并";
}else if ("3".equals(type)){ }else if ("3".equals(type)){
prcName=object.getJSONArray("bussSort").get(0).toString()+"-"+object.getString("esName")+"-计划取消"; prcName=bussSort+"-"+object.getString("esName")+"-计划取消";
}else { }else {
prcName=object.getJSONArray("bussSort").get(0).toString()+"-"+object.getString("renameEs")+"-计划更名"; prcName=bussSort+"-"+object.getString("renameEs")+"-计划更名";
} }
//截止时间 流程描述 创建人 //截止时间 流程描述 创建人
String user = delegateTask.getVariable("prcCreateUser",String.class); String user = delegateTask.getVariable("prcCreateUser",String.class);
@@ -11,6 +11,8 @@ import com.ydw.bat.wkflow.business_main.datas.service.IBusProcessNameService;
import com.ydw.bat.wkflow.business_main.datas.service.IBusProcessNewService; 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_main.datas.service.IDatasService;
import com.ydw.bat.wkflow.util.SpringContextUtil; import com.ydw.bat.wkflow.util.SpringContextUtil;
import net.sf.json.JSONArray;
import net.sf.json.util.JSONTokener;
import org.activiti.engine.ActivitiException; import org.activiti.engine.ActivitiException;
import org.activiti.engine.delegate.DelegateTask; import org.activiti.engine.delegate.DelegateTask;
import org.activiti.engine.delegate.TaskListener; import org.activiti.engine.delegate.TaskListener;
@@ -146,16 +148,24 @@ public class ProcessStep4After implements TaskListener {
delegateTask.setVariable("count",null); delegateTask.setVariable("count",null);
} }
String type=object.getString("type"); String type=object.getString("type");
String bussSort = "";
Object json = new JSONTokener(object.getString("bussSort")).nextValue();
if(json instanceof JSONArray) {
bussSort = object.getJSONArray("bussSort").get(0).toString();
}else{
bussSort = object.getString("bussSort");
}
if ("5".equals(type)){ if ("5".equals(type)){
prcName=object.getString("bussSort")+"-"+object.getString("esName")+"-计划立项"; prcName=bussSort+"-"+object.getString("esName")+"-计划立项";
}else if ("2".equals(type)){ }else if ("2".equals(type)){
prcName=object.getJSONArray("bussSort").get(0).toString()+"-"+object.getString("esName")+"-计划延期"; prcName=bussSort+"-"+object.getString("esName")+"-计划延期";
}else if ("1".equals(type)){ }else if ("1".equals(type)){
prcName=object.getString("bussSort")+"-"+object.getString("esName")+"-计划合并"; prcName=bussSort+"-"+object.getString("esName")+"-计划合并";
}else if ("3".equals(type)){ }else if ("3".equals(type)){
prcName=object.getJSONArray("bussSort").get(0).toString()+"-"+object.getString("esName")+"-计划取消"; prcName=bussSort+"-"+object.getString("esName")+"-计划取消";
}else { }else {
prcName=object.getJSONArray("bussSort").get(0).toString()+"-"+object.getString("renameEs")+"-计划更名"; prcName=bussSort+"-"+object.getString("renameEs")+"-计划更名";
} }
//截止时间 流程描述 创建人 //截止时间 流程描述 创建人
@@ -9,6 +9,8 @@ import com.ydw.bat.wkflow.business_main.datas.service.IBusProcessNameService;
import com.ydw.bat.wkflow.business_main.datas.service.IBusProcessNewService; 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_main.datas.service.IDatasService;
import com.ydw.bat.wkflow.util.SpringContextUtil; import com.ydw.bat.wkflow.util.SpringContextUtil;
import net.sf.json.JSONArray;
import net.sf.json.util.JSONTokener;
import org.activiti.engine.delegate.DelegateTask; import org.activiti.engine.delegate.DelegateTask;
import org.activiti.engine.delegate.TaskListener; import org.activiti.engine.delegate.TaskListener;
@@ -37,16 +39,24 @@ public class ProcessStep5After implements TaskListener {
List<String> nextUserList = new ArrayList(); List<String> nextUserList = new ArrayList();
String prcName = ""; String prcName = "";
String type=object.getString("type"); String type=object.getString("type");
String bussSort = "";
Object json = new JSONTokener(object.getString("bussSort")).nextValue();
if(json instanceof JSONArray) {
bussSort = object.getJSONArray("bussSort").get(0).toString();
}else{
bussSort = object.getString("bussSort");
}
if ("5".equals(type)){ if ("5".equals(type)){
prcName=object.getString("bussSort")+"-"+object.getString("esName")+"-计划立项"; prcName=bussSort+"-"+object.getString("esName")+"-计划立项";
}else if ("2".equals(type)){ }else if ("2".equals(type)){
prcName=object.getJSONArray("bussSort").get(0).toString()+"-"+object.getString("esName")+"-计划延期"; prcName=bussSort+"-"+object.getString("esName")+"-计划延期";
}else if ("1".equals(type)){ }else if ("1".equals(type)){
prcName=object.getString("bussSort")+"-"+object.getString("esName")+"-计划合并"; prcName=bussSort+"-"+object.getString("esName")+"-计划合并";
}else if ("3".equals(type)){ }else if ("3".equals(type)){
prcName=object.getJSONArray("bussSort").get(0).toString()+"-"+object.getString("esName")+"-计划取消"; prcName=bussSort+"-"+object.getString("esName")+"-计划取消";
}else { }else {
prcName=object.getJSONArray("bussSort").get(0).toString()+"-"+object.getString("renameEs")+"-计划更名"; prcName=bussSort+"-"+object.getString("renameEs")+"-计划更名";
} }
//根据意见选择 企标状态并对企标信息进行修改 bzfgId //根据意见选择 企标状态并对企标信息进行修改 bzfgId
nextUserList.add(delegateTask.getVariable("topmanagerId",String.class)); nextUserList.add(delegateTask.getVariable("topmanagerId",String.class));