From b5837609dcd4417904eaaa5924de46010443affd Mon Sep 17 00:00:00 2001
From: lin <sbla5888@163.com>
Date: Thu, 21 Mar 2024 19:37:45 +0800
Subject: [PATCH] 居住证审核+从业人员优化
---
src/main/java/org/springblade/modules/task/controller/TaskResidencePermitApplyController.java | 20 ++++++++++++++++++--
1 files changed, 18 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 cfde48d..4596e5f 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));
}
@@ -88,7 +95,7 @@
@ApiOperationSupport(order = 4)
@ApiOperation(value = "新增", notes = "传入taskResidencePermitApply")
public R save(@Valid @RequestBody TaskResidencePermitApplyEntity taskResidencePermitApply) {
- return R.status(taskResidencePermitApplyService.save(taskResidencePermitApply));
+ return R.status(taskResidencePermitApplyService.saveResidencePermitApplyEntity(taskResidencePermitApply));
}
/**
@@ -100,6 +107,15 @@
public R update(@Valid @RequestBody TaskResidencePermitApplyEntity taskResidencePermitApply) {
return R.status(taskResidencePermitApplyService.updateById(taskResidencePermitApply));
}
+ /**
+ * 居住证申请 审核
+ */
+ @PostMapping("/auditing")
+ @ApiOperationSupport(order = 5)
+ @ApiOperation(value = "审核", notes = "传入taskResidencePermitApply")
+ public R updateResidencePermitApply(@Valid @RequestBody TaskResidencePermitApplyEntity taskResidencePermitApply) {
+ return R.status(taskResidencePermitApplyService.updateResidencePermitApplyEntity(taskResidencePermitApply));
+ }
/**
* 居住证申请 新增或修改
--
Gitblit v1.9.3