From b1b3da5393c75ced1afa1467be69d60af5403878 Mon Sep 17 00:00:00 2001
From: shiyunteng <shiyunteng@example.com>
Date: 星期四, 27 八月 2026 14:25:16 +0800
Subject: [PATCH] feat:合同审核、出库及履约阶段代码优化
---
platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/controller/ContractController.java | 144 +++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 137 insertions(+), 7 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 839212c..50fcaa5 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
@@ -6,10 +6,7 @@
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.ContracQueryDTO;
-import com.by4cloud.platformx.business.dto.ContractAddDTO;
-import com.by4cloud.platformx.business.dto.ContractUpdateDTO;
-import com.by4cloud.platformx.business.dto.DelayOutApprovalDTO;
+import com.by4cloud.platformx.business.dto.*;
import com.by4cloud.platformx.business.entity.Contract;
import com.by4cloud.platformx.common.core.util.R;
import com.by4cloud.platformx.common.data.mybatis.BaseModel;
@@ -28,6 +25,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;
@@ -51,7 +49,7 @@
/**
* 鍒嗛〉鏌ヨ
* @param page 鍒嗛〉瀵硅薄
- * @param contract 鍚堝悓绠＄悊
+ * @param queryDTO 鍚堝悓绠＄悊
* @return
*/
@Operation(summary = "鍒嗛〉鏌ヨ" , description = "鍒嗛〉鏌ヨ" )
@@ -79,7 +77,19 @@
return R.ok(contractService.detail(id));
}
- /**
+ /**
+ * 閫氳繃id鎵嬪姩鎺ㄩ�佸悎鍚屼腑蹇�
+ * @param id id
+ * @return R
+ */
+ @Operation(summary = "閫氳繃id鎵嬪姩鎺ㄩ�佸悎鍚屼腑蹇�" , description = "閫氳繃id鎵嬪姩鎺ㄩ�佸悎鍚屼腑蹇�" )
+ @GetMapping("/pushCenter/{id}" )
+ public R pushCenter(@PathVariable("id" ) Long id) {
+ return contractService.pushCenter(id);
+ }
+
+
+ /**
* 鏂板鍚堝悓绠＄悊
* @param addDTO 鍚堝悓绠＄悊
* @return R
@@ -91,6 +101,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);
+ }
/**
* 淇敼鍚堝悓绠＄悊
@@ -131,6 +153,16 @@
public List<Contract> export(Contract contract,Long[] ids) {
return contractService.list(Wrappers.lambdaQuery(contract).in(ArrayUtil.isNotEmpty(ids), Contract::getId, ids));
}
+
+ /**
+ * list 涓嬫媺
+ */
+ @GetMapping("/list")
+ 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())
+ .orderByDesc(Contract::getCreateTime)));
+ }
/**
* 鍚姩瀹℃牳娴佺▼
@@ -184,7 +216,9 @@
@GetMapping("/listByBusId/{busId}" )
public R listByBusId(@PathVariable("busId" ) Long busId) {
return R.ok(contractService.listByScope(Wrappers.<Contract>lambdaQuery().eq(Contract::getPartyAId,busId)
- .gt(Contract::getBillingAmout,new BigDecimal("0"))));
+ .eq(Contract::getPartyBId,SecurityUtils.getUser().getCompId())
+ .gt(Contract::getBillingAmout,new BigDecimal("0"))
+ .apply("paid_amount < billing_amout")));
}
/**
@@ -232,6 +266,41 @@
}
/**
+ * 鏍规嵁妯＄増鐢熸垚word閫氭柟鍏徃宸ヤ笟鍝佷拱鍗栧悎鍚�
+ * @param id id
+ * @return R
+ */
+ @Operation(summary = "鏍规嵁妯＄増鐢熸垚word鍚堝悓" , description = "鏍规嵁妯＄増鐢熸垚word鍚堝悓" )
+ @GetMapping("/exportContractTFGSGYPMMWord/{id}" )
+ public void exportContractTFGSGYPMMWord(@PathVariable("id" ) Long id, HttpServletResponse response) {
+ contractService.exportContractTFGSGYPMMWord(id,response);
+ }
+
+ /**
+ * 鏍规嵁妯＄増鐢熸垚word鐭崇叅鏈哄伐涓氬搧涔板崠鍚堝悓
+ * @param id id
+ * @return R
+ */
+ @Operation(summary = "鏍规嵁妯＄増鐢熸垚word鍚堝悓" , description = "鏍规嵁妯＄増鐢熸垚word鍚堝悓" )
+ @GetMapping("/exportContractSMJGYPMMWord/{id}" )
+ public void exportContractSMJGYPMMWord(@PathVariable("id" ) Long id, HttpServletResponse response) {
+ contractService.exportContractSMJGYPMMWord(id,response);
+ }
+
+ /**
+ * 鏍规嵁妯＄増鐢熸垚word鏈烘鍘傞攢鍞悎鍚�
+ * @param id id
+ * @return R
+ */
+ @Operation(summary = "鏍规嵁妯＄増鐢熸垚word鏈烘鍘傞攢鍞悎鍚�" , description = "鏍规嵁妯＄増鐢熸垚word鏈烘鍘傞攢鍞悎鍚�" )
+ @GetMapping("/exportContractJXCXSWord/{id}" )
+ public void exportContractJXCXSWord(@PathVariable("id" ) Long id, HttpServletResponse response) {
+ contractService.exportContractJXCXSWord(id,response);
+ }
+
+
+
+ /**
* 寤舵湡鍑鸿揣瀹℃壒
*/
@@ -240,4 +309,65 @@
return contractService.delayOutApproval(dto);
}
+ /**
+ * 鏂板鍚堝悓-鐭冲伐娉�
+ * @return R
+ */
+ @Operation(summary = "鏂板鍚堝悓-鐭冲伐娉�" , description = "鏂板鍚堝悓-鐭冲伐娉�" )
+ @PostMapping("/addContractSgb")
+ @SysLog("鏂板鍚堝悓-鐭冲伐娉�" )
+ public R addContractSgb(@RequestBody ContractAddDTO addDTO) {
+ return contractService.addContractSgb(addDTO);
+ }
+
+ /**
+ * 淇敼鍚堝悓-鐭冲伐娉�
+ * @return R
+ */
+ @Operation(summary = "淇敼鍚堝悓-鐭冲伐娉�" , description = "淇敼鍚堝悓-鐭冲伐娉�" )
+ @PostMapping("/updateContractSgb")
+ @SysLog("淇敼鍚堝悓-鐭冲伐娉�" )
+ public R updateContractSgb(@RequestBody ContractUpdateDTO updateDTO) {
+ return contractService.updateContractSgb(updateDTO);
+ }
+
+ /**
+ * 缁堟鍚堝悓-鐭冲伐娉�
+ * @return R
+ */
+ @Operation(summary = "缁堟鍚堝悓-鐭冲伐娉�" , description = "缁堟鍚堝悓-鐭冲伐娉�" )
+ @GetMapping("/abortContractSgb/{dataId}")
+ @SysLog("缁堟鍚堝悓-鐭冲伐娉�" )
+ public R abortContractSgb(@PathVariable String dataId) {
+ return contractService.abortContractSgb(dataId);
+ }
+
+ /**
+ * 鍒犻櫎鍚堝悓-鐭冲伐娉�
+ * @return R
+ */
+ @Operation(summary = "鍒犻櫎鍚堝悓-鐭冲伐娉�" , description = "鍒犻櫎鍚堝悓-鐭冲伐娉�" )
+ @PostMapping("/delContractSgb/{dataId}")
+ @SysLog("鍒犻櫎鍚堝悓-鐭冲伐娉�" )
+ public R delContractSgb(@PathVariable String dataId) {
+ return contractService.delContractSgb(dataId);
+ }
+
+ /**
+ * 鍥涘叧鑱旀煡璇�
+ * @return R
+ */
+ @Operation(summary = "鍥涘叧鑱旀煡璇�" , description = "鍥涘叧鑱旀煡璇�" )
+ @GetMapping("/fourAssociation")
+ 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);
+ }
}
\ No newline at end of file
--
Gitblit v1.9.1