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:
chenwenjian 2025-02-21 18:11:34 +08:00
commit ba5a641616
2 changed files with 7 additions and 2 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/constant/VisaConstant.java
View File

@ -38,6 +38,8 @@ public interface VisaConstant {
String FORM_FIELD_HAPPEN_TIME = "happenTime";
// 主题
String FORM_FIELD_TOPIC = "topic";
// 工作台名称
String FORM_FIELD_WORKSPACE_NAME = "workspaceName";
// 关联工程
String FORM_FIELD_RELATION_PROJECT = "relationProject";
// 关联专业

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

@ -157,6 +157,7 @@ import static cn.axzo.nanopart.visa.api.constant.VisaConstant.FORM_FIELD_RELATIO
import static cn.axzo.nanopart.visa.api.constant.VisaConstant.FORM_FIELD_TOPIC;
import static cn.axzo.nanopart.visa.api.constant.VisaConstant.FORM_FIELD_UNIT;
import static cn.axzo.nanopart.visa.api.constant.VisaConstant.FORM_FIELD_UNIT_PERSON;
import static cn.axzo.nanopart.visa.api.constant.VisaConstant.FORM_FIELD_WORKSPACE_NAME;
import static cn.axzo.nanopart.visa.api.constant.VisaConstant.IM_GROUP_BIZ_INFO_INITIATOR_WORKSPACE_ID;
import static cn.axzo.nanopart.visa.api.constant.VisaConstant.IM_GROUP_BIZ_INFO_VISA_ID;
import static cn.axzo.nanopart.visa.api.constant.VisaConstant.IM_GROUP_BIZ_INFO_VISA_TYPE;
@ -820,6 +821,8 @@ public class ChangeRecordServiceImpl extends ServiceImpl<ChangeRecordDao, Change
final SimpleDateFormat sdf = new SimpleDateFormat(DATE_FORMAT);
formVariables.put(FORM_FIELD_HAPPEN_TIME, sdf.format(req.getHappenTime()));
formVariables.put(FORM_FIELD_TOPIC, req.getTopic());
GetDetailRes workspaceRes = workspaceGateway.getById(req.getRelationWorkspaceId());
formVariables.put(FORM_FIELD_WORKSPACE_NAME, Objects.isNull(workspaceRes) ? "" : workspaceRes.getName());
ProjectDetailRes projectDetailRes = visaProjectApiGateway.getProjectById(req.getRelationProject());
formVariables.put(FORM_FIELD_RELATION_PROJECT, projectDetailRes.getProjectInfo().getName());
formVariables.put(FORM_FIELD_RELATION_PROFESSIONAL, visaHelper.buildProfessionalName(req.getRelationProject(), req.getRelationProfessional()));
@ -1722,8 +1725,8 @@ public class ChangeRecordServiceImpl extends ServiceImpl<ChangeRecordDao, Change
public void reDecision(ChangeRecordButtonOperationReq req) {
ChangeRecord visa = changeRecordService.getById(req.getVisaId());
AssertUtil.notNull(visa, "未找到变洽签单据");
AssertUtil.isTrue(Objects.equals(visa.getStatus(), VisaStatusEnum.DECIDING)
|| Objects.equals(visa.getStatus(), VisaStatusEnum.EXECUTING), "单据未在决策中或执行中，不支持该操作");
AssertUtil.isTrue(!Objects.equals(visa.getStatus(), VisaStatusEnum.APPROVING)
&& !Objects.equals(visa.getStatus(), VisaStatusEnum.COMPLETED), "单据未在决策中或执行中，不支持该操作");
validOperationPermission(req.getVisaId(), req.getOperatorPersonId(), req.getOperatorOuId(), req.getOperatorWorkspaceId());
ImGroupOperationClearReq build = new ImGroupOperationClearReq();