Commit e2069d5f authored by 刘林's avatar 刘林

Merge remote-tracking branch 'origin/develop_tzs_register_to_0715' into…

Merge remote-tracking branch 'origin/develop_tzs_register_to_0715' into develop_tzs_register_to_0715
parents 55c7b3ac b6ef5f71
...@@ -23,14 +23,9 @@ ...@@ -23,14 +23,9 @@
tjurm.use_registration_code AS useRegistrationCode, tjurm.use_registration_code AS useRegistrationCode,
tjurm.use_unit_credit_code AS useUnitCreditCode, tjurm.use_unit_credit_code AS useUnitCreditCode,
tjurm.receive_company_code AS receiveCompanyCode, tjurm.receive_company_code AS receiveCompanyCode,
tjurm.use_registration_certificate_param AS useRegistrationCertificateParam,
tjurm.certificate_no AS certificateNo, tjurm.certificate_no AS certificateNo,
tjurm.use_flag_certificate_param AS useFlagCertificateParam,
tjurm.equ_category AS equCategory, tjurm.equ_category AS equCategory,
tjurm.equ_use_address AS equUseAddress, tjurm.equ_use_address AS equUseAddress
tjurm.equ_code AS equCode,
tjurm.use_inner_code AS useInnerCode,
tjurm.factory_num AS factoryNum
</sql> </sql>
...@@ -70,11 +65,11 @@ ...@@ -70,11 +65,11 @@
</if> </if>
-- 使用登记证编号 -- 使用登记证编号
<if test="dto.useRegistrationCode != null and dto.useRegistrationCode != ''"> <if test="dto.useRegistrationCode != null and dto.useRegistrationCode != ''">
and tjurm.use_registration_code = #{dto.useRegistrationCode} and tjurm.use_registration_code like #{dto.useRegistrationCode}
</if> </if>
-- 申请单号 -- 申请单号
<if test="dto.applyNo != null and dto.applyNo != ''"> <if test="dto.applyNo != null and dto.applyNo != ''">
and tjurm.apply_no = #{dto.applyNo} and tjurm.apply_no like #{dto.applyNo}
</if> </if>
<if test="dto.auditPassDate != null and dto.auditPassDate != ''"> <if test="dto.auditPassDate != null and dto.auditPassDate != ''">
and tjurm.audit_pass_date like concat('%',DATE_FORMAT(#{dto.auditPassDate},'%Y-%m-%d'),'%') and tjurm.audit_pass_date like concat('%',DATE_FORMAT(#{dto.auditPassDate},'%Y-%m-%d'),'%')
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment