Browse Source

首页样式相关

v6
蟑螂恶霸 1 year ago
parent
commit
117c6cc75f
  1. 75
      lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/code/statistical/home.html
  2. 1
      lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/controller/StatisticalPanelController.java
  3. 2
      lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/impl/EnterpriseComplaintServiceImpl.java
  4. 24
      lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/impl/StatisticalPaneServiceImpl.java
  5. 303
      lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/resources/mapper/StatisticalPanelMapper.xml

75
lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/code/statistical/home.html

@ -171,10 +171,12 @@
<div class="wrap_bottom"> <div class="wrap_bottom">
<div class="cont_left"> <div class="cont_left">
<h3>涉企执法趋势</h3> <h3>涉企执法趋势</h3>
<div class="tab_tit"> <a class="active">行政执法</a> <a>非行政执法</a> </div> <div class="tab_tit"> <a class="active" id="box0" onclick="switch_box(0)">行政执法</a> <a id="box1" onclick="switch_box(1)">非行政执法</a> </div>
<div class="tab_chart"> <div class="tab_chart">
<!-- <div class="chartbox" id="echartInspect" style="position: absolute"></div>-->
<!-- <div class="chartbox" id="echartNonInspect" style="opacity: 0; position: absolute"></div>-->
<div class="chartbox" id="echartInspect" style="position: absolute"></div> <div class="chartbox" id="echartInspect" style="position: absolute"></div>
<div class="chartbox" id="echartNonInspect" style="opacity: 0; position: absolute"></div> <div class="chartbox" id="echartNonInspect" style="display: none;"></div>
</div> </div>
</div> </div>
</div> </div>
@ -220,7 +222,7 @@
base_html += ' <ul>'; base_html += ' <ul>';
base_html += ' <li><label>单独检查</label><span>{single_num}</span><span>{single_per}%</span></li>'; base_html += ' <li><label>单独检查</label><span>{single_num}</span><span>{single_per}%</span></li>';
base_html += ' <li><label>联合检查</label><span>{nuite_num}</span><span>{nuite_per}%</span></li>'; base_html += ' <li><label>联合检查</label><span>{nuite_num}</span><span>{nuite_per}%</span></li>';
base_html += ' <li><label>检查压减率</label><span>{cut_num}</span><span>{cut_per}</span></li>'; base_html += ' <li><label>检查压减率</label><span>{cut_num}</span><span>{cut_per}%</span></li>';
// base_html += ' <li><label>被检查企业</label><span>{ent_num}</span><span>{ent_per}%</span></li>'; // base_html += ' <li><label>被检查企业</label><span>{ent_num}</span><span>{ent_per}%</span></li>';
// base_html += ' <li><label>涉企投诉次数</label><span>{com_num}</span><span>{com_per}%</span></li>'; // base_html += ' <li><label>涉企投诉次数</label><span>{com_num}</span><span>{com_per}%</span></li>';
base_html += ' <li><label>被检查企业</label><span>{ent_num}</span></li>'; base_html += ' <li><label>被检查企业</label><span>{ent_num}</span></li>';
@ -998,13 +1000,13 @@
}); });
} }
var linechart1 = echarts.init(document.getElementById("echartInspect"));
var linechart2 = echarts.init(document.getElementById("echartNonInspect"));
/** 行政检查趋势 */ /** 行政检查趋势 */
function timesCharts(times, ins, ent) { function timesCharts(times, ins, ent) {
var myChart = echarts.init(document.getElementById("echartInspect")); // var linechart1 = echarts.init(document.getElementById("echartInspect"));
// 指定相关的配置项和数据 // 指定相关的配置项和数据
var option = { var option = {
tooltip: { tooltip: {
trigger: 'axis', trigger: 'axis',
backgroundColor: 'rgba(0, 0, 0, .5)', backgroundColor: 'rgba(0, 0, 0, .5)',
@ -1021,7 +1023,7 @@
}, },
legend: { legend: {
// icon: 'rectangle', // icon: 'rectangle',
data: ['行政执法数量', '被执法企业数量'], data: ['行政执法数量', '被检查企业数量'],
x: 'right', x: 'right',
y: "top", y: "top",
itemGap: 15, itemGap: 15,
@ -1194,15 +1196,15 @@
}] }]
}; };
// 使用刚指定的配置项和数据显示图表。 // 使用刚指定的配置项和数据显示图表。
myChart.setOption(option); linechart1.setOption(option);
window.addEventListener("resize", function () { // window.addEventListener("resize", function () {
myChart.resize(); // linechart1.resize();
}); // });
} }
/** 非行政检查趋势 */ /** 非行政检查趋势 */
function timesCharts2(times, ins, ent) { function timesCharts2(times, ins, ent) {
var myChart = echarts.init(document.getElementById("echartNonInspect")); // var linechart2 = echarts.init(document.getElementById("echartNonInspect"));
// 指定相关的配置项和数据 // 指定相关的配置项和数据
var option = { var option = {
@ -1222,7 +1224,7 @@
}, },
legend: { legend: {
// icon: 'rectangle', // icon: 'rectangle',
data: ['行政执法数量', '被检查企业数量'], data: ['非行政执法数量', '被检查企业数量'],
x: 'right', x: 'right',
y: "top", y: "top",
itemGap: 15, itemGap: 15,
@ -1304,7 +1306,7 @@
], ],
series: [ series: [
{ {
name: '行政执法数量', name: '非行政执法数量',
type: 'line', type: 'line',
//stack: '总量', //stack: '总量',
itemStyle: { itemStyle: {
@ -1394,10 +1396,25 @@
}] }]
}; };
// 使用刚指定的配置项和数据显示图表。 // 使用刚指定的配置项和数据显示图表。
myChart.setOption(option); linechart2.setOption(option);
window.addEventListener("resize", function () { // window.addEventListener("resize", function () {
myChart.resize(); // linechart2.resize();
}); // });
}
/** 涉企检查趋势tab切换 */
function switch_box(tab) {
if (tab == 0) {
$("#box0").addClass("active").siblings().removeClass("active");
$("#echartInspect").show();
$("#echartNonInspect").hide();
linechart1.resize();
} else if (tab == 1) {
$("#box1").addClass("active").siblings().removeClass("active");
$("#echartInspect").hide();
$("#echartNonInspect").show();
linechart2.resize();
}
} }
/**********数据子项折叠************/ /**********数据子项折叠************/
@ -1422,6 +1439,7 @@
}) })
}); });
function showDetail(idx, aElement) { function showDetail(idx, aElement) {
var ame = $(aElement); var ame = $(aElement);
var aflag = ame.attr("flag"); var aflag = ame.attr("flag");
@ -1448,15 +1466,25 @@
if('xzzf' == flag) { if('xzzf' == flag) {
$("#xzzf"+index).show(); $("#xzzf"+index).show();
$("#fxzzf"+index).hide(); $("#fxzzf"+index).hide();
$(".pop_tit").css("width","auto");
$(".tab_inspect").css("margin-top","4rem");
$(".tab_inspect_item:first-child").show();
$(".tab_inspect_item:last-child").hide();
$("#districtSS .tab_inspect_item").css("width","auto");
} else if('fxzzf' == flag) { } else if('fxzzf' == flag) {
$("#xzzf"+index).hide(); $("#xzzf"+index).hide();
$("#fxzzf"+index).show(); $("#fxzzf"+index).show();
$(".pop_tit").css("width","83%");
$("#districtSS .pop_tit").css("width","88%");
$(".tab_inspect").css("margin-top","1.9rem");
$(".tab_inspect_item:first-child").hide();
$(".tab_inspect_item:last-child").show();
$("#districtSS .tab_inspect_item").css("width","40rem");
} }
$(aElement).addClass("active").siblings().removeClass("active"); $(aElement).addClass("active").siblings().removeClass("active");
} }
layui.use('laydate',function(){ layui.use('laydate',function(){
var laydate = layui.laydate; var laydate = layui.laydate;
laydate.render({ laydate.render({
@ -1487,13 +1515,6 @@
}) })
}); });
/** 涉企检查趋势tab切换 */
$(".tab_tit a").on("click", function () {
$(this).addClass("active").siblings().removeClass("active");
var index = $(this).index();
// $(".chartbox").eq(index).show().siblings(this).hide()
$(".chartbox").eq(index).css({opacity: 1}).siblings(this).css({opacity: 0})
});

1
lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/controller/StatisticalPanelController.java

@ -408,6 +408,7 @@ public class StatisticalPanelController extends BaseController {
// 全市行政检查数量 // 全市行政检查数量
Integer all_num = statisticalPaneService.analysisEnterprisesAll(params); Integer all_num = statisticalPaneService.analysisEnterprisesAll(params);
params.setParams(null);
resMap.put("allNum", all_num); resMap.put("allNum", all_num);
// 全市行政联合检查数量 // 全市行政联合检查数量

2
lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/impl/EnterpriseComplaintServiceImpl.java

@ -190,7 +190,7 @@ public class EnterpriseComplaintServiceImpl implements IEnterpriseComplaintServi
List<String> codes = Arrays.asList(Convert.toStrArray(enterpriseComplaint.getComplaintItemCodes())); List<String> codes = Arrays.asList(Convert.toStrArray(enterpriseComplaint.getComplaintItemCodes()));
codes.forEach(c->{ codes.forEach(c->{
String prwCode = addMssqOrder(enterpriseComplaint, c); String prwCode = addMssqOrder(enterpriseComplaint, c);
// proCodeList.add(prwCode); proCodeList.add(prwCode);
}); });
} }
//投诉工单返回参数 //投诉工单返回参数

