工作中心 流程查询 待办 已发 已办 监控 技术标准 与制修订分页问题bug 处理
This commit is contained in:
+6
@@ -101,5 +101,11 @@ public class BusProcessNewController extends BaseAction {
|
|||||||
public List<SarBussionessStandState> getSarBussionStandPageNo(@RequestBody List<SarBussionessStandState> rows) {
|
public List<SarBussionessStandState> getSarBussionStandPageNo(@RequestBody List<SarBussionessStandState> rows) {
|
||||||
return iBusProcessNewService.getSarBussionStandPageNo(rows);
|
return iBusProcessNewService.getSarBussionStandPageNo(rows);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ApiOperation(value = "福企标制修订计划流程变更 在合并 延期 取消 更名 流程变更 批准则结束")
|
||||||
|
@GetMapping("/endPrcName")
|
||||||
|
public String endPrcName(@RequestParam("prcName")String prcName,@RequestParam("esId") String esId) {
|
||||||
|
return iBusProcessNewService.endPrcName(prcName,esId);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
+2
@@ -53,4 +53,6 @@ public interface IBusProcessNewService extends IService<BusProcessNew> {
|
|||||||
ResponseMessage<BusProcessNew> updateBusProcessNew(String id, String mags);
|
ResponseMessage<BusProcessNew> updateBusProcessNew(String id, String mags);
|
||||||
|
|
||||||
List<SarBussionessStandState> getSarBussionStandPageNo(List<SarBussionessStandState> rows);
|
List<SarBussionessStandState> getSarBussionStandPageNo(List<SarBussionessStandState> rows);
|
||||||
|
|
||||||
|
String endPrcName(String prcName,String esId);
|
||||||
}
|
}
|
||||||
|
|||||||
+32
@@ -14,9 +14,14 @@ import com.ydw.bat.wkflow.business_main.datas.mapper.BusProcessNewMapper;
|
|||||||
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_oa.webService.service.impl.WebServiceOAServiceImpl;
|
import com.ydw.bat.wkflow.business_oa.webService.service.impl.WebServiceOAServiceImpl;
|
||||||
import com.ydw.bat.wkflow.config.ScheduledJobEsPlan;
|
import com.ydw.bat.wkflow.config.ScheduledJobEsPlan;
|
||||||
|
import com.ydw.bat.wkflow.util.activiti.DeleteTaskCommond;
|
||||||
import com.ydw.bat.wkflow.util.http.ResponseMessage;
|
import com.ydw.bat.wkflow.util.http.ResponseMessage;
|
||||||
import com.ydw.bat.wkflow.util.http.Result;
|
import com.ydw.bat.wkflow.util.http.Result;
|
||||||
|
import org.activiti.engine.ProcessEngine;
|
||||||
|
import org.activiti.engine.RuntimeService;
|
||||||
import org.activiti.engine.TaskService;
|
import org.activiti.engine.TaskService;
|
||||||
|
import org.activiti.engine.impl.ProcessEngineImpl;
|
||||||
|
import org.activiti.engine.runtime.ProcessInstanceQuery;
|
||||||
import org.activiti.engine.task.Task;
|
import org.activiti.engine.task.Task;
|
||||||
import org.activiti.engine.task.TaskQuery;
|
import org.activiti.engine.task.TaskQuery;
|
||||||
import org.apache.commons.lang.StringUtils;
|
import org.apache.commons.lang.StringUtils;
|
||||||
@@ -40,6 +45,9 @@ public class BusProcessNewServiceImpl extends ServiceImpl<BusProcessNewMapper, B
|
|||||||
@Autowired
|
@Autowired
|
||||||
private TaskService taskService;
|
private TaskService taskService;
|
||||||
|
|
||||||
|
@Autowired
|
||||||
|
private RuntimeService runtimeService;
|
||||||
|
|
||||||
@Autowired
|
@Autowired
|
||||||
private WebServiceOAServiceImpl webServiceOAService;
|
private WebServiceOAServiceImpl webServiceOAService;
|
||||||
@Autowired
|
@Autowired
|
||||||
@@ -246,6 +254,30 @@ public class BusProcessNewServiceImpl extends ServiceImpl<BusProcessNewMapper, B
|
|||||||
return row;
|
return row;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public String endPrcName(String prcName,String esId) {
|
||||||
|
// 获取企标的id
|
||||||
|
QueryWrapper<BusProcessNew> busProcessNewQueryWrapper = new QueryWrapper<>();
|
||||||
|
busProcessNewQueryWrapper.eq("PRC_NAME",prcName);
|
||||||
|
List<BusProcessNew> busProcessNews = baseMapper.selectList(busProcessNewQueryWrapper);
|
||||||
|
if(!busProcessNews.isEmpty()){
|
||||||
|
for (BusProcessNew newData:busProcessNews){
|
||||||
|
//判断是否是同一条企标计划
|
||||||
|
JSONObject jsonObject = JSON.parseObject(newData.getMesg());
|
||||||
|
String esIdMesg = jsonObject.getString("esId");
|
||||||
|
if(StringUtils.isNotBlank(esIdMesg)){
|
||||||
|
if(esId.equals(esIdMesg)){
|
||||||
|
//是同一条企标计划 删除当前待办 是否是起草页面
|
||||||
|
//删除OA待办任务
|
||||||
|
// taskService.deleteTask(newData.getTaskId());
|
||||||
|
runtimeService.deleteProcessInstance(newData.getPId(),"原始数据已被更改");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return "成功";
|
||||||
|
}
|
||||||
|
|
||||||
public void taskInfo(List<BusProcessNew> busProcessNews){
|
public void taskInfo(List<BusProcessNew> busProcessNews){
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user