From 362df657a02097232c85331a5039339067d3b713 Mon Sep 17 00:00:00 2001 From: wangzhijiang <12345678> Date: Thu, 8 Dec 2022 14:34:40 +0800 Subject: [PATCH] =?UTF-8?q?=E8=AE=A4=E8=AF=81=E7=AE=A1=E7=90=86-=E5=8F=82?= =?UTF-8?q?=E6=95=B0=E9=A1=B9=E6=94=B6=E9=9B=86=E6=B8=85=E5=8D=95-?= =?UTF-8?q?=E8=AE=A4=E8=AF=81=E5=B7=A5=E7=A8=8B=E5=B8=88=E5=BC=BA=E5=88=B6?= =?UTF-8?q?=E6=92=A4=E5=9B=9E=E6=8E=A5=E5=8F=A3=E5=BC=80=E5=8F=91=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ParamsCollectManifestEOController.java | 12 ++++ .../IParamsCollectManifestEOService.java | 3 + .../ParamsCollectManifestEOServiceImpl.java | 71 +++++++++++++++++++ 3 files changed, 86 insertions(+) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/controller/ParamsCollectManifestEOController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/controller/ParamsCollectManifestEOController.java index a4da44ec2..7bcd40a3e 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/controller/ParamsCollectManifestEOController.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/controller/ParamsCollectManifestEOController.java @@ -652,4 +652,16 @@ public class ParamsCollectManifestEOController extends JeroController mandatoryWithdraw(ParamsCollectManifestVO paramsCollectManifestVO) { + return this.paramsCollectManifestEOService.mandatoryWithdraw(paramsCollectManifestVO); + } } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/IParamsCollectManifestEOService.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/IParamsCollectManifestEOService.java index 2b198f223..1ca387bb7 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/IParamsCollectManifestEOService.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/IParamsCollectManifestEOService.java @@ -187,4 +187,7 @@ public interface IParamsCollectManifestEOService extends IService> configDataList, String paramsManifestId); + + // 认证工程师-强制撤回 + Result mandatoryWithdraw(ParamsCollectManifestVO paramsCollectManifestVO); } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java index 655936c7b..394cc92ab 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java @@ -6,6 +6,7 @@ import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.ZipUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.google.common.collect.Lists; @@ -57,6 +58,7 @@ import com.jero.modules.system.service.ISysAnnouncementService; import com.jero.modules.system.service.ISysDictItemService; import com.jero.modules.system.service.ISysUserRoleService; import com.jero.modules.system.service.ISysUserService; +import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.io.FileUtils; import org.apache.commons.lang3.ObjectUtils; import org.apache.commons.lang3.StringUtils; @@ -5139,6 +5141,75 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl mandatoryWithdraw(ParamsCollectManifestVO paramsCollectManifestVO) { + if (StringUtils.isEmpty(paramsCollectManifestVO.getIds())) { + throw new JeroBootException("参数不能为空！"); + } + String paramsCollectManifestIds = paramsCollectManifestVO.getIds(); + String[] paramsCollectManifestIdArr = paramsCollectManifestIds.split(","); + + // 根据参数收集清单id数组，查询参数配置数据 + QueryWrapper configDataQueryWrap = new QueryWrapper<>(); + configDataQueryWrap.lambda().in(ParamsConfigDataEO::getParamsCollectManifestId,paramsCollectManifestIdArr); + List paramsConfigDataList = this.paramsConfigDataEOService.list(configDataQueryWrap); + + for (int i=0; i paramsConfigDataListTemp = paramsConfigDataList.stream().filter(paramsConfig -> { + boolean flag = false; + if (StringUtils.equals(paramsConfig.getParamsCollectManifestId(), paramsCollectManifestId)) { + // 如果三种数据其中一种不为空，需要更新，都为空的话无需更新。 + if(StringUtils.isNotEmpty(paramsConfig.getTextData()) || StringUtils.isNotEmpty(paramsConfig.getPullData()) || StringUtils.isNotEmpty(paramsConfig.getFileConnectId())){ + flag = true; + } + } + return flag; + }).collect(Collectors.toList()); + + // 如果该参数收集清单数据对应的参数配置数据不为空，则设置将填写人填写的数据设置为空 + if(CollectionUtils.isNotEmpty(paramsConfigDataListTemp)){ + for (ParamsConfigDataEO paramsConfigDataEO : paramsConfigDataListTemp) { + LambdaUpdateWrapper configDataUpdateWrap = new LambdaUpdateWrapper<>(); + configDataUpdateWrap.set(ParamsConfigDataEO::getTextData,null); + configDataUpdateWrap.set(ParamsConfigDataEO::getPullData,null); + configDataUpdateWrap.set(ParamsConfigDataEO::getFileConnectId,null); + configDataUpdateWrap.eq(ParamsConfigDataEO::getId,paramsConfigDataEO.getId()); + try { + this.paramsConfigDataEOService.update(configDataUpdateWrap); + }catch (Exception ex){ + ex.printStackTrace(); + log.error("强制撤回，更新参数配置数据失败：" + ex.getMessage()); + throw new JeroBootException("强制撤回，更新参数配置数据失败!"); + } + } + } + } + + LambdaUpdateWrapper updateWrap = new LambdaUpdateWrapper<>(); + updateWrap.set(ParamsCollectManifestEO::getSdt,null); + updateWrap.set(ParamsCollectManifestEO::getDre,null); + updateWrap.set(ParamsCollectManifestEO::getDeadline,null); + updateWrap.set(ParamsCollectManifestEO::getState,CollectManifestStateEnum.WAIT_COLLECT.getValue()); + updateWrap.eq(ParamsCollectManifestEO::getId,paramsCollectManifestId); + try { + this.update(updateWrap); + }catch (Exception ex){ + ex.printStackTrace(); + log.error("强制撤回，更新参数收集清单失败：" + ex.getMessage()); + throw new JeroBootException("强制撤回，更新参数收集清单失败!"); + } + } + return Result.OK("强制撤回成功！"); + } + private void deadlineDateMap(Map> today, ParamsCollectManifestEO collectManifestEO, String thirdId) { List stringList = today.get(thirdId); if (ObjectUtils.isEmpty(stringList)) {