FT/foton-slrs-system-rest
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/dev_20230216' into dev_20230216

Browse Source
This commit is contained in:
SUNJIABIN
2023-04-03 19:37:40 +08:00
parent 295dcdcce5 c52c720884
commit f796716536
3 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
adc-da-activiti/src/main/java/com/adc/da/FeignClient/workFlowFeignClient.java
+2 -2
View File
@@ -475,8 +475,8 @@ public interface workFlowFeignClient {
String getEsByWk(@RequestParam("prcId")String prcId); String getEsByWk(@RequestParam("prcId")String prcId);
@RequestMapping(value = "/bat-wkflow/datas/bus-process-new/selectBusProcessNew",method = RequestMethod.GET) @RequestMapping(value = "/bat-wkflow/datas/bus-process-new/selectBusProcessNew",method = RequestMethod.GET)
String selectBusProcessNew(@RequestParam("taskId")String taskId); String selectBusProcessNew(@RequestParam("taskId")String taskId);
@RequestMapping(value = "/bat-wkflow/datas/bus-process-new/deleteReplyToenNotice",method = RequestMethod.GET) @RequestMapping(value = "/bat-wkflow/datas/bus-process-new/deleteReplyToenNotice",method = RequestMethod.POST)
String deleteReplyToenNotice(@RequestParam("taskId") String taskId,@RequestParam("answerer") String answerer); List<BusProcessNew> deleteReplyToenNotice(@RequestParam("taskId") String taskId,@RequestParam("answerer") String answerer);
@RequestMapping(value = "/bat-wkflow/datas/bus-process-new/selectAskId",method = RequestMethod.GET) @RequestMapping(value = "/bat-wkflow/datas/bus-process-new/selectAskId",method = RequestMethod.GET)
String selectAskId(@RequestParam("taskId") String taskId); String selectAskId(@RequestParam("taskId") String taskId);
} }
adc-da-activiti/src/main/java/com/adc/da/FeignClientImpl/workFlowFeignClientImpl.java
+1 -1
View File
@@ -423,7 +423,7 @@ public class workFlowFeignClientImpl {
return workFlowFeignClient.selectBusProcessNew(taskId); return workFlowFeignClient.selectBusProcessNew(taskId);
} }
public String deleteReplyToenNotice(@RequestParam("taskId") String taskId,@RequestParam("answerer") String answerer) { public List<BusProcessNew> deleteReplyToenNotice(@RequestParam("taskId") String taskId,@RequestParam("answerer") String answerer) {
return workFlowFeignClient.deleteReplyToenNotice(taskId,answerer); return workFlowFeignClient.deleteReplyToenNotice(taskId,answerer);
} }
adc-da-activiti/src/main/java/com/adc/da/workFlow/controller/WorkFlowController.java
+3 -2
View File
@@ -30,6 +30,7 @@ import com.adc.da.workFlow.service.WorkFlowService;
import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSON;
import io.swagger.annotations.Api; import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiOperation;
import oracle.ucp.proxy.annotation.Post;
import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.StringUtils;
import org.apache.poi.ss.usermodel.Workbook; import org.apache.poi.ss.usermodel.Workbook;
import org.apache.poi.util.IOUtils; import org.apache.poi.util.IOUtils;
@@ -975,8 +976,8 @@ public class WorkFlowController {
} }
@ApiOperation(value = "问答中心（第一个人回答以后删除其他人的代办任务以及OA提醒）") @ApiOperation(value = "问答中心（第一个人回答以后删除其他人的代办任务以及OA提醒）")
@GetMapping("/deleteReplyToenNotice") @PostMapping("/deleteReplyToenNotice")
public String deleteReplyToenNotice(@RequestParam("taskId") String taskId,@RequestParam("answerer") String answerer) { public List<BusProcessNew> deleteReplyToenNotice(@RequestParam("taskId") String taskId,@RequestParam("answerer") String answerer) {
return workFlowFeignClient.deleteReplyToenNotice(taskId,answerer); return workFlowFeignClient.deleteReplyToenNotice(taskId,answerer);
} }