From 8de09297dcc5393cc8542f29318b17f5696d4f8d Mon Sep 17 00:00:00 2001
From: shiyunteng <shiyunteng@example.com>
Date: 星期五, 17 七月 2026 09:28:46 +0800
Subject: [PATCH] feat:单点登录 首页及首页跳转
---
platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/controller/OutBoundController.java | 36 +++++++++++++++++++++++++++---------
1 files changed, 27 insertions(+), 9 deletions(-)
diff --git a/platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/controller/OutBoundController.java b/platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/controller/OutBoundController.java
index 4aef0cf..3b692ef 100644
--- a/platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/controller/OutBoundController.java
+++ b/platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/controller/OutBoundController.java
@@ -1,11 +1,14 @@
package com.by4cloud.platformx.business.controller;
+import cn.hutool.core.util.ObjUtil;
import cn.hutool.core.util.StrUtil;
import cn.hutool.core.util.ArrayUtil;
import cn.hutool.core.collection.CollUtil;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.by4cloud.platformx.business.dto.OutBoundAddDTO;
+import com.by4cloud.platformx.business.dto.OutBoundQueryDTO;
import com.by4cloud.platformx.common.core.util.R;
import com.by4cloud.platformx.common.log.annotation.SysLog;
import com.by4cloud.platformx.business.entity.OutBound;
@@ -36,23 +39,26 @@
@SecurityRequirement(name = HttpHeaders.AUTHORIZATION)
public class OutBoundController {
- private final OutBoundService outBoundService;
+ private final OutBoundService outBoundService;
/**
* 鍒嗛〉鏌ヨ
* @param page 鍒嗛〉瀵硅薄
- * @param outBound EPR鍑哄簱璁板綍
+ * @param queryDTO EPR鍑哄簱璁板綍
* @return
*/
@Operation(summary = "鍒嗛〉鏌ヨ" , description = "鍒嗛〉鏌ヨ" )
@GetMapping("/page" )
@PreAuthorize("@pms.hasPermission('business_outBound_view')" )
- public R getOutBoundPage(@ParameterObject Page page, @ParameterObject OutBound outBound) {
+ public R getOutBoundPage(@ParameterObject Page page, @ParameterObject OutBoundQueryDTO queryDTO) {
LambdaQueryWrapper<OutBound> wrapper = Wrappers.lambdaQuery();
- wrapper.like(StrUtil.isNotBlank(outBound.getBusGuestName()),OutBound::getBusGuestName,outBound.getBusGuestName());
- wrapper.like(StrUtil.isNotBlank(outBound.getSubjectMatterName()),OutBound::getSubjectMatterName,outBound.getSubjectMatterName());
+ wrapper.like(StrUtil.isNotBlank(queryDTO.getBusGuestName()),OutBound::getBusGuestName,queryDTO.getBusGuestName());
+ wrapper.like(StrUtil.isNotBlank(queryDTO.getSubjectMatterName()),OutBound::getSubjectMatterName,queryDTO.getSubjectMatterName());
+ wrapper.like(StrUtil.isNotBlank(queryDTO.getBatchNumber()),OutBound::getBatchNumber,queryDTO.getBatchNumber());
+ wrapper.ge(ObjUtil.isNotNull(queryDTO.getStartTime()),OutBound::getOutBoundTime,queryDTO.getStartTime());
+ wrapper.le(ObjUtil.isNotNull(queryDTO.getEndTime()),OutBound::getOutBoundTime,queryDTO.getEndTime());
wrapper.orderByDesc(OutBound::getCreateTime);
- return R.ok(outBoundService.page(page, wrapper));
+ return R.ok(outBoundService.pageByScope(page, wrapper));
}
@@ -70,17 +76,29 @@
/**
* 鏂板EPR鍑哄簱璁板綍
- * @param outBound EPR鍑哄簱璁板綍
+ * @param addDTO EPR鍑哄簱璁板綍
* @return R
*/
@Operation(summary = "鏂板EPR鍑哄簱璁板綍" , description = "鏂板EPR鍑哄簱璁板綍" )
@SysLog("鏂板EPR鍑哄簱璁板綍" )
@PostMapping
@PreAuthorize("@pms.hasPermission('business_outBound_add')" )
- public R save(@RequestBody OutBound outBound) {
- return R.ok(outBoundService.save(outBound));
+ public R save(@RequestBody OutBoundAddDTO addDTO) {
+ return outBoundService.add(addDTO);
}
+ /**
+ * 鏂板鍚堝悓鍑哄簱璁板綍
+ * @param addDTO 鍚堝悓鍑哄簱璁板綍
+ * @return R
+ */
+ @Operation(summary = "鏂板鍚堝悓鍑哄簱璁板綍" , description = "鏂板鍚堝悓鍑哄簱璁板綍" )
+ @SysLog("鏂板鍚堝悓鍑哄簱璁板綍" )
+ @PostMapping("/addContractOut")
+ public R addContractOut(@RequestBody OutBoundAddDTO addDTO) {
+ return outBoundService.addContractOut(addDTO);
+ }
+
/**
* 淇敼EPR鍑哄簱璁板綍
* @param outBound EPR鍑哄簱璁板綍
--
Gitblit v1.9.1