Ver Fonte

1.机器设备模板处理

GouGengquan há 8 meses atrás
pai
commit
264ccf835f
21 ficheiros alterados com 1000 adições e 2 exclusões
  1. 71 0
      biz-base/src/main/java/com/dayou/controller/TmplAssetCalculateController.java
  2. 71 0
      biz-base/src/main/java/com/dayou/controller/TmplAssetCalculateSectionController.java
  3. 5 1
      biz-base/src/test/java/com/dayou/WordSimpleTests.java
  4. 16 0
      dao/src/main/java/com/dayou/mapper/TmplAssetCalculateMapper.java
  5. 16 0
      dao/src/main/java/com/dayou/mapper/TmplAssetCalculateSectionMapper.java
  6. 29 0
      dao/src/main/resources/mapper/TmplAssetCalculateMapper.xml
  7. 27 0
      dao/src/main/resources/mapper/TmplAssetCalculateSectionMapper.xml
  8. 48 0
      domain/src/main/java/com/dayou/dto/excel/equipment/EquipmentBaseDTO.java
  9. 129 0
      domain/src/main/java/com/dayou/dto/excel/equipment/EquipmentInfoDTO.java
  10. 21 0
      domain/src/main/java/com/dayou/dto/excel/equipment/ImportedEquipmentBaseDTO.java
  11. 98 0
      domain/src/main/java/com/dayou/dto/excel/equipment/ImportedEquipmentInfoDTO.java
  12. 23 0
      domain/src/main/java/com/dayou/dto/excel/equipment/NonStandardEquipmentBaseDTO.java
  13. 123 0
      domain/src/main/java/com/dayou/dto/excel/equipment/NonStandardEquipmentInfoDTO.java
  14. 58 0
      domain/src/main/java/com/dayou/entity/TmplAssetCalculate.java
  15. 48 0
      domain/src/main/java/com/dayou/entity/TmplAssetCalculateSection.java
  16. 35 0
      domain/src/main/java/com/dayou/enums/EquipmentTmplCode.java
  17. 28 0
      service/src/main/java/com/dayou/service/TmplAssetCalculateSectionService.java
  18. 28 0
      service/src/main/java/com/dayou/service/TmplAssetCalculateService.java
  19. 58 0
      service/src/main/java/com/dayou/service/impl/TmplAssetCalculateSectionServiceImpl.java
  20. 58 0
      service/src/main/java/com/dayou/service/impl/TmplAssetCalculateServiceImpl.java
  21. 10 1
      sql/update_sql.sql

+ 71 - 0
biz-base/src/main/java/com/dayou/controller/TmplAssetCalculateController.java

@@ -0,0 +1,71 @@
+package com.dayou.controller;
+
+import com.dayou.result.Result;
+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.TmplAssetCalculateService;
+import com.dayou.entity.TmplAssetCalculate;
+import org.springframework.web.bind.annotation.*;
+/**
+ * 资产测算表模板信息表
+ *
+ * @author mybatis-plus-generator
+ * @since 2024-11-06
+ */
+@RestController
+@RequestMapping("tmplAssetCalculate")
+@Slf4j
+public class TmplAssetCalculateController {
+    @Autowired
+    private TmplAssetCalculateService tmplAssetCalculateService;
+
+    /**
+    * 资产测算表模板信息表列表
+    */
+    @GetMapping("/page")
+    public Result<Page<TmplAssetCalculate>> page(TmplAssetCalculate tmplAssetCalculate, Page page){
+        Page<TmplAssetCalculate> pages=tmplAssetCalculateService.selectPage(page,tmplAssetCalculate);
+        return Result.build(pages);
+    }
+
+    /**
+     * 资产测算表模板信息表详情
+     */
+    @GetMapping("/detail/{id}")
+    public Result<TmplAssetCalculate> detail(@PathVariable Long id){
+        TmplAssetCalculate xTmplAssetCalculate =tmplAssetCalculateService.detail(id);
+        return Result.build(xTmplAssetCalculate);
+     }
+
+    /**
+     * 资产测算表模板信息表新增
+     */
+    @PostMapping("/save")
+    public Result<Boolean> save(@RequestBody TmplAssetCalculate tmplAssetCalculate) {
+        Boolean ret = tmplAssetCalculateService.add(tmplAssetCalculate);
+        return Result.build(ret);
+    }
+
+    /**
+     * 资产测算表模板信息表更新
+     */
+    @PutMapping("/update")
+    public Result<Boolean> update(@RequestBody TmplAssetCalculate tmplAssetCalculate) {
+        Boolean ret = tmplAssetCalculateService.update(tmplAssetCalculate);
+        return Result.build(ret);
+    }
+
+    /**
+     * 资产测算表模板信息表删除
+     */
+    @DeleteMapping("/delete/{id}")
+    public Result<Boolean> delete(@PathVariable Long id) {
+        Boolean ret = tmplAssetCalculateService.delete(id);
+        return Result.build(ret);
+    }
+
+}
+

