结算单优化

performance-api/src/main/java/com/clx/performance/vo/pc/carrier/settle/CarrierPageSettlementOwnerVO.java

@@ -78,6 +78,7 @@ public class CarrierPageSettlementOwnerVO {
     @ApiModelProperty("卸车净重（单位吨）")
     private BigDecimal unloadNet;
 
+    @MoneyOutConvert
     @ApiModelProperty("司机实收（分）")
     private BigDecimal driverFreight;
 }

performance-web/src/main/java/com/clx/performance/dao/impl/settle/SettlementOwnerDetailDaoImpl.java

@@ -210,6 +210,7 @@ public class SettlementOwnerDetailDaoImpl extends BaseDaoImpl<SettlementOwnerDet
          update(lUdWrapper()
                 .in(SettlementOwnerDetail::getChildNo, childNoList)
                 .set(SettlementOwnerDetail::getInvoiceStatus, SettlementOwnerDetailEnum.InvoiceStatus.YES.getCode())
+                .set(SettlementOwnerDetail::getInvoiceTime,LocalDateTime.now())
         );
     }
 

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

@@ -187,7 +187,7 @@ public class SettlementDriverDetailServiceImpl  implements SettlementDriverDetai
             rowData.add(new ExcelData(dto.getTruckNo()));
             rowData.add(new ExcelData(dto.getInvoicingCompanyShorterName()));
             rowData.add(new ExcelData(dto.getInvoiceType()==null?null:SettlementOwnerEnum.InvoiceType.getMsgByCode(dto.getInvoiceType())));
-            rowData.add(new ExcelData(SettlementDriverEnum.PrepayFreightFlag.getMsgByCode(dto.getPrepayFreightFlag())));
+            rowData.add(new ExcelData(dto.getPrepayFreightFlag()==null?null:SettlementDriverEnum.PrepayFreightFlag.getMsgByCode(dto.getPrepayFreightFlag())));
             rowData.add(new ExcelData(dto.getLoanFlagMsg()));
             rowData.add(new ExcelData(dto.getWeight()));
             rowData.add(new ExcelData(dto.getFreightPrice()==null?null:dto.getFreightPrice().movePointLeft(2)));

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

@@ -133,12 +133,11 @@ public class SettlementDriverServiceImpl implements SettlementDriverService {
 
             rowData.add(new ExcelData(vo.getDriverName()));
             rowData.add(new ExcelData(vo.getGoodsName()));
-            rowData.add(new ExcelData(vo.getGoodsName()));
-            rowData.add(new ExcelData(SettlementDriverEnum.PrepayFreightFlag.getMsgByCode(vo.getPrepayFreightFlag())));
+            rowData.add(new ExcelData(vo.getPrepayFreightFlag()==null?null:SettlementDriverEnum.PrepayFreightFlag.getMsgByCode(vo.getPrepayFreightFlag())));
 
             rowData.add(new ExcelData(vo.getLoanFlagMsg()));
             rowData.add(new ExcelData(vo.getTruckNo()));
-            rowData.add(new ExcelData(SettlementDriverEnum.InvoiceType.getMsgByCode(vo.getInvoiceType())));
+            rowData.add(new ExcelData(vo.getInvoiceType()==null?null:SettlementDriverEnum.InvoiceType.getMsgByCode(vo.getInvoiceType())));
             rowData.add(new ExcelData(vo.getWeight()));
             rowData.add(new ExcelData(vo.getFreightPrice()));