From 7c1fa763aebd56be8bf38d1ce54b9282a146b688 Mon Sep 17 00:00:00 2001
From: liufeilong <liufeilong@ele-cloud.com>
Date: Mon, 6 Mar 2023 17:02:37 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E8=AE=A2=E5=8D=95=E4=B8=BB=E8=A1=A8?=
 =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=AE=9A=E5=88=B6=E5=8C=96=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../dxhy/order/model/OrderProcessInfo.java    | 34 +++++++
 .../mybatis/mapper/OrderProcessInfoMapper.xml | 92 ++++++++++++++++++-
 2 files changed, 122 insertions(+), 4 deletions(-)

diff --git a/order-management-common/src/main/java/com/dxhy/order/model/OrderProcessInfo.java b/order-management-common/src/main/java/com/dxhy/order/model/OrderProcessInfo.java
index b5311839..e045a091 100644
--- a/order-management-common/src/main/java/com/dxhy/order/model/OrderProcessInfo.java
+++ b/order-management-common/src/main/java/com/dxhy/order/model/OrderProcessInfo.java
@@ -181,5 +181,39 @@ public class OrderProcessInfo implements Serializable {
     private String skcwms;
     private String pushJosStatus;
 
+    /**
+     * 报账单号
+     */
+    private String bzdh;
+    /**
+     * 系统来源
+     */
+    private String xtly;
+    /**
+     * 公司代码
+     */
+    private String gsdm;
+    /**
+     * 驳回状态
+     */
+    private String bhzt;
+    /**
+     * 员工姓名
+     */
+    private String ygxm;
+    /**
+     * 开票凭账号
+     */
+    private String kppzh;
+    /**
+     * 凭证过账日期
+     */
+    private Date pzgzrq;
+    /**
+     * 是否预制发票
+     */
+    private String yzfp;
+
+
 
 }
diff --git a/order-management-consumer/src/main/resources/mybatis/mapper/OrderProcessInfoMapper.xml b/order-management-consumer/src/main/resources/mybatis/mapper/OrderProcessInfoMapper.xml
index 144f7399..83bb11fa 100644
--- a/order-management-consumer/src/main/resources/mybatis/mapper/OrderProcessInfoMapper.xml
+++ b/order-management-consumer/src/main/resources/mybatis/mapper/OrderProcessInfoMapper.xml
@@ -42,6 +42,14 @@
         <result column="skcwdm" property="skcwdm" jdbcType="VARCHAR"/>
         <result column="skcwms" property="skcwms" jdbcType="VARCHAR"/>
         <result column="push_jos_status" property="pushJosStatus" jdbcType="VARCHAR"/>
+        <result column="bzdh" property="bzdh" jdbcType="VARCHAR"/>
+        <result column="xtly" property="xtly" jdbcType="VARCHAR"/>
+        <result column="gsdm" property="gsdm" jdbcType="VARCHAR"/>
+        <result column="bhzt" property="bhzt" jdbcType="VARCHAR"/>
+        <result column="ygxm" property="ygxm" jdbcType="VARCHAR"/>
+        <result column="kppzh" property="kppzh" jdbcType="VARCHAR"/>
+        <result column="pzgzrq" property="pzgzrq" jdbcType="TIMESTAMP"/>
+        <result column="yzfp" property="yzfp" jdbcType="VARCHAR"/>
     </resultMap>
 
     <resultMap id="selectYwlxCountResultMap" type="com.dxhy.order.consumer.modules.order.model.bo.YwlxCountBO">
@@ -76,7 +84,8 @@
         id, order_info_id,ddqqpch, fpqqlsh, ddh, tqm, kphjje, hjbhsje, kpse, fpzl_dm,
         ghf_mc, ghf_nsrsbh,
         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
     </sql>
 
     <select id="selectOrderProcessInfoByProcessId" resultMap="BaseResultMap"
