From cda2290b327dbbbaf0c496f1a2e17f29528d78b4 Mon Sep 17 00:00:00 2001 From: gaojiabao Date: Tue, 18 Apr 2023 10:03:05 +0800 Subject: [PATCH 1/4] =?UTF-8?q?OA=E5=BE=85=E5=8A=9E=E5=88=A0=E9=99=A4?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3=20PId?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/adc/da/FeignClient/workFlowFeignClient.java | 2 ++ .../da/FeignClientImpl/workFlowFeignClientImpl.java | 4 ++++ .../da/workFlow/controller/WorkFlowController.java | 12 ++++++++++++ 3 files changed, 18 insertions(+) diff --git a/adc-da-activiti/src/main/java/com/adc/da/FeignClient/workFlowFeignClient.java b/adc-da-activiti/src/main/java/com/adc/da/FeignClient/workFlowFeignClient.java index 0e20eb4e..7f97d4f5 100644 --- a/adc-da-activiti/src/main/java/com/adc/da/FeignClient/workFlowFeignClient.java +++ b/adc-da-activiti/src/main/java/com/adc/da/FeignClient/workFlowFeignClient.java @@ -490,4 +490,6 @@ public interface workFlowFeignClient { @RequestMapping(value = "/bat-wkflow/datas/bus-process-new/questionsAndAnswers",method = RequestMethod.GET) ResponseMessage questionsAndAnswers(@RequestParam("askId") String askId, @RequestParam("answerer") String answerer); + @RequestMapping(value = "/bat-wkflow/deleteOATask",method = RequestMethod.GET) + String deleteOATask(@RequestParam("pId") String pId); } diff --git a/adc-da-activiti/src/main/java/com/adc/da/FeignClientImpl/workFlowFeignClientImpl.java b/adc-da-activiti/src/main/java/com/adc/da/FeignClientImpl/workFlowFeignClientImpl.java index 9107167a..2824665e 100644 --- a/adc-da-activiti/src/main/java/com/adc/da/FeignClientImpl/workFlowFeignClientImpl.java +++ b/adc-da-activiti/src/main/java/com/adc/da/FeignClientImpl/workFlowFeignClientImpl.java @@ -446,4 +446,8 @@ public class workFlowFeignClientImpl { public ResponseMessage questionsAndAnswers(@RequestParam("askId") String askId,@RequestParam("answerer") String answerer) { return workFlowFeignClient.questionsAndAnswers(askId,answerer); } + + public String deleteOATask(@RequestParam("pId") String pId) { + return workFlowFeignClient.deleteOATask(pId); + } } diff --git a/adc-da-activiti/src/main/java/com/adc/da/workFlow/controller/WorkFlowController.java b/adc-da-activiti/src/main/java/com/adc/da/workFlow/controller/WorkFlowController.java index f89e7dcc..02c61b5b 100644 --- a/adc-da-activiti/src/main/java/com/adc/da/workFlow/controller/WorkFlowController.java +++ b/adc-da-activiti/src/main/java/com/adc/da/workFlow/controller/WorkFlowController.java @@ -1209,4 +1209,16 @@ public class WorkFlowController { public ResponseMessage questionsAndAnswers(@RequestParam("askId") String askId,@RequestParam("answerer") String answerer) { return workFlowFeignClient.questionsAndAnswers(askId,answerer); } + + @ApiOperation(value = "删除OA代办任务 pid") + @GetMapping("/deleteOATask") + public String deleteOATask(@RequestParam("pIds") String pIds) { + if(StringUtils.isNotBlank(pIds)){ + String[] split = pIds.split(","); + for (String pId: split){ + workFlowFeignClient.deleteOATask(pId); + } + } + return "1"; + } } From 170ca52342c5f00b5aa4d069195b7c4ad493a211 Mon Sep 17 00:00:00 2001 From: gaojiabao Date: Tue, 18 Apr 2023 10:12:19 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E7=AC=AC=E4=B8=89=E6=96=B9=E8=B0=83?= =?UTF-8?q?=E7=94=A8=E6=8E=A5=E5=8F=A3=E4=BF=A1=E6=81=AF=E8=AE=B0=E5=BD=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- adc-da-slrs/src/main/resources/mysql/interfaceLog.sql | 7 +++++++ 1 file changed, 7 insertions(+) create mode 100644 adc-da-slrs/src/main/resources/mysql/interfaceLog.sql diff --git a/adc-da-slrs/src/main/resources/mysql/interfaceLog.sql b/adc-da-slrs/src/main/resources/mysql/interfaceLog.sql new file mode 100644 index 00000000..654cc974 --- /dev/null +++ b/adc-da-slrs/src/main/resources/mysql/interfaceLog.sql @@ -0,0 +1,7 @@ +-- 福田 需要通过第三方调用的接口 + +-- 2023-04-18 +-- 路径 http://localhost:9090/api/lawss/activiti/deleteOATask +--参数 String pIds (pIds 字符串拼接 逗号隔开) +--类型 Get + From c4510b070ff8612c48ba5b7a49938b6bca30e2c0 Mon Sep 17 00:00:00 2001 From: gaojiabao Date: Tue, 18 Apr 2023 10:21:20 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E7=AC=AC=E4=B8=89=E6=96=B9=E8=B0=83?= =?UTF-8?q?=E7=94=A8=E6=8E=A5=E5=8F=A3=E4=BF=A1=E6=81=AF=E8=AE=B0=E5=BD=95?= =?UTF-8?q?=20=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/mysql/interfaceLog.sql | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/adc-da-slrs/src/main/resources/mysql/interfaceLog.sql b/adc-da-slrs/src/main/resources/mysql/interfaceLog.sql index 654cc974..179c58eb 100644 --- a/adc-da-slrs/src/main/resources/mysql/interfaceLog.sql +++ b/adc-da-slrs/src/main/resources/mysql/interfaceLog.sql @@ -1,7 +1,16 @@ -- 福田 需要通过第三方调用的接口 -- 2023-04-18 +-- 名称 通过pid删除OA待办任务 +-- 详情 -- 路径 http://localhost:9090/api/lawss/activiti/deleteOATask ---参数 String pIds (pIds 字符串拼接 逗号隔开) ---类型 Get +-- 参数 String pIds (pIds 字符串拼接 逗号隔开) +-- 类型 Get + +-- 2023-04-18 +-- 名称 调用此接口走流程 +-- 详情 手动数据库加入企标计划 调用此接口使其走流程 +-- 路径 http://localhost:9090/api/lawss/activiti/batchToDoTasks +-- 参数 String json (字符串类型的json，需要包含ids，prcCreateUser（不能为空即可）) 以起草人为发起人 +-- 类型 Get From e61b740e8839180ce904fc40f47727df9395a028 Mon Sep 17 00:00:00 2001 From: gaojiabao Date: Tue, 18 Apr 2023 10:57:27 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E7=AC=AC=E4=B8=89=E6=96=B9=E8=B0=83?= =?UTF-8?q?=E7=94=A8=E6=8E=A5=E5=8F=A3=E4=BF=A1=E6=81=AF=E8=AE=B0=E5=BD=95?= =?UTF-8?q?=20=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/WorkFlowController.java | 29 ++++++++++--------- .../src/main/resources/mysql/interfaceLog.sql | 2 ++ 2 files changed, 17 insertions(+), 14 deletions(-) diff --git a/adc-da-activiti/src/main/java/com/adc/da/workFlow/controller/WorkFlowController.java b/adc-da-activiti/src/main/java/com/adc/da/workFlow/controller/WorkFlowController.java index 02c61b5b..931faa89 100644 --- a/adc-da-activiti/src/main/java/com/adc/da/workFlow/controller/WorkFlowController.java +++ b/adc-da-activiti/src/main/java/com/adc/da/workFlow/controller/WorkFlowController.java @@ -23,6 +23,8 @@ import com.adc.da.slrs.sarInstitution.entity.TsInstitution; import com.adc.da.slrs.sarUser.entity.TsUser; import com.adc.da.slrs.sarUser.service.ITsUserService; import com.adc.da.sys.common.EmailUtils; +import com.adc.da.sys.dao.DicTypeEODao; +import com.adc.da.sys.entity.DicTypeEO; import com.adc.da.sys.entity.UserEO; import com.adc.da.sys.service.IUserEOService; import com.adc.da.util.LoginUserUtil; @@ -96,6 +98,9 @@ public class WorkFlowController { @Autowired private TsInstitutionDao tsInstitutionDao; + @Autowired + private DicTypeEODao dicTypeEODao; + // @Autowired // private ExportExcelMapper exportExcelMapper; @@ -1128,23 +1133,19 @@ public class WorkFlowController { qbfsForm.put("isRelate",data.getIsRelate()); qbfsForm.put("useLevel",data.getUseLevel()); - String useLevelNameStr = ""; if(StringUtils.isNotBlank(data.getUseLevel())){ - String[] split = data.getUseLevel().split(","); - List asList = Arrays.asList(split); - for (String uid: asList){ - TsUser byIdUseLevel = userService.getById(uid); - if(StringUtils.isBlank(useLevelNameStr)){ - useLevelNameStr = byIdUseLevel.getUname(); - }else { - useLevelNameStr = useLevelNameStr+","+byIdUseLevel.getUname(); - } - } - } - if(StringUtils.isNotBlank(useLevelNameStr)){ - qbfsForm.put("useLevelName",useLevelNameStr); + List dicTypeEOS = dicTypeEODao.selectDic("VBERTFDGGF"); + if(!dicTypeEOS.isEmpty()) { + for (DicTypeEO dicInfo:dicTypeEOS) { + if(data.getUseLevel().equals(dicInfo.getDicTypeCode())){ + qbfsForm.put("useLevelName",dicInfo.getDicTypeName()); + } + } + } + } + qbfsForm.put("technologic",data.getTechnologic()); qbfsForm.put("bussSort",data.getBussSort()); qbfsForm.put("lxdName",""); diff --git a/adc-da-slrs/src/main/resources/mysql/interfaceLog.sql b/adc-da-slrs/src/main/resources/mysql/interfaceLog.sql index 179c58eb..1eefefbd 100644 --- a/adc-da-slrs/src/main/resources/mysql/interfaceLog.sql +++ b/adc-da-slrs/src/main/resources/mysql/interfaceLog.sql @@ -1,5 +1,7 @@ -- 福田 需要通过第三方调用的接口 + + -- 2023-04-18 -- 名称 通过pid删除OA待办任务 -- 详情