|
@@ -482,7 +482,7 @@ public class TaskController extends BladeController {
|
|
if (archiveFile != null) {
|
|
if (archiveFile != null) {
|
|
//修改档案文件收集业务数据状态=已废除
|
|
//修改档案文件收集业务数据状态=已废除
|
|
jdbcTemplate.execute("update u_archive_file set status = 3 where id = " + archiveId);
|
|
jdbcTemplate.execute("update u_archive_file set status = 3 where id = " + archiveId);
|
|
- Task task = jdbcTemplate.queryForObject("select id,status,process_instance_id from u_task where form_data_id = " + archiveId, new BeanPropertyRowMapper<>(Task.class));
|
|
|
|
|
|
+ Task task = jdbcTemplate.query("select id,status,process_instance_id from u_task where form_data_id = " + archiveId, new BeanPropertyRowMapper<>(Task.class)).stream().findAny().orElse(null);
|
|
if (task != null && task.getStatus().equals(1)) {
|
|
if (task != null && task.getStatus().equals(1)) {
|
|
//待审批审批任务=已废除
|
|
//待审批审批任务=已废除
|
|
jdbcTemplate.execute("update u_task set status = 3 where id = " + task.getId());
|
|
jdbcTemplate.execute("update u_task set status = 3 where id = " + task.getId());
|
|
@@ -512,7 +512,7 @@ public class TaskController extends BladeController {
|
|
} else if (repealDTO.getType().equals(2)) { //任务审批废除
|
|
} else if (repealDTO.getType().equals(2)) { //任务审批废除
|
|
String[] taskIds = repealDTO.getIds().split(",");
|
|
String[] taskIds = repealDTO.getIds().split(",");
|
|
for (String taskId : taskIds) {
|
|
for (String taskId : taskIds) {
|
|
- Task task = jdbcTemplate.queryForObject("select id,status,process_instance_id,form_data_id from u_task where id = " + taskId, new BeanPropertyRowMapper<>(Task.class));
|
|
|
|
|
|
+ Task task = jdbcTemplate.query("select id,status,process_instance_id,form_data_id from u_task where id = " + taskId, new BeanPropertyRowMapper<>(Task.class)).stream().findAny().orElse(null);
|
|
if (task != null && task.getStatus().equals(1)) {
|
|
if (task != null && task.getStatus().equals(1)) {
|
|
//待审批审批任务=已废除
|
|
//待审批审批任务=已废除
|
|
jdbcTemplate.execute("update u_task set status = 3 where id = " + task.getId());
|
|
jdbcTemplate.execute("update u_task set status = 3 where id = " + task.getId());
|