From 151aa4f8b444cf1b6fe5fbbd5d5ab0277f041f7a Mon Sep 17 00:00:00 2001
From: zhaoqing <1670883518@qq.com>
Date: Fri, 15 May 2026 15:20:04 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=9D=A1=E4=BB=B6=E6=9F=A5?=
 =?UTF-8?q?=E8=AF=A2=E6=8A=A5=E9=94=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../BusinessDocumentOrderDTO.java                |  4 ++--
 .../OriginalImportExportDocumentApi.java         |  2 --
 .../BusinessDocumentOrderMapper.xml              |  2 +-
 .../ErpEnterpriseUnitMapper.xml                  | 16 ++++++++--------
 4 files changed, 11 insertions(+), 13 deletions(-)

diff --git a/mhd_oms/src/main/java/com/mhd/oms/interfaces/dto/businessDocumentOrder/BusinessDocumentOrderDTO.java b/mhd_oms/src/main/java/com/mhd/oms/interfaces/dto/businessDocumentOrder/BusinessDocumentOrderDTO.java
index 798dd487a..7279b8a20 100644
--- a/mhd_oms/src/main/java/com/mhd/oms/interfaces/dto/businessDocumentOrder/BusinessDocumentOrderDTO.java
+++ b/mhd_oms/src/main/java/com/mhd/oms/interfaces/dto/businessDocumentOrder/BusinessDocumentOrderDTO.java
@@ -672,8 +672,8 @@ public class BusinessDocumentOrderDTO extends BaseVOEntity{
 
     @ApiModelProperty("$column.columnComment")
     @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
-    @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
-    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+//    @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
+//    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
     private Date documentDate;
 
 
diff --git a/mhd_oms/src/main/java/com/mhd/oms/interfaces/facade/originalImportExportDocument/OriginalImportExportDocumentApi.java b/mhd_oms/src/main/java/com/mhd/oms/interfaces/facade/originalImportExportDocument/OriginalImportExportDocumentApi.java
index 251d65f39..08e0da384 100644
--- a/mhd_oms/src/main/java/com/mhd/oms/interfaces/facade/originalImportExportDocument/OriginalImportExportDocumentApi.java
+++ b/mhd_oms/src/main/java/com/mhd/oms/interfaces/facade/originalImportExportDocument/OriginalImportExportDocumentApi.java
@@ -98,10 +98,8 @@ public class OriginalImportExportDocumentApi extends BaseController {
         PageHelper.startPage(pageNo, pageSize);
         List<BusinessDocumentOrderPO> orderList = businessDocumentOrderApplicationService.queryListAndMaterial(businessDocumentOrderDO);
 
-        // ✅ 批量查询货物列表并设置到订单
         fillCargoInfo(orderList);
 
-        // ✅ 获取分页信息
         Page<BusinessDocumentOrderPO> page = (Page<BusinessDocumentOrderPO>) orderList;
 
         List<OrderWithMaterialDTO> resultList = convertToOrderWithMaterialList(orderList);
diff --git a/mhd_oms/src/main/resources/mapper/businessDocumentOrder/BusinessDocumentOrderMapper.xml b/mhd_oms/src/main/resources/mapper/businessDocumentOrder/BusinessDocumentOrderMapper.xml
index d56e74b4c..bfe739722 100644
--- a/mhd_oms/src/main/resources/mapper/businessDocumentOrder/BusinessDocumentOrderMapper.xml
+++ b/mhd_oms/src/main/resources/mapper/businessDocumentOrder/BusinessDocumentOrderMapper.xml
@@ -1200,7 +1200,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <!--            and ORG_NAME like concat('%', #{orgName}, '%')-->
             <!--        </if>-->
             <if test="organizationId != null ">
-                and ORGANIZATION_ID = #{organizationId}
+                and o.ORGANIZATION_ID = #{organizationId}
             </if>
             <!--        <if test="organizationName != null  and organizationName != ''">-->
             <!--            and ORGANIZATION_NAME like concat('%', #{organizationName}, '%')-->
diff --git a/mhd_oms/src/main/resources/mapper/erpEnterpriseUnit/ErpEnterpriseUnitMapper.xml b/mhd_oms/src/main/resources/mapper/erpEnterpriseUnit/ErpEnterpriseUnitMapper.xml
index 828884083..c4a91cbd1 100644
--- a/mhd_oms/src/main/resources/mapper/erpEnterpriseUnit/ErpEnterpriseUnitMapper.xml
+++ b/mhd_oms/src/main/resources/mapper/erpEnterpriseUnit/ErpEnterpriseUnitMapper.xml
@@ -10,28 +10,28 @@
         FROM erp_enterprise_unit
         WHERE del_flag = 1
         <if test="erpEnterpriseUnitDO.erpCode != null and erpEnterpriseUnitDO.erpCode != ''">
-            AND erp_code LIKE CONCAT('%', #{do.erpCode}, '%')
+            AND erp_code LIKE CONCAT('%', #{erpCode}, '%')
         </if>
         <if test="erpEnterpriseUnitDO.erpName != null and erpEnterpriseUnitDO.erpName != ''">
-            AND erp_name LIKE CONCAT('%', #{do.erpName}, '%')
+            AND erp_name LIKE CONCAT('%', #{erpName}, '%')
         </if>
         <if test="erpEnterpriseUnitDO.pushStatus != null">
-            AND push_status = #{do.pushStatus}
+            AND push_status = #{pushStatus}
         </if>
         <if test="erpEnterpriseUnitDO.pushTimeFrom != null and erpEnterpriseUnitDO.pushTimeFrom != ''">
-            AND DATE_FORMAT(push_time, '%Y-%m-%d') &gt;= #{do.pushTimeFrom}
+            AND DATE_FORMAT(push_time, '%Y-%m-%d') &gt;= #{pushTimeFrom}
         </if>
         <if test="erpEnterpriseUnitDO.pushTimeTo != null and erpEnterpriseUnitDO.pushTimeTo != ''">
-            AND DATE_FORMAT(push_time, '%Y-%m-%d') &lt;= #{do.pushTimeTo}
+            AND DATE_FORMAT(push_time, '%Y-%m-%d') &lt;= #{pushTimeTo}
         </if>
         <if test="erpEnterpriseUnitDO.organizationId != null">
-            AND organization_id = #{do.organizationId}
+            AND organization_id = #{organizationId}
         </if>
         <if test="erpEnterpriseUnitDO.createTimeFrom != null and erpEnterpriseUnitDO.createTimeFrom != ''">
-            AND DATE_FORMAT(create_time, '%Y-%m-%d') &gt;= #{do.createTimeFrom}
+            AND DATE_FORMAT(create_time, '%Y-%m-%d') &gt;= #{createTimeFrom}
         </if>
         <if test="erpEnterpriseUnitDO.createTimeTo != null and erpEnterpriseUnitDO.createTimeTo != ''">
-            AND DATE_FORMAT(create_time, '%Y-%m-%d') &lt;= #{do.createTimeTo}
+            AND DATE_FORMAT(create_time, '%Y-%m-%d') &lt;= #{createTimeTo}
         </if>
         ORDER BY create_time DESC
     </select>