Browse Source

提交对接市监接口,获取企业信息

统计执法计划页面
修改执法人员执法证件号存在重复导致错误
v4
chenrui 2 years ago
parent
commit
f34a2d5f5a
  1. 272
      lib/EmergencyService/zdxtEmergencyAppService/src/main/java/com/zdxt/app/controller/AppEnforcementCheckStatisticsController.java
  2. 11
      lib/EmergencyService/zdxtEmergencyAppService/src/main/java/com/zdxt/app/controller/AppEnterpriseInformationController.java
  3. 13
      lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/static/css/stat1.css
  4. 30
      lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/code/registration/registration.html
  5. 317
      lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/code/registration/staticRegistration.html
  6. 454
      lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/code/statistical/staticProgram.html
  7. 1
      lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/controller/EnforcementCheckStatisticsController.java
  8. 52
      lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/controller/EnforcementInspectionProgramController.java
  9. 21
      lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/controller/EnforcementRegistrationController.java
  10. 5
      lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/domain/SearchType.java
  11. 66
      lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/domain/dto/EnforcementInspectionProgramDto.java
  12. 113
      lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/domain/dto/EnforcementRegistrationDto.java
  13. 27
      lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/mapper/EnforcementInspectionProgramMapper.java
  14. 8
      lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/mapper/EnforcementRegistrationMapper.java
  15. 29
      lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/IEnforcementInspectionProgramService.java
  16. 8
      lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/IEnforcementRegistrationService.java
  17. 7
      lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/IEnterpriseInformationService.java
  18. 21
      lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/impl/EnforcementInspectionProgramServiceImpl.java
  19. 8
      lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/impl/EnforcementRegistrationServiceImpl.java
  20. 13
      lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/impl/EnterpriseInformationServiceImpl.java
  21. 36
      lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/utils/HttpUtil.java
  22. 120
      lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/resources/mapper/EnforcementInspectionProgramMapper.xml
  23. 33
      lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/resources/mapper/EnforcementRegistrationMapper.xml
  24. 25
      lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/resources/mapper/RegistrationComplaintInformationMapper.xml
  25. 4
      lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/resources/mapper/Zfryjdm2405301Mapper.xml

272
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<Integer> month) throws ParseException {//以执法主体维度统计
EnforcementCheckStatistics enforcementCheckStatistics=new EnforcementCheckStatistics();
String month1=StringUtils.join(month,",");
enforcementCheckStatistics.setYear(year);
enforcementCheckStatistics.setMonth(month1);
System.out.println(enforcementCheckStatistics);
//查出区下所有区的id
List<EnforcementCheckStatistics> areaAllList = enforcementCheckStatisticsService.selectAllAreaList();
//存放以区id为键,该id下的所有记录为值
Map<String,List<EnforcementCheckStatistics>> list=new HashMap<>();
for(int i=0;i<areaAllList.size();i++) {
areaAllList.get(i).setMonth(enforcementCheckStatistics.getMonth());
areaAllList.get(i).setYear(enforcementCheckStatistics.getYear());
EnforcementCheckStatistics enforcementCheckStatistics1 = areaAllList.get(i);
//查找出该区下的所有执法记录
List<EnforcementCheckStatistics> 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<String> inOrderList=new ArrayList<>();
Collections.addAll(inOrderList,"福田区","罗湖区","盐田区","南山区","宝安区","龙岗区","龙华区",
"坪山区","光明区","大鹏新区","深汕特别合作区","市");
List<EnterpriseStreet> 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<EnterpriseStreet> 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<EnforcementCheckStatistics> enforcementCheckStatisticsList=enforcementCheckStatisticsService.selectAllStatisticsList(enforcementCheckStatistics);
List<String> inOrderList=new ArrayList<>();
Collections.addAll(inOrderList,"福田区","罗湖区","盐田区","南山区","宝安区","龙岗区","龙华区",
"坪山区","光明区","大鹏新区","深汕特别合作区");
Map<String,List<EnforcementCheckStatistics>> enforcementCheckStatisticsMap=new HashMap<>();
for(int i=0;i<inOrderList.size();i++){
String area=inOrderList.get(i);
//List<EnforcementCheckStatistics> e1=enforcementCheckStatisticsList.stream().filter(item->item.getEnterpriseAddress().contains(area)).collect(Collectors.toList());
List<EnforcementCheckStatistics> 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<EnforcementCheckStatistics> 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> 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<StatisticsIndicatorPart> 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<String> strings = Arrays.asList(split);
searchType.setEnterpriseType(strings);
}
if(StringUtils.isNotEmpty(searchType.getCheckTypeStr())){
String[] split = searchType.getCheckTypeStr().split(",");
List<String> strings = Arrays.asList(split);
List<Integer> transform = Lists.transform(strings, res -> {
return Integer.valueOf(res);
});
searchType.setCheckType(transform);
}
if(StringUtils.isNotEmpty(searchType.getComplaintTypeStr())){
String[] split = searchType.getComplaintTypeStr().split(",");
List<String> strings = Arrays.asList(split);
List<Integer> 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<StatisticsIndicatorPart> 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<String> strings = Arrays.asList(split);
searchType.setEnterpriseType(strings);
}
if(StringUtils.isNotEmpty(searchType.getCheckTypeStr())){
String[] split = searchType.getCheckTypeStr().split(",");
List<String> strings = Arrays.asList(split);
List<Integer> transform = Lists.transform(strings, res -> {
return Integer.valueOf(res);
});
searchType.setCheckType(transform);
}
if(StringUtils.isNotEmpty(searchType.getComplaintTypeStr())){
String[] split = searchType.getComplaintTypeStr().split(",");
List<String> strings = Arrays.asList(split);
List<Integer> 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<StatisticsIndicatorPart> statisticsIndicatorPartList =enforcementCheckStatisticsService.statisticsIndicatorPart3(searchType);
return ZDResponse.success("成功",statisticsIndicatorPartList);
}
}

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

13
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%;
}

