src/main/java/org/springblade/modules/place/controller/PlaceController.java
@@ -21,6 +21,8 @@ import io.swagger.annotations.ApiParam; import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport; import lombok.AllArgsConstructor; import javax.servlet.http.HttpServletResponse; import javax.validation.Valid; import org.springblade.core.excel.util.ExcelUtil; @@ -28,13 +30,13 @@ import org.springblade.core.mp.support.Condition; import org.springblade.core.mp.support.Query; import org.springblade.core.tool.api.R; import org.springblade.core.tool.utils.DateUtil; import org.springblade.core.tool.utils.Func; import org.springblade.modules.house.excel.HouseAndHoldExcel; import org.springblade.modules.house.excel.HouseAndHoldImporter; import org.springblade.modules.place.excel.PlaceAndRelExcel; import org.springblade.modules.place.excel.PlaceAndRelImporter; import org.springblade.modules.place.excel.PlaceExcel; import org.springblade.modules.place.excel.PlaceImporter; import org.springblade.modules.place.excel.*; import org.springblade.modules.taskPlaceRectification.excel.TaskPlaceRectificationExcel; import org.springblade.modules.taskPlaceRectification.vo.TaskPlaceRectificationsVO; import org.springframework.transaction.annotation.Transactional; import org.springframework.web.bind.annotation.*; import com.baomidou.mybatisplus.core.metadata.IPage; @@ -264,4 +266,15 @@ public R placeLabelHandle() { return R.data(placeService.placeLabelHandle()); } /** * 导出房屋 */ @GetMapping("exportNineType") @ApiOperationSupport(order = 13) @ApiOperation(value = "导出九小统计", notes = "传入user") public void exportNineType(PlaceVO place, HttpServletResponse response) { List<NinePlaceExcel> list = placeService.export(place); ExcelUtil.export(response, "房屋数据" + DateUtil.time(), "房屋数据表", list, NinePlaceExcel.class); } } src/main/java/org/springblade/modules/place/excel/NinePlaceExcel.java
New file @@ -0,0 +1,55 @@ package org.springblade.modules.place.excel; import com.alibaba.excel.annotation.ExcelProperty; import com.alibaba.excel.annotation.write.style.ColumnWidth; import com.alibaba.excel.annotation.write.style.ContentRowHeight; import com.alibaba.excel.annotation.write.style.HeadRowHeight; import lombok.Data; import java.io.Serializable; /** * HouseExcel * * @author Chill */ @Data @ColumnWidth(25) @HeadRowHeight(20) @ContentRowHeight(18) public class NinePlaceExcel implements Serializable { private static final long serialVersionUID = 2L; /** 门牌地址编码 */ @ExcelProperty( "门牌地址编码") private String houseCode; /** 街道名称 */ @ExcelProperty( "街道名称") private String streetName; /** 社区名称 */ @ExcelProperty( "社区名称") private String communityName; /** 所属网格 */ @ExcelProperty( "所属网格") private String gridName; /** 房屋名称 */ @ExcelProperty( "详细地址") private String houseName; /** 姓名 */ @ColumnWidth(15) @ExcelProperty( "姓名") private String name; /** 手机号 */ @ColumnWidth(15) @ExcelProperty( "手机号") private String phoneNumber; }
@@ -20,6 +20,7 @@ import org.apache.ibatis.annotations.Param; import org.springblade.common.node.TreeStringNode; import org.springblade.modules.place.entity.PlaceEntity; import org.springblade.modules.place.excel.NinePlaceExcel; import org.springblade.modules.place.excel.PlaceAndRelExcel; import org.springblade.modules.place.excel.PlaceExcel; import org.springblade.modules.place.vo.PlaceVO; @@ -157,4 +158,6 @@ * @return */ IPage<PlaceVO> selectNinePlacePage(IPage<PlaceVO> page, PlaceVO place); List<NinePlaceExcel> export(PlaceVO place); } src/main/java/org/springblade/modules/place/service/impl/PlaceServiceImpl.java
@@ -39,6 +39,7 @@ import org.springblade.modules.house.entity.UserHouseLabelEntity; import org.springblade.modules.house.service.IHouseholdService; import org.springblade.modules.place.entity.*; import org.springblade.modules.place.excel.NinePlaceExcel; import org.springblade.modules.place.excel.PlaceAndRelExcel; import org.springblade.modules.place.excel.PlaceExcel; import org.springblade.modules.place.service.IPlaceExtService; @@ -1103,4 +1104,9 @@ // 返回 return page.setRecords(placeVOS); } @Override public List<NinePlaceExcel> export(PlaceVO place) { return null; } } src/main/java/org/springblade/modules/place/vo/PlaceVO.java
@@ -147,7 +147,6 @@ @ApiModelProperty(value = "机构名称") private String deptName; @ApiModelProperty(value = "地址") private String addressName;
@@ -36,6 +36,7 @@ import org.springblade.modules.house.vo.HouseVO; import org.springblade.modules.taskPlaceRectification.dto.TaskPlaceRectificationDTO; import org.springblade.modules.taskPlaceRectification.excel.TaskPlaceRectificationExcel; import org.springblade.modules.taskPlaceRectification.vo.TaskPlaceRectificationsVO; import org.springframework.web.bind.annotation.*; import com.baomidou.mybatisplus.core.metadata.IPage; import org.springblade.modules.taskPlaceRectification.entity.TaskPlaceRectificationEntity; @@ -194,7 +195,7 @@ @GetMapping("exportRectificationStatistics") @ApiOperationSupport(order = 13) @ApiOperation(value = "导出整改统计", notes = "传入user") public void exportHouse(TaskPlaceRectificationVO taskPlaceRectificationVO, HttpServletResponse response) { public void exportHouse(TaskPlaceRectificationsVO taskPlaceRectificationVO, HttpServletResponse response) { List<TaskPlaceRectificationExcel> list = taskPlaceRectificationService.export(taskPlaceRectificationVO); ExcelUtil.export(response, "房屋数据" + DateUtil.time(), "房屋数据表", list, TaskPlaceRectificationExcel.class); } src/main/java/org/springblade/modules/taskPlaceRectification/mapper/TaskPlaceRectificationMapper.java
@@ -25,6 +25,7 @@ import org.springblade.modules.taskPlaceRectification.vo.TaskPlaceRectificationVO; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.metadata.IPage; import org.springblade.modules.taskPlaceRectification.vo.TaskPlaceRectificationsVO; import java.util.List; import java.util.Map; @@ -70,7 +71,7 @@ Integer isAdministrator, TaskPlaceRectificationVO taskPlaceRectification); List<TaskPlaceRectificationExcel> export(@Param("taskPalce") TaskPlaceRectificationVO taskPlaceRectification, List<TaskPlaceRectificationExcel> export(@Param("taskPalce") TaskPlaceRectificationsVO taskPlaceRectification, @Param("regionChildCodesList") List<String> regionChildCodesList, @Param("isAdministrator") Integer isAdministrator); } src/main/java/org/springblade/modules/taskPlaceRectification/service/ITaskPlaceRectificationService.java
@@ -24,6 +24,7 @@ import org.springblade.modules.taskPlaceRectification.vo.TaskPlaceRectificationVO; import org.springblade.core.mp.base.BaseService; import com.baomidou.mybatisplus.core.metadata.IPage; import org.springblade.modules.taskPlaceRectification.vo.TaskPlaceRectificationsVO; import java.util.List; @@ -66,5 +67,5 @@ Object rectificationStatistics(TaskPlaceRectificationVO taskPlaceRectification); List<TaskPlaceRectificationExcel> export(TaskPlaceRectificationVO taskPlaceRectificationVO); List<TaskPlaceRectificationExcel> export(TaskPlaceRectificationsVO taskPlaceRectificationVO); } src/main/java/org/springblade/modules/taskPlaceRectification/service/impl/TaskPlaceRectificationServiceImpl.java
@@ -41,6 +41,7 @@ import org.springblade.modules.taskPlaceRectification.mapper.TaskPlaceRectificationMapper; import org.springblade.modules.taskPlaceRectification.service.ITaskPlaceRectificationService; import org.springblade.core.mp.base.BaseServiceImpl; import org.springblade.modules.taskPlaceRectification.vo.TaskPlaceRectificationsVO; import org.springframework.stereotype.Service; import com.baomidou.mybatisplus.core.metadata.IPage; @@ -146,7 +147,7 @@ } @Override public List<TaskPlaceRectificationExcel> export(TaskPlaceRectificationVO taskPlaceRectificationVO) { public List<TaskPlaceRectificationExcel> export(TaskPlaceRectificationsVO taskPlaceRectificationVO) { List<String> regionChildCodesList = SysCache.getRegionChildCodesByDeptId(AuthUtil.getDeptId()); Integer isAdministrator = AuthUtil.isAdmin() == true ? 1 : 2; List<TaskPlaceRectificationExcel> export = baseMapper.export(taskPlaceRectificationVO,regionChildCodesList,isAdministrator); src/main/java/org/springblade/modules/taskPlaceRectification/vo/TaskPlaceRectificationsVO.java
New file @@ -0,0 +1,100 @@ /* * Copyright (c) 2018-2028, Chill Zhuang All rights reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions are met: * * Redistributions of source code must retain the above copyright notice, * this list of conditions and the following disclaimer. * Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. * Neither the name of the dreamlu.net developer nor the names of its * contributors may be used to endorse or promote products derived from * this software without specific prior written permission. * Author: Chill 庄骞 (smallchill@163.com) */ package org.springblade.modules.taskPlaceRectification.vo; import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.annotations.ApiModelProperty; import lombok.Data; import lombok.EqualsAndHashCode; import org.springblade.modules.patrol.vo.PatrolRecordVO; import org.springblade.modules.place.vo.PlacePoiLabelVO; import org.springblade.modules.taskPlaceRectification.entity.TaskPlaceRectificationEntity; import java.util.Date; import java.util.List; /** * 场所整改任务表 视图实体类 * * @author BladeX * @since 2024-01-31 */ @Data @EqualsAndHashCode(callSuper = true) public class TaskPlaceRectificationsVO extends TaskPlaceRectificationEntity { private static final long serialVersionUID = 1L; @ApiModelProperty(value = "场所名称", example = "") private String placeName; @ApiModelProperty(value = "场所地址", example = "") private String location; @ApiModelProperty(value = "负责人", example = "") private String principal; @ApiModelProperty(value = "网格名称", example = "") private String gridName; @ApiModelProperty(value = "负责人电话", example = "") private String principalPhone; @ApiModelProperty(value = "街道名称", example = "") private String streetName; @ApiModelProperty(value = "社区名称", example = "") private String communityName; @ApiModelProperty(value = "法人", example = "") private String legalPerson; @ApiModelProperty(value = "法人电话", example = "") private String legalTel; @ApiModelProperty(value = "检查人名称", example = "") private String name; @ApiModelProperty(value = "隐患数量", example = "") private Integer number; @ApiModelProperty(value = "机构名称", example = "") private String deptName; @ApiModelProperty(value = "九小场所类型 业务字典：nineType", example = "") private String nineType; @ApiModelProperty(value = "隐患问题", example = "") private String hiddenDanger; @ApiModelProperty(value = "不通过原因", example = "") private String reasonFailure; @ApiModelProperty(value = "地址编码", example = "") private String addressName; @ApiModelProperty(value = "开始时间", example = "") @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") private Date startTime; /** 创建时间 */ @ApiModelProperty(value = "结束时间", example = "") @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") private Date endTime; }
