1.机器设备报告基本信息填写，修改，查询等相关接口开发

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

@@ -1,6 +1,7 @@
 package com.dayou.controller;
 
 import cn.dev33.satoken.annotation.SaCheckLogin;
+import com.dayou.common.DropDownBoxData;
 import com.dayou.dto.calculate.CalculateBaseInfoDTO;
 import com.dayou.result.Result;
 import com.dayou.result.Status;
@@ -144,6 +145,16 @@ public class AssetsCalculateController {
         return Result.build(assetsCalculateService.getValuationBasisDate(calculateId));
     }
 
+    /**
+     * 根据项目id获取测算信息下拉框数据
+     * @param projectId 项目id
+     * @return List<DropDownBoxData>
+     */
+    @GetMapping("/getDropDownBoxData/{projectId}")
+    public Result<List<DropDownBoxData>> getDropDownBoxData(@PathVariable Long projectId) {
+        return Result.build(assetsCalculateService.getDropDownBoxData(projectId));
+    }
+
 
 }
 

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

@@ -0,0 +1,111 @@
+package com.dayou.controller;
+
+import com.dayou.dto.report.ReportBaseInfoDTO;
+import com.dayou.result.Result;
+import com.dayou.vo.AssetsReportVO;
+import com.dayou.vo.report.AssetsReportProgressVO;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.RequestMapping;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import org.springframework.web.bind.annotation.RestController;
+import com.dayou.service.AssetsReportService;
+import com.dayou.entity.AssetsReport;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+/**
+ * 资产项目报告信息表
+ *
+ * @author mybatis-plus-generator
+ * @since 2024-12-06
+ */
+@RestController
+@RequestMapping("assetsReport")
+@Slf4j
+@CrossOrigin
+public class AssetsReportController {
+
+    @Autowired
+    private AssetsReportService assetsReportService;
+
+    /**
+     * 根据项目id查询所有报告信息
+     * @param projectId 项目id
+     * @return List<AssetsReport>
+     */
+    @GetMapping("/listAllByProjectId/{projectId}")
+    public Result<List<AssetsReportVO>> listAllByProjectId(@PathVariable Long projectId) {
+        List<AssetsReportVO> pages = assetsReportService.listAllByProjectId(projectId);
+        return Result.build(pages);
+    }
+
+    /**
+     * 资产项目报告信息表详情
+     */
+    @GetMapping("/detail/{id}")
+    public Result<AssetsReport> detail(@PathVariable Long id) {
+        AssetsReport xAssetsReport = assetsReportService.detail(id);
+        return Result.build(xAssetsReport);
+    }
+
+    /**
+     * 资产项目报告信息表新增
+     */
+    @PostMapping("/save")
+    public Result<Boolean> save(@RequestBody AssetsReport assetsReport) {
+        Boolean ret = assetsReportService.add(assetsReport);
+        return Result.build(ret);
+    }
+
+    /**
+     * 资产项目报告信息表更新
+     */
+    @PutMapping("/update")
+    public Result<Boolean> update(@RequestBody AssetsReport assetsReport) {
+        Boolean ret = assetsReportService.update(assetsReport);
+        return Result.build(ret);
+    }
+
+    /**
+     * 资产项目报告信息表删除
+     */
+    @DeleteMapping("/delete/{id}")
+    public Result<Boolean> delete(@PathVariable Long id) {
+        Boolean ret = assetsReportService.delete(id);
+        return Result.build(ret);
+    }
+
+    /**
+     * 根据项目id获取未完成报告的进度信息
+     * @param projectId 项目id
+     * @return AssetsReportProgressVO
+     */
+    @GetMapping("/getUnFinishedReportProgress/{projectId}")
+    public Result<AssetsReportProgressVO> getUnFinishedReportProgress(@PathVariable Long projectId) {
+        return Result.build(assetsReportService.getUnFinishedReportProgress(projectId));
+    }
+
+    /**
+     * 更新报告基础信息
+     * @param reportBaseInfoDTO dto
+     * @return Boolean
+     */
+    @PutMapping("/updateReportBaseInfo")
+    public Result<Boolean> updateReportBaseInfo(@RequestBody ReportBaseInfoDTO reportBaseInfoDTO) {
+        return Result.build(assetsReportService.updateReportBaseInfo(reportBaseInfoDTO));
+    }
+
+    /**
+     * 根据报告id获取报告基础信息
+     * @param reportId 报告id
+     * @return String
+     */
+    @GetMapping("/getReportBaseInfo/{reportId}")
+    public Result<String> getReportBaseInfo(@PathVariable Long reportId) {
+        return Result.build(assetsReportService.getReportBaseInfo(reportId));
+    }
+
+}
+

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

