bug修复

linwe

2023-12-23 55d677758efadb6d42e6d4e595cecc2c50c20d5a

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

@@ -28,6 +28,7 @@
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;
@@ -153,9 +154,19 @@
   }

   /**
    * 住户审核统计
    */
   @PostMapping("/statistics")
   @ApiOperationSupport(order = 7)
   @ApiOperation(value = "住户审核统计", notes = "网格员调用")
   public R remove( ) {
      return R.data(householdService.statistics(AuthUtil.getUserId()));
   }

   /**
    * 导入用户
    */
   @PostMapping("import-houseHold")
   @PostMapping("import-household")
   @ApiOperationSupport(order = 12)
   @ApiOperation(value = "导入住户", notes = "传入excel")
   public R importUser(MultipartFile file, Integer isCovered) {
@@ -167,7 +178,7 @@
   /**
    * 导出用户
    */
   @GetMapping("export-houseHold")
   @GetMapping("export-household")
   @ApiOperationSupport(order = 13)
   @ApiOperation(value = "导出住户", notes = "传入user")
   public void exportUser(HouseholdVO household, HttpServletResponse response) {
@@ -176,4 +187,30 @@
   }


   /**
    * 住户对应物业，网格，公安负责人查询
    * @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));
   }


}