LK/income_payments_management
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

注释不需要内容

Browse Source
This commit is contained in:
zhangqinlin
2021-10-09 15:57:24 +08:00
parent 98ebd3dd75
commit 8e3ca9d2cc
16 changed files with 189 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-boot-incoming-payment/src/main/java/com/jero/mail/controller/PayMailBillController.java
+6 -7
View File
@@ -39,6 +39,7 @@ import com.jero.project.entity.PayWorkingGroupSubItem;
import com.jero.project.service.IPayCommonProjectService;
import com.jero.project.service.IPayWorkingGroupSubItemService;
import com.jero.util.AmountUtil;
import com.jero.util.SearchUtil;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.collections.CollectionUtils;
import org.apache.commons.lang3.ObjectUtils;
@@ -69,10 +70,6 @@ public class PayMailBillController extends JeroController<PayMailBill, IPayMailB
@Autowired
private IPayMailBillService payMailBillService;
@Autowired
private ProjectDetailService projectDetailService;
@Autowired
private IPayMailBillProjectService iPayMailBillProjectService;
@Autowired
private IPayCommonProjectService payCommonProjectService;
@Autowired
private IPayMemberProjectSubitemService payMemberProjectSubitemService;
@@ -124,13 +121,15 @@ public class PayMailBillController extends JeroController<PayMailBill, IPayMailB
queryWrapper.le("send_date", calendar.getTime());
}
if (ObjectUtil.isNotEmpty(payMailBillSearch.getChargeCompanyName())){
queryWrapper.like("charge_company_name",payMailBillSearch.getChargeCompanyName());
//queryWrapper.apply("charge_company_name"+"like{0}"+"{1}","%"+SearchUtil.exchenge(payMailBillSearch.getChargeCompanyName())+"%","escape '/'");
queryWrapper.like("charge_company_name", SearchUtil.exchenge(payMailBillSearch.getChargeCompanyName()));
}
if (ObjectUtil.isNotEmpty(payMailBillSearch.getPrincipalId())){
queryWrapper.like("principal_id",payMailBillSearch.getPrincipalId());
queryWrapper.eq("principal_id",payMailBillSearch.getPrincipalId());
}
if (ObjectUtil.isNotEmpty(payMailBillSearch.getProjectName())){
queryWrapper.like("project_name",payMailBillSearch.getProjectName());
//queryWrapper.apply("project_name"+" like{0}" +"{1}","%"+SearchUtil.exchenge(payMailBillSearch.getProjectName())+"%"+"escape '/'");
queryWrapper.like("project_name",SearchUtil.exchenge(payMailBillSearch.getProjectName()));
}
IPage<PayMailBill> pageList = payMailBillService.pageList(page, queryWrapper);