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:
baozhipeng
2021-12-24 17:00:43 +08:00
parent 94bc11674d
commit ea5c7a22cc
3 changed files with 32 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-boot-incoming-payment/src/main/java/com/jero/payment/controller/PayPaymentRecordController.java
+19
View File
@@ -28,7 +28,10 @@ import com.jero.mail.entity.PayMailBillProject;
import com.jero.mail.service.IPayMailBillService;
import com.jero.meeting.entity.PayMeetingSituation;
import com.jero.member.entity.PayMemberProjectSubitem;
import com.jero.member.entity.TbCertificatePayment;
import com.jero.member.entity.TbMemberProjectSubitem;
import com.jero.member.service.ITbCertificatePaymentService;
import com.jero.member.service.ITbMemberProjectSubitemService;
import com.jero.payment.entity.PayPaymentRecord;
import com.jero.payment.service.IPayPaymentRecordService;
import com.jero.project.entity.PayCommonProject;
@@ -59,6 +62,10 @@ public class PayPaymentRecordController extends JeroController<PayPaymentRecord,
private IPayPaymentRecordService payPaymentRecordService;
@Autowired
private IPayMailBillService payMailBillService;
@Autowired
private ITbMemberProjectSubitemService tbMemberProjectSubitemService;
@Autowired
private ITbCertificatePaymentService tbCertificatePaymentService;
/**
* 到账开票主列表
@@ -156,6 +163,18 @@ public class PayPaymentRecordController extends JeroController<PayPaymentRecord,
wrapper.orderByAsc(PayPaymentRecord::getPaymentDate);
List<PayPaymentRecord> list = payPaymentRecordService.list(wrapper);
//标协会员、标协证书查出缴费方式
if(list!=null && list.size()>0){
if(PayIncomeContractCommon.PROJECT_TYPE5.equals(String.valueOf(list.get(0).getProjectType()))){
TbMemberProjectSubitem memberProject = tbMemberProjectSubitemService.getById(id);
list.get(0).setPaymentMethod(memberProject.getPaymentMethod());
}
if(PayIncomeContractCommon.PROJECT_TYPE6.equals(String.valueOf(list.get(0).getProjectType()))){
TbCertificatePayment tbCertificatePayment = tbCertificatePaymentService.getById(id);
list.get(0).setPaymentMethod(tbCertificatePayment.getPaymentMethod());
}
}
return Result.OK(list);
}
jero-boot-incoming-payment/src/main/java/com/jero/payment/entity/PayPaymentRecord.java
+6
View File
@@ -109,4 +109,10 @@ public class PayPaymentRecord implements Serializable {
@ApiModelProperty(value = "审核说明")
private String reviewInstructions;
/**缴费方式*/
@Excel(name = "缴费方式", width = 15,dicCode = "meeting_pay_type")
@Dict(dicCode = "meeting_pay_type")
@TableField(exist = false)
private Integer paymentMethod;
}
jero-boot-incoming-payment/src/main/java/com/jero/payment/service/impl/PayPaymentRecordServiceImpl.java
+7 -3
View File
@@ -163,6 +163,7 @@ public class PayPaymentRecordServiceImpl extends ServiceImpl<PayPaymentRecordMap
commonProject.setSituationId(id);
}
//插入待审核状态，供前端判断是否显示审核按钮
//先查审核记录表有没有待审核的
for(PayPaymentRecordSub recordSub : RecordSubList){
if(commonProject.getId().equals(recordSub.getProjectId())){
if(PaymentStatusEnum.TO_BE_REVIEWED.getCode().equals(recordSub.getPaymentStatus())){
@@ -171,9 +172,12 @@ public class PayPaymentRecordServiceImpl extends ServiceImpl<PayPaymentRecordMap
}
}
}
// if(StringUtils.isBlank(commonProject.getCheckPaymentStatus())){
// commonProject.setCheckPaymentStatus(commonProject.getPaymentStatus());
// }
//再查项目主表状态是不是待审核
if(StringUtils.isBlank(commonProject.getCheckPaymentStatus())){
if(PaymentStatusEnum.TO_BE_REVIEWED.getCode().equals(commonProject.getPaymentStatus())){
commonProject.setCheckPaymentStatus(commonProject.getPaymentStatus());
}
}
//会议、标协会员、标协证书，来款单位拼接“未审核”
if (commonProject.getProjectType().equals(Integer.parseInt(ProjectCommon.PROJECT_TYPE3))||
commonProject.getProjectType().equals(Integer.parseInt(ProjectCommon.PROJECT_TYPE5))||