From 67baba6c3d7f99f8c856d727d2a68be2b0c44370 Mon Sep 17 00:00:00 2001 From: gaojiabao Date: Sun, 23 Apr 2023 18:21:34 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A4=8D=E5=AE=A1=E6=B5=81=E7=A8=8B=20?= =?UTF-8?q?=E4=BC=81=E6=A0=87=E6=9F=A5=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../da/FeignClient/workFlowFeignClient.java | 3 ++ .../workFlowFeignClientImpl.java | 5 +++ .../controller/WorkFlowController.java | 34 +++++++++++++++---- 3 files changed, 36 insertions(+), 6 deletions(-) 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 812ca558..ee799552 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 @@ -4,6 +4,7 @@ import com.adc.da.common.*; import com.adc.da.common.Category; import com.adc.da.common.Page; import com.adc.da.http.ResponseMessage; +import com.adc.da.slrs.sarBussionessStandState.entity.SarBussionessStandState; import com.adc.da.workFlow.entity.BusProcessEvaluationHis; import com.adc.da.workFlow.entity.BusProcessModelHis; import com.adc.da.workFlow.entity.ProcessRollBackEO; @@ -497,4 +498,6 @@ public interface workFlowFeignClient { @RequestMapping(value = "/bat-wkflow/datas/bus-process-new/updateBusProcessNew",method = RequestMethod.GET) ResponseMessage updateBusProcessNew(@RequestParam("id") String id, @RequestParam("mags") String mags); + @RequestMapping(value = "/bat-wkflow/datas/bus-process-new/getSarBussionStandPageNo",method = RequestMethod.POST) + List getSarBussionStandPageNo(@RequestBody List rows); } 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 0b7baaad..dda61982 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 @@ -6,6 +6,7 @@ import com.adc.da.http.ResponseMessage; import com.adc.da.http.Result; import com.adc.da.common.*; import com.adc.da.common.Page; +import com.adc.da.slrs.sarBussionessStandState.entity.SarBussionessStandState; import com.adc.da.sys.entity.UserEO; import com.adc.da.sys.service.IUserEOService; import com.adc.da.workFlow.entity.BusProcessEvaluationHis; @@ -460,4 +461,8 @@ public class workFlowFeignClientImpl { String mags = busMes.getJson(); return workFlowFeignClient.updateBusProcessNew(id,mags); } + + public List getSarBussionStandPageNo(@RequestBody List rows) { + return workFlowFeignClient.getSarBussionStandPageNo(rows); + } } 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 fabde358..a8cbc3dc 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 @@ -8,6 +8,8 @@ import com.adc.da.FeignClientImpl.workFlowFeignClientImpl; import com.adc.da.Timer.ProcessTimer; import com.adc.da.att.entity.AttFileEO; import com.adc.da.att.service.impl.AttFileEOServiceImpl; +import com.adc.da.base.page.Pager; +import com.adc.da.base.web.BaseController; import com.adc.da.common.*; import com.adc.da.exception.AdcDaBaseException; import com.adc.da.http.PageInfo; @@ -25,6 +27,9 @@ import com.adc.da.slrs.sarBussStandAttrInfo.dao.SarBussStandAttrInfoDao; import com.adc.da.slrs.sarBussStandAttrInfo.entity.SarBussStandAttrInfo; import com.adc.da.slrs.sarBussionessStand.entity.SarBussionessStand; import com.adc.da.slrs.sarBussionessStand.service.ISarBussionessStandService; +import com.adc.da.slrs.sarBussionessStandState.entity.SarBussionessStandState; +import com.adc.da.slrs.sarBussionessStandState.entity.SarBussionessStandStatePage; +import com.adc.da.slrs.sarBussionessStandState.service.ISarBussionessStandStateService; import com.adc.da.slrs.sarInstitution.dao.TsInstitutionDao; import com.adc.da.slrs.sarInstitution.entity.TsInstitution; import com.adc.da.slrs.sarUser.entity.TsUser; @@ -35,16 +40,14 @@ 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; -import com.adc.da.workFlow.dao.ExportExcelMapper; import com.adc.da.workFlow.entity.*; -import com.adc.da.workFlow.service.WorkFlowService; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; -import oracle.ucp.proxy.annotation.Post; import org.apache.commons.lang3.StringUtils; +import org.apache.poi.ss.formula.functions.T; import org.apache.poi.ss.usermodel.Workbook; import org.apache.poi.util.IOUtils; import org.slf4j.Logger; @@ -52,7 +55,6 @@ import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; import org.springframework.web.bind.annotation.*; -import springfox.documentation.spring.web.json.Json; import sun.misc.BASE64Encoder; import javax.servlet.http.HttpServletRequest; @@ -60,7 +62,6 @@ import javax.servlet.http.HttpServletResponse; import java.io.*; import java.net.HttpURLConnection; import java.net.URL; -import java.net.URLConnection; import java.net.URLEncoder; import java.text.SimpleDateFormat; import java.util.*; @@ -69,7 +70,7 @@ import java.util.stream.Collectors; @RestController @RequestMapping("/${restPath}/lawss/activiti") @Api(tags = "福田标准法规-工作流管理") -public class WorkFlowController { +public class WorkFlowController extends BaseController { private static final Logger logger = LoggerFactory.getLogger(WorkFlowController.class); @@ -118,6 +119,9 @@ public class WorkFlowController { @Autowired private ISarBussionessStandService sarBussionessStandEOService; + @Autowired + private ISarBussionessStandStateService bussionessStandStateService; + // @Autowired // private ExportExcelMapper exportExcelMapper; @@ -1298,4 +1302,22 @@ public class WorkFlowController { public ResponseMessage updateBusProcessNew(BusMes busMes) { return workFlowFeignClient.updateBusProcessNew(busMes); } + + /** + * 自定义分页复审流程查询列表 + * @param page 标准信息 + * @return + */ + @ApiOperation(value = "|SarBussionessStandState|自定义分页复审流程查询列表") + @GetMapping("/getSarBussionStandPageNo") + //@RequiresPermissions("lawss:sarBussionessStand:getSarBussionStandPage") + public ResponseMessage> getSarBussionStandPageNo(SarBussionessStandStatePage page) throws Exception { + List rows = bussionessStandStateService.getSarBussionessStandStatePageNo(page); + if(!rows.isEmpty()) { + List rowsList = workFlowFeignClient.getSarBussionStandPageNo(rows); + return Result.success(getPageInfo(page.getPager(), rowsList)); + } + return Result.success(getPageInfo(page.getPager(), rows)); + } + }