diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/mail/service/impl/PayMailBillServiceImpl.java b/jero-boot-incoming-payment/src/main/java/com/jero/mail/service/impl/PayMailBillServiceImpl.java index 045d88e3..40c4e072 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/mail/service/impl/PayMailBillServiceImpl.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/mail/service/impl/PayMailBillServiceImpl.java @@ -46,8 +46,11 @@ import com.jero.project.entity.PayWorkingGroupSubItem; import com.jero.project.mapper.PayCommonProjectMapper; import com.jero.project.mapper.PayWorkingGroupMapper; import com.jero.project.mapper.PayWorkingGroupSubItemMapper; +import com.jero.temporary.entity.PayCompanyManagementTemporary; +import com.jero.temporary.service.IPayCompanyManagementTemporaryService; import org.apache.commons.collections.CollectionUtils; import org.apache.commons.lang3.StringUtils; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import javax.annotation.Resource; @@ -96,6 +99,8 @@ public class PayMailBillServiceImpl extends ServiceImpl selectMailBillVO(String projectId) { @@ -131,7 +136,7 @@ public class PayMailBillServiceImpl extends ServiceImpl bmpList = payMailBill.getBmpList(); - //校验不同项目是否属于同一个公司,开票金额是否大于当前欠未开票金额 + //校验不同项目是否属于同一个公司,开票金额是否大于当前欠未开票金额,企业名称是否审核 String res = checkCompanyProject(bmpList); if (!"success".equals(res)) { return Result.error(res); @@ -276,7 +281,7 @@ public class PayMailBillServiceImpl extends ServiceImpl bmpList) { String standardCompanyId = null;//基准公司id @@ -398,8 +403,8 @@ public class PayMailBillServiceImpl extends ServiceImpl mainList(Page page, PayCommonProject payCommonProject,String projectType,String paymentDate){ + + //如果前端传来模糊查询的字段有%,就替换掉它 + if(!StringUtils.isBlank(payCommonProject.getChargeProject())){ + payCommonProject.setChargeProject(oConvertUtils.replaceAllPercent(payCommonProject.getChargeProject())); + } + if(!StringUtils.isBlank(payCommonProject.getChargeCompanyTemporaryName())){ + payCommonProject.setChargeCompanyTemporaryName(oConvertUtils.replaceAllPercent(payCommonProject.getChargeCompanyTemporaryName())); + } return payPaymentRecordMapper.mainList(page, payCommonProject,projectType, paymentDate); } @@ -499,6 +508,13 @@ public class PayPaymentRecordServiceImpl extends ServiceImpl clazz, String title) { // Step.2 获取导出数据 + //如果前端传来模糊查询的字段有%,就替换掉它 + if(!StringUtils.isBlank(payCommonProject.getChargeProject())){ + payCommonProject.setChargeProject(oConvertUtils.replaceAllPercent(payCommonProject.getChargeProject())); + } + if(!StringUtils.isBlank(payCommonProject.getChargeCompanyTemporaryName())){ + payCommonProject.setChargeCompanyTemporaryName(oConvertUtils.replaceAllPercent(payCommonProject.getChargeCompanyTemporaryName())); + } List pageList=payPaymentRecordMapper.mainListExportXls(payCommonProject, projectType,paymentDate); pageList.forEach(p-> { if (!Objects.isNull(p.getChargeUse())) {