1.1.43 合同物料模板里备注如果为空,不显示“备注”二字。

dev
yinq 2 months ago
parent 90e1a1ff7a
commit 35622cdcf5

@ -111,6 +111,15 @@ public class TemplateVariableAssignServiceImpl implements ITemplateVariableAssig
.collect(Collectors.joining("\n"));
contractInfo.setPaymentMethodDetails(paymentMethodDetails);
}
// 合同物料备注:有值时前缀「备注:」
if (StringUtils.isNotBlank(contractInfo.getMaterialRemark())) {
String remark = contractInfo.getMaterialRemark().trim();
if (!remark.startsWith("备注:")) {
contractInfo.setMaterialRemark("备注:" + remark);
} else {
contractInfo.setMaterialRemark(remark);
}
}
// 为所有模板变量赋值
return buildAssignResultList(allTemplateVariables, variableMap, contractInfo, contractMaterials);
}

Loading…
Cancel
Save