12.7bug修复 草稿改批量删除 流程汇总异常恢复

This commit is contained in:
yuezhihang
2021-12-07 15:17:06 +08:00
parent 50e7d7ab60
commit 2ced1d27a3
5 changed files with 15 additions and 6 deletions
@@ -2521,7 +2521,13 @@ public class TodoTaskController extends BaseAction {
@ApiOperation(value = "删除草稿")
@PostMapping("/delCG")
public String delCG(@RequestParam("id") String id) {
return iBusProcessNameService.delDB(id);
List<String> strings=new ArrayList<>();
if (id.contains(",")){
strings.addAll(new ArrayList<>(Arrays.asList(id.split(","))));
}else {
strings.add(id);
}
return iBusProcessNameService.delDB(strings);
}
@@ -23,5 +23,5 @@ public interface IBusProcessNameService extends IService<BusProcessName> {
List<BusProcessName> todoTask(TaskCommonQuery taskCommonQuery);
String delDB(String id);
String delDB(List<String> id);
}
@@ -35,8 +35,8 @@ public class BusProcessNameServiceImpl extends ServiceImpl<BusProcessNameMapper,
}
@Override
public String delDB(String id) {
if (busProcessNameMapper.deleteById(id)>0) {
public String delDB(List<String> id) {
if (busProcessNameMapper.deleteBatchIds(id)>0) {
return "success";
}else {
return "error";
@@ -10,6 +10,7 @@ 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.IDatasService;
import com.ydw.bat.wkflow.util.SpringContextUtil;
import org.activiti.engine.ActivitiException;
import org.activiti.engine.delegate.DelegateTask;
import org.activiti.engine.delegate.TaskListener;
@@ -42,7 +43,10 @@ public class ProcessStep2After implements TaskListener {
}
if (delegateTask.getVariable("count",Integer.class)==1){
//对数据进行处理 现阶段是数据貌似是只需要人和意见就可以了!!!!
List<BusProcessNew> busProcessNews = busBean.findLastworkPeople2("企标复审流程-起草人修改标准状态",delegateTask.getProcessInstanceId());
QueryWrapper<BusProcessNew> wrapper=new QueryWrapper<>();
wrapper.eq("TASK_ID","6969696969696969");
wrapper.eq("P_ID",delegateTask.getProcessInstanceId());
List<BusProcessNew> busProcessNews = busBean.list(wrapper);
List<String> stings=new ArrayList<>();
stings.add(object.getString("presentPeople")+"-"+object.getString("reviewComments"));
busProcessNews.forEach(busProcessNew -> {
@@ -84,7 +84,6 @@ public class ProcessStep3After implements TaskListener {
queryWrapper1.eq("TASK_ID",delegateTask.getId());
BusProcessNew one1 = busBean.getOne(queryWrapper1);
if(one1!=null){
one1.setCommitFlag("0");
one1.setCommitText(object.getString("commentText"));
busBean.saveOrUpdate(one1);
}