问题修改

src/main/java/com/dk/mdm/mapper/ivt/InboundItemMapper.xml

@@ -125,6 +125,9 @@
         <result column="flgCostCheckName" property="flgCostCheckName"/>
         <result column="ingBoxPiece" property="ingBoxPiece"/>
         <result column="boxPiece" property="boxPiece"/>
+        <result column="skuModel" property="skuModel"/>
+        <result column="skuName" property="skuName"/>
+        <result column="supName" property="supName"/>
     </resultMap>
 <!--    退货用-->
     <resultMap id="BaseResultMapReturnResponse" type="com.dk.mdm.model.response.ivt.InboundItemResponse">

src/main/java/com/dk/mdm/mapper/mac/OtherReceivableMapper.xml

@@ -48,6 +48,7 @@
             <result column="cp_id" property="cpId"/>
         <result column="receivable_residue" property="receivableResidue"/>
         <result column="receipt_residue" property="receiptResidue"/>
+        <result column="contact_name" property="contactName"/>
     </resultMap>
 
 
@@ -141,6 +142,7 @@
                tmc.cus_code         as "cusCode",
                tmc.cus_name         as "cusName",
                tmc.cus_phone        as "cusPhone",
+               tmc.contact_name
                t.org_id,
                tmo.org_name         as "orgName",
                t.staff_id,

src/main/java/com/dk/mdm/mapper/mac/RecPayMapper.xml

@@ -5,75 +5,76 @@
     <!-- 通用设置 -->
     <!-- 通用查询列 -->
     <sql id="Base_Column_List">
-        rp_id, rp_no, rp_type, object_id, org_id, staff_id, sum_amt_rec, sum_amt_pay, sum_should_handle, sum_use_receipt_residue, sum_use_payment_residue, sum_amt_receivable_handle, sum_amt_payable_handle, sum_waive_amt, acc_date, annex_paths, remarks, biznis_type, biznis_id, biznis_no, flg_order_handle, flg_lock, make_staff, make_time, flg_valid, cp_id
+        rp_id
+        , rp_no, rp_type, object_id, org_id, staff_id, sum_amt_rec, sum_amt_pay, sum_should_handle, sum_use_receipt_residue, sum_use_payment_residue, sum_amt_receivable_handle, sum_amt_payable_handle, sum_waive_amt, acc_date, annex_paths, remarks, biznis_type, biznis_id, biznis_no, flg_order_handle, flg_lock, make_staff, make_time, flg_valid, cp_id
     </sql>
 
     <!-- 通用查询映射结果 -->
     <resultMap id="BaseResultMap" type="com.dk.mdm.model.pojo.mac.RecPay">
         <id column="rp_id" property="rpId"/>
-            <result column="rp_no" property="rpNo"/>
-            <result column="rp_type" property="rpType"/>
-            <result column="object_id" property="objectId" typeHandler="UuidTypeHandler"/>
-            <result column="org_id" property="orgId" typeHandler="UuidTypeHandler"/>
-            <result column="staff_id" property="staffId" typeHandler="UuidTypeHandler"/>
-            <result column="sum_amt_rec" property="sumAmtRec"/>
-            <result column="sum_amt_pay" property="sumAmtPay"/>
-            <result column="sum_should_handle" property="sumShouldHandle"/>
-            <result column="sum_use_receipt_residue" property="sumUseReceiptResidue"/>
-            <result column="sum_use_payment_residue" property="sumUsePaymentResidue"/>
-            <result column="sum_amt_receivable_handle" property="sumAmtReceivableHandle"/>
-            <result column="sum_amt_payable_handle" property="sumAmtPayableHandle"/>
-            <result column="sum_waive_amt" property="sumWaiveAmt"/>
-            <result column="acc_date" property="accDate" typeHandler="TimestampTypeHandler"/>
-            <result column="remarks" property="remarks"/>
-            <result column="annex_paths" property="annexPaths" typeHandler="JsonTypeHandler"/>
-            <result column="biznis_type" property="biznisType"/>
-            <result column="biznis_id" property="biznisId" typeHandler="UuidTypeHandler"/>
-            <result column="biznis_no" property="biznisNo"/>
-            <result column="flg_order_handle" property="flgOrderHandle"/>
-            <result column="flg_lock" property="flgLock"/>
-            <result column="make_staff" property="makeStaff" typeHandler="UuidTypeHandler"/>
-            <result column="make_time" property="makeTime" typeHandler="TimestampTypeHandler"/>
-            <result column="flg_valid" property="flgValid"/>
-            <result column="cp_id" property="cpId"/>
+        <result column="rp_no" property="rpNo"/>
+        <result column="rp_type" property="rpType"/>
+        <result column="object_id" property="objectId" typeHandler="UuidTypeHandler"/>
+        <result column="org_id" property="orgId" typeHandler="UuidTypeHandler"/>
+        <result column="staff_id" property="staffId" typeHandler="UuidTypeHandler"/>
+        <result column="sum_amt_rec" property="sumAmtRec"/>
+        <result column="sum_amt_pay" property="sumAmtPay"/>
+        <result column="sum_should_handle" property="sumShouldHandle"/>
+        <result column="sum_use_receipt_residue" property="sumUseReceiptResidue"/>
+        <result column="sum_use_payment_residue" property="sumUsePaymentResidue"/>
+        <result column="sum_amt_receivable_handle" property="sumAmtReceivableHandle"/>
+        <result column="sum_amt_payable_handle" property="sumAmtPayableHandle"/>
+        <result column="sum_waive_amt" property="sumWaiveAmt"/>
+        <result column="acc_date" property="accDate" typeHandler="TimestampTypeHandler"/>
+        <result column="remarks" property="remarks"/>
+        <result column="annex_paths" property="annexPaths" typeHandler="JsonTypeHandler"/>
+        <result column="biznis_type" property="biznisType"/>
+        <result column="biznis_id" property="biznisId" typeHandler="UuidTypeHandler"/>
+        <result column="biznis_no" property="biznisNo"/>
+        <result column="flg_order_handle" property="flgOrderHandle"/>
+        <result column="flg_lock" property="flgLock"/>
+        <result column="make_staff" property="makeStaff" typeHandler="UuidTypeHandler"/>
+        <result column="make_time" property="makeTime" typeHandler="TimestampTypeHandler"/>
+        <result column="flg_valid" property="flgValid"/>
+        <result column="cp_id" property="cpId"/>
     </resultMap>
 
     <!-- Response查询映射结果 -->
     <resultMap id="BaseResultMapResponse" type="com.dk.mdm.model.response.mac.RecPayResponse">
         <id column="rp_id" property="rpId"/>