30
lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/code/registration/registration.html

@ -27,7 +27,7 @@
<ul>
<li>
<p>执法部门:</p>
<input type="text" name="lawEnforcement"/>
<input type="text" name="bureauDeptName"/>
</li>
<li>
<p>执法人员:</p>
@ -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');

317
lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/code/registration/staticRegistration.html

@ -0,0 +1,317 @@
<!DOCTYPE html>
<html lang="zh" xmlns:th="http://www.thymeleaf.org" xmlns:shiro="http://www.pollix.at/thymeleaf/shiro">
<head>
<th:block th:include="include :: header('企业端-执法部门预约记录列表')" />
</head>
<body class="gray-bg">
<div class="container-div">
<div class="row">
<div class="col-sm-12 search-collapse">
<form id="formId">
<div class="select-list">
<ul>
<li>
<p>执法部门:</p>
<input type="text" name="bureauDeptName"/>
</li>
<li>
<p>执法人员:</p>
<input type="text" name="lawEnforcer"/>
</li>
<li>
<p>企业名称:</p>
<input type="text" name="enterpriseName"/>
</li>
<li>
<p>检查事项:</p>
<input type="text" name="lawEnforcementItemText"/>
</li>
<li>
<p>时段:</p>
<select id="year" name="year">
<option value="">所有</option>
<option value="2024">2024</option>
</select>
<select id="dateSearch" name="dateSearch" onchange="timeType()" >
<option value="">所有</option>
<option value="year">年度</option>
<option value="quarter">季度</option>
<option value="month">月度</option>
</select>
<select id="quarter" name="quarter">
<option value="">所有</option>
<option value="1">第一季度</option>
<option value="2">第二季度</option>
<option value="3">第三季度</option>
<option value="4">第四季度</option>
</select>
<select id="month" name="month">
<option value="">所有</option>
<option value="01">1月</option>
<option value="02">2月</option>
<option value="03">3月</option>
<option value="04">4月</option>
<option value="05">5月</option>
<option value="06">6月</option>
<option value="07">7月</option>
<option value="08">8月</option>
<option value="09">9月</option>
<option value="10">10月</option>
<option value="11">11月</option>
<option value="12">12月</option>
</select>
</li>
<li class="select-time">
<p>检查时间:</p>
<input type="text" class="time-input" id="startTime" placeholder="开始时间" name="beginTime"/>
<span>-</span>
<input type="text" class="time-input" id="endTime" placeholder="结束时间" name="endTime"/>
</li>
<li>
<a class="btn btn-success btn-rounded btn-sm" onclick="search1()"><i class="fa fa-search"></i>&nbsp;搜索</a>
<a class="btn btn-reset btn-rounded btn-sm" onclick="$.form.reset()"><i class="fa fa-refresh"></i>&nbsp;重置</a>
<a class="btn btn-download btn-rounded btn-sm" onclick="download1()"><i class="fa fa-download"></i>下载</a>
</li>
</ul>
</div>
</form>
</div>
<div class="btn-group-sm" id="toolbar" role="group">
</div>
<div class="col-sm-12 select-table table-bordered">
<table id="bootstrap-table"></table>
</div>
</div>
</div>
<th:block th:include="zdxtInclude :: footer" />
<script th:inline="javascript">
var editFlag = [[${@permission.hasPermi('code:registration:edit')}]];
var removeFlag = [[${@permission.hasPermi('code:registration:remove')}]];
var detailFlag = [[${@permission.hasPermi('code:registration:datail')}]];
var checkCategory=[[${@dict.getType('check_category')}]];
var prefix = ctx + "code/registration";
var searchType;
window.onload = function () {
$("#quarter").hide();
$("#month").hide();
};
$(function() {
var options = {
url: prefix + "/staticEnforcementRegistration",
createUrl: prefix + "/add",
updateUrl: prefix + "/edit/{id}",
removeUrl: prefix + "/remove",
detailUrl: prefix + "/detail/{id}",
exportUrl: prefix + "/export",
modalName: "企业端-执法部门预约记录",
showHeader: false,
showFooter: false,
showColumns: false,
showRefresh: false,
showToggle: false,
columns: [
{
checkbox: false
},
{
field : 'bureauDeptName',
title : '执法部门'
},
{
field : 'lawEnforcement',
title : '执法人员',
formatter:function (value,row,index) {
name="";
if(row.lawEnforcer!=""&&row.lawEnforcer!=null){
name=row.lawEnforcer;
}
if(row.lawEnforcer!=""&&row.lawEnforcer!=null&&row.lawEnforcerTwo!=""&&row.lawEnforcerTwo!=null){
name=name+",";
}
if(row.lawEnforcerTwo!=""&&row.lawEnforcerTwo!=null){
name=name+row.lawEnforcerTwo;
}
return name;
}
},
{
field : 'enterpriseName',
title : '企业名称'
},
{
field : 'lawEnforcementItemText',
title : '检查事项'
},
{
field : 'total',
title : '检查次数',
align : 'center',
},
{
field : 'total',
title : '2次及以下',
align : 'center',
formatter:function (value,row,index) {
if(value <= 2){
return value;
}else{
return "-";
}
}
},
{
field : 'total',
title : '3至4次(黄色)',
align : 'center',
formatter:function (value,row,index) {
if(value >= 3 && value <= 4){
return "<span style='color: yellow'>"+value+"</span>";
}else{
return "-";
}
}
},
{
field : 'total',
title : '5至6次(橙色)',
align : 'center',
formatter:function (value,row,index) {
if(value >= 5 && value <= 6){
return "<span style='color: orange'>"+value+"</span>";
}else{
return "-";
}
}
},
{
field : 'total',
title : '7次及以上(红色)',
align : 'center',
formatter:function (value,row,index) {
if(value >= 7){
return "<span style='color: red'>"+value+"</span>";
}else{
return "-";
}
}
},
]
};
$.table.init(options);
});
function timeType() {
var dateSearch = document.getElementById("dateSearch");
console.log(dateSearch.value);
if(dateSearch.value=="quarter"){
$("#quarter").show();
$("#month").hide();
}else if(dateSearch.value=="month"){
$("#quarter").hide();
$("#month").show();
}else {
$("#quarter").hide();
$("#month").hide();
}
}
function search1 (formId) {
var currentId = $.common.isEmpty(formId) ? $('form').attr('id') : formId;
console.log(currentId);
var params = $.common.formToJSON(currentId);
searchType=params;
console.log(params);
$("#bootstrap-table").bootstrapTable('refresh', params);
zhanbi();
}
function zhanbi (){
enforcementRegistration={
"lawEnforcement":searchType.lawEnforcement,
"lawEnforcer":searchType.lawEnforcer,
"enterpriseName":searchType.enterpriseName,
"lawEnforcementItemText":searchType.lawEnforcementItemText,
"uniteCheck":searchType.uniteCheck,
"checkCategory":searchType.checkCategory,
"isComplaint":searchType.isComplaint,
"checkCss":searchType.checkCss,
"year":searchType.year,
"dateSearch":searchType.dateSearch,
"quarter":searchType.quarter,
"month":searchType.month,
"beginTime":searchType.beginTime,
"endTime":searchType.endTime,
};
$.ajax({
url:prefix+'/searchType',
type:'GET',
data:searchType,
success: function (response) {
console.log(check);
console.log('317'+response);
$('#a').html(response);
}
})
}
$(document).ready();
function download1(){
/*startTime=searchType.beginTime;
endTime=searchType.endTime;*/
/*$.ajax({
url:ctx+"enforcementCheckStatistics/queryAllList/"+startTime+"/"+endTime,
type:'GET',
success: function (data) {
console.log('329'+data)
}
})*/
/*this.download('/export',{
...this.queryParameters
},`registration.xlsx`)*/
//$.operate.get(ctx+"enforcementCheckStatistics/queryAllList", { "startTime": searchType.beginTime, "endTime": searchType.endTime });
let table=document.getElementById('bootstrap-table');
//let html=table.outerHTML;
let newTableHtml='<table><thead><tr>';
let headers = table.querySelectorAll('thead tr th');
headers.forEach((header, index) => {
console.log(header,index);
console.log(index !== 9);
if (index !== 9) {
newTableHtml += `<th>${header.innerText}</th>`;
}
});
newTableHtml += '</tr></thead><tbody>';
let rows = table.querySelectorAll('tbody tr');
rows.forEach(row => {
newTableHtml += '<tr>';
let cells = row.querySelectorAll('td');
cells.forEach((cell, index) => {
if (index !== 9) {
newTableHtml += `<td>${cell.innerText}</td>`;
}
});
newTableHtml += '</tr>';
});
newTableHtml += '</tbody></table>';
let downloadLink=document.createElement("a");
//document.body.append(downloadLink);
downloadLink.href='data:application/vnd.ms-excel,'+ encodeURIComponent(newTableHtml);
document.body.appendChild(downloadLink);
downloadLink.download='执法检查统计.xls';
downloadLink.click();
document.body.removeChild(downloadLink);
}
/*var table=document.getElementById('bootstrap-table');
var rows=table.rows;
var data1=[];
for(var i=0;i<rows.length;i++){
var rowData=[];
for(var j=0;j<rows[i].cells.length;j++){
rowData.push(rows[i].cells[j].innerText);
}
data1.push(rowData)
}
var encodedUri=encodeURI(csvContent);
var link=do*/
</script>
</body>
</html>

