结算单优化

performance-web/src/main/java/com/clx/performance/listener/excel/InvoiceDataListener.java

@@ -7,12 +7,15 @@ import com.clx.performance.dao.settle.SettlementOwnerDetailDao;
 import com.clx.performance.dto.excel.InvoiceData;
 import com.clx.performance.model.settle.SettlementOwnerDetail;
 import com.clx.performance.param.pc.owner.PageInvoiceOwnerSettlementOwnerDetailParam;
+import com.msl.common.exception.ServiceSystemException;
 import lombok.AllArgsConstructor;
 import org.springframework.util.CollectionUtils;
 
 import java.math.BigDecimal;
 import java.util.List;
+import java.util.Map;
 
+import static com.clx.performance.enums.PerformanceResultEnum.DATA_NOT_FIND;
 import static com.clx.performance.enums.settle.SettlementOwnerDetailEnum.InvoiceStatus.NO;
 import static com.clx.performance.enums.settle.SettlementOwnerEnum.InvoiceType.ORDINARY;
 
@@ -49,5 +52,18 @@ public class InvoiceDataListener extends AnalysisEventListener<InvoiceData> {
         // 解析完成后调用
         // 可在此进行后续操作，如保存数据到数据库
     }
+
+    @Override
+    public void invokeHeadMap(Map<Integer, String> headMap, AnalysisContext context) {
+        // 解析表头时调用
+        // 可在此进行表头校验等操作
+        //模板有3列，模板第1列是运单编号，第2列是开票标识，第3列是开票金额，校验上传的Excel是否是这个模板
+        if (headMap.size() != 3) {
+            throw new ServiceSystemException(DATA_NOT_FIND,"上传文件格式错误");
+        }
+        if (!headMap.get(0).equals("运单编号") || !headMap.get(1).equals("开票标识") || !headMap.get(2).equals("开票金额")) {
+            throw new ServiceSystemException(DATA_NOT_FIND,"上传文件格式错误");
+        }
+    }
 }
 

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

@@ -139,13 +139,13 @@ public class SettlementDriverServiceImpl implements SettlementDriverService {
             rowData.add(new ExcelData(vo.getTruckNo()));
             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()));
+            rowData.add(new ExcelData(vo.getFreightPrice()==null?null:vo.getFreightPrice().movePointLeft(2)));
 
-            rowData.add(new ExcelData(vo.getFreight()));
-            rowData.add(new ExcelData(vo.getLossPrice()));
+            rowData.add(new ExcelData(vo.getFreight()==null?null:vo.getFreight().movePointLeft(2)));
+            rowData.add(new ExcelData(vo.getLossPrice()==null?null:vo.getLossPrice().movePointLeft(2)));
             rowData.add(new ExcelData(vo.getLossWeight()));
-            rowData.add(new ExcelData(vo.getLossFreight()));
-            rowData.add(new ExcelData(vo.getSettlementFreight()));
+            rowData.add(new ExcelData(vo.getLossFreight()==null?null:vo.getLossFreight().movePointLeft(2)));
+            rowData.add(new ExcelData(vo.getSettlementFreight()==null?null:vo.getSettlementFreight().movePointLeft(2)));
 
             rowData.add(new ExcelData(SettlementDriverEnum.Status.getMsgByCode(vo.getStatus())));
             rowData.add(new ExcelData("-"));