src/main/java/org/springblade/modules/grid/mapper/GridmanMapper.xml
@@ -54,17 +54,16 @@ <select id="getGridStatistics" resultType="java.lang.Integer"> SELECT count(1) number FROM jczz_grid jg LEFT JOIN jczz_gridman jgm ON jg.id = jgm.grid_id FROM jczz_gridman jgm LEFT JOIN jczz_grid jg ON jg.id = jgm.grid_id WHERE jg.community_code = #{code} AND jg.is_deleted = 0 <if test="userId!=null"> AND jg.is_deleted = 0 <if test="userId!=null and roleType == '1'"> and jgm.user_id= #{userId} </if> </select> <select id="getCompanyStatistics" resultType="java.lang.Integer"> SELECT count(1) FROM @@ -73,9 +72,9 @@ WHERE jd.community_code = #{code} and jpcd.is_deleted= 0 <if test="userId!=null"> AND EXISTS ( SELECT <if test="userId!=null and roleType == '1'"> AND jd.aoi_code in ( SELECT distinct jda.aoi_code FROM jczz_grid jg @@ -85,10 +84,18 @@ WHERE jgm.user_id = #{userId} AND jg.is_deleted = 0 AND jd.aoi_code = jda.aoi_code AND jda.aoi_code IS NOT NULL GROUP BY ) </if> <if test="userId != null and roleType == '3'"> AND jd.aoi_code IN (SELECT jda.aoi_code FROM jczz_doorplate_address jda LEFT JOIN jczz_community jc ON jc.CODE = jda.nei_code WHERE jc.res_police_user_id = #{userId}) ) </if>
@@ -181,14 +181,15 @@ @Override public Object getGridStatistics(String code, String roleType) { Map<String, Object> objectObjectHashMap = new HashMap<>(); if (roleType.equals("1")) { Integer gridStatistics = baseMapper.getGridStatistics(code, AuthUtil.getUserId()); Integer companyStatistics = baseMapper.getCompanyStatistics(code, AuthUtil.getUserId()); if (roleType.equals("2")) { Integer gridStatistics = baseMapper.getGridStatistics(code, null); Integer companyStatistics = baseMapper.getCompanyStatistics(code, null); objectObjectHashMap.put("gridStatistics", gridStatistics); objectObjectHashMap.put("companyStatistics", companyStatistics); } else { Integer gridStatistics = baseMapper.getGridStatistics(code, null); Integer companyStatistics = baseMapper.getCompanyStatistics(code, null); Integer gridStatistics = baseMapper.getGridStatistics(code, AuthUtil.getUserId()); Integer companyStatistics = baseMapper.getCompanyStatistics(code, AuthUtil.getUserId()); objectObjectHashMap.put("gridStatistics", gridStatistics); objectObjectHashMap.put("companyStatistics", companyStatistics); } src/main/java/org/springblade/modules/house/mapper/HouseholdMapper.xml
@@ -292,9 +292,10 @@ WHERE jda.nei_code = #{code} AND jh.is_deleted = 0 and jda.doorplate_type = '户室牌' <if test="userId != null and roleType == '1'"> AND jda.address_code IN ( SELECT SELECT DISTINCT jgr.house_code FROM jczz_grid jg @@ -302,7 +303,6 @@ LEFT JOIN jczz_grid_range jgr ON jgr.grid_id = jg.id WHERE jgm.user_id = #{userId} AND jh.house_code = jgr.house_code AND jg.is_deleted = 0 ) </if> @@ -327,17 +327,20 @@ when TIMESTAMPDIFF(YEAR,STR_TO_DATE(substr(id_card,7,8),'%Y%m%d'),sysdate()) <![CDATA[ >= ]]> 0 and TIMESTAMPDIFF(YEAR,STR_TO_DATE(substr(id_card,7,8),'%Y%m%d'),sysdate()) <![CDATA[ <= ]]> 3 then '0~3岁' when TIMESTAMPDIFF(YEAR,STR_TO_DATE(substr(id_card,7,8),'%Y%m%d'),sysdate()) <![CDATA[ >= ]]> 4 and TIMESTAMPDIFF(YEAR,STR_TO_DATE(substr(id_card,7,8),'%Y%m%d'),sysdate()) <![CDATA[ <= ]]> 17 then '4~17岁' when TIMESTAMPDIFF(YEAR,STR_TO_DATE(substr(id_card,7,8),'%Y%m%d'),sysdate()) <![CDATA[ >= ]]> 18 and TIMESTAMPDIFF(YEAR,STR_TO_DATE(substr(id_card,7,8),'%Y%m%d'),sysdate()) <![CDATA[ <= ]]> 39 then '18~39岁' when TIMESTAMPDIFF(YEAR,STR_TO_DATE(substr(id_card,7,8),'%Y%m%d'),sysdate()) <![CDATA[ >= ]]> 40 and TIMESTAMPDIFF(YEAR,STR_TO_DATE(substr(id_card,7,8),'%Y%m%d'),sysdate()) <![CDATA[ <= ]]> 59 then '40~59岁' when TIMESTAMPDIFF(YEAR,STR_TO_DATE(substr(id_card,7,8),'%Y%m%d'),sysdate()) <![CDATA[ >= ]]> 60 and TIMESTAMPDIFF(YEAR,STR_TO_DATE(substr(id_card,7,8),'%Y%m%d'),sysdate()) <![CDATA[ <= ]]> 79 then '60~79岁' when TIMESTAMPDIFF(YEAR,STR_TO_DATE(substr(id_card,7,8),'%Y%m%d'),sysdate()) <![CDATA[ > ]]> 80 then '80岁以上' ELSE '无身份信息' END AS age, count(1) as number FROM jczz_household jh LEFT JOIN jczz_doorplate_address jda ON jh.house_code = jda.address_code when TIMESTAMPDIFF(YEAR,STR_TO_DATE(substr(id_card,7,8),'%Y%m%d'),sysdate()) <![CDATA[ >= ]]> 40 and TIMESTAMPDIFF(YEAR,STR_TO_DATE(substr(id_card,7,8),'%Y%m%d'),sysdate()) <![CDATA[ <= ]]> 59 then '40~59岁' when TIMESTAMPDIFF(YEAR,STR_TO_DATE(substr(id_card,7,8),'%Y%m%d'),sysdate()) <![CDATA[ >= ]]> 60 and TIMESTAMPDIFF(YEAR,STR_TO_DATE(substr(id_card,7,8),'%Y%m%d'),sysdate()) <![CDATA[ <= ]]> 79 then '60~79岁' when TIMESTAMPDIFF(YEAR,STR_TO_DATE(substr(id_card,7,8),'%Y%m%d'),sysdate()) <![CDATA[ > ]]> 80 then '80岁以上' ELSE '无身份信息' END AS age, count(1) as number FROM jczz_household jh LEFT JOIN jczz_doorplate_address jda ON jh.house_code = jda.address_code WHERE jda.nei_code = #{code} AND jh.is_deleted = 0 jda.nei_code = #{code} and jda.doorplate_type = '户室牌' AND jh.is_deleted = 0 <if test="userId != null and roleType == '1'"> AND jda.address_code IN ( SELECT src/main/java/org/springblade/modules/task/controller/TaskCampusReportingEventController.java
@@ -120,7 +120,7 @@ @ApiOperationSupport(order = 7) @ApiOperation(value = "逻辑删除", notes = "传入ids") public R remove(@ApiParam(value = "主键集合", required = true) @RequestParam String ids) { return R.status(taskCampusReportingEventService.deleteLogic(Func.toLongList(ids))); return R.status(taskCampusReportingEventService.removeBatchByIds(Func.toLongList(ids))); }
@@ -16,7 +16,11 @@ */ package org.springblade.modules.task.entity; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import com.fasterxml.jackson.annotation.JsonFormat; import lombok.Data; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; @@ -33,173 +37,178 @@ @Data @TableName("jczz_task_campus_reporting_event") @ApiModel(value = "TaskCampusReportingEvent对象", description = "校园安全检查任务表") @EqualsAndHashCode(callSuper = true) public class TaskCampusReportingEventEntity extends TenantEntity { public class TaskCampusReportingEventEntity { /** * 任务ID */ @ApiModelProperty(value = "任务ID") /** 主键id */ @ApiModelProperty(value = "主键ID", example = "") // @TableId(value = "id", type = IdType.AUTO) private Long id; /** 任务ID */ @ApiModelProperty(value = "任务ID", example = "") @TableField("task_id") private Long taskId; /** * 场所ID */ @ApiModelProperty(value = "场所ID") /** 场所ID */ @ApiModelProperty(value = "场所ID", example = "") @TableField("place_id") private Integer placeId; /** * 小区ID */ @ApiModelProperty(value = "小区ID") /** 小区ID */ @ApiModelProperty(value = "小区ID", example = "") @TableField("district_id") private String districtId; /** * 小区名称 */ @ApiModelProperty(value = "小区名称") /** 小区名称 */ @ApiModelProperty(value = "小区名称", example = "") @TableField("district_name") private String districtName; /** * 自查时间 */ @ApiModelProperty(value = "自查时间") /** 自查时间 */ @ApiModelProperty(value = "自查时间", example = "") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") @TableField("check_time") private Date checkTime; /** * 自查人姓名 */ @ApiModelProperty(value = "自查人姓名") /** 自查人姓名 */ @ApiModelProperty(value = "自查人姓名", example = "") @TableField("check_user_id") private Long checkUserId; /** * 自查人姓名 */ @ApiModelProperty(value = "自查人姓名") /** 自查人姓名 */ @ApiModelProperty(value = "自查人姓名", example = "") @TableField("check_user_name") private String checkUserName; /** * 自查人手机 */ @ApiModelProperty(value = "自查人手机") /** 自查人手机 */ @ApiModelProperty(value = "自查人手机", example = "") @TableField("check_telephone") private String checkTelephone; /** * 自查位置 */ @ApiModelProperty(value = "自查位置") /** 自查位置 */ @ApiModelProperty(value = "自查位置", example = "") @TableField("location") private String location; /** * 安全通道状态 */ @ApiModelProperty(value = "安全通道状态") /** 安全通道状态 */ @ApiModelProperty(value = "安全通道状态", example = "") @TableField("sc_status") private String scStatus; /** * 安全通道图片 */ @ApiModelProperty(value = "安全通道图片") /** 安全通道图片 */ @ApiModelProperty(value = "安全通道图片", example = "") @TableField("sc_image_urls") private String scImageUrls; /** * 未成年人入住登记本照片 */ @ApiModelProperty(value = "未成年人入住登记本照片") /** 未成年人入住登记本照片 */ @ApiModelProperty(value = "未成年人入住登记本照片", example = "") @TableField("uan_image_urls") private String uanImageUrls; /** * 确认时间 */ @ApiModelProperty(value = "确认时间") /** 确认时间 */ @ApiModelProperty(value = "确认时间", example = "") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") @TableField("confirm_time") private Date confirmTime; /** * 确认用户ID */ @ApiModelProperty(value = "确认用户ID") /** 确认用户ID */ @ApiModelProperty(value = "确认用户ID", example = "") @TableField("confirm_user_id") private Integer confirmUserId; /** * 确认用户ID */ @ApiModelProperty(value = "确认用户ID") /** 确认用户ID */ @ApiModelProperty(value = "确认用户ID", example = "") @TableField("confirm_user_name") private String confirmUserName; /** * 确认意见 */ @ApiModelProperty(value = "确认意见") /** 确认意见 */ @ApiModelProperty(value = "确认意见", example = "") @TableField("confirm_notion") private String confirmNotion; /** * 确认标记 */ @ApiModelProperty(value = "确认标记") /** 确认标记 */ @ApiModelProperty(value = "确认标记", example = "") @TableField("confirm_flag") private String confirmFlag; /** * 校园名称 */ @ApiModelProperty(value = "校园名称") /** 校园名称 */ @ApiModelProperty(value = "校园名称", example = "") @TableField("campus_name") private String campusName; /** * 四个一 */ @ApiModelProperty(value = "四个一") /** 四个一 */ @ApiModelProperty(value = "四个一", example = "") @TableField("four_one") private String fourOne; /** * 消防器材数量 */ @ApiModelProperty(value = "消防器材数量") /** 消防器材数量 */ @ApiModelProperty(value = "消防器材数量", example = "") @TableField("fire_facs_nums") private Integer fireFacsNums; /** * 消防器材状态 */ @ApiModelProperty(value = "消防器材状态") /** 消防器材状态 */ @ApiModelProperty(value = "消防器材状态", example = "") @TableField("fire_facs_status") private String fireFacsStatus; /** * 消防器材图片 */ @ApiModelProperty(value = "消防器材图片") /** 消防器材图片 */ @ApiModelProperty(value = "消防器材图片", example = "") @TableField("fire_facs_image_urls") private String fireFacsImageUrls; /** * 消防器材种类 */ @ApiModelProperty(value = "消防器材种类") /** 消防器材种类 */ @ApiModelProperty(value = "消防器材种类", example = "") @TableField("fire_facs_type") private String fireFacsType; /** * 校园周边安全巡查照片 */ @ApiModelProperty(value = "校园周边安全巡查照片") /** 校园周边安全巡查照片 */ @ApiModelProperty(value = "校园周边安全巡查照片", example = "") @TableField("patrol_image_urls") private String patrolImageUrls; /** * 学校大门是否配备防撞装置 */ @ApiModelProperty(value = "学校大门是否配备防撞装置") /** 学校大门是否配备防撞装置 */ @ApiModelProperty(value = "学校大门是否配备防撞装置", example = "") @TableField("anti_collision") private String antiCollision; /** * 校园防撞装置照片 */ @ApiModelProperty(value = "校园防撞装置照片") /** 校园防撞装置照片 */ @ApiModelProperty(value = "校园防撞装置照片", example = "") @TableField("anti_collision_image_urls") private String antiCollisionImageUrls; /** * 专职保安人数 */ @ApiModelProperty(value = "专职保安人数") /** 专职保安人数 */ @ApiModelProperty(value = "专职保安人数", example = "") @TableField("full_so_nums") private Integer fullSoNums; /** * 兼职保安人数 */ @ApiModelProperty(value = "兼职保安人数") /** 兼职保安人数 */ @ApiModelProperty(value = "兼职保安人数", example = "") @TableField("part_so_nums") private Integer partSoNums; /** * 学校监控总数 */ @ApiModelProperty(value = "学校监控总数") /** 学校监控总数 */ @ApiModelProperty(value = "学校监控总数", example = "") @TableField("monitor_nums") private Integer monitorNums; /** * 监控是否全覆盖 */ @ApiModelProperty(value = "监控是否全覆盖") /** 监控是否全覆盖 */ @ApiModelProperty(value = "监控是否全覆盖", example = "") @TableField("monitor_over") private String monitorOver; /** * 高空抛物监控 */ @ApiModelProperty(value = "高空抛物监控") /** 高空抛物监控 */ @ApiModelProperty(value = "高空抛物监控", example = "") @TableField("high_altitude_monitor") private String highAltitudeMonitor; /** * 高空抛物监控照片 */ @ApiModelProperty(value = "高空抛物监控照片") /** 高空抛物监控照片 */ @ApiModelProperty(value = "高空抛物监控照片", example = "") @TableField("ha_image_urls") private String haImageUrls; /** * 四个一工程照片 */ @ApiModelProperty(value = "四个一工程照片") /** 四个一工程照片 */ @ApiModelProperty(value = "四个一工程照片", example = "") @TableField("fo_image_urls") private String foImageUrls; } src/main/java/org/springblade/modules/task/service/ITaskCampusReportingEventService.java
@@ -17,6 +17,7 @@ package org.springblade.modules.task.service; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.service.IService; import org.springblade.core.mp.base.BaseService; import org.springblade.modules.task.dto.TaskCampusReportingEventDTO; import org.springblade.modules.task.entity.TaskCampusReportingEventEntity; @@ -28,7 +29,7 @@ * @author BladeX * @since 2023-11-06 */ public interface ITaskCampusReportingEventService extends BaseService<TaskCampusReportingEventEntity> { public interface ITaskCampusReportingEventService extends IService<TaskCampusReportingEventEntity> { /** * 自定义分页 src/main/java/org/springblade/modules/task/service/impl/TaskCampusReportingEventServiceImpl.java
@@ -16,6 +16,7 @@ */ package org.springblade.modules.task.service.impl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import org.apache.commons.lang3.StringUtils; import org.springblade.common.constant.DictConstant; import org.springblade.core.secure.utils.AuthUtil; @@ -39,7 +40,7 @@ * @since 2023-11-06 */ @Service public class TaskCampusReportingEventServiceImpl extends BaseServiceImpl<TaskCampusReportingEventMapper, TaskCampusReportingEventEntity> implements ITaskCampusReportingEventService { public class TaskCampusReportingEventServiceImpl extends ServiceImpl<TaskCampusReportingEventMapper, TaskCampusReportingEventEntity> implements ITaskCampusReportingEventService { @Resource private ITaskService taskService;
