feat: 订单主表增加矿别字段

liufeilong 2 years ago committed by WangQi
parent c41ecfa374
commit 0e41e6533d
  1. 4
      order-management-common/src/main/java/com/dxhy/order/model/OrderProcessInfo.java
  2. 22
      order-management-consumer/src/main/resources/mybatis/mapper/OrderProcessInfoMapper.xml

@ -221,6 +221,10 @@ public class OrderProcessInfo implements Serializable {
* 原始订单ID * 原始订单ID
*/ */
private String originOrderId; private String originOrderId;
/**
* 矿别
*/
private String kb;

@ -52,6 +52,7 @@
<result column="yzfp" property="yzfp" jdbcType="VARCHAR"/> <result column="yzfp" property="yzfp" jdbcType="VARCHAR"/>
<result column="origin_ddh" property="originDdh" jdbcType="VARCHAR"/> <result column="origin_ddh" property="originDdh" jdbcType="VARCHAR"/>
<result column="origin_order_id" property="originOrderId" jdbcType="VARCHAR"/> <result column="origin_order_id" property="originOrderId" jdbcType="VARCHAR"/>
<result column="kb" property="kb" jdbcType="VARCHAR"/>
</resultMap> </resultMap>
<resultMap id="selectYwlxCountResultMap" type="com.dxhy.order.consumer.modules.order.model.bo.YwlxCountBO"> <resultMap id="selectYwlxCountResultMap" type="com.dxhy.order.consumer.modules.order.model.bo.YwlxCountBO">
@ -87,7 +88,7 @@
ghf_mc, ghf_nsrsbh, ghf_mc, ghf_nsrsbh,
kpxm, ddcjsj, ddlx, ddzt, ddly, ywlx,ywlx_id,kpfs, sbyy, order_status, create_time, kpxm, ddcjsj, ddlx, ddzt, ddly, ywlx,ywlx_id,kpfs, sbyy, order_status, create_time,
update_time,xhf_nsrsbh,xhf_mc,ent_id,sksbdm,fg_status,edit_status,num,check_status,check_time, update_time,xhf_nsrsbh,xhf_mc,ent_id,sksbdm,fg_status,edit_status,num,check_status,check_time,
bzdh,xtly,gsdm,bhzt,ygxm,kppzh,pzgzrq,yzfp,origin_ddh,origin_order_id bzdh,xtly,gsdm,bhzt,ygxm,kppzh,pzgzrq,yzfp,origin_ddh,origin_order_id,kb
</sql> </sql>
<select id="selectOrderProcessInfoByProcessId" resultMap="BaseResultMap" <select id="selectOrderProcessInfoByProcessId" resultMap="BaseResultMap"
@ -172,7 +173,7 @@
sbyy, order_status, create_time, sbyy, order_status, create_time,
update_time, xhf_nsrsbh, xhf_mc,ent_id,sksbdm, update_time, xhf_nsrsbh, xhf_mc,ent_id,sksbdm,
edit_status, num, check_status, check_time, edit_status, num, check_status, check_time,
bzdh,xtly,gsdm,bhzt,ygxm,kppzh,pzgzrq,yzfp,origin_ddh,origin_order_id) bzdh,xtly,gsdm,bhzt,ygxm,kppzh,pzgzrq,yzfp,origin_ddh,origin_order_id,kb)
values (#{id,jdbcType=VARCHAR}, #{orderInfoId,jdbcType=VARCHAR}, #{ddqqpch,jdbcType=VARCHAR}, values (#{id,jdbcType=VARCHAR}, #{orderInfoId,jdbcType=VARCHAR}, #{ddqqpch,jdbcType=VARCHAR},
#{fpqqlsh,jdbcType=VARCHAR}, #{fpqqlsh,jdbcType=VARCHAR},
#{ddh,jdbcType=VARCHAR}, #{tqm,jdbcType=VARCHAR}, #{kphjje,jdbcType=VARCHAR}, #{ddh,jdbcType=VARCHAR}, #{tqm,jdbcType=VARCHAR}, #{kphjje,jdbcType=VARCHAR},
@ -190,7 +191,7 @@
#{editStatus,jdbcType=VARCHAR}, #{num,jdbcType=INTEGER}, #{checkStatus,jdbcType=VARCHAR}, #{editStatus,jdbcType=VARCHAR}, #{num,jdbcType=INTEGER}, #{checkStatus,jdbcType=VARCHAR},
#{checkTime,jdbcType=VARCHAR}, #{bzdh,jdbcType=VARCHAR}, #{xtly,jdbcType=VARCHAR}, #{gsdm,jdbcType=VARCHAR}, #{checkTime,jdbcType=VARCHAR}, #{bzdh,jdbcType=VARCHAR}, #{xtly,jdbcType=VARCHAR}, #{gsdm,jdbcType=VARCHAR},
#{bhzt,jdbcType=VARCHAR}, #{ygxm,jdbcType=VARCHAR}, #{kppzh,jdbcType=VARCHAR}, #{pzgzrq,jdbcType=TIMESTAMP}, #{bhzt,jdbcType=VARCHAR}, #{ygxm,jdbcType=VARCHAR}, #{kppzh,jdbcType=VARCHAR}, #{pzgzrq,jdbcType=TIMESTAMP},
#{yzfp,jdbcType=VARCHAR}, #{originDdh,jdbcType=VARCHAR}, #{originOrderId,jdbcType=VARCHAR}) #{yzfp,jdbcType=VARCHAR}, #{originDdh,jdbcType=VARCHAR}, #{originOrderId,jdbcType=VARCHAR}, #{kb,jdbcType=VARCHAR})
</insert> </insert>
<update id="updateOrderProcessInfoByProcessId" parameterType="com.dxhy.order.model.OrderProcessInfo"> <update id="updateOrderProcessInfoByProcessId" parameterType="com.dxhy.order.model.OrderProcessInfo">
@ -311,10 +312,13 @@
yzfp = #{processInfo.yzfp,jdbcType=VARCHAR}, yzfp = #{processInfo.yzfp,jdbcType=VARCHAR},
</if> </if>
<if test="processInfo.originDdh != null"> <if test="processInfo.originDdh != null">
yzfp = #{processInfo.originDdh,jdbcType=VARCHAR}, origin_ddh = #{processInfo.originDdh,jdbcType=VARCHAR},
</if> </if>
<if test="processInfo.originOrderId != null"> <if test="processInfo.originOrderId != null">
yzfp = #{processInfo.originOrderId,jdbcType=VARCHAR}, origin_order_id = #{processInfo.originOrderId,jdbcType=VARCHAR},
</if>
<if test="processInfo.kb != null">
kb = #{processInfo.kb,jdbcType=VARCHAR},
</if> </if>
</set> </set>
<where> <where>
@ -359,7 +363,7 @@
op.ghf_mc, op.ghf_nsrsbh, op.ghf_mc, op.ghf_nsrsbh,
op.kpxm, op.ddcjsj, op.ddlx, op.ddzt, op.ddly, op.ywlx,op.ywlx_id,op.kpfs, op.sbyy, op.order_status, op.create_time, op.kpxm, op.ddcjsj, op.ddlx, op.ddzt, op.ddly, op.ywlx,op.ywlx_id,op.kpfs, op.sbyy, op.order_status, op.create_time,
op.update_time,op.xhf_nsrsbh,op.ent_id,op.xhf_mc,op.fg_status,op.edit_status,num,op.check_status,op.check_time, op.update_time,op.xhf_nsrsbh,op.ent_id,op.xhf_mc,op.fg_status,op.edit_status,num,op.check_status,op.check_time,
op.bzdh,op.xtly,op.gsdm,op.bhzt,op.ygxm,op.kppzh,op.pzgzrq,op.yzfp,op.origin_ddh,op.origin_order_id op.bzdh,op.xtly,op.gsdm,op.bhzt,op.ygxm,op.kppzh,op.pzgzrq,op.yzfp,op.origin_ddh,op.origin_order_id,op.kb
from order_process_info op from order_process_info op
left join order_invoice_info oii on op.id = oii.order_process_info_id left join order_invoice_info oii on op.id = oii.order_process_info_id
@ -601,6 +605,9 @@
<if test="map.originOrderId != null and map.originOrderId != ''"> <if test="map.originOrderId != null and map.originOrderId != ''">
and op.origin_order_id = #{map.originOrderId,jdbcType=VARCHAR} and op.origin_order_id = #{map.originOrderId,jdbcType=VARCHAR}
</if> </if>
<if test="map.kb != null and map.kb != ''">
and op.kb = #{map.kb,jdbcType=VARCHAR}
</if>
<!-- 异常订单列表根据订单更新时间排序 --> <!-- 异常订单列表根据订单更新时间排序 -->
<choose> <choose>
@ -875,6 +882,9 @@
<if test="processInfo.originOrderId != null"> <if test="processInfo.originOrderId != null">
origin_order_id = #{processInfo.originOrderId,jdbcType=VARCHAR}, origin_order_id = #{processInfo.originOrderId,jdbcType=VARCHAR},
</if> </if>
<if test="processInfo.kb != null">
kb = #{processInfo.kb,jdbcType=VARCHAR},
</if>
</set> </set>
<where> <where>
<if test="processInfo.id != null and processInfo.id != '' "> <if test="processInfo.id != null and processInfo.id != '' ">

Loading…
Cancel
Save