From a422a984cfa2a5a2bbe89c6fa6947363e559bb4f Mon Sep 17 00:00:00 2001
From: shiyunteng <shiyunteng@example.com>
Date: 星期五, 22 五月 2026 09:29:14 +0800
Subject: [PATCH] feat:faet:出库加批次号，合同履约加销方购方履约，到货单据必填校验，验收单据必填校验，单位新增法人、委托代理人字段 、合同出库新增erp出库ID
---
platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/controller/ContractController.java | 85 ++++++++++++++++++++++++++++++++++++++----
1 files changed, 77 insertions(+), 8 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 ecef49e..1608d7e 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
@@ -2,13 +2,21 @@
import cn.hutool.core.util.ArrayUtil;
import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.util.ObjUtil;
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.entity.Contract;
import com.by4cloud.platformx.common.core.util.R;
+import com.by4cloud.platformx.common.data.mybatis.BaseModel;
import com.by4cloud.platformx.common.log.annotation.SysLog;
import com.by4cloud.platformx.business.service.ContractService;
+import com.by4cloud.platformx.common.security.annotation.Inner;
+import com.by4cloud.platformx.common.security.util.SecurityUtils;
+import jakarta.servlet.http.HttpServletResponse;
+import org.apache.commons.lang3.StringUtils;
import org.springframework.security.access.prepost.PreAuthorize;
import com.by4cloud.platformx.common.excel.annotation.ResponseExcel;
import io.swagger.v3.oas.annotations.security.SecurityRequirement;
@@ -19,6 +27,7 @@
import lombok.RequiredArgsConstructor;
import org.springframework.web.bind.annotation.*;
+import java.math.BigDecimal;
import java.util.List;
import java.util.Objects;
@@ -48,7 +57,11 @@
@PreAuthorize("@pms.hasPermission('business_contract_view')" )
public R getContractPage(@ParameterObject Page page, @ParameterObject Contract contract) {
LambdaQueryWrapper<Contract> wrapper = Wrappers.lambdaQuery();
- return R.ok(contractService.page(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(BaseModel::getCreateTime);
+ return R.ok(contractService.pageByScope(page, wrapper));
}
@@ -61,33 +74,33 @@
@GetMapping("/{id}" )
@PreAuthorize("@pms.hasPermission('business_contract_view')" )
public R getById(@PathVariable("id" ) Long id) {
- return R.ok(contractService.getById(id));
+ return R.ok(contractService.detail(id));
}
/**
* 鏂板鍚堝悓绠＄悊
- * @param contract 鍚堝悓绠＄悊
+ * @param addDTO 鍚堝悓绠＄悊
* @return R
*/
@Operation(summary = "鏂板鍚堝悓绠＄悊" , description = "鏂板鍚堝悓绠＄悊" )
@SysLog("鏂板鍚堝悓绠＄悊" )
@PostMapping
@PreAuthorize("@pms.hasPermission('business_contract_add')" )
- public R save(@RequestBody Contract contract) {
- return R.ok(contractService.save(contract));
+ public R save(@RequestBody ContractAddDTO addDTO) {
+ return contractService.add(addDTO);
}
/**
* 淇敼鍚堝悓绠＄悊
- * @param contract 鍚堝悓绠＄悊
+ * @param updateDTO 鍚堝悓绠＄悊
* @return R
*/
@Operation(summary = "淇敼鍚堝悓绠＄悊" , description = "淇敼鍚堝悓绠＄悊" )
@SysLog("淇敼鍚堝悓绠＄悊" )
@PutMapping
@PreAuthorize("@pms.hasPermission('business_contract_edit')" )
- public R updateById(@RequestBody Contract contract) {
- return R.ok(contractService.updateById(contract));
+ public R updateById(@RequestBody ContractUpdateDTO updateDTO) {
+ return contractService.edit(updateDTO);
}
/**
@@ -116,4 +129,60 @@
public List<Contract> export(Contract contract,Long[] ids) {
return contractService.list(Wrappers.lambdaQuery(contract).in(ArrayUtil.isNotEmpty(ids), Contract::getId, ids));
}
+
+ /**
+ * 鍚姩瀹℃牳娴佺▼
+ * @param id id
+ * @return R
+ */
+ @Operation(summary = "閫氳繃id鍚姩瀹℃牳娴佺▼" , description = "閫氳繃id鍚堝悓鐢熸晥" )
+ @GetMapping("/startApproval/{id}" )
+ public R startApproval(@PathVariable("id" ) Long id) {
+ return contractService.startApproval(id);
+ }
+
+
+ /**
+ * 瀹氭椂鐢熸垚搴旀敹娆捐处鐩�
+ * @return R
+ */
+ @GetMapping("/genCurrentOverdue" )
+ @Inner(value = false)
+ public R genCurrentOverdue() {
+ return contractService.genCurrentOverdue();
+ }
+
+ /**
+ * 鐢熸垚鏂板悎鍚�
+ * @param id id
+ * @return R
+ */
+ @Operation(summary = "閫氳繃id鐢熸垚鏂板悎鍚�" , description = "閫氳繃id鐢熸垚鏂板悎鍚�" )
+ @GetMapping("/copyNewContract/{id}" )
+ public R copyNewContract(@PathVariable("id" ) Long id) {
+ return contractService.copyNewContract(id);
+ }
+
+ /**
+ * 鏍规嵁瀹㈠晢鏌ヨ鍚堝悓
+ * @param busId id
+ * @return R
+ */
+ @Operation(summary = "鏍规嵁瀹㈠晢鏌ヨ鍚堝悓" , description = "鏍规嵁瀹㈠晢鏌ヨ鍚堝悓" )
+ @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"))));
+ }
+
+ /**
+ * 鏍规嵁妯＄増鐢熸垚word涓�鐓ゆ満鍔犲伐鎵挎徑鍚堝悓
+ * @param id id
+ * @return R
+ */
+ @Operation(summary = "鏍规嵁妯＄増鐢熸垚word鍚堝悓" , description = "鏍规嵁妯＄増鐢熸垚word鍚堝悓" )
+ @GetMapping("/exportContractYMJJGCLWord/{id}" )
+ public void exportContractYMJJGCLWord(@PathVariable("id" ) Long id, HttpServletResponse response) {
+ contractService.exportContractYMJJGCLWord(id,response);
+ }
}
\ No newline at end of file
--
Gitblit v1.9.1