Browse Source

部门统计BUG修复及优化

anderx 2 years ago
parent
commit
ccbe6a6d9a

+ 11 - 1
src/main/java/com/goafanti/order/service/impl/OrderReceivablesServiceImpl.java

@@ -378,31 +378,41 @@ public class OrderReceivablesServiceImpl extends BaseMybatisDao<TemporaryReceiva
 	        	TemporaryReceivablesBo trb=new TemporaryReceivablesBo();
 		        for(int cellNum = (firstCellNum); cellNum < lastCellNum;cellNum++){
 			        Cell cell = row.getCell(cellNum);
+			        String str=null;
 			    	try {
 			        switch (cellNum) {
 					case 0:
+						str="流水号";
 						trb.setFinancialPayNo(ExcelUtils.getCellValue(cell));
 						break;
 					case 1:
+						str="订单编号";
 						trb.setOrderNo(ExcelUtils.getCellValue(cell).trim());
 						break;
 					case 2:
+						str="客户名称";
 						trb.setCorporateName(ExcelUtils.getCellValue(cell));
 						break;
 					case 3:
+						str="回收款";
 						trb.setAmount(new BigDecimal((ExcelUtils.getCellValue(cell).equals("")?"0":ExcelUtils.getCellValue(cell))));
 						break;
 					case 4:
+						str="回款时间";
 						trb.setReceivablesTime(DateUtils.StringToDate(ExcelUtils.getCellValue(cell), AFTConstants.YYYYMMDD));
 						break;
 					case 5:
+						str="备注";
 						trb.setRemarks(ExcelUtils.getCellValue(cell));
 						break;
 					}
 			    	} catch (Exception e) {
-			    		throw new BusinessException(new Error("表格第"+(rowNum+1)+"行输入内容不正确。"));
+			    		throw new BusinessException(new Error("表格第"+(rowNum+1)+"行【"+str+"】内容不正确。"));
 					}
 		        }
+		        if (trb.getOrderNo()==null){
+					throw new BusinessException(new Error("表格第"+(rowNum+1)+"行【订单编号】必须输入。"));
+				}
 		        trb.setAid(TokenManager.getAdminId());
 		        trb.setCreateTime(new Date());
 		        trb.setStatus(0);