问答中心 页面
This commit is contained in:
+13
@@ -14,6 +14,7 @@ import org.springframework.beans.factory.annotation.Autowired;
|
|||||||
import org.springframework.web.bind.annotation.GetMapping;
|
import org.springframework.web.bind.annotation.GetMapping;
|
||||||
import org.springframework.web.bind.annotation.RequestMapping;
|
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.RestController;
|
||||||
|
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
@@ -68,6 +69,18 @@ public class BusProcessNewController extends BaseAction {
|
|||||||
return iBusProcessNewService.selectBusProcessNew(taskId);
|
return iBusProcessNewService.selectBusProcessNew(taskId);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ApiOperation(value = "问答中心(第一个人回答以后删除其他人的代办任务以及OA提醒)")
|
||||||
|
@GetMapping("/deleteReplyToenNotice")
|
||||||
|
public String deleteReplyToenNotice(@RequestParam("taskId") String taskId, @RequestParam("answerer") String answerer){
|
||||||
|
return iBusProcessNewService.deleteReplyToenNotice(taskId,answerer);
|
||||||
|
}
|
||||||
|
|
||||||
|
@ApiOperation(value = "问答中心(第一个人回答以后删除其他人的代办任务以及OA提醒)")
|
||||||
|
@GetMapping("/selectAskId")
|
||||||
|
public String selectAskId(@RequestParam("taskId") String taskId){
|
||||||
|
return iBusProcessNewService.selectAskId(taskId);
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -34,4 +34,5 @@ public interface BusProcessNewMapper extends BaseMapper<BusProcessNew> {
|
|||||||
|
|
||||||
List<BusProcessNew> everyDayTenOlockSAM();
|
List<BusProcessNew> everyDayTenOlockSAM();
|
||||||
|
|
||||||
|
void deleteTask(@Param("taskId") String taskId);
|
||||||
}
|
}
|
||||||
|
|||||||
+4
@@ -37,4 +37,8 @@ public interface IBusProcessNewService extends IService<BusProcessNew> {
|
|||||||
List<BusProcessNew> everyDayTenOlockSAM();
|
List<BusProcessNew> everyDayTenOlockSAM();
|
||||||
|
|
||||||
String selectBusProcessNew(String taskId);
|
String selectBusProcessNew(String taskId);
|
||||||
|
|
||||||
|
String deleteReplyToenNotice(String taskId, String answerer);
|
||||||
|
|
||||||
|
String selectAskId(String taskId);
|
||||||
}
|
}
|
||||||
|
|||||||
+49
@@ -1,13 +1,17 @@
|
|||||||
package com.ydw.bat.wkflow.business_main.datas.service.impl;
|
package com.ydw.bat.wkflow.business_main.datas.service.impl;
|
||||||
|
|
||||||
import com.alibaba.fastjson.JSON;
|
import com.alibaba.fastjson.JSON;
|
||||||
|
import com.alibaba.fastjson.JSONObject;
|
||||||
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
|
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
|
||||||
import com.ydw.bat.wkflow.business_main.datas.entity.BusProcessNew;
|
import com.ydw.bat.wkflow.business_main.datas.entity.BusProcessNew;
|
||||||
import com.ydw.bat.wkflow.business_main.datas.mapper.BusProcessNewMapper;
|
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.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
|
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
|
||||||
|
import com.ydw.bat.wkflow.business_oa.webService.service.impl.WebServiceOAServiceImpl;
|
||||||
import org.activiti.engine.TaskService;
|
import org.activiti.engine.TaskService;
|
||||||
import org.activiti.engine.task.Task;
|
import org.activiti.engine.task.Task;
|
||||||
|
import org.apache.commons.lang.StringUtils;
|
||||||
|
import org.springframework.beans.factory.annotation.Autowired;
|
||||||
import org.springframework.stereotype.Service;
|
import org.springframework.stereotype.Service;
|
||||||
|
|
||||||
import java.util.*;
|
import java.util.*;
|
||||||
@@ -24,8 +28,12 @@ import java.util.stream.Collectors;
|
|||||||
@Service
|
@Service
|
||||||
public class BusProcessNewServiceImpl extends ServiceImpl<BusProcessNewMapper, BusProcessNew> implements IBusProcessNewService {
|
public class BusProcessNewServiceImpl extends ServiceImpl<BusProcessNewMapper, BusProcessNew> implements IBusProcessNewService {
|
||||||
|
|
||||||
|
@Autowired
|
||||||
private TaskService taskService;
|
private TaskService taskService;
|
||||||
|
|
||||||
|
@Autowired
|
||||||
|
private WebServiceOAServiceImpl webServiceOAService;
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* @Author yuzhong
|
* @Author yuzhong
|
||||||
* @Description
|
* @Description
|
||||||
@@ -98,4 +106,45 @@ public class BusProcessNewServiceImpl extends ServiceImpl<BusProcessNewMapper, B
|
|||||||
return null;
|
return null;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public String deleteReplyToenNotice(String taskId, String answerer) {
|
||||||
|
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";
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public String selectAskId(String taskId) {
|
||||||
|
if(StringUtils.isNotBlank(taskId)){
|
||||||
|
QueryWrapper<BusProcessNew> objectQueryWrapper = new QueryWrapper<>();
|
||||||
|
objectQueryWrapper.eq("TASK_ID",taskId);
|
||||||
|
List<BusProcessNew> busProcessNews = baseMapper.selectList(objectQueryWrapper);
|
||||||
|
if(!busProcessNews.isEmpty()){
|
||||||
|
String mesg = busProcessNews.get(0).getMesg();
|
||||||
|
JSONObject jsonObject = JSON.parseObject(mesg);
|
||||||
|
JSONObject askQuestions = jsonObject.getJSONObject("askQuestions");
|
||||||
|
String id = askQuestions.getString("id");
|
||||||
|
return id;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return null;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,5 +1,7 @@
|
|||||||
package com.ydw.bat.wkflow.listener.quizOrAnswer;
|
package com.ydw.bat.wkflow.listener.quizOrAnswer;
|
||||||
|
|
||||||
|
import com.alibaba.fastjson.JSON;
|
||||||
|
import com.alibaba.fastjson.JSONObject;
|
||||||
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
|
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
|
||||||
import com.ydw.bat.wkflow.business_main.datas.entity.BusProcessNew;
|
import com.ydw.bat.wkflow.business_main.datas.entity.BusProcessNew;
|
||||||
import com.ydw.bat.wkflow.business_main.datas.service.IBusProcessNewService;
|
import com.ydw.bat.wkflow.business_main.datas.service.IBusProcessNewService;
|
||||||
@@ -28,7 +30,7 @@ public class answerBefore implements TaskListener {
|
|||||||
|
|
||||||
CreateMQService oaService = SpringContextUtil.getBean(CreateMQService.class);
|
CreateMQService oaService = SpringContextUtil.getBean(CreateMQService.class);
|
||||||
// 发送 oa 待办 设置 跳转页面 router ? 后面流程类型
|
// 发送 oa 待办 设置 跳转页面 router ? 后面流程类型
|
||||||
one1.setLink("standQA?prcType=27");
|
one1.setLink("standQA?prcType=27&taskId="+one1.getTaskId());
|
||||||
one1.setTaskInfo(delegateTask.getName());
|
one1.setTaskInfo(delegateTask.getName());
|
||||||
oaService.sendTodoMq(one1);
|
oaService.sendTodoMq(one1);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -62,5 +62,9 @@
|
|||||||
TASK_INFO = '标准化活动参会流程-流程结束'
|
TASK_INFO = '标准化活动参会流程-流程结束'
|
||||||
</select>
|
</select>
|
||||||
|
|
||||||
|
<delete id="deleteTask">
|
||||||
|
delete act_ru_task where ID_ = #{taskId}
|
||||||
|
</delete>
|
||||||
|
|
||||||
|
|
||||||
</mapper>
|
</mapper>
|
||||||
|
|||||||
Reference in New Issue
Block a user