修改

blade-service-api/blade-mocha-item-api/src/main/java/org/springblade/mocha/entity/PriceItem.java

@@ -195,5 +195,17 @@ public class PriceItem implements Serializable {
 		private BigDecimal freightFees;
 
 		private BigDecimal labelFees;
+	/**
+	 * 制单日期日期开始
+	 */
+	@ApiModelProperty(value = "制单日期日期开始")
+	@TableField(exist = false)
+	private String createTimeStart;
+	/**
+	 * 制单日期日期结束
+	 */
+	@ApiModelProperty(value = "制单日期日期结束")
+	@TableField(exist = false)
+	private String createTimeEnd;
 
 }

blade-service/blade-mocha-item/src/main/java/org/springblade/mocha/controller/PriceItemController.java

@@ -39,6 +39,7 @@ import org.springblade.core.excel.util.ExcelUtil;
 import org.springblade.mocha.entity.SalesPolicy;
 import org.springblade.mocha.excel.PriceImport;
 import org.springblade.mocha.excel.PriceItemExcel;
+import org.springblade.purchase.sales.entity.Order;
 import org.springblade.system.entity.AuthClient;
 import org.springframework.web.bind.annotation.*;
 import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -87,10 +88,19 @@ public class PriceItemController extends BladeController {
 	@ApiOperationSupport(order = 2)
 	@ApiOperation(value = "分页", notes = "传入priceItem")
 	public R<IPage<PriceItem>> list(PriceItem priceItem, Query query) {
-		priceItem.setIsDeleted(0);
-		priceItem.setTenantId(SecureUtil.getTenantId());
 		LambdaQueryWrapper<PriceItem> lambdaQueryWrapper = new LambdaQueryWrapper<>();
-		lambdaQueryWrapper.setEntity(priceItem);
+		lambdaQueryWrapper.eq(PriceItem::getIsDeleted,0);
+		lambdaQueryWrapper.eq(PriceItem::getTenantId,SecureUtil.getTenantId());
+		lambdaQueryWrapper.like(Func.isNotBlank(priceItem.getCode()),PriceItem::getCode,priceItem.getCode());
+		lambdaQueryWrapper.like(Func.isNotBlank(priceItem.getBigCharacter()),PriceItem::getBigCharacter,priceItem.getBigCharacter());
+		lambdaQueryWrapper.like(Func.isNotBlank(priceItem.getBrandItem()),PriceItem::getBrandItem,priceItem.getBrandItem());
+		lambdaQueryWrapper.like(Func.isNotBlank(priceItem.getPlaceProduction()),PriceItem::getPlaceProduction,priceItem.getPlaceProduction());
+		lambdaQueryWrapper.like(Func.isNotBlank(priceItem.getTypeno()),PriceItem::getTypeno,priceItem.getTypeno());
+		lambdaQueryWrapper.like(Func.isNotBlank(priceItem.getBrand()),PriceItem::getBrand,priceItem.getBrand());
+		lambdaQueryWrapper.ge(Func.isNotEmpty(priceItem.getCreateTimeStart()), PriceItem::getCreateTime, priceItem.getCreateTimeStart());//制单日期开始
+		lambdaQueryWrapper.le(Func.isNotEmpty(priceItem.getCreateTimeEnd()), PriceItem::getCreateTime, priceItem.getCreateTimeEnd());//制单日期结束
+
+
 		lambdaQueryWrapper.orderByDesc(PriceItem::getId);
 		IPage<PriceItem> pages = priceItemService.listMessage(Condition.getPage(query), lambdaQueryWrapper);
 		return R.data(pages);

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

@@ -226,11 +226,11 @@ public class AccController extends BladeController {
 			.eq(Acc::getTenantId, AuthUtil.getTenantId())
 			.eq(Acc::getIsDeleted, 0)
 			.eq(Acc::getTradeType, acc.getTradeType())
-			.like(Func.isNotEmpty(acc.getAccSysNo()),Acc::getAccSysNo,acc.getAccSysNo())
-			.eq(Func.isNotEmpty(acc.getCorpId()),Acc::getCorpId,acc.getCorpId())
+			.like(StringUtils.isNotBlank(acc.getAccSysNo()),Acc::getAccSysNo,acc.getAccSysNo())
+			.eq(acc.getCorpId() != null,Acc::getCorpId,acc.getCorpId())
 			.eq(Acc::getDc,acc.getDc())
-			.ge(Func.isNotEmpty(acc.getAccDateStart()), Acc::getAccDate, acc.getAccDateStart())//订单日期开始
-			.le(Func.isNotEmpty(acc.getAccDateEnd()), Acc::getAccDate, acc.getAccDateEnd());//订单日期结束
+			.ge(StringUtils.isNotBlank(acc.getAccDateStart()), Acc::getAccDate, acc.getAccDateStart())//订单日期开始
+			.le(StringUtils.isNotBlank(acc.getAccDateEnd()), Acc::getAccDate, acc.getAccDateEnd());//订单日期结束
 
 		IPage<Acc> page = accService.page(Condition.getPage(query), accLambdaQueryWrapper);
 		if (CollectionUtils.isNotEmpty(page.getRecords())){
@@ -258,11 +258,11 @@ public class AccController extends BladeController {
 			.eq(Acc::getTenantId, AuthUtil.getTenantId())
 			.eq(Acc::getIsDeleted, 0)
 			.eq(Acc::getTradeType, acc.getTradeType())
-			.like(Func.isNotEmpty(acc.getAccSysNo()),Acc::getAccSysNo,acc.getAccSysNo())
-			.eq(Func.isNotEmpty(acc.getCorpId()),Acc::getCorpId,acc.getCorpId())
+			.like(StringUtils.isNotBlank(acc.getAccSysNo()),Acc::getAccSysNo,acc.getAccSysNo())
+			.eq(acc.getCorpId()!= null,Acc::getCorpId,acc.getCorpId())
 			.eq(Acc::getDc,acc.getDc())
-			.ge(Func.isNotEmpty(acc.getAccDateStart()), Acc::getAccDate, acc.getAccDateStart())//订单日期开始
-			.le(Func.isNotEmpty(acc.getAccDateEnd()), Acc::getAccDate, acc.getAccDateEnd());//订单日期结束
+			.ge(StringUtils.isNotBlank(acc.getAccDateStart()), Acc::getAccDate, acc.getAccDateStart())//订单日期开始
+			.le(StringUtils.isNotBlank(acc.getAccDateEnd()), Acc::getAccDate, acc.getAccDateEnd());//订单日期结束
 
 		List<Acc> list = accService.list(accLambdaQueryWrapper);
 		if (CollectionUtils.isNotEmpty(list)){