From fa40a4c76c97d1384384a36fe40ab08133870a7f Mon Sep 17 00:00:00 2001 From: gaojiabao Date: Wed, 10 May 2023 13:34:49 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E4=BC=81=E6=A0=87=E8=AE=A1=E5=88=92?= =?UTF-8?q?=E5=88=A0=E9=99=A4=E7=9A=84=E5=90=8C=E6=97=B6=20=E4=BC=81?= =?UTF-8?q?=E6=A0=87=E5=A4=8D=E5=AE=A1=E8=AE=A1=E5=88=92=E4=B8=AD=E4=B8=80?= =?UTF-8?q?=E5=B9=B6=E5=88=A0=E9=99=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/SarBussionessStandServiceImpl.java | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/service/impl/SarBussionessStandServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/service/impl/SarBussionessStandServiceImpl.java index df27dc73..8df29452 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/service/impl/SarBussionessStandServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/service/impl/SarBussionessStandServiceImpl.java @@ -51,6 +51,7 @@ import com.adc.da.slrs.sarBussionessStand.entity.SarBussionessStand; import com.adc.da.slrs.sarBussionessStand.dao.SarBussionessStandDao; import com.adc.da.slrs.sarBussionessStand.entity.SarBussionessStandExport; import com.adc.da.slrs.sarBussionessStand.service.ISarBussionessStandService; +import com.adc.da.slrs.sarBussionessStandState.dao.SarBussionessStandStateDao; import com.adc.da.slrs.sarBussionessStandState.service.ISarBussionessStandStateService; import com.adc.da.slrs.sarEnterpriseStandardEvaluation.service.IQualityEvaluationService; import com.adc.da.slrs.sarInstitution.dao.TsInstitutionDao; @@ -278,6 +279,9 @@ public class SarBussionessStandServiceImpl extends ServiceImpl objectQueryWrapper = new QueryWrapper<>(); + objectQueryWrapper.eq("STAND_ID",id); + sarBussionessStandStateDao.delete(objectQueryWrapper); List listFile = sarBussStandFileEODao.selectFileByStandId(id); if (listFile != null) { if (!listFile.isEmpty()) { From 9c5a7ce7144f5e2d8598592e185dc0bbe7f16f1b Mon Sep 17 00:00:00 2001 From: gaojiabao Date: Thu, 11 May 2023 15:12:49 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E5=BA=9F=E6=AD=A2=E6=B5=81=E7=A8=8B=20?= =?UTF-8?q?=E7=AB=8B=E5=8D=B3=E4=BF=AE=E6=94=B9=20=E5=BA=9F=E6=AD=A2?= =?UTF-8?q?=E7=8A=B6=E6=80=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../SarBussionessStandController.java | 6 ++++++ .../service/ISarBussionessStandService.java | 2 ++ .../impl/SarBussionessStandServiceImpl.java | 17 +++++++++++++++++ 3 files changed, 25 insertions(+) diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/controller/SarBussionessStandController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/controller/SarBussionessStandController.java index 4599494f..9cb8e45a 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/controller/SarBussionessStandController.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/controller/SarBussionessStandController.java @@ -685,5 +685,11 @@ public class SarBussionessStandController extends BaseController ResponseMessage selectByIdAtt(String id); ResponseMessage cleaningDataReview(); + + ResponseMessage repeal(String id, String type); } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/service/impl/SarBussionessStandServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/service/impl/SarBussionessStandServiceImpl.java index 455649b0..4174ac54 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/service/impl/SarBussionessStandServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/service/impl/SarBussionessStandServiceImpl.java @@ -4646,6 +4646,23 @@ public class SarBussionessStandServiceImpl extends ServiceImpl asList,String standId,String attfId) { //重复的集合 List chongfu = new ArrayList<>(); From ba33586bac7d2b346a517a21392d22929b2a87d4 Mon Sep 17 00:00:00 2001 From: gaojiabao Date: Thu, 11 May 2023 17:11:58 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E5=B7=A5=E4=BD=9C=E6=B5=81=20=E4=BC=81?= =?UTF-8?q?=E6=A0=87=E8=AE=A1=E5=88=92=20=E5=88=A0=E9=99=A4=E5=BE=85?= =?UTF-8?q?=E5=8A=9E=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../da/FeignClient/workFlowFeignClient.java | 2 ++ .../workFlowFeignClientImpl.java | 4 ++++ .../controller/WorkFlowController.java | 18 +++++++++++++++++- 3 files changed, 23 insertions(+), 1 deletion(-) 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 7af58f07..54f478ce 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 @@ -502,4 +502,6 @@ public interface workFlowFeignClient { List getSarBussionStandPageNo(@RequestBody List rows); @RequestMapping(value = "/bat-wkflow/busProcessModel/recieveFile",method = RequestMethod.POST) void recieveFile(@RequestParam("fileNm") String fileNm,@RequestParam("standNo") String standNo,@RequestParam("fileId") String fileId); + @RequestMapping(value = "/bat-wkflow/datas/bus-process-new/endPrcName",method = RequestMethod.GET) + String endPrcName(@RequestParam("prcName")String prcName,@RequestParam("esId") String esId); } 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 c3ec0156..79652be7 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 @@ -469,4 +469,8 @@ public class workFlowFeignClientImpl { public void recieveFile(@RequestParam("fileNm") String fileNm,@RequestParam("standNo") String standNo,@RequestParam("fileId") String fileId) { workFlowFeignClient.recieveFile(fileNm,standNo,fileId); } + + public String endPrcName(String prcName,String esId) { + return workFlowFeignClient.endPrcName(prcName,esId); + } } 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 6b89630a..5d702a58 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 @@ -1198,7 +1198,7 @@ public class WorkFlowController extends BaseController { qbfsForm.put("esStandRelations",data.getEsStandRelations()); qbfsForm.put("isRelate",data.getIsRelate()); qbfsForm.put("useLevel",data.getUseLevel()); - + qbfsForm.put("esId",data.getId()); if(StringUtils.isNotBlank(data.getUseLevel())){ List dicTypeEOS = dicTypeEODao.selectDic("VBERTFDGGF"); if(!dicTypeEOS.isEmpty()) { @@ -1326,4 +1326,20 @@ public class WorkFlowController extends BaseController { workFlowFeignClient.recieveFile(fileNm,standNo,fileId); } + @ApiOperation(value = "福企标制修订计划流程变更 在合并 延期 取消 更名 流程变更 批准则结束") + @GetMapping("/endPrcName") + public String endPrcName(String sort,String prcName,String json){ + if(StringUtils.isBlank(prcName) || StringUtils.isBlank(json) || StringUtils.isBlank(sort)){ + return "失败,参数为空."; + }else { + prcName = sort+"-"+prcName+"-计划立项"; + } + JSONObject jsonObject = JSON.parseObject(json); + String esId = jsonObject.getString("esId"); + if(StringUtils.isBlank(esId)){ + return "失败,参数为空."; + } + return workFlowFeignClient.endPrcName(prcName,esId); + } + }