1.分割债权和机器设备的业务接口

2.新增生成债权报告所需要的前置信息的接口

biz-base/src/main/java/com/dayou/controller/AssetsCalculateController.java

@@ -6,6 +6,7 @@ import com.dayou.dto.calculate.CalculateBaseInfoDTO;
 import com.dayou.result.Result;
 import com.dayou.result.Status;
 import com.dayou.vo.AssetsCalculateVO;
+import com.dayou.vo.CRReportReferencesCalculateVO;
 import com.dayou.vo.EqptReportReferencesCalculateVO;
 import com.dayou.vo.calculate.AssetsCalculateProgressVO;
 import com.fasterxml.jackson.core.JsonProcessingException;
@@ -161,9 +162,19 @@ public class AssetsCalculateController {
      * @param calculateId 测算表id
      * @return EqptReportReferencesCalculateVO
      */
-    @GetMapping("/getReferencesInfoById/{calculateId}")
-    public Result<EqptReportReferencesCalculateVO> getReferencesInfoById(@PathVariable Long calculateId) {
-       return Result.build(assetsCalculateService.getReferencesInfoById(calculateId));
+    @GetMapping("/eqpt/getReferencesInfoById/{calculateId}")
+    public Result<EqptReportReferencesCalculateVO> getEqptReferencesInfoById(@PathVariable Long calculateId) {
+       return Result.build(assetsCalculateService.getEqptReferencesInfoById(calculateId));
+    }
+
+    /**
+     * 根据测算表id获取生成债权分析报告引用的测算表信息
+     * @param calculateId 测算表id
+     * @return EqptReportReferencesCalculateVO
+     */
+    @GetMapping("/cr/getReferencesInfoById/{calculateId}")
+    public Result<CRReportReferencesCalculateVO> getCRReferencesInfoById (@PathVariable Long calculateId) {
+        return Result.build(assetsCalculateService.getCRReferencesInfoById(calculateId));
     }
 
 

dao/src/main/java/com/dayou/mapper/AssetsCalculateMapper.java

@@ -4,6 +4,7 @@ import com.dayou.common.DropDownBoxData;
 import com.dayou.entity.AssetsCalculate;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.dayou.vo.AssetsCalculateVO;
+import com.dayou.vo.CRReportReferencesCalculateVO;
 import com.dayou.vo.EqptReportReferencesCalculateVO;
 import com.dayou.vo.calculate.AssetsCalculateProgressVO;
 import org.apache.ibatis.annotations.Param;
@@ -77,6 +78,13 @@ public interface AssetsCalculateMapper extends BaseMapper<AssetsCalculate> {
      * @param calculateId 测算表id
      * @return EqptReportReferencesCalculateVO
      */
-    EqptReportReferencesCalculateVO getReferencesInfoById(@Param("calculateId") Long calculateId);
+    EqptReportReferencesCalculateVO getEqptReferencesInfoById(@Param("calculateId") Long calculateId);
+
+    /**
+     * 根据测算表id获取生成债权分析报告引用的测算表信息
+     * @param calculateId 测算表id
+     * @return EqptReportReferencesCalculateVO
+     */
+    CRReportReferencesCalculateVO getCRReferencesInfoById(@Param("calculateId") Long calculateId);
 
 }

dao/src/main/resources/mapper/AssetsCalculateMapper.xml

@@ -99,7 +99,7 @@
     </select>
 
     <!--根据测算表id获取生成机器设备融资项目报告引用的测算表信息-->
-    <select id="getReferencesInfoById" resultType="com.dayou.vo.EqptReportReferencesCalculateVO">
+    <select id="getEqptReferencesInfoById" resultType="com.dayou.vo.EqptReportReferencesCalculateVO">
         SELECT valuation_basis_date,
                (SELECT COUNT(id) FROM assets_calculate_eqpt_data WHERE assets_calculate_id = #{calculateId} AND delete_status = 0) AS assetCount,
                (SELECT GROUP_CONCAT( equipment.equipment_name SEPARATOR '、' ) AS concatenated_string
@@ -110,7 +110,15 @@
         LEFT JOIN assets_calculate_eqpt_data AS data ON calculate.id = data.assets_calculate_id AND data.delete_status = 0
         WHERE calculate.id = #{calculateId}
         AND calculate.delete_status = 0
+    </select>
 
+    <!--根据测算表id获取生成债权分析报告引用的测算表信息-->
+    <select id="getCRReferencesInfoById" resultType="com.dayou.vo.CRReportReferencesCalculateVO">
+        SELECT valuation_basis_date
+        FROM assets_calculate AS calculate
+                 LEFT JOIN assets_calculate_eqpt_data AS data ON calculate.id = data.assets_calculate_id AND data.delete_status = 0
+        WHERE calculate.id = #{calculateId}
+          AND calculate.delete_status = 0
     </select>
 
 

domain/src/main/java/com/dayou/bo/CRReportFillBO.java

@@ -0,0 +1,10 @@
+package com.dayou.bo;
+
+import lombok.Data;
+
+@Data
+public class CRReportFillBO {
+
+
+
+}

domain/src/main/java/com/dayou/vo/CRReportReferencesCalculateVO.java

@@ -0,0 +1,15 @@
+package com.dayou.vo;
+
+import lombok.Data;
+
+import java.time.LocalDate;
+
+@Data
+public class CRReportReferencesCalculateVO {
+
+    /**
+     * 评估基准日
+     */
+    private LocalDate valuationBasisDate;
+
+}

service/src/main/java/com/dayou/service/AssetsCalculateService.java

@@ -4,6 +4,7 @@ import com.dayou.entity.AssetsCalculate;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.dayou.vo.AssetsCalculateVO;
+import com.dayou.vo.CRReportReferencesCalculateVO;
 import com.dayou.vo.EqptReportReferencesCalculateVO;
 import com.dayou.vo.calculate.AssetsCalculateProgressVO;
 import com.fasterxml.jackson.core.JsonProcessingException;
@@ -98,7 +99,14 @@ public interface AssetsCalculateService extends IService<AssetsCalculate> {
          * @param calculateId 测算表id
          * @return EqptReportReferencesCalculateVO
          */
-        EqptReportReferencesCalculateVO getReferencesInfoById(Long calculateId);
+        EqptReportReferencesCalculateVO getEqptReferencesInfoById(Long calculateId);
+
+        /**
+         * 根据测算表id获取生成债权分析报告引用的测算表信息
+         * @param calculateId 测算表id
+         * @return EqptReportReferencesCalculateVO
+         */
+        CRReportReferencesCalculateVO getCRReferencesInfoById(Long calculateId);
 
         /**
          * 获取新增DocumentProduction所需的测算信息

service/src/main/java/com/dayou/service/impl/AssetsCalculateServiceImpl.java

@@ -21,10 +21,7 @@ import com.dayou.service.AssetsCalculateService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.dayou.service.DocumentProductionService;
 import com.dayou.utils.EasyExcelUtil;
-import com.dayou.vo.AssetsCalculateEqptImpDataVO;
-import com.dayou.vo.AssetsCalculateEqptNonsDataVO;
-import com.dayou.vo.AssetsCalculateVO;
-import com.dayou.vo.EqptReportReferencesCalculateVO;
+import com.dayou.vo.*;
 import com.dayou.vo.calculate.AssetsCalculateProgressVO;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import org.apache.poi.ss.usermodel.*;
@@ -474,8 +471,8 @@ public class AssetsCalculateServiceImpl extends ServiceImpl<AssetsCalculateMappe
      * @return EqptReportReferencesCalculateVO
      */
     @Override
-    public EqptReportReferencesCalculateVO getReferencesInfoById(Long calculateId) {
-        EqptReportReferencesCalculateVO referencesVO = assetsCalculateMapper.getReferencesInfoById(calculateId);
+    public EqptReportReferencesCalculateVO getEqptReferencesInfoById(Long calculateId) {
+        EqptReportReferencesCalculateVO referencesVO = assetsCalculateMapper.getEqptReferencesInfoById(calculateId);
         // 判断最大年份是否等于最小年份
         if (referencesVO.getMinPurchaseYear().equals(referencesVO.getMaxPurchaseYear())) {
             referencesVO.setPurchasePeriod(referencesVO.getMinPurchaseYear() + "年");
@@ -487,6 +484,16 @@ public class AssetsCalculateServiceImpl extends ServiceImpl<AssetsCalculateMappe
     }
 
     /**
+     * 根据测算表id获取生成债权分析报告引用的测算表信息
+     * @param calculateId 测算表id
+     * @return EqptReportReferencesCalculateVO
+     */
+    @Override
+    public CRReportReferencesCalculateVO getCRReferencesInfoById(Long calculateId) {
+        return assetsCalculateMapper.getCRReferencesInfoById(calculateId);
+    }
+
+    /**
      * 获取新增DocumentProduction所需的测算信息
      * @param calculateId 测算表id
      * @return AssetsCalculateVO