@@ -1,5 +1,6 @@
 package com.dayou.mapper;
 
+import com.dayou.common.DropDownBoxData;
 import com.dayou.entity.AssetsCalculate;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.dayou.vo.AssetsCalculateVO;
@@ -62,4 +63,11 @@ public interface AssetsCalculateMapper extends BaseMapper<AssetsCalculate> {
      * @return String
      */
     String getCalculateBaseInfo(@Param("calculateId") Long calculateId);
+
+    /**
+     * 根据项目id获取测算信息下拉框数据
+     * @param projectId 项目id
+     * @return List<DropDownBoxData>
+     */
+    List<DropDownBoxData> getDropDownBoxData(@Param("projectId") Long projectId);
 }

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

@@ -0,0 +1,58 @@
+package com.dayou.mapper;
+
+import com.dayou.dto.report.ReportBaseInfoDTO;
+import com.dayou.entity.AssetsReport;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.dayou.vo.AssetsReportVO;
+import com.dayou.vo.report.AssetsReportProgressVO;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 资产项目报告信息表 Mapper 接口
+ * </p>
+ *
+ * @author mybatis-plus-generator
+ * @since 2024-12-06
+ */
+public interface AssetsReportMapper extends BaseMapper<AssetsReport> {
+
+    /**
+     * 根据项目id查询所有报告信息
+     * @param projectId 项目id
+     * @return List<AssetsReport>
+     */
+    List<AssetsReportVO> listAllByProjectId(@Param("projectId") Long projectId);
+
+    /**
+     * 根据项目id获取未完成报告的进度信息
+     * @param projectId 项目id
+     * @return AssetsReportProgressVO
+     */
+    AssetsReportProgressVO getUnFinishedReportProgress(@Param("projectId") Long projectId);
+
+    /**
+     * 更新报告基础信息
+     * @param reportBaseInfoDTO dto
+     * @return Boolean
+     */
+    Boolean updateReportBaseInfo(@Param("reportBaseInfoDTO") ReportBaseInfoDTO reportBaseInfoDTO);
+
+    /**
+     * 通过id更新报告进度
+     * @param reportId id
+     * @param progress 进度
+     * @return Boolean
+     */
+    Boolean updateReportProgress(@Param("reportId") Long reportId, @Param("progress") String progress);
+
+    /**
+     * 根据报告id获取报告基础信息
+     * @param reportId 报告id
+     * @return String
+     */
+    String getReportBaseInfo(@Param("reportId") Long reportId);
+
+}

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

@@ -90,5 +90,13 @@
         AND id = #{calculateId}
     </select>
 
+    <!--根据项目id获取测算信息下拉框数据-->
+    <select id="getDropDownBoxData" resultType="com.dayou.common.DropDownBoxData">
+        SELECT id, calculate_name AS name
+        FROM assets_calculate
+        WHERE delete_status = 0
+        AND project_id = #{projectId}
+    </select>
+
 
 </mapper>

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

@@ -0,0 +1,81 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.dayou.mapper.AssetsReportMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.dayou.entity.AssetsReport">
+        <result column="id" property="id" />
+        <result column="create_time" property="createTime" />
+        <result column="update_time" property="updateTime" />
+        <result column="delete_status" property="deleteStatus" />
+        <result column="project_id" property="projectId" />
+        <result column="report_name" property="reportName" />
+        <result column="base_info" property="baseInfo" />
+        <result column="create_user_id" property="createUserId" />
+        <result column="progress" property="progress" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id,
+        create_time,
+        update_time,
+        delete_status,
+        project_id, report_name, base_info, create_user_id, progress
+    </sql>
+
+    <!--根据项目id查询所有报告信息-->
+    <select id="listAllByProjectId" resultType="com.dayou.vo.AssetsReportVO">
+        SELECT report.id AS id,
+               report.project_id,
+               report_name,
+               valuation_basis_date,
+               principal,
+               dict_data.name AS projectTypeName,
+               report.create_time,
+               doc.doc_name,
+               doc.doc_url,
+               report.progress
+        FROM assets_report AS report
+        LEFT JOIN assets_project AS project ON project.id = report.project_id AND project.delete_status = 0
+        LEFT JOIN assets_calculate AS calculate ON calculate.id = report.calculate_id AND calculate.delete_status = 0
+        LEFT JOIN sys_dict_data AS dict_data ON dict_data.id = project.project_type_id
+        LEFT JOIN document_production AS doc ON doc.business_id = project.id AND doc.business_sub_id = report.id
+        WHERE report.delete_status = 0
+          AND report.project_id = #{projectId}
+    </select>
+
+    <!--根据项目id获取未完成报告的进度信息-->
+    <select id="getUnFinishedReportProgress" resultType="com.dayou.vo.report.AssetsReportProgressVO">
+        SELECT id, project_id, report_name, progress, calculate_id
+        FROM assets_report
+        WHERE delete_status = 0
+          AND progress != 'FINISHED'
+          AND project_id = #{projectId}
+    </select>
+
+    <!--更新报告基础信息-->
+    <update id="updateReportBaseInfo">
+        UPDATE assets_report
+        SET base_info = #{reportBaseInfoDTO.baseInfo}
+        WHERE delete_status = 0
+        AND id = #{reportBaseInfoDTO.reportId}
+    </update>
+
+    <!--通过id更新报告进度-->
+    <update id="updateReportProgress">
+        UPDATE assets_report
+        SET progress = #{progress}
+        WHERE delete_status = 0
+          AND id = #{reportId}
+    </update>
+
+    <!--根据报告id获取报告基础信息-->
+    <select id="getReportBaseInfo" resultType="java.lang.String">
+        SELECT base_info
+        FROM assets_report
+        WHERE delete_status = 0
+        AND id = #{reportId}
+    </select>
+
+</mapper>

