fix:数据同步新华三调整
parent
4d8e4fa01d
commit
f03fc06949
|
|
@ -27,6 +27,8 @@ public class DeliveryInfoVo {
|
||||||
private String orderCode;
|
private String orderCode;
|
||||||
//版本号
|
//版本号
|
||||||
private String versionCode;
|
private String versionCode;
|
||||||
|
//合同版本号
|
||||||
|
private String orderVersionCode;
|
||||||
//条码
|
//条码
|
||||||
private String serialNumber;
|
private String serialNumber;
|
||||||
private String productCode;
|
private String productCode;
|
||||||
|
|
|
||||||
|
|
@ -26,6 +26,8 @@ public class OrderInfoVo {
|
||||||
private String orderName;
|
private String orderName;
|
||||||
//版本号
|
//版本号
|
||||||
private String versionCode;
|
private String versionCode;
|
||||||
|
//合同版本号
|
||||||
|
private String orderVersionCode;
|
||||||
// //下单代表处
|
// //下单代表处
|
||||||
// private String orderAgentName;
|
// private String orderAgentName;
|
||||||
// private String orderAgentCode;
|
// private String orderAgentCode;
|
||||||
|
|
|
||||||
|
|
@ -11,7 +11,9 @@ public class ProjectOrderInfoRecallVO {
|
||||||
private String orderCode;
|
private String orderCode;
|
||||||
//版本号
|
//版本号
|
||||||
private String versionCode;
|
private String versionCode;
|
||||||
|
//合同版本号
|
||||||
|
private String orderVersionCode;
|
||||||
|
//最后更新时间
|
||||||
private Date lastUpdateTime;
|
private Date lastUpdateTime;
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -84,6 +84,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
||||||
SELECT
|
SELECT
|
||||||
t3.order_code,
|
t3.order_code,
|
||||||
CAST(ifnull(t5.version_code,0) + ifnull(t5.operation_version,0) AS SIGNED) AS version_code,
|
CAST(ifnull(t5.version_code,0) + ifnull(t5.operation_version,0) AS SIGNED) AS version_code,
|
||||||
|
t5.version_code as order_version_code,
|
||||||
t5.project_id ,
|
t5.project_id ,
|
||||||
t2.product_sn as 'serialNumber' ,
|
t2.product_sn as 'serialNumber' ,
|
||||||
t2.product_code,
|
t2.product_code,
|
||||||
|
|
|
||||||
|
|
@ -334,6 +334,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
||||||
t1.order_code,
|
t1.order_code,
|
||||||
t2.project_name AS 'order_name',
|
t2.project_name AS 'order_name',
|
||||||
CAST(ifnull(t1.version_code,0) + ifnull(t1.operation_version,0) AS SIGNED) AS version_code,
|
CAST(ifnull(t1.version_code,0) + ifnull(t1.operation_version,0) AS SIGNED) AS version_code,
|
||||||
|
t1.version_code as order_version_code,
|
||||||
t3.contact_person AS 'sale_name',
|
t3.contact_person AS 'sale_name',
|
||||||
t3.contact_email AS 'sale_email' ,
|
t3.contact_email AS 'sale_email' ,
|
||||||
t4.customer_name as 'customer_name',
|
t4.customer_name as 'customer_name',
|
||||||
|
|
|
||||||
|
|
@ -35,7 +35,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
||||||
</insert>
|
</insert>
|
||||||
|
|
||||||
<select id="getOrderRecallInfo" parameterType="com.ruoyi.sip.dto.ApiDataQueryDto" resultType="com.ruoyi.sip.vo.ProjectOrderInfoRecallVO">
|
<select id="getOrderRecallInfo" parameterType="com.ruoyi.sip.dto.ApiDataQueryDto" resultType="com.ruoyi.sip.vo.ProjectOrderInfoRecallVO">
|
||||||
select order_code, CAST(ifnull(version_code,0) + ifnull(operation_version,0) AS SIGNED) as version_code, create_time as last_update_time
|
select
|
||||||
|
order_code,
|
||||||
|
CAST(ifnull(version_code,0) + ifnull(operation_version,0) AS SIGNED) as version_code,
|
||||||
|
version_code as order_version_code,
|
||||||
|
create_time as last_update_time
|
||||||
from project_order_info_recall
|
from project_order_info_recall
|
||||||
<where>
|
<where>
|
||||||
<choose>
|
<choose>
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue