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

update 会议导出增加到账状态，企业缴费凭证（最新上传的缴费凭证）

Browse Source
This commit is contained in:
lijiarao
2024-08-07 14:03:06 +08:00
parent 6eee05ae13
commit 7fa91ed9b9
9 changed files with 75 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/impl/PayMeetingSituationServiceImpl.java
+5
View File
@@ -1792,6 +1792,11 @@ public class PayMeetingSituationServiceImpl extends ServiceImpl<PayMeetingSituat
OSSFile ossFile = ossFileService.getById(checkFile);
meetingSituation.setCheckFile(ossFile.getUrl());
}
String paymentRecord = meetingSituation.getPaymentRecord();
if (StringUtils.isNotBlank(paymentRecord)) {
OSSFile ossFile = ossFileService.getById(paymentRecord);
meetingSituation.setPaymentRecord(ossFile.getUrl());
}
switch (meetingType1) {
case MeetingCommon.STANDARD_MEETING:
//保存数据
jero-boot-incoming-payment/src/main/java/com/jero/meeting/vo/excel/CommitteeSituationExcel.java
+10
View File
@@ -1,6 +1,7 @@
package com.jero.meeting.vo.excel;
import com.jero.common.aspect.annotation.Dict;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import org.jeecgframework.poi.excel.annotation.Excel;
@@ -72,6 +73,15 @@ public class CommitteeSituationExcel extends SituationBaseExcel {
@Excel(name = "需要发票", width = 15,dicCode = "invoice_type")
private Integer needInvoice;
/**缴费凭证*/
@Excel(name = "缴费凭证", type = 2 ,width = 40 , height = 20)
private String paymentRecord;
/**到账*/
@ApiModelProperty(value = "到账")
@Excel(name = "是否到账", width = 15, dicCode = "account_type")
private Integer inAccount;
/**订单后4位编码*/
@Excel(name = "订单后4位编码", width = 15)
private String orderCode;
jero-boot-incoming-payment/src/main/java/com/jero/meeting/vo/excel/CouncilSituationExcel.java
+10
View File
@@ -1,6 +1,7 @@
package com.jero.meeting.vo.excel;
import com.jero.common.aspect.annotation.Dict;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import org.jeecgframework.poi.excel.annotation.Excel;
@@ -72,6 +73,15 @@ public class CouncilSituationExcel extends SituationBaseExcel {
@Excel(name = "需要发票", width = 15,dicCode = "invoice_type")
private Integer needInvoice;
/**缴费凭证*/
@Excel(name = "缴费凭证", type = 2 ,width = 40 , height = 20)
private String paymentRecord;
/**到账*/
@ApiModelProperty(value = "到账")
@Excel(name = "是否到账", width = 15, dicCode = "account_type")
private Integer inAccount;
/**订单后4位编码*/
@Excel(name = "订单后4位编码", width = 15)
private String orderCode;
jero-boot-incoming-payment/src/main/java/com/jero/meeting/vo/excel/DraftingGroupSituationExcel.java
+10
View File
@@ -1,6 +1,7 @@
package com.jero.meeting.vo.excel;
import com.jero.common.aspect.annotation.Dict;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import org.jeecgframework.poi.excel.annotation.Excel;
@@ -68,6 +69,15 @@ public class DraftingGroupSituationExcel extends SituationBaseExcel {
@Excel(name = "需要发票", width = 15,dicCode = "invoice_type")
private Integer needInvoice;
/**缴费凭证*/
@Excel(name = "缴费凭证", type = 2 ,width = 40 , height = 20)
private String paymentRecord;
/**到账*/
@ApiModelProperty(value = "到账")
@Excel(name = "是否到账", width = 15, dicCode = "account_type")
private Integer inAccount;
/**订单后4位编码*/
@Excel(name = "订单后4位编码", width = 15)
private String orderCode;
jero-boot-incoming-payment/src/main/java/com/jero/meeting/vo/excel/InternationalSituationExcel.java
+9
View File
@@ -142,6 +142,15 @@ public class InternationalSituationExcel extends SituationBaseExcel {
@Excel(name = "需要发票", width = 15,dicCode = "invoice_type")
private Integer needInvoice;
/**缴费凭证*/
@Excel(name = "缴费凭证", type = 2 ,width = 40 , height = 20)
private String paymentRecord;
/**到账*/
@ApiModelProperty(value = "到账")
@Excel(name = "是否到账", width = 15, dicCode = "account_type")
private Integer inAccount;
/**订单后4位编码*/
@Excel(name = "订单后4位编码", width = 15)
private String orderCode;
jero-boot-incoming-payment/src/main/java/com/jero/meeting/vo/excel/SituationBaseExcel.java
+2 -2
View File
@@ -1,5 +1,6 @@
package com.jero.meeting.vo.excel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import org.jeecgframework.poi.excel.annotation.Excel;
@@ -10,9 +11,8 @@ import org.jeecgframework.poi.excel.annotation.Excel;
@Data
public class SituationBaseExcel {
/**签到文件*/
@Excel(name = "手动签到", type = 2 ,width = 40 , height = 20,imageType = 3)
@Excel(name = "手动签到", type = 2 ,width = 40 , height = 20)
private String checkFile;
/**发票项目*/
@Excel(name = "发票项目", dicCode = "invoice_project", width = 15)
private Integer invoiceProject;
jero-boot-incoming-payment/src/main/java/com/jero/meeting/vo/excel/SituationExcel.java
+10
View File
@@ -1,6 +1,7 @@
package com.jero.meeting.vo.excel;
import com.jero.common.aspect.annotation.Dict;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import org.jeecgframework.poi.excel.annotation.Excel;
@@ -72,6 +73,15 @@ public class SituationExcel extends SituationBaseExcel{
@Excel(name = "需要发票", width = 15,dicCode = "invoice_type")
private Integer needInvoice;
/**缴费凭证*/
@Excel(name = "缴费凭证", type = 2 ,width = 40 , height = 20)
private String paymentRecord;
/**到账*/
@ApiModelProperty(value = "到账")
@Excel(name = "是否到账", width = 15, dicCode = "account_type")
private Integer inAccount;
/**订单后4位编码*/
@Excel(name = "订单后4位编码", width = 15)
private String orderCode;
jero-boot-incoming-payment/src/main/java/com/jero/meeting/vo/excel/StandardsSituationExcel.java
+9
View File
@@ -88,6 +88,15 @@ public class StandardsSituationExcel extends SituationBaseExcel {
@Excel(name = "需要发票", width = 15,dicCode = "invoice_type")
private Integer needInvoice;
/**缴费凭证*/
@Excel(name = "缴费凭证", type = 2 ,width = 40 , height = 20)
private String paymentRecord;
/**到账*/
@ApiModelProperty(value = "到账")
@Excel(name = "是否到账", width = 15, dicCode = "account_type")
private Integer inAccount;
/**订单后4位编码*/
@Excel(name = "订单后4位编码", width = 15)
private String orderCode;
jero-boot-incoming-payment/src/main/java/com/jero/meeting/vo/excel/WorkingGroupSituationExcel.java
+10
View File
@@ -1,6 +1,7 @@
package com.jero.meeting.vo.excel;
import com.jero.common.aspect.annotation.Dict;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;
import org.jeecgframework.poi.excel.annotation.Excel;
@@ -73,6 +74,15 @@ public class WorkingGroupSituationExcel extends SituationBaseExcel {
@Excel(name = "需要发票", width = 15,dicCode = "invoice_type")
private Integer needInvoice;
/**缴费凭证*/
@Excel(name = "缴费凭证", type = 2 ,width = 40 , height = 20)
private String paymentRecord;
/**到账*/
@ApiModelProperty(value = "到账")
@Excel(name = "是否到账", width = 15, dicCode = "account_type")
private Integer inAccount;
/**订单后4位编码*/
@Excel(name = "订单后4位编码", width = 15)
private String orderCode;