| | |
| | | @ApiLog("住户 详情") |
| | | @ApiOperation(value = "详情", notes = "传入household") |
| | | public R<HouseholdVO> detail(HouseholdEntity household) { |
| | | bladeLogger.info("住户 详情", JsonUtil.toJson(household)); |
| | | bladeLogger.info("住户详情查询", JsonUtil.toJson(household)); |
| | | HouseholdEntity detail = householdService.getOne(Condition.getQueryWrapper(household).last("limit 1")); |
| | | return R.data(HouseholdWrapper.build().entityVO(detail)); |
| | | } |
| | |
| | | @ApiLog("住户 详情") |
| | | @ApiOperation(value = "详情", notes = "传入household") |
| | | public R getDetail(HouseholdEntity household) { |
| | | bladeLogger.info("住户 详情", JsonUtil.toJson(household)); |
| | | bladeLogger.info("住户详情查询", JsonUtil.toJson(household)); |
| | | return R.data(householdService.getDetail(household)); |
| | | } |
| | | |
| | |
| | | @ApiLog("住户 自定义分页") |
| | | @ApiOperation(value = "分页", notes = "传入household") |
| | | public R<IPage<HouseholdVO>> page(HouseholdVO household, Query query) { |
| | | bladeLogger.info("住户 自定义分页", JsonUtil.toJson(household)); |
| | | bladeLogger.info("住户列表信息查询", JsonUtil.toJson(household)); |
| | | IPage<HouseholdVO> pages = householdService.selectHouseholdPage(Condition.getPage(query), household); |
| | | return R.data(pages); |
| | | } |
| | |
| | | @ApiLog("住户 自定义分页") |
| | | @ApiOperation(value = "分页", notes = "传入household") |
| | | public R<IPage<HouseholdVO>> getKeynotePersonnelPage(HouseholdVO household, Query query) { |
| | | bladeLogger.info("住户 自定义分页", JsonUtil.toJson(household)); |
| | | bladeLogger.info("住户列表信息查询", JsonUtil.toJson(household)); |
| | | IPage<HouseholdVO> pages = householdService.getKeynotePersonnelPage(Condition.getPage(query), household); |
| | | return R.data(pages); |
| | | } |
| | |
| | | @ApiLog("住户 自定义新增或修改") |
| | | @ApiOperation(value = "自定义新增或修改", notes = "传入household") |
| | | public R saveOrUpdateHousehold(@Valid @RequestBody HouseholdVO household) { |
| | | bladeLogger.info("住户 自定义新增或修改", JsonUtil.toJson(household)); |
| | | bladeLogger.info("住户信息新增或修改", JsonUtil.toJson(household)); |
| | | return R.status(householdService.saveOrUpdateHousehold(household)); |
| | | } |
| | | |
| | |
| | | @ApiOperation(value = "逻辑删除", notes = "传入ids") |
| | | @Transactional(rollbackFor = Exception.class) |
| | | public R remove(@ApiParam(value = "主键集合", required = true) @RequestParam String ids) { |
| | | bladeLogger.info("住户 删除", JsonUtil.toJson(ids)); |
| | | bladeLogger.info("住户信息删除", JsonUtil.toJson(ids)); |
| | | // 返回 |
| | | return R.status(householdService.removeHousehold(ids)); |
| | | } |
| | |
| | | @ApiOperationSupport(order = 12) |
| | | @ApiOperation(value = "导入住户", notes = "传入excel") |
| | | public R importUser(MultipartFile file, Integer isCovered) { |
| | | bladeLogger.info("住户信息导入", JsonUtil.toJson(isCovered)); |
| | | String data = householdService.importUserHouseHold(ExcelUtil.read(file, ImportHouseholdExcel.class),isCovered==1); |
| | | return R.data(200,data,null); |
| | | } |