Merge remote-tracking branch 'origin/dev' into dev

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

@@ -292,7 +292,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             #{departmentName},
             #{userId},
             #{shipperName},
-            #{waybillSource},
+            <if test="waybillSource == null">DEFAULT</if>
+            <if test="waybillSource != null">#{waybillSource}</if>,
             #{waybillSourceName},
             #{reconciliationStart},
             #{reconciliationEnd},
@@ -303,8 +304,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             #{receivable},
             #{actualReceivable},
             #{uncollectedReceivable},
-            #{collectionState},
-            #{auditState},
+            <if test="collectionState == null">DEFAULT</if>
+            <if test="collectionState != null">#{collectionState}</if>,
+            <if test="auditState == null">DEFAULT</if>
+            <if test="auditState != null">#{auditState}</if>,
             #{createTime},
             #{createBy},
             #{createByName},
@@ -328,23 +331,28 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             #{invoiceApplyStatus},
             #{invoiceInfoId},
             #{auditNumber},
-            #{auditStatus},
+            <if test="auditStatus == null">DEFAULT</if>
+            <if test="auditStatus != null">#{auditStatus}</if>,
             #{auditType},
             #{auditRemark},
             #{instanceId},
-            #{approvalStatus},
+            <if test="approvalStatus == null">DEFAULT</if>
+            <if test="approvalStatus != null">#{approvalStatus}</if>,
             #{approvalResult},
-            #{isInvoice},
+            <if test="isInvoice == null">DEFAULT</if>
+            <if test="isInvoice != null">#{isInvoice}</if>,
             #{invoiceId},
             #{invoiceMakeTime},
             #{applyNumber},
-            #{synchronousStatus},
+            <if test="synchronousStatus == null">DEFAULT</if>
+            <if test="synchronousStatus != null">#{synchronousStatus}</if>,
             #{synchronousTime},
             #{ncId},
-            #{skSynchronousStatus},
+            <if test="skSynchronousStatus == null">DEFAULT</if>
+            <if test="skSynchronousStatus != null">#{skSynchronousStatus}</if>,
             #{skSynchronousTime},
             #{skNcId},
             #{accountInformation}
         )
     </insert>
-</mapper>
+</mapper>