Merge branch 'master' of http://git.lionquexpress.com/wuweihua/BMS
This commit is contained in:
wuweihua
@@ -36,4 +36,34 @@
|
||||
and status = '0'
|
||||
order by is_default desc, bank_account_id limit 1
|
||||
</select>
|
||||
|
||||
<sql id="enabledColumns">
|
||||
select bank_account_id,
|
||||
account_name,
|
||||
account_no,
|
||||
bank_name,
|
||||
currency,
|
||||
is_default,
|
||||
status,
|
||||
remark,
|
||||
create_by,
|
||||
create_time,
|
||||
update_by,
|
||||
update_time
|
||||
from ar_bank_account
|
||||
where status = '0'
|
||||
</sql>
|
||||
|
||||
<select id="selectEnabledById" resultMap="ArBankAccountResult">
|
||||
<include refid="enabledColumns"/>
|
||||
and bank_account_id = #{bankAccountId}
|
||||
</select>
|
||||
|
||||
<select id="selectEnabledList" resultMap="ArBankAccountResult">
|
||||
<include refid="enabledColumns"/>
|
||||
<if test="currency != null and currency != ''">
|
||||
and currency = #{currency}
|
||||
</if>
|
||||
order by is_default desc, currency asc, bank_account_id asc
|
||||
</select>
|
||||
</mapper>
|
||||
|
||||
@@ -363,7 +363,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
||||
<result property="registeredCity" column="registered_city" />
|
||||
<result property="registeredDistrict" column="registered_district" />
|
||||
<result property="registeredAddressDetail" column="registered_address_detail" />
|
||||
<result property="businessLicenseOssId" column="business_license_oss_id" />
|
||||
<result property="businessLicenseUrl" column="business_license_url" />
|
||||
<result property="attachmentIds" column="attachment_ids" />
|
||||
<result property="remark" column="remark" />
|
||||
<result property="createBy" column="create_by" />
|
||||
@@ -374,7 +374,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
||||
</resultMap>
|
||||
|
||||
<sql id="selectBmsCustomerCompanyVo">
|
||||
select company_id, customer_id, company_name_full, english_name, credit_code, legal_person, legal_person_phone, legal_person_id_card, registered_capital, capital_currency, paid_in_capital, establish_date, business_term_start, business_term_end, business_term_permanent, registration_authority, registration_number, operating_status, business_scope, shareholders, employee_count, company_phone, company_fax, company_website, company_email, registered_province, registered_city, registered_district, registered_address_detail, business_license_oss_id, attachment_ids, remark, create_by, create_time, update_by, update_time, del_flag from bms_customer_company
|
||||
select company_id, customer_id, company_name_full, english_name, credit_code, legal_person, legal_person_phone, legal_person_id_card, registered_capital, capital_currency, paid_in_capital, establish_date, business_term_start, business_term_end, business_term_permanent, registration_authority, registration_number, operating_status, business_scope, shareholders, employee_count, company_phone, company_fax, company_website, company_email, registered_province, registered_city, registered_district, registered_address_detail, business_license_url, attachment_ids, remark, create_by, create_time, update_by, update_time, del_flag from bms_customer_company
|
||||
</sql>
|
||||
|
||||
<select id="selectBmsCustomerCompanyList" parameterType="com.ruoyi.customer.customerinfo.domain.BmsCustomerCompany" resultMap="BmsCustomerCompanyResult">
|
||||
@@ -426,7 +426,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
||||
<if test="registeredCity != null">registered_city,</if>
|
||||
<if test="registeredDistrict != null">registered_district,</if>
|
||||
<if test="registeredAddressDetail != null">registered_address_detail,</if>
|
||||
<if test="businessLicenseOssId != null">business_license_oss_id,</if>
|
||||
<if test="businessLicenseUrl != null">business_license_url,</if>
|
||||
<if test="attachmentIds != null">attachment_ids,</if>
|
||||
<if test="remark != null">remark,</if>
|
||||
<if test="createBy != null">create_by,</if>
|
||||
@@ -462,7 +462,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
||||
<if test="registeredCity != null">#{registeredCity},</if>
|
||||
<if test="registeredDistrict != null">#{registeredDistrict},</if>
|
||||
<if test="registeredAddressDetail != null">#{registeredAddressDetail},</if>
|
||||
<if test="businessLicenseOssId != null">#{businessLicenseOssId},</if>
|
||||
<if test="businessLicenseUrl != null">#{businessLicenseUrl},</if>
|
||||
<if test="attachmentIds != null">#{attachmentIds},</if>
|
||||
<if test="remark != null">#{remark},</if>
|
||||
<if test="createBy != null">#{createBy},</if>
|
||||
@@ -502,7 +502,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
||||
<if test="registeredCity != null">registered_city = #{registeredCity},</if>
|
||||
<if test="registeredDistrict != null">registered_district = #{registeredDistrict},</if>
|
||||
<if test="registeredAddressDetail != null">registered_address_detail = #{registeredAddressDetail},</if>
|
||||
<if test="businessLicenseOssId != null">business_license_oss_id = #{businessLicenseOssId},</if>
|
||||
<if test="businessLicenseUrl != null">business_license_url = #{businessLicenseUrl},</if>
|
||||
<if test="attachmentIds != null">attachment_ids = #{attachmentIds},</if>
|
||||
<if test="remark != null">remark = #{remark},</if>
|
||||
<if test="updateBy != null">update_by = #{updateBy},</if>
|
||||
|
||||
@@ -247,6 +247,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
||||
<result property="rateSourceDesc" column="rate_source_desc" />
|
||||
<result property="baseAmount" column="base_amount" />
|
||||
<result property="payMethod" column="pay_method" />
|
||||
<result property="bankAccountId" column="bank_account_id" />
|
||||
<result property="bankAccountName" column="bank_account_name" />
|
||||
<result property="bankAccountNo" column="bank_account_no" />
|
||||
<result property="bankName" column="bank_name" />
|
||||
<result property="bankTransactionNo" column="bank_transaction_no" />
|
||||
<result property="receivedAt" column="received_at" />
|
||||
<result property="status" column="status" />
|
||||
@@ -266,7 +270,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
||||
<sql id="selectCustomerReceiptVo">
|
||||
select r.id, r.receipt_no, r.customer_id, r.account_id, r.receipt_type, r.amount, r.allocated_amount,
|
||||
r.unallocated_amount, r.currency, r.exchange_rate, r.rate_source, r.rate_source_desc,
|
||||
r.base_amount, r.pay_method, r.bank_transaction_no,
|
||||
r.base_amount, r.pay_method, r.bank_account_id, r.bank_account_name,
|
||||
r.bank_account_no, r.bank_name, r.bank_transaction_no,
|
||||
r.received_at, r.status,
|
||||
r.confirmed_at, r.confirmed_by, r.invoice_status, r.version, r.create_by, r.create_time,
|
||||
r.update_by, r.update_time, r.remark, r.del_flag,
|
||||
@@ -322,6 +327,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
||||
<if test="rateSourceDesc != null">rate_source_desc,</if>
|
||||
<if test="baseAmount != null">base_amount,</if>
|
||||
<if test="payMethod != null">pay_method,</if>
|
||||
<if test="bankAccountId != null">bank_account_id,</if>
|
||||
<if test="bankAccountName != null">bank_account_name,</if>
|
||||
<if test="bankAccountNo != null">bank_account_no,</if>
|
||||
<if test="bankName != null">bank_name,</if>
|
||||
<if test="bankTransactionNo != null">bank_transaction_no,</if>
|
||||
<if test="receivedAt != null">received_at,</if>
|
||||
<if test="status != null">status,</if>
|
||||
@@ -347,6 +356,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
||||
<if test="rateSourceDesc != null">#{rateSourceDesc},</if>
|
||||
<if test="baseAmount != null">#{baseAmount},</if>
|
||||
<if test="payMethod != null">#{payMethod},</if>
|
||||
<if test="bankAccountId != null">#{bankAccountId},</if>
|
||||
<if test="bankAccountName != null">#{bankAccountName},</if>
|
||||
<if test="bankAccountNo != null">#{bankAccountNo},</if>
|
||||
<if test="bankName != null">#{bankName},</if>
|
||||
<if test="bankTransactionNo != null">#{bankTransactionNo},</if>
|
||||
<if test="receivedAt != null">#{receivedAt},</if>
|
||||
<if test="status != null">#{status},</if>
|
||||
|
||||
Reference in New Issue
Block a user