chenrui
/
zdxtLawEnforcementCode
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

补充权限注解，新增查询字段

v4
chenrui 2 years ago
parent
d35b83a671
commit
d73a1b92c0
4 changed files with 105 additions and 53 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 1
      lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/domain/EnforcementRegistration.java
  2. 41
      lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/domain/StatisticsIndicatorPart.java
  3. 1
      lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/impl/StatisticalPaneServiceImpl.java
  4. 115
      lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/resources/mapper/EnforcementRegistrationMapper.xml

1
lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/domain/EnforcementRegistration.java
View File

@ -183,6 +183,7 @@ public class EnforcementRegistration extends BaseDomain
/** 是否牵头单位 */ /** 是否牵头单位 */
private int uniteType; private int uniteType;
public String getDeptQx() { public String getDeptQx() {
return deptQx; return deptQx;
} }

41
lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/domain/StatisticsIndicatorPart.java
View File

@ -53,6 +53,23 @@ public class StatisticsIndicatorPart extends BaseDomain {
private String beginTime; private String beginTime;
private String endTime; private String endTime;
/**
* 是否全部数据权限
*/
private String isAllData;
/**
* 区 搜索条件
*/
private String region;
/**
* 街道 搜索条件
*/
private String street;
public String getName() { public String getName() {
return name; return name;
} }
@ -180,4 +197,28 @@ public class StatisticsIndicatorPart extends BaseDomain {
public void setHuanValue(Double huanValue) { public void setHuanValue(Double huanValue) {
this.huanValue = huanValue; this.huanValue = huanValue;
} }
public String getRegion() {
return region;
}
public void setRegion(String region) {
this.region = region;
}
public String getStreet() {
return street;
}
public void setStreet(String street) {
this.street = street;
}
public String getIsAllData() {
return isAllData;
}
public void setIsAllData(String isAllData) {
this.isAllData = isAllData;
}
} }

1
lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/impl/StatisticalPaneServiceImpl.java
View File

