数据过滤调整

zhongrj

2024-01-18 77fea47f1fa683f9a0356df3d2328e2bb68b28cf

 src/main/java/org/springblade/modules/house/controller/HouseholdController.java

@@ -16,33 +16,31 @@
 */
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;
import org.springblade.core.secure.utils.AuthUtil;
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.transaction.annotation.Transactional;
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;

/**
@@ -103,6 +101,29 @@
   }

   /**
    * 住户 自定义分页
    */
   @GetMapping("/getKeynotePersonnelPage")
   @ApiOperationSupport(order = 3)
   @ApiOperation(value = "分页", notes = "传入household")
   public R<IPage<HouseholdVO>> getKeynotePersonnelPage(HouseholdVO household, Query query) {
      IPage<HouseholdVO> pages = householdService.getKeynotePersonnelPage(Condition.getPage(query), household);
      return R.data(pages);
   }


   /**
    * 住户列表查询
    *
    * @param household
    * @return
    */
   @GetMapping("/selectHouseholdList")
   public R selectHouseholdList(HouseholdVO household) {
      return R.data(householdService.selectHouseholdList(household));
   }

   /**
    * 住户 新增
    */
   @PostMapping("/save")
@@ -139,7 +160,7 @@
    */
   @PostMapping("/saveOrUpdateHousehold")
   @ApiOperation(value = "自定义新增或修改", notes = "传入household")
   public R saveOrUpdateHousehold(@Valid @RequestBody HouseholdEntity household) {
   public R saveOrUpdateHousehold(@Valid @RequestBody HouseholdVO household) {
      return R.status(householdService.saveOrUpdateHousehold(household));
   }

@@ -149,9 +170,12 @@
   @PostMapping("/remove")
   @ApiOperationSupport(order = 7)
   @ApiOperation(value = "逻辑删除", notes = "传入ids")
   @Transactional(rollbackFor = Exception.class)
   public R remove(@ApiParam(value = "主键集合", required = true) @RequestParam String ids) {
      return R.status(householdService.removeByIds(Func.toLongList(ids)));
      // 返回
      return R.status(householdService.removeHousehold(ids));
   }


   /**
    * 住户审核统计
@@ -159,8 +183,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(), ""));
   }

   /**
@@ -213,4 +237,25 @@
   }


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

   /**
    * 获取所有住户
    * @return
    */
   @GetMapping("/getAllHouseHold")
   public R getAllHouseHold(HouseholdVO household) {
      return R.data(householdService.getAllHouseHold(household));
   }




}