feat:合同新增关联单位 开票可根据甲方或关联单位选择开票单位 收款去掉强制确认 收款只关联合同甲方或关联单位

shiyunteng

昨天 6bbed1ea6b36af4eb0b234bec9d6e42d56f0cd00

 platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/controller/ContractController.java

@@ -8,6 +8,7 @@
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.common.core.util.R;
import com.by4cloud.platformx.common.data.mybatis.BaseModel;
import com.by4cloud.platformx.common.log.annotation.SysLog;
@@ -78,14 +79,14 @@
    }

   /**
    * 通过id手动推送合同中心
    * @param id id
    * 手动推送合同中心
    * @param dto
    * @return R
    */
   @Operation(summary = "通过id手动推送合同中心" , description = "通过id手动推送合同中心" )
   @GetMapping("/pushCenter/{id}" )
   public R pushCenter(@PathVariable("id" ) Long id) {
      return contractService.pushCenter(id);
   @Operation(summary = "手动推送合同中心" , description = "手动推送合同中心" )
   @PostMapping("/pushCenter" )
   public R pushCenter(@RequestBody PushCenterDTO dto) {
      return contractService.pushCenter(dto);
   }


@@ -161,6 +162,17 @@
   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)));
   }

@@ -358,7 +370,7 @@
    * @return R
    */
   @Operation(summary = "删除合同-石工泵" , description = "删除合同-石工泵" )
   @PostMapping("/delContractSgb/{dataId}")
   @GetMapping("/delContractSgb/{dataId}")
   @SysLog("删除合同-石工泵" )
   public R delContractSgb(@PathVariable String dataId) {
      return contractService.delContractSgb(dataId);
@@ -436,6 +448,26 @@
      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);
   }

   /**
    * 新增合同-石工泵