From 9f8f9d13c42ca8cdccbf351069082a5fdccef2e4 Mon Sep 17 00:00:00 2001
From: lin <sbla5888@163.com>
Date: Mon, 25 Mar 2024 17:30:51 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/org/springblade/modules/task/controller/TaskResidencePermitApplyController.java | 12 +++++++++---
1 files changed, 9 insertions(+), 3 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 5029c99..3483522 100644
--- a/src/main/java/org/springblade/modules/task/controller/TaskResidencePermitApplyController.java
+++ b/src/main/java/org/springblade/modules/task/controller/TaskResidencePermitApplyController.java
@@ -21,10 +21,12 @@
import io.swagger.annotations.ApiParam;
import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
import lombok.AllArgsConstructor;
+
import javax.validation.Valid;
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.Func;
import org.springframework.web.bind.annotation.*;
@@ -34,6 +36,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;
/**
* 居住证申请 控制器
@@ -59,6 +63,7 @@
TaskResidencePermitApplyEntity detail = taskResidencePermitApplyService.getOne(Condition.getQueryWrapper(taskResidencePermitApply));
return R.data(TaskResidencePermitApplyWrapper.build().entityVO(detail));
}
+
/**
* 居住证申请 分页
*/
@@ -66,7 +71,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));
}
@@ -100,7 +107,6 @@
public R update(@Valid @RequestBody TaskResidencePermitApplyEntity taskResidencePermitApply) {
return R.status(taskResidencePermitApplyService.updateById(taskResidencePermitApply));
}
-
/**
* 居住证申请 审核
*/
@@ -128,7 +134,7 @@
@ApiOperationSupport(order = 7)
@ApiOperation(value = "逻辑删除", notes = "传入ids")
public R remove(@ApiParam(value = "主键集合", required = true) @RequestParam String ids) {
- return R.status(taskResidencePermitApplyService.removeBatchByIds(Func.toLongList(ids)));
+ return R.status(taskResidencePermitApplyService.removeTaskResidencePermitApplyBatchByIds(Func.toLongList(ids)));
}
--
Gitblit v1.9.3