diff --git a/lib/EmergencyService/zdxtEmergencyAppService/src/main/java/com/zdxt/app/controller/AppEnforcementCheckStatisticsController.java b/lib/EmergencyService/zdxtEmergencyAppService/src/main/java/com/zdxt/app/controller/AppEnforcementCheckStatisticsController.java new file mode 100644 index 00000000..175168b9 --- /dev/null +++ b/lib/EmergencyService/zdxtEmergencyAppService/src/main/java/com/zdxt/app/controller/AppEnforcementCheckStatisticsController.java @@ -0,0 +1,272 @@ +package com.zdxt.app.controller; + + +import com.google.common.collect.Lists; +import com.zdxt.auth.project.system.dept.mapper.DeptMapper; +import com.zdxt.auth.project.system.user.mapper.UserMapper; +import com.zdxt.code.domain.*; +import com.zdxt.code.mapper.Zfryjdm2405301Mapper; +import com.zdxt.code.service.EnforcementCheckStatisticsService; +import com.zdxt.common.ZDResponse; +import com.zdxt.common.controller.BaseController; +import com.zdxt.common.util.StringUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Controller; +import org.springframework.web.bind.annotation.*; + +import javax.servlet.http.HttpServletResponse; +import java.text.ParseException; +import java.util.*; +import java.util.stream.Collectors; + + +/** + * 行政执法检查统计Controller + * + * @author zouyaxin + * @date 2024/8/29 + */ + +@Controller +@RequestMapping("/app/enforcementCheckStatistics") +public class AppEnforcementCheckStatisticsController extends BaseController { + private String prefix = "code/enforcementCheckStatistics"; + + @Autowired + private EnforcementCheckStatisticsService enforcementCheckStatisticsService; + @Autowired + private UserMapper userMapper; + @Autowired + private Zfryjdm2405301Mapper zfryjdm2405301Mapper; + @Autowired + private DeptMapper deptMapper; + + @GetMapping ("/queryList/{year}/{month}") + @ResponseBody + public void queryList(HttpServletResponse response, @PathVariable String year, @PathVariable List month) throws ParseException {//以执法主体维度统计 + EnforcementCheckStatistics enforcementCheckStatistics=new EnforcementCheckStatistics(); + String month1=StringUtils.join(month,","); + enforcementCheckStatistics.setYear(year); + enforcementCheckStatistics.setMonth(month1); + System.out.println(enforcementCheckStatistics); + //查出区下所有区的id + List areaAllList = enforcementCheckStatisticsService.selectAllAreaList(); + //存放以区id为键，该id下的所有记录为值 + Map> list=new HashMap<>(); + for(int i=0;i statisticslist = enforcementCheckStatisticsService.selectEnforcementCheckStatisticsList(enforcementCheckStatistics1); + //以区id为键，区下所有执法记录为值 + list.put(areaAllList.get(i).getDeptName(), statisticslist);//区名为键 + //list.put(areaAllList.get(i).getDeptId(), statisticslist); + } + EnforcementCheckStatistics e2=new EnforcementCheckStatistics(); + e2.setYear(year); + e2.setMonth(month1); + list.put("市",enforcementCheckStatisticsService.selectEnforcementCheckStatisticsCityList(e2));//区外也加入 + List inOrderList=new ArrayList<>(); + Collections.addAll(inOrderList,"福田区","罗湖区","盐田区","南山区","宝安区","龙岗区","龙华区", + "坪山区","光明区","大鹏新区","深汕特别合作区","市"); + List enterpriseStreet=enforcementCheckStatisticsService.selectEnterpriseStreetList(); + enforcementCheckStatisticsService.excelExport(response,enforcementCheckStatistics,inOrderList,list,enterpriseStreet); + } + + //http://10.132.108.3:85/enforcementCheckStatistics/queryEnterpriseAddressList?enterpriseAddress=地区名 + @GetMapping ("/queryEnterpriseAddressList") + @ResponseBody + public void queryEnterpriseAddressList(HttpServletResponse response, @RequestParam String enterpriseAddress) + { + EnterpriseStreet enterpriseStreet=new EnterpriseStreet(); + enterpriseStreet.setEnterpriseAddress(enterpriseAddress); + List enterpriseStreetList=enforcementCheckStatisticsService.selectEnterpriseName(enterpriseStreet); + System.out.println(enterpriseStreetList); + enforcementCheckStatisticsService.excelExport2(response,enterpriseStreetList,enterpriseAddress); + } + //http://localhost:85/enforcementCheckStatistics/queryAllList/2024-8-26/2024-8-28 + @GetMapping ("/queryAllList/{startTime}/{endTime}") + @ResponseBody + public void queryAllList(HttpServletResponse response, @PathVariable String startTime, @PathVariable String endTime) throws ParseException {//以企业维度统计 + EnforcementCheckStatistics enforcementCheckStatistics=new EnforcementCheckStatistics(); +/* String month1=StringUtils.join(month,","); + enforcementCheckStatistics.setYear(year); + enforcementCheckStatistics.setMonth(month1);*/ + enforcementCheckStatistics.setStartTime(startTime); + enforcementCheckStatistics.setEndTime(endTime); + enforcementCheckStatistics.setNowTime(new Date()); + List enforcementCheckStatisticsList=enforcementCheckStatisticsService.selectAllStatisticsList(enforcementCheckStatistics); + List inOrderList=new ArrayList<>(); + Collections.addAll(inOrderList,"福田区","罗湖区","盐田区","南山区","宝安区","龙岗区","龙华区", + "坪山区","光明区","大鹏新区","深汕特别合作区"); + Map> enforcementCheckStatisticsMap=new HashMap<>(); + for(int i=0;i e1=enforcementCheckStatisticsList.stream().filter(item->item.getEnterpriseAddress().contains(area)).collect(Collectors.toList()); + List e1=new ArrayList<>(); + if(area.equals("光明区")){//光明区特殊处理 + //e1 = enforcementCheckStatisticsList.stream().collect(Collectors.groupingBy(item -> ((item.getEnterpriseAddress().contains(area)||(item.getEnterpriseAddress().contains("光明新区")))? area : "其他"))); + e1=enforcementCheckStatisticsList.stream().filter(item->(item.getEnterpriseAddress().contains(area)||item.getEnterpriseAddress().contains("光明新区"))).collect(Collectors.toList()); + }else { + // e1 = enforcementCheckStatisticsList.stream().collect(Collectors.groupingBy(item -> (item.getEnterpriseAddress().contains(area)? area : "其他"))); + e1=enforcementCheckStatisticsList.stream().filter(item->item.getEnterpriseAddress().contains(area)).collect(Collectors.toList()); + } + enforcementCheckStatisticsMap.put(area,e1); + } + //将地址不属于各个区的筛出来放入执法记录map + List qt=enforcementCheckStatisticsList.stream().filter(item->!( + item.getEnterpriseAddress().contains("福田区")||item.getEnterpriseAddress().contains("罗湖区")|| + item.getEnterpriseAddress().contains("盐田区")||item.getEnterpriseAddress().contains("南山区")|| + item.getEnterpriseAddress().contains("宝安区")||item.getEnterpriseAddress().contains("龙岗区")|| + item.getEnterpriseAddress().contains("龙华区")||item.getEnterpriseAddress().contains("坪山区")|| + item.getEnterpriseAddress().contains("大鹏新区")||item.getEnterpriseAddress().contains("深汕特别合作区")|| + item.getEnterpriseAddress().contains("光明区")||item.getEnterpriseAddress().contains("光明新区"))) + .collect(Collectors.toList()); + enforcementCheckStatisticsMap.put("其他",qt); + List enterpriseStreet=enforcementCheckStatisticsService.selectEnterpriseStreetList(); + inOrderList.add("其他"); + enforcementCheckStatisticsService.excelExport(response,enforcementCheckStatistics,inOrderList,enforcementCheckStatisticsMap,enterpriseStreet); + } + @GetMapping("/statisticsIndicator") + @ResponseBody + public ZDResponse statisticsIndicator(){ + return ZDResponse.success("统计成功", enforcementCheckStatisticsService.sjtjzb()); + } + @GetMapping("/statisticsIndicator1") + @ResponseBody + public ZDResponse statisticsIndicator1(){ + return ZDResponse.success("企业维度统计成功",enforcementCheckStatisticsService.enterpriseStatistics()); + } + @GetMapping("/statisticsIndicator2") + @ResponseBody + public ZDResponse statisticsIndicator2(){ + return ZDResponse.success("执法主体维度统计成功",enforcementCheckStatisticsService.enforcementStatistics()); + } + @GetMapping("/statisticsIndicator3/{startTime}/{endTime}/{dateType}") + @ResponseBody + public ZDResponse statisticsIndicator3(@PathVariable String startTime,@PathVariable String endTime,@PathVariable int dateType){ + return ZDResponse.success("执法检查维度统计成功",enforcementCheckStatisticsService.checkStatistics(startTime,endTime,dateType)); + } + @GetMapping("/statisticsIndicator4/{startTime}/{endTime}/{dateType}") + @ResponseBody + public ZDResponse statisticsIndicator4(@PathVariable String startTime,@PathVariable String endTime,@PathVariable int dateType){ + return ZDResponse.success("投诉维度统计成功",enforcementCheckStatisticsService.complaintStatistics(startTime,endTime,dateType)); + } + @GetMapping("/statisticsIndicator5") + @ResponseBody + public ZDResponse statisticsIndicator5(){ + return ZDResponse.success("检查计划维度统计成功",enforcementCheckStatisticsService.planStatistics()); + } + @GetMapping("/statisticsIndicator6/{startTime}/{endTime}/{dateType}") + @ResponseBody + public ZDResponse statisticsIndicator6(@PathVariable String startTime,@PathVariable String endTime,@PathVariable int dateType){ + return ZDResponse.success("预警维度统计成功",enforcementCheckStatisticsService.warningStatistics(startTime,endTime,dateType)); + } + @GetMapping("/huan/{bureauDeptId}") + @ResponseBody + public ZDResponse statisticsIndicator4(@PathVariable String bureauDeptId){ + return ZDResponse.success("执法主体执法环比成功",enforcementCheckStatisticsService.Include(bureauDeptId)); + } + @GetMapping("/statisticsIndicatorWaring/{startTime}/{endTime}/{dateType}") + @ResponseBody + public ZDResponse statisticsIndicatorWaring(@PathVariable String startTime,@PathVariable String endTime,@PathVariable int dateType){ + return ZDResponse.success("预警时间筛选",enforcementCheckStatisticsService.TimeFiltering3(startTime,endTime,dateType)); + } + @GetMapping("/statisticsIndicatorTest") + @ResponseBody + public ZDResponse statisticsIndicatorTest(EnforcementRegistration enforcementRegistration){ + return ZDResponse.success("成功",enforcementRegistration); + } + + @GetMapping("/statisticsIndicatorPart1") + @ResponseBody + public ZDResponse statisticsIndicatorPart1(EnforcementRegistration enforcementRegistration){ + if(enforcementRegistration.getBeginTime()==null||"".equals(enforcementRegistration.getBeginTime())){ + enforcementRegistration.setBeginTime("0"); + } + if(enforcementRegistration.getEndTime()==null||"".equals(enforcementRegistration.getEndTime())){ + enforcementRegistration.setEndTime("0"); + } + //当不需要时间筛选时startTime=0，endTime=0，dateType=0 月度 dateType=6，年度 dateType=5，季度 dateType=1 自定义时，startTime，endTime；dateType=0 + List statisticsIndicatorPartList =enforcementCheckStatisticsService.statisticsIndicatorPart1(enforcementRegistration); + return ZDResponse.success("成功", statisticsIndicatorPartList); + } + @GetMapping("/statisticsIndicatorPart2") + @ResponseBody + public ZDResponse statisticsIndicatorPart2(SearchType searchType) throws ParseException { + + if(StringUtils.isNotEmpty(searchType.getEnterpriseTypeStr())){ + String[] split = searchType.getEnterpriseTypeStr().split(","); + List strings = Arrays.asList(split); + searchType.setEnterpriseType(strings); + } + if(StringUtils.isNotEmpty(searchType.getCheckTypeStr())){ + String[] split = searchType.getCheckTypeStr().split(","); + List strings = Arrays.asList(split); + List transform = Lists.transform(strings, res -> { + return Integer.valueOf(res); + }); + searchType.setCheckType(transform); + } + if(StringUtils.isNotEmpty(searchType.getComplaintTypeStr())){ + String[] split = searchType.getComplaintTypeStr().split(","); + List strings = Arrays.asList(split); + List transform = Lists.transform(strings, res -> { + return Integer.valueOf(res); + }); + searchType.setComplaintType(transform); + } + //区域和企业类型传中文 + if(searchType.getBeginTime()==null||"".equals(searchType.getBeginTime())){ + searchType.setBeginTime("0"); + } + if(searchType.getEndTime()==null||"".equals(searchType.getEndTime())){ + searchType.setEndTime("0"); + } + List statisticsIndicatorPartList =enforcementCheckStatisticsService.statisticsIndicatorPart3(searchType); + return ZDResponse.success("成功",statisticsIndicatorPartList); + } + @GetMapping("/statisticsIndicatorPart3") + @ResponseBody + public ZDResponse statisticsIndicatorPart3(SearchType searchType) throws ParseException { + + if(StringUtils.isNotEmpty(searchType.getEnterpriseTypeStr())){ + String[] split = searchType.getEnterpriseTypeStr().split(","); + List strings = Arrays.asList(split); + searchType.setEnterpriseType(strings); + } + if(StringUtils.isNotEmpty(searchType.getCheckTypeStr())){ + String[] split = searchType.getCheckTypeStr().split(","); + List strings = Arrays.asList(split); + List transform = Lists.transform(strings, res -> { + return Integer.valueOf(res); + }); + searchType.setCheckType(transform); + } + if(StringUtils.isNotEmpty(searchType.getComplaintTypeStr())){ + String[] split = searchType.getComplaintTypeStr().split(","); + List strings = Arrays.asList(split); + List transform = Lists.transform(strings, res -> { + return Integer.valueOf(res); + }); + searchType.setComplaintType(transform); + } + + if(searchType.getBeginTime()==null||"".equals(searchType.getBeginTime())){ + searchType.setBeginTime("0"); + } + if(searchType.getEndTime()==null||"".equals(searchType.getEndTime())){ + searchType.setEndTime("0"); + } + Long userId=searchType.getUserId(); + String lawCertificateNum=userMapper.selectUserById(userId).getLawCertificateNum(); + String deptId=zfryjdm2405301Mapper.selectZfryByZfCode(lawCertificateNum).getZzjgdm(); + /*String certificateNumber=userMapper.selectUserById(userId).getCertificateNumber(); + String deptId=zfryjdm2405301Mapper.selectZfryBySfz(certificateNumber).getZzjgdm();*/ + searchType.setUserId(null); + searchType.setBureauDeptId(deptId); + List statisticsIndicatorPartList =enforcementCheckStatisticsService.statisticsIndicatorPart3(searchType); + return ZDResponse.success("成功",statisticsIndicatorPartList); + } +} diff --git a/lib/EmergencyService/zdxtEmergencyAppService/src/main/java/com/zdxt/app/controller/AppEnterpriseInformationController.java b/lib/EmergencyService/zdxtEmergencyAppService/src/main/java/com/zdxt/app/controller/AppEnterpriseInformationController.java index eda6e2db..fa31669a 100644 --- a/lib/EmergencyService/zdxtEmergencyAppService/src/main/java/com/zdxt/app/controller/AppEnterpriseInformationController.java +++ b/lib/EmergencyService/zdxtEmergencyAppService/src/main/java/com/zdxt/app/controller/AppEnterpriseInformationController.java @@ -287,4 +287,15 @@ public class AppEnterpriseInformationController extends BaseController return enterpriseInformationService.insertQrCode(num) > 0 ? ZDResponse.success("失效成功"): ZDResponse.error("失效失败"); } + /** + * 通过市监二维码获取企业信息 + */ + @GetMapping("/getEnterpriseInfoBySj") + @ResponseBody + public ZDResponse getEnterpriseCode(String url) + { + EnterpriseInformation enterpriseInformation = + enterpriseInformationService.paresEnterpriseCode(url); + return ZDResponse.success("市监二维码扫描成功",enterpriseInformation); + } } diff --git a/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/static/css/stat1.css b/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/static/css/stat1.css index b7fe606d..14298035 100755 --- a/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/static/css/stat1.css +++ b/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/static/css/stat1.css @@ -216,3 +216,16 @@ body { border-radius: 6px; background-color: #ccc; } + +.tab_item2 { + position: absolute; + z-index: -999; + width: 100%; + height: 100%; + +} +.tab_item2 .echarts{ + width: 45%; + height: 45%; +} + 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 7ed94b8c..b567faeb 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 @@ -27,7 +27,7 @@

  • 执法部门：

    - +

  • 执法人员：

    @@ -215,7 +215,7 @@ $("#month2").hide(); rTable(); echarts1(); - } + }; $(function() { var options = { modalName: "执法记录统计", @@ -323,14 +323,14 @@ $("#bootstrap-table").bootstrapTable(options); }); function echarts1(){ - var currentId=$('form').eq(1).attr('id') + var currentId=$('form').eq(1).attr('id'); var params = $.common.formToJSON(currentId); $.ajax({ url:prefix+'/echarts1', type:'POST', data:params, success: function (response) { - console.log(response) + console.log(response); var option1 = { color:['#1874CD','#3A5FCD','#436EEE','#4876FF','#1E90FF','#63B8FF'], tooltip: {}, @@ -352,7 +352,7 @@ }, } ] - } + }; echart1.setOption(option1); debugger; } @@ -369,13 +369,13 @@ } function rest2(){ $('form').eq(1).trigger("reset"); - console.log($.common.formToJSON($('form').eq(1).attr('id'))) - timeType2() + console.log($.common.formToJSON($('form').eq(1).attr('id'))); + timeType2(); echarts1() } function timeType() { var dateSearch = document.getElementById("dateSearch"); - console.log(dateSearch.value) + console.log(dateSearch.value); if(dateSearch.value=="quarter"){ $("#quarter").show(); $("#month").hide(); @@ -393,7 +393,7 @@ } function timeType2() { var dateSearch = document.getElementById("dateSearch2"); - console.log(dateSearch.value) + console.log(dateSearch.value); if(dateSearch.value=="quarter"){ $("#quarter2").show(); $("#month2").hide(); @@ -410,7 +410,7 @@ } } function search1 () { - rTable() + rTable(); var currentId=$('form').eq(0).attr('id'); var params = $.common.formToJSON(currentId); $.ajax({ @@ -430,7 +430,7 @@ zhanbi();*/ } function rTable(){ - var currentId=$('form').eq(0).attr('id') + var currentId=$('form').eq(0).attr('id'); var params = $.common.formToJSON(currentId); $.ajax({ url: prefix + "/list", @@ -449,15 +449,15 @@ type:'GET', data:searchType, success: function (response) { - console.log(check) - console.log('317'+response) + console.log(check); + console.log('317'+response); $('#a').html(response); } }) } function setTab(prefix, num, total) { - console.log( document.getElementById(`${prefix}1`)) - console.log( document.getElementById(`${prefix}2`)) + console.log( document.getElementById(`${prefix}1`)); + console.log( document.getElementById(`${prefix}2`)); for (let i = 1; i <= total; i++) { document.getElementById(`${prefix}${i}`).classList.remove('actit'); document.getElementById(`${prefix}-tab${i}`).classList.remove('active'); 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 new file mode 100644 index 00000000..aecc5548 --- /dev/null +++ b/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/code/registration/staticRegistration.html @@ -0,0 +1,317 @@ + + + + + + +
    +
    +
    +
    +
    +
      +
    • +

      执法部门：

      + +
      • +
    • +

      执法人员：

      + +
      • +
    • +

      企业名称：

      + +
      • +
    • +

      检查事项：

      + +
      • +
    • +

      时段：

      + + + + +
      • +
    • +

      检查时间：

      + + - + +
      • +
    • +  搜索 +  重置 + 下载 +
      • +
    + +
    +
    +
    + +
    +
    +
    +
    +
    +
    +
    + + + + \ No newline at end of file diff --git a/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/code/statistical/staticProgram.html b/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/code/statistical/staticProgram.html index 96372278..182e135c 100644 --- a/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/code/statistical/staticProgram.html +++ b/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/code/statistical/staticProgram.html @@ -4,6 +4,7 @@ + @@ -11,84 +12,37 @@
    - - 年度 - - - - - - - - - - - - 所属行业： - - + + + + + + + + + + + + + + + + + + + + + + +
    - 检查事项 - 案件数量 + 检查计划统计 + 检查计划排行
    -
    @@ -97,25 +51,36 @@

    • 执法部门：

      - +

    • 时段：

      - -
      • -
    • -

      企业类型：

      - - + + +
      • +
    • + +
    • -

      企业地址：

      - -
      • +
    • + +
    • -  搜索 +
    • + + +
    • +  搜索  重置
    @@ -129,8 +94,8 @@
    -
    -
    +
    + +
    +
    + 2024检查计划总数量排行 +
    +
    +
    +
    +
    -
    +
    +
    - + \ No newline at end of file diff --git a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/controller/EnforcementCheckStatisticsController.java b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/controller/EnforcementCheckStatisticsController.java index 18c6dd13..6f59e8b1 100644 --- a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/controller/EnforcementCheckStatisticsController.java +++ b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/controller/EnforcementCheckStatisticsController.java @@ -178,6 +178,7 @@ public class EnforcementCheckStatisticsController extends BaseController { public ZDResponse statisticsIndicatorTest(EnforcementRegistration enforcementRegistration){ return ZDResponse.success("成功",enforcementRegistration); } + @GetMapping("/statisticsIndicatorPart1") @ResponseBody public ZDResponse statisticsIndicatorPart1(EnforcementRegistration enforcementRegistration){ diff --git a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/controller/EnforcementInspectionProgramController.java b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/controller/EnforcementInspectionProgramController.java index 2be7c290..e852be22 100644 --- a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/controller/EnforcementInspectionProgramController.java +++ b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/controller/EnforcementInspectionProgramController.java @@ -177,6 +177,58 @@ public class EnforcementInspectionProgramController extends BaseController ZDResponse.success("删除成功") : ZDResponse.error("删除失败"); } + /** + * 统计总数量计划柱状图 + * @return + */ + @GetMapping("/staticProgramWithAll") + @ResponseBody + public ZDResponse staticProgramWithAll(EnforcementInspectionProgramDto enforcementInspectionProgramDto){ + + List enforcementInspectionProgramDtos = + enforcementInspectionProgramService.staticProgramWithAll(enforcementInspectionProgramDto); + return ZDResponse.success("统计总数执法计划排行榜统计",enforcementInspectionProgramDtos); + } + /** + * 统计年度计划柱状图 + * @return + */ + @GetMapping("/staticProgramWithYear") + @ResponseBody + public ZDResponse staticProgramWithYear(EnforcementInspectionProgramDto enforcementInspectionProgramDto){ + + List enforcementInspectionProgramDtos = + enforcementInspectionProgramService.staticProgramWithYear(enforcementInspectionProgramDto); + return ZDResponse.success("年度计划排行榜统计",enforcementInspectionProgramDtos); + } + /** + * 统计年度计划柱状图 + * @return + */ + @GetMapping("/staticProgramWithQuarter") + @ResponseBody + public ZDResponse staticProgramWithQuarter(EnforcementInspectionProgramDto enforcementInspectionProgramDto){ + + List enforcementInspectionProgramDtos = + enforcementInspectionProgramService.staticProgramWithQuarter(enforcementInspectionProgramDto); + return ZDResponse.success("季度计划排行榜统计",enforcementInspectionProgramDtos); + } + + /** + * 统计年度计划柱状图 + * @return + */ + @GetMapping("/staticProgramWithMonth") + @ResponseBody + public ZDResponse staticProgramWithMonth(EnforcementInspectionProgramDto enforcementInspectionProgramDto){ + + List enforcementInspectionProgramDtos = + enforcementInspectionProgramService.staticProgramWithMonth(enforcementInspectionProgramDto); + return ZDResponse.success("月度计划排行榜统计",enforcementInspectionProgramDtos); + } + + + @PostMapping("/import") public void importUser(@RequestPart("file") MultipartFile file) throws Exception { List users = ExcelUtils.readMultipartFile(file, LawEnforcementEnterpriseExport.class); diff --git a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/controller/EnforcementRegistrationController.java b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/controller/EnforcementRegistrationController.java index 013273ec..619b1053 100644 --- a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/controller/EnforcementRegistrationController.java +++ b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/controller/EnforcementRegistrationController.java @@ -12,6 +12,10 @@ import java.util.stream.Collectors; import com.zdxt.auth.project.system.dept.service.IDeptService; import com.zdxt.auth.project.system.dict.service.IDictDataService; +import com.zdxt.code.domain.EnforceRegCount; +import com.zdxt.code.domain.EnterpriseLawEnforcement; +import com.zdxt.code.domain.LinkageDict; +import com.zdxt.code.domain.dto.EnforcementRegistrationDto; import com.zdxt.code.domain.*; import com.zdxt.code.service.ILinkageDictService; import com.zdxt.common.ZDResponse; @@ -78,6 +82,11 @@ public class EnforcementRegistrationController extends BaseController return prefix + "/registration"; } + @GetMapping("/staticRegistrationView") + public String staticRegistrationView(){ + return prefix + "/staticRegistration"; + } + /** * 查询执法端-执法登记列表 */ @@ -90,6 +99,15 @@ public class EnforcementRegistrationController extends BaseController List list = enforcementRegistrationService.selectEnforcementRegistrationList1(enforcementRegistration); return getDataTable(list); } + + @PostMapping("/staticEnforcementRegistration") + @ResponseBody + public TableDataInfo staticList(EnforcementRegistrationDto enforcementRegistrationDto){ + startPage(); + List enforcementRegistrationDtos = enforcementRegistrationService. + staticEnforcementRegistration(enforcementRegistrationDto); + return getDataTable(enforcementRegistrationDtos); + } /** * 查询执法端-执法登记列表 */ @@ -375,4 +393,7 @@ public class EnforcementRegistrationController extends BaseController registration.setParams(params); return ZDResponse.success("查询成功", registration); } + + + } diff --git a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/domain/SearchType.java b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/domain/SearchType.java index 863dd71b..86de3c80 100644 --- a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/domain/SearchType.java +++ b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/domain/SearchType.java @@ -24,6 +24,10 @@ public class SearchType { private String quarter; private String month; + private String enterpriseTypeStr; + private String checkTypeStr; + private String complaintTypeStr; + public SearchType(){} public SearchType(SearchType searchType){ this.areaStreet=searchType.getAreaStreet(); @@ -36,6 +40,7 @@ public class SearchType { this.beginTime=searchType.getBeginTime(); this.endTime=searchType.getEndTime(); this.dateType=searchType.getDateType(); + } } \ No newline at end of file diff --git a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/domain/dto/EnforcementInspectionProgramDto.java b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/domain/dto/EnforcementInspectionProgramDto.java index 268d65ea..b49723a3 100644 --- a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/domain/dto/EnforcementInspectionProgramDto.java +++ b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/domain/dto/EnforcementInspectionProgramDto.java @@ -37,6 +37,32 @@ public class EnforcementInspectionProgramDto extends BaseDomain { */ private Integer monthTotal = 0; + /** + * 时间类型 + */ + private String timeType; + + /** + * 检查计划排行数量 + */ + private Integer total; + + /** + * 搜索参数 + */ + /** + * 年度 + */ + private String year; + /** + * 季度 + */ + private String quarter; + /** + * 月度 + */ + private String month; + public String getBeginTime() { return beginTime; } @@ -92,4 +118,44 @@ public class EnforcementInspectionProgramDto extends BaseDomain { public void setMonthTotal(Integer monthTotal) { this.monthTotal = monthTotal; } + + public String getTimeType() { + return timeType; + } + + public void setTimeType(String timeType) { + this.timeType = timeType; + } + + public Integer getTotal() { + return total; + } + + public void setTotal(Integer total) { + this.total = total; + } + + public String getYear() { + return year; + } + + public void setYear(String year) { + this.year = year; + } + + public String getQuarter() { + return quarter; + } + + public void setQuarter(String quarter) { + this.quarter = quarter; + } + + public String getMonth() { + return month; + } + + public void setMonth(String month) { + this.month = month; + } } 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 new file mode 100644 index 00000000..ff56adc8 --- /dev/null +++ b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/domain/dto/EnforcementRegistrationDto.java @@ -0,0 +1,113 @@ +package com.zdxt.code.domain.dto; + +/** + * 执法登记 统计 + */ +public class EnforcementRegistrationDto { + + /** 被执法企业 */ + private String enterpriseName; + + /** 被执法企业税号 */ + private String enterpriseNumber; + + /** 执法人员姓名 */ + private String lawEnforcer; + + /** 执法人员ID */ + private Long lawEnforcerId; + + /** 执法人员2姓名 */ + private String lawEnforcerTwo; + + /** 执法人员2ID */ + private String lawEnforcerIdTwo; + + /** + * 检查事项 + */ + private String lawEnforcementItemText; + + /** + * 数量 + */ + private Integer total; + + /** + * 局级部门 + */ + private String bureauDeptName; + + + public String getEnterpriseName() { + return enterpriseName; + } + + public void setEnterpriseName(String enterpriseName) { + this.enterpriseName = enterpriseName; + } + + public String getEnterpriseNumber() { + return enterpriseNumber; + } + + public void setEnterpriseNumber(String enterpriseNumber) { + this.enterpriseNumber = enterpriseNumber; + } + + public String getLawEnforcer() { + return lawEnforcer; + } + + public void setLawEnforcer(String lawEnforcer) { + this.lawEnforcer = lawEnforcer; + } + + public Long getLawEnforcerId() { + return lawEnforcerId; + } + + public void setLawEnforcerId(Long lawEnforcerId) { + this.lawEnforcerId = lawEnforcerId; + } + + public String getLawEnforcerTwo() { + return lawEnforcerTwo; + } + + public void setLawEnforcerTwo(String lawEnforcerTwo) { + this.lawEnforcerTwo = lawEnforcerTwo; + } + + public String getLawEnforcerIdTwo() { + return lawEnforcerIdTwo; + } + + public void setLawEnforcerIdTwo(String lawEnforcerIdTwo) { + this.lawEnforcerIdTwo = lawEnforcerIdTwo; + } + + public String getLawEnforcementItemText() { + return lawEnforcementItemText; + } + + public void setLawEnforcementItemText(String lawEnforcementItemText) { + this.lawEnforcementItemText = lawEnforcementItemText; + } + + public Integer getTotal() { + return total; + } + + public void setTotal(Integer total) { + this.total = total; + } + + public String getBureauDeptName() { + return bureauDeptName; + } + + public void setBureauDeptName(String bureauDeptName) { + this.bureauDeptName = bureauDeptName; + } +} diff --git a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/mapper/EnforcementInspectionProgramMapper.java b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/mapper/EnforcementInspectionProgramMapper.java index dfad8b15..7a2db8c1 100644 --- a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/mapper/EnforcementInspectionProgramMapper.java +++ b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/mapper/EnforcementInspectionProgramMapper.java @@ -74,4 +74,31 @@ public interface EnforcementInspectionProgramMapper * @return */ EnforcementInspectionProgramDto staticAllProgram(EnforcementInspectionProgramDto enforcementInspectionProgramDto); + + + /** + * 统计总数排行榜 + * @param enforcementInspectionProgramDto + * @return + */ + List staticProgramWithAll(EnforcementInspectionProgramDto enforcementInspectionProgramDto); + /** + * 统计年度计划排行榜 + * @param enforcementInspectionProgramDto + * @return + */ + List staticProgramWithYear(EnforcementInspectionProgramDto enforcementInspectionProgramDto); + /** + * 统计季度计划排行榜 + * @param enforcementInspectionProgramDto + * @return + */ + List staticProgramWithQuarter(EnforcementInspectionProgramDto enforcementInspectionProgramDto); + + /** + * 统计月度计划排行榜 + * @param enforcementInspectionProgramDto + * @return + */ + List staticProgramWithMonth(EnforcementInspectionProgramDto enforcementInspectionProgramDto); } diff --git a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/mapper/EnforcementRegistrationMapper.java b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/mapper/EnforcementRegistrationMapper.java index 71fd1576..314ef796 100644 --- a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/mapper/EnforcementRegistrationMapper.java +++ b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/mapper/EnforcementRegistrationMapper.java @@ -2,6 +2,7 @@ package com.zdxt.code.mapper; import com.zdxt.code.domain.EnforceRegCount; import com.zdxt.code.domain.EnforcementRegistration; +import com.zdxt.code.domain.dto.EnforcementRegistrationDto; import org.apache.ibatis.annotations.Param; import java.util.List; @@ -92,4 +93,11 @@ public interface EnforcementRegistrationMapper List countMentByTimeQyNew(@Param("beginTime") String beginTime, @Param("endTime") String endTime); List selectAllList(EnforcementRegistration enforcementRegistration); + + /** + * 统计分析，统计分类列表 + * @param enforcementRegistrationDto + * @return + */ + List staticEnforcementRegistration(EnforcementRegistrationDto enforcementRegistrationDto); } diff --git a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/IEnforcementInspectionProgramService.java b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/IEnforcementInspectionProgramService.java index b63627f2..356dec35 100644 --- a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/IEnforcementInspectionProgramService.java +++ b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/IEnforcementInspectionProgramService.java @@ -76,4 +76,33 @@ public interface IEnforcementInspectionProgramService * @return */ EnforcementInspectionProgramDto staticAllProgram(EnforcementInspectionProgramDto enforcementInspectionProgramDto); + + /** + * 统计年度排行 + * @param enforcementInspectionProgramDto + * @return + */ + List staticProgramWithAll(EnforcementInspectionProgramDto enforcementInspectionProgramDto); + + + /** + * 统计年度排行 + * @param enforcementInspectionProgramDto + * @return + */ + List staticProgramWithYear(EnforcementInspectionProgramDto enforcementInspectionProgramDto); + + /** + * 统计季度排行 + * @param enforcementInspectionProgramDto + * @return + */ + List staticProgramWithQuarter(EnforcementInspectionProgramDto enforcementInspectionProgramDto); + + /** + * 统计季度排行 + * @param enforcementInspectionProgramDto + * @return + */ + List staticProgramWithMonth(EnforcementInspectionProgramDto enforcementInspectionProgramDto); } diff --git a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/IEnforcementRegistrationService.java b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/IEnforcementRegistrationService.java index fb022610..822fc167 100644 --- a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/IEnforcementRegistrationService.java +++ b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/IEnforcementRegistrationService.java @@ -2,6 +2,7 @@ package com.zdxt.code.service; import com.zdxt.code.domain.EnforceRegCount; import com.zdxt.code.domain.EnforcementRegistration; +import com.zdxt.code.domain.dto.EnforcementRegistrationDto; import com.zdxt.common.zdxtFile.AttFileRespDTO; import java.util.List; @@ -88,4 +89,11 @@ public interface IEnforcementRegistrationService EnforcementRegistration getByUserIdAndZero(Long userId); EnforcementRegistration getByDeptIdAndEnterpriseNumber(String deptId, String enterpriseNumber); + /** + * 统计分析列表 + * @param enforcementRegistrationDto + * @return + */ + List staticEnforcementRegistration(EnforcementRegistrationDto enforcementRegistrationDto); + } diff --git a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/IEnterpriseInformationService.java b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/IEnterpriseInformationService.java index 42c46cfc..2fd7de62 100644 --- a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/IEnterpriseInformationService.java +++ b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/IEnterpriseInformationService.java @@ -101,4 +101,11 @@ public interface IEnterpriseInformationService * @return */ int insertQrCode(String num); + + /** + * 解析获取市场监督页面统一社会信用代码 + * @param url + * @return + */ + EnterpriseInformation paresEnterpriseCode(String url); } diff --git a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/impl/EnforcementInspectionProgramServiceImpl.java b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/impl/EnforcementInspectionProgramServiceImpl.java index c698e955..ff206c05 100644 --- a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/impl/EnforcementInspectionProgramServiceImpl.java +++ b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/impl/EnforcementInspectionProgramServiceImpl.java @@ -179,7 +179,26 @@ public class EnforcementInspectionProgramServiceImpl implements IEnforcementInsp @Override public EnforcementInspectionProgramDto staticAllProgram(EnforcementInspectionProgramDto enforcementInspectionProgramDto) { - return enforcementInspectionProgramMapper.staticAllProgram(enforcementInspectionProgramDto); } + + @Override + public List staticProgramWithAll(EnforcementInspectionProgramDto enforcementInspectionProgramDto) { + return enforcementInspectionProgramMapper.staticProgramWithAll(enforcementInspectionProgramDto); + } + + @Override + public List staticProgramWithYear(EnforcementInspectionProgramDto enforcementInspectionProgramDto) { + return enforcementInspectionProgramMapper.staticProgramWithYear(enforcementInspectionProgramDto); + } + + @Override + public List staticProgramWithQuarter(EnforcementInspectionProgramDto enforcementInspectionProgramDto) { + return enforcementInspectionProgramMapper.staticProgramWithQuarter(enforcementInspectionProgramDto); + } + + @Override + public List staticProgramWithMonth(EnforcementInspectionProgramDto enforcementInspectionProgramDto) { + return enforcementInspectionProgramMapper.staticProgramWithMonth(enforcementInspectionProgramDto); + } } diff --git a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/impl/EnforcementRegistrationServiceImpl.java b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/impl/EnforcementRegistrationServiceImpl.java index f82e9fae..38ba3dcd 100644 --- a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/impl/EnforcementRegistrationServiceImpl.java +++ b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/impl/EnforcementRegistrationServiceImpl.java @@ -18,6 +18,7 @@ import com.zdxt.auth.feign.ZdxtFileCommonApi; import com.zdxt.auth.project.system.dept.service.IDeptService; import com.zdxt.auth.project.system.dict.service.IDictDataService; import com.zdxt.code.domain.*; +import com.zdxt.code.domain.dto.EnforcementRegistrationDto; import com.zdxt.code.mapper.LinkageDictMapper; import com.zdxt.code.service.*; import com.zdxt.common.annotation.DataScope; @@ -533,6 +534,13 @@ public class EnforcementRegistrationServiceImpl implements IEnforcementRegistrat return result; } + @Override + public List staticEnforcementRegistration(EnforcementRegistrationDto enforcementRegistrationDto) { + List enforcementRegistrationDtos = + enforcementRegistrationMapper.staticEnforcementRegistration(enforcementRegistrationDto); + return enforcementRegistrationDtos; + } + public static String getTime(Integer mouthTime){ int year = LocalDate.now().getYear(); int nowMonth = LocalDate.now().getMonth().getValue() - (mouthTime -1); diff --git a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/impl/EnterpriseInformationServiceImpl.java b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/impl/EnterpriseInformationServiceImpl.java index fd0ed243..0af3caa4 100644 --- a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/impl/EnterpriseInformationServiceImpl.java +++ b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/impl/EnterpriseInformationServiceImpl.java @@ -26,10 +26,12 @@ import com.zdxt.code.domain.EnterpriseMerchantAuthorization; import com.zdxt.code.domain.QrCodeGenerateHistory; import com.zdxt.code.service.IEnterpriseMerchantAuthorizationService; import com.zdxt.code.service.IQrCodeGenerateHistoryService; +import com.zdxt.code.utils.HttpUtil; import com.zdxt.code.utils.PasswordTools; import com.zdxt.code.utils.QRCodeUtil; import com.zdxt.code.utils.ServiceInvocation; import com.zdxt.common.util.DateUtils; +import com.zdxt.common.util.StringUtils; import lombok.extern.slf4j.Slf4j; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -401,4 +403,15 @@ public class EnterpriseInformationServiceImpl implements IEnterpriseInformationS return 0; } + @Override + public EnterpriseInformation paresEnterpriseCode(String url) { + String s = HttpUtil.HttpSendGet(url); + if(StringUtils.isNotEmpty(s)){ + EnterpriseInformation enterpriseInformation = + enterpriseInformationMapper.selectEnterpriseInformationByNum(s); + return enterpriseInformation; + } + return null; + } + } diff --git a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/utils/HttpUtil.java b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/utils/HttpUtil.java index 5a6d6e42..77e242da 100644 --- a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/utils/HttpUtil.java +++ b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/utils/HttpUtil.java @@ -175,7 +175,6 @@ public class HttpUtil { return EntityUtils.toString(response.getEntity(),"utf-8"); } - public static String httpSendPost(String url,String params,Map heardMap){ try { URL uri = new URL(url); @@ -237,11 +236,41 @@ public class HttpUtil { } } + /** + * 解析页面元素 + * + * @param url + * @return + */ + public static String HttpSendGet(String url){ + try { +// String s = HttpSendGet("https://qr.szcredit.org.cn/GJQYCredit/GSZJGSPT/QYGS_Jump.aspx?rid=836E3C11540954A7A32077D8E724981E995A0B0521B91F8ECB1984EF3C175A05189FF39173BB0049", ""); + //// System.out.println(s); + // // 选择 id 为 "main" 的元素 + HttpClient httpClient = HttpClients.createDefault(); + HttpGet pmethod = new HttpGet(url); + pmethod.addHeader("Connection", "keep-alive"); + pmethod.addHeader("Cache-Control", "max-age=0"); + pmethod.addHeader("User-Agent", "Mozilla/4.0 (compatible; MSIE 8.0; Windows NT 6.0) "); + pmethod.addHeader("Accept", "text/html,application/xhtml+xml,application/xml;q=0.9,*/;q=0.8"); + HttpResponse response = httpClient.execute(pmethod); + String s = EntityUtils.toString(response.getEntity(), "utf-8"); + log.info("获取市监查询结果，{}",s); + Document doc = Jsoup.parse(s); + String mainContent = doc.select("#lblEntSCCode").text(); + return mainContent; + } catch (Exception e) { + e.printStackTrace(); + } + return null; + } + + public static void main(String[] args) { try { // String s = HttpSendGet("https://qr.szcredit.org.cn/GJQYCredit/GSZJGSPT/QYGS_Jump.aspx?rid=836E3C11540954A7A32077D8E724981E995A0B0521B91F8ECB1984EF3C175A05189FF39173BB0049", ""); -// System.out.println(s); - // 选择 id 为 "main" 的元素 + //// System.out.println(s); + // // 选择 id 为 "main" 的元素 HttpClient httpClient = HttpClients.createDefault(); HttpGet pmethod = new HttpGet("https://qr.szcredit.org.cn/GJQYCredit/GSZJGSPT/QYGS_Jump.aspx?rid=836E3C11540954A7A32077D8E724981E995A0B0521B91F8ECB1984EF3C175A05189FF39173BB0049"); pmethod.addHeader("Connection", "keep-alive"); @@ -252,7 +281,6 @@ public class HttpUtil { String s = EntityUtils.toString(response.getEntity(), "utf-8"); Document doc = Jsoup.parse(s); String mainContent = doc.select("#lblEntSCCode").text(); - System.out.println(mainContent); } catch (Exception e) { e.printStackTrace(); } diff --git a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/resources/mapper/EnforcementInspectionProgramMapper.xml b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/resources/mapper/EnforcementInspectionProgramMapper.xml index e8fd30f7..6745ca29 100644 --- a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/resources/mapper/EnforcementInspectionProgramMapper.xml +++ b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/resources/mapper/EnforcementInspectionProgramMapper.xml @@ -217,4 +217,124 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" AND bureau_dept_id is not null + + + + + + + + \ No newline at end of file diff --git a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/resources/mapper/EnforcementRegistrationMapper.xml b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/resources/mapper/EnforcementRegistrationMapper.xml index 5b5b8407..3400cc5f 100644 --- a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/resources/mapper/EnforcementRegistrationMapper.xml +++ b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/resources/mapper/EnforcementRegistrationMapper.xml @@ -528,4 +528,37 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + + + \ No newline at end of file diff --git a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/resources/mapper/EnterpriseInformationMapper.xml b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/resources/mapper/EnterpriseInformationMapper.xml index 707100f7..58945b94 100644 --- a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/resources/mapper/EnterpriseInformationMapper.xml +++ b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/resources/mapper/EnterpriseInformationMapper.xml @@ -108,7 +108,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" where salt = #{salt} - + insert into enterprise_information diff --git a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/resources/mapper/RegistrationComplaintInformationMapper.xml b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/resources/mapper/RegistrationComplaintInformationMapper.xml index 8e82e6c4..c79abee9 100644 --- a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/resources/mapper/RegistrationComplaintInformationMapper.xml +++ b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/resources/mapper/RegistrationComplaintInformationMapper.xml @@ -27,24 +27,29 @@ and r.bureau_dept_id=#{bureauDeptId} and (r.law_enforcer_id=#{userId} or r.law_enforcer_id_two like concat('%',#{userId},'%')) - + and r.check_css in #{checkType} - - and DATE_FORMAT(r.create_time,'%Y-%m-%d') >= STR_TO_DATE(#{beginTime},'%Y-%m-%d') - and DATE_FORMAT(r.create_time,'%Y-%m-%d') <= STR_TO_DATE(#{endTime},'%Y-%m-%d') + + and DATE_FORMAT(r.create_time,'%Y-%m-%d') >= STR_TO_DATE(#{beginTime},'%Y-%m-%d') + + + + and DATE_FORMAT(r.create_time,'%Y-%m-%d') <= STR_TO_DATE(#{endTime},'%Y-%m-%d') - + and c.complaint_type in #{complaintType} - - and DATE_FORMAT(c.create_time,'%Y-%m-%d') >= STR_TO_DATE(#{beginTime},'%Y-%m-%d') - and DATE_FORMAT(c.create_time,'%Y-%m-%d') <= STR_TO_DATE(#{endTime},'%Y-%m-%d') + + and DATE_FORMAT(r.create_time,'%Y-%m-%d') >= STR_TO_DATE(#{beginTime},'%Y-%m-%d') + + + and DATE_FORMAT(r.create_time,'%Y-%m-%d') <= STR_TO_DATE(#{endTime},'%Y-%m-%d') @@ -54,7 +59,7 @@ from enterprise_complaint c inner join enterprise_information i on c.enterprise_number=i.enterprise_number and c.complaint_department_ids like concat('%',#{bureauDeptId},'%') - + and c.complaint_type in #{complaintType} @@ -74,7 +79,7 @@ and r.bureau_dept_id=#{bureauDeptId} and (r.law_enforcer_id=#{userId} or r.law_enforcer_id_two like concat('%',#{userId},'%')) - + and r.check_css in #{checkType} diff --git a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/resources/mapper/Zfryjdm2405301Mapper.xml b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/resources/mapper/Zfryjdm2405301Mapper.xml index 2ff77c8c..692ed004 100755 --- a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/resources/mapper/Zfryjdm2405301Mapper.xml +++ b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/resources/mapper/Zfryjdm2405301Mapper.xml @@ -57,7 +57,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" \ No newline at end of file