From eb55b4133ae6b3df80d8d14fbc5b32928f296fd7 Mon Sep 17 00:00:00 2001
From: linwe <872216996@qq.com>
Date: Tue, 26 Dec 2023 14:17:07 +0800
Subject: [PATCH] bug修复
---
src/main/java/org/springblade/modules/place/mapper/PlaceExtMapper.xml | 41 ++++
src/main/java/org/springblade/modules/house/mapper/HouseholdMapper.java | 2
src/main/java/org/springblade/modules/place/service/IPlaceExtService.java | 3
src/main/java/org/springblade/modules/grid/mapper/GridPatrolRecordMapper.xml | 18 +
src/main/java/org/springblade/modules/task/mapper/TaskReportForRepairsMapper.java | 2
src/main/java/org/springblade/modules/house/mapper/HouseRentalMapper.xml | 25 ++
src/main/java/org/springblade/modules/house/service/impl/HouseRentalServiceImpl.java | 2
src/main/java/org/springblade/modules/task/vo/TaskVO.java | 2
src/main/java/org/springblade/modules/house/controller/HouseRentalController.java | 1
src/main/java/org/springblade/modules/house/vo/HouseholdVO.java | 3
src/main/java/org/springblade/modules/task/service/ITaskReportForRepairsService.java | 2
src/main/java/org/springblade/modules/task/mapper/TaskMapper.xml | 69 +++++---
src/main/java/org/springblade/modules/house/service/impl/HouseholdServiceImpl.java | 4
src/main/java/org/springblade/modules/task/controller/TaskReportForRepairsController.java | 2
src/main/java/org/springblade/modules/place/service/impl/PlaceExtServiceImpl.java | 5
src/main/java/org/springblade/modules/task/service/impl/TaskServiceImpl.java | 48 +++---
src/main/java/org/springblade/modules/place/mapper/PlaceExtMapper.java | 9
src/main/java/org/springblade/modules/place/service/impl/PlaceServiceImpl.java | 1
src/main/java/org/springblade/modules/house/mapper/HouseRentalMapper.java | 2
src/main/java/org/springblade/modules/system/controller/MenuController.java | 2
src/main/java/org/springblade/modules/task/controller/TaskController.java | 2
src/main/java/org/springblade/modules/house/vo/HouseRentalTenantVO.java | 4
src/main/java/org/springblade/modules/house/controller/HouseholdController.java | 22 +-
src/main/java/org/springblade/modules/house/mapper/HouseholdMapper.xml | 35 +++-
src/main/java/org/springblade/modules/house/service/IHouseholdService.java | 2
src/main/java/org/springblade/modules/task/service/impl/TaskReportForRepairsServiceImpl.java | 4
src/main/java/org/springblade/modules/grid/entity/GridPatrolRecordEntity.java | 90 +++++-----
src/main/java/org/springblade/modules/task/mapper/TaskReportForRepairsMapper.xml | 27 ++-
28 files changed, 269 insertions(+), 160 deletions(-)
diff --git a/src/main/java/org/springblade/modules/grid/entity/GridPatrolRecordEntity.java b/src/main/java/org/springblade/modules/grid/entity/GridPatrolRecordEntity.java
index 9b3ac87..e075656 100644
--- a/src/main/java/org/springblade/modules/grid/entity/GridPatrolRecordEntity.java
+++ b/src/main/java/org/springblade/modules/grid/entity/GridPatrolRecordEntity.java
@@ -16,10 +16,7 @@
*/
package org.springblade.modules.grid.entity;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableLogic;
-import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.*;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
@@ -45,58 +42,61 @@
public class GridPatrolRecordEntity implements Serializable {
private static final long serialVersionUID = 1L;
- /**
- * 主键
- */
- @JsonSerialize(using = ToStringSerializer.class)
- @ApiModelProperty("主键id")
+
+ @ApiModelProperty(value = "主键ID", example = "")
@TableId(value = "id", type = IdType.ASSIGN_ID)
private Long id;
- /**
- * 名称
- */
- @ApiModelProperty(value = "名称")
+ /** 名称 */
+ @ApiModelProperty(value = "名称", example = "")
+ @TableField("name")
private String name;
- /**
- * 内容
- */
- @ApiModelProperty(value = "内容")
+
+ /** 内容 */
+ @ApiModelProperty(value = "内容", example = "")
+ @TableField("context")
private String context;
- /**
- * 图片地址
- */
- @ApiModelProperty(value = "图片地址")
+
+ /** 图片地址 */
+ @ApiModelProperty(value = "图片地址", example = "")
+ @TableField("url")
private String url;
- /**
- * 巡查时间
- */
- @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
- @ApiModelProperty("巡查时间")
+ /** 巡查时间 */
+ @ApiModelProperty(value = "巡查时间", example = "")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ @TableField("patrol_time")
private Date patrolTime;
- /**
- * 创建人
- */
- @JsonSerialize(using = ToStringSerializer.class)
- @ApiModelProperty("创建人")
- private Long createUser;
-
- /**
- * 创建时间
- */
- @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
- @ApiModelProperty("创建时间")
+ /** 创建时间 */
+ @ApiModelProperty(value = "创建时间", example = "")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ @TableField(value = "create_time",fill = FieldFill.INSERT)
private Date createTime;
- /**
- * 是否删除
- */
- @TableLogic
- @ApiModelProperty("是否已删除 0:否 1:是")
+ /** 创建人 */
+ @ApiModelProperty(value = "创建人", example = "")
+ @TableField("create_user")
+ private Long createUser;
+
+ /** 是否删除 0：否 1：是 */
+ @ApiModelProperty(value = "是否删除 0：否 1：是", example = "")
+ @TableField("is_deleted")
private Integer isDeleted;
+ /** 纬度 */
+ @ApiModelProperty(value = "纬度", example = "")
+ @TableField("latitude")
+ private String latitude;
+
+ /** 经度 */
+ @ApiModelProperty(value = "经度", example = "")
+ @TableField("longitude")
+ private String longitude;
+
+ /** 地址 */
+ @ApiModelProperty(value = "地址", example = "")
+ @TableField("location")
+ private String location;
+
}
diff --git a/src/main/java/org/springblade/modules/grid/mapper/GridPatrolRecordMapper.xml b/src/main/java/org/springblade/modules/grid/mapper/GridPatrolRecordMapper.xml
index 0f935d8..1c28ced 100644
--- a/src/main/java/org/springblade/modules/grid/mapper/GridPatrolRecordMapper.xml
+++ b/src/main/java/org/springblade/modules/grid/mapper/GridPatrolRecordMapper.xml
@@ -4,13 +4,17 @@
<!-- 通用查询映射结果 -->
<resultMap id="gridPatrolRecordResultMap" type="org.springblade.modules.grid.entity.GridPatrolRecordEntity">
- <result column="id" property="id"/>
- <result column="name" property="name"/>
- <result column="context" property="context"/>
- <result column="url" property="url"/>
- <result column="create_time" property="createTime"/>
- <result column="create_user" property="createUser"/>
- <result column="is_deleted" property="isDeleted"/>
+ <result property="id" column="id" />
+ <result property="name" column="name" />
+ <result property="context" column="context" />
+ <result property="url" column="url" />
+ <result property="patrolTime" column="patrol_time" />
+ <result property="createTime" column="create_time" />
+ <result property="createUser" column="create_user" />
+ <result property="isDeleted" column="is_deleted" />
+ <result property="latitude" column="latitude" />
+ <result property="longitude" column="longitude" />
+ <result property="location" column="location" />
</resultMap>
<!--自定义分页查询-->
diff --git a/src/main/java/org/springblade/modules/house/controller/HouseRentalController.java b/src/main/java/org/springblade/modules/house/controller/HouseRentalController.java
index 7fa0571..5e9d4a4 100644
--- a/src/main/java/org/springblade/modules/house/controller/HouseRentalController.java
+++ b/src/main/java/org/springblade/modules/house/controller/HouseRentalController.java
@@ -184,6 +184,7 @@
@GetMapping("/getStatisticsCount")
public R getStatisticsCount(HouseRentalTenantVO houseRental){
+ houseRental.setUserId(AuthUtil.getUserId());
return R.data(houseRentalService.getStatisticsCount(houseRental));
}
diff --git a/src/main/java/org/springblade/modules/house/controller/HouseholdController.java b/src/main/java/org/springblade/modules/house/controller/HouseholdController.java
index d8e7e7e..8bc331a 100644
--- a/src/main/java/org/springblade/modules/house/controller/HouseholdController.java
+++ b/src/main/java/org/springblade/modules/house/controller/HouseholdController.java
@@ -16,15 +16,13 @@
*/
package org.springblade.modules.house.controller;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
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.boot.ctrl.BladeController;
import org.springblade.core.excel.util.ExcelUtil;
import org.springblade.core.mp.support.Condition;
import org.springblade.core.mp.support.Query;
@@ -32,17 +30,17 @@
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.entity.HouseholdEntity;
import org.springblade.modules.house.excel.HouseHoldExcel;
import org.springblade.modules.house.excel.HouseHoldImporter;
-import org.springframework.web.bind.annotation.*;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import org.springblade.modules.house.entity.HouseholdEntity;
+import org.springblade.modules.house.service.IHouseholdService;
import org.springblade.modules.house.vo.HouseholdVO;
import org.springblade.modules.house.wrapper.HouseholdWrapper;
-import org.springblade.modules.house.service.IHouseholdService;
-import org.springblade.core.boot.ctrl.BladeController;
+import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;
+import javax.servlet.http.HttpServletResponse;
+import javax.validation.Valid;
import java.util.List;
/**
@@ -159,8 +157,8 @@
@PostMapping("/statistics")
@ApiOperationSupport(order = 7)
@ApiOperation(value = "住户审核统计", notes = "网格员调用")
- public R remove( ) {
- return R.data(householdService.statistics(AuthUtil.getUserId()));
+ public R getStatistics() {
+ return R.data(householdService.statistics(AuthUtil.getUserId(), ""));
}
/**
diff --git a/src/main/java/org/springblade/modules/house/mapper/HouseRentalMapper.java b/src/main/java/org/springblade/modules/house/mapper/HouseRentalMapper.java
index 458ec1f..f724c45 100644
--- a/src/main/java/org/springblade/modules/house/mapper/HouseRentalMapper.java
+++ b/src/main/java/org/springblade/modules/house/mapper/HouseRentalMapper.java
@@ -67,5 +67,5 @@
*/
List<HouseRentalExcel> export(@Param("vo") HouseRentalTenantVO houseRental);
- Integer getStatisticsCount(Long userId);
+ Integer getStatisticsCount(Long userId,String neiCode);
}
diff --git a/src/main/java/org/springblade/modules/house/mapper/HouseRentalMapper.xml b/src/main/java/org/springblade/modules/house/mapper/HouseRentalMapper.xml
index f8cdc45..f63f335 100644
--- a/src/main/java/org/springblade/modules/house/mapper/HouseRentalMapper.xml
+++ b/src/main/java/org/springblade/modules/house/mapper/HouseRentalMapper.xml
@@ -295,16 +295,27 @@
<select id="getStatisticsCount" resultType="java.lang.Integer">
SELECT
- count(1)
+ count( 1 )
FROM
- jczz_grid_range jgr
- LEFT JOIN jczz_grid jg ON jg.id = jgr.grid_id
- LEFT JOIN jczz_gridman jgm on jg.id = jgm.grid_id
- LEFT JOIN jczz_house_rental jhr on jhr.house_code=jgr.house_code
+ jczz_house_rental jhr
+ LEFT JOIN jczz_doorplate_address jda ON jhr.house_code = jda.address_code
WHERE
+ jhr.is_deleted = 0
+ <if test="neiCode != null and neiCode != ''">
+ and jda.nei_code = #{neiCode}
+ </if>
+ <if test="userId != null">
+ AND jhr.house_code IN (
+ SELECT
+ jgr.house_code
+ FROM
+ jczz_grid_range jgr
+ LEFT JOIN jczz_grid jg ON jg.id = jgr.grid_id
+ LEFT JOIN jczz_gridman jgm ON jg.id = jgm.grid_id
+ WHERE
jg.is_deleted = 0
- and jhr.audit_status = 0
- AND jgm.user_id = #{userId}
+ AND jgm.user_id = #{userId} )
+ </if>
</select>
diff --git a/src/main/java/org/springblade/modules/house/mapper/HouseholdMapper.java b/src/main/java/org/springblade/modules/house/mapper/HouseholdMapper.java
index 2bdfeac..7290897 100644
--- a/src/main/java/org/springblade/modules/house/mapper/HouseholdMapper.java
+++ b/src/main/java/org/springblade/modules/house/mapper/HouseholdMapper.java
@@ -74,7 +74,7 @@
*/
List<HouseHoldExcel> export(@Param("household") HouseholdVO household);
- Integer statistics(Long userId);
+ Integer statistics(Long userId,String neiCode);
/**
* 查询物业
diff --git a/src/main/java/org/springblade/modules/house/mapper/HouseholdMapper.xml b/src/main/java/org/springblade/modules/house/mapper/HouseholdMapper.xml
index effa372..5228875 100644
--- a/src/main/java/org/springblade/modules/house/mapper/HouseholdMapper.xml
+++ b/src/main/java/org/springblade/modules/house/mapper/HouseholdMapper.xml
@@ -153,12 +153,16 @@
jg.grid_name
FROM
jczz_household jh
- LEFT JOIN jczz_house jhs ON jh.house_code = jhs.house_code
+ LEFT JOIN jczz_house jhs ON jh.house_code = jhs.house_code and jhs.is_deleted = 0
LEFT JOIN jczz_doorplate_address jda ON jda.address_code = jh.house_code
LEFT JOIN jczz_grid_range jgr on jgr.house_code=jda.address_code
LEFT JOIN jczz_grid jg on jg.id = jgr.grid_id
+ LEFT JOIN jczz_gridman jgm on jgm.grid_id=jg.id
WHERE
jh.is_deleted = 0
+ <if test="household.userId!=null">
+ and jgm.user_id = #{household.userId}
+ </if>
<if test="household.name!=null and household.name !=''">
and jh.name like concat('%',#{household.name},'%')
</if>
@@ -266,16 +270,29 @@
<select id="statistics" resultType="java.lang.Integer">
SELECT
- count(1)
+ count( 1 )
FROM
- jczz_grid_range jgr
+ jczz_household jh
+ LEFT JOIN jczz_doorplate_address jda ON jh.house_code = jda.address_code
+ <where>
+ <if test="neiCode != null and neiCode != ''">
+ and jda.nei_code = #{neiCode}
+ </if>
+ <if test="userId != null">
+ AND jh.house_code IN (
+ SELECT
+ jgr.house_code
+ FROM
+ jczz_grid_range jgr
LEFT JOIN jczz_grid jg ON jg.id = jgr.grid_id
- LEFT JOIN jczz_gridman jgm on jg.id = jgm.grid_id
- LEFT JOIN jczz_household jh on jh.house_code=jgr.house_code
- WHERE
- jg.is_deleted = 0
- and jh.confirm_flag = 0
- AND jgm.user_id = #{userId}
+ LEFT JOIN jczz_gridman jgm ON jg.id = jgm.grid_id
+ WHERE
+ jg.is_deleted = 0
+ AND jgm.user_id = #{userId} )
+ </if>
+ and jh.is_deleted = 0
+ and jh.confirm_flag = 0
+ </where>
</select>
<!--查询物业-->
diff --git a/src/main/java/org/springblade/modules/house/service/IHouseholdService.java b/src/main/java/org/springblade/modules/house/service/IHouseholdService.java
index 71c0774..bcf9e6c 100644
--- a/src/main/java/org/springblade/modules/house/service/IHouseholdService.java
+++ b/src/main/java/org/springblade/modules/house/service/IHouseholdService.java
@@ -74,7 +74,7 @@
void importUserHouseHold(List<HouseHoldExcel> data, Boolean isCovered);
- Integer statistics(Long userId);
+ Integer statistics(Long userId,String neiCode);
/**
* 住户对应物业，网格，公安负责人查询
diff --git a/src/main/java/org/springblade/modules/house/service/impl/HouseRentalServiceImpl.java b/src/main/java/org/springblade/modules/house/service/impl/HouseRentalServiceImpl.java
index fed0dec..fe634e7 100644
--- a/src/main/java/org/springblade/modules/house/service/impl/HouseRentalServiceImpl.java
+++ b/src/main/java/org/springblade/modules/house/service/impl/HouseRentalServiceImpl.java
@@ -329,6 +329,6 @@
@Override
public Integer getStatisticsCount(HouseRentalTenantVO houseRental) {
- return baseMapper.getStatisticsCount(AuthUtil.getUserId());
+ return baseMapper.getStatisticsCount(houseRental.getUserId(), houseRental.getNeiCode());
}
}
diff --git a/src/main/java/org/springblade/modules/house/service/impl/HouseholdServiceImpl.java b/src/main/java/org/springblade/modules/house/service/impl/HouseholdServiceImpl.java
index 0175064..1c02b88 100644
--- a/src/main/java/org/springblade/modules/house/service/impl/HouseholdServiceImpl.java
+++ b/src/main/java/org/springblade/modules/house/service/impl/HouseholdServiceImpl.java
@@ -277,8 +277,8 @@
* @return
*/
@Override
- public Integer statistics(Long userId) {
- return baseMapper.statistics(userId);
+ public Integer statistics(Long userId,String neiCode) {
+ return baseMapper.statistics(userId,neiCode);
}
/**
diff --git a/src/main/java/org/springblade/modules/house/vo/HouseRentalTenantVO.java b/src/main/java/org/springblade/modules/house/vo/HouseRentalTenantVO.java
index 3212edf..f2be28c 100644
--- a/src/main/java/org/springblade/modules/house/vo/HouseRentalTenantVO.java
+++ b/src/main/java/org/springblade/modules/house/vo/HouseRentalTenantVO.java
@@ -56,5 +56,9 @@
*/
private String endTime;
+ private String neiCode;
+
+ private Long userId;
+
}
diff --git a/src/main/java/org/springblade/modules/house/vo/HouseholdVO.java b/src/main/java/org/springblade/modules/house/vo/HouseholdVO.java
index 456b08f..043e700 100644
--- a/src/main/java/org/springblade/modules/house/vo/HouseholdVO.java
+++ b/src/main/java/org/springblade/modules/house/vo/HouseholdVO.java
@@ -80,4 +80,7 @@
@ApiModelProperty("结束时间")
private String endTime;
+ @ApiModelProperty("用户id")
+ private Long userId;
+
}
diff --git a/src/main/java/org/springblade/modules/place/mapper/PlaceExtMapper.java b/src/main/java/org/springblade/modules/place/mapper/PlaceExtMapper.java
index d57a163..4672b68 100644
--- a/src/main/java/org/springblade/modules/place/mapper/PlaceExtMapper.java
+++ b/src/main/java/org/springblade/modules/place/mapper/PlaceExtMapper.java
@@ -16,11 +16,12 @@
*/
package org.springblade.modules.place.mapper;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
import org.apache.ibatis.annotations.Param;
import org.springblade.modules.place.entity.PlaceExtEntity;
import org.springblade.modules.place.vo.PlaceExtVO;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
+
import java.util.List;
/**
@@ -44,8 +45,12 @@
/**
* 场所详情表 自定义详情
+ *
* @param placeExt
* @return
*/
PlaceExtVO getDetail(@Param("placeExt") PlaceExtVO placeExt);
+
+
+ Integer selectCount(@Param("userId") Long userId, @Param("neiCode") String neiCode, @Param("confirmFlag") Integer confirmFlag);
}
diff --git a/src/main/java/org/springblade/modules/place/mapper/PlaceExtMapper.xml b/src/main/java/org/springblade/modules/place/mapper/PlaceExtMapper.xml
index 9b1b450..c8e75b6 100644
--- a/src/main/java/org/springblade/modules/place/mapper/PlaceExtMapper.xml
+++ b/src/main/java/org/springblade/modules/place/mapper/PlaceExtMapper.xml
@@ -46,12 +46,45 @@
order by jpe.create_time desc,jpe.id desc
</select>
- <!--自定义详情查询-->
+ <!--场所审核统计-->
+ <select id="selectCount" resultType="java.lang.Integer">
+ SELECT
+ count( 1 )
+ FROM
+ jczz_place_ext jpe
+ LEFT JOIN jczz_place jp ON jp.id = jpe.place_id
+ LEFT JOIN jczz_doorplate_address jda ON jp.house_code = jda.address_code
+ <where>
+ <if test="confirmFlag != null">
+ and jpe.confirm_flag = #{confirmFlag}
+ </if>
+ <if test="userId != null">
+ AND jp.house_code IN (
+ SELECT
+ jgr.house_code
+ FROM
+ jczz_grid_range jgr
+ LEFT JOIN jczz_grid jg ON jg.id = jgr.grid_id
+ LEFT JOIN jczz_gridman jgm ON jg.id = jgm.grid_id
+ WHERE
+ jg.is_deleted = 0
+ <if test="neiCode != null and neiCode != ''">
+ and jg.community_code = #{neiCode}
+ </if>
+ AND jgm.user_id = #{userId} )
+ </if>
+ and jpe.is_deleted = 0
+ </where>
+
+
+ </select>
+
<select id="getDetail" resultType="org.springblade.modules.place.vo.PlaceExtVO">
- select jpe.*,jp.place_name as placeName from jczz_place_ext jpe
- left join jczz_place jp on jpe.place_id = jp.id and jp.is_deleted = 0
+ select jpe.*, jp.place_name as placeName
+ from jczz_place_ext jpe
+ left join jczz_place jp on jpe.place_id = jp.id and jp.is_deleted = 0
where jpe.is_deleted = 0
- and jpe.place_id = #{placeExt.placeId}
+ and jpe.place_id = #{placeExt.placeId}
</select>
diff --git a/src/main/java/org/springblade/modules/place/service/IPlaceExtService.java b/src/main/java/org/springblade/modules/place/service/IPlaceExtService.java
index ec04a4b..9e3268f 100644
--- a/src/main/java/org/springblade/modules/place/service/IPlaceExtService.java
+++ b/src/main/java/org/springblade/modules/place/service/IPlaceExtService.java
@@ -17,6 +17,7 @@
package org.springblade.modules.place.service;
import com.baomidou.mybatisplus.extension.service.IService;
+import org.apache.ibatis.annotations.Param;
import org.springblade.modules.place.entity.PlaceExtEntity;
import org.springblade.modules.place.vo.PlaceExtVO;
import org.springblade.core.mp.base.BaseService;
@@ -66,4 +67,6 @@
* @return
*/
PlaceExtVO getDetail(PlaceExtVO placeExt);
+
+ Integer selectCount(@Param("userId") Long userId, @Param("neiCode") String neiCode, @Param("confirmFlag") Integer confirmFlag);
}
diff --git a/src/main/java/org/springblade/modules/place/service/impl/PlaceExtServiceImpl.java b/src/main/java/org/springblade/modules/place/service/impl/PlaceExtServiceImpl.java
index 1ac3c81..5d59302 100644
--- a/src/main/java/org/springblade/modules/place/service/impl/PlaceExtServiceImpl.java
+++ b/src/main/java/org/springblade/modules/place/service/impl/PlaceExtServiceImpl.java
@@ -224,4 +224,9 @@
// 返回
return detail;
}
+
+ @Override
+ public Integer selectCount(Long userId, String neiCode, Integer confirmFlag) {
+ return baseMapper.selectCount(userId, neiCode, confirmFlag);
+ }
}
diff --git a/src/main/java/org/springblade/modules/place/service/impl/PlaceServiceImpl.java b/src/main/java/org/springblade/modules/place/service/impl/PlaceServiceImpl.java
index 07a85ad..7fd6cc3 100644
--- a/src/main/java/org/springblade/modules/place/service/impl/PlaceServiceImpl.java
+++ b/src/main/java/org/springblade/modules/place/service/impl/PlaceServiceImpl.java
@@ -383,6 +383,7 @@
PlaceExtEntity one = placeExtService.getOne(wrapper);
if (null == one) {
placeExtEntity.setPlaceId(placeVO.getId());
+ placeExtEntity.setLocaltion(placeVO.getLocaltion());
//新增
placeExtService.savePlaceExt(placeExtEntity);
}
diff --git a/src/main/java/org/springblade/modules/system/controller/MenuController.java b/src/main/java/org/springblade/modules/system/controller/MenuController.java
index 7b0451b..7fd68ea 100644
--- a/src/main/java/org/springblade/modules/system/controller/MenuController.java
+++ b/src/main/java/org/springblade/modules/system/controller/MenuController.java
@@ -138,7 +138,7 @@
*/
@GetMapping("/dynamicMenu")
@ApiOperation(value = "菜单列表", notes = "传入menu")
- public R<List<MenuVO>> dynamicMenu(String roleId, Long topMenuId, @RequestParam(value = "labelType", required = false) Integer labelType) {
+ public R<List<MenuVO>> dynamicMenu(String roleId, Long topMenuId, @RequestParam(value = "labelType", required = false,defaultValue = "1") Integer labelType) {
List<MenuVO> list = menuService.routes(roleId, topMenuId,labelType,1);
return R.data(list);
}
diff --git a/src/main/java/org/springblade/modules/task/controller/TaskController.java b/src/main/java/org/springblade/modules/task/controller/TaskController.java
index 8399b73..d835c75 100644
--- a/src/main/java/org/springblade/modules/task/controller/TaskController.java
+++ b/src/main/java/org/springblade/modules/task/controller/TaskController.java
@@ -132,7 +132,7 @@
@GetMapping("/countTypeNumber")
@ApiOperationSupport(order = 9)
@ApiOperation(value = "统计类型数量")
- public R countTypeNumber() {
+ public R countTypeNumber(@RequestParam(value = "neiCode", required = false) String neiCode) {
return R.data(taskService.countTypeNumber());
}
diff --git a/src/main/java/org/springblade/modules/task/controller/TaskReportForRepairsController.java b/src/main/java/org/springblade/modules/task/controller/TaskReportForRepairsController.java
index cdc2714..b0c3951 100644
--- a/src/main/java/org/springblade/modules/task/controller/TaskReportForRepairsController.java
+++ b/src/main/java/org/springblade/modules/task/controller/TaskReportForRepairsController.java
@@ -160,7 +160,7 @@
@GetMapping("/getStatistics")
@ApiOperation(value = "w网格员查询报事报修统计" )
public R getStatistics() {
- return R.data(taskReportForRepairsService.getStatistics(AuthUtil.getUserId()));
+ return R.data(taskReportForRepairsService.getStatistics(AuthUtil.getUserId(),""));
}
/**
diff --git a/src/main/java/org/springblade/modules/task/mapper/TaskMapper.xml b/src/main/java/org/springblade/modules/task/mapper/TaskMapper.xml
index 4783185..902b68e 100644
--- a/src/main/java/org/springblade/modules/task/mapper/TaskMapper.xml
+++ b/src/main/java/org/springblade/modules/task/mapper/TaskMapper.xml
@@ -86,38 +86,51 @@
<select id="selectTaskCount" resultType="int" parameterType="org.springblade.modules.task.vo.TaskVO">
- SELECT count(1)
+ SELECT
+ count( 1 )
FROM
- jczz_gridman jgm
- LEFT JOIN jczz_grid jg ON jgm.grid_id = jg.id
- LEFT JOIN jczz_grid_range jgr ON jg.id = jgr.grid_id
- LEFT JOIN jczz_task jt ON jgr.house_code = jt.house_code
+ jczz_task jt
LEFT JOIN jczz_doorplate_address jda ON jda.address_code = jt.house_code
- WHERE
- jgm.user_id = #{userId}
- <if test="status != null">
- and jt.status = #{status}
- </if>
- <if test="frequency != null">
- and jt.frequency = #{frequency}
- </if>
- <if test="type != null">
- and jt.type = #{type}
- </if>
- <!-- 取保候审 -->
- <if test="reportType != null and reportType == 1 ">
- and jt.report_type = 1
- </if>
- <!-- 场所店铺 -->
- <if test="reportType != null and reportType == 2 ">
- and jt.report_type in (2,3,4,5,6)
- </if>
+ <where>
+ <if test="status != null">
+ and jt.status = #{status}
+ </if>
+ <if test="frequency != null">
+ and jt.frequency = #{frequency}
+ </if>
+ <if test="type != null">
+ and jt.type = #{type}
+ </if>
+ <!-- 取保候审 -->
+ <if test="reportType != null and reportType == 1 ">
+ and jt.report_type = 1
+ </if>
+ <!-- 场所店铺 -->
+ <if test="reportType != null and reportType == 2 ">
+ and jt.report_type in (2,3,4,5,6)
+ </if>
- <if test="name != null and name != ''">
- and jt.name like concat('%', #{name}, '%')
- </if>
+ <if test="name != null and name != ''">
+ and jt.name like concat('%', #{name}, '%')
+ </if>
+ <if test="neiCode != null and neiCode != ''">
+ and jda.nei_code = #{neiCode}
+ </if>
+ <if test="userId != null">
+ AND jt.house_code IN (
+ SELECT
+ jgr.house_code
+ FROM
+ jczz_grid_range jgr
+ LEFT JOIN jczz_grid jg ON jg.id = jgr.grid_id
+ LEFT JOIN jczz_gridman jgm ON jg.id = jgm.grid_id
+ WHERE
+ jg.is_deleted = 0
+ AND jgm.user_id = #{userId} )
+ </if>
+ </where>
+
order by jt.create_time desc
-
</select>
diff --git a/src/main/java/org/springblade/modules/task/mapper/TaskReportForRepairsMapper.java b/src/main/java/org/springblade/modules/task/mapper/TaskReportForRepairsMapper.java
index 109a46e..3a0057f 100644
--- a/src/main/java/org/springblade/modules/task/mapper/TaskReportForRepairsMapper.java
+++ b/src/main/java/org/springblade/modules/task/mapper/TaskReportForRepairsMapper.java
@@ -53,7 +53,7 @@
*/
TaskReportStatistics getStatisticsCount(@Param("userId") Long userId);
- Integer getStatistics(Long userId);
+ Integer getStatistics(Long userId,String neiCode);
/**
* 更新状态--临时接口
diff --git a/src/main/java/org/springblade/modules/task/mapper/TaskReportForRepairsMapper.xml b/src/main/java/org/springblade/modules/task/mapper/TaskReportForRepairsMapper.xml
index 1b3ade3..b23021f 100644
--- a/src/main/java/org/springblade/modules/task/mapper/TaskReportForRepairsMapper.xml
+++ b/src/main/java/org/springblade/modules/task/mapper/TaskReportForRepairsMapper.xml
@@ -130,19 +130,28 @@
<select id="getStatistics" resultType="java.lang.Integer">
-
SELECT
- count(1)
+ count( 1 )
FROM
- jczz_gridman jgm
- LEFT JOIN jczz_grid jg ON jgm.grid_id = jg.id
- LEFT JOIN jczz_grid_range jgr ON jg.id = jgr.grid_id
- LEFT JOIN jczz_task_report_for_repairs jtr ON jgr.house_code = jtr.address_code
- LEFT JOIN jczz_doorplate_address jda ON jda.address_code = jtr.address_code
+ jczz_task_report_for_repairs jtr
+ LEFT JOIN jczz_doorplate_address jda ON jtr.address_code = jda.address_code
WHERE
+ jtr.is_deleted = 0
+ <if test="neiCode != null and neiCode != ''">
+ and jda.nei_code = #{neiCode}
+ </if>
+ <if test="userId != null">
+ AND jtr.address_code IN (
+ SELECT
+ jgr.house_code
+ FROM
+ jczz_grid_range jgr
+ LEFT JOIN jczz_grid jg ON jg.id = jgr.grid_id
+ LEFT JOIN jczz_gridman jgm ON jg.id = jgm.grid_id
+ WHERE
jg.is_deleted = 0
- and jtr.confirm_flag = 1
- AND jgm.user_id = #{userId}
+ AND jgm.user_id = #{userId} )
+ </if>
</select>
diff --git a/src/main/java/org/springblade/modules/task/service/ITaskReportForRepairsService.java b/src/main/java/org/springblade/modules/task/service/ITaskReportForRepairsService.java
index 7a1a03d..b63f53d 100644
--- a/src/main/java/org/springblade/modules/task/service/ITaskReportForRepairsService.java
+++ b/src/main/java/org/springblade/modules/task/service/ITaskReportForRepairsService.java
@@ -67,7 +67,7 @@
*/
boolean checkReportForRepairs(TaskReportForRepairsEntity taskReportForRepairs);
- Integer getStatistics(Long userId);
+ Integer getStatistics(Long userId,String neiCode);
/**
* 更新状态--临时接口
diff --git a/src/main/java/org/springblade/modules/task/service/impl/TaskReportForRepairsServiceImpl.java b/src/main/java/org/springblade/modules/task/service/impl/TaskReportForRepairsServiceImpl.java
index af713f4..116ea08 100644
--- a/src/main/java/org/springblade/modules/task/service/impl/TaskReportForRepairsServiceImpl.java
+++ b/src/main/java/org/springblade/modules/task/service/impl/TaskReportForRepairsServiceImpl.java
@@ -160,8 +160,8 @@
}
@Override
- public Integer getStatistics(Long userId) {
- return baseMapper.getStatistics(userId);
+ public Integer getStatistics(Long userId,String neiCode) {
+ return baseMapper.getStatistics(userId,neiCode);
}
/**
diff --git a/src/main/java/org/springblade/modules/task/service/impl/TaskServiceImpl.java b/src/main/java/org/springblade/modules/task/service/impl/TaskServiceImpl.java
index 9867936..9430922 100644
--- a/src/main/java/org/springblade/modules/task/service/impl/TaskServiceImpl.java
+++ b/src/main/java/org/springblade/modules/task/service/impl/TaskServiceImpl.java
@@ -18,13 +18,16 @@
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import org.springblade.common.utils.SpringUtils;
import org.springblade.core.mp.base.BaseServiceImpl;
import org.springblade.core.secure.utils.AuthUtil;
import org.springblade.modules.house.service.IHouseRentalService;
import org.springblade.modules.house.service.IHouseholdService;
import org.springblade.modules.house.vo.HouseRentalTenantVO;
+import org.springblade.modules.place.service.IPlaceExtService;
import org.springblade.modules.task.entity.TaskEntity;
import org.springblade.modules.task.mapper.TaskMapper;
+import org.springblade.modules.task.service.ITaskReportForRepairsService;
import org.springblade.modules.task.service.ITaskService;
import org.springblade.modules.task.vo.TaskVO;
import org.springframework.beans.factory.annotation.Autowired;
@@ -44,8 +47,8 @@
@Service
public class TaskServiceImpl extends BaseServiceImpl<TaskMapper, TaskEntity> implements ITaskService {
-// @Autowired
-// private ITaskReportForRepairsService iTaskReportForRepairsService;
+ // @Autowired
+ // private ITaskReportForRepairsService iTaskReportForRepairsService;
@Autowired
private IHouseholdService iHouseholdService;
@@ -127,32 +130,29 @@
public Object countTypeNumber() {
TaskVO taskVO = new TaskVO();
Map<String, Object> objectObjectHashMap = new HashMap<>();
- taskVO.setUserId(AuthUtil.getUserId());
- taskVO.setType(1);
taskVO.setStatus(1);
- // 综治任务
- Integer comprehensiveTask = baseMapper.selectTaskCount(taskVO);
- taskVO.setType(2);
- // 组建任务
- Integer residentialTask = baseMapper.selectTaskCount(taskVO);
- taskVO.setType(3);
- // 公安任务
- Integer publicTask = baseMapper.selectTaskCount(taskVO);
-
+ taskVO.setReportType(2);
+ // 标签时间
+ Integer bqsj = baseMapper.selectTaskCount(taskVO);
+ taskVO.setReportType(1);
+ // 标签时间
+ Integer qbhs = baseMapper.selectTaskCount(taskVO);
// 报事报修
-// Integer statistics = iTaskReportForRepairsService.getStatistics(AuthUtil.getUserId());
+ Integer bsbx = SpringUtils.getBean(ITaskReportForRepairsService.class).getStatistics(AuthUtil.getUserId(), "");
// 住房审核
- Integer statistics1 = iHouseholdService.statistics(AuthUtil.getUserId());
+ Integer zhsh = iHouseholdService.statistics(AuthUtil.getUserId(),"");
// 出租审核
- Integer statisticsCount = iHouseRentalService.getStatisticsCount(new HouseRentalTenantVO());
-
- objectObjectHashMap.put("comprehensiveTask", comprehensiveTask);
- objectObjectHashMap.put("residentialTask", residentialTask);
- objectObjectHashMap.put("publicTask", publicTask);
-
-// objectObjectHashMap.put("baoshi", statistics);
- objectObjectHashMap.put("zhufang", statistics1);
- objectObjectHashMap.put("chuzhu", statisticsCount);
+ HouseRentalTenantVO houseRentalTenantVO = new HouseRentalTenantVO();
+ houseRentalTenantVO.setUserId(AuthUtil.getUserId());
+ Integer czsh = iHouseRentalService.getStatisticsCount(houseRentalTenantVO);
+ // 场所审核
+ Integer cssh = SpringUtils.getBean(IPlaceExtService.class).selectCount(AuthUtil.getUserId(), "", 1);
+ objectObjectHashMap.put("qbhs", qbhs);
+ objectObjectHashMap.put("bqsj", bqsj);
+ objectObjectHashMap.put("bsbx", bsbx);
+ objectObjectHashMap.put("zhsh", zhsh);
+ objectObjectHashMap.put("czsh", czsh);
+ objectObjectHashMap.put("cssh", cssh);
return objectObjectHashMap;
}
diff --git a/src/main/java/org/springblade/modules/task/vo/TaskVO.java b/src/main/java/org/springblade/modules/task/vo/TaskVO.java
index 13c9677..938da27 100644
--- a/src/main/java/org/springblade/modules/task/vo/TaskVO.java
+++ b/src/main/java/org/springblade/modules/task/vo/TaskVO.java
@@ -45,4 +45,6 @@
@ApiModelProperty(value = "社区编码")
private String communityCode;
+ private String neiCode;
+
}
--
Gitblit v1.9.3