From c4e2c196aad8af656d94bc47e9f1a80bc504b5d7 Mon Sep 17 00:00:00 2001
From: lin <sbla5888@163.com>
Date: Thu, 14 Mar 2024 18:15:29 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/org/springblade/modules/place/controller/PlaceCheckController.java | 38 +++++++++++++++++++++++++++++++++++---
1 files changed, 35 insertions(+), 3 deletions(-)
diff --git a/src/main/java/org/springblade/modules/place/controller/PlaceCheckController.java b/src/main/java/org/springblade/modules/place/controller/PlaceCheckController.java
index cdb9f7f..6e72df1 100644
--- a/src/main/java/org/springblade/modules/place/controller/PlaceCheckController.java
+++ b/src/main/java/org/springblade/modules/place/controller/PlaceCheckController.java
@@ -21,13 +21,21 @@
import io.swagger.annotations.ApiParam;
import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
import lombok.AllArgsConstructor;
+
+import javax.servlet.http.HttpServletResponse;
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.place.dto.PlaceCheckDTO;
+import org.springblade.modules.place.excel.NinePlaceExcel;
+import org.springblade.modules.place.excel.PlaceCheckExcel;
+import org.springblade.modules.place.vo.PlaceVO;
import org.springframework.web.bind.annotation.*;
import com.baomidou.mybatisplus.core.metadata.IPage;
import org.springblade.modules.place.entity.PlaceCheckEntity;
@@ -35,6 +43,8 @@
import org.springblade.modules.place.wrapper.PlaceCheckWrapper;
import org.springblade.modules.place.service.IPlaceCheckService;
import org.springblade.core.boot.ctrl.BladeController;
+
+import java.util.List;
/**
* 场所检查表 控制器
@@ -56,8 +66,8 @@
@GetMapping("/detail")
@ApiOperationSupport(order = 1)
@ApiOperation(value = "详情", notes = "传入placeCheck")
- public R<PlaceCheckEntity> detail(PlaceCheckEntity placeCheck) {
- PlaceCheckEntity detail = placeCheckService.getOne(Condition.getQueryWrapper(placeCheck));
+ public R<PlaceCheckVO> detail(PlaceCheckEntity placeCheck) {
+ PlaceCheckVO detail = placeCheckService.selectPlaceCheckById(placeCheck.getId());
return R.data(detail);
}
/**
@@ -88,7 +98,17 @@
@PostMapping("/save")
@ApiOperationSupport(order = 4)
@ApiOperation(value = "新增", notes = "传入placeCheck")
- public R save(@Valid @RequestBody PlaceCheckVO placeCheck) throws Exception {
+ public R save(@Valid @RequestBody PlaceCheckVO placeCheck){
+ return R.status(placeCheckService.save(placeCheck));
+ }
+
+ /**
+ * 场所检查表 新增
+ */
+ @PostMapping("/saveTwo")
+ @ApiOperationSupport(order = 4)
+ @ApiOperation(value = "新增", notes = "传入placeCheck")
+ public R saveTwo(@Valid @RequestBody PlaceCheckVO placeCheck) throws Exception {
return R.status(placeCheckService.savePlace(placeCheck));
}
@@ -122,5 +142,17 @@
return R.status(placeCheckService.removeByIds(Func.toLongList(ids)));
}
+ /**
+ * 导出场所检查信息
+ * @param placeCheck
+ */
+ @GetMapping("export-placeCheck")
+ @ApiOperationSupport(order = 8)
+ @ApiOperation(value = "导出场所检查", notes = "传入placeCheck")
+ public void exportPlaceCheck(PlaceCheckVO placeCheck, HttpServletResponse response) {
+ List<PlaceCheckExcel> list = placeCheckService.exportPlaceCheck(placeCheck);
+ ExcelUtil.export(response, "场所检查" + DateUtil.time(), "场所检查记录表", list, PlaceCheckExcel.class);
+ }
+
}
--
Gitblit v1.9.3