From 39182e08f3888a182ad3aa60fafa8a0d4983c176 Mon Sep 17 00:00:00 2001 From: zouyx <1798599149@qq.com> Date: Fri, 8 Nov 2024 10:33:49 +0800 Subject: [PATCH] =?UTF-8?q?=E9=83=A8=E9=97=A8=E7=BB=9F=E8=AE=A1=EF=BC=8C?= =?UTF-8?q?=E7=BB=BC=E5=90=88=E5=88=86=E6=9E=90=EF=BC=8C=E6=89=A7=E6=B3=95?= =?UTF-8?q?=E5=88=86=E6=9E=90=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../project/code/deptStatic/deptStatic.html | 1 - .../project/code/deptStatic/fragmentB.html | 2 +- .../code/registration/registration.html | 290 +++++++++++++++--- .../code/registration/staticRegistration.html | 8 +- .../code/controller/DeptStaticController.java | 4 +- .../dto/EnforcementRegistrationDto.java | 25 ++ .../mapper/EnforcementRegistrationMapper.xml | 6 + .../mapper/StatisticalPanelMapper.xml | 4 +- .../resources/mapper/Zfryjdm2405301Mapper.xml | 3 +- 9 files changed, 294 insertions(+), 49 deletions(-) diff --git a/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/code/deptStatic/deptStatic.html b/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/code/deptStatic/deptStatic.html index c38ecff2..d0226fa6 100644 --- a/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/code/deptStatic/deptStatic.html +++ b/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/code/deptStatic/deptStatic.html @@ -43,7 +43,6 @@

