Browse Source

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

dev
zhuibobo 2 months ago
parent
commit
a80700f910
  1. 4
      zdxt-modules/zdxt-enforcement-code/src/main/resources/mapper/enforcementcode/ComprehensiveAnalysisMapper.xml

4
zdxt-modules/zdxt-enforcement-code/src/main/resources/mapper/enforcementcode/ComprehensiveAnalysisMapper.xml

@ -41,10 +41,8 @@
</where>
</select>
<select id="primarySectionA" parameterType="com.zdxt.enforcementcode.domain.bo.ComprehensiveAnalysisBo" resultMap="ComprehensiveAnalysisResult">
select r.check_category,r.law_enforce_category, e.company_org_type,r.enterprise_number,r.enterprise_name,e.enterprise_address,r.bureau_dept_id,r.bureau_dept_name
select r.check_category,r.law_enforce_category,r.enterprise_number,r.enterprise_name,r.bureau_dept_id,r.bureau_dept_name
from enforcement_registration r
left join (select * from enterprise_information group by enterprise_number) e
on r.enterprise_number = e.enterprise_number
<where>
and r.enterprise_number is not null
and r.check_category is not null

Loading…
Cancel
Save