bug 修复

linwei

2024-01-19 494aeb58eb885b40ab2fdb083aaa79007bb79ae2

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

@@ -16,7 +16,6 @@
 */
package org.springblade.modules.house.controller;

import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
import io.swagger.annotations.Api;
@@ -30,13 +29,10 @@
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.entity.UserHouseLabelEntity;
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.service.IUserHouseLabelService;
import org.springblade.modules.house.vo.HouseholdVO;
import org.springblade.modules.house.wrapper.HouseholdWrapper;
import org.springframework.transaction.annotation.Transactional;
@@ -60,7 +56,6 @@
public class HouseholdController extends BladeController {

   private final IHouseholdService householdService;
   private final IUserHouseLabelService userHouseLabelService;

   /**
    * 住户 详情
@@ -103,6 +98,29 @@
   public R<IPage<HouseholdVO>> page(HouseholdVO household, Query query) {
      IPage<HouseholdVO> pages = householdService.selectHouseholdPage(Condition.getPage(query), household);
      return R.data(pages);
   }

   /**
    * 住户 自定义分页
    */
   @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));
   }

   /**
@@ -154,25 +172,10 @@
   @ApiOperation(value = "逻辑删除", notes = "传入ids")
   @Transactional(rollbackFor = Exception.class)
   public R remove(@ApiParam(value = "主键集合", required = true) @RequestParam String ids) {
      List<Long> idList = Func.toLongList(ids);
      boolean removeByIds = householdService.removeByIds(idList);
      // 同时删除当前住户对应的标签
      removeHouseholdLabel(idList);
      // 返回
      return R.status(removeByIds);
      return R.status(householdService.removeHousehold(ids));
   }

   /**
    * 删除住户标签信息
    * @param idList
    */
   public void removeHouseholdLabel(List<Long> idList) {
      for (Long id : idList) {
         QueryWrapper<UserHouseLabelEntity> wrapper = new QueryWrapper<>();
         wrapper.eq("household_id",id);
         userHouseLabelService.remove(wrapper);
      }
   }

   /**
    * 住户审核统计
@@ -243,5 +246,16 @@
      return R.data(householdService.userHandle());
   }

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




}