From 764d883b5ea3bdc06abbec548b6df0511e567978 Mon Sep 17 00:00:00 2001
From: linwe <872216996@qq.com>
Date: Tue, 03 Sep 2024 09:46:05 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/binlog' into binlog
---
src/main/java/org/springblade/modules/task/controller/TaskResidencePermitApplyController.java | 38 ++++++++++++++++++++++++++++++++++++--
1 files changed, 36 insertions(+), 2 deletions(-)
diff --git a/src/main/java/org/springblade/modules/task/controller/TaskResidencePermitApplyController.java b/src/main/java/org/springblade/modules/task/controller/TaskResidencePermitApplyController.java
index 76f6ccc..56684aa 100644
--- a/src/main/java/org/springblade/modules/task/controller/TaskResidencePermitApplyController.java
+++ b/src/main/java/org/springblade/modules/task/controller/TaskResidencePermitApplyController.java
@@ -21,11 +21,16 @@
import io.swagger.annotations.ApiParam;
import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
import lombok.AllArgsConstructor;
+
import javax.validation.Valid;
+import org.springblade.core.log.annotation.ApiLog;
+import org.springblade.core.log.logger.BladeLogger;
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.jackson.JsonUtil;
import org.springblade.core.tool.utils.Func;
import org.springframework.web.bind.annotation.*;
import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -34,6 +39,8 @@
import org.springblade.modules.task.wrapper.TaskResidencePermitApplyWrapper;
import org.springblade.modules.task.service.ITaskResidencePermitApplyService;
import org.springblade.core.boot.ctrl.BladeController;
+
+import java.util.Date;
/**
* 居住证申请 控制器
@@ -48,17 +55,21 @@
public class TaskResidencePermitApplyController extends BladeController {
private final ITaskResidencePermitApplyService taskResidencePermitApplyService;
+ private final BladeLogger bladeLogger;
/**
* 居住证申请 详情
*/
@GetMapping("/detail")
@ApiOperationSupport(order = 1)
+ @ApiLog("居住证申请 详情")
@ApiOperation(value = "详情", notes = "传入taskResidencePermitApply")
public R<TaskResidencePermitApplyVO> detail(TaskResidencePermitApplyEntity taskResidencePermitApply) {
+ bladeLogger.info("居住证申请 详情", JsonUtil.toJson(taskResidencePermitApply));
TaskResidencePermitApplyEntity detail = taskResidencePermitApplyService.getOne(Condition.getQueryWrapper(taskResidencePermitApply));
return R.data(TaskResidencePermitApplyWrapper.build().entityVO(detail));
}
+
/**
* 居住证申请 分页
*/
@@ -66,7 +77,9 @@
@ApiOperationSupport(order = 2)
@ApiOperation(value = "分页", notes = "传入taskResidencePermitApply")
public R<IPage<TaskResidencePermitApplyVO>> list(TaskResidencePermitApplyEntity taskResidencePermitApply, Query query) {
- IPage<TaskResidencePermitApplyEntity> pages = taskResidencePermitApplyService.page(Condition.getPage(query), Condition.getQueryWrapper(taskResidencePermitApply));
+ // 查询自己的记录
+ taskResidencePermitApply.setCreateUser(AuthUtil.getUserId());
+ IPage<TaskResidencePermitApplyEntity> pages = taskResidencePermitApplyService.page(Condition.getPage(query), Condition.getQueryWrapper(taskResidencePermitApply).orderByDesc("create_time"));
return R.data(TaskResidencePermitApplyWrapper.build().pageVO(pages));
}
@@ -75,8 +88,10 @@
*/
@GetMapping("/page")
@ApiOperationSupport(order = 3)
+ @ApiLog("居住证申请 自定义分页")
@ApiOperation(value = "分页", notes = "传入taskResidencePermitApply")
public R<IPage<TaskResidencePermitApplyVO>> page(TaskResidencePermitApplyVO taskResidencePermitApply, Query query) {
+ bladeLogger.info("居住证申请 自定义分页", JsonUtil.toJson(taskResidencePermitApply));
IPage<TaskResidencePermitApplyVO> pages = taskResidencePermitApplyService.selectTaskResidencePermitApplyPage(Condition.getPage(query), taskResidencePermitApply);
return R.data(pages);
}
@@ -86,8 +101,10 @@
*/
@PostMapping("/save")
@ApiOperationSupport(order = 4)
+ @ApiLog("居住证申请 新增")
@ApiOperation(value = "新增", notes = "传入taskResidencePermitApply")
public R save(@Valid @RequestBody TaskResidencePermitApplyEntity taskResidencePermitApply) {
+ bladeLogger.info("居住证申请 新增", JsonUtil.toJson(taskResidencePermitApply));
return R.status(taskResidencePermitApplyService.saveResidencePermitApplyEntity(taskResidencePermitApply));
}
@@ -96,9 +113,22 @@
*/
@PostMapping("/update")
@ApiOperationSupport(order = 5)
+ @ApiLog("居住证申请 修改")
@ApiOperation(value = "修改", notes = "传入taskResidencePermitApply")
public R update(@Valid @RequestBody TaskResidencePermitApplyEntity taskResidencePermitApply) {
+ bladeLogger.info("居住证申请 修改", JsonUtil.toJson(taskResidencePermitApply));
return R.status(taskResidencePermitApplyService.updateById(taskResidencePermitApply));
+ }
+ /**
+ * 居住证申请 审核
+ */
+ @PostMapping("/auditing")
+ @ApiOperationSupport(order = 5)
+ @ApiLog("居住证申请 审核")
+ @ApiOperation(value = "审核", notes = "传入taskResidencePermitApply")
+ public R updateResidencePermitApply(@Valid @RequestBody TaskResidencePermitApplyEntity taskResidencePermitApply) {
+ bladeLogger.info("居住证申请 审核", JsonUtil.toJson(taskResidencePermitApply));
+ return R.status(taskResidencePermitApplyService.updateResidencePermitApplyEntity(taskResidencePermitApply));
}
/**
@@ -106,8 +136,10 @@
*/
@PostMapping("/submit")
@ApiOperationSupport(order = 6)
+ @ApiLog("居住证申请 新增或修改")
@ApiOperation(value = "新增或修改", notes = "传入taskResidencePermitApply")
public R submit(@Valid @RequestBody TaskResidencePermitApplyEntity taskResidencePermitApply) {
+ bladeLogger.info("居住证申请 新增或修改", JsonUtil.toJson(taskResidencePermitApply));
return R.status(taskResidencePermitApplyService.saveOrUpdate(taskResidencePermitApply));
}
@@ -116,9 +148,11 @@
*/
@PostMapping("/remove")
@ApiOperationSupport(order = 7)
+ @ApiLog("居住证申请 详情")
@ApiOperation(value = "逻辑删除", notes = "传入ids")
public R remove(@ApiParam(value = "主键集合", required = true) @RequestParam String ids) {
- return R.status(taskResidencePermitApplyService.removeBatchByIds(Func.toLongList(ids)));
+ bladeLogger.info("居住证申请 删除", JsonUtil.toJson(ids));
+ return R.status(taskResidencePermitApplyService.removeTaskResidencePermitApplyBatchByIds(Func.toLongList(ids)));
}
--
Gitblit v1.9.3