From cdc830ec960bcbf90ac715acb62fcdb46ca89d40 Mon Sep 17 00:00:00 2001 From: wangli <274027703@qq.com> Date: Mon, 10 Feb 2025 14:30:27 +0800 Subject: [PATCH] =?UTF-8?q?feat(REQ-3300)=20-=20=E8=B0=83=E6=95=B4?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E5=8F=98=E6=B4=BD=E7=AD=BE=E5=85=B3=E8=81=94?= =?UTF-8?q?=E7=9A=84=E5=AE=A1=E6=89=B9=E4=BF=A1=E6=81=AF=E9=9B=86=E5=90=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../visa/api/response/VisaRelationResp.java | 2 +- .../ChangeRecordRelationController.java | 28 ++++++++++++++----- .../impl/ChangeRecordRelationServiceImpl.java | 6 ++-- .../service/impl/ChangeRecordServiceImpl.java | 10 +++++-- 4 files changed, 32 insertions(+), 14 deletions(-) diff --git a/visa/visa-api/src/main/java/cn/axzo/nanopart/visa/api/response/VisaRelationResp.java b/visa/visa-api/src/main/java/cn/axzo/nanopart/visa/api/response/VisaRelationResp.java index 93d1d2ef..4a03db07 100644 --- a/visa/visa-api/src/main/java/cn/axzo/nanopart/visa/api/response/VisaRelationResp.java +++ b/visa/visa-api/src/main/java/cn/axzo/nanopart/visa/api/response/VisaRelationResp.java @@ -48,7 +48,7 @@ public class VisaRelationResp { /** * 数据值的一些额外描述 */ - private String content_ext; + private String contentExt; /** * 创建时间 diff --git a/visa/visa-server/src/main/java/cn/axzo/nanopart/visa/server/controller/ChangeRecordRelationController.java b/visa/visa-server/src/main/java/cn/axzo/nanopart/visa/server/controller/ChangeRecordRelationController.java index c298ba66..a9cdd415 100644 --- a/visa/visa-server/src/main/java/cn/axzo/nanopart/visa/server/controller/ChangeRecordRelationController.java +++ b/visa/visa-server/src/main/java/cn/axzo/nanopart/visa/server/controller/ChangeRecordRelationController.java @@ -2,20 +2,23 @@ package cn.axzo.nanopart.visa.server.controller; import cn.axzo.framework.domain.web.result.ApiResult; import cn.axzo.nanopart.visa.api.changerecord.ChangeRecordRelationApi; +import cn.axzo.nanopart.visa.api.enums.VisaRelationFieldEnum; import cn.axzo.nanopart.visa.api.request.ChangeRecordAppendAttachReq; import cn.axzo.nanopart.visa.api.request.ImGroupOperationReq; import cn.axzo.nanopart.visa.api.request.ImGroupTipsQueryReq; import cn.axzo.nanopart.visa.api.request.VisaRelationReq; import cn.axzo.nanopart.visa.api.response.ImGroupTipsResp; import cn.axzo.nanopart.visa.api.response.VisaRelationResp; +import cn.axzo.nanopart.visa.server.domain.ChangeRecordRelation; +import cn.axzo.nanopart.visa.server.dto.VisaRelationDto; import cn.axzo.nanopart.visa.server.service.ChangeRecordRelationService; -import cn.axzo.nanopart.visa.server.service.ChangeRecordService; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.RestController; +import java.util.Comparator; import java.util.List; +import java.util.stream.Collectors; /** * @author xudawei @@ -27,14 +30,25 @@ import java.util.List; @RequiredArgsConstructor public class ChangeRecordRelationController implements ChangeRecordRelationApi { - @Autowired - private ChangeRecordService changeRecordService; - @Autowired - private ChangeRecordRelationService changeRecordRelationService; + private final ChangeRecordRelationService changeRecordRelationService; @Override public ApiResult> listByVisaId(VisaRelationReq req) { - return null; + return ApiResult.ok(changeRecordRelationService.findByCondition(VisaRelationDto.builder() + .visaId(req.getVisaId()) + .varName(VisaRelationFieldEnum.PROCESS_INSTANCE.name()) + .build()) + .stream().sorted(Comparator.comparing(ChangeRecordRelation::getCreateAt)) + .map(i -> VisaRelationResp.builder() + .id(i.getId()) + .visaId(String.valueOf(i.getVisaId())) + .varName(i.getVarName()) + .varExt(i.getVarExt()) + .varType(i.getVarType()) + .content(i.getContent()) + .contentExt(i.getContentExt()) + .createAt(i.getCreateAt()) + .build()).collect(Collectors.toList())); } @Override diff --git a/visa/visa-server/src/main/java/cn/axzo/nanopart/visa/server/service/impl/ChangeRecordRelationServiceImpl.java b/visa/visa-server/src/main/java/cn/axzo/nanopart/visa/server/service/impl/ChangeRecordRelationServiceImpl.java index 6c648864..78718618 100644 --- a/visa/visa-server/src/main/java/cn/axzo/nanopart/visa/server/service/impl/ChangeRecordRelationServiceImpl.java +++ b/visa/visa-server/src/main/java/cn/axzo/nanopart/visa/server/service/impl/ChangeRecordRelationServiceImpl.java @@ -162,7 +162,7 @@ public class ChangeRecordRelationServiceImpl extends ServiceImpl byCondition = findByCondition(VisaRelationDto.builder() .visaId(req.getVisaId()) - .varName(VisaRelationFieldEnum.IM_GROUP_PARTICIPATE.getCode()) + .varName(VisaRelationFieldEnum.IM_GROUP_PARTICIPATE.name()) .content(String.valueOf(req.getOperatorOuId())) .contentExt(NumberUtil.isPositiveNumber(req.getOperatorWorkspaceId()) ? String.valueOf(req.getOperatorWorkspaceId()) : null) .createBy(req.getOperatorPersonId()) @@ -219,7 +219,7 @@ public class ChangeRecordRelationServiceImpl extends ServiceImpl imGroupParticipate = findByCondition(VisaRelationDto.builder() .visaId(req.getVisaId()) - .varName(VisaRelationFieldEnum.IM_GROUP_PARTICIPATE.getCode()) + .varName(VisaRelationFieldEnum.IM_GROUP_PARTICIPATE.name()) .build()); List buttons = new ArrayList<>(); diff --git a/visa/visa-server/src/main/java/cn/axzo/nanopart/visa/server/service/impl/ChangeRecordServiceImpl.java b/visa/visa-server/src/main/java/cn/axzo/nanopart/visa/server/service/impl/ChangeRecordServiceImpl.java index 0940df41..b4ab6192 100644 --- a/visa/visa-server/src/main/java/cn/axzo/nanopart/visa/server/service/impl/ChangeRecordServiceImpl.java +++ b/visa/visa-server/src/main/java/cn/axzo/nanopart/visa/server/service/impl/ChangeRecordServiceImpl.java @@ -702,17 +702,17 @@ public class ChangeRecordServiceImpl extends ServiceImpl taskOrderIds = req.getRelationOrderMap().getOrDefault(VisaRelationFieldEnum.TASK_ORDER.getCode(), null); + List taskOrderIds = req.getRelationOrderMap().getOrDefault(VisaBillTypeEnum.TASK.name(), null); if (CollectionUtils.isNotEmpty(taskOrderIds)) { formVariables.put(FORM_FIELD_RELATION_TASK_ORDER, taskOrderIds); } - List rectificationOrderIds = req.getRelationOrderMap().getOrDefault(VisaRelationFieldEnum.RECTIFICATION_ORDER.getCode(), null); + List rectificationOrderIds = req.getRelationOrderMap().getOrDefault(VisaBillTypeEnum.RECTIFY.name(), null); if (CollectionUtils.isNotEmpty(rectificationOrderIds)) { formVariables.put(FORM_FIELD_RELATION_RECTIFICATION_ORDER, rectificationOrderIds); } - List visaOrderIds = req.getRelationOrderMap().getOrDefault(VisaRelationFieldEnum.VISA_ORDER.getCode(), null); + List visaOrderIds = req.getRelationOrderMap().getOrDefault(VisaBillTypeEnum.DESIGN_VISA.name(), null); if (CollectionUtils.isNotEmpty(visaOrderIds)) { formVariables.put(FORM_FIELD_RELATION_VISA_ORDER, visaOrderIds); } @@ -1331,8 +1331,12 @@ public class ChangeRecordServiceImpl extends ServiceImpl