结算单优化

performance-api/src/main/java/com/clx/performance/vo/pc/owner/settle/PageOwnerSettlementOwnerDetailVO.java

@@ -134,4 +134,7 @@ public class PageOwnerSettlementOwnerDetailVO {
 
     @ApiModelProperty(value="备注")
     private String remark;
+
+    @ApiModelProperty(value="磅单审核通过时间")
+    private String poundAuditTime;
 }
\ No newline at end of file

performance-web/src/main/java/com/clx/performance/service/impl/settle/SettlementOwnerDetailServiceImpl.java

@@ -595,10 +595,10 @@ public class SettlementOwnerDetailServiceImpl  implements SettlementOwnerDetailS
         fieldList.add(new ExcelField(24, "是否已付尾款", "finalPaymentStatusMsg", 5000));
         fieldList.add(new ExcelField(25, "是否已开票", "invoiceStatusMsg", 5000));
         if (param.getInvoiceStatus().equals(SettlementOwnerDetailEnum.InvoiceStatus.NO.getCode())) {
-            fieldList.add(new ExcelField(26, "备注", "remark", 5000));
+            fieldList.add(new ExcelField(26, "备注", "separateRemark", 5000));
         }else {
             fieldList.add(new ExcelField(26, "开票时间", "invoiceTime", 5000));
-            fieldList.add(new ExcelField(27, "备注", "remark", 5000));
+            fieldList.add(new ExcelField(27, "备注", "separateRemark", 5000));
         }
 
         // 组装数据
@@ -635,10 +635,10 @@ public class SettlementOwnerDetailServiceImpl  implements SettlementOwnerDetailS
             rowData.add(new ExcelData(vo.getFinalPaymentStatusMsg()));
             rowData.add(new ExcelData(vo.getInvoiceStatusMsg()));
             if (param.getInvoiceStatus().equals(SettlementOwnerDetailEnum.InvoiceStatus.NO.getCode())) {
-                rowData.add(new ExcelData(vo.getRemark()));
+                rowData.add(new ExcelData(vo.getSeparateRemark()));
             }else {
                 rowData.add(new ExcelData(vo.getInvoiceTime()));
-                rowData.add(new ExcelData(vo.getRemark()));
+                rowData.add(new ExcelData(vo.getSeparateRemark()));
             }
 
             dataList.add(rowData);