src/main/java/org/springblade/modules/place/mapper/PlaceMapper.xml
@@ -140,6 +140,18 @@ <if test="place.townStreetName!=null and place.townStreetName!=''"> and br.town_name like concat('%',#{place.townStreetName},'%') </if> <if test="place.deptName!=null and place.deptName!=''"> and bd.dept_name like concat('%',#{place.deptName},'%') </if> <if test="place.policeName!=null and place.policeName!=''"> and bus.name like concat('%',#{place.policeName},'%') </if> <if test="place.nineType!=null and place.nineType!=''"> and jp.nine_type = #{place.nineType} </if> <if test="place.neiName!=null and place.neiName!=''"> and br.name like concat('%',#{place.neiName},'%') </if> src/main/java/org/springblade/modules/taskPlaceRectification/controller/TaskPlaceRectificationController.java
@@ -35,6 +35,7 @@ import org.springblade.modules.house.excel.HouseExcel; import org.springblade.modules.house.vo.HouseVO; import org.springblade.modules.taskPlaceRectification.dto.TaskPlaceRectificationDTO; import org.springblade.modules.taskPlaceRectification.excel.TaskPlaceRectificationExcel; import org.springframework.web.bind.annotation.*; import com.baomidou.mybatisplus.core.metadata.IPage; import org.springblade.modules.taskPlaceRectification.entity.TaskPlaceRectificationEntity; @@ -183,8 +184,8 @@ @GetMapping("/rectificationStatistics") @ApiOperationSupport(order = 5) @ApiOperation(value = "九小场所类型隐患数量统计", notes = "传入taskPlaceRectification") public R rectificationStatistics() { return R.data(taskPlaceRectificationService.rectificationStatistics()); public R rectificationStatistics(@Valid @RequestBody TaskPlaceRectificationVO taskPlaceRectification) { return R.data(taskPlaceRectificationService.rectificationStatistics(taskPlaceRectification)); } /** @@ -194,8 +195,8 @@ @ApiOperationSupport(order = 13) @ApiOperation(value = "导出整改统计", notes = "传入user") public void exportHouse(TaskPlaceRectificationVO taskPlaceRectificationVO, HttpServletResponse response) { List<HouseExcel> list = taskPlaceRectificationService.export(taskPlaceRectificationVO); ExcelUtil.export(response, "房屋数据" + DateUtil.time(), "房屋数据表", list, HouseExcel.class); List<TaskPlaceRectificationExcel> list = taskPlaceRectificationService.export(taskPlaceRectificationVO); ExcelUtil.export(response, "房屋数据" + DateUtil.time(), "房屋数据表", list, TaskPlaceRectificationExcel.class); }
@@ -18,6 +18,7 @@ import io.swagger.annotations.ApiModelProperty; import org.springblade.modules.patrol.entity.PatrolRecord; import org.springblade.modules.patrol.vo.PatrolRecordVO; import org.springblade.modules.place.vo.PlacePoiLabelVO; import org.springblade.modules.taskPlaceRectification.entity.TaskPlaceRectificationEntity; import lombok.Data; @@ -35,8 +36,12 @@ @EqualsAndHashCode(callSuper = true) public class TaskPlaceRectificationDTO extends TaskPlaceRectificationEntity { private static final long serialVersionUID = 1L; private List<PatrolRecord> patrolRecordVOList; @ApiModelProperty(value = "隐患项目", example = "") private List<PatrolRecordVO> patrolRecordVOList; @ApiModelProperty(value = "场所标签", example = "") private List<PlacePoiLabelVO> placePoiLabelVOList ; @ApiModelProperty(value = "场所名称", example = "") @@ -72,5 +77,20 @@ @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; } src/main/java/org/springblade/modules/taskPlaceRectification/mapper/TaskPlaceRectificationMapper.java
@@ -18,8 +18,10 @@ import org.apache.ibatis.annotations.MapKey; import org.apache.ibatis.annotations.Param; import org.springblade.modules.house.excel.HouseExcel; import org.springblade.modules.taskPlaceRectification.dto.TaskPlaceRectificationDTO; import org.springblade.modules.taskPlaceRectification.entity.TaskPlaceRectificationEntity; import org.springblade.modules.taskPlaceRectification.excel.TaskPlaceRectificationExcel; import org.springblade.modules.taskPlaceRectification.vo.TaskPlaceRectificationVO; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.metadata.IPage; @@ -63,5 +65,12 @@ @Param("regionChildCodesList") List<String> regionChildCodesList, @Param("isAdministrator") Integer isAdministrator); List<Map<String, Object>> getNineTypeStatistics(String code, List<String> regionChildCodesList, Integer isAdministrator); List<Map<String, Object>> getNineTypeStatistics(String code, List<String> regionChildCodesList, Integer isAdministrator, TaskPlaceRectificationVO taskPlaceRectification); List<TaskPlaceRectificationExcel> export(@Param("taskPalce") TaskPlaceRectificationVO taskPlaceRectification, @Param("regionChildCodesList") List<String> regionChildCodesList, @Param("isAdministrator") Integer isAdministrator); } src/main/java/org/springblade/modules/taskPlaceRectification/mapper/TaskPlaceRectificationMapper.xml
@@ -195,9 +195,27 @@ <if test="taskPalce.status != null ">and status = #{taskPalce.status}</if> <if test="taskPalce.taskName != null and taskPalce.taskName != ''">and task_name = #{taskPalce.taskName} </if> <if test="taskPalce.placeName != null and taskPalce.placeName != ''">and place_name = #{taskPalce.placeName} <if test="taskPalce.placeName!=null and taskPalce.placeName!=''"> and jp.place_name like concat('%',#{taskPalce.placeName},'%') </if> <if test="taskPalce.addressName!=null and taskPalce.addressName!=''"> and jda.address_name like concat('%',#{taskPalce.addressName},'%') </if> <if test="taskPalce.deptName!=null and taskPalce.deptName!=''"> and bd.dept_name like concat('%',#{taskPalce.deptName},'%') </if> <if test="taskPalce.nineType!=null"> and jp.nine_type = #{taskPalce.nineType} </if> <if test="taskPalce.punishFlag!=null"> and jp.punish_flag = #{taskPalce.punishFlag} </if> <if test="taskPalce.remark != null and taskPalce.remark != ''">and remark = #{taskPalce.remark}</if> <if test="taskPalce.updateTime != null ">and update_time = #{taskPalce.updateTime}</if> <if test="taskPalce.createTime != null ">and create_time = #{taskPalce.createTime}</if> @@ -306,6 +324,12 @@ and br.town_code =#{code} and jpc.create_time=( SELECT MAX(create_time) FROM jczz_place_check where jpc.house_code=house_code <if test="taskPlaceRectification.startTime!=null and taskPlaceRectification.startTime!=''"> AND date_format(create_time,'%Y-%m-%d')>= #{taskPlaceRectification.startTime} </if> <if test="taskPlaceRectification.endTime!=null and taskPlaceRectification.endTime!=''"> AND date_format(create_time,'%Y-%m-%d')<= #{taskPlaceRectification.endTime} </if> ) </where> ) number @@ -318,6 +342,127 @@ order by bd.sort asc </select> <select id="export" resultType="org.springblade.modules.taskPlaceRectification.excel.TaskPlaceRectificationExcel"> SELECT jtpr.id, jtpr.place_check_id, jtpr.task_id, jtpr.STATUS, jtpr.task_name, jtpr.remark, jtpr.update_time, jtpr.create_time, jtpr.house_code, jtpr.rectification_notice_flag, jtpr.rectification_end_time, jtpr.rectification_complete_time, jtpr.rectification_flag, jtpr.punish_flag, jtpr.police_station, jtpr.rectification_notice_img_url, jtpr.signature_path, jtpr.create_user, jtpr.image_urls, bd.dept_name, jp.id jpid, jp.place_name, jp.location, jg.grid_name, jp.principal, jp.principal_phone, jp.nine_type, br.town_name, br.village_name, bu.`name`, jpe.legal_tel, jpe.legal_person, jda.address_name FROM jczz_task_place_rectification jtpr LEFT JOIN jczz_place jp ON jtpr.house_code = jp.house_code LEFT JOIN jczz_grid jg ON jg.grid_code = jp.grid_code LEFT JOIN blade_region br ON br.`code` = jg.community_code LEFT JOIN jczz_place_ext jpe ON jpe.place_id = jp.id LEFT JOIN blade_user bu ON bu.id = jtpr.create_user LEFT JOIN blade_dept bd ON bu.dept_id = bd.id LEFT JOIN jczz_doorplate_address jda on jda.address_code=jp.house_code <where> <if test="taskPalce.id != null ">and id = #{taskPalce.id}</if> <if test="taskPalce.placeCheckId != null ">and place_check_id = #{taskPalce.placeCheckId}</if> <if test="taskPalce.taskId != null ">and task_id = #{taskPalce.taskId}</if> <if test="taskPalce.status != null ">and status = #{taskPalce.status}</if> <if test="taskPalce.taskName != null and taskPalce.taskName != ''">and task_name = #{taskPalce.taskName} </if> <if test="taskPalce.placeName!=null and taskPalce.placeName!=''"> and jp.place_name like concat('%',#{taskPalce.placeName},'%') </if> <if test="taskPalce.addressName!=null and taskPalce.addressName!=''"> and jda.address_name like concat('%',#{taskPalce.addressName},'%') </if> <if test="taskPalce.deptName!=null and taskPalce.deptName!=''"> and bd.dept_name like concat('%',#{taskPalce.deptName},'%') </if> <if test="taskPalce.nineType!=null"> and jp.nine_type = #{taskPalce.nineType} </if> <if test="taskPalce.punishFlag!=null"> and jp.punish_flag = #{taskPalce.punishFlag} </if> <if test="taskPalce.remark != null and taskPalce.remark != ''">and remark = #{taskPalce.remark}</if> <if test="taskPalce.updateTime != null ">and update_time = #{taskPalce.updateTime}</if> <if test="taskPalce.createTime != null ">and create_time = #{taskPalce.createTime}</if> <if test="taskPalce.houseCode != null and taskPalce.houseCode != ''">and house_code = #{taskPalce.houseCode} </if> <if test="taskPalce.rectificationNoticeFlag != null ">and rectification_notice_flag = #{taskPalce.rectificationNoticeFlag} </if> <if test="taskPalce.rectificationEndTime != null ">and rectification_end_time = #{taskPalce.rectificationEndTime} </if> <if test="taskPalce.rectificationCompleteTime != null ">and rectification_complete_time = #{taskPalce.rectificationCompleteTime} </if> <if test="taskPalce.rectificationFlag != null ">and rectification_flag = #{taskPalce.rectificationFlag}</if> <if test="taskPalce.punishFlag != null ">and punish_flag = #{taskPalce.punishFlag}</if> <if test="taskPalce.policeStation != null and taskPalce.policeStation != ''">and police_station = #{taskPalce.policeStation} </if> <if test="taskPalce.rectificationNoticeImgUrl != null and taskPalce.rectificationNoticeImgUrl != ''">and rectification_notice_img_url = #{taskPalce.rectificationNoticeImgUrl} </if> <if test="taskPalce.signaturePath != null and taskPalce.signaturePath != ''">and signature_path = #{taskPalce.signaturePath} </if> <if test="taskPalce.createUser != null ">and create_user = #{taskPalce.createUser}</if> <if test="taskPalce.imageUrls != null and taskPalce.imageUrls != ''">and image_urls = #{taskPalce.imageUrls} </if> <if test="isAdministrator==2"> <choose> <when test="regionChildCodesList !=null and regionChildCodesList.size()>0"> and jg.grid_code in <foreach collection="regionChildCodesList" item="code" open="(" close=")" separator=","> #{code} </foreach> </when> </choose> </if> and jtpr.create_time=( SELECT MAX(create_time) FROM jczz_task_place_rectification where jtpr.house_code=house_code ) </where> </select> </mapper> src/main/java/org/springblade/modules/taskPlaceRectification/service/ITaskPlaceRectificationService.java
@@ -20,6 +20,7 @@ import org.springblade.modules.house.excel.HouseExcel; import org.springblade.modules.taskPlaceRectification.dto.TaskPlaceRectificationDTO; import org.springblade.modules.taskPlaceRectification.entity.TaskPlaceRectificationEntity; import org.springblade.modules.taskPlaceRectification.excel.TaskPlaceRectificationExcel; import org.springblade.modules.taskPlaceRectification.vo.TaskPlaceRectificationVO; import org.springblade.core.mp.base.BaseService; import com.baomidou.mybatisplus.core.metadata.IPage; @@ -63,7 +64,7 @@ Boolean applyRectification(TaskPlaceRectificationVO taskPlaceRectification); Object rectificationStatistics(); Object rectificationStatistics(TaskPlaceRectificationVO taskPlaceRectification); List<HouseExcel> export(TaskPlaceRectificationVO taskPlaceRectificationVO); List<TaskPlaceRectificationExcel> export(TaskPlaceRectificationVO taskPlaceRectificationVO); } src/main/java/org/springblade/modules/taskPlaceRectification/service/impl/TaskPlaceRectificationServiceImpl.java
@@ -36,6 +36,7 @@ import org.springblade.modules.task.service.ITaskService; import org.springblade.modules.taskPlaceRectification.dto.TaskPlaceRectificationDTO; import org.springblade.modules.taskPlaceRectification.entity.TaskPlaceRectificationEntity; import org.springblade.modules.taskPlaceRectification.excel.TaskPlaceRectificationExcel; import org.springblade.modules.taskPlaceRectification.vo.TaskPlaceRectificationVO; import org.springblade.modules.taskPlaceRectification.mapper.TaskPlaceRectificationMapper; import org.springblade.modules.taskPlaceRectification.service.ITaskPlaceRectificationService; @@ -128,7 +129,7 @@ } @Override public Object rectificationStatistics() { public Object rectificationStatistics(TaskPlaceRectificationVO taskPlaceRectification) { List<String> regionChildCodesList = SysCache.getRegionChildCodesByDeptId(AuthUtil.getDeptId()); Integer isAdministrator = AuthUtil.isAdmin() == true ? 1 : 2; // 统计九小场所类型隐患统计 @@ -138,15 +139,17 @@ .eq(Region::getRegionLevel, 4)); List<RegionVO> copy = BeanUtil.copy(list, RegionVO.class); for (RegionVO regionVO : copy) { List<Map<String, Object>> nineTypeStatistics = baseMapper.getNineTypeStatistics(regionVO.getCode(), regionChildCodesList, isAdministrator); List<Map<String, Object>> nineTypeStatistics = baseMapper.getNineTypeStatistics(regionVO.getCode(), regionChildCodesList, isAdministrator,taskPlaceRectification); regionVO.setNineTypeStatistics(nineTypeStatistics); } return copy; } @Override public List<HouseExcel> export(TaskPlaceRectificationVO taskPlaceRectificationVO) { List<HouseExcel> houseExcels = null; //baseMapper.export(taskPlaceRectificationVO); return houseExcels; public List<TaskPlaceRectificationExcel> export(TaskPlaceRectificationVO taskPlaceRectificationVO) { List<String> regionChildCodesList = SysCache.getRegionChildCodesByDeptId(AuthUtil.getDeptId()); Integer isAdministrator = AuthUtil.isAdmin() == true ? 1 : 2; List<TaskPlaceRectificationExcel> export = baseMapper.export(taskPlaceRectificationVO,regionChildCodesList,isAdministrator); return export; } } src/main/java/org/springblade/modules/taskPlaceRectification/vo/TaskPlaceRectificationVO.java
@@ -16,6 +16,9 @@ */ package org.springblade.modules.taskPlaceRectification.vo; import com.baomidou.mybatisplus.annotation.FieldFill; import com.baomidou.mybatisplus.annotation.TableField; import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.annotations.ApiModelProperty; import org.springblade.modules.patrol.entity.PatrolRecord; import org.springblade.modules.patrol.vo.PatrolRecordVO; @@ -25,6 +28,7 @@ import lombok.Data; import lombok.EqualsAndHashCode; import java.util.Date; import java.util.List; /** @@ -92,4 +96,15 @@ @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; }
