From 6bbed1ea6b36af4eb0b234bec9d6e42d56f0cd00 Mon Sep 17 00:00:00 2001
From: shiyunteng <shiyunteng@example.com>
Date: 星期三, 30 九月 2026 16:12:49 +0800
Subject: [PATCH] feat:合同新增关联单位 开票可根据甲方或关联单位选择开票单位 收款去掉强制确认 收款只关联合同甲方或关联单位
---
platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/controller/ContractController.java | 306 +++++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 295 insertions(+), 11 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 ef61fb2..0adc9b3 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,9 +6,9 @@
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.ContractAddDTO;
-import com.by4cloud.platformx.business.dto.ContractUpdateDTO;
+import com.by4cloud.platformx.business.dto.*;
import com.by4cloud.platformx.business.entity.Contract;
+import com.by4cloud.platformx.business.entity.PaymentConfirm;
import com.by4cloud.platformx.common.core.util.R;
import com.by4cloud.platformx.common.data.mybatis.BaseModel;
import com.by4cloud.platformx.common.log.annotation.SysLog;
@@ -26,6 +26,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;
@@ -49,19 +50,19 @@
/**
* 鍒嗛〉鏌ヨ
* @param page 鍒嗛〉瀵硅薄
- * @param contract 鍚堝悓绠＄悊
+ * @param queryDTO 鍚堝悓绠＄悊
* @return
*/
@Operation(summary = "鍒嗛〉鏌ヨ" , description = "鍒嗛〉鏌ヨ" )
@GetMapping("/page" )
@PreAuthorize("@pms.hasPermission('business_contract_view')" )
- public R getContractPage(@ParameterObject Page page, @ParameterObject Contract contract) {
+ public R getContractPage(@ParameterObject Page page, @ParameterObject ContracQueryDTO queryDTO) {
LambdaQueryWrapper<Contract> wrapper = Wrappers.lambdaQuery();
- wrapper.like(StringUtils.isNotBlank(contract.getContractName()),Contract::getContractName,contract.getContractName());
- wrapper.like(StringUtils.isNotBlank(contract.getPartyA()),Contract::getPartyA,contract.getPartyA());
- wrapper.eq(ObjUtil.isNotNull(contract.getContractStatus()),Contract::getContractStatus,contract.getContractStatus());
- wrapper.orderByDesc(BaseModel::getCreateTime);
- return R.ok(contractService.pageByScope(page, wrapper));
+// wrapper.like(StringUtils.isNotBlank(contract.getContractName()),Contract::getContractName,contract.getContractName());
+// wrapper.like(StringUtils.isNotBlank(contract.getPartyA()),Contract::getPartyA,contract.getPartyA());
+// wrapper.eq(ObjUtil.isNotNull(contract.getContractStatus()),Contract::getContractStatus,contract.getContractStatus());
+// wrapper.orderByDesc(Contract::getCreateTime);
+ return R.ok(contractService.pageScope(page, queryDTO));
}
@@ -77,7 +78,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
@@ -89,6 +102,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);
+ }
/**
* 淇敼鍚堝悓绠＄悊
@@ -129,6 +154,27 @@
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)));
+ }
+
+ @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)));
+ }
/**
* 鍚姩瀹℃牳娴佺▼
@@ -182,7 +228,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")));
}
/**
@@ -195,4 +243,240 @@
public void exportContractYMJJGCLWord(@PathVariable("id" ) Long id, HttpServletResponse response) {
contractService.exportContractYMJJGCLWord(id,response);
}
+
+ /**
+ * 鏍规嵁妯＄増鐢熸垚word涓�鐓ゆ満宸ヤ笟鍝佷拱鍗栧悎鍚�
+ * @param id id
+ * @return R
+ */
+ @Operation(summary = "鏍规嵁妯＄増鐢熸垚word鍚堝悓" , description = "鏍规嵁妯＄増鐢熸垚word鍚堝悓" )
+ @GetMapping("/exportContractYMJGYPMMWord/{id}" )
+ public void exportContractYMJGYPMMWord(@PathVariable("id" ) Long id, HttpServletResponse response) {
+ contractService.exportContractYMJGYPMMWord(id,response);
+ }
+
+ /**
+ * 鏍规嵁妯＄増鐢熸垚word涓�鐓ゆ満宸ョ熆浜у搧涔板崠鍚堝悓
+ * @param id id
+ * @return R
+ */
+ @Operation(summary = "鏍规嵁妯＄増鐢熸垚word鍚堝悓" , description = "鏍规嵁妯＄増鐢熸垚word鍚堝悓" )
+ @GetMapping("/exportContractYMJGKCPMMWord/{id}" )
+ public void exportContractYMJGKCPMMWord(@PathVariable("id" ) Long id, HttpServletResponse response) {
+ contractService.exportContractYMJGKCPMMWord(id,response);
+ }
+
+ /**
+ * 鏍规嵁妯＄増鐢熸垚word涓�鐓ゆ満閲囪喘鍚堝悓
+ * @param id id
+ * @return R
+ */
+ @Operation(summary = "鏍规嵁妯＄増鐢熸垚word鍚堝悓" , description = "鏍规嵁妯＄増鐢熸垚word鍚堝悓" )
+ @GetMapping("/exportContractYMJCGWord/{id}" )
+ public void exportContractYMJCGWord(@PathVariable("id" ) Long id, HttpServletResponse response) {
+ contractService.exportContractYMJCGWord(id,response);
+ }
+
+ /**
+ * 鏍规嵁妯＄増鐢熸垚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);
+ }
+
+
+
+ /**
+ * 寤舵湡鍑鸿揣瀹℃壒
+ */
+
+ @PostMapping("/delayOutApproval")
+ public R delayOutApproval(@RequestBody DelayOutApprovalDTO dto) {
+ return contractService.delayOutApproval(dto);
+ }
+
+ /**
+ * 鏂板鍚堝悓-鐭冲伐娉�
+ * @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("/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 = "鍒犻櫎鍚堝悓-鐭冲伐娉�" )
+ @GetMapping("/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);
+ }
+
+ /**
+ * 鍚堝悓鏍囩殑鐗╁彉鏇�
+ * @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);
+ }
}
\ No newline at end of file
--
Gitblit v1.9.1