domain/src/main/java/com/dayou/dto/report/ReportBaseInfoDTO.java

@@ -0,0 +1,18 @@
+package com.dayou.dto.report;
+
+import lombok.Data;
+
+@Data
+public class ReportBaseInfoDTO {
+
+    /**
+     * 报告id
+     */
+    private Long reportId;
+
+    /**
+     * 基础报告信息
+     */
+    private String baseInfo;
+
+}

domain/src/main/java/com/dayou/dto/report/equipment/EqptReportBaseInfoDTO.java

@@ -217,12 +217,12 @@ public class EqptReportBaseInfoDTO {
         /**
          * 基准日尚余未付设备款
          */
-        private Boolean eqptUnpaidAmount;
+        private Integer eqptUnpaidAmount;
 
         /**
          * 产权持有人权属等主要资料不完整或者存在瑕疵的情形
          */
-        private Boolean hasFlaw;
+        private String flaw;
 
     }
 

domain/src/main/java/com/dayou/entity/AssetsReport.java

@@ -0,0 +1,53 @@
+package com.dayou.entity;
+import com.dayou.common.BaseEntity;
+
+import java.io.Serializable;
+
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+/**
+ * <p>
+ * 资产项目报告信息表
+ * </p>
+ *
+ * @author mybatis-plus-generator
+ * @since 2024-12-06
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class AssetsReport extends BaseEntity implements Serializable {
+
+    private static final long serialVersionUID=1L;
+
+    /**
+     * 资产项目id
+     */
+    private Long projectId;
+
+    /**
+     * 报告名
+     */
+    private String reportName;
+
+    /**
+     * 基础报告信息
+     */
+    private String baseInfo;
+
+    /**
+     * 报告创建者user_id
+     */
+    private Long createUserId;
+
+    /**
+     * 报告生成进度(BASE、GENERATE、FINISHED)
+     */
+    private String progress;
+
+    /**
+     * 关联的测算表id
+     */
+    private Long calculateId;
+
+
+}

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

@@ -0,0 +1,60 @@
+package com.dayou.vo;
+
+import lombok.Data;
+
+import java.util.Date;
+
+@Data
+public class AssetsReportVO {
+
+    /**
+     * 主键自增id
+     */
+    protected Long id;
+
+    /**
+     * 资产项目id
+     */
+    private Long projectId;
+
+    /**
+     * 报告名
+     */
+    private String reportName;
+
+    /**
+     * 基础报告信息
+     */
+    private String baseInfo;
+
+    /**
+     * 报告创建者user_id
+     */
+    private Long createUserId;
+
+    /**
+     * 报告生成进度(BASE、GENERATE、FINISHED)
+     */
+    private String progress;
+
+    /**
+     * 关联的测算表id
+     */
+    private Long calculateId;
+
+    /**
+     * 创建时间
+     */
+    private Date createTime;
+
+    /**
+     * 文档名称
+     */
+    private String docName;
+
+    /**
+     * 文档路径
+     */
+    private String docUrl;
+
+}

domain/src/main/java/com/dayou/vo/report/AssetsReportProgressVO.java

