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/ContractController.java | 206 ++++++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 201 insertions(+), 5 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 f858f61..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
@@ -8,6 +8,8 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
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;
@@ -25,6 +27,7 @@
import io.swagger.v3.oas.annotations.Operation;
import lombok.RequiredArgsConstructor;
import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
import java.math.BigDecimal;
import java.util.List;
@@ -76,7 +79,19 @@
return R.ok(contractService.detail(id));
}
- /**
+ /**
+ * 鎵嬪姩鎺ㄩ�佸悎鍚屼腑蹇�
+ * @param dto
+ * @return R
+ */
+ @Operation(summary = "鎵嬪姩鎺ㄩ�佸悎鍚屼腑蹇�" , description = "鎵嬪姩鎺ㄩ�佸悎鍚屼腑蹇�" )
+ @PostMapping("/pushCenter" )
+ public R pushCenter(@RequestBody PushCenterDTO dto) {
+ return contractService.pushCenter(dto);
+ }
+
+
+ /**
* 鏂板鍚堝悓绠$悊
* @param addDTO 鍚堝悓绠$悊
* @return R
@@ -88,6 +103,18 @@
public R save(@RequestBody ContractAddDTO addDTO) {
return contractService.add(addDTO);
}
+
+ /**
+ * 鏂板绠�鏄撳悎鍚�
+ * @param addDTO 鍚堝悓绠$悊
+ * @return R
+ */
+ @Operation(summary = "鏂板绠�鏄撳悎鍚�" , description = "鏂板绠�鏄撳悎鍚�" )
+ @SysLog("鏂板绠�鏄撳悎鍚�" )
+ @PostMapping("/addSimple")
+ public R addSimple(@RequestBody ContractAddDTO addDTO) {
+ return contractService.addSimple(addDTO);
+ }
/**
* 淇敼鍚堝悓绠$悊
@@ -118,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);
}
/**
@@ -136,6 +163,18 @@
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)));
+ }
+
+ @GetMapping("/listAssoci")
+ public R listAssoci(@ParameterObject Contract contract) {
+ return R.ok(contractService.listByScope(Wrappers.<Contract>lambdaQuery().eq(Contract::getContractStatus,2)
+ .and(wrapper -> wrapper
+ .eq(ObjUtil.isNotNull(contract.getPartyAId()),Contract::getPartyAId,contract.getPartyAId())
+ .or()
+ .eq(ObjUtil.isNotNull(contract.getPartyAId()),Contract::getPartyCId,contract.getPartyAId())
+ )
.orderByDesc(Contract::getCreateTime)));
}
@@ -288,11 +327,33 @@
* 鏂板鍚堝悓-鐭冲伐娉�
* @return R
*/
+// @Operation(summary = "鏂板鍘嗗彶鍚堝悓-鐭冲伐娉�" , description = "鏂板鍘嗗彶鍚堝悓-鐭冲伐娉�" )
+// @PostMapping("/addContractSgbHis")
+// @SysLog("鏂板鍘嗗彶鍚堝悓-鐭冲伐娉�" )
+// public R addContractSgbHis(@RequestBody ContractAddDTO addDTO) {
+// return contractService.addContractSgbHis(addDTO);
+// }
+
+ /**
+ * 鏂板鍚堝悓-鐭冲伐娉�(鍚堝悓鍙锋柊鐢熸垚)
+ * @return R
+ */
@Operation(summary = "鏂板鍚堝悓-鐭冲伐娉�" , description = "鏂板鍚堝悓-鐭冲伐娉�" )
@PostMapping("/addContractSgb")
@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);
}
/**
@@ -322,7 +383,7 @@
* @return R
*/
@Operation(summary = "鍒犻櫎鍚堝悓-鐭冲伐娉�" , description = "鍒犻櫎鍚堝悓-鐭冲伐娉�" )
- @PostMapping("/delContractSgb/{dataId}")
+ @GetMapping("/delContractSgb/{dataId}")
@SysLog("鍒犻櫎鍚堝悓-鐭冲伐娉�" )
public R delContractSgb(@PathVariable String dataId) {
return contractService.delContractSgb(dataId);
@@ -337,4 +398,139 @@
public R fourAssociation(@ParameterObject Page page,@ParameterObject ContractQueryDTO queryDTO) {
return R.ok(contractService.fourAssociation(page,queryDTO));
}
+
+ @PostMapping("/importContractMultiSheet")
+ public R importContractMultiSheet(@RequestParam("file") MultipartFile file) {
+ if (file.isEmpty()) {
+ return R.failed("鏂囦欢涓嶈兘涓虹┖");
+ }
+ return contractService.importContractMultiSheet(file);
+ }
+
+ /**
+ * 鍚堝悓鏍囩殑鐗╁彉鏇�
+ * @param changeDTO 鍚堝悓绠$悊
+ * @return R
+ */
+ @Operation(summary = "鍚堝悓鏍囩殑鐗╁彉鏇�" , description = "鍚堝悓鏍囩殑鐗╁彉鏇�" )
+ @SysLog("鍚堝悓鏍囩殑鐗╁彉鏇�" )
+ @PostMapping("/subjectChange")
+ @PreAuthorize("@pms.hasPermission('business_contract_subchange')" )
+ public R subjectChange(@RequestBody ContractSubjectChangeDTO changeDTO) {
+ return contractService.subjectChange(changeDTO);
+ }
+
+ /**
+ * 鍚堝悓鏍囩殑鐗╁彉鏇村垎椤�
+ * @param queryDTO 鍚堝悓绠$悊
+ * @return R
+ */
+ @Operation(summary = "鍚堝悓鏍囩殑鐗╁彉鏇村垎椤�" , description = "鍚堝悓鏍囩殑鐗╁彉鏇村垎椤�" )
+ @SysLog("鍚堝悓鏍囩殑鐗╁彉鏇村垎椤�" )
+ @GetMapping("/subjectChangePage")
+ public R subjectChangePage(@ParameterObject Page page, @ParameterObject ContracQueryDTO queryDTO) {
+ return R.ok(contractService.subjectChangePage(page,queryDTO));
+ }
+
+ /**
+ * 鍚堝悓鏍囩殑鐗╁彉鏇撮檮浠�
+ * @param attDTO 鍚堝悓绠$悊
+ * @return R
+ */
+ @Operation(summary = "鍚堝悓鏍囩殑鐗╁彉鏇撮檮浠�" , description = "鍚堝悓鏍囩殑鐗╁彉鏇撮檮浠�" )
+ @SysLog("鍚堝悓鏍囩殑鐗╁彉鏇撮檮浠�" )
+ @PostMapping("/subjectChangeAtt")
+ public R subjectChangeAtt(@RequestBody ContractSubjectChangeAttDTO attDTO) {
+ return contractService.subjectChangeAtt(attDTO);
+ }
+
+ /**
+ * 鍚堝悓鏍囩殑鐗╁彉鏇撮檮浠�
+ * @param dto 鍚堝悓绠$悊
+ * @return R
+ */
+ @Inner(value = false)
+ @SysLog("鍚堝悓瀹℃壒缁撴灉鍚屾" )
+ @PostMapping("/syncContractStatus")
+ public R syncContractStatus(@RequestBody SyncContractStatusDTO dto) {
+ return contractService.syncContractStatus(dto);
+ }
+
+ @PostMapping("/finallyPdf")
+ public R finallyPdf(@RequestBody ContractFinallyDTO attDTO) {
+ return contractService.finallyPdf(attDTO);
+ }
+
+ @PostMapping("/associationPartyC")
+ public R associationPartyC(@RequestBody ContractAssociationPartyCyDTO associationPartyCyDTO) {
+ return contractService.associationPartyC(associationPartyCyDTO);
+ }
+
+ @GetMapping("/getFinallyInfo/{id}")
+ public R getFinallyInfo(@PathVariable("id") Long id) {
+ return contractService.getFinallyInfo(id);
+ }
+
+ @Inner(value = false)
+ @GetMapping("/erpPush/{id}")
+ public R erpPush(@PathVariable("id") Long id) {
+ return contractService.erpPush(id);
+ }
+
+ @GetMapping("/getInvoiceObj/{id}")
+ public R getInvoiceObj(@PathVariable("id") Long id) {
+ return contractService.getInvoiceObj(id);
+ }
+
+ /**
+ * 鏂板鍚堝悓(宸叉帹閫佸悎鍚屼腑蹇�)
+ * @return R
+ */
+ @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