From cc9dcfec975f6a10121be67eac6d029d159b9460 Mon Sep 17 00:00:00 2001
From: shiyunteng <shiyunteng@example.com>
Date: 星期二, 20 十月 2026 14:19:42 +0800
Subject: [PATCH] feat:长期协议,不定期新增单位,标的物 历史导入标的物,根据接口查询 石煤机乙方总公司选总公司 和 分公司 银行流水加 时间拉取 流水数据 产品加拉取按钮 盖章件关闭控制

---
 platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/controller/OutBoundController.java |   52 +++++++++++++++++++++++++++++++++++++++++++++++-----
 1 files changed, 47 insertions(+), 5 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 16f9a4f..41be04b 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,5 +1,6 @@
 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;
@@ -7,6 +8,7 @@
 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;
@@ -42,16 +44,19 @@
     /**
      * 鍒嗛〉鏌ヨ
      * @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.pageByScope(page, wrapper));
     }
@@ -82,7 +87,32 @@
         return outBoundService.add(addDTO);
     }
 
-    /**
+	/**
+	 * 鏂板鍚堝悓鍑哄簱璁板綍
+	 * @param addDTO 鍚堝悓鍑哄簱璁板綍
+	 * @return R
+	 */
+	@Operation(summary = "鏂板鍚堝悓鍑哄簱璁板綍" , description = "鏂板鍚堝悓鍑哄簱璁板綍" )
+	@SysLog("鏂板鍚堝悓鍑哄簱璁板綍" )
+	@PostMapping("/addContractOut")
+	public R addContractOut(@RequestBody OutBoundAddDTO addDTO) {
+		return outBoundService.addContractOut(addDTO);
+	}
+
+	/**
+	 * 鏂板鍚堝悓鍑哄簱璁板綍-鐭冲伐娉�
+	 * @param addDTO 鍚堝悓鍑哄簱璁板綍
+	 * @return R
+	 */
+	@Operation(summary = "鏂板鍚堝悓鍑哄簱璁板綍-鐭冲伐娉�" , description = "鏂板鍚堝悓鍑哄簱璁板綍-鐭冲伐娉�" )
+	@SysLog("鏂板鍚堝悓鍑哄簱璁板綍-鐭冲伐娉�" )
+	@PostMapping("/addContractOutSgb")
+	public R addContractOutSgb(@RequestBody OutBoundAddDTO addDTO) {
+		return outBoundService.addContractOutSgb(addDTO);
+	}
+
+
+	/**
      * 淇敼EPR鍑哄簱璁板綍
      * @param outBound EPR鍑哄簱璁板綍
      * @return R
@@ -121,4 +151,16 @@
     public List<OutBound> export(OutBound outBound,Long[] ids) {
         return outBoundService.list(Wrappers.lambdaQuery(outBound).in(ArrayUtil.isNotEmpty(ids), OutBound::getId, ids));
     }
+
+	/**
+	 * 閫氳繃鎵规鍙峰垹闄PR鍑哄簱璁板綍
+	 * @param batchNumber
+	 * @return R
+	 */
+	@Operation(summary = "閫氳繃鎵规鍙峰垹闄PR鍑哄簱璁板綍" , description = "閫氳繃鎵规鍙峰垹闄PR鍑哄簱璁板綍" )
+	@SysLog("閫氳繃鎵规鍙峰垹闄PR鍑哄簱璁板綍" )
+	@GetMapping("/delOutBound/{batchNumber}")
+	public R delOutBound(@PathVariable("batchNumber")String batchNumber) {
+		return outBoundService.delOutBound(batchNumber);
+	}
 }
\ No newline at end of file

--
Gitblit v1.9.1