|
@@ -246,6 +246,16 @@ public class CwFinanceInvoiceService extends ServiceImpl<CwFinanceInvoiceMapper,
|
|
checkNum.getAndIncrement();
|
|
checkNum.getAndIncrement();
|
|
|
|
|
|
}
|
|
}
|
|
|
|
+ }else{
|
|
|
|
+ if(StringUtils.isNotBlank(cwFinanceInvoiceDTO.getProgramName())){
|
|
|
|
+ //根据项目名称先查询项目对应的id集合
|
|
|
|
+ List<String> projectIdList = cwProjectRecordsMapper.getByProgramName(cwFinanceInvoiceDTO.getProgramName());
|
|
|
|
+ if(projectIdList.size()>0){
|
|
|
|
+ queryWrapper.in("a.program_id",projectIdList).or().like("a.program_name",cwFinanceInvoiceDTO.getProgramName());
|
|
|
|
+ }else{
|
|
|
|
+ queryWrapper.like("a.program_name",cwFinanceInvoiceDTO.getProgramName());
|
|
|
|
+ }
|
|
|
|
+ }
|
|
}
|
|
}
|
|
// 经办人
|
|
// 经办人
|
|
if (StringUtils.isNotBlank(cwFinanceInvoiceDTO.getOperator())){
|
|
if (StringUtils.isNotBlank(cwFinanceInvoiceDTO.getOperator())){
|