From 145580fd820bb31334f2e71643413e846b7ce904 Mon Sep 17 00:00:00 2001
From: shiyunteng <shiyunteng@example.com>
Date: 星期五, 30 十月 2026 15:53:20 +0800
Subject: [PATCH] feat:统计内容1-8页

---
 platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/controller/ContractController.java |   80 +++++++++++++++++++++++++++++++++------
 1 files changed, 67 insertions(+), 13 deletions(-)

diff --git a/platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/controller/ContractController.java b/platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/controller/ContractController.java
index 0adc9b3..b068372 100644
--- a/platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/controller/ContractController.java
+++ b/platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/controller/ContractController.java
@@ -9,6 +9,7 @@
 import com.by4cloud.platformx.business.dto.*;
 import com.by4cloud.platformx.business.entity.Contract;
 import com.by4cloud.platformx.business.entity.PaymentConfirm;
+import com.by4cloud.platformx.business.vo.ContractExportExceVO;
 import com.by4cloud.platformx.common.core.util.R;
 import com.by4cloud.platformx.common.data.mybatis.BaseModel;
 import com.by4cloud.platformx.common.log.annotation.SysLog;
@@ -122,7 +123,7 @@
      */
     @Operation(summary = "淇敼鍚堝悓绠$悊" , description = "淇敼鍚堝悓绠$悊" )
     @SysLog("淇敼鍚堝悓绠$悊" )
