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

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
zhangqinlin
2021-09-02 18:06:40 +08:00
parent d3d29240ce a598fc0af8
commit e5a4e25f03
2 changed files with 4 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-boot-incoming-payment/src/main/java/com/jero/project/controller/PayWorkingGroupSubItemController.java
+3
View File
@@ -92,6 +92,9 @@ public class PayWorkingGroupSubItemController extends JeroController<PayWorkingG
if(!StringUtils.isBlank(payWorkingGroupSubitem.getChargeCompanyTemporaryName()) && payWorkingGroupSubitem.getChargeCompanyTemporaryName().length() > 50){ if(!StringUtils.isBlank(payWorkingGroupSubitem.getChargeCompanyTemporaryName()) && payWorkingGroupSubitem.getChargeCompanyTemporaryName().length() > 50){
return Result.error("成员单位长度不能大于50个字符"); return Result.error("成员单位长度不能大于50个字符");
} }
if(StringUtils.isBlank(payWorkingGroupSubitem.getWorkingGroupId())){
return Result.error("工作组id不能为空！");
}
Page<PayWorkingGroupSubItem> page = new Page<PayWorkingGroupSubItem>(pageNo, pageSize); Page<PayWorkingGroupSubItem> page = new Page<PayWorkingGroupSubItem>(pageNo, pageSize);
IPage<PayWorkingGroupSubItem> pageList = payWorkingGroupSubItemService.queryPageList(page, payWorkingGroupSubitem,paymentDate); IPage<PayWorkingGroupSubItem> pageList = payWorkingGroupSubItemService.queryPageList(page, payWorkingGroupSubitem,paymentDate);
return Result.OK(pageList); return Result.OK(pageList);
jero-boot-incoming-payment/src/main/java/com/jero/project/mapper/xml/PayWorkingGroupSubItemMapper.xml
+1
View File
@@ -52,6 +52,7 @@
FROM pay_working_group_subitem pwgs FROM pay_working_group_subitem pwgs
LEFT JOIN pay_payment_record ppr ON ppr.project_id = pwgs.id LEFT JOIN pay_payment_record ppr ON ppr.project_id = pwgs.id
<where> <where>
pwgs.working_group_id = #{payWorkingGroupSubItem.workingGroupId}
<if test="payWorkingGroupSubItem.chargeCompanyTemporaryName != null and payWorkingGroupSubItem.chargeCompanyTemporaryName != ''"> <if test="payWorkingGroupSubItem.chargeCompanyTemporaryName != null and payWorkingGroupSubItem.chargeCompanyTemporaryName != ''">
AND pwgs.charge_company_temporary_name LIKE AND pwgs.charge_company_temporary_name LIKE
concat('%',concat(#{payWorkingGroupSubItem.chargeCompanyTemporaryName},'%')) concat('%',concat(#{payWorkingGroupSubItem.chargeCompanyTemporaryName},'%'))