(删除更改为完成任务)

This commit is contained in:
gaojiabao
2023-04-03 11:18:40 +08:00
parent 7121f00552
commit 0738eefbd1
5 changed files with 11 additions and 35 deletions
@@ -11,11 +11,7 @@ import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.activiti.engine.task.Task;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;
import org.springframework.web.bind.annotation.*;
import java.util.List;
@@ -70,8 +66,8 @@ public class BusProcessNewController extends BaseAction {
}
@ApiOperation(value = "问答中心(第一个人回答以后删除其他人的代办任务以及OA提醒)")
@GetMapping("/deleteReplyToenNotice")
public String deleteReplyToenNotice(@RequestParam("taskId") String taskId, @RequestParam("answerer") String answerer){
@PostMapping("/deleteReplyToenNotice")
public List<BusProcessNew> deleteReplyToenNotice(@RequestParam("taskId") String taskId, @RequestParam("answerer") String answerer){
return iBusProcessNewService.deleteReplyToenNotice(taskId,answerer);
}
@@ -81,6 +77,5 @@ public class BusProcessNewController extends BaseAction {
return iBusProcessNewService.selectAskId(taskId);
}
}
@@ -33,6 +33,4 @@ public interface BusProcessNewMapper extends BaseMapper<BusProcessNew> {
List<BusProcessNew> everyDayTenOlock();
List<BusProcessNew> everyDayTenOlockSAM();
void deleteTask(@Param("taskId") String taskId);
}
@@ -38,7 +38,7 @@ public interface IBusProcessNewService extends IService<BusProcessNew> {
String selectBusProcessNew(String taskId);
String deleteReplyToenNotice(String taskId, String answerer);
List<BusProcessNew> deleteReplyToenNotice(String taskId, String answerer);
String selectAskId(String taskId);
}
@@ -107,28 +107,20 @@ public class BusProcessNewServiceImpl extends ServiceImpl<BusProcessNewMapper, B
}
@Override
public String deleteReplyToenNotice(String taskId, String answerer) {
public List<BusProcessNew> deleteReplyToenNotice(String taskId, String answerer) {
ArrayList<BusProcessNewVO> objects = new ArrayList<>();
QueryWrapper<BusProcessNew> objectQueryWrapper = new QueryWrapper<>();
objectQueryWrapper.eq("TASK_ID",taskId);
List<BusProcessNew> busProcessNews = baseMapper.selectList(objectQueryWrapper);
//获取pid
if(!busProcessNews.isEmpty()){
QueryWrapper<BusProcessNew> queryWrapper = new QueryWrapper<>();
queryWrapper.eq("P_ID",busProcessNews.get(0).getPId());
List<BusProcessNew> busProcessNewList = baseMapper.selectList(queryWrapper);
for (BusProcessNew data : busProcessNewList){
//通过taskId删除对应的任务。
if(StringUtils.isNotBlank(data.getUserId()) && !data.getUserId().equals(answerer)){
baseMapper.deleteTask(data.getTaskId());
}
}
}
//删除OA待办
if(StringUtils.isNotBlank(busProcessNews.get(0).getPId())){
webServiceOAService.deleteOAByPid(busProcessNews.get(0).getPId());
}
return "1";
QueryWrapper<BusProcessNew> objectQueryWrapperTaskId = new QueryWrapper<>();
objectQueryWrapperTaskId.eq("P_ID",busProcessNews.get(0).getPId());
List<BusProcessNew> busProcessNewsArr = baseMapper.selectList(objectQueryWrapperTaskId);
//返回当前任务的所有 taskId
return busProcessNewsArr;
}
@Override
@@ -61,13 +61,4 @@
CONCAT( date_sub( DATE_FORMAT( NOW(), '%Y-%m-%d' ), INTERVAL 1 DAY), '%')) and
TASK_INFO = '标准化活动参会流程-流程结束'
</select>
<delete id="deleteTask">
delete act_ru_task
<where>
ID_ = #{taskId}
</where>
</delete>
</mapper>