-    @PutMapping
+    @PostMapping("/edit")
     @PreAuthorize("@pms.hasPermission('business_contract_edit')" )
     public R updateById(@RequestBody ContractUpdateDTO updateDTO) {
         return contractService.edit(updateDTO);
@@ -144,15 +145,15 @@
 
     /**
      * 瀵煎嚭excel 琛ㄦ牸
-     * @param contract 鏌ヨ鏉′欢
+     * @param queryDTO 鏌ヨ鏉′欢
    	 * @param ids 瀵煎嚭鎸囧畾ID
      * @return excel 鏂囦欢娴�
      */
     @ResponseExcel
     @GetMapping("/export")
     @PreAuthorize("@pms.hasPermission('business_contract_export')" )
-    public List<Contract> export(Contract contract,Long[] ids) {
-        return contractService.list(Wrappers.lambdaQuery(contract).in(ArrayUtil.isNotEmpty(ids), Contract::getId, ids));
+    public List<ContractExportExceVO> export(ContracQueryDTO queryDTO, Long[] ids) {
+        return contractService.export(queryDTO);
     }
 
 	/**
@@ -162,6 +163,7 @@
 	public R list(@ParameterObject Contract contract) {
 		return R.ok(contractService.listByScope(Wrappers.<Contract>lambdaQuery().eq(Contract::getContractStatus,2)
 				.eq(ObjUtil.isNotNull(contract.getPartyAId()),Contract::getPartyAId,contract.getPartyAId())
+				.eq(ObjUtil.isNotNull(contract.getAmount()),Contract::getAmount,0)
 				.orderByDesc(Contract::getCreateTime)));
 	}
 
@@ -325,15 +327,15 @@
 	 * 鏂板鍚堝悓-鐭冲伐娉�
 	 * @return R
 	 */
-	@Operation(summary = "鏂板鍘嗗彶鍚堝悓-鐭冲伐娉�" , description = "鏂板鍘嗗彶鍚堝悓-鐭冲伐娉�" )
-	@PostMapping("/addContractSgbHis")
-	@SysLog("鏂板鍘嗗彶鍚堝悓-鐭冲伐娉�" )
-	public R addContractSgbHis(@RequestBody ContractAddDTO addDTO) {
-		return contractService.addContractSgbHis(addDTO);
-	}
+//	@Operation(summary = "鏂板鍘嗗彶鍚堝悓-鐭冲伐娉�" , description = "鏂板鍘嗗彶鍚堝悓-鐭冲伐娉�" )
+//	@PostMapping("/addContractSgbHis")
+//	@SysLog("鏂板鍘嗗彶鍚堝悓-鐭冲伐娉�" )
+//	public R addContractSgbHis(@RequestBody ContractAddDTO addDTO) {
+//		return contractService.addContractSgbHis(addDTO);
+//	}
 
 	/**
-	 * 鏂板鍚堝悓-鐭冲伐娉�
+	 * 鏂板鍚堝悓-鐭冲伐娉�(鍚堝悓鍙锋柊鐢熸垚)
 	 * @return R
 	 */
 	@Operation(summary = "鏂板鍚堝悓-鐭冲伐娉�" , description = "鏂板鍚堝悓-鐭冲伐娉�" )
@@ -341,6 +343,17 @@
 	@SysLog("鏂板鍚堝悓-鐭冲伐娉�" )
 	public R addContractSgb(@RequestBody ContractAddDTO addDTO) {
 		return contractService.addContractSgb(addDTO);
+	}
+
+	/**
+	 * 鏂板鍚堝悓-鐭冲伐娉�(鍚堝悓鍙峰鐢�)
+	 * @return R
+	 */
+	@Operation(summary = "鏂板鍚堝悓-鐭冲伐娉�" , description = "鏂板鍚堝悓-鐭冲伐娉�" )
+	@PostMapping("/addContractNoSgb")
+	@SysLog("鏂板鍚堝悓-鐭冲伐娉�(鍚堝悓鍙峰鐢�)" )
+	public R addContractNoSgb(@RequestBody ContractAddDTO addDTO) {
+		return contractService.addContractNoSgb(addDTO);
 	}
 
 	/**
@@ -470,13 +483,54 @@
 	}
 
 	/**
-	 * 鏂板鍚堝悓-鐭冲伐娉�
+	 * 鏂板鍚堝悓(宸叉帹閫佸悎鍚屼腑蹇�)
 	 * @return R
 	 */
-	@Operation(summary = "鏂板鍘嗗彶鍚堝悓" , description = "鏂板鍘嗗彶鍚堝悓" )
+	@Operation(summary = "鏂板鍘嗗彶鍚堝悓(宸叉帹閫佸悎鍚屼腑蹇�)" , description = "鏂板鍘嗗彶鍚堝悓(宸叉帹閫佸悎鍚屼腑蹇�)" )
 	@PostMapping("/addContractHis")
 	@SysLog("鏂板鍘嗗彶鍚堝悓" )
 	public R addContractHis(@RequestBody ContractAddDTO addDTO) {
 		return contractService.addContractHis(addDTO);
 	}
+
+	/**
+	 * 鏂板鍚堝悓(鏈帹閫佸悎鍚屼腑蹇�)
+	 * @return R
+	 */
+	@Operation(summary = "鏂板鍘嗗彶鍚堝悓(鏈帹閫佸悎鍚屼腑蹇�)" , description = "鏂板鍘嗗彶鍚堝悓(鏈帹閫佸悎鍚屼腑蹇�)" )
+	@PostMapping("/addContractHisNoCenter")
+	@SysLog("鏂板鍘嗗彶鍚堝悓" )
+	public R addContractHisNoCenter(@RequestBody ContractAddDTO addDTO) {
+		return contractService.addContractHisNoCenter(addDTO);
+	}
+
+	/**
+	 * 鏇存柊鍘嗗彶鍚堝悓(鏈帹閫佸悎鍚屼腑蹇�)
+	 * @return R
+	 */
+	@Operation(summary = "鏇存柊鍘嗗彶鍚堝悓(鏈帹閫佸悎鍚屼腑蹇�)" , description = "鏇存柊鍘嗗彶鍚堝悓(鏈帹閫佸悎鍚屼腑蹇�)" )
+	@PostMapping("/updContractHisNoCenter")
+	@SysLog("鏇存柊鍘嗗彶鍚堝悓" )
+	public R updContractHisNoCenter(@RequestBody ContractUpdateDTO updateDTO) {
+		return contractService.updContractHisNoCenter(updateDTO);
+	}
+
+
+	@Inner(value = false)
+	@GetMapping("/takeEffect/{id}")
+	public R takeEffect(@PathVariable("id") Long id) {
+		contractService.takeEffect(id);
+		return R.ok();
+	}
+
+	/**
+	 * 鏂板闀挎湡鍗忚璁㈠崟
+	 * @return R
+	 */
+	@Operation(summary = "鏂板闀挎湡鍗忚璁㈠崟" , description = "鏂板闀挎湡鍗忚璁㈠崟" )
+	@PostMapping("/addContractOrder")
+	@SysLog("鏂板闀挎湡鍗忚璁㈠崟" )
+	public R addContractOrder(@RequestBody ContractOrderAddDTO addDTO) {
+		return contractService.addContractOrder(addDTO);
+	}
 }
\ No newline at end of file

--
Gitblit v1.9.1