454
lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/code/statistical/staticProgram.html

@ -4,6 +4,7 @@
<html lang="zh" xmlns:th="http://www.thymeleaf.org" xmlns:shiro="http://www.pollix.at/thymeleaf/shiro">
<head>
<th:block th:include="zdxtInclude :: header('检查计划统计')"/>
<th:block th:include="zdxtInclude :: datetimepicker-css" />
<link type="text/css" href="/css/stat1.css" rel="stylesheet"/>
</head>
@ -11,84 +12,37 @@
<div class="statwrap">
<div class="seltime" id="seltime">
<i class="icsty"></i>
<span>
<select id="year" name="year" onchange="selectDate()">
<option value="2024">2024</option>
<option value="2023">2023</option>
<option value="2022">2022</option>
</select>年度
</span>
<span>
<select id="qorm" name="qorm" onchange="selectDate()">
<option value="q">季度</option>
<option value="m">月度</option>
</select>
</span>
<span>
<select id="quarter" name="quarter" onchange="selectDate()">
<option value="q1">1季度</option>
<option value="q2">2季度</option>
<option value="q3">3季度</option>
<option value="q4">4季度</option>
</select>
</span>
<span>
<select id="month" name="month" onchange="selectDate()" style="display: none;">
<option value="01">1月</option>
<option value="02">2月</option>
<option value="03">3月</option>
<option value="04">4月</option>
<option value="05">5月</option>
<option value="06">6月</option>
<option value="07">7月</option>
<option value="08">8月</option>
<option value="09">9月</option>
<option value="10">10月</option>
<option value="11">11月</option>
<option value="12">12月</option>
</select>
</span>
<span>
<span>所属行业:</span>
<select id="industry" name="industry" th:with="type=${@dict.getType('industryType')}" onchange="selectDate()">
<option value="">请选择</option>
<option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>
</select>
</span>
<!-- <span>-->
<!-- <select id="month" name="month" onchange="selectDate()" style="display: none;">-->
<!-- <option value="01">1月</option>-->
<!-- <option value="02">2月</option>-->
<!-- <option value="03">3月</option>-->
<!-- <option value="04">4月</option>-->
<!-- <option value="05">5月</option>-->
<!-- <option value="06">6月</option>-->
<!-- <option value="07">7月</option>-->
<!-- <option value="08">8月</option>-->
<!-- <option value="09">9月</option>-->
<!-- <option value="10">10月</option>-->
<!-- <option value="11">11月</option>-->
<!-- <option value="12">12月</option>-->
<!-- </select>-->
<!-- </span>-->
<!-- <span>-->
<!-- <span>所属行业:</span>-->
<!-- <select id="industry" name="industry" th:with="type=${@dict.getType('industryType')}" onchange="selectDate()">-->
<!-- <option value="">请选择</option>-->
<!-- <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>-->
<!-- </select>-->
<!-- </span>-->
</div>
<div class="statit">
<span id="one1" class="actit" onclick="setTab('one',1,5)">检查事项</span>
<span id="one2" onclick="setTab('one',2,5)">案件数量</span>
<span id="one1" class="actit" onclick="setTab('one',1,5)">检查计划统计</span>
<span id="one2" onclick="setTab('one',2,5)">检查计划排行</span>
</div>
<div class="tab_box">
<div id="con_one_1" class="tab_item" style="z-index: 1;">
<!-- <div class="tab_cont">
<div class="listhead">
<table width="100%" border="0" cellpadding="0" cellspacing="0" class="desktab">
<colgroup>
<col width="60%"/>
<col width="25%"/>
</colgroup>
<tr class="trodd">
<th>行政检查事项</th>
<th>行政检查次数</th>
</tr>
</table>
</div>
<div class="listbody">
<div class="inner">
<table width="100%" border="0" cellpadding="0" cellspacing="0" class="desktab">
<colgroup>
<col width="60%"/>
<col width="25%"/>
</colgroup>
<tbody id="echartLineTable"></tbody>
</table>
</div>
</div>
</div>
<div class="chartbox" id="echartLine"></div>-->
<div class="container-div">
<div class="row">
<div class="col-sm-12 search-collapse">
@ -97,25 +51,36 @@
<ul>
<li>
<p>执法部门:</p>
<input type="text" name=""/>
<input type="text" name="bureauDeptName"/>
</li>
<li>
<p>时段:</p>
<input type="text" name="" id="timeType"/>
</li>
<li>
<p>企业类型:</p>
<select name="enterpriseType" th:with="type=${@dict.getType('enterpriseType')}">
<select name="timeType" id="timeType" onchange="changeSelect()">
<option value="">所有</option>
<option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>
<option value="year">年度</option>
<option value="quarter">季度</option>
<option value="month">月度</option>
</select>
</li>
<li class="select-time" id="yearDom">
<label>年度:</label>
<input type="text" class="year-input" style="width: 150px" id="yearSearch" name="year">
<li>
<p>企业地址:</p>
<input type="text" name="enterpriseAddress"/>
</li>
<li class="select-time" id="quarterDom">
<label>季度:</label>
<select id="quarter" name="quarter" onchange="selectDate()">
<option value="">请选择</option>
<option value="1">1季度</option>
<option value="2">2季度</option>
<option value="3">3季度</option>
<option value="4">4季度</option>
</select>
<li>
<a class="btn btn-success btn-rounded btn-sm" onclick="$.table.search()"><i class="fa fa-search"></i>&nbsp;搜索</a>
<li class="select-time" id="monthDom">
<label>月度:</label>
<input type="text" class="month-input" style="width: 150px" id="monthSearch" name="month">
<li>
<a class="btn btn-success btn-rounded btn-sm" onclick="query()"><i class="fa fa-search"></i>&nbsp;搜索</a>
<a class="btn btn-reset btn-rounded btn-sm" onclick="$.form.reset()"><i class="fa fa-refresh"></i>&nbsp;重置</a>
</li>
</ul>
@ -129,8 +94,8 @@
</div>
</div>
</div>
<div id="con_one_2" class="tab_item">
<div class="tab_cont">
<div id="con_one_2" class="tab_item2">
<!--<div class="tab_cont">
<div class="listhead">
<table width="100%" border="0" cellpadding="0" cellspacing="0" class="desktab">
<colgroup>
@ -155,19 +120,36 @@
</div>
</div>
</div>
<div class="chartbox" id="echartRing"></div>
<div class="chartbox" id="echartRing"></div>-->
<div class="echarts" id="echars1">
<div style="width: 20%;height: 5%">
<span>2024</span>检查计划总数量排行
</div>
</div>
<div class="echarts" id="echars2"></div>
<div class="echarts" id="echars3"></div>
<div class="echarts" id="echars4"></div>
</div>
</div>
</div>
<script type="text/javascript" src="/js/echarts.min.js"></script>
<th:block th:include="zdxtInclude :: footer"/>
<script>
<th:block th:include="zdxtInclude :: datetimepicker-js" />
<script type="text/javascript">
var prefix = ctx + "code/enforcementInspectionProgram";
window.onload = function () {
// selectDate();
staticAllProgram();
staticProgramWithAll();
staticProgramWithYear();
staticProgramWithQuarter();
staticProgramWithMonth();
//初始化默认隐藏
$("#yearDom").hide();
$("#quarterDom").hide();
$("#monthDom").hide();
};
function setTab(name, cursel, n) {
@ -183,7 +165,7 @@
function staticAllProgram() {
$.ajax({
url: prefix + '/staticAllProgram', //后台url
data: {},
data: $("#formId").serialize(),
type: "POST",
dataType: 'json',
success: function (data) { //成功,回调函数
@ -194,6 +176,139 @@
});
}
/**
* 年度统计
*
*/
function staticProgramWithAll() {
$.ajax({
url: prefix + '/staticProgramWithAll', //后台url
data: $("#formId").serialize(),
type: "GET",
dataType: 'json',
success: function (data) { //成功,回调函数
console.log(data.data);
var dataArr = [];
for (let i = 0; i < data.data.length; i++) {
var tmpArr = [];
tmpArr.push(data.data[i].bureauDeptName);
tmpArr.push(data.data[i].total);
dataArr.push(tmpArr);
}
console.log(dataArr);
initEcharts1(dataArr)
},
error: function (er) {}
});
}
/**
* 年度统计
*
*/
function staticProgramWithYear() {
$.ajax({
url: prefix + '/staticProgramWithYear', //后台url
data: $("#formId").serialize(),
type: "GET",
dataType: 'json',
success: function (data) { //成功,回调函数
var dataArr = [];
for (let i = 0; i < data.data.length; i++) {
var tmpArr = [];
tmpArr.push(data.data[i].bureauDeptName);
tmpArr.push(data.data[i].total);
dataArr.push(tmpArr);
}
console.log(dataArr);
initEcharts2(dataArr)
},
error: function (er) {}
});
}
/**
* 季度统计
*
*/
function staticProgramWithQuarter() {
$.ajax({
url: prefix + '/staticProgramWithQuarter', //后台url
data: $("#formId").serialize(),
type: "GET",
dataType: 'json',
success: function (data) {
console.log(data.data);
var dataArr = [];
for (let i = 0; i < data.data.length; i++) {
var tmpArr = [];
tmpArr.push(data.data[i].bureauDeptName);
tmpArr.push(data.data[i].total);
dataArr.push(tmpArr);
}
console.log(dataArr);
initEcharts3(dataArr)
},
error: function (er) {}
});
}
/**
* 月度统计
*
*/
function staticProgramWithMonth() {
$.ajax({
url: prefix + '/staticProgramWithMonth', //后台url
data: $("#formId").serialize(),
type: "GET",
dataType: 'json',
success: function (data) {
console.log(data.data);
var dataArr = [];
for (let i = 0; i < data.data.length; i++) {
var tmpArr = [];
tmpArr.push(data.data[i].bureauDeptName);
tmpArr.push(data.data[i].total);
dataArr.push(tmpArr);
}
console.log(dataArr);
initEcharts4(dataArr)
},
error: function (er) {}
});
}
/**
*
*/
function changeSelect(){
var options = $("#timeType option:selected");
if("year" == options.val()){
$("#yearDom").show();
$("#quarterDom").hide();
$("#monthDom").hide();
$("input[name='year']").val("");
document.getElementById("quarter").selectedIndex = -1;
$("input[name='month']").val("")
}else if("quarter" == options.val()){
$("#yearDom").hide();
$("#quarterDom").show();
$("#monthDom").hide();
$("input[name='year']").val("");
document.getElementById("quarter").selectedIndex = -1;
$("input[name='month']").val("")
}else if("month" == options.val()){
$("#yearDom").hide();
$("#quarterDom").hide();
$("#monthDom").show();
$("input[name='year']").val("");
document.getElementById("quarter").selectedIndex = -1;
$("input[name='month']").val("")
}
}
$(function() {
var options = {
@ -237,8 +352,171 @@
}]
};
$.table.init(options);
layui.use('laydate', function(){
var laydate = layui.laydate;
laydate.render({
elem: '#yearSearch',
type: 'year',
trigger: 'click'
});
laydate.render({
elem: '#monthSearch',
type: 'month',
trigger: 'click'
})
});
});
/**
* 初始化
*/
function initEcharts1(data) {
var chartDom = document.getElementById('echars1');
var myChart = echarts.init(chartDom);
var option;
option = {
dataset: [
{
dimensions: ['name', 'score'],
source: data
},
{
transform: {
type: 'sort',
config: { dimension: 'score', order: 'desc' }
}
}
],
xAxis: {
type: 'category',
axisLabel: { interval: 0, rotate: 30 }
},
yAxis: {},
series: {
type: 'bar',
encode: { x: 'name', y: 'score' },
datasetIndex: 1
}
};
option && myChart.setOption(option);
}
/**
* 初始化
*/
function initEcharts2(data) {
var chartDom = document.getElementById('echars2');
var myChart = echarts.init(chartDom);
var option;
option = {
dataset: [
{
dimensions: ['name', 'score'],
source: data
},
{
transform: {
type: 'sort',
config: { dimension: 'score', order: 'desc' }
}
}
],
xAxis: {
type: 'category',
axisLabel: { interval: 0, rotate: 30 }
},
yAxis: {},
series: {
type: 'bar',
encode: { x: 'name', y: 'score' },
datasetIndex: 1
}
};
option && myChart.setOption(option);
}
/**
* 初始化
*/
function initEcharts3(data) {
var chartDom = document.getElementById('echars3');
var myChart = echarts.init(chartDom);
var option;
option = {
dataset: [
{
dimensions: ['name', 'score'],
source: data
},
{
transform: {
type: 'sort',
config: { dimension: 'score', order: 'desc' }
}
}
],
xAxis: {
type: 'category',
axisLabel: { interval: 0, rotate: 30 }
},
yAxis: {},
series: {
type: 'bar',
encode: { x: 'name', y: 'score' },
datasetIndex: 1
}
};
option && myChart.setOption(option);
}
/**
* 初始化
*/
function initEcharts4(data) {
var chartDom = document.getElementById('echars4');
var myChart = echarts.init(chartDom);
var option;
option = {
dataset: [
{
dimensions: ['name', 'score'],
source: data
},
{
transform: {
type: 'sort',
config: { dimension: 'score', order: 'desc' }
}
}
],
xAxis: {
type: 'category',
axisLabel: { interval: 0, rotate: 30 }
},
yAxis: {},
series: {
type: 'bar',
encode: { x: 'name', y: 'score' },
datasetIndex: 1
}
};
option && myChart.setOption(option);
}
function query() {
var params = $("#formId").bootstrapTable('getOptions');
console.log(params);
$("#bootstrap-table").bootstrapTable('refresh', params);
this.changeEcharts();
}
function changeEcharts() {
staticAllProgram();
staticProgramWithAll();
staticProgramWithYear();
staticProgramWithQuarter();
staticProgramWithMonth();
}
</script>
</body>
</html>

