2022年11月08 19:55

blade-service-api/trade-finance-api/src/main/java/org/springblade/finance/vojo/Settlement.java

@@ -302,13 +302,13 @@ public class Settlement  implements Serializable {
 	/**
 	 *	单据完成开始日期
 	 */
-	@ApiModelProperty(value = "单据完成日期")
+	@TableField(exist = false)
 	private String completionTimeStart;
 
 	/**
 	 *	单据完成结束日期
 	 */
-	@ApiModelProperty(value = "单据完成日期")
+	@TableField(exist = false)
 	private String completionTimeEnd;
 
 }

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

@@ -57,6 +57,7 @@ import org.springblade.finance.vo.SettlementVO;
 import org.springblade.finance.vojo.Acc;
 import org.springblade.finance.vojo.Items;
 import org.springblade.finance.vojo.Settlement;
+import org.springblade.purchase.sales.entity.Order;
 import org.springblade.purchase.sales.vo.OrderSettlementVo;
 import org.springblade.system.user.entity.User;
 import org.springblade.system.user.feign.IUserClient;
@@ -189,8 +190,8 @@ public class SettlementController extends BladeController {
 		settlementLambdaQueryWrapper.eq(StringUtils.isNotBlank(settlement.getFinanceStatus()), Settlement::getFinanceStatus, settlement.getFinanceStatus());
 		settlementLambdaQueryWrapper.eq(StringUtils.isNotBlank(settlement.getCheckStatus()), Settlement::getCheckStatus, settlement.getCheckStatus());
 		settlementLambdaQueryWrapper.eq(StringUtils.isNotBlank(settlement.getBillType()), Settlement::getBillType, settlement.getBillType());
-		settlementLambdaQueryWrapper.between(StringUtils.isNotBlank(settlement.getCompletionTimeStart()) && StringUtils.isNotBlank(settlement.getCompletionTimeEnd()),
-			Settlement::getCompletionTime, settlement.getCompletionTimeStart(), settlement.getCompletionTimeEnd());//单据完成日期
+		settlementLambdaQueryWrapper.ge(Func.isNotEmpty(settlement.getCompletionTimeStart()), Settlement::getCompletionTime, settlement.getCompletionTimeStart());//单据完成开始日期
+		settlementLambdaQueryWrapper.le(Func.isNotEmpty(settlement.getCompletionTimeEnd()), Settlement::getCompletionTime, settlement.getCompletionTimeEnd());//单据完成结束日期
 		settlementLambdaQueryWrapper.eq(Settlement::getTenantId, AuthUtil.getTenantId());
 		settlementLambdaQueryWrapper.eq(Settlement::getIsDeleted, 0);
 		settlementLambdaQueryWrapper.orderByDesc(Settlement::getCreateTime);
@@ -226,8 +227,8 @@ public class SettlementController extends BladeController {
 		settlementLambdaQueryWrapper.eq(StringUtils.isNotBlank(settlement.getFinanceStatus()), Settlement::getFinanceStatus, settlement.getFinanceStatus());
 		settlementLambdaQueryWrapper.eq(StringUtils.isNotBlank(settlement.getCheckStatus()), Settlement::getCheckStatus, settlement.getCheckStatus());
 		settlementLambdaQueryWrapper.eq(StringUtils.isNotBlank(settlement.getBillType()), Settlement::getBillType, settlement.getBillType());
-		settlementLambdaQueryWrapper.between(StringUtils.isNotBlank(settlement.getCompletionTimeStart()) && StringUtils.isNotBlank(settlement.getCompletionTimeEnd()),
-			Settlement::getCompletionTime, settlement.getCompletionTimeStart(), settlement.getCompletionTimeEnd());//单据完成日期
+		settlementLambdaQueryWrapper.ge(Func.isNotEmpty(settlement.getCompletionTimeStart()), Settlement::getCompletionTime, settlement.getCompletionTimeStart());//单据完成开始日期
+		settlementLambdaQueryWrapper.le(Func.isNotEmpty(settlement.getCompletionTimeEnd()), Settlement::getCompletionTime, settlement.getCompletionTimeEnd());//单据完成结束日期
 		settlementLambdaQueryWrapper.eq(Settlement::getTenantId, AuthUtil.getTenantId());
 		settlementLambdaQueryWrapper.eq(Settlement::getIsDeleted, 0);
 		settlementLambdaQueryWrapper.orderByDesc(Settlement::getCreateTime);