Merge branch 'dev'

yudao-module-order/yudao-module-order-core/src/main/java/cn/iocoder/yudao/module/order/dal/mysql/orderTime/OrderTimeMapper.java

@@ -58,5 +58,12 @@ public interface OrderTimeMapper extends AbstractMapper<OrderTimeDO> {
      * @return
      */
     List<OrderTimeDO> newOrderTimeByContainerNumberAndStatus(@Param("containerNumber") String containerNumber, @Param("status") Integer status);
+
     List<OrderTimeDO> newOrderTimeByOrderIdAndStatus(@Param("orderId") Long orderId, @Param("status") Integer status);
+
+    //lanbm 2024-06-13 添加根据订单ID获取柜号
+    long getShipment_id(long orderId);
+
+    //lanbm 2024-06-13 添加根据柜号获取卸柜时间
+    Date getUlboxtime(long shipmentId);
 }

yudao-module-order/yudao-module-order-core/src/main/java/cn/iocoder/yudao/module/order/service/order/impl/OrderQueryServiceImpl.java

@@ -726,22 +726,20 @@ public class OrderQueryServiceImpl implements OrderQueryService {
      lanbm 2024-06-11 添加的函数
      */
     private void getDaoCanTiam(List<OrderTimeDO> orderTimeList) {
-        /*
-        List<OrderTimeDO> list = orderTimeList.stream().
-                filter(i -> i.getTitleZh() == "到仓").collect(Collectors.toList());
-        if (CollectionUtil.isEmpty(list)) {
+        if (CollectionUtil.isEmpty(orderTimeList)) {
             return;
-        }*/
-        for (OrderTimeDO i:orderTimeList
+        }
+
+        for (OrderTimeDO i : orderTimeList
         ) {
-            if(i.getTitleZh()!=null&&i.getTitleZh()=="到仓")
-            {
+            if (i.getTitleZh() != null && i.getTitleZh().equals("到仓")) {
                 //i.getBusinessTime();
-                long l=i.getOrderId();
-
+                long l = i.getOrderId();
+                long shpId = orderTimeMapper.getShipment_id(l);
+                Date d = orderTimeMapper.getUlboxtime(shpId);
+                if (d != null) i.setBusinessTime(d);
             }
         }
-
     }
 
     @NotNull

yudao-module-order/yudao-module-order-core/src/main/resources/mapper/order/OrderTimeMapper.xml

 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="cn.iocoder.yudao.module.order.dal.mysql.orderTime.OrderTimeMapper">
-    <!--
-        一般情况下，尽可能使用 Mapper 进行 CRUD 增删改查即可。
-        无法满足的场景，例如说多表关联查询，才使用 XML 编写 SQL。
-        代码生成器暂时只生成 Mapper XML 文件本身，更多推荐 MybatisX 快速开发插件来生成查询。
-        文档可见：https://www.iocoder.cn/MyBatis/x-plugins/
-     -->
+    <!--根据订单获取柜号 lanbm 2024-06-13 add-->
+    <select id="getShipment_id" resultType="java.lang.Long">
+        SELECT DISTINCT shipment_id from ecw_box_load_info
+        where order_id=#{orderId}
+    </select>
+    <!--根据柜号获取卸柜时间 lanbm 2024-06-13 add-->
+    <select id="getUlboxtime" resultType="java.util.Date">
+        select ul_box_time from ecw_box_cabinet_unload
+        where shipment_id=#{shipmentId}
+    </select>
+
 
     <select id="newOrderTimeByContainerNumberAndStatus" resultType="cn.iocoder.yudao.module.order.dal.dataobject.orderTime.OrderTimeDO">
         SELECT

yudao-module-wealth/yudao-module-wealth-core/src/main/java/cn/iocoder/yudao/module/wealth/service/receiptItem/BankReceiptDetailsImpl.java

@@ -63,6 +63,16 @@ public class BankReceiptDetailsImpl implements BankReceiptDetailsService {
                 r.setCreator(userMap.get(l));
             }
             r.setAttrList(getFileList(r.getAttr()));
+
+            if(r.getCreateBpm()==null||r.getCreator().length()==0)
+            {
+                r.setCreateBpm("");
+            }
+            else
+            {
+                Long l2 = Long.parseLong(r.getCreateBpm());
+                r.setCreateBpm(userMap.get(l2));
+            }
         }
         return new PageResult<>(list, total, mpPage.getSize(),
                 req.getPageNo(), (total + mpPage.getSize() - 1) / mpPage.getSize());