From e5047b29a8b3d878f2a03fd17ddc9bf18b1245b9 Mon Sep 17 00:00:00 2001 From: liao Date: Fri, 10 Nov 2023 11:46:33 +0800 Subject: [PATCH] =?UTF-8?q?update=20ASMS=E5=AF=B9=E6=8E=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/LawsAsmsOpenApiServiceImpl.java | 2 +- .../impl/SynchronizationAsmsService.java | 2 +- ...ProcessFbStandardConsultationController.java | 17 +++++++++++++++++ .../IProcessFbStandardConsultationService.java | 7 +++++++ ...rocessFbStandardConsultationServiceImpl.java | 11 +++++++++++ 5 files changed, 37 insertions(+), 2 deletions(-) diff --git a/laws-modules-docking/src/main/java/com/jero/modules/docking/asms/service/impl/LawsAsmsOpenApiServiceImpl.java b/laws-modules-docking/src/main/java/com/jero/modules/docking/asms/service/impl/LawsAsmsOpenApiServiceImpl.java index 085134f7..471f2d4f 100644 --- a/laws-modules-docking/src/main/java/com/jero/modules/docking/asms/service/impl/LawsAsmsOpenApiServiceImpl.java +++ b/laws-modules-docking/src/main/java/com/jero/modules/docking/asms/service/impl/LawsAsmsOpenApiServiceImpl.java @@ -535,7 +535,7 @@ public class LawsAsmsOpenApiServiceImpl extends ServiceImpl totalMap = asmsPostUtil.sendGetReq2(url, map); Integer total = (Integer) totalMap.get("total"); map.put("pageSize", total.toString()); diff --git a/laws-modules-docking/src/main/java/com/jero/modules/docking/asms/service/impl/SynchronizationAsmsService.java b/laws-modules-docking/src/main/java/com/jero/modules/docking/asms/service/impl/SynchronizationAsmsService.java index b9b18224..5b687b97 100644 --- a/laws-modules-docking/src/main/java/com/jero/modules/docking/asms/service/impl/SynchronizationAsmsService.java +++ b/laws-modules-docking/src/main/java/com/jero/modules/docking/asms/service/impl/SynchronizationAsmsService.java @@ -293,7 +293,7 @@ public class SynchronizationAsmsService { String url = "xiaobodata/openApi/article/search"; Map paramMap = new HashMap<>(); paramMap.put("pageNo", "1"); - paramMap.put("pageSize", "2"); + paramMap.put("pageSize", "1000"); Map totalMap = asmsPostUtil.sendGetReq2(url, paramMap); Integer total = (Integer) totalMap.get("total"); paramMap.put("pageSize", total.toString()); diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/fb/controller/ProcessFbStandardConsultationController.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/fb/controller/ProcessFbStandardConsultationController.java index bd0404f2..0af3e0ea 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/fb/controller/ProcessFbStandardConsultationController.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/fb/controller/ProcessFbStandardConsultationController.java @@ -2,6 +2,7 @@ package com.jero.modules.activiti.process.fb.controller; import com.jero.common.api.vo.Result; import com.jero.common.aspect.annotation.AutoLog; +import com.jero.modules.activiti.process.fb.entity.ProcessFbEntryChange; import com.jero.modules.activiti.process.fb.entity.ProcessFbStandardConsultation; import com.jero.modules.activiti.process.fb.service.IProcessFbStandardConsultationService; import com.jero.modules.activiti.process.fb.vo.ProcessFbStandardConsultationVO; @@ -37,4 +38,20 @@ public class ProcessFbStandardConsultationController extends JeroController agree(@Validated @RequestBody ProcessInfoVO processInfoVO) { + processFbStandardConsultationService.approveTask(processInfoVO, true); + return Result.OK(); + } + + @AutoLog(value = "标准征求意见流程-驳回") + @ApiOperation(value="标准征求意见流程-驳回", notes="标准征求意见流程-驳回") + @PostMapping("/reject") + public Result reject(@Validated @RequestBody ProcessInfoVO processInfoVO) { + processFbStandardConsultationService.approveTask(processInfoVO, false); + return Result.OK(); + } } diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/fb/service/IProcessFbStandardConsultationService.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/fb/service/IProcessFbStandardConsultationService.java index ee08641e..c671e3db 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/fb/service/IProcessFbStandardConsultationService.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/fb/service/IProcessFbStandardConsultationService.java @@ -19,4 +19,11 @@ public interface IProcessFbStandardConsultationService extends IService processInfoVO); + + /** + * @Author: liao + * @Date: 2023/11/10 11:41 + * @Description: 审批 + **/ + void approveTask(ProcessInfoVO processInfoVO, boolean pass); } diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/fb/service/impl/ProcessFbStandardConsultationServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/fb/service/impl/ProcessFbStandardConsultationServiceImpl.java index aa533726..66f54c66 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/fb/service/impl/ProcessFbStandardConsultationServiceImpl.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/fb/service/impl/ProcessFbStandardConsultationServiceImpl.java @@ -49,6 +49,7 @@ public class ProcessFbStandardConsultationServiceImpl extends ServiceImpl processInfoVO) { + // 业务基本信息 ProcessFbStandardConsultation businessInfoDTO = processInfoVO.getBusinessInfoDTO().getProcessFbStandardConsultation(); businessInfoDTO.setId(UUIDUtils.randomUUID20()); save(businessInfoDTO); // 保存业务信息 @@ -77,4 +78,14 @@ public class ProcessFbStandardConsultationServiceImpl extends ServiceImpl processInfoVO, boolean pass) { + + } }