From c5ea85558fea4d82b5368073c598a30f905c4bdc Mon Sep 17 00:00:00 2001
From: shiyunteng <shiyunteng@example.com>
Date: 星期五, 23 十月 2026 17:11:49 +0800
Subject: [PATCH] feat:新增统计标注功能
---
platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/controller/ContractController.java | 78 +++++++++++++++++++++++++++++++++------
1 files changed, 66 insertions(+), 12 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..c61aef6 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;
@@ -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