diff --git a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/controller/app/enforcement/AppEnfCaseInfoController.java b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/controller/app/enforcement/AppEnfCaseInfoController.java index 6f8153d4..a0257499 100644 --- a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/controller/app/enforcement/AppEnfCaseInfoController.java +++ b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/controller/app/enforcement/AppEnfCaseInfoController.java @@ -36,7 +36,6 @@ public class AppEnfCaseInfoController { /** * 查询【历史检查信息】列表 */ - @SaIgnore @GetMapping("/queryXzjcList") public TableDataInfo queryXzjcList(SxtJcdzb107522Bo bo, PageQuery pageQuery) { @@ -46,7 +45,6 @@ public class AppEnfCaseInfoController { /** * 查询【历史强制案件】列表 */ - @SaIgnore @GetMapping("/queryXzqzList") public TableDataInfo queryXzqzList(SxtXzqzjbxx173774Bo bo, PageQuery pageQuery) { @@ -57,7 +55,6 @@ public class AppEnfCaseInfoController { /** * 查询【历史处罚案件】列表 */ - @SaIgnore @GetMapping("/queryXzcfList") public TableDataInfo queryXzcfList(SxtXzcfajjbxx026705Bo bo, PageQuery pageQuery) { diff --git a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/domain/bo/SxtJcdzb107522Bo.java b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/domain/bo/SxtJcdzb107522Bo.java index a344d086..37ea4e9d 100644 --- a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/domain/bo/SxtJcdzb107522Bo.java +++ b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/domain/bo/SxtJcdzb107522Bo.java @@ -252,6 +252,11 @@ public class SxtJcdzb107522Bo extends BaseEntity { */ private Long updatestatus; + /** + * 当事人证件号码(用于关联查询条件) + */ + private String c601034; + /** * 非业务主键 */ diff --git a/zdxt-modules/zdxt-enforcement-code/src/main/resources/mapper/enforcementcode/ComprehensiveAnalysisMapper.xml b/zdxt-modules/zdxt-enforcement-code/src/main/resources/mapper/enforcementcode/ComprehensiveAnalysisMapper.xml index f4ebfbd1..04c95bff 100644 --- a/zdxt-modules/zdxt-enforcement-code/src/main/resources/mapper/enforcementcode/ComprehensiveAnalysisMapper.xml +++ b/zdxt-modules/zdxt-enforcement-code/src/main/resources/mapper/enforcementcode/ComprehensiveAnalysisMapper.xml @@ -81,7 +81,7 @@ select r.check_category, e.company_org_type,r.enterprise_address from enforcement_registration r - left join (select * from enterprise_information group by enterprise_number) e + left join (SELECT enterprise_number, ANY_VALUE(id) AS id, ANY_VALUE(enterprise_name) AS enterprise_name, ANY_VALUE(enterprise_type) AS enterprise_type, ANY_VALUE(enterprise_address) AS enterprise_address, ANY_VALUE(legal_person) AS legal_person, ANY_VALUE(registered_capital) AS registered_capital, ANY_VALUE(establishment_time) AS establishment_time, ANY_VALUE(operating_term) AS operating_term, ANY_VALUE(business_scope) AS business_scope, ANY_VALUE(user_id) AS user_id, ANY_VALUE(dept_id) AS dept_id, ANY_VALUE(qr_code_id) AS qr_code_id, ANY_VALUE(last_qr_code_time) AS last_qr_code_time, ANY_VALUE(is_unsubscribe) AS is_unsubscribe, ANY_VALUE(is_delete) AS is_delete, ANY_VALUE(salt) AS salt, ANY_VALUE(enterprise_tel) AS enterprise_tel, ANY_VALUE(company_org_type) AS company_org_type, ANY_VALUE(industry) AS industry, ANY_VALUE(operating_term_end) AS operating_term_end, ANY_VALUE(create_time) AS create_time, ANY_VALUE(update_time) AS update_time FROM enterprise_information GROUP BY enterprise_number) e on r.enterprise_number = e.enterprise_number and r.enterprise_number is not null @@ -263,7 +263,7 @@