1
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){

52
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<EnforcementInspectionProgramDto> enforcementInspectionProgramDtos =
enforcementInspectionProgramService.staticProgramWithAll(enforcementInspectionProgramDto);
return ZDResponse.success("统计总数执法计划排行榜统计",enforcementInspectionProgramDtos);
}
/**
* 统计年度计划柱状图
* @return
*/
@GetMapping("/staticProgramWithYear")
@ResponseBody
public ZDResponse staticProgramWithYear(EnforcementInspectionProgramDto enforcementInspectionProgramDto){
List<EnforcementInspectionProgramDto> enforcementInspectionProgramDtos =
enforcementInspectionProgramService.staticProgramWithYear(enforcementInspectionProgramDto);
return ZDResponse.success("年度计划排行榜统计",enforcementInspectionProgramDtos);
}
/**
* 统计年度计划柱状图
* @return
*/
@GetMapping("/staticProgramWithQuarter")
@ResponseBody
public ZDResponse staticProgramWithQuarter(EnforcementInspectionProgramDto enforcementInspectionProgramDto){
List<EnforcementInspectionProgramDto> enforcementInspectionProgramDtos =
enforcementInspectionProgramService.staticProgramWithQuarter(enforcementInspectionProgramDto);
return ZDResponse.success("季度计划排行榜统计",enforcementInspectionProgramDtos);
}
/**
* 统计年度计划柱状图
* @return
*/
@GetMapping("/staticProgramWithMonth")
@ResponseBody
public ZDResponse staticProgramWithMonth(EnforcementInspectionProgramDto enforcementInspectionProgramDto){
List<EnforcementInspectionProgramDto> enforcementInspectionProgramDtos =
enforcementInspectionProgramService.staticProgramWithMonth(enforcementInspectionProgramDto);
return ZDResponse.success("月度计划排行榜统计",enforcementInspectionProgramDtos);
}
@PostMapping("/import")
public void importUser(@RequestPart("file") MultipartFile file) throws Exception {
List<LawEnforcementEnterpriseExport> users = ExcelUtils.readMultipartFile(file, LawEnforcementEnterpriseExport.class);

21
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<EnforcementRegistration> list = enforcementRegistrationService.selectEnforcementRegistrationList1(enforcementRegistration);
return getDataTable(list);
}
@PostMapping("/staticEnforcementRegistration")
@ResponseBody
public TableDataInfo staticList(EnforcementRegistrationDto enforcementRegistrationDto){
startPage();
List<EnforcementRegistrationDto> enforcementRegistrationDtos = enforcementRegistrationService.
staticEnforcementRegistration(enforcementRegistrationDto);
return getDataTable(enforcementRegistrationDtos);
}
/**
* 查询执法端-执法登记列表
*/
@ -375,4 +393,7 @@ public class EnforcementRegistrationController extends BaseController
registration.setParams(params);
return ZDResponse.success("查询成功", registration);
}
}

