From 58eacecb952e08aa9443e71e00bd16c0b4983e67 Mon Sep 17 00:00:00 2001 From: Fixiaobai <fixiaobai@163.com> Date: 星期三, 15 十一月 2023 17:05:20 +0800 Subject: [PATCH] Changes13 --- mes-plan/src/main/java/com/chinaztt/mes/plan/vo/CustomerOrderVO2.java | 2 +- mes-plan/src/main/java/com/chinaztt/mes/plan/dto/CustomerOrderDTO.java | 5 +---- mes-plan/src/main/resources/mapper/CustomerOrderMapper.xml | 4 ++-- 3 files changed, 4 insertions(+), 7 deletions(-) diff --git a/mes-plan/src/main/java/com/chinaztt/mes/plan/dto/CustomerOrderDTO.java b/mes-plan/src/main/java/com/chinaztt/mes/plan/dto/CustomerOrderDTO.java index 2fc64d2..108f4b3 100644 --- a/mes-plan/src/main/java/com/chinaztt/mes/plan/dto/CustomerOrderDTO.java +++ b/mes-plan/src/main/java/com/chinaztt/mes/plan/dto/CustomerOrderDTO.java @@ -121,7 +121,7 @@ private List<Long> customerOrderIds; @ApiModelProperty(value = "瀹㈡埛璁㈠崟鍙�") - private String customerContractNo; + private String customerOrderNo; @ApiModelProperty(value = "绛捐鏃ユ湡") private LocalDateTime placeOrderDate; @@ -140,8 +140,5 @@ @ApiModelProperty(value = "缁堟鏃ユ湡") private LocalDateTime endTime; - - @ApiModelProperty(value = "闇�姹傛棩鏈�") - private LocalDateTime deliveryDate; } diff --git a/mes-plan/src/main/java/com/chinaztt/mes/plan/vo/CustomerOrderVO2.java b/mes-plan/src/main/java/com/chinaztt/mes/plan/vo/CustomerOrderVO2.java index 6fa7da7..b3a6ba9 100644 --- a/mes-plan/src/main/java/com/chinaztt/mes/plan/vo/CustomerOrderVO2.java +++ b/mes-plan/src/main/java/com/chinaztt/mes/plan/vo/CustomerOrderVO2.java @@ -14,7 +14,7 @@ private Long id; //鍚堝悓缂栧彿 - private String customerOrderNo; + private String contractNo; //宸ョ▼鍚嶇О private String entityName; diff --git a/mes-plan/src/main/resources/mapper/CustomerOrderMapper.xml b/mes-plan/src/main/resources/mapper/CustomerOrderMapper.xml index d5b1e91..928ac0b 100644 --- a/mes-plan/src/main/resources/mapper/CustomerOrderMapper.xml +++ b/mes-plan/src/main/resources/mapper/CustomerOrderMapper.xml @@ -244,7 +244,7 @@ <resultMap id="resultMap" type="com.chinaztt.mes.plan.vo.CustomerOrderVO2"> <id property="id" column="id"/> - <result property="customerOrderNo" column="customer_order_no"/> + <result property="contractNo" column="contract_no"/> <result property="entityName" column="entity_name"/> <result property="createUser" column="create_user"/> <result property="createTime" column="create_time"/> @@ -273,7 +273,7 @@ <select id="getCustomerOrderPage" resultMap="resultMap"> select * from (SELECT pco.id , - customer_order_no , + contract_no , pc.entity_name , pc.create_user , pc.create_time , -- Gitblit v1.9.3