2022年8月16日18点51分

blade-service-api/blade-check-api/src/main/java/org/springblade/check/entity/AuditProecess.java

@@ -165,6 +165,18 @@ public class AuditProecess implements Serializable {
 		@TableField(exist = false)
 		@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
 		private Date applyendtime;
+
+	@TableField(value = "订单日期")
+	private Date orderDate;
+
+	@TableField(value = "订单号")
+	private String orderNo;
+
+	@TableField(value = "供应商名称")
+	private String corpsName;
+
+	@TableField(value = "请核人真实姓名")
+	private String sendRealName;
 	/**
 	 * 数量
 	 */

blade-service/blade-check/src/main/java/org/springblade/check/controller/AuditPathsController.java

@@ -35,12 +35,19 @@ import org.springblade.core.mp.support.Query;
 import org.springblade.core.secure.utils.AuthUtil;
 import org.springblade.core.tool.api.R;
 import org.springblade.core.tool.utils.Func;
+import org.springblade.core.tool.utils.ObjectUtil;
 import org.springframework.web.bind.annotation.*;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import org.springblade.check.service.IAuditPathsService;
 import org.springblade.core.boot.ctrl.BladeController;
 
+import java.util.ArrayList;
+import java.util.Comparator;
 import java.util.List;
+import java.util.TreeSet;
+import java.util.stream.Collectors;
+
+import static io.seata.common.util.LambdaUtils.distinctByKey;
 
 /**
  * 审批流配置主表 控制器
@@ -125,4 +132,48 @@ public class AuditPathsController extends BladeController {
 	}
 
 
+	/**
+	 * 获得所有类型
+	 * @param auditPaths 审批流配置类
+	 */
+	@GetMapping("/typeList")
+	@ApiOperation(value = "获得审批类型", notes = "传入auditPaths")
+	public R<List<AuditPaths>> typeList(AuditPaths auditPaths) {
+		LambdaQueryWrapper<AuditPaths> lambdaQueryWrapper = new LambdaQueryWrapper<>();
+		lambdaQueryWrapper.eq(AuditPaths::getTenantId, AuthUtil.getTenantId());
+		lambdaQueryWrapper.ne(AuditPaths::getBusinessType, "");
+		//获得所有数据
+		List<AuditPaths> list = auditPathsService.list(lambdaQueryWrapper);
+		List<AuditPaths> pathsList = new ArrayList<>();
+		//根据类型去重
+		if (ObjectUtil.isNotEmpty(list)){
+			pathsList = list.stream().collect(Collectors.collectingAndThen(
+				Collectors.toCollection(() -> new TreeSet<>(
+					Comparator.comparing(AuditPaths::getBusinessType))), ArrayList::new));
+		}
+		return R.data(pathsList);
+	}
+
+	/**
+	 * 根据类型获得所有审批名称
+	 * @param auditPaths 审批流配置类
+	 */
+	@GetMapping("/pathNameList")
+	@ApiOperation(value = "获得审批名称", notes = "传入auditPaths")
+	public R<List<AuditPaths>> pathNameList(AuditPaths auditPaths) {
+		LambdaQueryWrapper<AuditPaths> lambdaQueryWrapper = new LambdaQueryWrapper<>();
+		lambdaQueryWrapper.eq(StringUtils.isNotBlank(auditPaths.getBusinessType()),AuditPaths::getBusinessType,auditPaths.getBusinessType())
+			.eq(AuditPaths::getTenantId, AuthUtil.getTenantId());
+		//根据类型获得所有数据
+		List<AuditPaths> list = auditPathsService.list(lambdaQueryWrapper);
+		//根据审批名称去重
+		List<AuditPaths> pathsList = new ArrayList<>();
+		//根据类型去重
+		if (ObjectUtil.isNotEmpty(list)){
+			pathsList = list.stream().collect(Collectors.collectingAndThen(
+				Collectors.toCollection(() -> new TreeSet<>(
+					Comparator.comparing(AuditPaths::getPathName))), ArrayList::new));
+		}
+		return R.data(pathsList);
+	}
 }