5
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();
}
}

66
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;
}
}

113
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;
}
}

27
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<EnforcementInspectionProgramDto> staticProgramWithAll(EnforcementInspectionProgramDto enforcementInspectionProgramDto);
/**
* 统计年度计划排行榜
* @param enforcementInspectionProgramDto
* @return
*/
List<EnforcementInspectionProgramDto> staticProgramWithYear(EnforcementInspectionProgramDto enforcementInspectionProgramDto);
/**
* 统计季度计划排行榜
* @param enforcementInspectionProgramDto
* @return
*/
List<EnforcementInspectionProgramDto> staticProgramWithQuarter(EnforcementInspectionProgramDto enforcementInspectionProgramDto);
/**
* 统计月度计划排行榜
* @param enforcementInspectionProgramDto
* @return
*/
List<EnforcementInspectionProgramDto> staticProgramWithMonth(EnforcementInspectionProgramDto enforcementInspectionProgramDto);
}

8
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<EnforceRegCount> countMentByTimeQyNew(@Param("beginTime") String beginTime, @Param("endTime") String endTime);
List<EnforcementRegistration> selectAllList(EnforcementRegistration enforcementRegistration);
/**
* 统计分析,统计分类列表
* @param enforcementRegistrationDto
* @return
*/
List<EnforcementRegistrationDto> staticEnforcementRegistration(EnforcementRegistrationDto enforcementRegistrationDto);
}

