Browse Source

修改评价、非行政执法bug

v6
Chendy 1 year ago
parent
commit
5e4f00536a
  1. 11
      lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/domain/EnterpriseEvaluate.java
  2. 8
      lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/resources/mapper/EnterpriseEvaluateMapper.xml
  3. 5
      lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/resources/mapper/NonEnforcementRegistrationMapper.xml

11
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;

8
lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/resources/mapper/EnterpriseEvaluateMapper.xml

@ -29,12 +29,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<result property="problem3" column="problem3" />
<result property="problem4" column="problem4" />
<result property="problem5" column="problem5" />
<result property="checkAttitude" column="check_attitude" />
</resultMap>
<!-- ,enterprise_number,enterprise_name-->
<sql id="selectEnterpriseEvaluateVo">
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
</sql>
<select id="selectEnterpriseEvaluateList" parameterType="EnterpriseEvaluate" resultMap="EnterpriseEvaluateResult">
@ -61,6 +63,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="problem3 != null "> and problem3 = #{problem3}</if>
<if test="problem4 != null "> and problem4 = #{problem4}</if>
<if test="problem5 != null "> and problem5 = #{problem5}</if>
<if test="checkAttitude != null "> and check_attitude = #{checkAttitude}</if>
</where>
</select>
@ -104,6 +107,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="problem3 != null ">problem3,</if>
<if test="problem4 != null ">problem4,</if>
<if test="problem5 != null ">problem5,</if>
<if test="checkAttitude != null ">check_attitude,</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="id != null and id != ''">#{id},</if>
@ -128,6 +132,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="problem3 != null ">#{problem3},</if>
<if test="problem4 != null ">#{problem4},</if>
<if test="problem5 != null ">#{problem5},</if>
<if test="checkAttitude != null ">#{checkAttitude},</if>
</trim>
</insert>
@ -155,6 +160,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="problem3 != null ">problem3 = #{problem3},</if>
<if test="problem4 != null ">problem4 = #{problem4},</if>
<if test="problem5 != null ">problem5 = #{problem5},</if>
<if test="checkAttitude != null ">check_attitude=#{checkAttitude},</if>
</trim>
where id = #{id}
</update>

5
lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/resources/mapper/NonEnforcementRegistrationMapper.xml

@ -164,7 +164,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
)
</if>
<if test="lawEnforcementItemText != null and lawEnforcementItemText != ''">
and law_enforcement_item_text like concat('%', #{lawEnforcementItemText}, '%')
and law_enforcement_item_text like concat('%', #{lawEnforcementItemText}, '%')
</if>
<if test="enterpriseName != null and enterpriseName != ''">
and enterprise_name like concat('%', #{enterpriseName}, '%')
</if>
<if test="lawEnforcementType !=null">
and law_enforcement_type =#{lawEnforcementType}

Loading…
Cancel
Save