2023年1月13日17:23:29

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

@@ -149,10 +149,16 @@ public class TransferServiceImpl implements ITransferService {
 					tradingBoxItem.setCreateUser(AuthUtil.getUserId());
 					tradingBoxItem.setCreateTime(new Date());
 					tradingBoxItem.setRentStartDate(new Date());
+					tradingBoxItem.setLeaseCommencementDate(new Date());
+					tradingBoxItem.setRentEndDate(null);
+					tradingBoxItem.setAmount(null);
+					tradingBoxItem.setPrice(null);
+					tradingBoxItem.setNewDate(new Date());
 					tradingBoxItem.setCreateUserName(AuthUtil.getUserName());
 					tradingBoxItem.setTenantId(AuthUtil.getTenantId());
 					tradingBoxItem.setPid(tradingBox.getId());
 					tradingBoxItem.setStatus("待使用");
+
 					tradingBoxItem.setStockpilingStatus("0");
 					tradingBoxItemMapper.insert(tradingBoxItem);
 				} else {
@@ -253,6 +259,9 @@ public class TransferServiceImpl implements ITransferService {
 			TradingBoxFees tradingBoxFees = new TradingBoxFees();
 			tradingBoxFees.setCorpId(tradingBox.getPurchaseCompanyId());
 			tradingBoxFees.setCorpName(tradingBox.getPurchaseCompanyName());
+			if (ObjectUtils.isNull(tradingBoxItem.getPrice()) || tradingBoxItem.getPrice().equals(new BigDecimal("0"))){
+				throw new RuntimeException("箱号："+tradingBoxItem.getCode() + "请先维护堆存/天价格在计算费用");
+			}
 			tradingBoxFees.setAmount(tradingBoxItem.getPrice().multiply(BigDecimal.valueOf(days)));
 			tradingBoxFees.setPrice(tradingBoxItem.getPrice());
 			tradingBoxFees.setQuantity(BigDecimal.valueOf(days));

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

@@ -349,7 +349,7 @@ public class TransportServiceImpl extends ServiceImpl<TransportMapper, Transport
 			Archives archives = new Archives();
 
 			if ("2".equals(status) && "空箱入场".equals(type)) {
-				transportItem.setStatus("待使用");
+				transportItem.setStatus("type");
 				archives.setStatus("待使用");
 				//判断空箱入场时间是否大于合同时间  true 计算超期金额  false 不计算
 				if (transport.getExpiryDate().compareTo(newDate) < 0) {
@@ -404,7 +404,7 @@ public class TransportServiceImpl extends ServiceImpl<TransportMapper, Transport
 				}
 			} else {
 				archives.setStatus("使用");
-				transportItem.setStatus("使用");
+				transportItem.setStatus(type);
 			}
 			transportItemMapper.updateById(transportItem);
 			//更新箱档案信息

blade-service/blade-client/src/main/java/org/springblade/client/corps/mapper/CorpsTypeMapper.xml

@@ -156,7 +156,7 @@
             and (corp_type like '%KH%' or corp_type like '%GYS%')
         </if>
         <if test="param3 !=null and param3 != '' and param3 != 'KG'">
-            and dept.corp_type = #{param3}
+            and find_in_set(dept.corp_type,#{param3})
         </if>
         <if test="param4!=null and param4!=''">
             and dept.cname = #{param4}

blade-service/blade-client/src/main/java/org/springblade/client/goods/controller/GoodsDescController.java

@@ -631,10 +631,14 @@ public class GoodsDescController extends BladeController {
 						goodsDescList.add(good);
 					}
 				} else {
+					if (r.isSuccess() && ObjectUtils.isNotNull(r.getData())) {
+						good.setStockGoods(r.getData());
+					}
 					goodsDescList.add(good);
 				}
 
 			}
+
 		});
 		if (ObjectUtils.isNotNull(storageId)) {
 			iPage.setRecords(goodsDescList);

blade-service/blade-land/src/main/java/org/springblade/land/controller/StatisticsAnalysisController.java

@@ -96,46 +96,8 @@ public class StatisticsAnalysisController {
 	@ApiOperationSupport(order = 2)
 	@ApiOperation(value = "统计分析", notes = "传入orderAcctVO")
 	public R<IPage<DataAnalysisVO>> detailsList(DataAnalysisVO dataAnalysisVO, Query query) {
-		LambdaQueryWrapper<LandOrder> lambdaQueryWrapper = new LambdaQueryWrapper<>();
-		lambdaQueryWrapper.eq(LandOrder::getIsDeleted, 0)
-			.eq(LandOrder::getTenantId, AuthUtil.getTenantId())
-			.eq(ObjectUtils.isNotNull(dataAnalysisVO.getCorpId()),LandOrder::getFleetId, dataAnalysisVO.getCorpId());
-		if (dataAnalysisVO.getBsDateList() != null && dataAnalysisVO.getBsDateList().size() > 1) {
-			lambdaQueryWrapper.ge(LandOrder::getBsDate, dataAnalysisVO.getBsDateList().get(0));
-			lambdaQueryWrapper.le(LandOrder::getBsDate, dataAnalysisVO.getBsDateList().get(1));
-		}
-		IPage<LandOrder> pages = orderService.page(Condition.getPage(query), lambdaQueryWrapper);
-		List<DataAnalysisVO> dataAnalysisVOList = new ArrayList<>();
-		for (LandOrder landOrder : pages.getRecords()) {
-			DataAnalysisVO DataAnalysisVO_ = new DataAnalysisVO();
-			CorpsDesc corpsDesc = corpsDescClient.getCorpId(landOrder.getFleetId());
-			if (ObjectUtils.isNotNull(corpsDesc)) {
-				DataAnalysisVO_.setCorpName(corpsDesc.getCname());
-			}
-			DataAnalysisVO_.setBsDate(landOrder.getBsDate());
-			DataAnalysisVO_.setBillNo(landOrder.getBillNo());
-			DataAnalysisVO_.setOrderNo(landOrder.getOrderNo());
-			DataAnalysisVO_.setPlateNo(landOrder.getPlateNo());
-			DataAnalysisVO_.setFreightCollect(landOrder.getFreightCollect());
-			LambdaQueryWrapper<OrderItem> orderItemLambdaQueryWrapper = new LambdaQueryWrapper<>();
-			orderItemLambdaQueryWrapper.eq(OrderItem::getOrderId,landOrder.getId())
-				.eq(OrderItem::getKind,2)
-				.eq(OrderItem::getIsDeleted,0)
-				.eq(OrderItem::getTenantId,AuthUtil.getTenantId());
-			List<OrderItem> orderItemList = orderItemService.list(orderItemLambdaQueryWrapper);
-			if (ObjectUtils.isNotNull(landOrder.getFreightPay())){
-				DataAnalysisVO_.setFreightPay(landOrder.getFreightPay().add(orderItemList.stream().map(OrderItem::getLandAmountC).filter(Objects::nonNull).reduce(BigDecimal.ZERO, BigDecimal::add)));
-			}
-//			DataAnalysisVO_.setFreightPay(landOrder.getFreightPay());
-			dataAnalysisVOList.add(DataAnalysisVO_);
-		}
-		IPage<DataAnalysisVO> newPage = new Page<>();
-		newPage.setRecords(dataAnalysisVOList);
-		newPage.setPages(pages.getPages());
-		newPage.setSize(pages.getSize());
-		newPage.setCurrent(pages.getCurrent());
-		newPage.setTotal(pages.getTotal());
-		return R.data(newPage);
+		IPage<DataAnalysisVO> pages = orderService.getDetailsList(Condition.getPage(query), dataAnalysisVO);
+		return R.data(pages);
 	}
 
 	/**

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

@@ -56,4 +56,6 @@ public interface OrderMapper extends BaseMapper<LandOrder> {
     List<DataAnalysisVO> getDataAnalysis(IPage<DataAnalysisVO> page, @Param("dataAnalysisVO") DataAnalysisVO dataAnalysisVO);
 
 	List<DataAnalysisVO> dataAnalysisExport(@Param("dataAnalysisVO") DataAnalysisVO dataAnalysisVO);
+
+	List<DataAnalysisVO> getDetailsList(IPage<DataAnalysisVO> page, @Param("dataAnalysisVO") DataAnalysisVO dataAnalysisVO);
 }

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

@@ -165,40 +165,78 @@
         SELECT
             bcd.id AS corpId,
             bcd.cname AS corpName,
-            sum( lo.freight_pay ) AS freightPay,
-            sum( lo.freight_collect ) AS freightCollect
+        sum( loi.land_amount_c ) AS freightPay,
+        sum( loi.land_amount_d ) AS freightCollect
         FROM
-            land_order lo
-                LEFT JOIN basic_corps_desc bcd ON lo.fleet_id = bcd.id
+        land_order_item loi
+        LEFT JOIN land_order lo ON loi.order_id = lo.id
+        LEFT JOIN basic_corps_desc bcd ON loi.fleet_id = bcd.id
         WHERE
             lo.is_deleted = 0
-          AND lo.tenant_id = '234557'
-          AND lo.fleet_id != ""
+        AND lo.tenant_id = '234557'
+        and lo.shipping_mode = '集装箱'
+        and loi.fleet_id is not null
+        and loi.land_amount_d != 0
+        and loi.land_amount_c != 0
         <if test="dataAnalysisVO.corpName != null  and  dataAnalysisVO.corpName != ''">and bcd.cname like concat('%', #{dataAnalysisVO.corpName}, '%')</if>
-        <if test="dataAnalysisVO.corpId != null and  dataAnalysisVO.corpId != ''">and lo.fleet_id like concat('%', #{dataAnalysisVO.corpId}, '%')</if>
+        <if test="dataAnalysisVO.corpId != null and  dataAnalysisVO.corpId != ''">and loi.fleet_id like concat('%', #{dataAnalysisVO.corpId}, '%')</if>
         <if test="dataAnalysisVO.bsDateList != null and  dataAnalysisVO.bsDateList[0] != ''">and lo.arrival_time &gt;= #{dataAnalysisVO.bsDateList[0]}</if>
         <if test="dataAnalysisVO.bsDateList != null and  dataAnalysisVO.bsDateList[1] != ''">and lo.arrival_time &lt;= #{dataAnalysisVO.bsDateList[1]}</if>
         GROUP BY
-            lo.fleet_id
+        loi.fleet_id
     </select>
     <select id="dataAnalysisExport" resultType="org.springblade.land.vo.DataAnalysisVO">
         SELECT
         bcd.id AS corpId,
         bcd.cname AS corpName,
-        sum( lo.freight_pay ) AS freightPay,
-        sum( lo.freight_collect ) AS freightCollect
+        sum( loi.land_amount_c ) AS freightPay,
+        sum( loi.land_amount_d ) AS freightCollect
         FROM
-        land_order lo
-        LEFT JOIN basic_corps_desc bcd ON lo.fleet_id = bcd.id
+        land_order_item loi
+        LEFT JOIN land_order lo ON loi.order_id = lo.id
+        LEFT JOIN basic_corps_desc bcd ON loi.fleet_id = bcd.id
         WHERE
-        lo.is_deleted = 0
-        AND lo.tenant_id = '234557'
-        AND lo.fleet_id != ""
+        loi.is_deleted = 0
+        AND loi.tenant_id = '234557'
+        and loi.kind = 2
+        AND lo.shipping_mode = '集装箱'
+        and loi.fleet_id is not null
+        and loi.land_amount_d != 0
+        and loi.land_amount_c != 0
         <if test="dataAnalysisVO.corpName != null  and  dataAnalysisVO.corpName != ''">and bcd.cname like concat('%', #{dataAnalysisVO.corpName}, '%')</if>
-        <if test="dataAnalysisVO.corpId != null and  dataAnalysisVO.corpId != ''">and lo.fleet_id like concat('%', #{dataAnalysisVO.corpId}, '%')</if>
+        <if test="dataAnalysisVO.corpId != null and  dataAnalysisVO.corpId != ''">and loi.fleet_id like concat('%', #{dataAnalysisVO.corpId}, '%')</if>
         <if test="dataAnalysisVO.bsDateList != null and  dataAnalysisVO.bsDateList[0] != ''">and lo.arrival_time &gt;= #{dataAnalysisVO.bsDateList[0]}</if>
         <if test="dataAnalysisVO.bsDateList != null and  dataAnalysisVO.bsDateList[1] != ''">and lo.arrival_time &lt;= #{dataAnalysisVO.bsDateList[1]}</if>
         GROUP BY
-        lo.fleet_id
+        loi.fleet_id
+    </select>
+    <select id="getDetailsList" resultType="org.springblade.land.vo.DataAnalysisVO">
+        SELECT
+        bcd.id AS corpId,
+        bcd.cname AS corpName,
+        loi.land_amount_c  AS freightPay,
+        loi.land_amount_d  AS freightCollect,
+        lo.bs_date AS bsDate,
+        lo.bill_no AS billNo,
+        lo.order_no AS orderNo,
+        loi.plate_no AS plateNo
+        FROM
+        land_order_item loi
+        LEFT JOIN land_order lo ON loi.order_id = lo.id
+        LEFT JOIN basic_corps_desc bcd ON loi.fleet_id = bcd.id
+        WHERE
+        loi.is_deleted = 0
+        AND loi.tenant_id = '234557'
+        and loi.kind = 2
+        AND lo.shipping_mode = '集装箱'
+        and loi.fleet_id is not null
+        and loi.land_amount_d != 0
+        and loi.land_amount_c != 0
+        <if test="dataAnalysisVO.corpName != null  and  dataAnalysisVO.corpName != ''">and bcd.cname like concat('%', #{dataAnalysisVO.corpName}, '%')</if>
+        <if test="dataAnalysisVO.corpId != null and  dataAnalysisVO.corpId != ''">and loi.fleet_id like concat('%', #{dataAnalysisVO.corpId}, '%')</if>
+        <if test="dataAnalysisVO.bsDateList != null and  dataAnalysisVO.bsDateList[0] != ''">and lo.arrival_time &gt;= #{dataAnalysisVO.bsDateList[0]}</if>
+        <if test="dataAnalysisVO.bsDateList != null and  dataAnalysisVO.bsDateList[1] != ''">and lo.arrival_time &lt;= #{dataAnalysisVO.bsDateList[1]}</if>
+        ORDER BY
+        lo.bs_date
     </select>
 </mapper>

blade-service/blade-land/src/main/java/org/springblade/land/service/IOrderService.java

@@ -190,4 +190,6 @@ public interface IOrderService extends IService<LandOrder> {
 	List<DataAnalysisVO> dataAnalysisExport(DataAnalysisVO dataAnalysisVO);
 
 	LandOrder generateBill(LandOrder order);
+
+	IPage<DataAnalysisVO> getDetailsList(IPage<DataAnalysisVO> page, DataAnalysisVO dataAnalysisVO);
 }

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

@@ -1271,38 +1271,13 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, LandOrder> implem
 	@Override
 	public IPage<DataAnalysisVO> getDataAnalysis(IPage<DataAnalysisVO> page, DataAnalysisVO dataAnalysisVO) {
 		dataAnalysisVO.setTenantId(AuthUtil.getTenantId());
-		List<DataAnalysisVO> dataAnalysisVOList = baseMapper.getDataAnalysis(page, dataAnalysisVO);
-		for (DataAnalysisVO dataAnalysis : dataAnalysisVOList) {
-			LambdaQueryWrapper<OrderItem> lambdaQueryWrapper = new LambdaQueryWrapper<>();
-			lambdaQueryWrapper.eq(OrderItem::getOrderId,dataAnalysis.getOrderId())
-				.eq(OrderItem::getKind,2)
-				.eq(OrderItem::getIsDeleted,0)
-				.eq(OrderItem::getTenantId,AuthUtil.getTenantId());
-			List<OrderItem> orderItemList = orderItemMapper.selectList(lambdaQueryWrapper);
-			if (ObjectUtils.isNotNull(dataAnalysis.getFreightPay())){
-				dataAnalysis.setFreightPay(dataAnalysis.getFreightPay().add(orderItemList.stream().map(OrderItem::getLandAmountC).filter(Objects::nonNull).reduce(BigDecimal.ZERO, BigDecimal::add)));
-			}
-		}
-//		calculateAcct(acctList);
-		return page.setRecords(dataAnalysisVOList);
+		return page.setRecords(baseMapper.getDataAnalysis(page, dataAnalysisVO));
 	}
 
 	@Override
 	public List<DataAnalysisVO> dataAnalysisExport(DataAnalysisVO dataAnalysisVO) {
 		dataAnalysisVO.setTenantId(AuthUtil.getTenantId());
-		List<DataAnalysisVO> dataAnalysisVOList = baseMapper.dataAnalysisExport(dataAnalysisVO);
-		for (DataAnalysisVO dataAnalysis : dataAnalysisVOList) {
-			LambdaQueryWrapper<OrderItem> lambdaQueryWrapper = new LambdaQueryWrapper<>();
-			lambdaQueryWrapper.eq(OrderItem::getOrderId,dataAnalysis.getOrderId())
-				.eq(OrderItem::getKind,2)
-				.eq(OrderItem::getIsDeleted,0)
-				.eq(OrderItem::getTenantId,AuthUtil.getTenantId());
-			List<OrderItem> orderItemList = orderItemMapper.selectList(lambdaQueryWrapper);
-			if (ObjectUtils.isNotNull(dataAnalysis.getFreightPay())){
-				dataAnalysis.setFreightPay(dataAnalysis.getFreightPay().add(orderItemList.stream().map(OrderItem::getLandAmountC).filter(Objects::nonNull).reduce(BigDecimal.ZERO, BigDecimal::add)));
-			}
-		}
-		return dataAnalysisVOList;
+		return baseMapper.dataAnalysisExport(dataAnalysisVO);
 	}
 
 	@Override
@@ -1517,6 +1492,12 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, LandOrder> implem
 		return landOrder;
 	}
 
+	@Override
+	public IPage<DataAnalysisVO> getDetailsList(IPage<DataAnalysisVO> page, DataAnalysisVO dataAnalysisVO) {
+		dataAnalysisVO.setTenantId(AuthUtil.getTenantId());
+		return page.setRecords(baseMapper.getDetailsList(page, dataAnalysisVO));
+	}
+
 	private List<OrderItem> getOrderItemList(Long id) {
 		List<OrderItem> orderItemList = orderItemMapper.selectList(new LambdaQueryWrapper<OrderItem>()
 			.eq(OrderItem::getOrderId, id)

blade-service/blade-purchase-sales/src/main/java/org/springblade/purchase/sales/feign/OrderDescClient.java

@@ -29,6 +29,7 @@ import org.springblade.purchase.sales.service.IOrderService;
 import org.springblade.stock.feign.IStockGoodsClient;
 import org.springblade.stock.vo.StockGoodsVO;
 import org.springblade.system.cache.ParamCache;
+import org.springblade.system.feign.IDictBizClient;
 import org.springframework.web.bind.annotation.*;
 import springfox.documentation.annotations.ApiIgnore;
 
@@ -68,6 +69,8 @@ public class OrderDescClient implements IOrderDescClient {
 	 */
 	private ISerialClient serialClient;
 
+	private final IDictBizClient dictBizClient;
+
 	@Override
 	@PostMapping(UPDATE_ORDER)
 	public R updateOrder(Order order) {
@@ -95,7 +98,8 @@ public class OrderDescClient implements IOrderDescClient {
 			iOrderService.updateById(order);
 		} else {
 			if (ObjectUtil.isNotEmpty(order.getStatus())) {
-				if (ParamCache.getValue(APPROVAL_PROCESS).equals("1") || 6 == order.getStatus()) {
+				R<String> dictKey = dictBizClient.getOneByValue("to_examine", "是否启用", AuthUtil.getTenantId());
+				if ((dictKey.isSuccess() && "1".equals(dictKey.getData())) || 6 == order.getStatus()) {
 					iOrderService.collectHairGoods(order);
 				} else {
 					iOrderService.updateById(order);

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

@@ -64,6 +64,7 @@ import org.springblade.stock.feign.IStockGoodsClient;
 import org.springblade.stock.vo.StockGoodsVO;
 import org.springblade.system.cache.ParamCache;
 import org.springblade.system.entity.Tenant;
+import org.springblade.system.feign.IDictBizClient;
 import org.springblade.system.feign.ISysClient;
 import org.springblade.system.feign.ITenantClient;
 import org.springblade.system.user.entity.User;
@@ -155,6 +156,8 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
 
 	private final ILandClient landClient;
 
+	private final IDictBizClient dictBizClient;
+
 
 	@Override
 	public IPage<OrderVO> selectOrderPage(IPage<OrderVO> page, OrderVO order) {
@@ -952,7 +955,7 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
 		if (order.getCheckFlag() != 3 && salesOrder.getStatus() != 0) {
 			throw new SecurityException("订单已开启审核,请勿重复提交");
 		}
-		if (order.getCheckFlag() == 3 && salesOrder.getSpecialCheckStatus() == 1){
+		if (order.getCheckFlag() == 3 && salesOrder.getSpecialCheckStatus() == 1) {
 			throw new SecurityException("订单已开启特批审核,请勿重复提交");
 		}
 		// 判断是否有审批流,如果审批流已开启就进入审批流,否则直接走申请通过
@@ -2311,7 +2314,7 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
 						order.setStatus(9);
 						order.setClient(AuthUtil.getUser().getRoleName());
 						R<User> r = userClient.userInfoById(AuthUtil.getUserId());
-						if (r.isSuccess() && ObjectUtils.isNotNull(r.getData())){
+						if (r.isSuccess() && ObjectUtils.isNotNull(r.getData())) {
 							order.setClientAttn(r.getData().getPhone());
 						}
 						baseMapper.insert(order);
@@ -2469,7 +2472,7 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
 						}
 						order.setClient(AuthUtil.getUser().getRoleName());
 						R<User> r = userClient.userInfoById(AuthUtil.getUserId());
-						if (r.isSuccess() && ObjectUtils.isNotNull(r.getData())){
+						if (r.isSuccess() && ObjectUtils.isNotNull(r.getData())) {
 							order.setClientAttn(r.getData().getPhone());
 						}
 						baseMapper.insert(order);
@@ -2678,7 +2681,7 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
 					}
 					order.setClient(AuthUtil.getUser().getRoleName());
 					R<User> r = userClient.userInfoById(AuthUtil.getUserId());
-					if (r.isSuccess() && ObjectUtils.isNotNull(r.getData())){
+					if (r.isSuccess() && ObjectUtils.isNotNull(r.getData())) {
 						order.setClientAttn(r.getData().getPhone());
 					}
 					baseMapper.insert(order);
@@ -2858,7 +2861,8 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
 						}
 					}
 				}
-				if (ParamCache.getValue(APPROVAL_PROCESS).equals("1")) {
+				R<String> r = dictBizClient.getOneByValue("to_examine", "是否启用", AuthUtil.getTenantId());
+				if (r.isSuccess() && "1".equals(r.getData())) {
 					//审批数据
 					AuditProecessDTO auditProecessDTO = new AuditProecessDTO();
 					//获取审批级次
@@ -2962,7 +2966,7 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
 						}
 						order.setClient(AuthUtil.getUser().getRoleName());
 						R<User> r = userClient.userInfoById(AuthUtil.getUserId());
-						if (r.isSuccess() && ObjectUtils.isNotNull(r.getData())){
+						if (r.isSuccess() && ObjectUtils.isNotNull(r.getData())) {
 							order.setClientAttn(r.getData().getPhone());
 						}
 						baseMapper.insert(order);
@@ -3125,7 +3129,7 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
 						}
 						order.setClient(AuthUtil.getUser().getRoleName());
 						R<User> r = userClient.userInfoById(AuthUtil.getUserId());
-						if (r.isSuccess() && ObjectUtils.isNotNull(r.getData())){
+						if (r.isSuccess() && ObjectUtils.isNotNull(r.getData())) {
 							order.setClientAttn(r.getData().getPhone());
 						}
 						baseMapper.insert(order);
@@ -3306,7 +3310,8 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
 					}
 				}
 			} else {
-				if (ParamCache.getValue(APPROVAL_PROCESS).equals("1")) {
+				R<String> dictKey = dictBizClient.getOneByValue("to_examine", "是否启用", AuthUtil.getTenantId());
+				if (dictKey.isSuccess() && "1".equals(dictKey.getData())) {
 					// 订单时间
 					order.setStatus(9);
 					order.setBusinesDate(new Date());
@@ -3359,7 +3364,7 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
 					}
 					order.setClient(AuthUtil.getUser().getRoleName());
 					R<User> userR = userClient.userInfoById(AuthUtil.getUserId());
-					if (userR.isSuccess() && ObjectUtils.isNotNull(userR.getData())){
+					if (userR.isSuccess() && ObjectUtils.isNotNull(userR.getData())) {
 						order.setClientAttn(userR.getData().getPhone());
 					}
 					baseMapper.insert(order);
@@ -3577,7 +3582,7 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
 					}
 					order.setClient(AuthUtil.getUser().getRoleName());
 					R<User> userR = userClient.userInfoById(AuthUtil.getUserId());
-					if (userR.isSuccess() && ObjectUtils.isNotNull(userR.getData())){
+					if (userR.isSuccess() && ObjectUtils.isNotNull(userR.getData())) {
 						order.setClientAttn(userR.getData().getPhone());
 					}
 					baseMapper.insert(order);
@@ -4113,7 +4118,8 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
 		if (order.getId() == null) {
 			throw new RuntimeException("缺少必要参数");
 		}
-		if (ParamCache.getValue(APPROVAL_PROCESS).equals("1") || ObjectUtils.isNotNull(order.getStatus()) && 6 == order.getStatus()) {
+		R<String> dictKey = dictBizClient.getOneByValue("to_examine", "是否启用", AuthUtil.getTenantId());
+		if ((dictKey.isSuccess() && "1".equals(dictKey.getData())) || ObjectUtils.isNotNull(order.getStatus()) && 6 == order.getStatus()) {
 			if (ObjectUtils.isNotNull(order.getSpecial()) && "1".equals(order.getSpecial())) {
 				Order selectOrder = baseMapper.selectById(order.getId());
 				LambdaQueryWrapper<OrderItems> lambdaQueryWrapper = new LambdaQueryWrapper<>();