mengxu/pusong-crm
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

审批bug

Browse Source
This commit is contained in:
mx 2024-10-09 17:42:02 +08:00
parent 24bd78c702
commit 824ccedbb2
2 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
doc/report.ftl
View File

@ -92,7 +92,9 @@
<#list company.businessList as item> <#list company.businessList as item>
<div style="height: 5pt;width: 1pt"></div> <div style="height: 5pt;width: 1pt"></div>
<p class="content" style="text-indent:5pt"> <p class="content" style="text-indent:5pt">
${item.businessTypeName}-金额：${item.businessAmount}元 <#if item.businessAmount??>
${item.businessTypeName}-金额：${item.businessAmount}元
</#if>
<#if item.businessDesc?? && item.businessDesc != ""> <#if item.businessDesc?? && item.businessDesc != "">
-备注：${item.businessDesc} -备注：${item.businessDesc}
</#if> </#if>

7
pusong-modules/pusong-business/src/main/java/com/pusong/business/service/approver/impl/SignApproverServiceImpl.java
View File

@ -57,7 +57,14 @@ public class SignApproverServiceImpl extends ApproverAbstractServiceImpl {
PsContractInfo info = new PsContractInfo(); PsContractInfo info = new PsContractInfo();
BeanUtils.copyProperties(vo, info); BeanUtils.copyProperties(vo, info);
PsCompanyInfoBo companyInfo = new PsCompanyInfoBo(); PsCompanyInfoBo companyInfo = new PsCompanyInfoBo();
if (vo.getPsCompanyInfoVo() == null){
PsCompanyInfoVo psCompanyInfoVo = new PsCompanyInfoVo();
psCompanyInfoVo.setLegalPersonName(vo.getContactPersonName());
psCompanyInfoVo.setLegalPersonPhone(vo.getContactPersonPhone());
vo.setPsCompanyInfoVo(psCompanyInfoVo);
}
BeanUtils.copyProperties(vo.getPsCompanyInfoVo(), companyInfo); BeanUtils.copyProperties(vo.getPsCompanyInfoVo(), companyInfo);
bo.setCompanyInfoBo(companyInfo); bo.setCompanyInfoBo(companyInfo);
List<PsCompanyInfoBo> serviceCompanyInfoList = new ArrayList<>(); List<PsCompanyInfoBo> serviceCompanyInfoList = new ArrayList<>();
bo.setServiceCompanyInfoList(serviceCompanyInfoList); bo.setServiceCompanyInfoList(serviceCompanyInfoList);