@ -380,6 +380,7 @@ public class StatisticalPaneServiceImpl implements StatisticalPaneService {
@DataScope @DataScope
@Override @Override
public StatisticsIndicatorPart registrationNew(StatisticsIndicatorPart statisticsIndicatorPart) { public StatisticsIndicatorPart registrationNew(StatisticsIndicatorPart statisticsIndicatorPart) {
//获取当前用户所在执法部门ID //获取当前用户所在执法部门ID
String deptId = takeDeptId(); String deptId = takeDeptId();
//获取当前部门执法数据 //获取当前部门执法数据

115
lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/resources/mapper/EnforcementRegistrationMapper.xml
View File

@ -154,59 +154,68 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
order by enforcement_time desc order by enforcement_time desc
</select> </select>
<select id="selectEnforcementRegistrationList1" parameterType="EnforcementRegistration" resultMap="EnforcementRegistrationResult"> <select id="selectEnforcementRegistrationList1" parameterType="EnforcementRegistration" resultMap="EnforcementRegistrationResult">
<include refid="selectEnforcementRegistrationVo"/> <include refid="selectEnforcementRegistrationVo"/>
<where> <where>
and bureau_dept_name is not null and bureau_dept_name is not null
and law_enforcement_id is not null and law_enforcement_id is not null
and enterprise_name is not null and enterprise_name is not null
and enterprise_number is not null and enterprise_number is not null
and law_enforcer is not null and law_enforcer is not null
and law_enforcer_two is not null and law_enforcer_two is not null
and is_complaint is not null and is_complaint is not null
and check_category is not null and check_category is not null
and bureau_dept_id is not null and bureau_dept_id is not null
<if test="deptQx != null and deptQx != ''">and bureau_dept_id =#{deptQx}</if> <if test="deptQx != null and deptQx != ''">and bureau_dept_id =#{deptQx}</if>
<if test="lawEnforcement != null and lawEnforcement != ''"> and law_enforcement like concat('%', #{lawEnforcement}, '%')</if> <if test="lawEnforcement != null and lawEnforcement != ''"> and law_enforcement like concat('%', #{lawEnforcement}, '%')</if>
<if test="bureauDeptName != null and bureauDeptName != ''"> and bureau_dept_name like concat('%', #{bureauDeptName}, '%')</if> <if test="bureauDeptName != null and bureauDeptName != ''"> and bureau_dept_name like concat('%', #{bureauDeptName}, '%')</if>
<if test="lawEnforcementId != null and lawEnforcementId != ''"> and law_enforcement_id = #{lawEnforcementId}</if> <if test="lawEnforcementId != null and lawEnforcementId != ''"> and law_enforcement_id = #{lawEnforcementId}</if>
<if test="enterpriseId != null and enterpriseId != ''"> and enterprise_id = #{enterpriseId}</if> <if test="enterpriseId != null and enterpriseId != ''"> and enterprise_id = #{enterpriseId}</if>
<if test="enterpriseName != null and enterpriseName != ''"> and enterprise_name like concat('%', #{enterpriseName}, '%')</if> <if test="enterpriseName != null and enterpriseName != ''"> and enterprise_name like concat('%', #{enterpriseName}, '%')</if>
<if test="enterpriseNumber != null and enterpriseNumber != ''"> and enterprise_number = #{enterpriseNumber}</if> <if test="enterpriseNumber != null and enterpriseNumber != ''"> and enterprise_number = #{enterpriseNumber}</if>
<if test="enforcementTime != null "> and enforcement_time = #{enforcementTime}</if> <if test="enforcementTime != null "> and enforcement_time = #{enforcementTime}</if>
<if test="lawEnforcer != null and lawEnforcer != ''"> and (law_enforcer like concat('%',#{lawEnforcer} ,'%') or law_enforcer_two like concat('%',#{lawEnforcer} ,'%'))</if> <if test="lawEnforcer != null and lawEnforcer != ''"> and (law_enforcer like concat('%',#{lawEnforcer} ,'%') or law_enforcer_two like concat('%',#{lawEnforcer} ,'%'))</if>
<if test="lawEnforcerId != null and lawEnforcerId != ''"> and law_enforcer_id = #{lawEnforcerId}</if> <if test="lawEnforcerId != null and lawEnforcerId != ''"> and law_enforcer_id = #{lawEnforcerId}</if>
<if test="lawEnforcerTel != null and lawEnforcerTel != ''"> and law_enforcer_tel = #{lawEnforcerTel}</if> <if test="lawEnforcerTel != null and lawEnforcerTel != ''"> and law_enforcer_tel = #{lawEnforcerTel}</if>
<if test="lawEnforcerIdTwo != null and lawEnforcerIdTwo != ''"> and law_enforcer_id_two = #{lawEnforcerIdTwo}</if> <if test="lawEnforcerIdTwo != null and lawEnforcerIdTwo != ''"> and law_enforcer_id_two = #{lawEnforcerIdTwo}</if>
<if test="lawEnforcerTelTwo != null and lawEnforcerTelTwo != ''"> and law_enforcer_tel_two = #{lawEnforcerTelTwo}</if> <if test="lawEnforcerTelTwo != null and lawEnforcerTelTwo != ''"> and law_enforcer_tel_two = #{lawEnforcerTelTwo}</if>
<if test="subsidiaryer != null and subsidiaryer != ''"> and subsidiaryer = #{subsidiaryer}</if> <if test="subsidiaryer != null and subsidiaryer != ''"> and subsidiaryer = #{subsidiaryer}</if>
<if test="subsidiaryerId != null and subsidiaryerId != ''"> and subsidiaryer_id = #{subsidiaryerId}</if> <if test="subsidiaryerId != null and subsidiaryerId != ''"> and subsidiaryer_id = #{subsidiaryerId}</if>
<if test="subsidiaryerTel != null and subsidiaryerTel != ''"> and subsidiaryer_tel = #{subsidiaryerTel}</if> <if test="subsidiaryerTel != null and subsidiaryerTel != ''"> and subsidiaryer_tel = #{subsidiaryerTel}</if>
<if test="lawEnforcementItem != null and lawEnforcementItem != ''"> and law_enforcement_item = #{lawEnforcementItem}</if> <if test="lawEnforcementItem != null and lawEnforcementItem != ''"> and law_enforcement_item = #{lawEnforcementItem}</if>
<if test="lawEnforcementItemText != null and lawEnforcementItemText != ''"> and law_enforcement_item_text like concat('%', #{lawEnforcementItemText,jdbcType=VARCHAR}, '%')</if> <if test="lawEnforcementItemText != null and lawEnforcementItemText != ''"> and law_enforcement_item_text like concat('%', #{lawEnforcementItemText,jdbcType=VARCHAR}, '%')</if>
<if test="lawEnforcementBasis != null and lawEnforcementBasis != ''"> and law_enforcement_basis = #{lawEnforcementBasis}</if> <if test="lawEnforcementBasis != null and lawEnforcementBasis != ''"> and law_enforcement_basis = #{lawEnforcementBasis}</if>
<if test="lawEnforcementBasisText != null and lawEnforcementBasisText != ''"> and law_enforcement_basis_text = #{lawEnforcementBasisText}</if> <if test="lawEnforcementBasisText != null and lawEnforcementBasisText != ''"> and law_enforcement_basis_text = #{lawEnforcementBasisText}</if>
<if test="reslut != null "> and reslut = #{reslut}</if> <if test="reslut != null "> and reslut = #{reslut}</if>
<if test="isSubmit != null "> and is_submit = #{isSubmit}</if> <if test="isSubmit != null "> and is_submit = #{isSubmit}</if>
<if test="userId != null "> and user_id = #{userId}</if> <if test="userId != null "> and user_id = #{userId}</if>
<if test="deptId != null "> and dept_id = #{deptId}</if> <if test="deptId != null "> and dept_id = #{deptId}</if>
<if test="isDelete != null "> and is_delete = #{isDelete}</if> <if test="isDelete != null "> and is_delete = #{isDelete}</if>
<if test="isComplaint != null "> and is_complaint = #{isComplaint}</if> <if test="isComplaint != null "> and is_complaint = #{isComplaint}</if>
<if test="status != null "> and status = #{status}</if> <if test="status != null "> and status = #{status}</if>
<if test="lawEnforcementCode != null and lawEnforcementCode != ''"> and law_enforcement_code = #{lawEnforcementCode}</if> <if test="lawEnforcementCode != null and lawEnforcementCode != ''"> and law_enforcement_code = #{lawEnforcementCode}</if>
<if test="uniteCheck == '0'.toString()"> and unite_check is not null</if> <if test="uniteCheck == '0'.toString()"> and unite_check is not null</if>
<if test="uniteCheck == '1'.toString()"> and unite_check is null</if> <if test="uniteCheck == '1'.toString()"> and unite_check is null</if>
<if test="enforce == '0'.toString()"> and check_css is not null</if> <if test="enforce == '0'.toString()"> and check_css is not null</if>
<if test="enforce == '1'.toString()"> and check_css is null</if> <if test="enforce == '1'.toString()"> and check_css is null</if>
<if test="checkCategory != null and checkCategory != ''"> and check_category = #{checkCategory}</if> <if test="checkCategory != null and checkCategory != ''"> and check_category = #{checkCategory}</if>
<if test="checkCss != null and checkCss != ''"> and check_css = #{checkCss}</if> <if test="checkCss != null and checkCss != ''"> and check_css = #{checkCss}</if>
<if test="beginTime != null and beginTime != ''"><!-- 开始时间检索 --> <if test="beginTime != null and beginTime != ''"><!-- 开始时间检索 -->
and DATE_FORMAT(create_time,'%Y-%m-%d') &gt;= STR_TO_DATE(#{beginTime},'%Y-%m-%d') and DATE_FORMAT(create_time,'%Y-%m-%d') &gt;= STR_TO_DATE(#{beginTime},'%Y-%m-%d')
</if> </if>
<if test="endTime != null and endTime != ''"><!-- 结束时间检索 --> <if test="endTime != null and endTime != ''"><!-- 结束时间检索 -->
and DATE_FORMAT(create_time,'%Y-%m-%d') &lt;= STR_TO_DATE(#{endTime},'%Y-%m-%d') and DATE_FORMAT(create_time,'%Y-%m-%d') &lt;= STR_TO_DATE(#{endTime},'%Y-%m-%d')
</if> </if>
<choose>
<when test="params.dataScope != null and params.dataScope != ''">
and dept_id IN ( SELECT dept_id FROM sys_dept WHERE dept_id = #{deptId} or find_in_set( #{deptId} , ancestors ) <![CDATA[ <> ]]> 0 )
</when>
<!--默认开启权限搜索 -->
<otherwise>
${params.dataScope}
</otherwise>
</choose>
</where> </where>
order by create_time desc order by create_time desc
</select> </select>
<select id="selectEnforcementRegistrationAndAddressList" parameterType="EnforcementRegistration" resultMap="EnforcementRegistrationResult"> <select id="selectEnforcementRegistrationAndAddressList" parameterType="EnforcementRegistration" resultMap="EnforcementRegistrationResult">
@ -517,7 +526,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
#{id} #{id}
</foreach> </foreach>
</delete> </delete>
<!-- <!--
<select id="countMentByTime" resultMap="EnforceRegCountResult" <select id="countMentByTime" resultMap="EnforceRegCountResult"
resultType="com.zdxt.code.domain.EnforceRegCount"> resultType="com.zdxt.code.domain.EnforceRegCount">
SELECT law_enforcement, law_enforcement_id,enterprise_number, COUNT(law_enforcement_id) AS num SELECT law_enforcement, law_enforcement_id,enterprise_number, COUNT(law_enforcement_id) AS num

Write Preview
Loading…
Cancel
Save