24
lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/impl/StatisticalPaneServiceImpl.java

@ -1501,42 +1501,51 @@ public class StatisticalPaneServiceImpl implements StatisticalPaneService {
// } // }
@Override @Override
@DataScope(deptAlias = "r",userAlias = "r",deptField = "bureau_dept_id")
public Integer analysisEnterprisesAll(SixAnalysisParams params) { public Integer analysisEnterprisesAll(SixAnalysisParams params) {
return statisticalPanelMapper.analysis_enterprises_all(params); return statisticalPanelMapper.analysis_enterprises_all(params);
} }
@Override @Override
@DataScope(deptAlias = "r",userAlias = "r",deptField = "bureau_dept_id")
public Integer analysisEnterprisesNonAll(SixAnalysisParams params) { public Integer analysisEnterprisesNonAll(SixAnalysisParams params) {
return statisticalPanelMapper.analysis_enterprises_non_all(params); return statisticalPanelMapper.analysis_enterprises_non_all(params);
} }
@Override @Override
@DataScope(deptAlias = "r",userAlias = "r",deptField = "bureau_dept_id")
public Integer analysisEnterprisesUnion(SixAnalysisParams params) { public Integer analysisEnterprisesUnion(SixAnalysisParams params) {
return statisticalPanelMapper.analysis_enterprises_union(params); return statisticalPanelMapper.analysis_enterprises_union(params);
} }
@Override @Override
@DataScope(deptAlias = "r",userAlias = "r",deptField = "bureau_dept_id")
public Double analysisEnterprisesUnionRr(SixAnalysisParams params) { public Double analysisEnterprisesUnionRr(SixAnalysisParams params) {
return statisticalPanelMapper.analysis_enterprises_union_rr(params); return statisticalPanelMapper.analysis_enterprises_union_rr(params);
} }
@Override @Override
@DataScope(deptAlias = "r",userAlias = "r",deptField = "bureau_dept_id")
public Double analysisEnterprisesUnionYoy(SixAnalysisParams params) { public Double analysisEnterprisesUnionYoy(SixAnalysisParams params) {
return statisticalPanelMapper.analysis_enterprises_union_yoy(params); return statisticalPanelMapper.analysis_enterprises_union_yoy(params);
} }
@Override @Override
@DataScope(deptAlias = "r",userAlias = "r",deptField = "bureau_dept_id")
public Integer analysisEnterprisesSingle(SixAnalysisParams params) { public Integer analysisEnterprisesSingle(SixAnalysisParams params) {
return statisticalPanelMapper.analysis_enterprises_union(params); return statisticalPanelMapper.analysis_enterprises_single(params);
} }
@Override @Override
@DataScope(deptAlias = "r",userAlias = "r",deptField = "bureau_dept_id")
public Double analysisEnterprisesSingleRr(SixAnalysisParams params) { public Double analysisEnterprisesSingleRr(SixAnalysisParams params) {
return statisticalPanelMapper.analysis_enterprises_union_rr(params); return statisticalPanelMapper.analysis_enterprises_single_rr(params);
} }
@Override @Override
@DataScope(deptAlias = "r",userAlias = "r",deptField = "bureau_dept_id")
public Double analysisEnterprisesSingleYoy(SixAnalysisParams params) { public Double analysisEnterprisesSingleYoy(SixAnalysisParams params) {
return statisticalPanelMapper.analysis_enterprises_union_yoy(params); return statisticalPanelMapper.analysis_enterprises_single_yoy(params);
} }
@Override @Override
@DataScope(deptAlias = "r",userAlias = "r",deptField = "bureau_dept_id")
public Integer analysis_non_enterprisesIns(SixAnalysisParams params) { public Integer analysis_non_enterprisesIns(SixAnalysisParams params) {
return statisticalPanelMapper.analysis_non_enterprisesIns(params); return statisticalPanelMapper.analysis_non_enterprisesIns(params);
} }
@ -1557,6 +1566,7 @@ public class StatisticalPaneServiceImpl implements StatisticalPaneService {
return statisticalPanelMapper.analysis_insNotice_yoy(params); return statisticalPanelMapper.analysis_insNotice_yoy(params);
} }
@Override @Override
@DataScope(deptAlias = "c",userAlias = "c",deptField = "complaint_department_id")
public Integer analysisEnterprisesComplaint(SixAnalysisParams params) { public Integer analysisEnterprisesComplaint(SixAnalysisParams params) {
return statisticalPanelMapper.analysis_enterprisesComplaint(params); return statisticalPanelMapper.analysis_enterprisesComplaint(params);
} }
@ -1569,14 +1579,17 @@ public class StatisticalPaneServiceImpl implements StatisticalPaneService {
return statisticalPanelMapper.analysis_enterprisesComplaint_yoy(params); return statisticalPanelMapper.analysis_enterprisesComplaint_yoy(params);
} }
@Override @Override
@DataScope(deptAlias = "r",userAlias = "r",deptField = "bureau_dept_id")
public Integer analysisEnterprises(SixAnalysisParams params) { public Integer analysisEnterprises(SixAnalysisParams params) {
return statisticalPanelMapper.analysis_enterprises(params); return statisticalPanelMapper.analysis_enterprises(params);
} }
@Override @Override
@DataScope(deptAlias = "r",userAlias = "r",deptField = "bureau_dept_id")
public Double analysisEnterprisesRr(SixAnalysisParams params) { public Double analysisEnterprisesRr(SixAnalysisParams params) {
return statisticalPanelMapper.analysis_enterprises_rr(params); return statisticalPanelMapper.analysis_enterprises_rr(params);
} }
@Override @Override
@DataScope(deptAlias = "r",userAlias = "r",deptField = "bureau_dept_id")
public Double analysisEnterprisesYoy(SixAnalysisParams params) { public Double analysisEnterprisesYoy(SixAnalysisParams params) {
return statisticalPanelMapper.analysis_enterprises_yoy(params); return statisticalPanelMapper.analysis_enterprises_yoy(params);
} }
@ -1589,23 +1602,28 @@ public class StatisticalPaneServiceImpl implements StatisticalPaneService {
return statisticalPanelMapper.analysis_enterprises_countAll(params); return statisticalPanelMapper.analysis_enterprises_countAll(params);
} }
@Override @Override
@DataScope(deptAlias = "nr",userAlias = "nr",deptField = "bureau_dept_id")
public List<Map<String, Object>> analysisNonRegistrationType(SixAnalysisParams params) { public List<Map<String, Object>> analysisNonRegistrationType(SixAnalysisParams params) {
return statisticalPanelMapper.analysis_non_registration_type(params); return statisticalPanelMapper.analysis_non_registration_type(params);
} }
@Override @Override
@DataScope(deptAlias = "r",userAlias = "r",deptField = "bureau_dept_id")
public List<Map<String, Object>> analysisRegistrationType(SixAnalysisParams params) { public List<Map<String, Object>> analysisRegistrationType(SixAnalysisParams params) {
return statisticalPanelMapper.analysis_registration_type(params); return statisticalPanelMapper.analysis_registration_type(params);
} }
@Override @Override
@DataScope(deptAlias = "r",userAlias = "r",deptField = "bureau_dept_id")
public List<Map<String, Object>> analysisEnterprisesInsTime(SixAnalysisParams params) { public List<Map<String, Object>> analysisEnterprisesInsTime(SixAnalysisParams params) {
return statisticalPanelMapper.analysis_enterprisesIns_time(params); return statisticalPanelMapper.analysis_enterprisesIns_time(params);
} }
@Override @Override
@DataScope(deptAlias = "r",userAlias = "r",deptField = "bureau_dept_id")
public List<Map<String, Object>> analysisNonEnterprisesInsTime(SixAnalysisParams params) { public List<Map<String, Object>> analysisNonEnterprisesInsTime(SixAnalysisParams params) {
return statisticalPanelMapper.analysis_non_enterprisesIns_time(params); return statisticalPanelMapper.analysis_non_enterprisesIns_time(params);
} }
@Override @Override
@DataScope(deptAlias = "r",userAlias = "r",deptField = "bureau_dept_id")
public List<Map<String, Object>> analysisEnterprisesTime(SixAnalysisParams params) { public List<Map<String, Object>> analysisEnterprisesTime(SixAnalysisParams params) {
return statisticalPanelMapper.analysis_enterprises_time(params); return statisticalPanelMapper.analysis_enterprises_time(params);
} }

303
lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/resources/mapper/StatisticalPanelMapper.xml

