diff --git a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/resources/mapper/ComprehensiveAnalysisMapper.xml b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/resources/mapper/ComprehensiveAnalysisMapper.xml index 80f76153..743debc3 100644 --- a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/resources/mapper/ComprehensiveAnalysisMapper.xml +++ b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/resources/mapper/ComprehensiveAnalysisMapper.xml @@ -22,6 +22,7 @@ and r.enterprise_number is not null and r.check_category is not null + and r.is_submit=1 and( r.law_enforcer_id=#{userId} or r.law_enforcer_id_two like concat('%',#{userId}, '%')) @@ -59,6 +60,7 @@ and r.enterprise_number is not null and r.check_category is not null + and r.is_submit=1 and( r.law_enforcer_id=#{userId} or r.law_enforcer_id_two like concat('%',#{userId}, '%')) @@ -96,6 +98,7 @@ and r.enterprise_number is not null and r.check_category is not null + and r.is_submit=1 and( r.law_enforcer_id=#{userId} or r.law_enforcer_id_two like concat('%',#{userId}, '%')) diff --git a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/resources/mapper/EnforcementCheckStatisticsMapper.xml b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/resources/mapper/EnforcementCheckStatisticsMapper.xml index 1530e9d2..381edd6e 100644 --- a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/resources/mapper/EnforcementCheckStatisticsMapper.xml +++ b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/resources/mapper/EnforcementCheckStatisticsMapper.xml @@ -64,6 +64,7 @@ and e.is_complaint is not null and e.check_category is not null and e.bureau_dept_id is not null + and e.is_submit=1 and (i.enterprise_address like concat('深圳市',substring_index(#{qy}, "区",1), '区%')or i.enterprise_address like concat('深圳市',substring_index(#{qy}, "区",1), '新区%')) diff --git a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/resources/mapper/EnforcementRegistrationMapper.xml b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/resources/mapper/EnforcementRegistrationMapper.xml index b2b2c92b..aadbbae1 100644 --- a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/resources/mapper/EnforcementRegistrationMapper.xml +++ b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/resources/mapper/EnforcementRegistrationMapper.xml @@ -278,6 +278,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" bureau_dept_id,bureau_dept_name,is_evaluate, law_id, law_text, count( enterprise_number ) AS num from enforcement_registration + and is_submit=1 and enterprise_id = #{enterpriseId} and enterprise_name like concat('%', #{enterpriseName}, '%') and enterprise_number = #{enterpriseNumber} @@ -361,6 +362,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" select name, zzjgdm, #{zfdw} as zfdw, sub_name, zfcode, sfzcode_encrypt,x.dept_id as deptId,phoneNumber as phoneNumber,ancestors as ancestors, - (select count(*) from enforcement_registration where law_enforcer_id=x.user_id or law_enforcer_id_two=x.user_id) as number from + (select count(*) from enforcement_registration where (law_enforcer_id=x.user_id or law_enforcer_id_two=x.user_id) and is_submit=1) as number from (select* from (select name, zzjgdm, zfdw, sub_name, zfcode, sfzcode_encrypt from zfryjdm2405301