diff --git a/src/main/java/com/ydw/bat/wkflow/business_main/datas/controller/BusProcessNewController.java b/src/main/java/com/ydw/bat/wkflow/business_main/datas/controller/BusProcessNewController.java index 171457db..b6595722 100644 --- a/src/main/java/com/ydw/bat/wkflow/business_main/datas/controller/BusProcessNewController.java +++ b/src/main/java/com/ydw/bat/wkflow/business_main/datas/controller/BusProcessNewController.java @@ -1,12 +1,10 @@ package com.ydw.bat.wkflow.business_main.datas.controller; -import com.baomidou.mybatisplus.extension.api.R; import com.tmsps.fk.common.base.action.BaseAction; 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.impl.BusProcessNewServiceImpl; -import com.ydw.bat.wkflow.util.WebUtil; +import com.ydw.bat.wkflow.util.http.ResponseMessage; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.activiti.engine.task.Task; @@ -86,7 +84,7 @@ public class BusProcessNewController extends BaseAction { @ApiOperation(value = "问答中心 个人中心 我的问答 回答无taskID问题") @GetMapping("/questionsAndAnswers") - public BusProcessNew questionsAndAnswers(@RequestParam("askId") String askId,@RequestParam("answerer") String answerer) { + public ResponseMessage questionsAndAnswers(@RequestParam("askId") String askId, @RequestParam("answerer") String answerer) { return iBusProcessNewService.questionsAndAnswers(askId,answerer); } } diff --git a/src/main/java/com/ydw/bat/wkflow/business_main/datas/service/IBusProcessNewService.java b/src/main/java/com/ydw/bat/wkflow/business_main/datas/service/IBusProcessNewService.java index c6b564e9..b6be23c1 100644 --- a/src/main/java/com/ydw/bat/wkflow/business_main/datas/service/IBusProcessNewService.java +++ b/src/main/java/com/ydw/bat/wkflow/business_main/datas/service/IBusProcessNewService.java @@ -2,6 +2,7 @@ package com.ydw.bat.wkflow.business_main.datas.service; import com.ydw.bat.wkflow.business_main.datas.entity.BusProcessNew; import com.baomidou.mybatisplus.extension.service.IService; +import com.ydw.bat.wkflow.util.http.ResponseMessage; import org.activiti.engine.task.Task; import org.apache.ibatis.annotations.Param; @@ -45,5 +46,5 @@ public interface IBusProcessNewService extends IService { Map selectWenDan(String taskId); - BusProcessNew questionsAndAnswers(String askId, String answerer); + ResponseMessage questionsAndAnswers(String askId, String answerer); } diff --git a/src/main/java/com/ydw/bat/wkflow/business_main/datas/service/impl/BusProcessNewServiceImpl.java b/src/main/java/com/ydw/bat/wkflow/business_main/datas/service/impl/BusProcessNewServiceImpl.java index 8d51b452..408f5d5f 100644 --- a/src/main/java/com/ydw/bat/wkflow/business_main/datas/service/impl/BusProcessNewServiceImpl.java +++ b/src/main/java/com/ydw/bat/wkflow/business_main/datas/service/impl/BusProcessNewServiceImpl.java @@ -13,6 +13,8 @@ import com.ydw.bat.wkflow.business_main.datas.service.IBusProcessNewService; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.ydw.bat.wkflow.business_oa.webService.service.impl.WebServiceOAServiceImpl; import com.ydw.bat.wkflow.config.ScheduledJobEsPlan; +import com.ydw.bat.wkflow.util.http.ResponseMessage; +import com.ydw.bat.wkflow.util.http.Result; import org.activiti.engine.TaskService; import org.activiti.engine.task.Task; import org.apache.commons.lang.StringUtils; @@ -159,7 +161,7 @@ public class BusProcessNewServiceImpl extends ServiceImpl questionsAndAnswers(String askId, String answerer) { QueryWrapper objectQueryWrapper = new QueryWrapper<>(); objectQueryWrapper.eq("USER_ID",answerer); objectQueryWrapper.eq("TASK_INFO","问答中心回答"); @@ -174,12 +176,12 @@ public class BusProcessNewServiceImpl extends ServiceImpl