29
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<EnforcementInspectionProgramDto> staticProgramWithAll(EnforcementInspectionProgramDto enforcementInspectionProgramDto);
/**
* 统计年度排行
* @param enforcementInspectionProgramDto
* @return
*/
List<EnforcementInspectionProgramDto> staticProgramWithYear(EnforcementInspectionProgramDto enforcementInspectionProgramDto);
/**
* 统计季度排行
* @param enforcementInspectionProgramDto
* @return
*/
List<EnforcementInspectionProgramDto> staticProgramWithQuarter(EnforcementInspectionProgramDto enforcementInspectionProgramDto);
/**
* 统计季度排行
* @param enforcementInspectionProgramDto
* @return
*/
List<EnforcementInspectionProgramDto> staticProgramWithMonth(EnforcementInspectionProgramDto enforcementInspectionProgramDto);
}

8
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<EnforcementRegistrationDto> staticEnforcementRegistration(EnforcementRegistrationDto enforcementRegistrationDto);
}

7
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);
}

21
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<EnforcementInspectionProgramDto> staticProgramWithAll(EnforcementInspectionProgramDto enforcementInspectionProgramDto) {
return enforcementInspectionProgramMapper.staticProgramWithAll(enforcementInspectionProgramDto);
}
@Override
public List<EnforcementInspectionProgramDto> staticProgramWithYear(EnforcementInspectionProgramDto enforcementInspectionProgramDto) {
return enforcementInspectionProgramMapper.staticProgramWithYear(enforcementInspectionProgramDto);
}
@Override
public List<EnforcementInspectionProgramDto> staticProgramWithQuarter(EnforcementInspectionProgramDto enforcementInspectionProgramDto) {
return enforcementInspectionProgramMapper.staticProgramWithQuarter(enforcementInspectionProgramDto);
}
@Override
public List<EnforcementInspectionProgramDto> staticProgramWithMonth(EnforcementInspectionProgramDto enforcementInspectionProgramDto) {
return enforcementInspectionProgramMapper.staticProgramWithMonth(enforcementInspectionProgramDto);
}
}

