Merge remote-tracking branch 'origin/master'

lin

2024-03-14 c4e2c196aad8af656d94bc47e9f1a80bc504b5d7

 src/main/java/org/springblade/modules/place/controller/PlaceController.java

@@ -26,18 +26,12 @@
import javax.validation.Valid;

import org.springblade.core.excel.util.ExcelUtil;
import org.springblade.core.secure.BladeUser;
import org.springblade.core.mp.support.Condition;
import org.springblade.core.mp.support.Query;
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.excel.HouseAndHoldExcel;
import org.springblade.modules.house.excel.HouseAndHoldImporter;
import org.springblade.modules.place.excel.*;
import org.springblade.modules.taskPlaceRectification.excel.TaskPlaceRectificationExcel;
import org.springblade.modules.taskPlaceRectification.vo.TaskPlaceRectificationsVO;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.bind.annotation.*;
import com.baomidou.mybatisplus.core.metadata.IPage;
import org.springblade.modules.place.entity.PlaceEntity;
@@ -103,6 +97,17 @@
   @ApiOperation(value = "分页", notes = "传入place")
   public R<IPage<PlaceVO>> ninePage(PlaceVO place, Query query) {
      IPage<PlaceVO> pages = placeService.selectNinePlacePage(Condition.getPage(query), place);
      return R.data(pages);
   }

   /**
    * 企业商超列表查询
    */
   @GetMapping("/mallPage")
   @ApiOperationSupport(order = 3)
   @ApiOperation(value = "分页", notes = "传入place")
   public R<IPage<PlaceVO>> mallPage(PlaceVO place, Query query) {
      IPage<PlaceVO> pages = placeService.selectMallPage(Condition.getPage(query), place);
      return R.data(pages);
   }

@@ -268,14 +273,14 @@
   }

   /**
    * 导出房屋
    * 导出九小统计
    */
   @GetMapping("exportNineType")
   @ApiOperationSupport(order = 13)
   @ApiOperation(value = "导出九小统计", notes = "传入place")
   public void exportNineType(PlaceVO place, HttpServletResponse response) {
      List<NinePlaceExcel> list = placeService.export(place);
      ExcelUtil.export(response, "房屋数据" + DateUtil.time(), "房屋数据表", list, NinePlaceExcel.class);
      ExcelUtil.export(response, "档案管理" + DateUtil.time(), "场所数据表", list, NinePlaceExcel.class);
   }


@@ -286,4 +291,20 @@
   public R placeJwGridCodeHandle() {
      return R.data(placeService.placeJwGridCodeHandle());
   }

   /**
    * 场所综治网格处理
    */
   @GetMapping("/placeGridCodeHandle")
   public R placeGridCodeHandle() {
      return R.data(placeService.placeGridCodeHandle());
   }

   /**
    * 场所二维码绑定处理
    */
   @GetMapping("/placeDoorBindHandle")
   public R placeDoorBindHandle() {
      return R.data(placeService.placeDoorBindHandle());
   }
}