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

fix:企业端分标委

Browse Source
This commit is contained in:
zhangqinlin
2021-12-17 17:35:24 +08:00
parent cbbb96e204
commit ccbaa71fd3
2 changed files with 18 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-boot-incoming-payment/src/main/java/com/jero/common/mapper/xml/ProjectDetailMapper.xml
+1 -1
View File
@@ -58,7 +58,7 @@
</where>
<!-- 标协会员证书项目-->
UNION ALL
select tmps.id,tmember.project_name,tmps.charge_use,tmember.director_id,su.realname,tmps.liaison_man_id,tmps.liaison_man,tmps.company_name,tmps.amount_receivable,tmps.paid_amount,tmps.invoice_requirements,tmps.pack,tmps.in_account,tmps.make_invoice,tmps.mail,tmps.create_time,5,'','','','',tmps.company_id,tmps.payment_method,'','','',tmember.year,''
select tmps.id,tmember.project_name,tmps.charge_use,tmember.director_id,su.realname,tmps.liaison_man_id,tmps.liaison_man,tmps.company_name,tmps.amount_receivable,tmps.paid_amount,tmps.invoice_requirements,tmps.pack,tmps.in_account,tmps.make_invoice,tmps.mail,tmps.create_time,5,tmps.mobile,tmps.email,'','',tmps.company_id,tmps.payment_method,'','','',tmember.year,''
from tb_member_project tmember
left join sys_user su on tmember.director_id = su.id
inner join tb_certificate_payment tmps on tmember.id=tmps.project_id
jero-boot-incoming-payment/src/main/java/com/jero/member/controller/PayMemberProjectSubitemController.java
+17 -7
View File
@@ -117,16 +117,26 @@ public class PayMemberProjectSubitemController extends JeroController<PayMemberP
for (PayMemberProjectSubitem memberProjectSubitem : pageList.getRecords()) {
//DirectorName存的是id
LoginUser user = sysBaseAPI.getUserById(memberProjectSubitem.getDirectorName());
memberProjectSubitem.setDirectorName(user.getRealname());
memberProjectSubitem.setEmail(PasswordUtil.decrypt(user.getEmail()));
memberProjectSubitem.setPhone(PasswordUtil.decrypt(user.getPhone()));
switch (memberProjectSubitem.getPaymentStatus()){
case "toBeUploaded":memberProjectSubitem.setPaymentStatus("待上传");
case "toBeReviewed":memberProjectSubitem.setPaymentStatus("待审核");
case "rejected":memberProjectSubitem.setPaymentStatus("已拒绝");
case "completed":memberProjectSubitem.setPaymentStatus("已完结");
if(StringUtils.isNotBlank(memberProjectSubitem.getPaymentStatus())) {
switch (memberProjectSubitem.getPaymentStatus()) {
case "toBeUploaded":
memberProjectSubitem.setPaymentStatus("待上传");
break;
case "toBeReviewed":
memberProjectSubitem.setPaymentStatus("待审核");
break;
case "rejected":
memberProjectSubitem.setPaymentStatus("已拒绝");
break;
case "completed":
memberProjectSubitem.setPaymentStatus("已完结");
break;
default:
memberProjectSubitem.setPaymentStatus("");
}
}
}
return Result.OK(pageList);