8
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<EnforcementRegistrationDto> staticEnforcementRegistration(EnforcementRegistrationDto enforcementRegistrationDto) {
List<EnforcementRegistrationDto> 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);

13
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;
}
}

36
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<String,Object> 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();
}

120
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
</where>
</select>
<select id="staticProgramWithAll" resultType="com.zdxt.code.domain.dto.EnforcementInspectionProgramDto" >
SELECT
bureau_dept_name,
count(1) as total
FROM enforcement_inspection_program
<where>
<if test="bureauDeptName != null and bureauDeptName != ''">
bureau_dept_name like concat('%', #{bureauDeptName}, '%')
</if>
<if test="beginTime != null and beginTime != ''">
<![CDATA[ create_time >= concat('%', #{beginTime}, '%') ]]>
</if>
<if test="endTime != null and endTime != ''">
<![CDATA[ create_time <= concat('%', #{endTime}, '%') ]]>
</if>
<if test="year != null and year != ''">
YEAR(create_time) = #{year}
</if>
<if test="quarter != null and quarter != '' ">
QUARTER(create_time) = #{quarter}
</if>
<if test="month != null and month != '' ">
DATE_FORMAT(create_time, '%Y-%m') = #{month}
</if>
AND bureau_dept_id is not null
</where>
GROUP BY bureau_dept_id
order by total desc
</select>
<select id="staticProgramWithYear" resultType="com.zdxt.code.domain.dto.EnforcementInspectionProgramDto" >
SELECT
bureau_dept_name,
SUM(CASE WHEN time_type = 'year' THEN 1 ELSE 0 END ) as total
FROM enforcement_inspection_program
<where>
<if test="bureauDeptName != null and bureauDeptName != ''">
bureau_dept_name like concat('%', #{bureauDeptName}, '%')
</if>
<if test="beginTime != null and beginTime != ''">
<![CDATA[ create_time >= concat('%', #{beginTime}, '%') ]]>
</if>
<if test="endTime != null and endTime != ''">
<![CDATA[ create_time <= concat('%', #{endTime}, '%') ]]>
</if>
<if test="year != null and year != ''">
YEAR(create_time) = #{year}
</if>
<if test="quarter != null and quarter != '' ">
QUARTER(create_time) = #{quarter}
</if>
<if test="month != null and month != '' ">
DATE_FORMAT(create_time, '%Y-%m') = #{month}
</if>
AND bureau_dept_id is not null
</where>
GROUP BY bureau_dept_id
order by total desc
</select>
<select id="staticProgramWithQuarter" resultType="com.zdxt.code.domain.dto.EnforcementInspectionProgramDto" >
SELECT
bureau_dept_name,
SUM(CASE WHEN time_type = 'quarter' THEN 1 ELSE 0 END ) as total
FROM enforcement_inspection_program
<where>
<if test="bureauDeptName != null and bureauDeptName != ''">
bureau_dept_name like concat('%', #{bureauDeptName}, '%')
</if>
<if test="beginTime != null and beginTime != ''">
<![CDATA[ create_time >= concat('%', #{beginTime}, '%') ]]>
</if>
<if test="endTime != null and endTime != ''">
<![CDATA[ create_time <= concat('%', #{endTime}, '%') ]]>
</if>
<if test="year != null and year != ''">
YEAR(create_time) = #{year}
</if>
<if test="quarter != null and quarter != '' ">
QUARTER(create_time) = #{quarter}
</if>
<if test="month != null and month != '' ">
DATE_FORMAT(create_time, '%Y-%m') = #{month}
</if>
AND bureau_dept_id is not null
</where>
GROUP BY bureau_dept_id
order by total desc
</select>
<select id="staticProgramWithMonth" resultType="com.zdxt.code.domain.dto.EnforcementInspectionProgramDto" >
SELECT
bureau_dept_name,
SUM(CASE WHEN time_type = 'month' THEN 1 ELSE 0 END ) as total
FROM enforcement_inspection_program
<where>
<if test="bureauDeptName != null and bureauDeptName != ''">
bureau_dept_name like concat('%', #{bureauDeptName}, '%')
</if>
<if test="beginTime != null and beginTime != ''">
<![CDATA[ create_time >= concat('%', #{beginTime}, '%') ]]>
</if>
<if test="endTime != null and endTime != ''">
<![CDATA[ create_time <= concat('%', #{endTime}, '%') ]]>
</if>
<if test="year != null and year != ''">
YEAR(create_time) = #{year}
</if>
<if test="quarter != null and quarter != '' ">
QUARTER(create_time) = #{quarter}
</if>
<if test="month != null and month != '' ">
DATE_FORMAT(create_time, '%Y-%m') = #{month}
</if>
AND bureau_dept_id is not null
</where>
GROUP BY bureau_dept_id
order by total desc
</select>
</mapper>

33
lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/resources/mapper/EnforcementRegistrationMapper.xml

@ -528,4 +528,37 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</if>
</where>
</select>
<select id="staticEnforcementRegistration" resultType="com.zdxt.code.domain.dto.EnforcementRegistrationDto" parameterType="EnforcementRegistrationDto">
SELECT
enterprise_name,
enterprise_number,
bureau_dept_name,
law_enforcer,
law_enforcer_two,
law_enforcement_item_text,
count( t.id ) AS total
FROM
( SELECT * FROM enforcement_registration
<where>
<if test="enterpriseName != null and enterpriseName != ''">
enterprise_name like concat(concat('%',#{enterpriseName}),'%')
</if>
<if test="bureauDeptName != null and bureauDeptName != ''">
bureau_dept_name like concat(concat('%',#{bureauDeptName}),'%')
</if>
<if test="lawEnforcer != null and lawEnforcer != ''">
(law_enforcer like concat(concat('%',#{lawEnforcer}),'%')
or
law_enforcer_two like concat(concat('%',#{lawEnforcer}),'%'))
</if>
<if test="lawEnforcementItemText != null and lawEnforcementItemText != ''">
law_enforcement_item_text like concat(concat('%',#{lawEnforcementItemText}),'%')
</if>
</where>
ORDER BY create_time DESC LIMIT 1000000000 ) t
GROUP BY
t.enterprise_number
</select>
</mapper>

25
lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/resources/mapper/RegistrationComplaintInformationMapper.xml

@ -27,24 +27,29 @@
<where>
<if test="bureauDeptId != null and bureauDeptId != ''">and r.bureau_dept_id=#{bureauDeptId} </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="checkType != null">
<if test="checkType != null and checkType.size() > 0">
and r.check_css in
<foreach collection="checkType" item="checkType" open="(" separator="," close=")">
#{checkType}
</foreach>
<if test="beginTime != null and beginTime != '' and endTime != null and endTime != ''">
and DATE_FORMAT(r.create_time,'%Y-%m-%d') &gt;= STR_TO_DATE(#{beginTime},'%Y-%m-%d')<!-- 开始时间检索 -->
and DATE_FORMAT(r.create_time,'%Y-%m-%d') &lt;= STR_TO_DATE(#{endTime},'%Y-%m-%d')<!-- 结束时间检索 -->
<if test="beginTime != null and beginTime != '' ">
and DATE_FORMAT(r.create_time,'%Y-%m-%d') &gt;= STR_TO_DATE(#{beginTime},'%Y-%m-%d')
</if>
<if test="endTime != null and endTime != ''">
and DATE_FORMAT(r.create_time,'%Y-%m-%d') &lt;= STR_TO_DATE(#{endTime},'%Y-%m-%d')
</if>
</if>
<if test="complaintType != null ">
<if test="complaintType != null and complaintType.size() > 0 ">
and c.complaint_type in
<foreach collection="complaintType" item="complaintType" open="(" separator="," close=")">
#{complaintType}
</foreach>
<if test="beginTime != null and beginTime != '' and endTime != null and endTime != ''">
and DATE_FORMAT(c.create_time,'%Y-%m-%d') &gt;= STR_TO_DATE(#{beginTime},'%Y-%m-%d')<!-- 开始时间检索 -->
and DATE_FORMAT(c.create_time,'%Y-%m-%d') &lt;= STR_TO_DATE(#{endTime},'%Y-%m-%d')<!-- 结束时间检索 -->
<if test="beginTime != null and beginTime != '' ">
and DATE_FORMAT(r.create_time,'%Y-%m-%d') &gt;= STR_TO_DATE(#{beginTime},'%Y-%m-%d')
</if>
<if test="endTime != null and endTime != ''">
and DATE_FORMAT(r.create_time,'%Y-%m-%d') &lt;= STR_TO_DATE(#{endTime},'%Y-%m-%d')
</if>
</if>
</where>
@ -54,7 +59,7 @@
from enterprise_complaint c inner join enterprise_information i on c.enterprise_number=i.enterprise_number
<where>
<if test="bureauDeptId != null and bureauDeptId != ''">and c.complaint_department_ids like concat('%',#{bureauDeptId},'%') </if>
<if test="complaintType != null ">
<if test="complaintType != null and complaintType.size() > 0 ">
and c.complaint_type in
<foreach collection="complaintType" item="complaintType" open="(" separator="," close=")">
#{complaintType}
@ -74,7 +79,7 @@
<where>
<if test="bureauDeptId != null and bureauDeptId != ''">and r.bureau_dept_id=#{bureauDeptId} </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="checkType != null and checkType != ''">
<if test="checkType != null and checkType.size() > 0">
and r.check_css in
<foreach collection="checkType" item="checkType" open="(" separator="," close=")">
#{checkType}

4
lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/resources/mapper/Zfryjdm2405301Mapper.xml

@ -57,7 +57,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<select id="selectZfryByZfCode" parameterType="string" resultMap="ZfryjdmResult">
<include refid="selectZfryjdmVo" />
where zfcode = #{zfcode} and code_state = '01'
where zfcode = #{zfcode} and code_state = '01' limit 1
</select>
<select id="selectZfryAllList" resultMap="ZfryjdmResult">
@ -70,6 +70,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="sfzcode != null and sfzcode != ''">and sfzcode_encrypt=#{sfzcode}</if>
and code_state = '01'
</where>
limit 1;
limit 1
</select>
</mapper>
Loading…
Cancel
Save