diff --git a/lib/EmergencyBaseLib/EmergencyCommon/src/main/java/com/zdxt/common/util/IdCardCryptoUtil.java b/lib/EmergencyBaseLib/EmergencyCommon/src/main/java/com/zdxt/common/util/IdCardCryptoUtil.java index 6979e257..2e28c567 100644 --- a/lib/EmergencyBaseLib/EmergencyCommon/src/main/java/com/zdxt/common/util/IdCardCryptoUtil.java +++ b/lib/EmergencyBaseLib/EmergencyCommon/src/main/java/com/zdxt/common/util/IdCardCryptoUtil.java @@ -29,13 +29,15 @@ public class IdCardCryptoUtil { public static final String PRIVATE_KEY = "MIICdAIBADANBgkqhkiG9w0BAQEFAASCAl4wggJaAgEAAoGBAMAMhV1Fc3JPmmYbFJR/AS6nZjVgLPtV+JszLJCGSlU/cHIqygUONnfTJbmC/vSxBuqf8wK2FMWrCHf8j9gt+2Eze9TtN2WY1+eUpxDqmvFih8uRfxqSuGBBUV6tv/gOFxsCTnG/HXYOR6H+fMN/lDDYrcLKZE+evjM3pmMAvv0fAgMBAAECf2rTWPVVrHuC/ywzFz+CmSXAxLNSZbMCH0doYvs0hIrmvtjCjgN1F6P1z2yUpHBEbsetZEwdyQnEf74+WCuBaFIYjmQm/05grIxam/QrGibnV5qNiA0VeCkj6bUy+z5mt3/ithgzjmOiYIgMenjf6ut6RmgRDodgJiFbvSvfskECQQDoqGMNaUV+Y/O9h+l9eOCkSUOjOsL9WDRL34ei/jf7VFFYBZLs2GMzLunDkDz1dHvufDiMPeHUTTN8zIEEpNMVAkEA01Ehf9Np2zUqFQp3SW/fHVsaGM97JsbsTQrsDdUWwZLJTSQ7Yf+yg21GkNa8Mmlsp1OLyS607HV7lPlKO0LsYwJBAN1LTOv0taUCbVRZcj1mPEYHac5Ylh9jRlrkwp7GL3lfOf//TUD6kWCdvrvE9jaCFV9ByIecVLEavV53JkDEhgECQHgR40z0XXOWs8Cc38a0cDwH5b4vNjSEVwQ3roT1jSaUNxlD+xHl7hLLZosp2Gl0ia5RxF2d0mOBJaUyOMGPdy0CQCLBU3995JMoUyLgt2+Riw0PFbdxFEnKGyshAt5Q957/hC6L/V5tQNnh/AM9q23DIUQGb1whhxdIzV12qFSSS34="; public static void main(String[] args) { - + //VRJHzFqJpsSZhwnsKTWNspv_GZMxTWl-bgH6DyE9Ty0 + //VRJHzFqJpsSZhwnsKTWNspv_GZMxTWl-bgH6DyE9Ty0 + //SXRpWEhVN3RHM3ZFbzRQcQ== String userIdCode = IdCardCryptoUtil.symmetricEncryptIdCard("VRJHzFqJpsSZhwnsKTWNspv_GZMxTWl-bgH6DyE9Ty0", "1608644307579883522"); String userNameCode = IdCardCryptoUtil.symmetricEncryptIdCard("eWIzY3BMRVNEQXhvUUlXMA==", "汪鑫"); // String secret = IdCardCryptoUtil.symmetricEncryptIdCard("eWIzY3BMRVNEQXhvUUlXMA==", "ae739d8c-86ed-4898-b57d-eed3be42debf"); // String phone = IdCardCryptoUtil.symmetricDecryptIdCard("VRJHzFqJpsSZhwnsKTWNspv_GZMxTWl-bgH6DyE9Ty0", "3qQTst9aURL3pN5EzKtqVJnQv2Q0Ob3r+Gc9DXX/I30="); - String phone = IdCardCryptoUtil.symmetricDecryptIdCard("SXRpWEhVN3RHM3ZFbzRQcQ==", "vwU93AXzhBunLzjrILc3Ew=="); + String phone = IdCardCryptoUtil.symmetricDecryptIdCard("VRJHzFqJpsSZhwnsKTWNspv_GZMxTWl-bgH6DyE9Ty0", "AoQTc5m7o+maPsiYiikzYA=="); // System.out.println(userIdCode); System.out.println(phone); diff --git a/lib/EmergencyService/zdxtEmergencyAuthService/src/main/resources/mapper/system/UserMapper.xml b/lib/EmergencyService/zdxtEmergencyAuthService/src/main/resources/mapper/system/UserMapper.xml index 55858075..c6479027 100644 --- a/lib/EmergencyService/zdxtEmergencyAuthService/src/main/resources/mapper/system/UserMapper.xml +++ b/lib/EmergencyService/zdxtEmergencyAuthService/src/main/resources/mapper/system/UserMapper.xml @@ -110,7 +110,7 @@ + +
  • +

    投诉类型：

    + +
    • +
  • +

    时段：

    + + + + +
    • +
  • +  搜索 +  重置 + 下载 +
    • + + + +
    +
    +
    + + + + + + \ No newline at end of file diff --git a/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/code/complaintStatic/complaintStatic.html b/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/code/complaintStatic/complaintStatic.html new file mode 100644 index 00000000..f2262aab --- /dev/null +++ b/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/code/complaintStatic/complaintStatic.html @@ -0,0 +1,285 @@ + + + + + + + + + +
    +
    +
    +
    + 执法投诉统计 + 投诉类型统计 +
    +
    +
    +
    +
      +
    • +

      投诉对象：

      + +
      • +
    • +

      投诉类型：

      + +
      • +
    • +

      时段：

      + + + + +
      • +
    • +  搜索 +  重置 + 下载 +
      • +
        +
      • +

        +

        +

        +
        • +
      +
    +
    +
    +
    +
    +
    +
    +
    +
    +
    +
      +
    • +

      时段：

      + + + + +
      • +
    • +  搜索 +  重置 + 下载 +
      • +
    +
      +
    • +

      +

      +
      • +
    +
    + +
    +
    +
    +
    +
    +
    +
    +
    + + + + + + \ No newline at end of file diff --git a/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/code/deptStatic/deptStatic.html b/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/code/deptStatic/deptStatic.html new file mode 100644 index 00000000..24a05aeb --- /dev/null +++ b/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/code/deptStatic/deptStatic.html @@ -0,0 +1,106 @@ + + + + + + + + +
    +
    +
    +
    +
    + +
      +
    • +

      +
      • +
    +
    +
    +
    +
    +
    +
    +
    +
    + + + + \ No newline at end of file diff --git a/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/code/deptStatic/fragmentB.html b/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/code/deptStatic/fragmentB.html new file mode 100644 index 00000000..ebeca2fa --- /dev/null +++ b/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/code/deptStatic/fragmentB.html @@ -0,0 +1,12 @@ + + + + +
  • +

    +
    • + + + + + \ No newline at end of file diff --git a/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/code/registration/detail.html b/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/code/registration/detail.html index e0f59580..d4bf71df 100644 --- a/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/code/registration/detail.html +++ b/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/code/registration/detail.html @@ -70,7 +70,7 @@
    - +
    @@ -80,14 +80,31 @@
    - +
    -
    +
    + +
    + +
    +
    +
    + +
    + +
    +
    diff --git a/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/code/registration/edit.html b/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/code/registration/edit.html index ea27b235..f2e929a6 100644 --- a/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/code/registration/edit.html +++ b/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/code/registration/edit.html @@ -21,9 +21,9 @@
    - +
    - +
    @@ -43,7 +43,7 @@
    - +
    @@ -104,7 +104,7 @@
    - +
    @@ -132,9 +132,21 @@
    - + +
    + +
    +
    +
    + +
    + +
    +
    +
    +
    - +
    @@ -169,7 +181,7 @@ } } - $("input[name='enforcementTime']").datetimepicker({ + $("input[name='createTime']").datetimepicker({ format: "yyyy-mm-dd", minView: "month", autoclose: true diff --git a/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/code/registration/fragmentA.html b/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/code/registration/fragmentA.html new file mode 100644 index 00000000..1e00ee61 --- /dev/null +++ b/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/code/registration/fragmentA.html @@ -0,0 +1,15 @@ + + + + +
  • +

    +

    +

    +

    +
    • + + + + + \ No newline at end of file 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 a777ca11..f5919629 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 @@ -18,22 +18,97 @@

    执法人员：

    - - - - - - - +
  • +

    企业名称：

    + +
    • +
  • +

    检查事项：

    + +
    • +
  • +

    联合检查：

    + +
    • +
  • +

    检查类别：

    + +
    • +
  • +

    是否投诉：

    + +
    • +
  • +

    扫码原因：

    + +
    • +
  • +

    时段：

    + + + + +

  • 检查时间：

    - + - - +
  • -  搜索 +  搜索  重置 + 下载 +
    • + +
      +
    • +

      +

      +

      +

    @@ -61,8 +136,22 @@ 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 quarterBoolean=/*[[${quarterBoolean}]]*/{}; + var monthBoolean=/*[[${monthBoolean}]]*/{}; + var unite=/*[[${unite}]]*/{}; + var uniteDouble=/*[[${uniteDouble}]]*/{}; + var check=/*[[${check}]]*/{}; + var checkNumber=/*[[${checkNumber}]]*/{}; + var checkDouble=/*[[${checkDouble}]]*/{}; + var searchType; + //console.log(uniteNumber); + //console.log(checkCategory); + window.onload = function () { + $("#quarter").hide(); + $("#month").hide(); + } $(function() { var options = { url: prefix + "/list", @@ -77,92 +166,232 @@ showColumns: false, showRefresh: false, showToggle: false, - columns: [{ - checkbox: true - }, - { - field : 'id', - title : '主键ID', - visible: false - }, - { - field : 'lawEnforcementCode', - title : '登记编号' - }, - { - field : 'lawEnforcement', - title : '执法部门' - }, - { - field : 'enterpriseName', - title : '企业名称' - }, - { - field : 'enterpriseNumber', - title : '企业税号' - }, - { - field : 'enforcementTime', - title : '执法时间' - }, - { - field : 'lawEnforcer', - title : '执法人员姓名', - formatter:function (value,row,index) { - return value + ( row.lawEnforcerTwo != "" && row.lawEnforcerTwo !=null? "," + row.lawEnforcerTwo : ""); - } - }, - { - field : 'lawEnforcerTel', - title : '执法人员联系方式', - formatter:function (value,row,index) { - return (value != null && value != "" ? value : "") + - ( row.lawEnforcerTelTwo != "" && row.lawEnforcerTelTwo !=null? "," + row.lawEnforcerTelTwo : ""); - } - }, - // { - // field : 'subsidiaryer', - // title : '辅助人员姓名', - // formatter:function (value,row,index) { - // return value; - // } - // }, - // { - // field : 'subsidiaryerTel', - // title : '辅助人员联系方式' - // }, - { - field : 'lawEnforcementItemText', - title : '执法事项' - }, - { - field : 'lawEnforcementBasisText', - title : '执法依据' - }, - { - field : 'reslut', - title : '执法结果', - formatter:function (value,row,index) { - if(value == 0){ - return "合格"; - }else{ - return "不合格"; + //quarterBoolean:quarterBoolean, + columns: [ + /*{ + checkbox: false + },*/ + /*{ + field : 'id', + title : '主键ID', + visible: false + },*/ + { + field : 'lawEnforcement', + 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 : 'uniteCheck', + title : '联合检查', + formatter:function (value,row,index) { + if(value == "1"){ + return "是"; + }else{ + return "否"; + } + } + }, + { + field : 'checkCategory', + title : '行政检查类别', + formatter:function (value,row,index) { + for(i=0;i是"; + }else{ + return "否"; + } + } + }, + { + field : 'isComplaint', + title : '是否投诉', + formatter:function (value,row,index) { + if(value == 0){ + return "否"; + }else{ + return "是"; + } + } + }, + { + field : 'createTime', + title : '检查时间' + }, + { + title: '操作', + align: 'center', + formatter: function(value, row, index) { + var actions = []; + actions.push('编辑 '); + actions.push('详情'); + return actions.join(''); } } - }, - { - title: '操作', - align: 'center', - formatter: function(value, row, index) { - var actions = []; - actions.push('编辑 '); - actions.push('详情'); - return actions.join(''); - } - }] + ] }; $.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=''; + let headers = table.querySelectorAll('thead tr th'); + headers.forEach((header, index) => { + console.log(header,index); + console.log(index !== 9); + if (index !== 9) { + newTableHtml += ``; + } + }); + newTableHtml += ''; + let rows = table.querySelectorAll('tbody tr'); + rows.forEach(row => { + newTableHtml += ''; + let cells = row.querySelectorAll('td'); + cells.forEach((cell, index) => { + if (index !== 9) { + newTableHtml += ``; + } + }); + newTableHtml += ''; + }); + newTableHtml += '
    ${header.innerText}
    ${cell.innerText}
    '; + 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 \ No newline at end of file diff --git a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/controller/ComplaintStaticController.java b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/controller/ComplaintStaticController.java new file mode 100644 index 00000000..59a6d982 --- /dev/null +++ b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/controller/ComplaintStaticController.java @@ -0,0 +1,116 @@ +package com.zdxt.code.controller; + +import com.zdxt.auth.project.system.dict.mapper.DictDataMapper; +import com.zdxt.code.domain.EnterpriseComplaint; +import com.zdxt.code.domain.SearchType; +import com.zdxt.code.domain.StatisticsIndicator; +import com.zdxt.code.service.IEnterpriseComplaintService; +import com.zdxt.common.controller.BaseController; +import com.zdxt.common.util.TableDataInfo; +import com.zdxt.domain.auth.DictData; +import org.apache.shiro.authz.annotation.RequiresPermissions; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Controller; +import org.springframework.ui.Model; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.ResponseBody; + +import java.time.LocalDate; +import java.time.format.DateTimeFormatter; +import java.time.temporal.TemporalAdjusters; +import java.util.ArrayList; +import java.util.List; +import java.util.Map; +import java.util.concurrent.ExecutorCompletionService; +import java.util.stream.Collectors; + +@Controller +@RequestMapping("/code/complaintStatic") +public class ComplaintStaticController extends BaseController { + @Autowired + private IEnterpriseComplaintService iEnterpriseComplaintService; + @Autowired + private DictDataMapper dictDataMapper; + private String prefix = "project/code/complaintStatic"; + DateTimeFormatter str=DateTimeFormatter.ofPattern("yyyy-MM-dd"); + LocalDate localDate=LocalDate.now(); + @RequiresPermissions("code:complaintStatic:view") + @GetMapping() + public String complaintStatic(Model model) { + model.addAttribute("year",2024); + model.addAttribute("Number1",""); + model.addAttribute("Number2",""); + model.addAttribute("Number3",iEnterpriseComplaintService.selectEnterpriseComplaint(null).size()); + return prefix+"/complaintStatic"; + } + + @RequiresPermissions("code:complaintStatic:list") + @PostMapping("/list2") + @ResponseBody + public TableDataInfo complaint(SearchType searchType) { + if(searchType.getYear()==null||!"".equals(searchType.getYear())){ + searchType.setYear(localDate.getYear()+""); + } + EnterpriseComplaint enterpriseComplaint=new EnterpriseComplaint(); + if(searchType.getMonth()!=null&&!"".equals(searchType.getMonth())){ + LocalDate beginTime=localDate.withYear(Integer.valueOf(searchType.getYear())).withMonth(Integer.valueOf(searchType.getMonth())).withDayOfMonth(1); + LocalDate endTime = beginTime.with(TemporalAdjusters.lastDayOfMonth()); + enterpriseComplaint.setBeginTime(str.format(beginTime)); + enterpriseComplaint.setEndTime(str.format(endTime)); + }else if(searchType.getQuarter()!=null&&!"".equals(searchType.getQuarter())){ + LocalDate beginTime=LocalDate.now(); + LocalDate endTime=LocalDate.now(); + switch (searchType.getQuarter()){ + case "1": + beginTime=localDate.withYear(Integer.valueOf(searchType.getYear())).withMonth(1).withDayOfMonth(1); + endTime=beginTime.withMonth(3).with(TemporalAdjusters.lastDayOfMonth()); + break; + case "2": + beginTime=localDate.withYear(Integer.valueOf(searchType.getYear())).withMonth(4).withDayOfMonth(1); + endTime=beginTime.withMonth(6).with(TemporalAdjusters.lastDayOfMonth()); + break; + case "3": + beginTime=localDate.withYear(Integer.valueOf(searchType.getYear())).withMonth(7).withDayOfMonth(1); + endTime=beginTime.withMonth(9).with(TemporalAdjusters.lastDayOfMonth()); + break; + case "4": + beginTime=localDate.withYear(Integer.valueOf(searchType.getYear())).withMonth(10).withDayOfMonth(1); + endTime=beginTime.withMonth(12).with(TemporalAdjusters.lastDayOfMonth()); + break; + } + enterpriseComplaint.setBeginTime(str.format(beginTime)); + enterpriseComplaint.setEndTime(str.format(endTime)); + }else { + LocalDate beginTime=localDate.withYear(Integer.valueOf(searchType.getYear())).withMonth(1).withDayOfMonth(1); + LocalDate endTime = localDate.withYear(Integer.valueOf(searchType.getYear())).withMonth(12).with(TemporalAdjusters.lastDayOfMonth()); + enterpriseComplaint.setBeginTime(str.format(beginTime)); + enterpriseComplaint.setEndTime(str.format(endTime)); + } + List enterpriseComplaintList=iEnterpriseComplaintService.selectEnterpriseComplaint(enterpriseComplaint); + int number=enterpriseComplaintList.size(); + Map map=enterpriseComplaintList.stream().collect(Collectors.groupingBy(item->item.getComplaintType()==null?100:item.getComplaintType(),Collectors.counting())); + Map dictDataMap=dictDataMapper.selectDictDataByType("caseType").stream().collect(Collectors.toMap(DictData::getDictValue,DictData::getDictLabel)); + List list=new ArrayList<>(); + for(int i:map.keySet()){ + StatisticsIndicator s=new StatisticsIndicator(); + if(i==100){ + s.setName(""); + s.setNumInt(Integer.parseInt(map.get(100)+"")); + s.setPercentage((double)number/map.get(100)); + }else { + if(dictDataMap.containsKey(i+"")){ + s.setName(dictDataMap.get(i+"")); + }else { + s.setName(i+""); + } + s.setNumInt(Integer.parseInt(map.get(i)+"")); + s.setPercentage((double)map.get(i)/number); + } + list.add(s); + } + return getDataTable(list); + } + +} diff --git a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/controller/DeptStaticController.java b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/controller/DeptStaticController.java new file mode 100644 index 00000000..f26802e3 --- /dev/null +++ b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/controller/DeptStaticController.java @@ -0,0 +1,112 @@ +package com.zdxt.code.controller; + +import com.zdxt.auth.project.system.dept.mapper.DeptMapper; +import com.zdxt.auth.project.system.user.mapper.UserMapper; +import com.zdxt.code.domain.EnforcementRegistration; +import com.zdxt.code.domain.Zfryjdm2405301; +import com.zdxt.code.domain.Zfztjdm111915; +import com.zdxt.code.mapper.Zfryjdm2405301Mapper; +import com.zdxt.code.mapper.Zfztjdm111915Mapper; +import com.zdxt.code.service.IZfryjdm2405301Service; +import com.zdxt.code.service.IZfztjdm111915Service; +import com.zdxt.common.controller.BaseController; +import com.zdxt.common.util.TableDataInfo; +import com.zdxt.domain.auth.Dept; +import com.zdxt.domain.auth.User; +import org.apache.shiro.authz.annotation.RequiresPermissions; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Controller; +import org.springframework.ui.Model; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.ResponseBody; + +import java.util.ArrayList; +import java.util.List; +import java.util.Map; +import java.util.function.Function; +import java.util.stream.Collectors; + +@Controller +@RequestMapping("/code/deptStatic") +public class DeptStaticController extends BaseController { + private String prefix = "project/code/deptStatic"; + @Autowired + private UserMapper userMapper; + @Autowired + private DeptMapper deptMapper; + @Autowired + private IZfryjdm2405301Service iZfryjdm2405301Service; + @Autowired + private IZfztjdm111915Service iZfztjdm111915Service; + + @RequiresPermissions("code:deptStatic:view") + @GetMapping() + public String registration(Model model) + { + List deptList=iZfztjdm111915Service.selectZfztjdmList(new Zfztjdm111915()); + List zfryjdm2405301List=iZfryjdm2405301Service.selectZfryjdmList2(null); + model.addAttribute("lawNumber",zfryjdm2405301List.size()); + model.addAttribute("deptNumber",deptList.size()); + return prefix + "/deptStatic"; + } + + @RequiresPermissions("code:deptStatic:list") + @PostMapping("/list") + @ResponseBody + public TableDataInfo list(Zfryjdm2405301 zfryjdm2405301) + { + /*List deptList=deptMapper.selectDeptList(new Dept()); + deptList=deptList.stream().filter(item->item.getDeptId()!=null&&!"".equals(item.getDeptId())&&item.getDeptName()!=null&&!"".equals(item.getDeptName())).collect(Collectors.toList()); + Map deptIdMap=deptList.stream().collect(Collectors.toMap(Dept::getDeptId,Dept::getDeptName)); + Map deptNameMap=deptList.stream().collect(Collectors.toMap(Dept::getDeptName,Dept::getDeptId)); + if(user.getIsMappingPerson()!=null&&!"".equals(user.getIsMappingPerson())){ + for(String s:deptNameMap.keySet()){ + if(s.contains(user.getIsMappingPerson())){ + user.setDeptId(deptNameMap.get(s)); + } + } + user.setIsMappingPerson(null); + } + startPage(); + List list=userMapper.selectUserList(user); + for(int i=0;i zfryjdm2405301List=iZfryjdm2405301Service.selectZfryjdmList2(zfryjdm2405301); + List userlist=userMapper.selectUserList(new User()); + //userlist=userlist.stream().filter(item->item.getCertificateNumber()!=null&&!"".equals(item.getCertificateNumber())).collect(Collectors.toList()); + List users=userlist.stream().filter(item->item.getCertificateNumber()!=null&&!"".equals(item.getCertificateNumber())).collect(Collectors.toList()); + Map userMap=users.stream().collect(Collectors.toMap(User::getCertificateNumber, Function.identity())); + for(int i=0;i users=new ArrayList<>(); + for(User u:list){ + if(u.getDeptId()!=null&&!"".equals(u.getDeptId())){ + + }else if(deptMap.containsKey(u.getDeptId())){ + u.setIsMappingPerson(deptMap.get(u.getDeptId())); + }else{ + u.setIsMappingPerson(u.getDeptId()); + } + users.add(u); + }*/ + + //list=users; + return getDataTable(zfryjdm2405301List); + } + +} + 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 637e8550..18c6dd13 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 @@ -215,6 +215,8 @@ public class EnforcementCheckStatisticsController extends BaseController { 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); 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 6c6e0c0a..0cdf7f66 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 @@ -1,25 +1,37 @@ package com.zdxt.code.controller; +import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Map; +import java.util.stream.Collectors; +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.service.ILinkageDictService; import com.zdxt.common.ZDResponse; import com.zdxt.common.controller.BaseController; +import com.zdxt.common.util.ExcelUtils; import com.zdxt.common.util.StringUtils; import com.zdxt.common.util.TableDataInfo; +import com.zdxt.domain.auth.DictData; +import org.apache.poi.hssf.usermodel.HSSFSheet; +import org.apache.poi.hssf.usermodel.HSSFWorkbook; +import org.apache.poi.ss.usermodel.Row; import org.apache.shiro.authz.annotation.RequiresPermissions; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; +import org.springframework.ui.Model; import org.springframework.ui.ModelMap; import org.springframework.web.bind.annotation.*; import com.zdxt.code.domain.EnforcementRegistration; import com.zdxt.code.service.IEnforcementRegistrationService; +import javax.servlet.Registration; +import javax.servlet.http.HttpServletResponse; + /** * 执法端-执法登记Controller @@ -36,11 +48,21 @@ public class EnforcementRegistrationController extends BaseController @Autowired private IEnforcementRegistrationService enforcementRegistrationService; @Autowired private ILinkageDictService iLinkageDictService; + @Autowired private IDictDataService iDictDataService; @RequiresPermissions("code:registration:view") @GetMapping() - public String registration() + public String registration(Model model) { + List list = enforcementRegistrationService.selectEnforcementRegistrationList1(new EnforcementRegistration()); + List uniteList=list.stream().filter(item->item.getUniteCheck()!=null&&!"".equals(item.getUniteCheck())&&item.getUniteCheck().equals("1")).collect(Collectors.toList()); + List checkList=list.stream().filter(item->item.getCheckCategory()!=null&&!"".equals(item.getCheckCategory())&&item.getCheckCategory().equals("1")).collect(Collectors.toList()); + String checkName=iDictDataService.selectDictLabel("check_category","01"); + model.addAttribute("unite",uniteList.size()); + model.addAttribute("uniteDouble",String.format("%.3f",((double)uniteList.size()/list.size()))); + model.addAttribute("check",checkName);//！！ + model.addAttribute("checkNumber",checkList.size()); + model.addAttribute("checkDouble",String.format("%.3f",((double)checkList.size()/list.size()))); return prefix + "/registration"; } @@ -53,9 +75,35 @@ public class EnforcementRegistrationController extends BaseController public TableDataInfo list(EnforcementRegistration enforcementRegistration) { startPage(); - List list = enforcementRegistrationService.selectEnforcementRegistrationList(enforcementRegistration); + List list = enforcementRegistrationService.selectEnforcementRegistrationList1(enforcementRegistration); return getDataTable(list); } + /** + * 查询执法端-执法登记列表 + */ + @RequiresPermissions("code:registration:list") + @GetMapping("/searchType") + public String searchType(EnforcementRegistration enforcementRegistration,Model model) + { + List list = enforcementRegistrationService.selectEnforcementRegistrationList1(enforcementRegistration); + System.out.println(1); + List uniteList=list.stream().filter(item->item.getUniteCheck()!=null&&!"".equals(item.getUniteCheck())&&item.getUniteCheck().equals("1")).collect(Collectors.toList()); + List checkList=new ArrayList<>(); + String checkName; + if(enforcementRegistration.getCheckCategory()!=null&&!"".equals(enforcementRegistration.getCheckCategory())){ + checkList=list.stream().filter(item->item.getCheckCategory()!=null&&!"".equals(item.getCheckCategory())&&item.getCheckCategory().equals(enforcementRegistration.getCheckCategory())).collect(Collectors.toList()); + checkName = iDictDataService.selectDictLabel("check_category", enforcementRegistration.getCheckCategory()); + }else { + checkList=list.stream().filter(item->item.getCheckCategory()!=null&&!"".equals(item.getCheckCategory())&&item.getCheckCategory().equals("01")).collect(Collectors.toList()); + checkName = iDictDataService.selectDictLabel("check_category", "01"); + } + model.addAttribute("unite",uniteList.size()); + model.addAttribute("uniteDouble",String.format("%.3f",((double)uniteList.size()/list.size()))); + model.addAttribute("check",checkName); + model.addAttribute("checkNumber",checkList.size()); + model.addAttribute("checkDouble",String.format("%.3f",((double)checkList.size()/list.size()))); + return prefix+"/fragmentA"; + } /** * 查询执法端-执法登记列表 @@ -109,13 +157,16 @@ public class EnforcementRegistrationController extends BaseController @ResponseBody public ZDResponse editSave(@RequestBody EnforcementRegistration enforcementRegistration) { - int resNum = 0; + /*int resNum = 0; enforcementRegistration.setIsSubmit(1); if (StringUtils.isNotEmpty(enforcementRegistration.getId())) { resNum = enforcementRegistrationService.updateEnforcementRegistration(enforcementRegistration); } else { resNum = enforcementRegistrationService.insertEnforcementRegistration(enforcementRegistration); - } + }*/ + int resNum = 0; + enforcementRegistration.setIsSubmit(1); + resNum = enforcementRegistrationService.updateEnforcementRegistration(enforcementRegistration); return resNum > 0 ? ZDResponse.success("修改成功") : ZDResponse.error("修改失败"); } diff --git a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/domain/EnforcementRegistration.java b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/domain/EnforcementRegistration.java index 4ad9c81b..a185bd2a 100644 --- a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/domain/EnforcementRegistration.java +++ b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/domain/EnforcementRegistration.java @@ -128,6 +128,9 @@ public class EnforcementRegistration extends BaseDomain * 日期搜索 */ private String dateSearch; + private String year; + private String quarter; + private String month; /** * 开始时间 @@ -638,4 +641,28 @@ public class EnforcementRegistration extends BaseDomain public void setEnterpriseEvaluate(EnterpriseEvaluate enterpriseEvaluate) { this.enterpriseEvaluate = enterpriseEvaluate; } + + 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; + } + + public String getYear() { + return year; + } + + public void setYear(String year) { + this.year = year; + } } 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 a1ddb1f3..9b056d4d 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 @@ -19,6 +19,9 @@ public class SearchType { private Integer dateType; private String name; private Integer nameId; + private String year; + private String quarter; + private String month; public SearchType(){} public SearchType(SearchType searchType){ diff --git a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/domain/StatisticsIndicator.java b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/domain/StatisticsIndicator.java index e5ee2393..9b8f255f 100644 --- a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/domain/StatisticsIndicator.java +++ b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/domain/StatisticsIndicator.java @@ -4,6 +4,7 @@ import com.zdxt.common.BaseDomain; import com.zdxt.domain.auth.Dept; import lombok.Data; +import java.text.DecimalFormat; import java.util.List; @Data @@ -21,8 +22,13 @@ public class StatisticsIndicator extends BaseDomain { private Dept dept; private List lawEnforcementWarningListList; private List stringList; + private String percentage; public void setNumDouble(Double numDouble) { this.numDouble = new Double(String.format("%.3f",numDouble)); } + public void setPercentage(Double numDouble){ + DecimalFormat str=new DecimalFormat("0.00%"); + this.percentage=str.format(numDouble); + } } diff --git a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/domain/Zfryjdm2405301.java b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/domain/Zfryjdm2405301.java index f2567a97..ec2b7fcc 100755 --- a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/domain/Zfryjdm2405301.java +++ b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/domain/Zfryjdm2405301.java @@ -42,6 +42,24 @@ public class Zfryjdm2405301 { private String codeState; /** 执法证编号 */ private String zfcode; + public String phoneNumber; + public String ztName; + + public String getPhoneNumber() { + return phoneNumber; + } + + public void setPhoneNumber(String phoneNumber) { + this.phoneNumber = phoneNumber; + } + + public String getZtName() { + return ztName; + } + + public void setZtName(String ztName) { + this.ztName = ztName; + } public String getSfzcodeEncrypt() { return sfzcodeEncrypt; diff --git a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/domain/Zfztjdm111915.java b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/domain/Zfztjdm111915.java new file mode 100644 index 00000000..8a95062e --- /dev/null +++ b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/domain/Zfztjdm111915.java @@ -0,0 +1,15 @@ +package com.zdxt.code.domain; + +import lombok.Data; + +@Data +public class Zfztjdm111915 { + private String id; + private String updateTime; + private String updateStatus; + private String SEQ; + private String INS; + private String dataPlace; + private String subName; + private String code; +} diff --git a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/mapper/EnterpriseComplaintMapper.java b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/mapper/EnterpriseComplaintMapper.java index 791b3cca..496456a1 100644 --- a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/mapper/EnterpriseComplaintMapper.java +++ b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/mapper/EnterpriseComplaintMapper.java @@ -26,7 +26,7 @@ public interface EnterpriseComplaintMapper * @return 企业执法-在线投诉集合 */ List selectEnterpriseComplaintList(EnterpriseComplaint enterpriseComplaint); - + List selectEnterpriseComplaint(EnterpriseComplaint enterpriseComplaint); /** * 查询投诉列表支持搜索 * @param enterpriseComplaint diff --git a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/mapper/Zfryjdm2405301Mapper.java b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/mapper/Zfryjdm2405301Mapper.java index 19ca9104..95759410 100755 --- a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/mapper/Zfryjdm2405301Mapper.java +++ b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/mapper/Zfryjdm2405301Mapper.java @@ -18,7 +18,7 @@ public interface Zfryjdm2405301Mapper * @return 集合 */ List selectZfryjdmList(String searchValue); - + List selectZfryjdmList2 (Zfryjdm2405301 zfryjdm2405301); /** * 修改身份证号 * @@ -35,4 +35,6 @@ public interface Zfryjdm2405301Mapper Zfryjdm2405301 selectZfryByZfCode(String zfcode); List selectZfryAllList(); + + Zfryjdm2405301 selectZfryBySfz(String sfzcode); } diff --git a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/mapper/Zfztjdm111915Mapper.java b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/mapper/Zfztjdm111915Mapper.java new file mode 100644 index 00000000..b212f2d6 --- /dev/null +++ b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/mapper/Zfztjdm111915Mapper.java @@ -0,0 +1,16 @@ +package com.zdxt.code.mapper; + +import com.zdxt.code.domain.Zfryjdm2405301; +import com.zdxt.code.domain.Zfztjdm111915; + +import java.util.List; + +public interface Zfztjdm111915Mapper { + /** + * + * + * @param + * @return 集合 + */ + List selectZfztjdmList(Zfztjdm111915 zfztjdm111915); +} 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 1f585f57..fb022610 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 @@ -32,6 +32,7 @@ public interface IEnforcementRegistrationService * @return 执法端-执法登记集合 */ List selectEnforcementRegistrationList(EnforcementRegistration enforcementRegistration); + List selectEnforcementRegistrationList1(EnforcementRegistration enforcementRegistration); /** * 查询企业端-执法登录列表 diff --git a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/IEnterpriseComplaintService.java b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/IEnterpriseComplaintService.java index 56daf4cd..cf1c29b1 100644 --- a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/IEnterpriseComplaintService.java +++ b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/IEnterpriseComplaintService.java @@ -2,6 +2,7 @@ package com.zdxt.code.service; import com.zdxt.code.domain.EnterpriseComplaint; import com.zdxt.code.domain.MssqOrderFlow; +import com.zdxt.common.annotation.DataScope; import java.util.List; @@ -67,4 +68,7 @@ public interface IEnterpriseComplaintService * @return 结果 */ int deleteEnterpriseComplaintById(String id); + + + List selectEnterpriseComplaint(EnterpriseComplaint enterpriseComplaint); } diff --git a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/IZfryjdm2405301Service.java b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/IZfryjdm2405301Service.java index 0d5528a5..27ae1930 100755 --- a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/IZfryjdm2405301Service.java +++ b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/IZfryjdm2405301Service.java @@ -33,4 +33,6 @@ public interface IZfryjdm2405301Service * @return */ Zfryjdm2405301 selectZfryByZfCode(String zfcode); + + List selectZfryjdmList2(Zfryjdm2405301 zfryjdm2405301); } diff --git a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/IZfztjdm111915Service.java b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/IZfztjdm111915Service.java new file mode 100644 index 00000000..f6c175c4 --- /dev/null +++ b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/IZfztjdm111915Service.java @@ -0,0 +1,9 @@ +package com.zdxt.code.service; + +import com.zdxt.code.domain.Zfztjdm111915; + +import java.util.List; + +public interface IZfztjdm111915Service { + ListselectZfztjdmList(Zfztjdm111915 zfztjdm111915); +} 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 5797b3a8..79f7c357 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 @@ -2,6 +2,7 @@ package com.zdxt.code.service.impl; import java.time.LocalDate; import java.time.Month; +import java.time.format.DateTimeFormatter; import java.time.temporal.TemporalAdjusters; import java.util.*; import java.util.stream.Collectors; @@ -14,6 +15,8 @@ import com.zdxt.auth.dto.UserBean; import com.zdxt.auth.dto.ZdxtFileBean; import com.zdxt.auth.feign.UserApi; 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.mapper.LinkageDictMapper; import com.zdxt.code.service.*; @@ -24,12 +27,19 @@ import com.zdxt.common.util.StringUtils; import com.zdxt.common.zdxtFile.AttFileRespDTO; import com.zdxt.common.zdxtFile.FilePreviewUtilBean; import com.zdxt.common.zdxtFile.ZdxtFileCommon; +import com.zdxt.domain.auth.Dept; +import com.zdxt.domain.auth.DictData; import com.zdxt.flow.mapper.IUserMapper; +import org.apache.poi.hssf.usermodel.HSSFSheet; +import org.apache.poi.hssf.usermodel.HSSFWorkbook; +import org.apache.poi.ss.usermodel.Row; import org.dmg.pmml.association.Item; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import com.zdxt.code.mapper.EnforcementRegistrationMapper; +import javax.servlet.http.HttpServletResponse; + /** * 执法端-执法登记Service业务层处理 * @@ -60,6 +70,11 @@ public class EnforcementRegistrationServiceImpl implements IEnforcementRegistrat @Autowired private IEnterpriseEvaluateService enterpriseEvaluateService; + @Autowired + private IDeptService iDeptService; + @Autowired + private IDictDataService iDictDataService; + @Autowired private ILawEnforcementWarningListService lawEnforcementWarningListService; @@ -171,6 +186,67 @@ public class EnforcementRegistrationServiceImpl implements IEnforcementRegistrat enforcementRegistrationMapper.selectEnforcementRegistrationList(enforcementRegistration); return enforcementRegistrations; } + @Override + @DataScope + public List selectEnforcementRegistrationList1(EnforcementRegistration enforcementRegistration) + { + DateTimeFormatter str=DateTimeFormatter.ofPattern("yyyy-MM-dd"); + LocalDate localDate=LocalDate.now(); + if((enforcementRegistration.getBeginTime()!=null&&!"".equals(enforcementRegistration.getBeginTime()))||(enforcementRegistration.getEndTime()!=null&&!"".equals(enforcementRegistration.getEndTime()))){ + enforcementRegistration.setDateSearch(null); + enforcementRegistration.setYear(null); + enforcementRegistration.setQuarter(null); + enforcementRegistration.setMonth(null); + } else if (enforcementRegistration.getMonth()!=null&&!"".equals(enforcementRegistration.getMonth())) { + LocalDate beginTime=localDate.withYear(Integer.valueOf(enforcementRegistration.getYear())).withMonth(Integer.valueOf(enforcementRegistration.getMonth())).withDayOfMonth(1); + LocalDate endTime = beginTime.with(TemporalAdjusters.lastDayOfMonth()); + enforcementRegistration.setBeginTime(str.format(beginTime)); + enforcementRegistration.setEndTime(str.format(endTime)); + enforcementRegistration.setDateSearch(null); + enforcementRegistration.setYear(null); + enforcementRegistration.setQuarter(null); + enforcementRegistration.setMonth(null); + } else if (enforcementRegistration.getQuarter()!=null&&!"".equals(enforcementRegistration.getQuarter())) { + LocalDate beginTime=LocalDate.now(); + LocalDate endTime=LocalDate.now(); + switch (enforcementRegistration.getQuarter()){ + case "1": + beginTime=localDate.withYear(Integer.valueOf(enforcementRegistration.getYear())).withMonth(1).withDayOfMonth(1); + endTime=beginTime.withMonth(3).with(TemporalAdjusters.lastDayOfMonth()); + break; + case "2": + beginTime=localDate.withYear(Integer.valueOf(enforcementRegistration.getYear())).withMonth(4).withDayOfMonth(1); + endTime=beginTime.withMonth(6).with(TemporalAdjusters.lastDayOfMonth()); + break; + case "3": + beginTime=localDate.withYear(Integer.valueOf(enforcementRegistration.getYear())).withMonth(7).withDayOfMonth(1); + endTime=beginTime.withMonth(9).with(TemporalAdjusters.lastDayOfMonth()); + break; + case "4": + beginTime=localDate.withYear(Integer.valueOf(enforcementRegistration.getYear())).withMonth(10).withDayOfMonth(1); + endTime=beginTime.withMonth(12).with(TemporalAdjusters.lastDayOfMonth()); + break; + } + enforcementRegistration.setBeginTime(str.format(beginTime)); + enforcementRegistration.setEndTime(str.format(endTime)); + enforcementRegistration.setDateSearch(null); + enforcementRegistration.setYear(null); + enforcementRegistration.setQuarter(null); + enforcementRegistration.setMonth(null); + } else if (enforcementRegistration.getYear()!=null&&!"".equals(enforcementRegistration.getYear())) { + LocalDate beginTime=localDate.withYear(Integer.valueOf(enforcementRegistration.getYear())).withMonth(1).withDayOfMonth(1); + LocalDate endTime = localDate.withYear(Integer.valueOf(enforcementRegistration.getYear())).withMonth(12).with(TemporalAdjusters.lastDayOfMonth()); + enforcementRegistration.setBeginTime(str.format(beginTime)); + enforcementRegistration.setEndTime(str.format(endTime)); + enforcementRegistration.setDateSearch(null); + enforcementRegistration.setYear(null); + enforcementRegistration.setQuarter(null); + enforcementRegistration.setMonth(null); + } + List enforcementRegistrations = + enforcementRegistrationMapper.selectEnforcementRegistrationList(enforcementRegistration); + return enforcementRegistrations; + } @Override public List selectEnterpriseRegistrationList(EnforcementRegistration enforcementRegistration) { @@ -470,4 +546,23 @@ public class EnforcementRegistrationServiceImpl implements IEnforcementRegistrat return firstDayOfMonth +"," + lastDayOfMonth; } + /*@Override + public void export(HttpServletResponse httpServletResponse,EnforcementRegistration enforcementRegistration,List list){ + List deptList=iDeptService.selectDeptAll(); + Map deptMap=deptList.stream().collect(Collectors.toMap(Dept::getDeptId,Dept::getDeptName)); + List dictDataList=iDictDataService.selectDictDataByType("check_category"); + Map dictDataMap=dictDataList.stream().collect(Collectors.toMap(DictData::getDictValue,DictData::getDictLabel)); + HSSFWorkbook wb=new HSSFWorkbook(); + HSSFSheet sheet= wb.createSheet("执法信息"); + for(int i=0;i selectEnterpriseComplaint(EnterpriseComplaint enterpriseComplaint){ + return enterpriseComplaintMapper.selectEnterpriseComplaint(enterpriseComplaint); + } } diff --git a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/impl/Zfryjdm2405301ServiceImpl.java b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/impl/Zfryjdm2405301ServiceImpl.java index 468e49ea..c5db5f1a 100755 --- a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/impl/Zfryjdm2405301ServiceImpl.java +++ b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/impl/Zfryjdm2405301ServiceImpl.java @@ -3,6 +3,7 @@ package com.zdxt.code.service.impl; import com.zdxt.code.domain.Zfryjdm2405301; import com.zdxt.code.mapper.Zfryjdm2405301Mapper; import com.zdxt.code.service.IZfryjdm2405301Service; +import com.zdxt.common.annotation.DataScope; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import java.util.List; @@ -32,4 +33,9 @@ public class Zfryjdm2405301ServiceImpl implements IZfryjdm2405301Service public Zfryjdm2405301 selectZfryByZfCode(String zfcode) { return zfryjdm2405301Mapper.selectZfryByZfCode(zfcode); } + + @Override + public List selectZfryjdmList2(Zfryjdm2405301 zfryjdm2405301){ + return zfryjdm2405301Mapper.selectZfryjdmList2(zfryjdm2405301); + } } diff --git a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/impl/Zfztjdm111915ServiceImpl.java b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/impl/Zfztjdm111915ServiceImpl.java new file mode 100644 index 00000000..9e97c3bc --- /dev/null +++ b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/impl/Zfztjdm111915ServiceImpl.java @@ -0,0 +1,21 @@ +package com.zdxt.code.service.impl; + +import com.zdxt.code.domain.Zfryjdm2405301; +import com.zdxt.code.domain.Zfztjdm111915; +import com.zdxt.code.mapper.Zfztjdm111915Mapper; +import com.zdxt.code.service.IZfztjdm111915Service; +import com.zdxt.common.annotation.DataScope; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.util.List; + +@Service +public class Zfztjdm111915ServiceImpl implements IZfztjdm111915Service { + @Autowired + private Zfztjdm111915Mapper zfztjdm111915Mapper; + @Override + public List selectZfztjdmList(Zfztjdm111915 zfztjdm111915){ + return zfztjdm111915Mapper.selectZfztjdmList(zfztjdm111915); + } +} diff --git a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/resources/mapper/EnforcementRegistrationMapper.xml b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/resources/mapper/EnforcementRegistrationMapper.xml index cb9a916d..52ba2074 100644 --- a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/resources/mapper/EnforcementRegistrationMapper.xml +++ b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/resources/mapper/EnforcementRegistrationMapper.xml @@ -97,6 +97,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" and status = #{status} and law_enforcement_code = #{lawEnforcementCode} and unite_check = #{uniteCheck} + and check_category = #{checkCategory} + and check_css = #{checkCss} and (law_enforcement_item_text like concat(concat('%',#{searchValue}),'%') diff --git a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/resources/mapper/EnterpriseComplaintMapper.xml b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/resources/mapper/EnterpriseComplaintMapper.xml index 4451fdbc..85499e28 100644 --- a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/resources/mapper/EnterpriseComplaintMapper.xml +++ b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/resources/mapper/EnterpriseComplaintMapper.xml @@ -212,4 +212,16 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + + \ No newline at end of file diff --git a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/resources/mapper/Zfryjdm2405301Mapper.xml b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/resources/mapper/Zfryjdm2405301Mapper.xml index 13ff3974..9dab8a9d 100755 --- a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/resources/mapper/Zfryjdm2405301Mapper.xml +++ b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/resources/mapper/Zfryjdm2405301Mapper.xml @@ -36,6 +36,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + + update zfryjdm2405301 @@ -53,4 +61,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + \ No newline at end of file diff --git a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/resources/mapper/Zfztjdm111915Mapper.xml b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/resources/mapper/Zfztjdm111915Mapper.xml new file mode 100644 index 00000000..f9e4f190 --- /dev/null +++ b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/resources/mapper/Zfztjdm111915Mapper.xml @@ -0,0 +1,27 @@ + + + + + + + + + + + + + + + + + select id, updatetime, updatestatus, SEQ, INS, data_place, sub_name, code from Zfztjdm111915 + + + \ No newline at end of file