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

Merge remote-tracking branch 'origin/feature/REQ-3300' into feature/REQ-3300

Browse Source
This commit is contained in:
xudawei 2025-02-20 17:29:10 +08:00
commit e5ef81f459
4 changed files with 28 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
visa/visa-api/src/main/java/cn/axzo/nanopart/visa/api/changerecord/ChangeRecordApi.java
View File

@ -173,4 +173,12 @@ public interface ChangeRecordApi {
*/
@PostMapping("/api/visa/change/list")
ApiPageResult<VisaSearchResp> list(@RequestBody @Validated VisaSearchReq req);
/**
* test
*
* @return
*/
@PostMapping("/api/test")
ApiResult<Void> test();
}

6
visa/visa-server/src/main/java/cn/axzo/nanopart/visa/server/controller/ChangeRecordController.java
View File

@ -180,4 +180,10 @@ public class ChangeRecordController implements ChangeRecordApi {
public ApiResult<Map<String, Boolean>> getBillIfRelated(GetBillIfRelatedReq req) {
return ApiResult.ok(changeRecordBillService.getBillIfRelated(req));
}
@Override
public ApiResult<Void> test() {
changeRecordService.test();
return ApiResult.ok();
}
}

1
visa/visa-server/src/main/java/cn/axzo/nanopart/visa/server/service/ChangeRecordService.java
View File

@ -145,4 +145,5 @@ public interface ChangeRecordService extends IService<ChangeRecord> {
*/
PageData<VisaSearchResp> list(VisaSearchReq req);
void test();
}

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

@ -681,6 +681,7 @@ public class ChangeRecordServiceImpl extends ServiceImpl<ChangeRecordDao, Change
IM_GROUP_BIZ_INFO_VISA_TYPE, req.getType().name()));
GroupCreateResponse imGroup = msgCenterGateway.createImGroup(request);
AssertUtil.notNull(imGroup, "IM 群创建失败");
updateImInfo(visaId, imGroup);
ChangeRecord visa = changeRecordService.getById(visaId);
sendCardAndMsgToImGroup(ChangeRecordButtonOperationReq.builder()
@ -689,7 +690,6 @@ public class ChangeRecordServiceImpl extends ServiceImpl<ChangeRecordDao, Change
.operatorWorkspaceId(req.getRelationWorkspaceId())
.build(), visa);
updateImInfo(visaId, imGroup);
// 更新主表状态
changeStatus(ChangeStatusRequest.builder()
.visaId(visaId)
@ -745,9 +745,10 @@ public class ChangeRecordServiceImpl extends ServiceImpl<ChangeRecordDao, Change
/**
* 更改状态-申请审批时
* @param visaId 变更签证id
* @param req 请求，主要是获取最新的属性，比如变更金额/附件
* @param changeRecord 变更签证对象，主要获取老的属性，比如变更金额
*
* @param visaId 变更签证id
* @param req 请求，主要是获取最新的属性，比如变更金额/附件
* @param changeRecord 变更签证对象，主要获取老的属性，比如变更金额
* @param visaUploadFiles 上传附件，主要是老的属性
*/
public void changeStatusWhenApproveCreate(Long visaId, VisaChangeApproveCreateReq req, ChangeRecord changeRecord, List<VisaDetailByIdResponse.VisaUploadFile> visaUploadFiles) {
@ -888,6 +889,7 @@ public class ChangeRecordServiceImpl extends ServiceImpl<ChangeRecordDao, Change
.personIds(persons.stream().map(VisaChangeTempCreateReq.RelationUnitAndPerson::getPersonId).collect(Collectors.toList()))
.organizationalUnitId(unitId)
.workspaceId(workspaceId)
.organizationalNodeIds(persons.stream().map(VisaChangeTempCreateReq.RelationUnitAndPerson::getNodeId).collect(Collectors.toList()))
.needs(ListNodeUserReq.Needs.builder().job(true).personProfile(true).build()).build());
if (Objects.isNull(pageResp) || CollectionUtils.isEmpty(pageResp.getData())) {
return Collections.emptyList();
@ -1443,7 +1445,7 @@ public class ChangeRecordServiceImpl extends ServiceImpl<ChangeRecordDao, Change
AssertUtil.isFalse(Objects.equals(r.getStatus(), VisaStatusEnum.TO_REPORT) || Objects.equals(r.getStatus(), VisaStatusEnum.FORBIDED), String.format("单据%s状态为%s，不允许被关联", r.getNo(), r.getStatus().getDesc()));
});
validBillIfRelated(VisaBillTypeEnum.DESIGN_VISA, billIds, req.getType());
}else {
} else {
throw new ServiceException("不支持的关联单据类型");
}
}
@ -1919,5 +1921,10 @@ public class ChangeRecordServiceImpl extends ServiceImpl<ChangeRecordDao, Change
return visaIds;
}
@Override
public void test() {
VisaChangeApproveCreateReq createReq = buildVisaChangeApproveCreateReqByVisaId(240L);
List<Map<String, Object>> maps = buildUnitPerson(createReq.getRelationUnitAndPersonList(), createReq.getRelationWorkspaceId());
log.info("result: {}", JSON.toJSONString(maps));
}
}