blade-service/blade-check/src/main/java/org/springblade/check/controller/AuditProecessController.java

@@ -379,5 +379,43 @@ public class AuditProecessController extends BladeController {
 		return R.success("删除成功");
 	}
 
+	/**
+	 * 审批流记录
+	 * @param auditProecess
+	 */
+	@GetMapping("/appList")
+	@ApiOperationSupport(order = 2)
+	@ApiOperation(value = "app用户审批记录", notes = "传入auditProecess")
+	public R appList(AuditProecess auditProecess) {
+		LambdaQueryWrapper<AuditProecess> lambdaQueryWrapper = new LambdaQueryWrapper<>();
+		lambdaQueryWrapper.eq(AuditProecess::getIsDelete, 0);//是否删除
+		lambdaQueryWrapper.like(AuditProecess::getAuditUserId, String.valueOf(AuthUtil.getUserId()));//审核人id
+		lambdaQueryWrapper.eq(StringUtils.isNotBlank(auditProecess.getProcessType()), AuditProecess::getProcessType, auditProecess.getProcessType());//业务类型
+		lambdaQueryWrapper.eq(StringUtils.isNotBlank(auditProecess.getAuditStatus()), AuditProecess::getAuditStatus, auditProecess.getAuditStatus());//审核状态
+		lambdaQueryWrapper.eq(auditProecess.getCorpId() != null, AuditProecess::getCorpId, auditProecess.getCorpId());//往来单位
+		lambdaQueryWrapper.like(StringUtils.isNotBlank(auditProecess.getBillNo()),AuditProecess::getBillNo, auditProecess.getBillNo());//业务编号
+		lambdaQueryWrapper.gt(auditProecess.getApplybegintime() != null, AuditProecess::getSendTime, auditProecess.getApplybegintime());//请核时间
+		lambdaQueryWrapper.le(auditProecess.getApplyendtime() != null, AuditProecess::getSendTime, auditProecess.getApplyendtime());
+		lambdaQueryWrapper.orderByDesc(AuditProecess::getSendTime);
+
+		List<AuditProecess> auditProecessList = auditProecessService.list(lambdaQueryWrapper);
+		if (CollectionUtils.isNotEmpty(auditProecessList)) {
+			auditProecessList.forEach(auditOrderVO -> {
+				//采购销售表相关数据
+				if (auditOrderVO.getBillId() != null) {
+					Order order = orderDescClient.getById(auditOrderVO.getBillId());
+					if (order != null) {
+						auditOrderVO.setOrderDate(order.getCreateTime());
+						auditOrderVO.setOrderNo(order.getOrderNo());
+						auditOrderVO.setAmountReceivable(order.getDebitAmount());
+						if (order.getCorpId() != null ) {
+							auditOrderVO.setCorpsName(corpsDescClient.getCorpMessage(order.getCorpId()).getData().getCname());
+						}
+					}
+				}
+			});
+		}
+		return R.data(auditProecessList);
+	}
 
 }

blade-service/blade-deliver-goods/src/main/java/org/springblade/deliver/goods/controller/ExportDeliveryController.java

