Merge remote-tracking branch 'origin/master'

zss

2023-11-15 6c264ce8c372e18109f0a3b9f5754955d22ba353

Merge remote-tracking branch 'origin/master'

 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;

}

 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;

 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 ,