Merge remote-tracking branch 'refs/remotes/origin/dev' into nanguangmall

mhd_finance/src/main/resources/mapper/accountManage/AccountCashWalletMapper.xml

@@ -12,9 +12,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </sql>
 
     <!--<update id="updateCreditLimit">
-        UPDATE `account_cash_wallet` SET `credit_limit` =
+        UPDATE account_cash_wallet SET credit_limit =
             CASE
-                WHEN `credit_limit` - #{creditLimit} >= 0 THEN `credit_limit` - #{creditLimit}
+                WHEN credit_limit - #{creditLimit} >= 0 THEN credit_limit - #{creditLimit}
                 ELSE credit_limit
             END
         WHERE user_id = #{userId}

mhd_finance/src/main/resources/mapper/businessDocument/BusinessDocumentMapper.xml

@@ -148,7 +148,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         COUNT( 1 ) waybillCount,
         waybill_source_name
         FROM
-        `business_document`
+        business_document
         where del_flag = 1
         <include refid="selectBusinessDocumentPo1"/>
         GROUP BY
@@ -178,7 +178,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
       	SELECT
 			a.*
 		FROM
-			`business_document` a
+			business_document a
 			LEFT JOIN reconciliation_business_document c ON a.business_document_id = c.business_document_id
 			LEFT JOIN reconciliation d ON c.reconciliation_id = d.reconciliation_id
 		WHERE

mhd_finance/src/main/resources/mapper/businessDocumentDetali/BusinessDocumentDetaliMapper.xml

@@ -252,7 +252,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         SELECT
 			a.*
 		FROM
-			`business_document_detali` a
+			business_document_detali a
 			LEFT JOIN reconciliation_business_document c ON a.business_document_id = c.business_document_id
 			LEFT JOIN reconciliation d ON c.reconciliation_id = d.reconciliation_id
 		WHERE

mhd_finance/src/main/resources/mapper/loanManage/LoanManageMapper.xml

@@ -506,7 +506,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         SELECT
             image_url
         FROM
-            `loan_image`
+            loan_image
         WHERE
             loan_id =  #{values} and del_flag = 1
     </select>

mhd_finance/src/main/resources/mapper/ncLog/NcLogMapper.xml

@@ -0,0 +1,54 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.linke.finance.domain.ncLog.repository.mapper.NcLogMapper">
+
+    <resultMap type="com.linke.finance.domain.ncLog.repository.po.NcLogPO" id="NcLogResult">
+        <result property="ncLogId"    column="nc_log_id"    />
+        <result property="type"    column="type"    />
+        <result property="orderId"    column="order_id"    />
+        <result property="requestBody"    column="request_body"    />
+        <result property="responeBody"    column="respone_body"    />
+        <result property="delFlag"    column="del_flag"    />
+        <result property="organizationId"    column="organization_id"    />
+        <result property="topOrganizationId"    column="top_organization_id"    />
+        <result property="organizationName"    column="organization_name"    />
+    </resultMap>
+
+
+    <sql id="selectNcLogPo">
+        select nc_log_id, type, order_id, request_body, respone_body, del_flag, organization_id, top_organization_id, organization_name from nc_log
+    </sql>
+
+    <sql id="selectNcLogPo1">
+        <where>
+        <if test="type != null ">
+            and type = #{type}
+        </if>
+        <if test="orderId != null ">
+            and order_id = #{orderId}
+        </if>
+        <if test="requestBody != null  and requestBody != ''">
+            and request_body = #{requestBody}
+        </if>
+        <if test="responeBody != null  and responeBody != ''">
+            and respone_body = #{responeBody}
+        </if>
+        <if test="organizationId != null ">
+            and organization_id = #{organizationId}
+        </if>
+        <if test="topOrganizationId != null ">
+            and top_organization_id = #{topOrganizationId}
+        </if>
+        <if test="organizationName != null  and organizationName != ''">
+            and organization_name like concat('%', #{organizationName}, '%')
+        </if>
+        </where>
+    </sql>
+
+    <select id="queryList" parameterType="com.linke.finance.domain.ncLog.repository.todo.NcLogDO" resultMap="NcLogResult">
+        <include refid="selectNcLogPo"/>
+        <include refid="selectNcLogPo1"/>
+    </select>
+</mapper>

mhd_finance/src/main/resources/mapper/reconciliation/ReconciliationMapper.xml

@@ -48,6 +48,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             a.del_flag =1
          <if test="invoiceApplyStatus != null ">
                 and a.invoice_apply_status = #{invoiceApplyStatus}
+         </if> <if test="synchronousStatus != null ">
+                and a.synchronous_status = #{synchronousStatus}
+         </if> <if test="skSynchronousStatus != null ">
+                and a.sk_synchronous_status = #{skSynchronousStatus}
          </if>
         <if test="verificationMoney != null ">
             and a.verification_money = #{verificationMoney}

mhd_finance/src/main/resources/mapper/verification/VerificationMapper.xml

@@ -1110,7 +1110,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             a.verification_money,
             a.first_subject_name,
             a.second_subject_name,
-            a.verification_money,
             a.create_by_name,
             b.create_by_name record_create_by_name,
             a.verification_status