[fix] 优化预算管理功能

yudao-module-cms/yudao-module-cms-api/src/main/java/cn/iocoder/yudao/module/cms/api/contract/ContractApi.java

@@ -0,0 +1,11 @@
+package cn.iocoder.yudao.module.cms.api.contract;
+
+
+import cn.iocoder.yudao.module.cms.api.contract.dto.ContractDTO;
+
+public interface ContractApi {
+
+    ContractDTO getContractDTO(Long ContractId);
+
+    void validContractExists(Long Id);
+}

yudao-module-cms/yudao-module-cms-api/src/main/java/cn/iocoder/yudao/module/cms/api/contract/dto/ContractDTO.java

@@ -0,0 +1,19 @@
+package cn.iocoder.yudao.module.cms.api.contract.dto;
+
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+@Data
+public class ContractDTO {
+
+    /**
+     * 暂定结算数
+     */
+    private BigDecimal provisionalSettlement;
+
+    /**
+     * 包干审定金额
+     */
+    private BigDecimal approvedAmount;
+}

yudao-module-cms/yudao-module-cms-api/src/main/java/cn/iocoder/yudao/module/cms/api/outscontract/OutsContractApi.java

@@ -0,0 +1,9 @@
+package cn.iocoder.yudao.module.cms.api.outscontract;
+
+import java.math.BigDecimal;
+
+public interface OutsContractApi {
+
+    BigDecimal getOutsContractAmount(Long contractId);
+    
+}

yudao-module-cms/yudao-module-cms-api/src/main/java/cn/iocoder/yudao/module/cms/api/outscontract/dto/OutsContractDTO.java

@@ -0,0 +1,14 @@
+package cn.iocoder.yudao.module.cms.api.outscontract.dto;
+
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+@Data
+public class OutsContractDTO {
+
+    /**
+     * 外包合同金额
+     */
+    private BigDecimal amount;
+}

yudao-module-cms/yudao-module-cms-biz/src/main/java/cn/iocoder/yudao/module/cms/api/contract/ContractImpl.java

@@ -0,0 +1,28 @@
+package cn.iocoder.yudao.module.cms.api.contract;
+
+import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
+import cn.iocoder.yudao.module.cms.api.contract.dto.ContractDTO;
+import cn.iocoder.yudao.module.cms.dal.dataobject.contract.ContractDetailDO;
+import cn.iocoder.yudao.module.cms.service.contract.ContractService;
+import jakarta.annotation.Resource;
+import org.springframework.stereotype.Service;
+import org.springframework.validation.annotation.Validated;
+
+@Service
+@Validated
+public class ContractImpl implements ContractApi{
+
+    @Resource
+    private ContractService contractService;
+
+    @Override
+    public ContractDTO getContractDTO(Long ContractId) {
+        ContractDetailDO contractDetail = contractService.getContractDetail(ContractId);
+        return BeanUtils.toBean(contractDetail, ContractDTO.class);
+    }
+
+    @Override
+    public void validContractExists(Long Id) {
+        contractService.validateContractExists(Id);
+    }
+}

yudao-module-cms/yudao-module-cms-biz/src/main/java/cn/iocoder/yudao/module/cms/api/outscontract/OutsContractImpl.java

@@ -0,0 +1,30 @@
+package cn.iocoder.yudao.module.cms.api.outscontract;
+
+import cn.iocoder.yudao.module.cms.dal.dataobject.outscontract.OutsContractDO;
+import cn.iocoder.yudao.module.cms.dal.mysql.outscontract.OutsContractMapper;
+import cn.iocoder.yudao.module.cms.service.outscontract.OutsContractService;
+import jakarta.annotation.Resource;
+import org.springframework.stereotype.Service;
+import org.springframework.validation.annotation.Validated;
+
+import java.math.BigDecimal;
+import java.util.List;
+
+@Service
+@Validated
+public class OutsContractImpl implements OutsContractApi{
+
+    @Resource
+    private OutsContractMapper outsContractMapper;
+
+    @Override
+    public BigDecimal getOutsContractAmount(Long contractId) {
+
+        List<OutsContractDO> outsContractDOList = outsContractMapper.selectList("contract_id", contractId);
+        BigDecimal res = BigDecimal.ZERO;
+        for (OutsContractDO outsContractDO : outsContractDOList) {
+            res = res.add(outsContractDO.getOutsAmount());
+        }
+        return res;
+    }
+}

yudao-module-cms/yudao-module-cms-biz/src/main/java/cn/iocoder/yudao/module/cms/dal/dataobject/outscontract/OutsContractDO.java

@@ -61,11 +61,11 @@ public class OutsContractDO extends BaseDO {
     /**
      * 外包合同金额
      */
-    private BigDecimal amount;
+    private BigDecimal outsAmount;
     /**
      * 外包合同编号
      */
-    private Integer code;
+    private Integer outsCode;
     /**
      * 最终外包金额
      */

yudao-module-cms/yudao-module-cms-biz/src/main/java/cn/iocoder/yudao/module/cms/dal/mysql/outscontract/OutsContractMapper.java

@@ -20,8 +20,8 @@ public interface OutsContractMapper extends BaseMapperX<OutsContractDO> {
                 .eqIfPresent(OutsContractDO::getProjectId, reqVO.getProjectId())
                 .eqIfPresent(OutsContractDO::getContractId, reqVO.getContractId())
                 .eqIfPresent(OutsContractDO::getCountType, reqVO.getCountType())
-                .eqIfPresent(OutsContractDO::getAmount, reqVO.getAmount())
-                .eqIfPresent(OutsContractDO::getCode, reqVO.getCode())
+                .eqIfPresent(OutsContractDO::getOutsAmount, reqVO.getAmount())
+                .eqIfPresent(OutsContractDO::getOutsCode, reqVO.getCode())
                 .eqIfPresent(OutsContractDO::getMajor, reqVO.getMajor())
                 .betweenIfPresent(OutsContractDO::getSigningTime, reqVO.getSigningTime())
                 .eqIfPresent(OutsContractDO::getContractFileUrl, reqVO.getContractFileUrl())