@@ -0,0 +1,36 @@
+package com.dayou.vo.report;
+
+import lombok.Data;
+
+/**
+ * 测算表进度信息
+ */
+@Data
+public class AssetsReportProgressVO {
+
+    /**
+     * 测算表id
+     */
+    private Long id;
+
+    /**
+     * 资产项目id
+     */
+    private Long projectId;
+
+    /**
+     * 报告名
+     */
+    private String reportName;
+
+    /**
+     * 测算表生成进度(BASE、GENERATE、FINISHED)
+     */
+    private String progress;
+
+    /**
+     * 关联的测算表id
+     */
+    private Long calculateId;
+
+}

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

@@ -1,4 +1,5 @@
 package com.dayou.service;
+import com.dayou.common.DropDownBoxData;
 import com.dayou.entity.AssetsCalculate;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -84,4 +85,11 @@ public interface AssetsCalculateService extends IService<AssetsCalculate> {
          */
         LocalDate getValuationBasisDate(Long calculateId);
 
+        /**
+         * 根据项目id获取测算信息下拉框数据
+         * @param projectId 项目id
+         * @return List<DropDownBoxData>
+         */
+        List<DropDownBoxData> getDropDownBoxData(Long projectId);
+
 }

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

@@ -0,0 +1,59 @@
+package com.dayou.service;
+import com.dayou.dto.report.ReportBaseInfoDTO;
+import com.dayou.entity.AssetsReport;
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.dayou.vo.AssetsReportVO;
+import com.dayou.vo.report.AssetsReportProgressVO;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 资产项目报告信息表 服务类
+ * </p>
+ *
+ * @author mybatis-plus-generator
+ * @since 2024-12-06
+ */
+public interface AssetsReportService extends IService<AssetsReport> {
+
+        /**
+         * 根据项目id查询所有报告信息
+         * @param projectId 项目id
+         * @return List<AssetsReport>
+         */
+        List<AssetsReportVO> listAllByProjectId(Long projectId);
+
+        AssetsReport detail(Long id);
+
+        Boolean add(AssetsReport assetsReport);
+
+        Boolean update(AssetsReport assetsReport);
+
+        Boolean delete(Long id);
+
+
+        /**
+         * 根据项目id获取未完成报告的进度信息
+         * @param projectId 项目id
+         * @return AssetsReportProgressVO
+         */
+        AssetsReportProgressVO getUnFinishedReportProgress(Long projectId);
+
+        /**
+         * 更新报告基础信息
+         * @param reportBaseInfoDTO dto
+         * @return Boolean
+         */
+        Boolean updateReportBaseInfo(ReportBaseInfoDTO reportBaseInfoDTO);
+
+        /**
+         * 根据报告id获取报告基础信息
+         * @param reportId 报告id
+         * @return String
+         */
+        String getReportBaseInfo(Long reportId);
+
+}

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

@@ -7,6 +7,7 @@ import com.alibaba.excel.read.listener.PageReadListener;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.dayou.common.BaseEntity;
 import com.dayou.common.CalculateFormula;
+import com.dayou.common.DropDownBoxData;
 import com.dayou.config.FileNetConfig;
 import com.dayou.dto.calculate.equipment.EqptCalculateBaseInfoDTO;
 import com.dayou.entity.*;
@@ -398,4 +399,14 @@ public class AssetsCalculateServiceImpl extends ServiceImpl<AssetsCalculateMappe
                 .eq(BaseEntity::getId, calculateId)
                 .eq(BaseEntity::getDeleteStatus, 0)).getValuationBasisDate();
     }
+
+    /**
+     * 根据项目id获取测算信息下拉框数据
+     * @param projectId 项目id
+     * @return List<DropDownBoxData>
+     */
+    @Override
+    public List<DropDownBoxData> getDropDownBoxData(Long projectId) {
+        return assetsCalculateMapper.getDropDownBoxData(projectId);
+    }
 }

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

