wangli/nanopart
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat(REQ-3300) - 调整查询变洽签关联的审批信息集合

Browse Source
This commit is contained in:
wangli 2025-02-10 14:30:27 +08:00
parent c09bae37c2
commit cdc830ec96
4 changed files with 32 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
visa/visa-api/src/main/java/cn/axzo/nanopart/visa/api/response/VisaRelationResp.java
View File

@ -48,7 +48,7 @@ public class VisaRelationResp {
/**
* 数据值的一些额外描述
*/
private String content_ext;
private String contentExt;
/**
* 创建时间

28
visa/visa-server/src/main/java/cn/axzo/nanopart/visa/server/controller/ChangeRecordRelationController.java
View File

@ -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<List<VisaRelationResp>> 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

6
visa/visa-server/src/main/java/cn/axzo/nanopart/visa/server/service/impl/ChangeRecordRelationServiceImpl.java
View File

@ -162,7 +162,7 @@ public class ChangeRecordRelationServiceImpl extends ServiceImpl<ChangeRecordRel
ChangeRecordRelation relation = new ChangeRecordRelation();
relation.setVisaId(req.getVisaId());
relation.setVarName(VisaRelationFieldEnum.IM_GROUP_PARTICIPATE.getCode());
relation.setVarName(VisaRelationFieldEnum.IM_GROUP_PARTICIPATE.name());
relation.setVarExt(req.getButtonType().name());
relation.setVarType(VisaRelationVarTypeEnum.LONG.getType());
relation.setContentExt(String.valueOf(req.getOperatorWorkspaceId()));
@ -198,7 +198,7 @@ public class ChangeRecordRelationServiceImpl extends ServiceImpl<ChangeRecordRel
} else {
List<ChangeRecordRelation> 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<ChangeRecordRel
resp.setStatusText(record.getStatus().getDesc());
List<ChangeRecordRelation> imGroupParticipate = findByCondition(VisaRelationDto.builder()
.visaId(req.getVisaId())
.varName(VisaRelationFieldEnum.IM_GROUP_PARTICIPATE.getCode())
.varName(VisaRelationFieldEnum.IM_GROUP_PARTICIPATE.name())
.build());
List<ImGroupButton> buttons = new ArrayList<>();

10
visa/visa-server/src/main/java/cn/axzo/nanopart/visa/server/service/impl/ChangeRecordServiceImpl.java
View File

@ -702,17 +702,17 @@ public class ChangeRecordServiceImpl extends ServiceImpl<ChangeRecordDao, Change
// 三种单据
if (MapUtils.isNotEmpty(req.getRelationOrderMap())) {
List<Long> taskOrderIds = req.getRelationOrderMap().getOrDefault(VisaRelationFieldEnum.TASK_ORDER.getCode(), null);
List<Long> taskOrderIds = req.getRelationOrderMap().getOrDefault(VisaBillTypeEnum.TASK.name(), null);
if (CollectionUtils.isNotEmpty(taskOrderIds)) {
formVariables.put(FORM_FIELD_RELATION_TASK_ORDER, taskOrderIds);
}
List<Long> rectificationOrderIds = req.getRelationOrderMap().getOrDefault(VisaRelationFieldEnum.RECTIFICATION_ORDER.getCode(), null);
List<Long> rectificationOrderIds = req.getRelationOrderMap().getOrDefault(VisaBillTypeEnum.RECTIFY.name(), null);
if (CollectionUtils.isNotEmpty(rectificationOrderIds)) {
formVariables.put(FORM_FIELD_RELATION_RECTIFICATION_ORDER, rectificationOrderIds);
}
List<Long> visaOrderIds = req.getRelationOrderMap().getOrDefault(VisaRelationFieldEnum.VISA_ORDER.getCode(), null);
List<Long> 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<ChangeRecordDao, Change
req.setOperatorWorkspaceId(visa.getRelationWorkspaceId());
validOperationPermission(req.getVisaId(), req.getOperatorPersonId(), req.getOperatorOuId(), req.getOperatorWorkspaceId());
// 组装 REQ 参数
VisaChangeApproveCreateReq createReq = buildVisaChangeApproveCreateReqByVisaId(req.getVisaId());
AssertUtil.notNull(createReq, "未找到变洽签单据");
// 校验
validVisaChangeForm(createReq);
createReq.setApprovePersonInfoList(req.getApprovePersonInfoList());
createReq.setOperatorOuId(req.getOperatorOuId());
createReq.setOperatorPersonId(req.getOperatorPersonId());