diff --git a/dxhy-sign/src/main/java/com/dxhy/sign/entity/QsExcelEntity.java b/dxhy-sign/src/main/java/com/dxhy/sign/entity/QsExcelEntity.java index 3c2aa910..4073adf6 100644 --- a/dxhy-sign/src/main/java/com/dxhy/sign/entity/QsExcelEntity.java +++ b/dxhy-sign/src/main/java/com/dxhy/sign/entity/QsExcelEntity.java @@ -66,13 +66,13 @@ public class QsExcelEntity { * 税额 */ @ExcelProperty("税额") - private String taxAmount; + private BigDecimal taxAmount; /** * 价格合计 */ @ExcelProperty("价税合计金额") - private String totalAmount; + private BigDecimal totalAmount; /** * 备注 */ diff --git a/dxhy-sign/src/main/java/com/dxhy/sign/service/fpqs/impl/SignFpqsServiceImpl.java b/dxhy-sign/src/main/java/com/dxhy/sign/service/fpqs/impl/SignFpqsServiceImpl.java index 974379a7..cb380ddf 100644 --- a/dxhy-sign/src/main/java/com/dxhy/sign/service/fpqs/impl/SignFpqsServiceImpl.java +++ b/dxhy-sign/src/main/java/com/dxhy/sign/service/fpqs/impl/SignFpqsServiceImpl.java @@ -3403,7 +3403,7 @@ public class SignFpqsServiceImpl extends MpBaseServiceImpl 0) { for (int i = 0; i < resultList.size(); i++) { QsExcelEntity qsExcelEntity = new QsExcelEntity(); - BeanUtils.copyProperties(qsExcelEntity,resultList.get(i)); + BeanUtils.copyProperties(resultList.get(i),qsExcelEntity); log.info("导出的发票数据魏:{}",JSONObject.toJSONString(resultList.get(i))); log.info("totalAmount={}",resultList.get(i).getTotalAmount()); @@ -3428,12 +3428,12 @@ public class SignFpqsServiceImpl extends MpBaseServiceImpl attachmentVoList = Lists.newArrayList(); AttachmentVo attachmentVo = new AttachmentVo(); - attachmentVo.setName("发票签收"); + attachmentVo.setName("发票签收.xlsx"); attachmentVo.setFileBytes(xlsxFile); attachmentVo.setType("application/vnd.openxmlformats-officedocument.spreadsheetml.sheet"); // attachmentVo.setType("application/msexcel"); diff --git a/dxhy-sign/src/main/resources/mapper/SignRecordInvoiceMapper.xml b/dxhy-sign/src/main/resources/mapper/SignRecordInvoiceMapper.xml index c5586dc6..f9a1fe9c 100644 --- a/dxhy-sign/src/main/resources/mapper/SignRecordInvoiceMapper.xml +++ b/dxhy-sign/src/main/resources/mapper/SignRecordInvoiceMapper.xml @@ -15,6 +15,9 @@ + + + @@ -78,7 +81,8 @@