bug 修复

zhongrj

2023-12-28 1e53e07cb4b95e282e4a0a55cc082db34b83a0d7

 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(), ""));
   }

   /**
@@ -187,4 +185,40 @@
   }


   /**
    * 住户对应物业，网格，公安负责人查询
    * @param household
    * @return
    */
   @GetMapping("/getHouseholdOtherInfo")
   @ApiOperationSupport(order = 14)
   @ApiOperation(value = "住户对应物业，网格，公安负责人查询", notes = "住户对应物业，网格，公安负责人查询")
   public R getHouseholdOtherInfo(HouseholdVO household) {
      return R.data(householdService.getHouseholdOtherInfo(household));
   }

   /**
    * 用户信息统计
    * @param code
    * @param roleType
    * @return
    */
   @GetMapping("/getHouseHoldStatistics")
   @ApiOperationSupport(order = 14)
   @ApiOperation(value = "用户信息统计", notes = " ")
   public R getHouseHoldStatistics(@RequestParam("code") String code, @RequestParam("roleType") String roleType) {
      return R.data(householdService.getHouseHoldStatistics(code,roleType));
   }


   /**
    * 住户业主信息处理，将业主人员插入到用户表
    * @return
    */
   @GetMapping("/userHandle")
   public R userHandle() {
      return R.data(householdService.userHandle());
   }


}