@@ -0,0 +1,113 @@
+package com.dayou.service.impl;
+
+import cn.dev33.satoken.stp.StpUtil;
+import cn.hutool.core.util.ObjectUtil;
+import com.dayou.dto.report.ReportBaseInfoDTO;
+import com.dayou.entity.AssetsReport;
+import com.dayou.mapper.AssetsReportMapper;
+import com.dayou.service.AssetsReportService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.dayou.vo.AssetsReportVO;
+import com.dayou.vo.report.AssetsReportProgressVO;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
+
+import java.util.List;
+import java.util.ArrayList;
+
+import org.springframework.transaction.annotation.Transactional;
+
+/**
+ * <p>
+ * 资产项目报告信息表 服务实现类
+ * </p>
+ *
+ * @author mybatis-plus-generator
+ * @since 2024-12-06
+ */
+@Service
+public class AssetsReportServiceImpl extends ServiceImpl<AssetsReportMapper, AssetsReport> implements AssetsReportService {
+
+    @Autowired
+    private AssetsReportMapper assetsReportMapper;
+
+    /**
+     * 根据项目id查询所有报告信息
+     *
+     * @param projectId 项目id
+     * @return List<AssetsReport>
+     */
+    @Override
+    public List<AssetsReportVO> listAllByProjectId(Long projectId) {
+        return assetsReportMapper.listAllByProjectId(projectId);
+    }
+
+
+    @Override
+    public AssetsReport detail(Long id) {
+        return this.getById(id);
+    }
+
+    @Override
+    public Boolean add(AssetsReport assetsReport) {
+        assetsReport.setCreateUserId(StpUtil.getLoginIdAsLong());
+        if (ObjectUtil.isNull(assetsReport.getId())) {
+            return this.save(assetsReport);
+        }else {
+            return this.updateById(assetsReport);
+        }
+    }
+
+    @Override
+    public Boolean update(AssetsReport assetsReport) {
+        return this.updateById(assetsReport);
+    }
+
+    @Override
+    public Boolean delete(Long id) {
+        //逻辑删除
+        return this.removeById(id);
+    }
+
+    /**
+     * 根据项目id获取未完成报告的进度信息
+     * @param projectId 项目id
+     * @return AssetsReportProgressVO
+     */
+    @Override
+    public AssetsReportProgressVO getUnFinishedReportProgress(Long projectId) {
+        return assetsReportMapper.getUnFinishedReportProgress(projectId);
+    }
+
+    /**
+     * 更新报告基础信息
+     * @param reportBaseInfoDTO dto
+     * @return Boolean
+     */
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public Boolean updateReportBaseInfo(ReportBaseInfoDTO reportBaseInfoDTO) {
+        // 如果baseInfo为null说明是第一次进行填写测算基本信息的操作,则更新报告进度
+        if (ObjectUtil.isNull(getReportBaseInfo(reportBaseInfoDTO.getReportId()))) {
+            assetsReportMapper.updateReportProgress(reportBaseInfoDTO.getReportId(), "GENERATE");
+        }
+        return assetsReportMapper.updateReportBaseInfo(reportBaseInfoDTO);
+    }
+
+    /**
+     * 根据报告id获取报告基础信息
+     * @param reportId 报告id
+     * @return String
+     */
+    @Override
+    public String getReportBaseInfo(Long reportId) {
+        return assetsReportMapper.getReportBaseInfo(reportId);
+    }
+}

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

@@ -15,6 +15,7 @@ import com.dayou.common.BaseEntity;
 import com.dayou.dto.OALoginDTO;
 import com.dayou.entity.User;
 import com.dayou.entity.UserPost;
+import com.dayou.exception.BusinessException;
 import com.dayou.mapper.UserMapper;
 import com.dayou.mapper.UserPostMapper;
 import com.dayou.service.AuthService;
@@ -51,7 +52,7 @@ public class AuthServiceImpl implements AuthService {
                 .timeout(20000)//超时，毫秒
                 .execute().body();
         if (ObjectUtil.isNull(result) || ObjectUtil.isEmpty(result)) {
-            throw new RuntimeException("登录失败！Token无效！");
+            throw new BusinessException("登录失败！Token无效！");
         }
         JSONObject jsonObject = JSONUtil.parseObj(result);
         OALoginDTO oaLoginDTO = jsonObject.toBean(OALoginDTO.class);
@@ -90,7 +91,7 @@ public class AuthServiceImpl implements AuthService {
                         .setTokenValue(StpUtil.getTokenValue());
                 return userVO;
             } else {
-                throw new RuntimeException("登录失败！Token无效！");
+                throw new BusinessException("登录失败！Token无效！");
             }
         }
         return null;

sql/update_sql.sql

@@ -596,3 +596,10 @@ ALTER TABLE tmpl_asset_report ADD COLUMN tmpl_code VARCHAR(50) NOT NULL COMMENT
 ALTER TABLE tmpl_asset_report_section ADD COLUMN section_name VARCHAR(50) NOT NULL COMMENT '测算表段落模板名称';
 ALTER TABLE tmpl_asset_report_section ADD COLUMN tmpl_code VARCHAR(50) NOT NULL COMMENT '模板code';
 
+/**
+  日期：2024-12-06
+  修改人:苟耕铨
+  未更新到test-env
+ */
+ALTER TABLE assets_report ADD COLUMN calculate_id BIGINT(20) NULL COMMENT '关联的测算表id';
+