住户监管柱状图

linwei

2024-01-25 3524bd78770d3dd16b8be3e4fa9cba06a42cefa0

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

@@ -29,13 +29,13 @@
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.springblade.modules.house.service.IHouseholdService;
import org.springblade.modules.house.vo.HouseholdVO;
import org.springblade.modules.house.wrapper.HouseholdWrapper;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;

@@ -101,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")
@@ -137,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));
   }

@@ -147,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));
   }


   /**
    * 住户审核统计
@@ -211,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));
   }




}