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 1/3] =?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 Date: Mon, 10 Feb 2025 14:31:57 +0800 Subject: [PATCH 2/3] =?UTF-8?q?feat(REQ-3300)=20-=20=E8=A7=A3=E5=86=B3?= =?UTF-8?q?=E7=BC=96=E8=AF=91=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../visa/server/service/impl/ChangeRecordServiceImpl.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 b4ab6192..875d9b55 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 @@ -1203,7 +1203,7 @@ public class ChangeRecordServiceImpl extends ServiceImpl VisaDetailByIdResponse.RelationAreaDetail.builder() .id(item.getId()) - .name(item.getName()).build()) + .build()) .collect(Collectors.toList()); } @@ -1232,7 +1232,7 @@ public class ChangeRecordServiceImpl extends ServiceImpl VisaDetailByIdResponse.RelationProfessionalDetail.builder().id(item.getId()).code(item.getCode()).name(item.getName()).build()) + .map(item -> VisaDetailByIdResponse.RelationProfessionalDetail.builder().code(item.getCode()).build()) .collect(Collectors.toList()); } From f85ea2e40461dc3b650ce2bc71d5c4fab0b564b2 Mon Sep 17 00:00:00 2001 From: chenwenjian Date: Mon, 10 Feb 2025 14:37:04 +0800 Subject: [PATCH 3/3] =?UTF-8?q?feat(REQ-3300):=20=E5=8F=91=E8=B5=B7?= =?UTF-8?q?=E7=BE=A4=E8=81=8A=E5=93=8D=E5=BA=94=E5=AF=B9=E8=B1=A1=E8=B0=83?= =?UTF-8?q?=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../api/changerecord/ChangeRecordApi.java | 3 +- .../response/VisaChangeDiscussCreateResp.java | 33 +++++++++++++++++++ .../controller/ChangeRecordController.java | 4 +-- .../server/service/ChangeRecordService.java | 3 +- .../service/impl/ChangeRecordServiceImpl.java | 9 +++-- 5 files changed, 46 insertions(+), 6 deletions(-) create mode 100644 visa/visa-api/src/main/java/cn/axzo/nanopart/visa/api/response/VisaChangeDiscussCreateResp.java diff --git a/visa/visa-api/src/main/java/cn/axzo/nanopart/visa/api/changerecord/ChangeRecordApi.java b/visa/visa-api/src/main/java/cn/axzo/nanopart/visa/api/changerecord/ChangeRecordApi.java index c845bd4f..d1ed0932 100644 --- a/visa/visa-api/src/main/java/cn/axzo/nanopart/visa/api/changerecord/ChangeRecordApi.java +++ b/visa/visa-api/src/main/java/cn/axzo/nanopart/visa/api/changerecord/ChangeRecordApi.java @@ -13,6 +13,7 @@ import cn.axzo.nanopart.visa.api.request.VisaChangePageSearchReq; import cn.axzo.nanopart.visa.api.request.VisaChangeTempCreateReq; import cn.axzo.nanopart.visa.api.request.VisaDetailByIdRequest; import cn.axzo.nanopart.visa.api.request.VisaInitiatorListReq; +import cn.axzo.nanopart.visa.api.response.VisaChangeDiscussCreateResp; import cn.axzo.nanopart.visa.api.response.VisaChangeInitiatorResp; import cn.axzo.nanopart.visa.api.response.VisaChangePageSearchResp; import cn.axzo.nanopart.visa.api.response.VisaDetailByIdResponse; @@ -48,7 +49,7 @@ public interface ChangeRecordApi { * @return 签证变更记录id */ @PostMapping("/api/visa/change/discussCreate") - ApiResult discussCreateVisaChangeRecord(@RequestBody VisaChangeDiscussCreateReq req); + ApiResult discussCreateVisaChangeRecord(@RequestBody VisaChangeDiscussCreateReq req); /** * 发起变更签证审批 diff --git a/visa/visa-api/src/main/java/cn/axzo/nanopart/visa/api/response/VisaChangeDiscussCreateResp.java b/visa/visa-api/src/main/java/cn/axzo/nanopart/visa/api/response/VisaChangeDiscussCreateResp.java new file mode 100644 index 00000000..bb0f3633 --- /dev/null +++ b/visa/visa-api/src/main/java/cn/axzo/nanopart/visa/api/response/VisaChangeDiscussCreateResp.java @@ -0,0 +1,33 @@ +package cn.axzo.nanopart.visa.api.response; + +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.NoArgsConstructor; + +/** + * @author chenwenjian + * @version 1.0 + * @date 2025/2/10 14:17 + */ +@Data +@Builder +@NoArgsConstructor +@AllArgsConstructor +public class VisaChangeDiscussCreateResp { + + /** + * 变洽签单据id + */ + private Long visaId; + + /** + * 群聊id + */ + private Long imGroupId; + + /** + * 群聊名称 + */ + private String imGroupName; +} diff --git a/visa/visa-server/src/main/java/cn/axzo/nanopart/visa/server/controller/ChangeRecordController.java b/visa/visa-server/src/main/java/cn/axzo/nanopart/visa/server/controller/ChangeRecordController.java index 9f9940a1..25517b1a 100644 --- a/visa/visa-server/src/main/java/cn/axzo/nanopart/visa/server/controller/ChangeRecordController.java +++ b/visa/visa-server/src/main/java/cn/axzo/nanopart/visa/server/controller/ChangeRecordController.java @@ -16,12 +16,12 @@ import cn.axzo.nanopart.visa.api.request.VisaChangePageSearchReq; import cn.axzo.nanopart.visa.api.request.VisaChangeTempCreateReq; import cn.axzo.nanopart.visa.api.request.VisaDetailByIdRequest; import cn.axzo.nanopart.visa.api.request.VisaInitiatorListReq; +import cn.axzo.nanopart.visa.api.response.VisaChangeDiscussCreateResp; import cn.axzo.nanopart.visa.api.response.VisaChangeInitiatorResp; import cn.axzo.nanopart.visa.api.response.VisaChangePageSearchResp; import cn.axzo.nanopart.visa.api.response.VisaDetailByIdResponse; import cn.axzo.nanopart.visa.server.service.ChangeRecordConfirmService; import cn.axzo.nanopart.visa.server.service.ChangeRecordService; -import io.swagger.annotations.Api; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; @@ -53,7 +53,7 @@ public class ChangeRecordController implements ChangeRecordApi { } @Override - public ApiResult discussCreateVisaChangeRecord(VisaChangeDiscussCreateReq req) { + public ApiResult discussCreateVisaChangeRecord(VisaChangeDiscussCreateReq req) { return ApiResult.ok(changeRecordService.discussCreateVisaChangeRecord(req)); } diff --git a/visa/visa-server/src/main/java/cn/axzo/nanopart/visa/server/service/ChangeRecordService.java b/visa/visa-server/src/main/java/cn/axzo/nanopart/visa/server/service/ChangeRecordService.java index 0587735c..122994b3 100644 --- a/visa/visa-server/src/main/java/cn/axzo/nanopart/visa/server/service/ChangeRecordService.java +++ b/visa/visa-server/src/main/java/cn/axzo/nanopart/visa/server/service/ChangeRecordService.java @@ -11,6 +11,7 @@ import cn.axzo.nanopart.visa.api.request.VisaChangeExportReq; import cn.axzo.nanopart.visa.api.request.VisaChangePageSearchReq; import cn.axzo.nanopart.visa.api.request.VisaChangeTempCreateReq; import cn.axzo.nanopart.visa.api.request.VisaInitiatorListReq; +import cn.axzo.nanopart.visa.api.response.VisaChangeDiscussCreateResp; import cn.axzo.nanopart.visa.api.response.VisaChangeInitiatorResp; import cn.axzo.nanopart.visa.api.response.VisaChangePageSearchResp; import cn.axzo.nanopart.visa.api.response.VisaDetailByIdResponse; @@ -66,7 +67,7 @@ public interface ChangeRecordService extends IService { * @param req 表单数据 * @return 变更签证Id */ - Long discussCreateVisaChangeRecord(VisaChangeDiscussCreateReq req); + VisaChangeDiscussCreateResp discussCreateVisaChangeRecord(VisaChangeDiscussCreateReq req); /** * 创建审批变更签证 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 875d9b55..c570a998 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 @@ -45,6 +45,7 @@ import cn.axzo.nanopart.visa.api.request.VisaChangeExportReq; import cn.axzo.nanopart.visa.api.request.VisaChangePageSearchReq; import cn.axzo.nanopart.visa.api.request.VisaChangeTempCreateReq; import cn.axzo.nanopart.visa.api.request.VisaInitiatorListReq; +import cn.axzo.nanopart.visa.api.response.VisaChangeDiscussCreateResp; import cn.axzo.nanopart.visa.api.response.VisaChangeInitiatorResp; import cn.axzo.nanopart.visa.api.response.VisaChangePageSearchResp; import cn.axzo.nanopart.visa.api.response.VisaDetailByIdResponse; @@ -580,7 +581,7 @@ public class ChangeRecordServiceImpl extends ServiceImpl