@@ -160,7 +169,8 @@
                                         ddlx, ddzt, ddly, ywlx, ywlx_id, kpfs,
                                         sbyy, order_status, create_time,
                                         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)
         values (#{id,jdbcType=VARCHAR}, #{orderInfoId,jdbcType=VARCHAR}, #{ddqqpch,jdbcType=VARCHAR},
                 #{fpqqlsh,jdbcType=VARCHAR},
                 #{ddh,jdbcType=VARCHAR}, #{tqm,jdbcType=VARCHAR}, #{kphjje,jdbcType=VARCHAR},
@@ -176,7 +186,8 @@
                 #{updateTime,jdbcType=TIMESTAMP},
                 #{xhfNsrsbh,jdbcType=VARCHAR}, #{xhfMc,jdbcType=VARCHAR}, #{entId,jdbcType=VARCHAR}, #{sksbCode,jdbcType=VARCHAR},
                 #{editStatus,jdbcType=VARCHAR}, #{num,jdbcType=INTEGER}, #{checkStatus,jdbcType=VARCHAR},
-                #{checkTime,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}, #{yzfp,jdbcType=VARCHAR})
     </insert>
 
     <update id="updateOrderProcessInfoByProcessId" parameterType="com.dxhy.order.model.OrderProcessInfo">
@@ -272,6 +283,30 @@
             <if test="processInfo.checkTime != null">
                 check_time = #{processInfo.checkTime,jdbcType=TIMESTAMP},
             </if>
+            <if test="processInfo.bzdh != null">
+                bzdh = #{processInfo.bzdh,jdbcType=VARCHAR},
+            </if>
+            <if test="processInfo.xtly != null">
+                xtly = #{processInfo.xtly,jdbcType=VARCHAR},
+            </if>
+            <if test="processInfo.gsdm != null">
+                gsdm = #{processInfo.gsdm,jdbcType=VARCHAR},
+            </if>
+            <if test="processInfo.bhzt != null">
+                bhzt = #{processInfo.bhzt,jdbcType=VARCHAR},
+            </if>
+            <if test="processInfo.ygxm != null">
+                ygxm = #{processInfo.ygxm,jdbcType=VARCHAR},
+            </if>
+            <if test="processInfo.kppzh != null">
+                kppzh = #{processInfo.kppzh,jdbcType=VARCHAR},
+            </if>
+            <if test="processInfo.pzgzrq != null">
+                pzgzrq = #{processInfo.pzgzrq,jdbcType=TIMESTAMP},
+            </if>
+            <if test="processInfo.yzfp != null">
+                yzfp = #{processInfo.yzfp,jdbcType=VARCHAR},
+            </if>
         </set>
         <where>
             <if test="processInfo.id != null and processInfo.id != '' ">
@@ -314,7 +349,8 @@
         op.id, op.order_info_id,op.ddqqpch, op.fpqqlsh, op.ddh, op.tqm, op.kphjje, op.hjbhsje, op.kpse, op.fpzl_dm,
         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.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
         from order_process_info op
         left join order_invoice_info oii on op.id = oii.order_process_info_id
 
@@ -539,6 +575,30 @@
                     order by op.ddcjsj desc,op.num desc,op.create_time desc,op.id desc
                 </otherwise>
             </choose>
+            <if test="map.bzdh != null and map.bzdh != ''">
+                and op.bzdh = #{map.bzdh,jdbcType=VARCHAR}
+            </if>
+            <if test="map.xtly != null and map.xtly != ''">
+                and op.xtly = #{map.xtly,jdbcType=VARCHAR}
+            </if>
+            <if test="map.gsdm != null and map.gsdm != ''">
+                and op.gsdm = #{map.gsdm,jdbcType=VARCHAR}
+            </if>
+            <if test="map.bhzt != null and map.bhzt != ''">
+                and op.bhzt = #{map.bhzt,jdbcType=VARCHAR}
+            </if>
+            <if test="map.ygxm != null and map.ygxm != ''">
+                and op.ygxm = #{map.ygxm,jdbcType=VARCHAR}
+            </if>
+            <if test="map.kppzh != null and map.kppzh != ''">
+                and op.kppzh = #{map.kppzh,jdbcType=VARCHAR}
+            </if>
+            <if test="map.pzgzrq != null">
+                and op.pzgzrq = #{map.pzgzrq,jdbcType=TIMESTAMP}
+            </if>
+            <if test="map.yzfp != null and map.yzfp != ''">
+                and op.yzfp = #{map.yzfp,jdbcType=VARCHAR}
+            </if>
         </where>
     </select>
 
@@ -769,6 +829,30 @@
             <if test="processInfo.checkTime != null">
                 check_time = #{processInfo.checkTime,jdbcType=TIMESTAMP},
             </if>
+            <if test="processInfo.bzdh != null">
+                bzdh = #{processInfo.bzdh,jdbcType=VARCHAR},
+            </if>
+            <if test="processInfo.xtly != null">
+                xtly = #{processInfo.xtly,jdbcType=VARCHAR},
+            </if>
+            <if test="processInfo.gsdm != null">
+                gsdm = #{processInfo.gsdm,jdbcType=VARCHAR},
+            </if>
+            <if test="processInfo.bhzt != null">
+                bhzt = #{processInfo.bhzt,jdbcType=VARCHAR},
+            </if>
+            <if test="processInfo.ygxm != null">
+                ygxm = #{processInfo.ygxm,jdbcType=VARCHAR},
+            </if>
+            <if test="processInfo.kppzh != null">
+                kppzh = #{processInfo.kppzh,jdbcType=VARCHAR},
+            </if>
+            <if test="processInfo.pzgzrq != null">
+                pzgzrq = #{processInfo.pzgzrq,jdbcType=TIMESTAMP},
+            </if>
+            <if test="processInfo.yzfp != null">
+                yzfp = #{processInfo.yzfp,jdbcType=VARCHAR},
+            </if>
         </set>
         <where>
             <if test="processInfo.id != null and processInfo.id != '' ">