2022年12月6日18:01:25

blade-service-api/blade-box-tube-api/pom.xml

@@ -13,9 +13,7 @@
     <dependencies>
         <dependency>
             <groupId>com.alibaba</groupId>
-            <artifactId>easyexcel-core</artifactId>
-            <version>3.1.1</version>
-            <scope>compile</scope>
+            <artifactId>easyexcel</artifactId>
         </dependency>
         <dependency>
             <groupId>org.springblade</groupId>

blade-service-api/blade-box-tube-api/src/main/java/org/springblade/box/tube/dto/TradingBoxItemRentExcelEnter.java

@@ -59,6 +59,11 @@ public class TradingBoxItemRentExcelEnter implements Serializable {
 	@ExcelProperty(value = "币别")
 	private String currency;
 	/**
+	 * 起租/来源日期
+	 */
+	@ExcelProperty(value = "起租/来源日期")
+	private Date leaseCommencementDate;
+	/**
 	 * 最新地点
 	 */
 	@ExcelProperty(value = "最新地点")
@@ -127,9 +132,4 @@ public class TradingBoxItemRentExcelEnter implements Serializable {
 	@ExcelProperty(value = "备注")
 	private String remarks;
 
-	/**
-	 * 起租日期
-	 */
-	@ExcelProperty(value = "起租日期")
-	private Date leaseCommencementDate;
 }

blade-service-api/blade-box-tube-api/src/main/java/org/springblade/box/tube/dto/TransportItemExcelEnter.java

@@ -62,7 +62,7 @@ public class TransportItemExcelEnter implements Serializable {
 	 * 超期每天单价
 	 */
 	@ExcelProperty(value = "超期每天单价")
-	private BigDecimal overduePrice;
+	private BigDecimal price;
 	/**
 	 * 地点
 	 */

blade-service-api/trade-finance-api/pom.xml

@@ -15,9 +15,7 @@
     <dependencies>
         <dependency>
             <groupId>com.alibaba</groupId>
-            <artifactId>easyexcel-core</artifactId>
-            <version>3.1.1</version>
-            <scope>compile</scope>
+            <artifactId>easyexcel</artifactId>
         </dependency>
     </dependencies>
     <packaging>jar</packaging>

blade-service/blade-box-tube/src/main/java/org/springblade/box/tube/service/impl/TradingBoxServiceImpl.java

@@ -1313,17 +1313,6 @@ public class TradingBoxServiceImpl extends ServiceImpl<TradingBoxMapper, Trading
 					tradingBoxItem.setAddressId(null);
 				}
 			}
-			//租赁公司
-			if (ObjectUtils.isNotNull(tradingBoxItemExcelEnter.getBoxMakingCompany())) {
-				CorpsDesc detail = corpsDescClient.getCorpsDesc(tradingBoxItemExcelEnter.getBoxMakingCompany(), "KH");
-				if (ObjectUtils.isNotNull(detail)) {
-					tradingBoxItem.setBoxMakingCompany(detail.getCname());
-					tradingBoxItem.setBoxMakingCompanyId(detail.getId());
-				} else {
-					tradingBoxItem.setBoxMakingCompany(null);
-					tradingBoxItem.setBoxMakingCompanyId(null);
-				}
-			}
 			if ("SELL".equals(billType) || "BUY".equals(billType)){
 				tradingBoxItem.setAmount(tradingBoxItem.getPrice());
 				TradingBoxFees tradingBoxFees = new TradingBoxFees();
@@ -1349,7 +1338,7 @@ public class TradingBoxServiceImpl extends ServiceImpl<TradingBoxMapper, Trading
 				}
 				tradingBoxFees.setUnit(tradingBoxItem.getBoxType());
 				tradingBoxFees.setCurrency(tradingBoxItem.getCurrency());
-				if ("CYN".equals(tradingBoxItem.getCurrency())){
+				if ("CNY".equals(tradingBoxItem.getCurrency())){
 					tradingBoxFees.setExchangeRate(new BigDecimal(1));
 				}else{
 					tradingBoxFees.setExchangeRate(new BigDecimal("6.30"));

blade-service/blade-box-tube/src/main/java/org/springblade/box/tube/service/impl/TransportServiceImpl.java

@@ -692,7 +692,7 @@ public class TransportServiceImpl extends ServiceImpl<TransportMapper, Transport
 			}
 			transportItemFees.setUnit(transportItem.getBoxType());
 			transportItemFees.setCurrency(transportItem.getCurrency());
-			if ("CYN".equals(transportItem.getCurrency())){
+			if ("CNY".equals(transportItem.getCurrency())){
 				transportItemFees.setExchangeRate(new BigDecimal(1));
 			}else{
 				transportItemFees.setExchangeRate(new BigDecimal("6.30"));

blade-service/trade-finance/src/main/java/org/springblade/finance/controller/AccController.java

@@ -151,7 +151,7 @@ public class AccController extends BladeController {
 			.eq(StringUtils.isNotBlank(acc.getCostType()), Acc::getCostType, acc.getCostType())
 			.eq(acc.getCreateUser() != null, Acc::getCreateUser, acc.getCreateUser())
 			.eq(acc.getSrcParentId() != null, Acc::getSrcParentId, acc.getSrcParentId())
-			.eq(acc.getSrcSysno() != null, Acc::getSrcSysno, acc.getSrcSysno())
+			.eq(ObjectUtils.isNotNull(acc.getSrcSysno()), Acc::getSrcSysno, acc.getSrcSysno())
 			.eq(StringUtils.isNotBlank(acc.getDc()), Acc::getDc, acc.getDc());
 		accLambdaQueryWrapper.gt(acc.getCheckStatus() != null && acc.getCheckStatus() == 1, Acc::getCheckAmount, 0)
 			.eq(acc.getCheckStatus() != null && acc.getCheckStatus() == 2, Acc::getCheckAmount, 0)
@@ -620,7 +620,7 @@ public class AccController extends BladeController {
 			.eq(StringUtils.isNotBlank(acc.getCostType()), Acc::getCostType, acc.getCostType())
 			.eq(acc.getCreateUser() != null, Acc::getCreateUser, acc.getCreateUser())
 			.eq(acc.getSrcParentId() != null, Acc::getSrcParentId, acc.getSrcParentId())
-			.eq(acc.getSrcSysno() != null, Acc::getSrcSysno, acc.getSrcSysno())
+			.eq(ObjectUtils.isNotNull(acc.getSrcSysno()), Acc::getSrcSysno, acc.getSrcSysno())
 			.eq(StringUtils.isNotBlank(acc.getDc()), Acc::getDc, acc.getDc());
 		accLambdaQueryWrapper.gt(acc.getCheckStatus() != null && acc.getCheckStatus() == 1, Acc::getCheckAmount, 0)
 			.eq(acc.getCheckStatus() != null && acc.getCheckStatus() == 2, Acc::getCheckAmount, 0)