@ -1138,6 +1138,7 @@
group by t.satisfaction_level group by t.satisfaction_level
</select> </select>
<!-- 所有行政检查数量 --> <!-- 所有行政检查数量 -->
<select id="analysis_enterprises_all" parameterType="SixAnalysisParams" resultType="integer"> <select id="analysis_enterprises_all" parameterType="SixAnalysisParams" resultType="integer">
SELECT count(1) FROM enforcement_registration r SELECT count(1) FROM enforcement_registration r
@ -1151,14 +1152,17 @@
and r.is_complaint is not null and r.is_complaint is not null
and r.check_category is not null and r.check_category is not null
and r.bureau_dept_id is not null and r.bureau_dept_id is not null
and (r.union_no IS NOT NULL and r.union_no != '') <!-- <if test="params.zone != null and params.zone != ''"> and r.bureau_dept_id in (select dept_id from sys_dept where zone = #{params.zone}) </if>-->
<if test="params.zone != null and params.zone != ''"> and r.bureau_dept_id in (select dept_id from sys_dept where zone = #{params.zone}) </if>
<if test="deptId != null and deptId != ''"> <if test="deptId != null and deptId != ''">
and r.dept_id in (select sd.dept_id from sys_dept sd where find_in_set(#{deptId}, sd.ancestors) or sd.dept_id = #{deptId}) and r.dept_id in (select sd.dept_id from sys_dept sd where find_in_set(#{deptId}, sd.ancestors) or sd.dept_id = #{deptId})
</if> </if>
<if test="userId != null and userId != '' ">and( r.law_enforcer_id=#{userId} or r.law_enforcer_id_two like concat('%',#{userId}, '%')) </if> <!-- <if test="userId != null and userId != '' ">and( r.law_enforcer_id=#{userId} or r.law_enforcer_id_two like concat('%',#{userId}, '%')) </if>-->
<if test="beginTime != null and beginTime != ''"> and DATE_FORMAT(r.enforcement_time,'%Y-%m-%d') >= DATE_FORMAT(#{beginTime},'%Y-%m-%d') </if> <if test="beginTime != null and beginTime != ''"> and DATE_FORMAT(r.enforcement_time,'%Y-%m-%d') >= DATE_FORMAT(#{beginTime},'%Y-%m-%d') </if>
<if test="endTime != null and endTime != ''"> and DATE_FORMAT(#{endTime},'%Y-%m-%d') >= DATE_FORMAT(r.enforcement_time,'%Y-%m-%d') </if> <if test="endTime != null and endTime != ''"> and DATE_FORMAT(#{endTime},'%Y-%m-%d') >= DATE_FORMAT(r.enforcement_time,'%Y-%m-%d') </if>
<if test="params.dataScope != null and params.dataScope != ''">
<!-- 数据范围过滤 -->
${params.dataScope}
</if>
</select> </select>
<select id="analysis_enterprises_all_rr" parameterType="SixAnalysisParams" resultType="integer"> <select id="analysis_enterprises_all_rr" parameterType="SixAnalysisParams" resultType="integer">
SELECT count(1) FROM enforcement_registration r SELECT count(1) FROM enforcement_registration r
@ -1184,6 +1188,10 @@
<if test="endTime != null and endTime != ''"> <if test="endTime != null and endTime != ''">
and DATE_SUB(STR_TO_DATE(#{endTime},"%Y-%m-%d"),INTERVAL TO_DAYS(STR_TO_DATE(#{endTime},"%Y-%m-%d"))-TO_DAYS(STR_TO_DATE(#{beginTime},"%Y-%m-%d"))+1 day)>=DATE_FORMAT(r.enforcement_time,'%Y-%m-%d') and DATE_SUB(STR_TO_DATE(#{endTime},"%Y-%m-%d"),INTERVAL TO_DAYS(STR_TO_DATE(#{endTime},"%Y-%m-%d"))-TO_DAYS(STR_TO_DATE(#{beginTime},"%Y-%m-%d"))+1 day)>=DATE_FORMAT(r.enforcement_time,'%Y-%m-%d')
</if> </if>
<if test="params.dataScope != null and params.dataScope != ''">
<!-- 数据范围过滤 -->
${params.dataScope}
</if>
</select> </select>
<select id="analysis_enterprises_all_yoy" parameterType="SixAnalysisParams" resultType="integer"> <select id="analysis_enterprises_all_yoy" parameterType="SixAnalysisParams" resultType="integer">
SELECT count(1) FROM enforcement_registration r SELECT count(1) FROM enforcement_registration r
@ -1209,6 +1217,10 @@
<if test="endTime != null and endTime != ''"> <if test="endTime != null and endTime != ''">
and DATE_FORMAT(#{endTime},'%Y-%m-%d') >= DATE_FORMAT(DATE_SUB(r.enforcement_time,INTERVAL -1 year),'%Y-%m-%d') and DATE_FORMAT(#{endTime},'%Y-%m-%d') >= DATE_FORMAT(DATE_SUB(r.enforcement_time,INTERVAL -1 year),'%Y-%m-%d')
</if> </if>
<if test="params.dataScope != null and params.dataScope != ''">
<!-- 数据范围过滤 -->
${params.dataScope}
</if>
</select> </select>
<!-- 所有非行政检查数量 --> <!-- 所有非行政检查数量 -->
@ -1219,13 +1231,17 @@
and r.enterprise_number is not null and r.enterprise_number is not null
and r.law_enforcer is not null and r.law_enforcer is not null
and r.bureau_dept_id is not null and r.bureau_dept_id is not null
<if test="params.zone != null and params.zone != ''"> and r.bureau_dept_id in (select dept_id from sys_dept where zone = #{params.zone}) </if> <!-- <if test="params.zone != null and params.zone != ''"> and r.bureau_dept_id in (select dept_id from sys_dept where zone = #{params.zone}) </if>-->
<if test="deptId != null and deptId != ''"> <if test="deptId != null and deptId != ''">
and r.dept_id in (select sd.dept_id from sys_dept sd where find_in_set(#{deptId}, sd.ancestors) or sd.dept_id = #{deptId}) and r.dept_id in (select sd.dept_id from sys_dept sd where find_in_set(#{deptId}, sd.ancestors) or sd.dept_id = #{deptId})
</if> </if>
<if test="userId != null and userId != '' ">and( r.law_enforcer_id=#{userId} or r.law_enforcer_id_two like concat('%',#{userId}, '%')) </if> <!-- <if test="userId != null and userId != '' ">and( r.law_enforcer_id=#{userId} or r.law_enforcer_id_two like concat('%',#{userId}, '%')) </if>-->
<if test="beginTime != null and beginTime != ''"> and DATE_FORMAT(r.enforcement_time,'%Y-%m-%d') >= DATE_FORMAT(#{beginTime},'%Y-%m-%d') </if> <if test="beginTime != null and beginTime != ''"> and DATE_FORMAT(r.enforcement_time,'%Y-%m-%d') >= DATE_FORMAT(#{beginTime},'%Y-%m-%d') </if>
<if test="endTime != null and endTime != ''"> and DATE_FORMAT(#{endTime},'%Y-%m-%d') >= DATE_FORMAT(r.enforcement_time,'%Y-%m-%d') </if> <if test="endTime != null and endTime != ''"> and DATE_FORMAT(#{endTime},'%Y-%m-%d') >= DATE_FORMAT(r.enforcement_time,'%Y-%m-%d') </if>
<if test="params.dataScope != null and params.dataScope != ''">
<!-- 数据范围过滤 -->
${params.dataScope}
</if>
</select> </select>
<!-- 联合检查数量统计 --> <!-- 联合检查数量统计 -->
@ -1244,7 +1260,7 @@
and r.is_complaint is not null and r.is_complaint is not null
and r.check_category is not null and r.check_category is not null
and r.bureau_dept_id is not null and r.bureau_dept_id is not null
and (r.union_no IS NOT NULL and r.union_no != '') and r.union_no IS NOT NULL and r.union_no != ''
<if test="params.zone != null and params.zone != ''"> and r.bureau_dept_id in (select dept_id from sys_dept where zone = #{params.zone}) </if> <if test="params.zone != null and params.zone != ''"> and r.bureau_dept_id in (select dept_id from sys_dept where zone = #{params.zone}) </if>
<if test="deptId != null and deptId != ''"> <if test="deptId != null and deptId != ''">
and r.dept_id in (select sd.dept_id from sys_dept sd where find_in_set(#{deptId}, sd.ancestors) or sd.dept_id = #{deptId}) and r.dept_id in (select sd.dept_id from sys_dept sd where find_in_set(#{deptId}, sd.ancestors) or sd.dept_id = #{deptId})
@ -1252,8 +1268,12 @@
<if test="userId != null and userId != '' ">and( r.law_enforcer_id=#{userId} or r.law_enforcer_id_two like concat('%',#{userId}, '%')) </if> <if test="userId != null and userId != '' ">and( r.law_enforcer_id=#{userId} or r.law_enforcer_id_two like concat('%',#{userId}, '%')) </if>
<if test="beginTime != null and beginTime != ''"> and DATE_FORMAT(r.enforcement_time,'%Y-%m-%d') >= DATE_FORMAT(#{beginTime},'%Y-%m-%d') </if> <if test="beginTime != null and beginTime != ''"> and DATE_FORMAT(r.enforcement_time,'%Y-%m-%d') >= DATE_FORMAT(#{beginTime},'%Y-%m-%d') </if>
<if test="endTime != null and endTime != ''"> and DATE_FORMAT(#{endTime},'%Y-%m-%d') >= DATE_FORMAT(r.enforcement_time,'%Y-%m-%d') </if> <if test="endTime != null and endTime != ''"> and DATE_FORMAT(#{endTime},'%Y-%m-%d') >= DATE_FORMAT(r.enforcement_time,'%Y-%m-%d') </if>
<if test="params.dataScope != null and params.dataScope != ''">
<!-- 数据范围过滤 -->
${params.dataScope}
</if>
GROUP BY union_no GROUP BY union_no
HAVING COUNT(1) > 1 HAVING COUNT(1) &gt; 1
) AS t ) AS t
</select> </select>
<select id="analysis_enterprises_union_rr" parameterType="SixAnalysisParams" resultType="double"> <select id="analysis_enterprises_union_rr" parameterType="SixAnalysisParams" resultType="double">
@ -1283,8 +1303,12 @@
<if test="endTime != null and endTime != ''"> <if test="endTime != null and endTime != ''">
and DATE_SUB(STR_TO_DATE(#{endTime},"%Y-%m-%d"),INTERVAL TO_DAYS(STR_TO_DATE(#{endTime},"%Y-%m-%d"))-TO_DAYS(STR_TO_DATE(#{beginTime},"%Y-%m-%d"))+1 day)>=DATE_FORMAT(r.enforcement_time,'%Y-%m-%d') and DATE_SUB(STR_TO_DATE(#{endTime},"%Y-%m-%d"),INTERVAL TO_DAYS(STR_TO_DATE(#{endTime},"%Y-%m-%d"))-TO_DAYS(STR_TO_DATE(#{beginTime},"%Y-%m-%d"))+1 day)>=DATE_FORMAT(r.enforcement_time,'%Y-%m-%d')
</if> </if>
<if test="params.dataScope != null and params.dataScope != ''">
<!-- 数据范围过滤 -->
${params.dataScope}
</if>
GROUP BY union_no GROUP BY union_no
HAVING COUNT(1) > 1 HAVING COUNT(1) &gt; 1
) AS t ) AS t
</select> </select>
<select id="analysis_enterprises_union_yoy" parameterType="SixAnalysisParams" resultType="double"> <select id="analysis_enterprises_union_yoy" parameterType="SixAnalysisParams" resultType="double">
@ -1314,16 +1338,72 @@
<if test="endTime != null and endTime != ''"> <if test="endTime != null and endTime != ''">
and DATE_FORMAT(#{endTime},'%Y-%m-%d') >= DATE_FORMAT(DATE_SUB(r.enforcement_time,INTERVAL -1 year),'%Y-%m-%d') and DATE_FORMAT(#{endTime},'%Y-%m-%d') >= DATE_FORMAT(DATE_SUB(r.enforcement_time,INTERVAL -1 year),'%Y-%m-%d')
</if> </if>
<if test="params.dataScope != null and params.dataScope != ''">
<!-- 数据范围过滤 -->
${params.dataScope}
</if>
GROUP BY union_no GROUP BY union_no
HAVING COUNT(1) > 1 HAVING COUNT(1) &gt; 1
) AS t ) AS t
</select> </select>
<!-- 单条检查数量统计 --> <!-- 单条检查数量统计 -->
<select id="analysis_enterprises_single" parameterType="SixAnalysisParams" resultType="integer"> <select id="analysis_enterprises_single" parameterType="SixAnalysisParams" resultType="integer">
SELECT count(1) select
FROM enforcement_registration r (select count(1) from enforcement_registration r
WHERE r.bureau_dept_name is not null where r.bureau_dept_name is not null
and r.is_submit = 1
and r.law_enforcement_id is not null
and r.enterprise_name is not null
and r.enterprise_number is not null
and r.law_enforcer is not null
and r.law_enforcer_two is not null
and r.is_complaint is not null
and r.check_category is not null
and r.bureau_dept_id is not null
and (r.union_no is null or r.union_no = '')
<if test="params.zone != null and params.zone != ''">and r.bureau_dept_id in (select dept_id from sys_dept where zone = #{params.zone}) </if>
<if test="deptId != null and deptId != ''">
and r.dept_id in (select sd.dept_id from sys_dept sd where find_in_set(#{deptId}, sd.ancestors) or sd.dept_id = #{deptId})
</if>
<if test="userId != null and userId != '' ">and( r.law_enforcer_id=#{userId} or r.law_enforcer_id_two like concat('%',#{userId}, '%')) </if>
<if test="beginTime != null and beginTime != ''"> and DATE_FORMAT(r.enforcement_time,'%Y-%m-%d') >= DATE_FORMAT(#{beginTime},'%Y-%m-%d') </if>
<if test="endTime != null and endTime != ''"> and DATE_FORMAT(#{endTime},'%Y-%m-%d') >= DATE_FORMAT(r.enforcement_time,'%Y-%m-%d') </if>
<if test="params.dataScope != null and params.dataScope != ''">
<!-- 数据范围过滤 -->
${params.dataScope}
</if>
)+(
select count(1) as _count from (select 1 from enforcement_registration r
where r.bureau_dept_name is not null
and r.is_submit = 1
and r.law_enforcement_id is not null
and r.enterprise_name is not null
and r.enterprise_number is not null
and r.law_enforcer is not null
and r.law_enforcer_two is not null
and r.is_complaint is not null
and r.check_category is not null
and r.bureau_dept_id is not null
and r.union_no is not null and r.union_no != ''
<if test="params.zone != null and params.zone != ''">and r.bureau_dept_id in (select dept_id from sys_dept where zone = #{params.zone}) </if>
<if test="deptId != null and deptId != ''">
and r.dept_id in (select sd.dept_id from sys_dept sd where find_in_set(#{deptId}, sd.ancestors) or sd.dept_id = #{deptId})
</if>
<if test="userId != null and userId != '' ">and( r.law_enforcer_id=#{userId} or r.law_enforcer_id_two like concat('%',#{userId}, '%')) </if>
<if test="beginTime != null and beginTime != ''"> and DATE_FORMAT(r.enforcement_time,'%Y-%m-%d') >= DATE_FORMAT(#{beginTime},'%Y-%m-%d') </if>
<if test="endTime != null and endTime != ''"> and DATE_FORMAT(#{endTime},'%Y-%m-%d') >= DATE_FORMAT(r.enforcement_time,'%Y-%m-%d') </if>
<if test="params.dataScope != null and params.dataScope != ''">
<!-- 数据范围过滤 -->
${params.dataScope}
</if>
GROUP BY r.union_no HAVING COUNT(1) &lt; 2) as t
)
</select>
<select id="analysis_enterprises_single_rr" parameterType="SixAnalysisParams" resultType="double">
select
(select count(1) from enforcement_registration r
where r.bureau_dept_name is not null
and r.is_submit = 1 and r.is_submit = 1
and r.law_enforcement_id is not null and r.law_enforcement_id is not null
and r.enterprise_name is not null and r.enterprise_name is not null
@ -1333,19 +1413,25 @@
and r.is_complaint is not null and r.is_complaint is not null
and r.check_category is not null and r.check_category is not null
and r.bureau_dept_id is not null and r.bureau_dept_id is not null
and r.has_union = 1 and (r.union_no is null or r.union_no = '')
<if test="params.zone != null and params.zone != ''"> and r.bureau_dept_id in (select dept_id from sys_dept where zone = #{params.zone}) </if> <if test="params.zone != null and params.zone != ''">and r.bureau_dept_id in (select dept_id from sys_dept where zone = #{params.zone}) </if>
<if test="deptId != null and deptId != ''"> <if test="deptId != null and deptId != ''">
and r.dept_id in (select sd.dept_id from sys_dept sd where find_in_set(#{deptId}, sd.ancestors) or sd.dept_id = #{deptId}) and r.dept_id in (select sd.dept_id from sys_dept sd where find_in_set(#{deptId}, sd.ancestors) or sd.dept_id = #{deptId})
</if> </if>
<if test="userId != null and userId != '' ">and( r.law_enforcer_id=#{userId} or r.law_enforcer_id_two like concat('%',#{userId}, '%')) </if> <if test="userId != null and userId != '' ">and( r.law_enforcer_id=#{userId} or r.law_enforcer_id_two like concat('%',#{userId}, '%')) </if>
<if test="beginTime != null and beginTime != ''"> and DATE_FORMAT(r.enforcement_time,'%Y-%m-%d') >= DATE_FORMAT(#{beginTime},'%Y-%m-%d') </if> <if test="beginTime != null and beginTime != ''">
<if test="endTime != null and endTime != ''"> and DATE_FORMAT(#{endTime},'%Y-%m-%d') >= DATE_FORMAT(r.enforcement_time,'%Y-%m-%d') </if> and DATE_FORMAT(r.enforcement_time,'%Y-%m-%d')>=DATE_SUB(STR_TO_DATE(#{beginTime},"%Y-%m-%d"),INTERVAL TO_DAYS(STR_TO_DATE(#{endTime},"%Y-%m-%d"))-TO_DAYS(STR_TO_DATE(#{beginTime},"%Y-%m-%d"))+1 day)
</select> </if>
<select id="analysis_enterprises_single_rr" parameterType="SixAnalysisParams" resultType="double"> <if test="endTime != null and endTime != ''">
SELECT count(1) and DATE_SUB(STR_TO_DATE(#{endTime},"%Y-%m-%d"),INTERVAL TO_DAYS(STR_TO_DATE(#{endTime},"%Y-%m-%d"))-TO_DAYS(STR_TO_DATE(#{beginTime},"%Y-%m-%d"))+1 day)>=DATE_FORMAT(r.enforcement_time,'%Y-%m-%d')
FROM enforcement_registration r </if>
WHERE r.bureau_dept_name is not null <if test="params.dataScope != null and params.dataScope != ''">
<!-- 数据范围过滤 -->
${params.dataScope}
</if>
)+(
select count(1) as _count from (select 1 from enforcement_registration r
where r.bureau_dept_name is not null
and r.is_submit = 1 and r.is_submit = 1
and r.law_enforcement_id is not null and r.law_enforcement_id is not null
and r.enterprise_name is not null and r.enterprise_name is not null
@ -1355,8 +1441,8 @@
and r.is_complaint is not null and r.is_complaint is not null
and r.check_category is not null and r.check_category is not null
and r.bureau_dept_id is not null and r.bureau_dept_id is not null
and r.has_union = 1 and r.union_no is not null and r.union_no != ''
<if test="params.zone != null and params.zone != ''"> and r.bureau_dept_id in (select dept_id from sys_dept where zone = #{params.zone}) </if> <if test="params.zone != null and params.zone != ''">and r.bureau_dept_id in (select dept_id from sys_dept where zone = #{params.zone}) </if>
<if test="deptId != null and deptId != ''"> <if test="deptId != null and deptId != ''">
and r.dept_id in (select sd.dept_id from sys_dept sd where find_in_set(#{deptId}, sd.ancestors) or sd.dept_id = #{deptId}) and r.dept_id in (select sd.dept_id from sys_dept sd where find_in_set(#{deptId}, sd.ancestors) or sd.dept_id = #{deptId})
</if> </if>
@ -1367,14 +1453,17 @@
<if test="endTime != null and endTime != ''"> <if test="endTime != null and endTime != ''">
and DATE_SUB(STR_TO_DATE(#{endTime},"%Y-%m-%d"),INTERVAL TO_DAYS(STR_TO_DATE(#{endTime},"%Y-%m-%d"))-TO_DAYS(STR_TO_DATE(#{beginTime},"%Y-%m-%d"))+1 day)>=DATE_FORMAT(r.enforcement_time,'%Y-%m-%d') and DATE_SUB(STR_TO_DATE(#{endTime},"%Y-%m-%d"),INTERVAL TO_DAYS(STR_TO_DATE(#{endTime},"%Y-%m-%d"))-TO_DAYS(STR_TO_DATE(#{beginTime},"%Y-%m-%d"))+1 day)>=DATE_FORMAT(r.enforcement_time,'%Y-%m-%d')
</if> </if>
GROUP BY union_no <if test="params.dataScope != null and params.dataScope != ''">
HAVING COUNT(1) > 1 <!-- 数据范围过滤 -->
) AS t; ${params.dataScope}
</if>
GROUP BY r.union_no HAVING COUNT(1) &lt; 2) as t
)
</select> </select>
<select id="analysis_enterprises_single_yoy" parameterType="SixAnalysisParams" resultType="double"> <select id="analysis_enterprises_single_yoy" parameterType="SixAnalysisParams" resultType="double">
SELECT count(1) select
FROM enforcement_registration r (select count(1) from enforcement_registration r
WHERE r.bureau_dept_name is not null where r.bureau_dept_name is not null
and r.is_submit = 1 and r.is_submit = 1
and r.law_enforcement_id is not null and r.law_enforcement_id is not null
and r.enterprise_name is not null and r.enterprise_name is not null
@ -1384,8 +1473,8 @@
and r.is_complaint is not null and r.is_complaint is not null
and r.check_category is not null and r.check_category is not null
and r.bureau_dept_id is not null and r.bureau_dept_id is not null
and r.has_union = 1 and (r.union_no is null or r.union_no = '')
<if test="params.zone != null and params.zone != ''"> and r.bureau_dept_id in (select dept_id from sys_dept where zone = #{params.zone}) </if> <if test="params.zone != null and params.zone != ''">and r.bureau_dept_id in (select dept_id from sys_dept where zone = #{params.zone}) </if>
<if test="deptId != null and deptId != ''"> <if test="deptId != null and deptId != ''">
and r.dept_id in (select sd.dept_id from sys_dept sd where find_in_set(#{deptId}, sd.ancestors) or sd.dept_id = #{deptId}) and r.dept_id in (select sd.dept_id from sys_dept sd where find_in_set(#{deptId}, sd.ancestors) or sd.dept_id = #{deptId})
</if> </if>
@ -1396,9 +1485,40 @@
<if test="endTime != null and endTime != ''"> <if test="endTime != null and endTime != ''">
and DATE_FORMAT(#{endTime},'%Y-%m-%d') >= DATE_FORMAT(DATE_SUB(r.enforcement_time,INTERVAL -1 year),'%Y-%m-%d') and DATE_FORMAT(#{endTime},'%Y-%m-%d') >= DATE_FORMAT(DATE_SUB(r.enforcement_time,INTERVAL -1 year),'%Y-%m-%d')
</if> </if>
GROUP BY union_no <if test="params.dataScope != null and params.dataScope != ''">
HAVING COUNT(1) > 1 <!-- 数据范围过滤 -->
) AS t; ${params.dataScope}
</if>
)+(
select count(1) as _count from (select 1 from enforcement_registration r
where r.bureau_dept_name is not null
and r.is_submit = 1
and r.law_enforcement_id is not null
and r.enterprise_name is not null
and r.enterprise_number is not null
and r.law_enforcer is not null
and r.law_enforcer_two is not null
and r.is_complaint is not null
and r.check_category is not null
and r.bureau_dept_id is not null
and r.union_no is not null and r.union_no != ''
<if test="params.zone != null and params.zone != ''">and r.bureau_dept_id in (select dept_id from sys_dept where zone = #{params.zone}) </if>
<if test="deptId != null and deptId != ''">
and r.dept_id in (select sd.dept_id from sys_dept sd where find_in_set(#{deptId}, sd.ancestors) or sd.dept_id = #{deptId})
</if>
<if test="userId != null and userId != '' ">and( r.law_enforcer_id=#{userId} or r.law_enforcer_id_two like concat('%',#{userId}, '%')) </if>
<if test="beginTime != null and beginTime != ''">
and DATE_FORMAT(DATE_SUB(r.enforcement_time,INTERVAL -1 year),'%Y-%m-%d') >= DATE_FORMAT(#{beginTime},'%Y-%m-%d')
</if>
<if test="endTime != null and endTime != ''">
and DATE_FORMAT(#{endTime},'%Y-%m-%d') >= DATE_FORMAT(DATE_SUB(r.enforcement_time,INTERVAL -1 year),'%Y-%m-%d')
</if>
<if test="params.dataScope != null and params.dataScope != ''">
<!-- 数据范围过滤 -->
${params.dataScope}
</if>
GROUP BY r.union_no HAVING COUNT(1) &lt; 2) as t
)
</select> </select>
<select id="analysis_non_enterprisesIns" parameterType="SixAnalysisParams" resultType="integer"> <select id="analysis_non_enterprisesIns" parameterType="SixAnalysisParams" resultType="integer">
@ -1420,6 +1540,10 @@
<if test="userId != null and userId != '' ">and( r.law_enforcer_id=#{userId} or r.law_enforcer_id_two like concat('%',#{userId}, '%'))</if> <if test="userId != null and userId != '' ">and( r.law_enforcer_id=#{userId} or r.law_enforcer_id_two like concat('%',#{userId}, '%'))</if>
<if test="beginTime != null and beginTime != ''"> and DATE_FORMAT(r.enforcement_time,'%Y-%m-%d') >= DATE_FORMAT(#{beginTime},'%Y-%m-%d') </if> <if test="beginTime != null and beginTime != ''"> and DATE_FORMAT(r.enforcement_time,'%Y-%m-%d') >= DATE_FORMAT(#{beginTime},'%Y-%m-%d') </if>
<if test="endTime != null and endTime != ''"> and DATE_FORMAT(#{endTime},'%Y-%m-%d') >= DATE_FORMAT(r.enforcement_time,'%Y-%m-%d') </if> <if test="endTime != null and endTime != ''"> and DATE_FORMAT(#{endTime},'%Y-%m-%d') >= DATE_FORMAT(r.enforcement_time,'%Y-%m-%d') </if>
<if test="params.dataScope != null and params.dataScope != ''">
<!-- 数据范围过滤 -->
${params.dataScope}
</if>
</select> </select>
<select id="analysis_enterprisesIns_all" parameterType="SixAnalysisParams" resultType="integer"> <select id="analysis_enterprisesIns_all" parameterType="SixAnalysisParams" resultType="integer">
select select
@ -1444,6 +1568,10 @@
<if test="userId != null and userId != '' ">and( r.law_enforcer_id=#{userId} or r.law_enforcer_id_two like concat('%',#{userId}, '%'))</if> <if test="userId != null and userId != '' ">and( r.law_enforcer_id=#{userId} or r.law_enforcer_id_two like concat('%',#{userId}, '%'))</if>
<if test="beginTime != null and beginTime != ''"> and DATE_FORMAT(r.enforcement_time,'%Y-%m-%d') >= DATE_FORMAT(#{beginTime},'%Y-%m-%d') </if> <if test="beginTime != null and beginTime != ''"> and DATE_FORMAT(r.enforcement_time,'%Y-%m-%d') >= DATE_FORMAT(#{beginTime},'%Y-%m-%d') </if>
<if test="endTime != null and endTime != ''"> and DATE_FORMAT(#{endTime},'%Y-%m-%d') >= DATE_FORMAT(r.enforcement_time,'%Y-%m-%d') </if> <if test="endTime != null and endTime != ''"> and DATE_FORMAT(#{endTime},'%Y-%m-%d') >= DATE_FORMAT(r.enforcement_time,'%Y-%m-%d') </if>
<if test="params.dataScope != null and params.dataScope != ''">
<!-- 数据范围过滤 -->
${params.dataScope}
</if>
</select> </select>
<!-- 检查预告 --> <!-- 检查预告 -->
<select id="analysis_insNotice" parameterType="SixAnalysisParams" resultType="integer"> <select id="analysis_insNotice" parameterType="SixAnalysisParams" resultType="integer">
@ -1460,6 +1588,10 @@
<if test="isReg != null">and is_reg=#{isReg} </if> <if test="isReg != null">and is_reg=#{isReg} </if>
<if test="beginTime != null and beginTime != ''"> and DATE_FORMAT(n.enforcement_time,'%Y-%m-%d') >= DATE_FORMAT(#{beginTime},'%Y-%m-%d') </if> <if test="beginTime != null and beginTime != ''"> and DATE_FORMAT(n.enforcement_time,'%Y-%m-%d') >= DATE_FORMAT(#{beginTime},'%Y-%m-%d') </if>
<if test="endTime != null and endTime != ''"> and DATE_FORMAT(#{endTime},'%Y-%m-%d') >= DATE_FORMAT(n.enforcement_time,'%Y-%m-%d') </if> <if test="endTime != null and endTime != ''"> and DATE_FORMAT(#{endTime},'%Y-%m-%d') >= DATE_FORMAT(n.enforcement_time,'%Y-%m-%d') </if>
<if test="params.dataScope != null and params.dataScope != ''">
<!-- 数据范围过滤 -->
${params.dataScope}
</if>
</where> </where>
</select> </select>
<select id="analysis_insNotice_rr" parameterType="SixAnalysisParams" resultType="double"> <select id="analysis_insNotice_rr" parameterType="SixAnalysisParams" resultType="double">
@ -1479,6 +1611,10 @@
<if test="endTime != null and endTime != ''"> <if test="endTime != null and endTime != ''">
and DATE_SUB(STR_TO_DATE(#{endTime},"%Y-%m-%d"),INTERVAL TO_DAYS(STR_TO_DATE(#{endTime},"%Y-%m-%d"))-TO_DAYS(STR_TO_DATE(#{beginTime},"%Y-%m-%d"))+1 day)>=DATE_FORMAT(n.enforcement_time,'%Y-%m-%d') and DATE_SUB(STR_TO_DATE(#{endTime},"%Y-%m-%d"),INTERVAL TO_DAYS(STR_TO_DATE(#{endTime},"%Y-%m-%d"))-TO_DAYS(STR_TO_DATE(#{beginTime},"%Y-%m-%d"))+1 day)>=DATE_FORMAT(n.enforcement_time,'%Y-%m-%d')
</if> </if>
<if test="params.dataScope != null and params.dataScope != ''">
<!-- 数据范围过滤 -->
${params.dataScope}
</if>
</where> </where>
</select> </select>
<select id="analysis_insNotice_yoy" parameterType="SixAnalysisParams" resultType="double"> <select id="analysis_insNotice_yoy" parameterType="SixAnalysisParams" resultType="double">
@ -1498,6 +1634,10 @@
<if test="endTime != null and endTime != ''"> <if test="endTime != null and endTime != ''">
and DATE_FORMAT(#{endTime},'%Y-%m-%d') >= DATE_FORMAT(DATE_SUB(n.enforcement_time,INTERVAL -1 year),'%Y-%m-%d') and DATE_FORMAT(#{endTime},'%Y-%m-%d') >= DATE_FORMAT(DATE_SUB(n.enforcement_time,INTERVAL -1 year),'%Y-%m-%d')
</if> </if>
<if test="params.dataScope != null and params.dataScope != ''">
<!-- 数据范围过滤 -->
${params.dataScope}
</if>
</where> </where>
</select> </select>
<!-- 涉企投诉 --> <!-- 涉企投诉 -->
@ -1507,15 +1647,19 @@
and (c.rid is not null or c.complaint_department_id is not null) and (c.rid is not null or c.complaint_department_id is not null)
and c.enforce_type is not null and c.enforce_type is not null
and c.enterprise_number is not null and c.enterprise_number is not null
<if test="params.zone != null and params.zone != ''"> <!-- <if test="params.zone != null and params.zone != ''">-->
and c.complaint_department_id in (select dept_id from sys_dept where zone = #{params.zone}) <!-- and c.complaint_department_id in (select dept_id from sys_dept where zone = #{params.zone})-->
</if> <!-- </if>-->
<if test="deptId != null and deptId != ''"> <if test="deptId != null and deptId != ''">
and c.complaint_department_id in (select sd.dept_id from sys_dept sd where find_in_set(#{deptId}, sd.ancestors) or sd.dept_id = #{deptId}) and c.complaint_department_id in (select sd.dept_id from sys_dept sd where find_in_set(#{deptId}, sd.ancestors) or sd.dept_id = #{deptId})
</if> </if>
<if test="userId != null and userId != '' ">and( r.law_enforcer_id=#{userId} or c.law_enforcer_id_two=#{userId}) </if> <!-- <if test="userId != null and userId != '' ">and( r.law_enforcer_id=#{userId} or c.law_enforcer_id_two=#{userId}) </if>-->
<if test="beginTime != null and beginTime != ''"> and DATE_FORMAT(c.complaint_time,'%Y-%m-%d') >= DATE_FORMAT(#{beginTime},'%Y-%m-%d') </if> <if test="beginTime != null and beginTime != ''"> and DATE_FORMAT(c.complaint_time,'%Y-%m-%d') >= DATE_FORMAT(#{beginTime},'%Y-%m-%d') </if>
<if test="endTime != null and endTime != ''"> and DATE_FORMAT(#{endTime},'%Y-%m-%d') >= DATE_FORMAT(c.complaint_time,'%Y-%m-%d') </if> <if test="endTime != null and endTime != ''"> and DATE_FORMAT(#{endTime},'%Y-%m-%d') >= DATE_FORMAT(c.complaint_time,'%Y-%m-%d') </if>
<if test="params.dataScope != null and params.dataScope != ''">
<!-- 数据范围过滤 -->
${params.dataScope}
</if>
</where> </where>
</select> </select>
<select id="analysis_enterprisesComplaint_rr" parameterType="SixAnalysisParams" resultType="double"> <select id="analysis_enterprisesComplaint_rr" parameterType="SixAnalysisParams" resultType="double">
@ -1537,6 +1681,10 @@
<if test="endTime != null and endTime != ''"> <if test="endTime != null and endTime != ''">
and DATE_SUB(STR_TO_DATE(#{endTime},"%Y-%m-%d"),INTERVAL TO_DAYS(STR_TO_DATE(#{endTime},"%Y-%m-%d"))-TO_DAYS(STR_TO_DATE(#{beginTime},"%Y-%m-%d"))+1 day)>=DATE_FORMAT(c.enforcement_time,'%Y-%m-%d') and DATE_SUB(STR_TO_DATE(#{endTime},"%Y-%m-%d"),INTERVAL TO_DAYS(STR_TO_DATE(#{endTime},"%Y-%m-%d"))-TO_DAYS(STR_TO_DATE(#{beginTime},"%Y-%m-%d"))+1 day)>=DATE_FORMAT(c.enforcement_time,'%Y-%m-%d')
</if> </if>
<if test="params.dataScope != null and params.dataScope != ''">
<!-- 数据范围过滤 -->
${params.dataScope}
</if>
</where> </where>
</select> </select>
<select id="analysis_enterprisesComplaint_yoy" parameterType="SixAnalysisParams" resultType="double"> <select id="analysis_enterprisesComplaint_yoy" parameterType="SixAnalysisParams" resultType="double">
@ -1558,6 +1706,10 @@
<if test="endTime != null and endTime != ''"> <if test="endTime != null and endTime != ''">
and DATE_FORMAT(#{endTime},'%Y-%m-%d') >= DATE_FORMAT(DATE_SUB(c.enforcement_time,INTERVAL -1 year),'%Y-%m-%d') and DATE_FORMAT(#{endTime},'%Y-%m-%d') >= DATE_FORMAT(DATE_SUB(c.enforcement_time,INTERVAL -1 year),'%Y-%m-%d')
</if> </if>
<if test="params.dataScope != null and params.dataScope != ''">
<!-- 数据范围过滤 -->
${params.dataScope}
</if>
</where> </where>
</select> </select>
<!-- 被查企业 --> <!-- 被查企业 -->
@ -1584,6 +1736,10 @@
<if test="userId != null and userId != '' ">and( r.law_enforcer_id=#{userId} or r.law_enforcer_id_two like concat('%',#{userId}, '%')) </if> <if test="userId != null and userId != '' ">and( r.law_enforcer_id=#{userId} or r.law_enforcer_id_two like concat('%',#{userId}, '%')) </if>
<if test="beginTime != null and beginTime != ''"> and DATE_FORMAT(r.enforcement_time,'%Y-%m-%d') >= DATE_FORMAT(#{beginTime},'%Y-%m-%d') </if> <if test="beginTime != null and beginTime != ''"> and DATE_FORMAT(r.enforcement_time,'%Y-%m-%d') >= DATE_FORMAT(#{beginTime},'%Y-%m-%d') </if>
<if test="endTime != null and endTime != ''"> and DATE_FORMAT(#{endTime},'%Y-%m-%d') >= DATE_FORMAT(r.enforcement_time,'%Y-%m-%d') </if> <if test="endTime != null and endTime != ''"> and DATE_FORMAT(#{endTime},'%Y-%m-%d') >= DATE_FORMAT(r.enforcement_time,'%Y-%m-%d') </if>
<if test="params.dataScope != null and params.dataScope != ''">
<!-- 数据范围过滤 -->
${params.dataScope}
</if>
</select> </select>
<select id="analysis_enterprises_rr" parameterType="SixAnalysisParams" resultType="double"> <select id="analysis_enterprises_rr" parameterType="SixAnalysisParams" resultType="double">
select select
@ -1612,6 +1768,10 @@
<if test="endTime != null and endTime != ''"> <if test="endTime != null and endTime != ''">
and DATE_SUB(STR_TO_DATE(#{endTime},"%Y-%m-%d"),INTERVAL TO_DAYS(STR_TO_DATE(#{endTime},"%Y-%m-%d"))-TO_DAYS(STR_TO_DATE(#{beginTime},"%Y-%m-%d"))+1 day)>=DATE_FORMAT(r.enforcement_time,'%Y-%m-%d') and DATE_SUB(STR_TO_DATE(#{endTime},"%Y-%m-%d"),INTERVAL TO_DAYS(STR_TO_DATE(#{endTime},"%Y-%m-%d"))-TO_DAYS(STR_TO_DATE(#{beginTime},"%Y-%m-%d"))+1 day)>=DATE_FORMAT(r.enforcement_time,'%Y-%m-%d')
</if> </if>
<if test="params.dataScope != null and params.dataScope != ''">
<!-- 数据范围过滤 -->
${params.dataScope}
</if>
</select> </select>
<select id="analysis_enterprises_yoy" parameterType="SixAnalysisParams" resultType="double"> <select id="analysis_enterprises_yoy" parameterType="SixAnalysisParams" resultType="double">
select select
@ -1640,6 +1800,10 @@
<if test="endTime != null and endTime != ''"> <if test="endTime != null and endTime != ''">
and DATE_FORMAT(#{endTime},'%Y-%m-%d') >= DATE_FORMAT(DATE_SUB(r.enforcement_time,INTERVAL -1 year),'%Y-%m-%d') and DATE_FORMAT(#{endTime},'%Y-%m-%d') >= DATE_FORMAT(DATE_SUB(r.enforcement_time,INTERVAL -1 year),'%Y-%m-%d')
</if> </if>
<if test="params.dataScope != null and params.dataScope != ''">
<!-- 数据范围过滤 -->
${params.dataScope}
</if>
</select> </select>
<select id="analysis_non_enterprises" parameterType="SixAnalysisParams" resultType="integer"> <select id="analysis_non_enterprises" parameterType="SixAnalysisParams" resultType="integer">
select select
@ -1653,13 +1817,17 @@
and r.law_enforcer_id_other is not null and r.law_enforcer_id_other is not null
and r.law_enforcement_type is not null and r.law_enforcement_type is not null
and r.bureau_dept_id is not null and r.bureau_dept_id is not null
<if test="params.zone != null and params.zone != ''"> and r.bureau_dept_id in (select dept_id from sys_dept where zone = #{params.zone}) </if> <!-- <if test="params.zone != null and params.zone != ''"> and r.bureau_dept_id in (select dept_id from sys_dept where zone = #{params.zone}) </if>-->
<if test="deptId != null and deptId != ''"> <if test="deptId != null and deptId != ''">
and r.dept_id in (select sd.dept_id from sys_dept sd where find_in_set(#{deptId}, sd.ancestors) or sd.dept_id = #{deptId}) and r.dept_id in (select sd.dept_id from sys_dept sd where find_in_set(#{deptId}, sd.ancestors) or sd.dept_id = #{deptId})
</if> </if>
<if test="userId != null and userId != '' ">and( r.law_enforcer_id=#{userId} or r.law_enforcer_id_two like concat('%',#{userId}, '%'))</if> <!-- <if test="userId != null and userId != '' ">and( r.law_enforcer_id=#{userId} or r.law_enforcer_id_two like concat('%',#{userId}, '%'))</if>-->
<if test="beginTime != null and beginTime != ''"> and DATE_FORMAT(r.enforcement_time,'%Y-%m-%d') >= DATE_FORMAT(#{beginTime},'%Y-%m-%d') </if> <if test="beginTime != null and beginTime != ''"> and DATE_FORMAT(r.enforcement_time,'%Y-%m-%d') >= DATE_FORMAT(#{beginTime},'%Y-%m-%d') </if>
<if test="endTime != null and endTime != ''"> and DATE_FORMAT(#{endTime},'%Y-%m-%d') >= DATE_FORMAT(r.enforcement_time,'%Y-%m-%d') </if> <if test="endTime != null and endTime != ''"> and DATE_FORMAT(#{endTime},'%Y-%m-%d') >= DATE_FORMAT(r.enforcement_time,'%Y-%m-%d') </if>
<if test="params.dataScope != null and params.dataScope != ''">
<!-- 数据范围过滤 -->
${params.dataScope}
</if>
</select> </select>
<!-- 企业总数 --> <!-- 企业总数 -->
@ -1698,15 +1866,19 @@
and r.is_complaint is not null and r.is_complaint is not null
and r.check_category is not null and r.check_category is not null
and r.bureau_dept_id is not null and r.bureau_dept_id is not null
<if test="params.zone != null and params.zone != ''"> and r.bureau_dept_id in (select dept_id from sys_dept where zone = #{params.zone}) </if> <!-- <if test="params.zone != null and params.zone != ''"> and r.bureau_dept_id in (select dept_id from sys_dept where zone = #{params.zone}) </if>-->
<if test="deptId != null and deptId != ''"> <if test="deptId != null and deptId != ''">
and r.dept_id in (select sd.dept_id from sys_dept sd where find_in_set(#{deptId}, sd.ancestors) or sd.dept_id = #{deptId}) and r.dept_id in (select sd.dept_id from sys_dept sd where find_in_set(#{deptId}, sd.ancestors) or sd.dept_id = #{deptId})
</if> </if>
<if test="uniteCheck == '1'.toString()"> and (r.union_no is not null and r.union_no != '')</if> <if test="uniteCheck == '1'.toString()"> and (r.union_no is not null and r.union_no != '')</if>
<if test="uniteCheck == '0'.toString()"> and (r.union_no is null or r.union_no = '')</if> <if test="uniteCheck == '0'.toString()"> and (r.union_no is null or r.union_no = '')</if>
<if test="userId != null and userId != '' ">and( r.law_enforcer_id=#{userId} or r.law_enforcer_id_two like concat('%',#{userId}, '%'))</if> <!-- <if test="userId != null and userId != '' ">and( r.law_enforcer_id=#{userId} or r.law_enforcer_id_two like concat('%',#{userId}, '%'))</if>-->
<if test="beginTime != null and beginTime != ''"> and DATE_FORMAT(r.enforcement_time,'%Y-%m-%d') >= DATE_FORMAT(#{beginTime},'%Y-%m-%d') </if> <if test="beginTime != null and beginTime != ''"> and DATE_FORMAT(r.enforcement_time,'%Y-%m-%d') >= DATE_FORMAT(#{beginTime},'%Y-%m-%d') </if>
<if test="endTime != null and endTime != ''"> and DATE_FORMAT(#{endTime},'%Y-%m-%d') >= DATE_FORMAT(r.enforcement_time,'%Y-%m-%d') </if> <if test="endTime != null and endTime != ''"> and DATE_FORMAT(#{endTime},'%Y-%m-%d') >= DATE_FORMAT(r.enforcement_time,'%Y-%m-%d') </if>
<if test="params.dataScope != null and params.dataScope != ''">
<!-- 数据范围过滤 -->
${params.dataScope}
</if>
</where> </where>
group by DATE_FORMAT(enforcement_time, '%Y-%m') order by enforcement_time group by DATE_FORMAT(enforcement_time, '%Y-%m') order by enforcement_time
</select> </select>
@ -1723,13 +1895,17 @@
and r.law_enforcer_id_other is not null and r.law_enforcer_id_other is not null
and r.law_enforcement_type is not null and r.law_enforcement_type is not null
and r.bureau_dept_id is not null and r.bureau_dept_id is not null
<if test="params.zone != null and params.zone != ''"> and r.bureau_dept_id in (select dept_id from sys_dept where zone = #{params.zone}) </if> <!-- <if test="params.zone != null and params.zone != ''"> and r.bureau_dept_id in (select dept_id from sys_dept where zone = #{params.zone}) </if>-->
<if test="deptId != null and deptId != ''"> <if test="deptId != null and deptId != ''">
and r.dept_id in (select sd.dept_id from sys_dept sd where find_in_set(#{deptId}, sd.ancestors) or sd.dept_id = #{deptId}) and r.dept_id in (select sd.dept_id from sys_dept sd where find_in_set(#{deptId}, sd.ancestors) or sd.dept_id = #{deptId})
</if> </if>
<if test="userId != null and userId != '' ">and( r.law_enforcer_id=#{userId} or r.law_enforcer_id_two like concat('%',#{userId}, '%'))</if> <!-- <if test="userId != null and userId != '' ">and( r.law_enforcer_id=#{userId} or r.law_enforcer_id_two like concat('%',#{userId}, '%'))</if>-->
<if test="beginTime != null and beginTime != ''"> and DATE_FORMAT(r.enforcement_time,'%Y-%m-%d') >= DATE_FORMAT(#{beginTime},'%Y-%m-%d') </if> <if test="beginTime != null and beginTime != ''"> and DATE_FORMAT(r.enforcement_time,'%Y-%m-%d') >= DATE_FORMAT(#{beginTime},'%Y-%m-%d') </if>
<if test="endTime != null and endTime != ''"> and DATE_FORMAT(#{endTime},'%Y-%m-%d') >= DATE_FORMAT(r.enforcement_time,'%Y-%m-%d') </if> <if test="endTime != null and endTime != ''"> and DATE_FORMAT(#{endTime},'%Y-%m-%d') >= DATE_FORMAT(r.enforcement_time,'%Y-%m-%d') </if>
<if test="params.dataScope != null and params.dataScope != ''">
<!-- 数据范围过滤 -->
${params.dataScope}
</if>
group by DATE_FORMAT(enforcement_time, '%Y-%m') order by enforcement_time group by DATE_FORMAT(enforcement_time, '%Y-%m') order by enforcement_time
</select> </select>
<!-- 企业 --> <!-- 企业 -->
@ -1748,15 +1924,19 @@
and r.is_complaint is not null and r.is_complaint is not null
and r.check_category is not null and r.check_category is not null
and r.bureau_dept_id is not null and r.bureau_dept_id is not null
<if test="params.zone != null and params.zone != ''"> and r.bureau_dept_id in (select dept_id from sys_dept where zone = #{params.zone}) </if> <!-- <if test="params.zone != null and params.zone != ''"> and r.bureau_dept_id in (select dept_id from sys_dept where zone = #{params.zone}) </if>-->
<if test="deptId != null and deptId != ''"> <if test="deptId != null and deptId != ''">
and r.dept_id in (select sd.dept_id from sys_dept sd where find_in_set(#{deptId}, sd.ancestors) or sd.dept_id = #{deptId}) and r.dept_id in (select sd.dept_id from sys_dept sd where find_in_set(#{deptId}, sd.ancestors) or sd.dept_id = #{deptId})
</if> </if>
<if test="uniteCheck == '1'.toString()"> and (r.union_no is not null and r.union_no != '')</if> <if test="uniteCheck == '1'.toString()"> and (r.union_no is not null and r.union_no != '')</if>
<if test="uniteCheck == '0'.toString()"> and (r.union_no is null or r.union_no = '')</if> <if test="uniteCheck == '0'.toString()"> and (r.union_no is null or r.union_no = '')</if>
<if test="userId != null and userId != '' ">and( r.law_enforcer_id=#{userId} or r.law_enforcer_id_two like concat('%',#{userId}, '%')) </if> <!-- <if test="userId != null and userId != '' ">and( r.law_enforcer_id=#{userId} or r.law_enforcer_id_two like concat('%',#{userId}, '%')) </if>-->
<if test="beginTime != null and beginTime != ''"> and DATE_FORMAT(r.enforcement_time,'%Y-%m-%d') >= DATE_FORMAT(#{beginTime},'%Y-%m-%d') </if> <if test="beginTime != null and beginTime != ''"> and DATE_FORMAT(r.enforcement_time,'%Y-%m-%d') >= DATE_FORMAT(#{beginTime},'%Y-%m-%d') </if>
<if test="endTime != null and endTime != ''"> and DATE_FORMAT(#{endTime},'%Y-%m-%d') >= DATE_FORMAT(r.enforcement_time,'%Y-%m-%d') </if> <if test="endTime != null and endTime != ''"> and DATE_FORMAT(#{endTime},'%Y-%m-%d') >= DATE_FORMAT(r.enforcement_time,'%Y-%m-%d') </if>
<if test="params.dataScope != null and params.dataScope != ''">
<!-- 数据范围过滤 -->
${params.dataScope}
</if>
</where> </where>
group by DATE_FORMAT(enforcement_time, '%Y-%m') order by enforcement_time group by DATE_FORMAT(enforcement_time, '%Y-%m') order by enforcement_time
</select> </select>
@ -1767,6 +1947,14 @@
left join non_enforcement_registration nr on nr.law_enforcement_type = sdd.dict_value left join non_enforcement_registration nr on nr.law_enforcement_type = sdd.dict_value
<where> <where>
and sdd.dict_type = 'no_check_category' and sdd.dict_type = 'no_check_category'
and nr.bureau_dept_name is not null
and nr.dept_id is not null
and nr.enterprise_name is not null
and nr.enterprise_number is not null
and nr.law_enforcer_id is not null
and nr.law_enforcer_id_other is not null
and nr.law_enforcement_type is not null
and nr.bureau_dept_id is not null
<if test="params.zone != null and params.zone != ''"> and nr.bureau_dept_id in (select dept_id from sys_dept where zone = #{params.zone}) </if> <if test="params.zone != null and params.zone != ''"> and nr.bureau_dept_id in (select dept_id from sys_dept where zone = #{params.zone}) </if>
<if test="deptId != null and deptId != ''"> <if test="deptId != null and deptId != ''">
and nr.dept_id in (select sd.dept_id from sys_dept sd where find_in_set(#{deptId}, sd.ancestors) or sd.dept_id = #{deptId}) and nr.dept_id in (select sd.dept_id from sys_dept sd where find_in_set(#{deptId}, sd.ancestors) or sd.dept_id = #{deptId})
@ -1776,8 +1964,12 @@
<if test="userId != null and userId != '' ">and( nr.law_enforcer_id=#{userId} or nr.law_enforcer_id_two=#{userId}) </if> <if test="userId != null and userId != '' ">and( nr.law_enforcer_id=#{userId} or nr.law_enforcer_id_two=#{userId}) </if>
<if test="beginTime != null and beginTime != ''"> and DATE_FORMAT(nr.enforcement_time,'%Y-%m-%d') >= DATE_FORMAT(#{beginTime},'%Y-%m-%d') </if> <if test="beginTime != null and beginTime != ''"> and DATE_FORMAT(nr.enforcement_time,'%Y-%m-%d') >= DATE_FORMAT(#{beginTime},'%Y-%m-%d') </if>
<if test="endTime != null and endTime != ''"> and DATE_FORMAT(#{endTime},'%Y-%m-%d') >= DATE_FORMAT(nr.enforcement_time,'%Y-%m-%d') </if> <if test="endTime != null and endTime != ''"> and DATE_FORMAT(#{endTime},'%Y-%m-%d') >= DATE_FORMAT(nr.enforcement_time,'%Y-%m-%d') </if>
<if test="params.dataScope != null and params.dataScope != ''">
<!-- 数据范围过滤 -->
${params.dataScope}
</if>
</where> </where>
group by sdd.dict_value group by nr.law_enforcement_type order by sdd.dict_sort asc
</select> </select>
<!-- 行政检查类型统计 --> <!-- 行政检查类型统计 -->
@ -1786,8 +1978,17 @@
left join enforcement_registration r on r.check_category = sdd.dict_value left join enforcement_registration r on r.check_category = sdd.dict_value
<where> <where>
and sdd.dict_type = 'check_category' and sdd.dict_type = 'check_category'
and r.bureau_dept_name is not null
and r.is_submit = 1 and r.is_submit = 1
<if test="params.zone != null and params.zone != ''"> and r.bureau_dept_id in (select dept_id from sys_dept where zone = #{params.zone}) </if> and r.law_enforcement_id is not null
and r.enterprise_name is not null
and r.enterprise_number is not null
and r.law_enforcer is not null
and r.law_enforcer_two is not null
and r.is_complaint is not null
and r.check_category is not null
and r.bureau_dept_id is not null
<!-- <if test="params.zone != null and params.zone != ''"> and r.bureau_dept_id in (select dept_id from sys_dept where zone = #{params.zone}) </if>-->
<if test="deptId != null and deptId != ''"> <if test="deptId != null and deptId != ''">
and r.dept_id in (select sd.dept_id from sys_dept sd where find_in_set(#{deptId}, sd.ancestors) or sd.dept_id = #{deptId}) and r.dept_id in (select sd.dept_id from sys_dept sd where find_in_set(#{deptId}, sd.ancestors) or sd.dept_id = #{deptId})
</if> </if>
@ -1796,7 +1997,11 @@
<if test="userId != null and userId != '' ">and( r.law_enforcer_id=#{userId} or r.law_enforcer_id_two=#{userId}) </if> <if test="userId != null and userId != '' ">and( r.law_enforcer_id=#{userId} or r.law_enforcer_id_two=#{userId}) </if>
<if test="beginTime != null and beginTime != ''"> and DATE_FORMAT(r.enforcement_time,'%Y-%m-%d') >= DATE_FORMAT(#{beginTime},'%Y-%m-%d') </if> <if test="beginTime != null and beginTime != ''"> and DATE_FORMAT(r.enforcement_time,'%Y-%m-%d') >= DATE_FORMAT(#{beginTime},'%Y-%m-%d') </if>
<if test="endTime != null and endTime != ''"> and DATE_FORMAT(#{endTime},'%Y-%m-%d') >= DATE_FORMAT(r.enforcement_time,'%Y-%m-%d') </if> <if test="endTime != null and endTime != ''"> and DATE_FORMAT(#{endTime},'%Y-%m-%d') >= DATE_FORMAT(r.enforcement_time,'%Y-%m-%d') </if>
<if test="params.dataScope != null and params.dataScope != ''">
<!-- 数据范围过滤 -->
${params.dataScope}
</if>
</where> </where>
group by sdd.dict_value group by r.check_category
</select> </select>
</mapper> </mapper>
Loading…
Cancel
Save