diff --git a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/domain/EnterpriseEvaluate.java b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/domain/EnterpriseEvaluate.java index 9646592a..a594b64f 100644 --- a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/domain/EnterpriseEvaluate.java +++ b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/domain/EnterpriseEvaluate.java @@ -110,7 +110,18 @@ public class EnterpriseEvaluate extends BaseDomain */ public Integer problem5; + /** + * 执法态度 + */ + public Integer checkAttitude; + public Integer getCheckAttitude() { + return checkAttitude; + } + + public void setCheckAttitude(Integer checkAttitude) { + this.checkAttitude = checkAttitude; + } public String getBatchId() { return batchId; diff --git a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/resources/mapper/EnterpriseEvaluateMapper.xml b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/resources/mapper/EnterpriseEvaluateMapper.xml index 58ea5064..df9e6a73 100644 --- a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/resources/mapper/EnterpriseEvaluateMapper.xml +++ b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/resources/mapper/EnterpriseEvaluateMapper.xml @@ -29,12 +29,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + select id, enforcement_name, enforcement_id, evaluate_description, linkman, linkman_tel, authorization, create_time,inspection_efficiency ,check_effect,check_quality ,service_experience,check_effectiveness,procedural_legality, - batch_id,satisfaction_level,other_problem_switch,problem1,problem2,problem3,problem4,problem5 from enterprise_evaluate + batch_id,satisfaction_level,other_problem_switch,problem1,problem2,problem3,problem4,problem5,check_attitude + from enterprise_evaluate @@ -104,6 +107,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" problem3, problem4, problem5, + check_attitude, #{id}, @@ -128,6 +132,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" #{problem3}, #{problem4}, #{problem5}, + #{checkAttitude}, @@ -155,6 +160,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" problem3 = #{problem3}, problem4 = #{problem4}, problem5 = #{problem5}, + check_attitude=#{checkAttitude}, where id = #{id} diff --git a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/resources/mapper/NonEnforcementRegistrationMapper.xml b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/resources/mapper/NonEnforcementRegistrationMapper.xml index 877ee945..242966aa 100644 --- a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/resources/mapper/NonEnforcementRegistrationMapper.xml +++ b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/resources/mapper/NonEnforcementRegistrationMapper.xml @@ -164,7 +164,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" ) - and law_enforcement_item_text like concat('%', #{lawEnforcementItemText}, '%') + and law_enforcement_item_text like concat('%', #{lawEnforcementItemText}, '%') + + + and enterprise_name like concat('%', #{enterpriseName}, '%') and law_enforcement_type =#{lawEnforcementType}