计划相关Feign接口

zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/api/OrderApiImpl.java

@@ -81,7 +81,7 @@ public class OrderApiImpl implements OrderApi {
             if ("SALE".equals(f.getSplyBsnTp())) {
                 // 销售订单
                 salesOrdNoS.add(f.getId());
-            } else {
+            } else if ("PUR".equals(f.getSplyBsnTp())) {
                 // 非销售订单（采购订单）
                 purchaseOrderNoS.add(f.getId());
             }

zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/controller/admin/contract/ContractController.java

@@ -14,6 +14,7 @@ import com.zt.plat.module.contractorder.api.vo.contract.international.IntPushCon
 import com.zt.plat.module.contractorder.dal.dataobject.contract.ContractMainDO;
 import com.zt.plat.module.contractorder.service.contract.ContractService;
 import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.media.Schema;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import jakarta.annotation.Resource;
 import jakarta.validation.Valid;
@@ -223,4 +224,22 @@ public class ContractController implements BusinessControllerMarker {
     ) {
         return success(contractService.transactionInfoByPaperNumber(contractPaperNumber));
     }
+
+    @PostMapping("/relationContract")
+    @Operation(summary = "关联合同-新")
+    // @PreAuthorize("@ss.hasAnyPermissions({'base:contract:get','purchaseContract:detail'})")
+    public CommonResult<Boolean> relationContract(@RequestBody RelationContractVO reqVo) {
+        contractService.relationContract(reqVo);
+        return success(true);
+    }
+
+
+    @GetMapping("/page-no-permission")
+    @Operation(summary = "获得合同分页列表-没有权限")
+    @PreAuthorize("@ss.hasAnyPermissions({'base:contract:get','purchaseContract:detail'})")
+    public CommonResult<PageResult<ContractRespVO>> getPageNoPermission(@Valid ContractPageReqVO pageReqVO) {
+        PageResult<ContractMainDO> pageResult = contractService.getPageNoPermission(pageReqVO);
+        return success(BeanUtils.toBean(pageResult, ContractRespVO.class));
+    }
+
 }

zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/dal/dataobject/contract/ContractMainDO.java

@@ -455,4 +455,10 @@ public class ContractMainDO extends BusinessBaseDO {
      */
     @TableField("HS_CRDT")
     private String hasCredit;
+
+    /**
+     * 关联合同ID
+     */
+    @TableField(value = "REL_CTRT_ID")
+    private Long relatedContractId;
 }

zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/dal/mysql/contract/ContractMainMapper.java

@@ -1,6 +1,9 @@
 package com.zt.plat.module.contractorder.dal.mysql.contract;
 
 import com.zt.plat.framework.common.pojo.PageResult;
+import com.zt.plat.framework.datapermission.core.annotation.CompanyDataPermissionIgnore;
+import com.zt.plat.framework.datapermission.core.annotation.DataPermission;
+import com.zt.plat.framework.datapermission.core.annotation.DeptDataPermissionIgnore;
 import com.zt.plat.framework.mybatis.core.mapper.BaseMapperX;
 import com.zt.plat.framework.mybatis.core.query.LambdaQueryWrapperX;
 import com.zt.plat.module.contractorder.api.vo.contract.ContractPageReqVO;
@@ -27,4 +30,23 @@ public interface ContractMainMapper extends BaseMapperX<ContractMainDO> {
                 .eqIfPresent(ContractMainDO::getBusinessType, reqVO.getBusinessType())
                 .orderByDesc(ContractMainDO::getCreateTime));
     }
+
+    @CompanyDataPermissionIgnore
+    @DeptDataPermissionIgnore
+    default PageResult<ContractMainDO> selectContractPageNoPermission(ContractPageReqVO reqVO) {
+        return selectPage(reqVO, new LambdaQueryWrapperX<ContractMainDO>()
+                .eq(ContractMainDO::getId, reqVO.getId())
+                .likeIfPresent(ContractMainDO::getContractName, reqVO.getContractName())
+                .likeIfPresent(ContractMainDO::getContractPaperNumber, reqVO.getContractPaperNumber())
+                .eqIfPresent(ContractMainDO::getDirection, reqVO.getDirection())
+                .betweenIfPresent(ContractMainDO::getSignDate, reqVO.getSignDate())
+                .likeIfPresent(ContractMainDO::getPurchaseCompanyName, reqVO.getPurchaseCompanyName())
+                .likeIfPresent(ContractMainDO::getSalesCompanyName, reqVO.getSalesCompanyName())
+                .eqIfPresent(ContractMainDO::getBasicAmount, reqVO.getBasicAmount())
+                .eqIfPresent(ContractMainDO::getStatus, reqVO.getStatus())
+                .eqIfPresent(ContractMainDO::getBusinessType, reqVO.getBusinessType())
+                .eqIfPresent(ContractMainDO::getErpSalesCompanyNumber, reqVO.getErpSalesCompanyNumber())
+                .eqIfPresent(ContractMainDO::getErpPurchaseCompanyNumber, reqVO.getErpPurchaseCompanyNumber())
+                .orderByDesc(ContractMainDO::getCreateTime));
+    }
 }

zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/service/contract/ContractService.java

@@ -26,6 +26,14 @@ public interface ContractService {
      * @return 分页列表
      */
     PageResult<ContractMainDO> getContractPage(@Valid ContractPageReqVO pageReqVO);
+    /**
+     * 获得合同分页列表--无权限
+     *
+     * @param pageReqVO 分页条件
+     * @return 分页列表
+     */
+    PageResult<ContractMainDO> getPageNoPermission(@Valid ContractPageReqVO pageReqVO);
+
 
     /**
      * 新增合同
@@ -247,4 +255,10 @@ public interface ContractService {
      * @return 交易信息
      */
     TransactionInfoRespVO transactionInfoByPaperNumber(String contractPaperNumber);
+    /**
+     * 关联合同
+     *
+     * @param relationContractVO 关联合同信息
+     */
+    void relationContract(RelationContractVO relationContractVO);
 }