-            <result column="rp_no" property="rpNo"/>
-            <result column="rp_type" property="rpType"/>
-            <result column="object_id" property="objectId" typeHandler="UuidTypeHandler"/>
-            <result column="org_id" property="orgId" typeHandler="UuidTypeHandler"/>
-            <result column="staff_id" property="staffId" typeHandler="UuidTypeHandler"/>
-            <result column="sum_amt_rec" property="sumAmtRec"/>
-            <result column="amt_pay" property="amtPay"/>
-            <result column="sum_amt_pay" property="sumAmtPay"/>
-            <result column="sum_should_handle" property="sumShouldHandle"/>
-            <result column="sum_use_receipt_residue" property="sumUseReceiptResidue"/>
-            <result column="sum_use_payment_residue" property="sumUsePaymentResidue"/>
-            <result column="sum_amt_receivable_handle" property="sumAmtReceivableHandle"/>
-            <result column="sum_amt_payable_handle" property="sumAmtPayableHandle"/>
-            <result column="sum_waive_amt" property="sumWaiveAmt"/>
-            <result column="acc_date" property="accDate" typeHandler="TimestampTypeHandler"/>
-            <result column="remarks" property="remarks"/>
-            <result column="annex_paths" property="annexPaths" typeHandler="JsonTypeHandler"/>
-            <result column="biznis_type" property="biznisType"/>
-            <result column="biznis_id" property="biznisId" typeHandler="UuidTypeHandler"/>
-            <result column="biznis_no" property="biznisNo"/>
-            <result column="flg_order_handle" property="flgOrderHandle"/>
-            <result column="flg_lock" property="flgLock"/>
-            <result column="make_staff" property="makeStaff" typeHandler="UuidTypeHandler"/>
-            <result column="make_time" property="makeTime" typeHandler="TimestampTypeHandler"/>
-            <result column="flg_valid" property="flgValid"/>
-            <result column="cp_id" property="cpId"/>
-            <result column="receivable_residue" property="receivableResidue"/>
-            <result column="receipt_residue" property="receiptResidue"/>
-            <result column="payable_residue" property="payableResidue"/>
-            <result column="payment_residue" property="paymentResidue"/>
-            <result column="macNames" property="macNames"/>
-             <result column="amt_rec" property="amtRec"/>
-
+        <result column="rp_no" property="rpNo"/>
+        <result column="rp_type" property="rpType"/>
+        <result column="object_id" property="objectId" typeHandler="UuidTypeHandler"/>
+        <result column="org_id" property="orgId" typeHandler="UuidTypeHandler"/>
+        <result column="staff_id" property="staffId" typeHandler="UuidTypeHandler"/>
+        <result column="sum_amt_rec" property="sumAmtRec"/>
+        <result column="amt_pay" property="amtPay"/>
+        <result column="sum_amt_pay" property="sumAmtPay"/>
+        <result column="sum_should_handle" property="sumShouldHandle"/>
+        <result column="sum_use_receipt_residue" property="sumUseReceiptResidue"/>
+        <result column="sum_use_payment_residue" property="sumUsePaymentResidue"/>
+        <result column="sum_amt_receivable_handle" property="sumAmtReceivableHandle"/>
+        <result column="sum_amt_payable_handle" property="sumAmtPayableHandle"/>
+        <result column="sum_waive_amt" property="sumWaiveAmt"/>
+        <result column="acc_date" property="accDate" typeHandler="TimestampTypeHandler"/>
+        <result column="remarks" property="remarks"/>
+        <result column="annex_paths" property="annexPaths" typeHandler="JsonTypeHandler"/>
+        <result column="biznis_type" property="biznisType"/>
+        <result column="biznis_id" property="biznisId" typeHandler="UuidTypeHandler"/>
+        <result column="biznis_no" property="biznisNo"/>
+        <result column="flg_order_handle" property="flgOrderHandle"/>
+        <result column="flg_lock" property="flgLock"/>
+        <result column="make_staff" property="makeStaff" typeHandler="UuidTypeHandler"/>
+        <result column="make_time" property="makeTime" typeHandler="TimestampTypeHandler"/>
+        <result column="flg_valid" property="flgValid"/>
+        <result column="cp_id" property="cpId"/>
+        <result column="receivable_residue" property="receivableResidue"/>
+        <result column="receipt_residue" property="receiptResidue"/>
+        <result column="payable_residue" property="payableResidue"/>
+        <result column="payment_residue" property="paymentResidue"/>
+        <result column="macNames" property="macNames"/>
+        <result column="amt_rec" property="amtRec"/>
+        <result column="makeStaffName" property="makeStaffName"/>
         <result column="sup_id" property="supId"/>
         <result column="sup_code" property="supCode"/>
         <result column="sup_name" property="supName"/>