- diff --git a/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/code/deptStatic/fragmentB.html b/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/code/deptStatic/fragmentB.html index ea39c200..0b0d4ef2 100644 --- a/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/code/deptStatic/fragmentB.html +++ b/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/code/deptStatic/fragmentB.html @@ -2,7 +2,7 @@ -
  • +

  • 全市:

    diff --git a/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/code/registration/registration.html b/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/code/registration/registration.html index c45672f6..dd59556e 100644 --- a/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/code/registration/registration.html +++ b/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/code/registration/registration.html @@ -212,15 +212,15 @@
    -->
    -

    2024年年度执法检查排行（TOP10）

    +

    执法检查排行（TOP10）

    -

    2024年季度执法检查排行（TOP10）

    +

    执法检查排行（TOP10）

    -

    2024年月度执法检查排行（TOP10）

    +

    执法检查排行（TOP10）

    @@ -250,6 +250,9 @@ var rowData=[]; /*var echart1=echarts.init(document.getElementById('container1'));*/ var echart1=echarts.init(document.getElementById('echartRegistration')); + var echart2=echarts.init(document.getElementById('echarts2')); + var echart3=echarts.init(document.getElementById('echarts3')); + var echart4=echarts.init(document.getElementById('echarts4')); /*var echart2=echarts.init(document.getElementById('container2')); var echart3=echarts.init(document.getElementById('container3')); var echart4=echarts.init(document.getElementById('container4'));*/ @@ -474,7 +477,8 @@ currentId.resize(); });*/ } - /*function echarts2(){ + function echarts2(){ + $("#echarts2-title").text(currentYear+'年年度'); $.ajax({ url: prefix + '/echarts2', type: 'POST', @@ -490,22 +494,90 @@ ydata.push(e.value) }); var option2 = { - tooltip: {}, - xAxis: { - data:xdata, + calculable :false, + grid:{ + left: '1%', + right: '2%', + bottom: '1%', + top: '20%', + containLabel: true }, - yAxis: { + + tooltip : { + axisPointer : { + type : 'shadow' + } }, - legend:{ + xAxis: [{ + data: xdata, + axisLabel: { + show: true, + rotate: '30', + textStyle: { + color: 'rgba(0,0,0,.5)' + } + }, + splitLine: { + lineStyle: { + width: 0, + type: 'solid' + } + }, + axisLine: { + show: false, + }, + axisTick: { + show: false + } + }], + yAxis: [{ + type : 'value', + axisLabel: { + show: true, + textStyle: { + color: 'rgba(0,0,0,.5)' + } + }, + splitLine:{ + lineStyle:{ + color:['#f2f2f2'], + width:1.5, + type:'solid', + } + }, + axisLine: { + show: false, + }, + axisTick: { + show: false + } + }], + /*legend:{ data:[currentYear+'年年度执法检查排行(TOP10)'] - }, + },*/ series:[ { name:currentYear+'年年度执法检查排行(TOP10)', data:ydata, type:'bar', - color: "rgba(24, 116, 205, 1)", - barWidth: 50 + barWidth: 15, + barGap: 15, + smooth: false, + stack: '总量', + itemStyle: { + emphasis: { + barBorderRadius: 0 + },normal: { + barBorderRadius: 0, + color: new echarts.graphic.LinearGradient( + 0, 0, 1, 0, + [ + {offset: 0, color: '#3977E6'}, + {offset: 1, color: '#37BBF8'} + + ] + ) + }}, } ] }; @@ -514,6 +586,7 @@ }) } function echarts3(){ + $("#echarts3-title").text(currentYear+'年'+currentQuarter); $.ajax({ url: prefix + '/echarts3', type: 'POST', @@ -528,22 +601,91 @@ ydata.push(e.value) }); var option3 = { - tooltip: {}, - xAxis: { - data:xdata, + calculable :false, + grid:{ + left: '1%', + right: '2%', + bottom: '1%', + top: '20%', + containLabel: true }, - yAxis: { + + tooltip : { + axisPointer : { + type : 'shadow' + } }, - legend:{ + xAxis: [{ + data:xdata, + axisLabel: { + show: true, + rotate: '30', + textStyle: { + color: 'rgba(0,0,0,.5)' + } + }, + splitLine: { + lineStyle: { + width: 0, + type: 'solid' + } + }, + axisLine: { + show: false, + }, + axisTick: { + show: false + } + }], + yAxis: [{ + type : 'value', + axisLabel: { + show: true, + textStyle: { + color: 'rgba(0,0,0,.5)' + } + }, + splitLine:{ + lineStyle:{ + color:['#f2f2f2'], + width:1.5, + type:'solid', + } + }, + axisLine: { + show: false, + }, + axisTick: { + show: false + } + }], + /*legend:{ data:[currentYear+'年'+currentQuarter+'执法检查排行(TOP10)'] - }, + },*/ series:[ { - name:currentYear+'年'+currentQuarter+'执法检查排行(TOP10)', - data:ydata, - type:'bar', - color: "rgba(24, 116, 205, 1)", - barWidth: 50 + name: currentYear + '年' + currentQuarter + '执法检查排行(TOP10)', + data: ydata, + type: 'bar', + barWidth: 15, + barGap: 15, + smooth: false, + stack: '总量', + itemStyle: { + emphasis: { + barBorderRadius: 0 + }, normal: { + barBorderRadius: 0, + color: new echarts.graphic.LinearGradient( + 0, 0, 1, 0, + [ + {offset: 0, color: '#3977E6'}, + {offset: 1, color: '#37BBF8'} + + ] + ) + } + }, } ] }; @@ -552,6 +694,7 @@ }) } function echarts4(){ + $("#echarts4-title").text(currentYear+'年'+currentMonth+'月'); $.ajax({ url: prefix + '/echarts4', type: 'POST', @@ -566,29 +709,98 @@ ydata.push(e.value) }); var option4 = { - tooltip: {}, - xAxis: { - data:xdata, + calculable :false, + grid:{ + left: '1%', + right: '2%', + bottom: '1%', + top: '20%', + containLabel: true }, - yAxis: { + + tooltip : { + axisPointer : { + type : 'shadow' + } }, - legend:{ + xAxis: [{ + data:xdata, + axisLabel: { + show: true, + rotate: '30', + textStyle: { + color: 'rgba(0,0,0,.5)' + } + }, + splitLine: { + lineStyle: { + width: 0, + type: 'solid' + } + }, + axisLine: { + show: false, + }, + axisTick: { + show: false + } + }], + yAxis: [{ + type : 'value', + axisLabel: { + show: true, + textStyle: { + color: 'rgba(0,0,0,.5)' + } + }, + splitLine:{ + lineStyle:{ + color:['#f2f2f2'], + width:1.5, + type:'solid', + } + }, + axisLine: { + show: false, + }, + axisTick: { + show: false + } + }], + /*legend:{ data:[currentYear+'年'+currentMonth+'月执法检查排行(TOP10)'] - }, + },*/ series:[ { name:currentYear+'年'+currentMonth+'月执法检查排行(TOP10)', data:ydata, - type:'bar', - color: "rgba(24, 116, 205, 1)", - barWidth: 50 + type: 'bar', + barWidth: 15, + barGap: 15, + smooth: false, + stack: '总量', + itemStyle: { + emphasis: { + barBorderRadius: 0 + }, normal: { + barBorderRadius: 0, + color: new echarts.graphic.LinearGradient( + 0, 0, 1, 0, + [ + {offset: 0, color: '#3977E6'}, + {offset: 1, color: '#37BBF8'} + + ] + ) + } + }, } ] }; echart4.setOption(option4); } }) - }*/ + } $(function() { var options2 = { @@ -866,7 +1078,7 @@ /*******2.年度计划TOP10********/ - var myChart = echarts.init(document.getElementById('echarts2')); + /*var myChart = echarts.init(document.getElementById('echarts2')); var option = { color:["#2d4beb","#03a978",], @@ -1011,7 +1223,7 @@ myChart.resize(); }); - /*******3.季度计划TOP10********/ + /!*******3.季度计划TOP10********!/ var myChart = echarts.init(document.getElementById('echarts3')); var option = { @@ -1207,7 +1419,7 @@ myChart.resize(); }); - /*******4.月度计划TOP10********/ + /!*******4.月度计划TOP10********!/ var myChart = echarts.init(document.getElementById('echarts4')); var option = { @@ -1281,10 +1493,10 @@ textStyle: { color: 'rgba(0,0,0,.5)' }, - /*formatter: (value) => { + /!*formatter: (value) => { const list = ['差', '较差', '','较好','', '好'] return list[value/20] - }*/ + }*!/ }, splitLine:{ @@ -1597,7 +1809,7 @@ myChart.setOption(option); window.addEventListener("resize",function(){ myChart.resize(); - }); + });*/ \ No newline at end of file diff --git a/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/code/registration/staticRegistration.html b/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/code/registration/staticRegistration.html index 93508c1d..a2a38336 100644 --- a/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/code/registration/staticRegistration.html +++ b/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/code/registration/staticRegistration.html @@ -117,6 +117,7 @@ var checkCategory=[[${@dict.getType('check_category')}]]; var prefix = ctx + "code/registration"; var searchType; + var currentYear = new Date().getFullYear(); window.onload = function () { /*$("#quarter").hide(); $("#month").hide(); @@ -340,10 +341,9 @@ searchType=params; console.log(params); $("#bootstrap-table").bootstrapTable('refresh', params); - zhanbi(); - + /*zhanbi();*/ } - function zhanbi (){ + /*function zhanbi (){ enforcementRegistration={ "lawEnforcement":searchType.lawEnforcement, "lawEnforcer":searchType.lawEnforcer, @@ -370,7 +370,7 @@ $('#a').html(response); } }) - } + }*/ $(document).ready(); function download1(){ /*startTime=searchType.beginTime; diff --git a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/controller/DeptStaticController.java b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/controller/DeptStaticController.java index d11b48c4..fed9e10d 100644 --- a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/controller/DeptStaticController.java +++ b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/controller/DeptStaticController.java @@ -95,7 +95,9 @@ public class DeptStaticController extends BaseController { startPage(); List zfryjdm2405301List=iZfryjdm2405301Service.selectZfryjdmList2(zfryjdm2405301); for(int i=0;i users=new ArrayList<>(); for(User u:list){ diff --git a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/domain/dto/EnforcementRegistrationDto.java b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/domain/dto/EnforcementRegistrationDto.java index 4335986f..4bcea386 100644 --- a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/domain/dto/EnforcementRegistrationDto.java +++ b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/domain/dto/EnforcementRegistrationDto.java @@ -52,6 +52,15 @@ public class EnforcementRegistrationDto extends BaseDomain { * 月度 */ private String month; + /** + * 开始时间 + */ + private String beginTime; + + /** + * 结束时间 + */ + private String endTime; public String getEnterpriseName() { @@ -149,4 +158,20 @@ public class EnforcementRegistrationDto extends BaseDomain { public void setMonth(String month) { this.month = month; } + + public String getBeginTime() { + return beginTime; + } + + public void setBeginTime(String beginTime) { + this.beginTime = beginTime; + } + + public String getEndTime() { + return endTime; + } + + public void setEndTime(String endTime) { + this.endTime = endTime; + } } diff --git a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/resources/mapper/EnforcementRegistrationMapper.xml b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/resources/mapper/EnforcementRegistrationMapper.xml index bc1490f4..2ea416b1 100644 --- a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/resources/mapper/EnforcementRegistrationMapper.xml +++ b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/resources/mapper/EnforcementRegistrationMapper.xml @@ -574,6 +574,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" AND + + and DATE_FORMAT(create_time,'%Y-%m-%d') >= STR_TO_DATE(#{beginTime},'%Y-%m-%d') + + + and DATE_FORMAT(create_time,'%Y-%m-%d') <= STR_TO_DATE(#{endTime},'%Y-%m-%d') + ORDER BY create_time DESC LIMIT 1000000000 ) t GROUP BY diff --git a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/resources/mapper/StatisticalPanelMapper.xml b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/resources/mapper/StatisticalPanelMapper.xml index 21309a10..6966f4cc 100644 --- a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/resources/mapper/StatisticalPanelMapper.xml +++ b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/resources/mapper/StatisticalPanelMapper.xml @@ -12,11 +12,11 @@ select z.id, z.sfyx, z.rylx, z.zfzzfdw, z.zfryid, z.name, z.sfzcode, z.zzjgdm, z.zfdw, z.address, z.sub_name, z.is_lawcode, z.code_state, z.zfcode, z.sfzcode_encrypt, s.phoneNumber from zfryjdm2405301 z - left join sys_user s + left join (select * from sys_user where status='0' and del_flag='0' group by certificateNumber) s on z.sfzcode_encrypt=s.certificateNumber where z.code_state = '01' and z.name is not null @@ -47,6 +47,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" and z.name like concat('%',#{name},'%') and z.zfdw like concat('%',#{zfdw},'%') and z.zfcode like concat('%',#{zfcode},'%') + group by z.sfzcode