+ 71 - 0
biz-base/src/main/java/com/dayou/controller/TmplAssetCalculateSectionController.java

@@ -0,0 +1,71 @@
+package com.dayou.controller;
+
+import com.dayou.result.Result;
+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.TmplAssetCalculateSectionService;
+import com.dayou.entity.TmplAssetCalculateSection;
+import org.springframework.web.bind.annotation.*;
+/**
+ * 资产测算表段落模板信息表
+ *
+ * @author mybatis-plus-generator
+ * @since 2024-11-06
+ */
+@RestController
+@RequestMapping("tmplAssetCalculateSection")
+@Slf4j
+public class TmplAssetCalculateSectionController {
+    @Autowired
+    private TmplAssetCalculateSectionService tmplAssetCalculateSectionService;
+
+    /**
+    * 资产测算表段落模板信息表列表
+    */
+    @GetMapping("/page")
+    public Result<Page<TmplAssetCalculateSection>> page(TmplAssetCalculateSection tmplAssetCalculateSection, Page page){
+        Page<TmplAssetCalculateSection> pages=tmplAssetCalculateSectionService.selectPage(page,tmplAssetCalculateSection);
+        return Result.build(pages);
+    }
+
+    /**
+     * 资产测算表段落模板信息表详情
+     */
+    @GetMapping("/detail/{id}")
+    public Result<TmplAssetCalculateSection> detail(@PathVariable Long id){
+        TmplAssetCalculateSection xTmplAssetCalculateSection =tmplAssetCalculateSectionService.detail(id);
+        return Result.build(xTmplAssetCalculateSection);
+     }
+
+    /**
+     * 资产测算表段落模板信息表新增
+     */
+    @PostMapping("/save")
+    public Result<Boolean> save(@RequestBody TmplAssetCalculateSection tmplAssetCalculateSection) {
+        Boolean ret = tmplAssetCalculateSectionService.add(tmplAssetCalculateSection);
+        return Result.build(ret);
+    }
+
+    /**
+     * 资产测算表段落模板信息表更新
+     */
+    @PutMapping("/update")
+    public Result<Boolean> update(@RequestBody TmplAssetCalculateSection tmplAssetCalculateSection) {
+        Boolean ret = tmplAssetCalculateSectionService.update(tmplAssetCalculateSection);
+        return Result.build(ret);
+    }
+
+    /**
+     * 资产测算表段落模板信息表删除
+     */
+    @DeleteMapping("/delete/{id}")
+    public Result<Boolean> delete(@PathVariable Long id) {
+        Boolean ret = tmplAssetCalculateSectionService.delete(id);
+        return Result.build(ret);
+    }
+
+}
+

+ 5 - 1
biz-base/src/test/java/com/dayou/WordSimpleTests.java

@@ -342,8 +342,12 @@ public class WordSimpleTests {
         doc.save("E:\\test\\word\\output.docx");
     }
 
+    /**
+     * 测试删除光标所在位置的段落
+     * @throws Exception
+     */
     @Test