@@ -167,10 +168,10 @@
             AND tmc.cus_name LIKE concat('%',my_ex.likequery(#{cusName}),'%')
         </if>
         <if test="orgIdList != null and orgIdList.size() > 0">
-            AND t.org_id  =any(#{orgIdList, typeHandler=UuidListTypeHandler})
+            AND t.org_id =any(#{orgIdList, typeHandler=UuidListTypeHandler})
         </if>
         <if test="staffIdList != null and staffIdList.size() > 0">
-            AND t.staff_id  =any(#{staffIdList, typeHandler=UuidListTypeHandler})
+            AND t.staff_id =any(#{staffIdList, typeHandler=UuidListTypeHandler})
         </if>
         <if test="makeTimeStart != null and makeTimeEnd != null">
             AND t.make_time &gt;= #{makeTimeStart}::timestamp with time zone
@@ -186,24 +187,24 @@
             AND tmp.sup_name LIKE concat('%',my_ex.likequery(#{supName}),'%')
         </if>
         <if test="rpTypeList != null and rpTypeList.size() > 0">
-            AND t.rp_type  =any(#{rpTypeList, typeHandler=StringListTypeHandler})
+            AND t.rp_type =any(#{rpTypeList, typeHandler=StringListTypeHandler})
         </if>
         <if test="staffIds != null and staffIds.size() > 0">
-            AND t.staff_id  =any(#{staffIdList, typeHandler=UuidListTypeHandler})
+            AND t.staff_id =any(#{staffIdList, typeHandler=UuidListTypeHandler})
         </if>
         <if test="createtimeStart != null and createtimeEnd != null">
             AND t.op_create_time &gt;= #{createtimeStart}::timestamp with time zone
             AND t.op_create_time &lt; #{createtimeEnd}::timestamp with time zone + interval '1 day'
         </if>
-<!--        <if  test="searchText != null">-->
-<!--            AND ( t.rp_no  like concat('%', my_ex.likequery(#{searchText}) , '%')-->
-<!--            OR   tmc.cus_code  like concat('%', my_ex.likequery(#{searchText}) , '%')-->
-<!--            OR  tmc.cus_name  like concat('%', my_ex.likequery(#{searchText}) , '%')-->
-<!--            OR   tmc.cus_phone  like concat('%', my_ex.likequery(#{searchText}) , '%')-->
-<!--            OR   tmc.address_full  like concat('%', my_ex.likequery(#{searchText}) , '%')-->
-<!--            OR  t.remarks like concat('%', my_ex.likequery(#{searchText}) , '%')-->
-<!--            )-->
-<!--        </if>-->
+        <!--        <if  test="searchText != null">-->
+        <!--            AND ( t.rp_no  like concat('%', my_ex.likequery(#{searchText}) , '%')-->
+        <!--            OR   tmc.cus_code  like concat('%', my_ex.likequery(#{searchText}) , '%')-->
+        <!--            OR  tmc.cus_name  like concat('%', my_ex.likequery(#{searchText}) , '%')-->
+        <!--            OR   tmc.cus_phone  like concat('%', my_ex.likequery(#{searchText}) , '%')-->
+        <!--            OR   tmc.address_full  like concat('%', my_ex.likequery(#{searchText}) , '%')-->
+        <!--            OR  t.remarks like concat('%', my_ex.likequery(#{searchText}) , '%')-->
+        <!--            )-->
+        <!--        </if>-->
         <if test="staffName != null and staffName != ''">
             AND tms.staff_name LIKE concat('%',my_ex.likequery(#{staffName}),'%')
         </if>
@@ -214,6 +215,9 @@
         <if test="sumAmtReceivableHandleFlag != null and sumAmtReceivableHandleFlag == true">
             AND t.sum_amt_receivable_handle > 0
         </if>
+        <if test="addressFull != null and addressFull != ''">
+            AND tmc.address_full LIKE concat('%',my_ex.likequery(#{addressFull}),'%')
+        </if>
     </sql>
 
 
@@ -293,10 +297,10 @@
         </if>
 
         <if test="orgIdList != null and orgIdList.size() > 0">
-            AND t.org_id  =any(#{orgIdList, typeHandler=UuidListTypeHandler})
+            AND t.org_id =any(#{orgIdList, typeHandler=UuidListTypeHandler})
         </if>
         <if test="staffIdList != null and staffIdList.size() > 0">
-            AND t.staff_id  =any(#{staffIdList, typeHandler=UuidListTypeHandler})
+            AND t.staff_id =any(#{staffIdList, typeHandler=UuidListTypeHandler})
         </if>
         <if test="makeTimeStart != null and makeTimeEnd != null">
             AND t.make_time &gt;= #{makeTimeStart}::timestamp with time zone
@@ -307,13 +311,13 @@
         </if>
 
         <if test="rpTypeList != null and rpTypeList.size() > 0">
-            AND t.rp_type  =any(#{rpTypeList, typeHandler=StringListTypeHandler})
+            AND t.rp_type =any(#{rpTypeList, typeHandler=StringListTypeHandler})
         </if>
         <if test="staffIds != null and staffIds.size() > 0">
-            AND t.staff_id  =any(#{staffIdList, typeHandler=UuidListTypeHandler})
+            AND t.staff_id =any(#{staffIdList, typeHandler=UuidListTypeHandler})
         </if>
         <if test="makeStaffIds != null and makeStaffIds.size() > 0">
-            AND t.make_staff  =any(#{makeStaffIds, typeHandler=UuidListTypeHandler})
+            AND t.make_staff =any(#{makeStaffIds, typeHandler=UuidListTypeHandler})
         </if>
 
         <if test="createtimeStart != null and createtimeEnd != null">
@@ -345,55 +349,55 @@
     <!-- 查询表t_mac_rec_pay，（条件查询+分页）列表 -->
     <select id="selectByCond" resultMap="BaseResultMapResponse">
         select t.rp_id,
-               t.rp_no,
-               t.rp_type,
-               sys.f_get_name_i18n(tdk1.kind_name_i18n, #{i18n}) as "rpTypeName",
-               t.object_id,
-               tmc.cus_code         as "cusCode",
-               tmc.cus_name         as "cusName",
-               tmc.cus_phone        as "cusPhone",
-               tmc.address_full     as "addressFull",
-               t.org_id,
-               tmo.org_name         as "orgName",
-               t.staff_id,
-               tms.staff_name       as "staffName",
-               t.sum_amt_rec,
-               t.sum_amt_pay,
-               t.sum_should_handle,
-               t.sum_use_receipt_residue,
-               t.sum_use_payment_residue,
-               t.sum_amt_receivable_handle,
-               t.sum_amt_payable_handle,
-               t.sum_waive_amt,
-               t.acc_date,
-               t.remarks,
-               t.annex_paths,
-               t.biznis_type,
-               t.biznis_id,
-               t.biznis_no,
-               t.flg_order_handle,
-               t.flg_lock,
-               t.make_staff,
-               makestaff.staff_name as "makeStaffName",
-               t.make_time,
-               t.flg_valid,
-               t.cp_id,
-                tma.receivable_residue,
-                tma.receipt_residue
+        t.rp_no,
+        t.rp_type,
+        sys.f_get_name_i18n(tdk1.kind_name_i18n, #{i18n}) as "rpTypeName",
+        t.object_id,
+        tmc.cus_code as "cusCode",
+        tmc.cus_name as "cusName",
+        tmc.cus_phone as "cusPhone",
+        tmc.address_full as "addressFull",
+        t.org_id,
+        tmo.org_name as "orgName",
+        t.staff_id,
+        tms.staff_name as "staffName",
+        t.sum_amt_rec,
+        t.sum_amt_pay,
+        t.sum_should_handle,
+        t.sum_use_receipt_residue,
+        t.sum_use_payment_residue,
+        t.sum_amt_receivable_handle,
+        t.sum_amt_payable_handle,
+        t.sum_waive_amt,
+        t.acc_date,
+        t.remarks,
+        t.annex_paths,
+        t.biznis_type,
+        t.biznis_id,
+        t.biznis_no,
+        t.flg_order_handle,
+        t.flg_lock,
+        t.make_staff,
+        makestaff.staff_name as "makeStaffName",
+        t.make_time,
+        t.flg_valid,
+        t.cp_id,
+        tma.receivable_residue,
+        tma.receipt_residue
         from dkic_b.t_mac_rec_pay as t
-                 left join dkic_b.t_mst_customer tmc on tmc.cus_id = t.object_id
-                 left join sys.t_data_kind as tdk1 on tdk1.kind_code = t.rp_type
-                 left join dkic_b.t_mst_org tmo on tmo.org_id = t.org_id
-                 left join dkic_b.t_mst_staff tms on tms.staff_id = t.staff_id
-                 left join dkic_b.t_mst_staff as makestaff on makestaff.staff_id = t.make_staff
-                  LEFT JOIN  dkic_b.t_mac_account tma  on tma.object_id = t.object_id and tma.object_type in ('对象类型-客户')
+        left join dkic_b.t_mst_customer tmc on tmc.cus_id = t.object_id
+        left join sys.t_data_kind as tdk1 on tdk1.kind_code = t.rp_type
+        left join dkic_b.t_mst_org tmo on tmo.org_id = t.org_id
+        left join dkic_b.t_mst_staff tms on tms.staff_id = t.staff_id
+        left join dkic_b.t_mst_staff as makestaff on makestaff.staff_id = t.make_staff
+        LEFT JOIN dkic_b.t_mac_account tma on tma.object_id = t.object_id and tma.object_type in ('对象类型-客户')
         where t.rp_type in ('收付款类型-收款', '收付款类型-退收款')
         <include refid="Condition"/>
         <if test="viewVoidedDocuments !=null and viewVoidedDocuments == false">
-            AND  t.flg_valid = true
+            AND t.flg_valid = true
         </if>
         <if test="searchText !=null and searchText != ''">
-            AND (  tmc.cus_phone LIKE concat('%',my_ex.likequery(#{searchText}),'%')
+            AND ( tmc.cus_phone LIKE concat('%',my_ex.likequery(#{searchText}),'%')
             or tmc.address_full LIKE concat('%',my_ex.likequery(#{searchText}),'%')
             or tmc.cus_name LIKE concat('%',my_ex.likequery(#{searchText}),'%')
             or tmo.org_name LIKE concat('%',my_ex.likequery(#{searchText}),'%')
@@ -410,16 +414,16 @@
     <select id="countByCond" resultType="Long">
         SELECT count(1)
         from dkic_b.t_mac_rec_pay as t
-                 left join dkic_b.t_mst_customer tmc on tmc.cus_id = t.object_id
-                 left join sys.t_data_kind as tdk1 on tdk1.kind_code = t.rp_type
-                 left join dkic_b.t_mst_org tmo on tmo.org_id = t.org_id
-                 left join dkic_b.t_mst_staff tms on tms.staff_id = t.staff_id
-                 left join dkic_b.t_mst_staff as makestaff on makestaff.staff_id = t.make_staff
+        left join dkic_b.t_mst_customer tmc on tmc.cus_id = t.object_id
+        left join sys.t_data_kind as tdk1 on tdk1.kind_code = t.rp_type
+        left join dkic_b.t_mst_org tmo on tmo.org_id = t.org_id
+        left join dkic_b.t_mst_staff tms on tms.staff_id = t.staff_id
+        left join dkic_b.t_mst_staff as makestaff on makestaff.staff_id = t.make_staff
         where t.rp_type in ('收付款类型-收款', '收付款类型-退收款')
         <include refid="Condition"/>
         <if test="searchText !=null and searchText != ''">
             AND (
-            t.rp_no   LIKE concat('%',my_ex.likequery(#{searchText}),'%')
+            t.rp_no LIKE concat('%',my_ex.likequery(#{searchText}),'%')
             or tmc.cus_phone LIKE concat('%',my_ex.likequery(#{searchText}),'%')
             or tmc.cus_name LIKE concat('%',my_ex.likequery(#{searchText}),'%')
             or tmo.org_name LIKE concat('%',my_ex.likequery(#{searchText}),'%')
@@ -435,14 +439,14 @@
         t.rp_type,
         sys.f_get_name_i18n(tdk1.kind_name_i18n, #{i18n}) as "rpTypeName",
         t.object_id,
-        tmc.cus_code         as "cusCode",
-        tmc.cus_name         as "cusName",
-        tmc.cus_phone        as "cusPhone",
-        tmc.address_full     as "addressFull",
+        tmc.cus_code as "cusCode",
+        tmc.cus_name as "cusName",
+        tmc.cus_phone as "cusPhone",
+        tmc.address_full as "addressFull",
         t.org_id,
-        tmo.org_name         as "orgName",
+        tmo.org_name as "orgName",
         t.staff_id,
-        tms.staff_name       as "staffName",
+        tms.staff_name as "staffName",
         t.sum_amt_rec,
         t.sum_amt_pay,
         t.sum_should_handle,
@@ -474,15 +478,15 @@
         left join dkic_b.t_mst_org tmo on tmo.org_id = t.org_id
         left join dkic_b.t_mst_staff tms on tms.staff_id = t.staff_id
         left join dkic_b.t_mst_staff as makestaff on makestaff.staff_id = t.make_staff
-        LEFT JOIN  dkic_b.t_mac_account tma  on tma.object_id = t.object_id and tma.object_type in ('对象类型-客户')
-        left  join   dkic_b.t_mac_rec_pay_item  rpi  on  rpi.rp_id = t.rp_id
-        left  join   dkic_b.t_mst_money_account tmma  on  tmma.mac_id = rpi.mac_id
+        LEFT JOIN dkic_b.t_mac_account tma on tma.object_id = t.object_id and tma.object_type in ('对象类型-客户')
+        left join dkic_b.t_mac_rec_pay_item rpi on rpi.rp_id = t.rp_id
+        left join dkic_b.t_mst_money_account tmma on tmma.mac_id = rpi.mac_id
         where t.rp_type in ('收付款类型-收款', '收付款类型-退收款')
         <include refid="Condition"/>
 
         <if test="searchText !=null and searchText != ''">
             AND (
-            t.rp_no   LIKE concat('%',my_ex.likequery(#{searchText}),'%')
+            t.rp_no LIKE concat('%',my_ex.likequery(#{searchText}),'%')
             or tmc.cus_phone LIKE concat('%',my_ex.likequery(#{searchText}),'%')
             or tmc.cus_name LIKE concat('%',my_ex.likequery(#{searchText}),'%')
             or tmo.org_name LIKE concat('%',my_ex.likequery(#{searchText}),'%')
@@ -508,7 +512,7 @@
         <include refid="Condition"/>
         <if test="searchText !=null and searchText != ''">
             AND (
-            t.rp_no   LIKE concat('%',my_ex.likequery(#{searchText}),'%')
+            t.rp_no LIKE concat('%',my_ex.likequery(#{searchText}),'%')
             or tmc.cus_phone LIKE concat('%',my_ex.likequery(#{searchText}),'%')
             or tmc.cus_name LIKE concat('%',my_ex.likequery(#{searchText}),'%')
             or tmo.org_name LIKE concat('%',my_ex.likequery(#{searchText}),'%')
@@ -524,11 +528,11 @@
                t.rp_type,
                sys.f_get_name_i18n(tdk1.kind_name_i18n, #{i18n}) as "rpTypeName",
                t.object_id,
-               tmc.cus_code         as "cusCode",
-               tmc.cus_name         as "cusName",
-               tmc.cus_phone        as "cusPhone",
-               tmc.address_full     as "addressFull",
-               tmc.address_no   ,
+               tmc.cus_code                                      as "cusCode",
+               tmc.cus_name                                      as "cusName",
+               tmc.cus_phone                                     as "cusPhone",
+               tmc.address_full                                  as "addressFull",
+               tmc.address_no,
                tmsp.sup_id,
                tmsp.sup_code,
                tmsp.sup_name,
@@ -537,9 +541,9 @@
                tmsp.contact_phone,
                tmsp.return_address,
                t.org_id,
-               tmo.org_name         as "orgName",
+               tmo.org_name                                      as "orgName",
                t.staff_id,
-               tms.staff_name       as "staffName",
+               tms.staff_name                                    as "staffName",
                t.sum_amt_rec,
                t.sum_amt_pay,
                t.sum_should_handle,
@@ -557,7 +561,7 @@
                t.flg_order_handle,
                t.flg_lock,
                t.make_staff,
-               makestaff.staff_name as "makeStaffName",
+               makestaff.staff_name                              as "makeStaffName",
                t.make_time,
                t.flg_valid,
                t.cp_id,
@@ -572,8 +576,8 @@
                  left join dkic_b.t_mst_org tmo on tmo.org_id = t.org_id
                  left join dkic_b.t_mst_staff tms on tms.staff_id = t.staff_id
                  left join dkic_b.t_mst_staff as makestaff on makestaff.staff_id = t.make_staff
-                 LEFT JOIN  dkic_b.t_mac_account tma  on tma.object_id =  t.object_id
-        where   t.rp_id = #{id}::uuid
+                 LEFT JOIN dkic_b.t_mac_account tma on tma.object_id = t.object_id
+        where t.rp_id = #{id}::uuid
     </select>
 
     <!-- 根据主键锁定表t_mac_rec_pay的一行数据 -->
@@ -582,7 +586,7 @@
         <include refid="Base_Column_List"/>
         FROM dkic_b.t_mac_rec_pay
         WHERE flg_valid
-          and rp_id = #{id}::uuid
+        and rp_id = #{id}::uuid
         for update
     </select>
 
@@ -592,8 +596,8 @@
         <include refid="Base_Column_List"/>
         FROM dkic_b.t_mac_rec_pay
         WHERE flg_valid
-          and biznis_id = #{id}::uuid
-          and flg_order_handle = #{flgOrderHandle}
+        and biznis_id = #{id}::uuid
+        and flg_order_handle = #{flgOrderHandle}
         for update
     </select>
 
@@ -603,7 +607,7 @@
         <include refid="Base_Column_List"/>
         FROM dkic_b.t_mac_rec_pay
         WHERE flg_valid
-          and biznis_id = #{id}::uuid
+        and biznis_id = #{id}::uuid
     </select>
 
     <!-- 根据主键锁定表t_mac_rec_pay的多行数据 -->
@@ -684,51 +688,52 @@
     <!-- 查询表t_mac_rec_pay，（条件查询+分页）列表 -->
     <select id="selectPaymentByCond" resultMap="BaseResultMapResponse">
         select t.rp_id,
-               t.rp_no,
-               t.rp_type,
-               sys.f_get_name_i18n(tdk1.kind_name_i18n, #{i18n}) as "rpTypeName",
-               t.object_id,
-               tmp.sup_code         as "supCode",
-               tmp.sup_name         as "supName",
-               t.org_id,
-               tmo.org_name         as "orgName",
-               t.staff_id,
-               tms.staff_name       as "staffName",
-               t.sum_amt_rec,
-               t.sum_amt_pay,
-               t.sum_should_handle,
-               t.sum_use_receipt_residue,
-               t.sum_use_payment_residue,
-               t.sum_amt_receivable_handle,
-               t.sum_amt_payable_handle,
-               t.sum_waive_amt,
-               t.acc_date,
-               t.remarks,
-               t.annex_paths,
-               t.biznis_type,
-               t.biznis_id,
-               t.biznis_no,
-               t.flg_order_handle,
-               t.flg_lock,
-               t.make_staff,
-               makestaff.staff_name as "makeStaffName",
-               t.make_time,
-               t.flg_valid,
-               t.cp_id,
-               tma.payable_residue,
-               tma.payment_residue
+        t.rp_no,
+        t.rp_type,
+        sys.f_get_name_i18n(tdk1.kind_name_i18n, #{i18n}) as "rpTypeName",
+        t.object_id,
+        t.object_id as sup_id,
+        tmp.sup_code,
+        tmp.sup_name,
+        t.org_id,
+        tmo.org_name as "orgName",
+        t.staff_id,
+        tms.staff_name as "staffName",
+        t.sum_amt_rec,
+        t.sum_amt_pay,
+        t.sum_should_handle,
+        t.sum_use_receipt_residue,
+        t.sum_use_payment_residue,
+        t.sum_amt_receivable_handle,
+        t.sum_amt_payable_handle,
+        t.sum_waive_amt,
+        t.acc_date,
+        t.remarks,
+        t.annex_paths,
+        t.biznis_type,
+        t.biznis_id,
+        t.biznis_no,
+        t.flg_order_handle,
+        t.flg_lock,
+        t.make_staff,
+        makestaff.staff_name as "makeStaffName",
+        t.make_time,
+        t.flg_valid,
+        t.cp_id,
+        tma.payable_residue,
+        tma.payment_residue
         from dkic_b.t_mac_rec_pay as t
-                 Left join dkic_b.t_mst_supplier tmp on tmp.sup_id = t.object_id
-                 left join sys.t_data_kind as tdk1 on tdk1.kind_code = t.rp_type
-                 left join dkic_b.t_mst_org tmo on tmo.org_id = t.org_id
-                 left join dkic_b.t_mst_staff tms on tms.staff_id = t.staff_id
-                 left join dkic_b.t_mst_staff as makestaff on makestaff.staff_id = t.make_staff
-                 LEFT JOIN  dkic_b.t_mac_account tma  on tma.object_id = t.object_id and tma.object_type in ('对象类型-供应商')
+        Left join dkic_b.t_mst_supplier tmp on tmp.sup_id = t.object_id
+        left join sys.t_data_kind as tdk1 on tdk1.kind_code = t.rp_type
+        left join dkic_b.t_mst_org tmo on tmo.org_id = t.org_id
+        left join dkic_b.t_mst_staff tms on tms.staff_id = t.staff_id
+        left join dkic_b.t_mst_staff as makestaff on makestaff.staff_id = t.make_staff
+        LEFT JOIN dkic_b.t_mac_account tma on tma.object_id = t.object_id and tma.object_type in ('对象类型-供应商')
         where t.rp_type in ('收付款类型-付款', '收付款类型-退付款')
         <include refid="Condition"/>
         <if test="searchText !=null and searchText != ''">
             AND (
-            t.rp_no   LIKE concat('%',my_ex.likequery(#{searchText}),'%')
+            t.rp_no LIKE concat('%',my_ex.likequery(#{searchText}),'%')
             or tmo.org_name LIKE concat('%',my_ex.likequery(#{searchText}),'%')
             or tmp.sup_name LIKE concat('%',my_ex.likequery(#{searchText}),'%')
             or tms.staff_name LIKE concat('%',my_ex.likequery(#{searchText}),'%')
@@ -744,16 +749,16 @@
     <select id="countPaymentByCond" resultType="Long">
         SELECT count(1)
         from dkic_b.t_mac_rec_pay as t
-                 Left join dkic_b.t_mst_supplier tmp on tmp.sup_id = t.object_id
-                 left join sys.t_data_kind as tdk1 on tdk1.kind_code = t.rp_type
-                 left join dkic_b.t_mst_org tmo on tmo.org_id = t.org_id
-                 left join dkic_b.t_mst_staff tms on tms.staff_id = t.staff_id
-                 left join dkic_b.t_mst_staff as makestaff on makestaff.staff_id = t.make_staff
+        Left join dkic_b.t_mst_supplier tmp on tmp.sup_id = t.object_id
+        left join sys.t_data_kind as tdk1 on tdk1.kind_code = t.rp_type
+        left join dkic_b.t_mst_org tmo on tmo.org_id = t.org_id
+        left join dkic_b.t_mst_staff tms on tms.staff_id = t.staff_id
+        left join dkic_b.t_mst_staff as makestaff on makestaff.staff_id = t.make_staff
         where t.rp_type in ('收付款类型-付款', '收付款类型-退付款')
         <include refid="Condition"/>
         <if test="searchText !=null and searchText != ''">
             AND (
-            t.rp_no   LIKE concat('%',my_ex.likequery(#{searchText}),'%')
+            t.rp_no LIKE concat('%',my_ex.likequery(#{searchText}),'%')
             or tmo.org_name LIKE concat('%',my_ex.likequery(#{searchText}),'%')
             or tmp.sup_name LIKE concat('%',my_ex.likequery(#{searchText}),'%')
             or tms.staff_name LIKE concat('%',my_ex.likequery(#{searchText}),'%')
@@ -763,13 +768,12 @@
 
     <!-- 删除收款单 -->
     <delete id="deleteById">
-        DELETE FROM dkic_b.t_mac_rec_pay
+        DELETE
+        FROM dkic_b.t_mac_rec_pay
         WHERE rp_id = #{id}::uuid;
     </delete>
 
 
-
-
     <!-- 查询表t_mac_rec_pay，（条件查询+分页）列表 -->
     <select id="getRpSupList" resultMap="BaseResultMapResponse">
         select t.rp_id,
@@ -785,9 +789,9 @@
         tmsp.contact_phone,
         tmsp.return_address,
         t.org_id,
-        tmo.org_name         as "orgName",
+        tmo.org_name as "orgName",
         t.staff_id,
-        tms.staff_name       as "staffName",
+        tms.staff_name as "staffName",
         t.sum_amt_rec,
         t.sum_amt_pay,
         t.sum_should_handle,
@@ -817,15 +821,15 @@
         left join dkic_b.t_mst_org tmo on tmo.org_id = t.org_id
         left join dkic_b.t_mst_staff tms on tms.staff_id = t.staff_id
         left join dkic_b.t_mst_staff as makestaff on makestaff.staff_id = t.make_staff
-        LEFT JOIN  dkic_b.t_mac_account tma  on tma.object_id = t.object_id and tma.object_type in ('对象类型-供应商')
+        LEFT JOIN dkic_b.t_mac_account tma on tma.object_id = t.object_id and tma.object_type in ('对象类型-供应商')
         where t.rp_type in ('收付款类型-付款', '收付款类型-退付款')
         <include refid="Condition_sup"/>
         <if test="viewVoidedDocuments !=null and viewVoidedDocuments == false">
-            AND  t.flg_valid = true
+            AND t.flg_valid = true
         </if>
 
         <if test="searchText !=null and searchText != ''">
-            AND (  tmsp.contact_phone LIKE concat('%',my_ex.likequery(#{searchText}),'%')
+            AND ( tmsp.contact_phone LIKE concat('%',my_ex.likequery(#{searchText}),'%')
             or tmsp.return_address LIKE concat('%',my_ex.likequery(#{searchText}),'%')
             or tmsp.sup_name LIKE concat('%',my_ex.likequery(#{searchText}),'%')
             or tmo.org_name LIKE concat('%',my_ex.likequery(#{searchText}),'%')
@@ -851,7 +855,7 @@
         where t.rp_type in ('收付款类型-付款', '收付款类型-退付款')
         <include refid="Condition_sup"/>
         <if test="searchText !=null and searchText != ''">
-            AND (  tmsp.contact_phone LIKE concat('%',my_ex.likequery(#{searchText}),'%')
+            AND ( tmsp.contact_phone LIKE concat('%',my_ex.likequery(#{searchText}),'%')
             or tmsp.return_address LIKE concat('%',my_ex.likequery(#{searchText}),'%')
             or tmsp.sup_name LIKE concat('%',my_ex.likequery(#{searchText}),'%')
             or tmo.org_name LIKE concat('%',my_ex.likequery(#{searchText}),'%')
@@ -875,9 +879,9 @@
         tmsp.contact_phone,
         tmsp.return_address,
         t.org_id,
-        tmo.org_name         as "orgName",
+        tmo.org_name as "orgName",
         t.staff_id,
-        tms.staff_name       as "staffName",
+        tms.staff_name as "staffName",
         t.sum_amt_rec,
         t.sum_amt_pay,
         t.sum_should_handle,
@@ -909,17 +913,17 @@
         left join dkic_b.t_mst_org tmo on tmo.org_id = t.org_id
         left join dkic_b.t_mst_staff tms on tms.staff_id = t.staff_id
         left join dkic_b.t_mst_staff as makestaff on makestaff.staff_id = t.make_staff
-        LEFT JOIN  dkic_b.t_mac_account tma  on tma.object_id = t.object_id and tma.object_type in ('对象类型-供应商')
-        left  join   dkic_b.t_mac_rec_pay_item  rpi  on  rpi.rp_id = t.rp_id
-        left  join   dkic_b.t_mst_money_account tmma  on  tmma.mac_id = rpi.mac_id
+        LEFT JOIN dkic_b.t_mac_account tma on tma.object_id = t.object_id and tma.object_type in ('对象类型-供应商')
+        left join dkic_b.t_mac_rec_pay_item rpi on rpi.rp_id = t.rp_id
+        left join dkic_b.t_mst_money_account tmma on tmma.mac_id = rpi.mac_id
         where t.rp_type in ('收付款类型-付款', '收付款类型-退付款')
         <include refid="Condition_sup"/>
         <if test="viewVoidedDocuments !=null and viewVoidedDocuments == false">
-            AND  t.flg_valid = true
+            AND t.flg_valid = true
         </if>
 
         <if test="searchText !=null and searchText != ''">
-            AND (  tmsp.contact_phone LIKE concat('%',my_ex.likequery(#{searchText}),'%')
+            AND ( tmsp.contact_phone LIKE concat('%',my_ex.likequery(#{searchText}),'%')
             or tmsp.return_address LIKE concat('%',my_ex.likequery(#{searchText}),'%')
             or tmsp.sup_name LIKE concat('%',my_ex.likequery(#{searchText}),'%')
             or tmo.org_name LIKE concat('%',my_ex.likequery(#{searchText}),'%')
@@ -945,7 +949,7 @@
         where t.rp_type in ('收付款类型-付款', '收付款类型-退付款')
         <include refid="Condition_sup"/>
         <if test="searchText !=null and searchText != ''">
-            AND (  tmsp.contact_phone LIKE concat('%',my_ex.likequery(#{searchText}),'%')
+            AND ( tmsp.contact_phone LIKE concat('%',my_ex.likequery(#{searchText}),'%')
             or tmsp.return_address LIKE concat('%',my_ex.likequery(#{searchText}),'%')
             or tmsp.sup_name LIKE concat('%',my_ex.likequery(#{searchText}),'%')
             or tmo.org_name LIKE concat('%',my_ex.likequery(#{searchText}),'%')

src/main/java/com/dk/mdm/mapper/report/ReportMapper.xml

@@ -2305,10 +2305,10 @@
                 AND T.object_id = #{object_id}
             </if>
             <if test="cusName != null">
-                AND  tmc.cus_name = #{cusName}
+                AND  tmc.cus_name LIKE concat('%',my_ex.likequery(#{cusName}),'%')
             </if>
             <if test="cusPhone != null">
-                AND  tmc.cus_phone = #{cusPhone}
+                AND  tmc.cus_phone LIKE concat('%',my_ex.likequery(#{cusPhone}),'%')
             </if>
             <if test="accDateStart != null and accDateEnd != null">
                 AND T.acc_date &gt;= #{accDateStart}::timestamp with time zone

src/main/java/com/dk/mdm/model/query/mac/RecPayQuery.java

@@ -2,12 +2,13 @@ package com.dk.mdm.model.query.mac;
 
 import cn.afterturn.easypoi.excel.annotation.Excel;
 import com.alibaba.fastjson.JSONArray;
-import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.annotation.FieldFill;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.dk.common.infrastructure.annotaiton.ExportTitle;
-import com.dk.common.infrastructure.handler.*;
+import com.dk.common.infrastructure.handler.JsonTypeHandler;
+import com.dk.common.infrastructure.handler.TimestampTypeHandler;
+import com.dk.common.infrastructure.handler.UuidTypeHandler;
 import com.dk.common.model.pojo.PageInfo;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModel;
@@ -301,6 +302,9 @@ public class RecPayQuery extends PageInfo<RecPayQuery> implements Serializable {
 
     private Boolean viewVoidedDocuments;
 
+    @ApiModelProperty(value = "详细地址")
+    private String addressFull;
+
     private static final long serialVersionUID = 1L;
 
 }

src/main/java/com/dk/mdm/model/response/mac/OtherReceivableResponse.java

@@ -218,6 +218,9 @@ public class OtherReceivableResponse extends PageInfo<OtherReceivableResponse> i
     @ApiModelProperty(value = "大编辑标识")
     private Boolean daEdit;
 
+    @ApiModelProperty(value = "联系人")
+    private String contactName;
+
     private static final long serialVersionUID = 1L;
 
 }