@@ -261,6 +261,8 @@ public class ExportDeliveryController extends BladeController {
 		/*lambdaQueryWrapper.gt(Delivery::getStatus,0);
 		lambdaQueryWrapper.lt(Delivery::getStatus,3);*/
 		lambdaQueryWrapper.ne(Delivery::getDeliveryStatus,DeliveryStatusEnum.DELIVER.getType());
+		lambdaQueryWrapper.ge(Func.isNotEmpty(delivery.getBusinessStartDate()),Delivery::getBusinessDate,delivery.getBusinessStartDate());//日期开始
+		lambdaQueryWrapper.le(Func.isNotEmpty(delivery.getBusinessEndDate()),Delivery::getBusinessDate,delivery.getBusinessEndDate());//日期结束
 		deliveryData.setSellNumber(deliveryService.count(lambdaQueryWrapper));
 		//获取收货未审核数据
 		LambdaQueryWrapper<Delivery> queryWrapper = new LambdaQueryWrapper<>();
@@ -271,6 +273,8 @@ public class ExportDeliveryController extends BladeController {
 		/*queryWrapper.gt(Delivery::getStatus,0);
 		queryWrapper.lt(Delivery::getStatus,3);*/
 		lambdaQueryWrapper.ne(Delivery::getDeliveryStatus,DeliveryEnum.TAKE.getType());
+		lambdaQueryWrapper.ge(Func.isNotEmpty(delivery.getBusinessStartDate()),Delivery::getBusinessDate,delivery.getBusinessStartDate());//日期开始
+		lambdaQueryWrapper.le(Func.isNotEmpty(delivery.getBusinessEndDate()),Delivery::getBusinessDate,delivery.getBusinessEndDate());//日期结束
 		deliveryData.setPurchaseNumber(deliveryService.count(queryWrapper));
 		return R.data(deliveryData);
 	}

blade-service/blade-land/src/main/java/org/springblade/land/mapper/OrderMapper.xml

@@ -115,8 +115,8 @@
             <if test="acct.salesmanName != null and acct.salesmanName != ''">and t5.name like concat('%', #{acct.salesmanName}, '%')</if>
             <if test="acct.corpShortName != null and acct.corpShortName != ''">and t3.short_name like concat('%', #{acct.corpShortName}, '%')</if>
             <if test="acct.station != null and acct.station != '' and acct.shippingMode != '散货'">and t1.station like concat('%', #{acct.station}, '%')</if>
-            <if test="acct.fleetId != null and acct.shippingMode != '散货'">and t2.fleet_id = #{acct.fleetId}</if>
-            <if test="acct.fleetId != null and acct.shippingMode == '散货'">and t1.fleet_id = #{acct.fleetId}</if>
+            <if test="acct.fleetId != null and acct.fleetId != '' and acct.shippingMode != '散货'">and t2.fleet_id = #{acct.fleetId}</if>
+            <if test="acct.fleetId != null and acct.fleetId != '' and acct.shippingMode == '散货'">and t1.fleet_id = #{acct.fleetId}</if>
             <if test="acct.fleetShortName != null and acct.fleetShortName != ''">and t4.short_name like concat('%', #{acct.fleetShortName}, '%')</if>
             <if test="acct.addressDetail != null and acct.addressDetail != ''">and t1.address_detail like concat('%', #{acct.addressDetail}, '%')</if>
             <if test="acct.receiptNo != null and acct.receiptNo != ''">and t1.receipt_no like concat('%', #{acct.receiptNo}, '%')</if>

blade-service/blade-land/src/main/java/org/springblade/land/service/impl/OrderServiceImpl.java

@@ -550,6 +550,15 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
 			order.setCreateTime(new Date());
 			baseMapper.insert(order);
 		} else {
+			if (order.getShippingMode().equals("散货")){
+				LambdaQueryWrapper<Order> lambdaQueryWrapper = new LambdaQueryWrapper<>();
+				lambdaQueryWrapper.eq(Order::getId, order.getId());
+				lambdaQueryWrapper.eq(Order::getShippingMode, "散货");
+				lambdaQueryWrapper.eq(Order::getTenantId, AuthUtil.getTenantId());
+				lambdaQueryWrapper.eq(Order::getIsDeleted, 0);
+				Order order1 = baseMapper.selectOne(lambdaQueryWrapper);
+				order.setStatus(order1.getStatus());
+			}
 			order.setUpdateUser(AuthUtil.getUserId());
 			order.setUpdateTime(new Date());
 			baseMapper.updateById(order);

blade-service/blade-purchase-sales/src/main/java/org/springblade/purchase/sales/export/ExportOrderController.java

@@ -569,6 +569,8 @@ public class ExportOrderController extends BladeController {
 		lambdaQueryWrapper.eq(Order::getBillType,OrderTypeEnum.SALES.getType());//销售
 		lambdaQueryWrapper.gt(Order::getStatus,0);
 		lambdaQueryWrapper.lt(Order::getStatus,3);
+		lambdaQueryWrapper.ge(Func.isNotEmpty(order.getOrderStartDate()),Order::getBusinesDate,order.getOrderStartDate());//订单日期开始
+		lambdaQueryWrapper.le(Func.isNotEmpty(order.getOrderEndDate()),Order::getBusinesDate,order.getOrderEndDate());//订单日期结束
 		checkDate.setSellNumber(orderService.count(lambdaQueryWrapper));
 		//获取采购未审核数据
 		LambdaQueryWrapper<Order> queryWrapper = new LambdaQueryWrapper<>();
@@ -578,6 +580,8 @@ public class ExportOrderController extends BladeController {
 		queryWrapper.eq(Order::getBillType,OrderTypeEnum.PURCHASE.getType());//采购
 		queryWrapper.gt(Order::getStatus,0);
 		queryWrapper.lt(Order::getStatus,3);
+		lambdaQueryWrapper.ge(Func.isNotEmpty(order.getOrderStartDate()),Order::getBusinesDate,order.getOrderStartDate());//订单日期开始
+		lambdaQueryWrapper.le(Func.isNotEmpty(order.getOrderEndDate()),Order::getBusinesDate,order.getOrderEndDate());//订单日期结束
 		checkDate.setPurchaseNumber(orderService.count(queryWrapper));
 		//获取报价未审核数据
 		LambdaQueryWrapper<Order> wrapper = new LambdaQueryWrapper<>();
@@ -587,6 +591,8 @@ public class ExportOrderController extends BladeController {
 		wrapper.eq(Order::getBillType,OrderTypeEnum.ENQUIRY.getType());//报价
 		wrapper.gt(Order::getStatus,0);
 		wrapper.lt(Order::getStatus,3);
+		lambdaQueryWrapper.ge(Func.isNotEmpty(order.getOrderStartDate()),Order::getBusinesDate,order.getOrderStartDate());//订单日期开始
+		lambdaQueryWrapper.le(Func.isNotEmpty(order.getOrderEndDate()),Order::getBusinesDate,order.getOrderEndDate());//订单日期结束
 		checkDate.setOfferNumber(orderService.count(wrapper));
 		return R.data(checkDate);
 	}

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

@@ -37,6 +37,7 @@ import org.springblade.core.tool.api.R;
 import org.springblade.core.tool.utils.Func;
 import org.springblade.core.tool.utils.ObjectUtil;
 import org.springblade.core.tool.utils.StringUtil;
+import org.springblade.deliver.goods.entity.Delivery;
 import org.springblade.finance.dto.ApplyDTO;
 import org.springblade.finance.dto.SettlementDTO;
 import org.springblade.finance.entity.InvoiceItem;
@@ -458,6 +459,8 @@ public class SettlementController extends BladeController {
 		settlementLambdaQueryWrapper.eq(Settlement::getTenantId, AuthUtil.getTenantId());
 		settlementLambdaQueryWrapper.eq(Settlement::getIsDeleted, 0);
 		settlementLambdaQueryWrapper.ne(Settlement::getCheckStatus, "请核成功");
+		settlementLambdaQueryWrapper.ge(Func.isNotEmpty(settlement.getSettlementStartDate()), Settlement::getSettlementDate,settlement.getSettlementStartDate());//日期开始
+		settlementLambdaQueryWrapper.le(Func.isNotEmpty(settlement.getSettlementEndDate()),Settlement::getSettlementDate,settlement.getSettlementEndDate());//日期结束
 		return R.data(settlementService.count(settlementLambdaQueryWrapper));
 	}