diff --git a/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/nonRegistration/nonRegistrationView.html b/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/nonRegistration/nonRegistrationView.html new file mode 100644 index 00000000..3d0ba92e --- /dev/null +++ b/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/nonRegistration/nonRegistrationView.html @@ -0,0 +1,260 @@ + + + + + + + +
+
+
+
+
+
    +
  • +

    执法单位：

    + +
    • +
  • +

    执法人员：

    + +
    • +
  • +

    企业名称：

    + +
    • +
  • +

    入企事项：

    + +
    • +
  • +

    入企类别：

    + +
    • +
  • +

    企业注册地：

    + + + + +
    • +
  • +

    时段：

    + + + + +
    • +
  • +

    检查时间：

    + + - + +
    • +
  • +  搜索 +  重置 + 导出 +
    • +
+
+
+
+
+
+
+
+
+ + + + + \ No newline at end of file diff --git a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/controller/NonEnforcementRegistrationController.java b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/controller/NonEnforcementRegistrationController.java index 521b39fc..dd0bb726 100644 --- a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/controller/NonEnforcementRegistrationController.java +++ b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/controller/NonEnforcementRegistrationController.java @@ -1,18 +1,25 @@ package com.zdxt.code.controller; +import java.time.LocalDate; +import java.util.ArrayList; import java.util.List; +import com.alibaba.fastjson.JSON; +import com.zdxt.auth.project.system.dict.service.IDictDataService; import com.zdxt.code.domain.NonEnforcementRegistration; +import com.zdxt.code.domain.SearchType; import com.zdxt.code.service.INonEnforcementRegistrationService; 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.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 org.springframework.ui.Model; +import org.springframework.ui.ModelMap; +import org.springframework.web.bind.annotation.*; + +import javax.servlet.http.HttpServletResponse; /** * 非行政执法登记Controller @@ -26,9 +33,14 @@ public class NonEnforcementRegistrationController extends BaseController { private String prefix = "system/registration"; + private String url="project/nonRegistration"; + @Autowired private INonEnforcementRegistrationService nonEnforcementRegistrationService; + @Autowired + IDictDataService dictDataService; + @RequiresPermissions("system:registration:view") @GetMapping() public String registration() @@ -48,4 +60,57 @@ public class NonEnforcementRegistrationController extends BaseController List list = nonEnforcementRegistrationService.selectNonEnforcementRegistrationList(nonEnforcementRegistration); return getDataTable(list); } + + /** + * 非行政检查 + * @return + */ + @RequiresPermissions("system:nonRegistration:view") + @GetMapping("/getRegistrationView") + public String getRegistrationView(ModelMap map){ + int current= LocalDate.now().getYear(); + List yearList=new ArrayList<>(); + for(int i=current;i>=2023;i--){ + yearList.add(i); + } + map.put("yearList",yearList); + return url+"/nonRegistrationView"; + } + + /** + * 获取列表 + * @param param + * @return + */ + @RequiresPermissions("system:nonRegistration:getList") + @PostMapping("/getList") + @ResponseBody + public TableDataInfo getList(NonEnforcementRegistration param){ + startPage(); + List res=nonEnforcementRegistrationService.getList(param); + return getDataTable(res); + } + + + /** + * 获取街道 + * @param type + * @return + */ + @PostMapping("/getStreetList") + @ResponseBody + public List getStreetList(String type) { + List list=dictDataService.selectDictDataByType(type); + return list; + } + + /** + * 下载Excel + * @param response + */ + @GetMapping("/downloadExcel") + @ResponseBody + public void downloadExcel(HttpServletResponse response, NonEnforcementRegistration param){ + nonEnforcementRegistrationService.downloadExcel(response,param); + } } diff --git a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/domain/NonEnforcementRegistration.java b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/domain/NonEnforcementRegistration.java index dd64e19f..6aeccf9b 100644 --- a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/domain/NonEnforcementRegistration.java +++ b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/domain/NonEnforcementRegistration.java @@ -1,6 +1,7 @@ package com.zdxt.code.domain; import com.zdxt.common.BaseDomain; +import org.springframework.format.annotation.DateTimeFormat; import java.util.Date; import java.util.List; @@ -77,6 +78,116 @@ public class NonEnforcementRegistration extends BaseDomain /** 执法(入企)主体部门统一信用代码 */ private String creditcode; + /** + * 区域 + */ + private String area; + + /** + * 街道 + */ + private String street; + + /** + * 查询条件 + */ + private String year; + + private String dateSearch; + + private String quarter; + + private String month; + + private String startTime; + + private String endTime; + + private String areaText; + + private String streetText; + + public String getAreaText() { + return areaText; + } + + public void setAreaText(String areaText) { + this.areaText = areaText; + } + + public String getStreetText() { + return streetText; + } + + public void setStreetText(String streetText) { + this.streetText = streetText; + } + + public String getYear() { + return year; + } + + public void setYear(String year) { + this.year = year; + } + + public String getDateSearch() { + return dateSearch; + } + + public void setDateSearch(String dateSearch) { + this.dateSearch = dateSearch; + } + + 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 getStartTime() { + return startTime; + } + + public void setStartTime(String startTime) { + this.startTime = startTime; + } + + public String getEndTime() { + return endTime; + } + + public void setEndTime(String endTime) { + this.endTime = endTime; + } + + public String getArea() { + return area; + } + + public void setArea(String area) { + this.area = area; + } + + public String getStreet() { + return street; + } + + public void setStreet(String street) { + this.street = street; + } + + public String getId() { return id; } diff --git a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/mapper/NonEnforcementRegistrationMapper.java b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/mapper/NonEnforcementRegistrationMapper.java index 54073a1c..63eb0317 100644 --- a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/mapper/NonEnforcementRegistrationMapper.java +++ b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/mapper/NonEnforcementRegistrationMapper.java @@ -1,6 +1,7 @@ package com.zdxt.code.mapper; import com.zdxt.code.domain.NonEnforcementRegistration; +import org.springframework.stereotype.Repository; import java.util.List; @@ -10,6 +11,7 @@ import java.util.List; * @author kylin * @date 2025-06-19 */ +@Repository public interface NonEnforcementRegistrationMapper { /** @@ -59,4 +61,7 @@ public interface NonEnforcementRegistrationMapper * @return 结果 */ public int deleteNonEnforcementRegistrationByIds(String[] ids); + + + List getList(NonEnforcementRegistration param); } diff --git a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/INonEnforcementRegistrationService.java b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/INonEnforcementRegistrationService.java index ab812e3e..29dc56d4 100644 --- a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/INonEnforcementRegistrationService.java +++ b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/INonEnforcementRegistrationService.java @@ -2,6 +2,7 @@ package com.zdxt.code.service; import com.zdxt.code.domain.NonEnforcementRegistration; +import javax.servlet.http.HttpServletResponse; import java.util.List; /** @@ -59,4 +60,9 @@ public interface INonEnforcementRegistrationService * @return 结果 */ public int deleteNonEnforcementRegistrationById(String id); + + + List getList(NonEnforcementRegistration param); + + void downloadExcel(HttpServletResponse response, NonEnforcementRegistration param); } diff --git a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/impl/NonEnforcementRegistrationServiceImpl.java b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/impl/NonEnforcementRegistrationServiceImpl.java index b6fc9c16..1fc301ac 100644 --- a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/impl/NonEnforcementRegistrationServiceImpl.java +++ b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/impl/NonEnforcementRegistrationServiceImpl.java @@ -1,8 +1,11 @@ package com.zdxt.code.service.impl; +import java.net.URLEncoder; +import java.util.Arrays; import java.util.HashMap; import java.util.List; import java.util.Map; +import java.util.stream.Collectors; import cn.hutool.core.util.IdUtil; import cn.hutool.core.util.StrUtil; @@ -11,15 +14,23 @@ import com.zdxt.auth.dto.UserBean; import com.zdxt.auth.feign.DeptApi; import com.zdxt.auth.feign.UserApi; import com.zdxt.auth.feign.ZdxtFileCommonApi; +import com.zdxt.auth.project.system.dict.service.IDictDataService; import com.zdxt.code.domain.NonEnforcementRegistration; import com.zdxt.code.mapper.NonEnforcementRegistrationMapper; import com.zdxt.code.service.INonEnforcementRegistrationService; import com.zdxt.common.util.Convert; import com.zdxt.common.util.DateUtils; +import com.zdxt.common.util.StringUtils; import com.zdxt.common.zdxtFile.ZdxtFileCommon; +import com.zdxt.domain.auth.DictData; +import org.apache.poi.hssf.usermodel.*; +import org.apache.poi.ss.usermodel.*; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import javax.servlet.ServletOutputStream; +import javax.servlet.http.HttpServletResponse; + /** * 非行政执法登记Service业务层处理 * @@ -34,6 +45,8 @@ public class NonEnforcementRegistrationServiceImpl implements INonEnforcementReg @Autowired private DeptApi deptApi; @Autowired private UserApi userApi; + @Autowired private IDictDataService iDictDataService; + /** * 查询非行政执法登记 * @@ -145,4 +158,90 @@ public class NonEnforcementRegistrationServiceImpl implements INonEnforcementReg { return nonEnforcementRegistrationMapper.deleteNonEnforcementRegistrationById(id); } + + @Override + public List getList(NonEnforcementRegistration param) { + List list=nonEnforcementRegistrationMapper.getList(param); + if(list.size()==0)return list; + List areaList=iDictDataService.selectDictDataByType("address_Type"); + List areaType=areaList.stream().map(li->li.getDictValue()).collect(Collectors.toList()); + List streetList=iDictDataService.getDataByDataTypes(areaType); + list.forEach(li->{ + if(StringUtils.isNotEmpty(li.getLawEnforcerOther())){ + li.setLawEnforcer(li.getLawEnforcer()+","+li.getLawEnforcerOther()); + } + DictData area=areaList.stream().filter(a->li.getEnterpriseAddress().contains(a.getDictLabel())).findFirst().get(); + li.setArea(area!=null?area.getDictLabel():""); + DictData street=streetList.stream().filter(s->li.getEnterpriseAddress().contains(s.getDictLabel())).findFirst().get(); + li.setStreet(street!=null?street.getDictLabel():""); + }); + return list; + } + + @Override + public void downloadExcel(HttpServletResponse response, NonEnforcementRegistration param){ + try{ + String fileName =URLEncoder.encode("非行政检查统计.xls", "UTF-8"); + HSSFWorkbook workbook = new HSSFWorkbook(); + HSSFSheet sheet = workbook.createSheet("非行政检查统计"); + sheet.setDefaultColumnWidth(20);//全局 + HSSFFont font2=workbook.createFont(); + font2.setFontName("微软雅黑"); + font2.setBold(true); + font2.setFontHeightInPoints((short) 11); + HSSFCellStyle styleRow2=workbook.createCellStyle(); + styleRow2.setWrapText(true);//换行 + styleRow2.setFillForegroundColor(IndexedColors.GREY_25_PERCENT.getIndex()); + styleRow2.setFillPattern(FillPatternType.SOLID_FOREGROUND); + styleRow2.setAlignment(HorizontalAlignment.CENTER); + styleRow2.setVerticalAlignment(VerticalAlignment.CENTER); + styleRow2.setBorderTop(BorderStyle.THIN); + styleRow2.setBorderRight(BorderStyle.THIN); + styleRow2.setBorderBottom(BorderStyle.THIN); + styleRow2.setBorderLeft(BorderStyle.THIN); + styleRow2.setFont(font2); + HSSFRow headerRow = sheet.createRow(0); + String[] header = {"被检查企业名称","企业所属区域", "企业所属街道", "执法部门", "执法人员","检查时间","入企类别","入企事项","活动依据"}; + for (int i = 0; i < header.length; i++) { + HSSFCell cell = headerRow.createCell(i); + HSSFRichTextString text = new HSSFRichTextString(header[i]); + cell.setCellValue(text); + cell.setCellStyle(styleRow2); + } + HSSFCellStyle dateStyle= workbook.createCellStyle(); + HSSFDataFormat cellDataFormat= workbook.createDataFormat(); + dateStyle.setDataFormat(cellDataFormat.getFormat("yyyy\"年\"m\"月\"d\"日\" h:mm:ss")); + + setExcel(sheet,param); + response.setCharacterEncoding("UTF-8"); + response.setContentType("application/vnd.ms-excel"); + response.setHeader("Content-disposition", "attachment;filename=" + fileName); + ServletOutputStream outputStream = response.getOutputStream(); + workbook.write(outputStream); + workbook.close(); + }catch (Exception e){ + e.printStackTrace(); + } + + } + + // 设置excel + private void setExcel(HSSFSheet sheet,NonEnforcementRegistration param) throws Exception{ + List list=getList(param); + if(list.size()==0)return; + final int[] i = {1}; + list.forEach(li->{ + HSSFRow row = sheet.createRow(i[0]); + row.createCell(0).setCellValue(li.getEnterpriseName()); + row.createCell(1).setCellValue(li.getArea()); + row.createCell(2).setCellValue(li.getStreet()); + row.createCell(3).setCellValue(li.getBureauDeptName()); + row.createCell(4).setCellValue(li.getLawEnforcer()); + row.createCell(5).setCellValue(DateUtils.parseDateToStr("YYYY-MM-dd HH:mm:ss",li.getEnforcementTime())); + row.createCell(6).setCellValue(li.getLawEnforcementTypeText()); + row.createCell(7).setCellValue(li.getLawEnforcementItemText()); + row.createCell(8).setCellValue(li.getLawEnforcementBasisText()); + i[0]++; + }); + } } diff --git a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/resources/mapper/NonEnforcementRegistrationMapper.xml b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/resources/mapper/NonEnforcementRegistrationMapper.xml index 53deae19..e6670d91 100644 --- a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/resources/mapper/NonEnforcementRegistrationMapper.xml +++ b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/resources/mapper/NonEnforcementRegistrationMapper.xml @@ -37,10 +37,16 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + - select id, enterprise_name, enterprise_number, enforcement_time, law_enforcer, law_enforcer_id, law_enforcer_other, law_enforcer_id_other, law_enforcement_type, law_enforcement_type_text, law_enforcement_item, law_enforcement_item_text, law_enforcement_basis, law_enforcement_basis_text, remark, reslut, status, has_delete, has_complaint, has_submit, has_evaluate, law_id, law_text, bureau_dept_id, bureau_dept_name, creditcode, user_id, dept_id, create_by, update_by, create_time, update_time from non_enforcement_registration + select id, enterprise_name, enterprise_number, enforcement_time, law_enforcer, law_enforcer_id, law_enforcer_other, + law_enforcer_id_other, law_enforcement_type, law_enforcement_type_text, law_enforcement_item, + law_enforcement_item_text, law_enforcement_basis, law_enforcement_basis_text, remark, reslut, status, + has_delete, has_complaint, has_submit, has_evaluate, law_id, law_text, bureau_dept_id, bureau_dept_name, + creditcode, user_id, dept_id, create_by, update_by, create_time, update_time,enterprise_address + from non_enforcement_registration - + + insert into non_enforcement_registration