-    void getRowNo() throws Exception {
+    void testDeleteParagraph() throws Exception {
         Document doc = new Document("E:\\test\\word\\6_success_output.doc");
         DocumentBuilder builder = new DocumentBuilder(doc);
 

+ 16 - 0
dao/src/main/java/com/dayou/mapper/TmplAssetCalculateMapper.java

@@ -0,0 +1,16 @@
+package com.dayou.mapper;
+
+import com.dayou.entity.TmplAssetCalculate;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ * 资产测算表模板信息表 Mapper 接口
+ * </p>
+ *
+ * @author mybatis-plus-generator
+ * @since 2024-11-06
+ */
+public interface TmplAssetCalculateMapper extends BaseMapper<TmplAssetCalculate> {
+
+}

+ 16 - 0
dao/src/main/java/com/dayou/mapper/TmplAssetCalculateSectionMapper.java

@@ -0,0 +1,16 @@
+package com.dayou.mapper;
+
+import com.dayou.entity.TmplAssetCalculateSection;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ * 资产测算表段落模板信息表 Mapper 接口
+ * </p>
+ *
+ * @author mybatis-plus-generator
+ * @since 2024-11-06
+ */
+public interface TmplAssetCalculateSectionMapper extends BaseMapper<TmplAssetCalculateSection> {
+
+}

+ 29 - 0
dao/src/main/resources/mapper/TmplAssetCalculateMapper.xml

@@ -0,0 +1,29 @@
+<?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.TmplAssetCalculateMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.dayou.entity.TmplAssetCalculate">
+        <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="calculate_name" property="calculateName" />
+        <result column="file_name" property="fileName" />
+        <result column="file_url" property="fileUrl" />
+        <result column="calculate_type" property="calculateType" />
+        <result column="calculate_sec_type" property="calculateSecType" />
+        <result column="has_section" property="hasSection" />
+        <result column="tmpl_code" property="tmplCode" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id,
+        create_time,
+        update_time,
+        delete_status,
+        calculate_name, file_name, file_url, calculate_type, calculate_sec_type, has_section, tmpl_code
+    </sql>
+
+</mapper>

+ 27 - 0
dao/src/main/resources/mapper/TmplAssetCalculateSectionMapper.xml

@@ -0,0 +1,27 @@
+<?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.TmplAssetCalculateSectionMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.dayou.entity.TmplAssetCalculateSection">
+        <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="template_report_id" property="templateReportId" />
+        <result column="section_name" property="sectionName" />
+        <result column="section_file_name" property="sectionFileName" />
+        <result column="section_file_url" property="sectionFileUrl" />
+        <result column="tmpl_code" property="tmplCode" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id,
+        create_time,
+        update_time,
+        delete_status,
+        template_report_id, section_name, section_file_name, section_file_url, tmpl_code
+    </sql>
+
+</mapper>

+ 48 - 0
domain/src/main/java/com/dayou/dto/excel/equipment/EquipmentBaseDTO.java

@@ -0,0 +1,48 @@
+package com.dayou.dto.excel.equipment;
+
+import lombok.Data;
+
+import java.time.LocalDate;
+
+/**
+ * 机器设备-主模板
+ */
+@Data
+public class EquipmentBaseDTO {
+
+    /**
+     * 评估基准日
+     */
+    private LocalDate valuationBasisDate;
+
+    /**
+     * 工期
+     */
+    private Double constructionPeriod;
+
+    /**
+     * 利息
+     */
+    private Double interest;
+
+    /**
+     * 前期费用率
+     */
+    private Double preConstructionCostRatio;
+
+    /**
+     * 建设单位管理费率
+     */
+    private Double managementExpenseRatio;
+
+    /**
+     * 是否有进口设备
+     */
+    private Boolean hasImportedEquipment;
+
+    /**
+     * 非标设备(非标准设备,如定制设备等)
+     */
+    private Boolean hasNonStandardEquipment;
+
+}

+ 129 - 0
domain/src/main/java/com/dayou/dto/excel/equipment/EquipmentInfoDTO.java

@@ -0,0 +1,129 @@
+package com.dayou.dto.excel.equipment;
+
+import lombok.Data;
+
+import java.time.LocalDate;
+
+/**
+ * 机器设备-主模板-详细信息
+ */
+@Data
+public class EquipmentInfoDTO {
+
+    /**
+     * 序号
+     */
+    private Integer id;
+
+    /**
+     * 设备名称
+     */
+    private String equipmentName;
+
+    /**
+     * 生产厂家
+     */
+    private String manufacturer;
+
+    /**
+     * 型号规格
+     */
+    private String model;
+
+    /**
+     * 购买日期
+     */
+    private LocalDate purchaseDate;
+
+    /**
+     * 启动日期
+     */
+    private LocalDate activationDate;
+
+    /**
+     * 数量
+     */
+    private Integer quantity;
+
+    /**
+     * 计量单位
+     */
+    private String unitOfMeasurement;
+
+    /**
+     * 账面原值
+     */
+    private Double originalCost;
+
+    /**
+     * 含税单价
+     */
+    private Double taxedUnitPrice;
+
+    /**
+     * 税率
+     */
+    private Double taxRate;
+
+    /**
+     * 备注01
+     */
+    private String remark01;
+
+    /**
+     * 备注002
+     */
+    private String remark02;
+
+    /**
+     * 经济使用年数
+     */
+    private Integer economicServiceLife;
+
+    /**
+     * 直接观察成新率
+     */
+    private Double directObservationDepreciationRate;
+
+    /**
+     * 设备类型
+     */
+    private String equipmentType;
+
+    /**
+     * 作价方法
+     */
+    private String valuationMethod;
+
+    /**
+     * 询价依据
+     */
+    private String inquiryBasis;
+
+    /**
+     * 询价地点
+     */
+    private String inquiryLocation;
+
+    /**
+     * 单价
+     */
+    private Double price;
+
+    /**
+     * 运杂费率
+     */
+    private Double freightAndMiscellaneousFeeRate;
+
+    /**
+     * 基础费率
+     */
+    private Double baseRate;
+
+    /**
+     * 安装费率
+     */
+    private Double installationRate;
+
+
+}

+ 21 - 0
domain/src/main/java/com/dayou/dto/excel/equipment/ImportedEquipmentBaseDTO.java

@@ -0,0 +1,21 @@
+package com.dayou.dto.excel.equipment;
+
+import lombok.Data;
+
+/**
+ * 机器设备-进口设备测算-段落模板
+ */
+@Data
+public class ImportedEquipmentBaseDTO {
+
+    /**
+     * 关税
+     */
+    private Double tariff;
+
+    /**
+     * 进口增值税
+     */
+    private Double importVAT;
+
+}

+ 98 - 0
domain/src/main/java/com/dayou/dto/excel/equipment/ImportedEquipmentInfoDTO.java

@@ -0,0 +1,98 @@
+package com.dayou.dto.excel.equipment;
+
+import lombok.Data;
+
+import java.time.LocalDate;
+
+/**
+ * 机器设备-进口设备测算-详细信息-段落模板
+ */
+@Data
+public class ImportedEquipmentInfoDTO {
+
+    /**
+     * 序号
+     */
+    private Integer id;
+
+    /**
+     * 设备名称
+     */
+    private String equipmentName;
+
+    /**
+     * 生产厂家
+     */
+    private String manufacturer;
+
+    /**
+     * 型号规格
+     */
+    private String model;
+
+    /**
+     * 数量
+     */
+    private Integer quantity;
+
+    /**
+     * 计量单位
+     */
+    private String unitOfMeasurement;
+
+    /**
+     * 购买日期
+     */
+    private LocalDate purchaseDate;
+
+    /**
+     * 启用日期
+     */
+    private LocalDate activationDate;
+
+    /**
+     * 取价依据
+     */
+    private String pricingBasis;
+
+    /**
+     * 基准日汇率中间价
+     */
+    private Double centralParityRate;
+
+    /**
+     * 商品编号
+     */
+    private String productCode;
+
+    /**
+     * 币种
+     */
+    private String currency;
+
+    /**
+     * 地址
+     */
+    private String address;
+
+    /**
+     * 成交方式
+     */
+    private String transactionMethod;
+
+    /**
+     * 合同金额
+     */
+    private Double contractAmount;
+
+    /**
+     * 合同签订日期
+     */
+    private LocalDate contractSigningDate;
+
+    /**
+     * 到岸港口
+     */
+    private String destinationPort;
+
+}

+ 23 - 0
domain/src/main/java/com/dayou/dto/excel/equipment/NonStandardEquipmentBaseDTO.java

@@ -0,0 +1,23 @@
+package com.dayou.dto.excel.equipment;
+
+import lombok.Data;
+
+import java.time.LocalDate;
+
+/**
+ * 机器设备-非标设备测算-段落模板
+ */
+@Data
+public class NonStandardEquipmentBaseDTO {
+
+    /**
+     * 测算名
+     */
+    private String calculateName;
+
+    /**
+     * 评估基准日
+     */
+    private LocalDate valuationBasisDate;
+
+}

+ 123 - 0
domain/src/main/java/com/dayou/dto/excel/equipment/NonStandardEquipmentInfoDTO.java

@@ -0,0 +1,123 @@
+package com.dayou.dto.excel.equipment;
+
+import lombok.Data;
+
+import java.time.LocalDate;
+
+/**
+ * 机器设备-非标设备测算-详细信息-段落模板
+ */
+@Data
+public class NonStandardEquipmentInfoDTO {
+
+    /**
+     * 序号
+     */
+    private Integer id;
+
+    /**
+     * 设备编号
+     */
+    private String equipmentNumber;
+
+    /**
+     * 设备名称
+     */
+    private String equipmentName;
+
+    /**
+     * 型号规格
+     */
+    private String model;
+
+    /**
+     * 生产厂家
+     */
+    private String manufacturer;
+
+    /**
+     * 所属系统/生产线名称
+     */
+    private String affiliatedSystem;
+
+    /**
+     * 计量单位
+     */
+    private String unitOfMeasurement;
+
+    /**
+     * 数量
+     */
+    private Integer quantity;
+
+    /**
+     * 购买日期
+     */
+    private LocalDate purchaseDate;
+
+    /**
+     * 启用日期
+     */
+    private LocalDate activationDate;
+
+    /**
+     * 原值
+     */
+    private Double originalValue;
+
+    /**
+     * 净值
+     */
+    private Double netValue;
+
+    /**
+     * 备注
+     */
+    private String remark;
+
+    /**
+     * 价格来源
+     */
+    private String priceSource;
+
+    /**
+     * 询价地点
+     */
+    private String inquiryLocation;
+
+    /**
+     * 主材费/设备报价(含税不含运费不含安装调试费)
+     */
+    private Double mainMaterialCost;
+
+    /**
+     * 不含主要外购件费的成本主材费率
+     */
+    private Double mainMaterialCostRate;
+
+    /**
+     * 主要外购件费
+     */
+    private Double mainPurchasedPartsCost;
+
+    /**
+     * 成本利润率
+     */
+    private Double costProfitRatio;
+
+    /**
+     * 销售税金率
+     */
+    private Double salesTaxRate;
+
+    /**
+     * 非标准设备设计费率
+     */
+    private Double designFeeRate;
+
+    /**
+     * 增值税率
+     */
+    private Double VATRate;
+
+}

+ 58 - 0
domain/src/main/java/com/dayou/entity/TmplAssetCalculate.java

@@ -0,0 +1,58 @@
+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-11-06
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class TmplAssetCalculate extends BaseEntity implements Serializable {
+
+    private static final long serialVersionUID=1L;
+
+    /**
+     * 测算表名字
+     */
+    private String calculateName;
+
+    /**
+     * 模板文件名字
+     */
+    private String fileName;
+
+    /**
+     * 模板文件存储位置
+     */
+    private String fileUrl;
+
+    /**
+     * 测算类型
+     */
+    private String calculateType;
+
+    /**
+     * 二级测算类型(针对细分情况)
+     */
+    private String calculateSecType;
+
+    /**
+     * 是否有段落模板
+     */
+    private Boolean hasSection;
+
+    /**
+     * 模板code
+     */
+    private String tmplCode;
+
+
+}

+ 48 - 0
domain/src/main/java/com/dayou/entity/TmplAssetCalculateSection.java

@@ -0,0 +1,48 @@
+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-11-06
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class TmplAssetCalculateSection extends BaseEntity implements Serializable {
+
+    private static final long serialVersionUID=1L;
+
+    /**
+     * 测算表模板id
+     */
+    private Long templateReportId;
+
+    /**
+     * 测算表段落模板名称
+     */
+    private String sectionName;
+
+    /**
+     * 段落模板文件名字
+     */
+    private String sectionFileName;
+
+    /**
+     * 段落模板文件存储位置
+     */
+    private String sectionFileUrl;
+
+    /**
+     * 模板code
+     */
+    private String tmplCode;
+
+
+}

+ 35 - 0
domain/src/main/java/com/dayou/enums/EquipmentTmplCode.java

@@ -0,0 +1,35 @@
+package com.dayou.enums;
+
+public enum EquipmentTmplCode {
+
+    MAIN("MAIN", "机器设备-主模板"),
+    MAIN_DOMESTIC("MAIN_DOMESTIC", "机器设备-主模板-国产设备信息-段落模板"),
+    MAIN_IMPORTED("MAIN_IMPORTED", "机器设备-主模板-进口设备信息-段落模板"),
+    MAIN_NONSTANDARD("MAIN_NONSTANDARD","机器设备-主模板-非标设备信息-段落模板"),
+    IMPORTED_CALCULATE("IMPORTED_CALCULATE", "机器设备-进口设备测算-段落模板"),
+    IMPORTED_CALCULATE_DETAIL("IMPORTED_CALCULATE_DETAIL", "机器设备-进口设备测算-详细信息-段落模板"),
+    NONSTANDARD_CALCULATE("NONSTANDARD_CALCULATE", "机器设备-非标设备测算-段落模板"),
+    NONSTANDARD_CALCULATE_DETAIL("NONSTANDARD_CALCULATE_DETAIL", "机器设备-非标设备测算-详细信息-段落模板");
+
+    private String code;
+
+    private String name;
+
+    EquipmentTmplCode(String code, String name) {
+        this.code = code;
+        this.name = name;
+    }
+
+    public String getCode() {
+        return code;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    @Override
+    public String toString() {
+        return name + ":" + code;
+    }
+}

+ 28 - 0
service/src/main/java/com/dayou/service/TmplAssetCalculateSectionService.java

@@ -0,0 +1,28 @@
+package com.dayou.service;
+
+import com.dayou.entity.TmplAssetCalculateSection;
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+
+/**
+ * <p>
+ * 资产测算表段落模板信息表 服务类
+ * </p>
+ *
+ * @author mybatis-plus-generator
+ * @since 2024-11-06
+ */
+public interface TmplAssetCalculateSectionService extends IService<TmplAssetCalculateSection> {
+
+    Page<TmplAssetCalculateSection> selectPage(Page page, TmplAssetCalculateSection tmplAssetCalculateSection);
+
+    TmplAssetCalculateSection detail(Long id);
+
+    Boolean add(TmplAssetCalculateSection tmplAssetCalculateSection);
+
+    Boolean update(TmplAssetCalculateSection tmplAssetCalculateSection);
+
+    Boolean delete(Long id);
+
+}

+ 28 - 0
service/src/main/java/com/dayou/service/TmplAssetCalculateService.java

@@ -0,0 +1,28 @@
+package com.dayou.service;
+
+import com.dayou.entity.TmplAssetCalculate;
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+
+/**
+ * <p>
+ * 资产测算表模板信息表 服务类
+ * </p>
+ *
+ * @author mybatis-plus-generator
+ * @since 2024-11-06
+ */
+public interface TmplAssetCalculateService extends IService<TmplAssetCalculate> {
+
+    Page<TmplAssetCalculate> selectPage(Page page, TmplAssetCalculate tmplAssetCalculate);
+
+    TmplAssetCalculate detail(Long id);
+
+    Boolean add(TmplAssetCalculate tmplAssetCalculate);
+
+    Boolean update(TmplAssetCalculate tmplAssetCalculate);
+
+    Boolean delete(Long id);
+
+}

+ 58 - 0
service/src/main/java/com/dayou/service/impl/TmplAssetCalculateSectionServiceImpl.java

@@ -0,0 +1,58 @@
+package com.dayou.service.impl;
+
+import com.dayou.entity.TmplAssetCalculateSection;
+import com.dayou.mapper.TmplAssetCalculateSectionMapper;
+import com.dayou.service.TmplAssetCalculateSectionService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+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-11-06
+ */
+@Service
+public class TmplAssetCalculateSectionServiceImpl extends ServiceImpl<TmplAssetCalculateSectionMapper, TmplAssetCalculateSection> implements TmplAssetCalculateSectionService {
+
+
+    @Override
+    @SuppressWarnings("unchecked")
+    public Page<TmplAssetCalculateSection> selectPage(Page page,TmplAssetCalculateSection tmplAssetCalculateSection){
+        return this.page(page, new QueryWrapper<TmplAssetCalculateSection>(tmplAssetCalculateSection));
+    }
+
+
+    @Override
+    public TmplAssetCalculateSection detail(Long id){
+        return this.getById(id);
+    }
+
+    @Override
+    public Boolean add(TmplAssetCalculateSection tmplAssetCalculateSection){
+        return  this.save(tmplAssetCalculateSection);
+    }
+
+    @Override
+    public Boolean update(TmplAssetCalculateSection tmplAssetCalculateSection){
+        return  this.updateById(tmplAssetCalculateSection);
+    }
+
+    @Override
+    public Boolean delete(Long id){
+        //逻辑删除
+        return this.removeById(id);
+    }
+}

+ 58 - 0
service/src/main/java/com/dayou/service/impl/TmplAssetCalculateServiceImpl.java

@@ -0,0 +1,58 @@
+package com.dayou.service.impl;
+
+import com.dayou.entity.TmplAssetCalculate;
+import com.dayou.mapper.TmplAssetCalculateMapper;
+import com.dayou.service.TmplAssetCalculateService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+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-11-06
+ */
+@Service
+public class TmplAssetCalculateServiceImpl extends ServiceImpl<TmplAssetCalculateMapper, TmplAssetCalculate> implements TmplAssetCalculateService {
+
+
+    @Override
+    @SuppressWarnings("unchecked")
+    public Page<TmplAssetCalculate> selectPage(Page page,TmplAssetCalculate tmplAssetCalculate){
+        return this.page(page, new QueryWrapper<TmplAssetCalculate>(tmplAssetCalculate));
+    }
+
+
+    @Override
+    public TmplAssetCalculate detail(Long id){
+        return this.getById(id);
+    }
+
+    @Override
+    public Boolean add(TmplAssetCalculate tmplAssetCalculate){
+        return  this.save(tmplAssetCalculate);
+    }
+
+    @Override
+    public Boolean update(TmplAssetCalculate tmplAssetCalculate){
+        return  this.updateById(tmplAssetCalculate);
+    }
+
+    @Override
+    public Boolean delete(Long id){
+        //逻辑删除
+        return this.removeById(id);
+    }
+}

+ 10 - 1
sql/update_sql.sql

@@ -175,4 +175,13 @@ ALTER TABLE assets_calculate DROP COLUMN calculate_file_name;
 ALTER TABLE assets_calculate DROP COLUMN calculate_file_url;
 # 模板信息表修改
 ALTER TABLE tmpl_asset_calculate ADD COLUMN has_section BIT(1) NOT NULL DEFAULT 0 COMMENT '是否有段落模板';
-ALTER TABLE tmpl_asset_report ADD COLUMN has_section BIT(1) NOT NULL DEFAULT 0 COMMENT '是否有段落模板';
+ALTER TABLE tmpl_asset_report ADD COLUMN has_section BIT(1) NOT NULL DEFAULT 0 COMMENT '是否有段落模板';
+
+/**
+  日期:2024-11-06
+  修改人:苟耕铨
+  未更新到test-env
+ */
+ALTER TABLE tmpl_asset_calculate_section ADD COLUMN section_name VARCHAR(50) NOT NULL COMMENT '测算表段落模板名称';
+ALTER TABLE tmpl_asset_calculate_section ADD COLUMN tmpl_code VARCHAR(50) NOT NULL COMMENT '模板code';
+ALTER TABLE tmpl_asset_calculate ADD COLUMN tmpl_code VARCHAR(50) NOT NULL COMMENT '模板code';