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

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

Browse Source
This commit is contained in:
yanglin 2025-04-25 16:41:42 +08:00
commit 95c76d1075
2 changed files with 2 additions and 1 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

@ -103,7 +103,7 @@ public interface VisaConstant {
// ********************* 价款审批表单 ********************
// 完工确认单编号
String FORM_PAY_COMPLETE_WORKER_NO = "completeWorkerNo";
String FORM_PAY_COMPLETE_WORKER_NO = "completeWorkNo";
// 确认事项
String FORM_PAY_CONFIRM_MATTER = "confirmMatter";

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

@ -694,6 +694,7 @@ public class VisaHelper {
Map<String, Object> visaFormVariables = buildStartFormVariables(createReq);
variables.put(FORM_CONTRACT_NAME, createReq.getContractName());
variables.put(FORM_CONTRACT_NO, createReq.getContractNo());
variables.put(FORM_FIELD_NO, visaFormVariables.getOrDefault(FORM_FIELD_NO, null));
variables.put(FORM_FIELD_TOPIC, visaFormVariables.getOrDefault(FORM_FIELD_TOPIC, null));
variables.put(FORM_FIELD_WORKSPACE_NAME, visaFormVariables.getOrDefault(FORM_FIELD_WORKSPACE_NAME, null));
variables.put(FORM_FIELD_RELATION_PROFESSIONAL, visaFormVariables.getOrDefault(FORM_FIELD_RELATION_PROFESSIONAL, null));