src/main/java/org/springblade/modules/house/controller/HouseRentalController.java
@@ -182,6 +182,12 @@ return R.data(houseRentalService.getStatistics(houseRental)); } @GetMapping("/getStatisticsCount") public R getStatisticsCount(HouseRentalTenantVO houseRental){ return R.data(houseRentalService.getStatisticsCount(houseRental)); } /** * 导出用户 */ src/main/java/org/springblade/modules/house/mapper/HouseRentalMapper.java
@@ -61,4 +61,6 @@ @Param("list") List<String> list); List<HouseRentalExcel> export(HouseRentalVO houseRentalVO); Integer getStatisticsCount(Long userId); } src/main/java/org/springblade/modules/house/mapper/HouseRentalMapper.xml
@@ -232,4 +232,19 @@ </select> <select id="getStatisticsCount" resultType="java.lang.Integer"> SELECT count(1) FROM jczz_grid_range jgr LEFT JOIN jczz_grid jg ON jg.id = jgr.grid_id LEFT JOIN jczz_house_rental jhr on jhr.house_code=jgr.house_code WHERE jg.is_deleted = 0 and jh.confirm_flag = 0 AND jg.user_id = #{userId} </select> </mapper> src/main/java/org/springblade/modules/house/service/IHouseRentalService.java
@@ -84,4 +84,6 @@ Boolean confirmHouseRental(HouseRentalVO houseRental); List<HouseRentalExcel> export(HouseRentalVO houseRentalVO); Integer getStatisticsCount(HouseRentalTenantVO houseRental); } src/main/java/org/springblade/modules/house/service/impl/HouseRentalServiceImpl.java
@@ -243,4 +243,9 @@ List<HouseRentalExcel> houseRentalExcels = baseMapper.export(houseRentalVO); return houseRentalExcels; } @Override public Integer getStatisticsCount(HouseRentalTenantVO houseRental) { return baseMapper.getStatisticsCount(AuthUtil.getUserId()); } } src/main/java/org/springblade/modules/task/controller/TaskController.java
@@ -137,12 +137,12 @@ } @GetMapping("/countFrequencyNumber") @ApiOperationSupport(order = 10) @ApiOperation(value = "统计周期类型数量") public R countFrequencyNumber() { return R.data(taskService.countFrequencyNumber()); } // @GetMapping("/countFrequencyNumber") // @ApiOperationSupport(order = 10) // @ApiOperation(value = "统计周期类型数量") // public R countFrequencyNumber() { // return R.data(taskService.countFrequencyNumber()); // } } src/main/java/org/springblade/modules/task/mapper/TaskMapper.xml
@@ -43,6 +43,7 @@ LEFT JOIN jczz_doorplate_address jda on jda.address_code=jt.house_code WHERE jg.user_id = #{task.userId} and jt.type != 3 <if test="task.status != null and task.status != null"> and jt.status = #{task.status} </if> @@ -52,17 +53,17 @@ <if test="task.name != null and task.name != ''"> and jt.name like concat('%', #{task.name}, '%') </if> <if test="task.id != null ">and id = #{task.id}</if> <if test="task.type != null ">and type = #{task.type}</if> <if test="task.remark != null and task.remark != ''">and remark = #{task.remark}</if> <if test="task.createTime != null ">and create_time = #{task.createTime}</if> <if test="task.createUser != null ">and create_user = #{task.createUser}</if> <if test="task.updateTime != null ">and update_time = #{task.updateTime}</if> <if test="task.updateUser != null ">and update_user = #{task.updateUser}</if> <if test="task.tenantId != null and task.tenantId != ''">and tenant_id = #{task.tenantId}</if> <if test="task.createDept != null ">and create_dept = #{task.createDept}</if> <if test="task.isDeleted != null ">and is_deleted = #{task.isDeleted}</if> <if test="task.houseCode != null and task.houseCode != ''">and house_code = #{task.houseCode}</if> <if test="task.id != null ">and jt.id = #{task.id}</if> <if test="task.type != null ">and jt.type = #{task.type}</if> <if test="task.remark != null and task.remark != ''">and jt.remark = #{task.remark}</if> <if test="task.createTime != null ">and jt.create_time = #{task.createTime}</if> <if test="task.createUser != null ">and jt.create_user = #{task.createUser}</if> <if test="task.updateTime != null ">and jt.update_time = #{task.updateTime}</if> <if test="task.updateUser != null ">and jt.update_user = #{task.updateUser}</if> <if test="task.tenantId != null and task.tenantId != ''">and jt.tenant_id = #{task.tenantId}</if> <if test="task.createDept != null ">and jt.create_dept = #{task.createDept}</if> <if test="task.isDeleted != null ">and jt.is_deleted = #{task.isDeleted}</if> <if test="task.houseCode != null and task.houseCode != ''">and jt.house_code = #{task.houseCode}</if> order by jt.create_time desc </select> src/main/java/org/springblade/modules/task/service/impl/TaskBailReportingEventServiceImpl.java
@@ -50,7 +50,7 @@ @Override public Boolean saveBailReporting(TaskBailReportingEventDTO taskBailReportingEvent) { Long aLong = taskService.saveTask(1, DictConstant.BAIL_PENDING_TRIAL, 3, "", AuthUtil.getUserId(),taskBailReportingEvent.getHouseCode()); Long aLong = taskService.saveTask(3, DictConstant.BAIL_PENDING_TRIAL, 1, "", AuthUtil.getUserId(),taskBailReportingEvent.getHouseCode()); if (aLong > 0) { taskBailReportingEvent.setTaskId(aLong); taskBailReportingEvent.setCheckUserId(AuthUtil.getUserId()); src/main/java/org/springblade/modules/task/service/impl/TaskCampusReportingEventServiceImpl.java
@@ -51,7 +51,7 @@ @Override public Boolean saveCampusReporting(TaskCampusReportingEventDTO taskCampusReportingEvent) { Long aLong = taskService.saveTask(1, DictConstant.CAMPUS_SECURITY_INSPECTION, 3 , "", AuthUtil.getUserId(),taskCampusReportingEvent.getHouseCode()); Long aLong = taskService.saveTask(1, DictConstant.CAMPUS_SECURITY_INSPECTION, 1 , "", AuthUtil.getUserId(),taskCampusReportingEvent.getHouseCode()); if (aLong > 0) { taskCampusReportingEvent.setTaskId(aLong); taskCampusReportingEvent.setCheckUserId(AuthUtil.getUserId()); src/main/java/org/springblade/modules/task/service/impl/TaskHotelReportingServiceImpl.java
@@ -50,7 +50,7 @@ @Override public boolean saveHotelReporting(TaskHotelReportingDTO taskHotelReporting) { Long aLong = taskService.saveTask(1, DictConstant.HOTEL_SECURITY, 2, "", AuthUtil.getUserId(),taskHotelReporting.getHouseCode()); Long aLong = taskService.saveTask(2, DictConstant.HOTEL_SECURITY, 1, "", AuthUtil.getUserId(),taskHotelReporting.getHouseCode()); if (aLong > 0) { taskHotelReporting.setTaskId(aLong); taskHotelReporting.setCheckUserId(AuthUtil.getUserId()); src/main/java/org/springblade/modules/task/service/impl/TaskServiceImpl.java
@@ -18,15 +18,20 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import org.apache.xmlbeans.impl.xb.xsdschema.Public; 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.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; import org.springframework.stereotype.Service; import javax.annotation.Resource; import java.util.Date; import java.util.HashMap; import java.util.Map; @@ -40,6 +45,14 @@ @Service public class TaskServiceImpl extends BaseServiceImpl<TaskMapper, TaskEntity> implements ITaskService { // @Autowired // private ITaskReportForRepairsService iTaskReportForRepairsService; @Autowired private IHouseholdService iHouseholdService; @Autowired private IHouseRentalService iHouseRentalService; @Override public IPage<TaskVO> selectTaskPage(IPage<TaskVO> page, TaskVO task) { @@ -105,14 +118,29 @@ taskVO.setUserId(AuthUtil.getUserId()); taskVO.setType(1); taskVO.setStatus(1); // 综治任务 Integer comprehensiveTask = baseMapper.selectTaskCount(taskVO); taskVO.setType(2); Integer residentialTask = baseMapper.selectTaskCount(taskVO); // 组建任务 Integer residentialTask = baseMapper.selectTaskCount(taskVO); taskVO.setType(3); Integer publicTask = baseMapper.selectTaskCount(taskVO); // 公安任务 Integer publicTask = baseMapper.selectTaskCount(taskVO); // 报事报修 // Integer statistics = iTaskReportForRepairsService.getStatistics(AuthUtil.getUserId()); // 住房审核 Integer statistics1 = 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); return objectObjectHashMap; }