Prechádzať zdrojové kódy

1.机器设备作价-物价指数相关接口开发
2.新增WebConfig

GouGengquan 8 mesiacov pred
rodič
commit
332df03016

+ 11 - 0
biz-base/src/main/java/com/dayou/controller/AssetsCalculateEqptDataController.java

@@ -3,6 +3,7 @@ package com.dayou.controller;
 import cn.dev33.satoken.annotation.SaCheckLogin;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.dayou.dto.calculate.equipment.EqptQueryDTO;
+import com.dayou.entity.AssetsCalculate;
 import com.dayou.entity.AssetsCalculateEqptData;
 import com.dayou.result.Result;
 import com.dayou.service.AssetsCalculateEqptDataService;
@@ -47,4 +48,14 @@ public class AssetsCalculateEqptDataController {
         return Result.build(dataService.getDataPage(page, dto));
     }
 
+    /**
+     * 更新机器设备数据
+     * @param assetsCalculateEqptData 机器设备信息
+     * @return Boolean
+     */
+    @PutMapping("/update")
+    public Result<Boolean> update(@RequestBody AssetsCalculateEqptData assetsCalculateEqptData){
+        return Result.build(dataService.updateData(assetsCalculateEqptData));
+    }
+
 }

+ 52 - 0
biz-base/src/main/java/com/dayou/controller/EqptPPIController.java

@@ -0,0 +1,52 @@
+package com.dayou.controller;
+
+import com.dayou.entity.EqptPPI;
+import com.dayou.result.Result;
+import com.dayou.vo.EqptPPIDropDownData;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import com.dayou.service.EqptPPIService;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 机器设备物价指数表
+ *
+ * @author mybatis-plus-generator
+ * @since 2024-11-26
+ */
+@RestController
+@RequestMapping("eqptPPI")
+@Slf4j
+@CrossOrigin
+public class EqptPPIController {
+
+    @Autowired
+    private EqptPPIService eqptPpiService;
+
+    /**
+     * 获取所有
+     * @return List<String>
+     */
+    @GetMapping("/getPPIDownData")
+    public Result<List<EqptPPIDropDownData>> getPPIDownData() {
+        return Result.build(eqptPpiService.getPPIDownData());
+    }
+
+    /**
+     * 根据ppi名和类型获取ppi
+     * @param ppiName 名
+     * @param ppiType 类型
+     * @return EqptPPI
+     */
+    @GetMapping("/getPPIByNameType")
+    public Result<EqptPPI> getPPIByNameType(String ppiName, String ppiType) {
+        return Result.build(eqptPpiService.getPPIByNameType(ppiName, ppiType));
+    }
+
+}
+

+ 20 - 2
biz-base/src/main/java/com/dayou/controller/FileController.java

@@ -37,7 +37,7 @@ public class FileController {
     public Result<Map<String, String>> uploadAssetsCalculateTmpl(MultipartFile multipartFile){
         // 判断文件类型
         if (Objects.equals(multipartFile.getContentType(), "application/vnd.ms-excel") || Objects.equals(multipartFile.getContentType(), "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet")) {
-            return Result.build(FileNetUtil.uploadToServer(multipartFile, fileNetConfig.getBaseDir(), fileNetConfig.getAssetTemplateCalculatePath(), UUID.randomUUID() + "_" +multipartFile.getOriginalFilename()));
+            return Result.build(FileNetUtil.uploadToServer(multipartFile, fileNetConfig.getBaseDir(), fileNetConfig.getAssetTemplateCalculatePath(), System.currentTimeMillis() + "_" +multipartFile.getOriginalFilename()));
         }else {
             return Result.build(Status.PARAM_ERROR, "请上传xls或xlsx类型的excel文档!");
         }
@@ -52,7 +52,7 @@ public class FileController {
     public Result<Map<String, String>> uploadAssetsReportTmpl(MultipartFile multipartFile){
         // 判断文件类型
         if (Objects.equals(multipartFile.getContentType(), "application/msword") || Objects.equals(multipartFile.getContentType(), "application/vnd.openxmlformats-officedocument.wordprocessingml.document")){
-            return Result.build(FileNetUtil.uploadToServer(multipartFile, fileNetConfig.getBaseDir(), fileNetConfig.getAssetTemplateReportPath(), UUID.randomUUID() + "_" + multipartFile.getOriginalFilename()));
+            return Result.build(FileNetUtil.uploadToServer(multipartFile, fileNetConfig.getBaseDir(), fileNetConfig.getAssetTemplateReportPath(), System.currentTimeMillis() + "_" + multipartFile.getOriginalFilename()));
         }else {
             return Result.build(Status.PARAM_ERROR, "请上传doc或docx类型的word文档!");
         }
@@ -85,4 +85,22 @@ public class FileController {
         FileNetUtil.writeFile2Response(request,response,collect1,COLLECT1_XLSX);
     }
 
+    /**
+     * 上传图片
+     * @param file 文件
+     */
+    @PostMapping("/upload/image")
+    public Result<String> uploadImage(MultipartFile file) {
+        String contentType = file.getContentType();
+        boolean isImage = contentType != null && contentType.startsWith("image/");
+        // 判断文件类型
+        if (isImage){
+            String fileName = System.currentTimeMillis() + "_" + file.getOriginalFilename();
+            FileNetUtil.uploadToServer(file, fileNetConfig.getBaseDir(), fileNetConfig.getImage(), fileName);
+            return Result.build(fileNetConfig.getDomain() + "/images/" + fileName);
+        }else {
+            return Result.build(Status.PARAM_ERROR, "请上传图片!");
+        }
+    }
+
 }

+ 3 - 0
biz-base/src/main/resources/application-local.yaml

@@ -68,6 +68,9 @@ file-net:
   # 基础配置
   base-dir: E:\productivity-platform-files\
   max-file-size: 102400
+  domain: http://127.0.0.1:9080/pp/res
+  # 图片
+  image: images\
   # 资产业务配置
   asset-template-report-path: assets\templates\report\
   asset-template-calculate-path: assets\templates\calculate\

+ 10 - 0
common/src/main/java/com/dayou/config/FileNetConfig.java

@@ -20,6 +20,16 @@ public class FileNetConfig {
     private String assetTemplateReportPath;
 
     /**
+     * 文件访问url路径
+     */
+    private String domain;
+
+    /**
+     * 图片存储位置
+     */
+    private String image;
+
+    /**
      * 资产测算表模板存储位置
      */
     private String assetTemplateCalculatePath;

+ 24 - 0
common/src/main/java/com/dayou/config/WebConfig.java

@@ -0,0 +1,24 @@
+package com.dayou.config;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.web.servlet.config.annotation.ResourceHandlerRegistry;
+import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
+
+@Configuration
+public class WebConfig implements WebMvcConfigurer {
+
+    @Autowired
+    private FileNetConfig fileNetConfig;
+
+    /**
+     * 上传后的静态资源访问配置
+     * @param registry
+     */
+    @Override
+    public void addResourceHandlers(ResourceHandlerRegistry registry) {
+        // 图片访问配置
+        registry.addResourceHandler("/res/images/**")
+                .addResourceLocations("file:" + fileNetConfig.getBaseDir() + fileNetConfig.getImage()); //此处为设置服务端存储图片的dir路径
+    }
+}

+ 40 - 0
dao/src/main/java/com/dayou/mapper/EqptPPIMapper.java

@@ -0,0 +1,40 @@
+package com.dayou.mapper;
+
+import com.dayou.entity.EqptPPI;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 机器设备物价指数表 Mapper 接口
+ * </p>
+ *
+ * @author mybatis-plus-generator
+ * @since 2024-11-26
+ */
+public interface EqptPPIMapper extends BaseMapper<EqptPPI> {
+
+    /**
+     * 获取所有PPI类型
+     * @return List<String>
+     */
+    List<String> getAllPPIType();
+
+    /**
+     * 根据类型获取指数信息
+     * @param type 类型
+     * @return List<EqptPPI>
+     */
+    List<EqptPPI> getPPIByType(@Param("type") String type);
+
+    /**
+     * 根据ppi名和类型获取ppi
+     * @param ppiName 名
+     * @param ppiType 类型
+     * @return EqptPPI
+     */
+    EqptPPI getPPIByNameType(@Param("ppiName") String ppiName, @Param("ppiType") String ppiType);
+
+}

+ 10 - 2
dao/src/main/resources/mapper/AssetsCalculateEqptDataMapper.xml

@@ -44,7 +44,11 @@
 
     <!--根据测算表id获取所有机器设备导入的数据-->
     <select id="getAllByAssetsCalculateId" resultType="com.dayou.entity.AssetsCalculateEqptData">
-        SELECT id, assets_calculate_id, sort_id, equipment_name, manufacturer, model, purchase_date, activation_date, storage_location, quantity, unit_of_measurement, original_value, net_value, equipment_type, equipment_type_detail, remark, create_time, update_time, delete_status
+        SELECT id, assets_calculate_id, sort_id, equipment_name, manufacturer, model, purchase_date, activation_date,
+        storage_location, quantity, unit_of_measurement, book_original_value, book_net_value, equipment_type, remark,
+        create_time, update_time, delete_status, taxed_unit_price, (tax_rate / 100) AS taxRate, economic_service_life,
+        (direct_observation_depreciation_rate / 100) AS directObservationDepreciationRate, valuation_method, inquiry_basis, inquiry_location, price,
+        (freight_and_miscellaneous_fee_rate / 100) AS freightAndMiscellaneousFeeRate, (base_rate / 100) AS baseRate, (installation_rate / 100) AS installationRate
         FROM assets_calculate_eqpt_data
         WHERE delete_status = 0
         AND assets_calculate_id = #{calculateId}
@@ -55,7 +59,11 @@
 
     <!--分页查询导入的机器设备测算数据-->
     <select id="getDataPage" resultType="com.dayou.entity.AssetsCalculateEqptData">
-        SELECT id, assets_calculate_id, sort_id, equipment_name, manufacturer, model, purchase_date, activation_date, storage_location, quantity, unit_of_measurement, book_original_value, book_net_value, equipment_type, remark
+        SELECT id, assets_calculate_id, sort_id, equipment_name, manufacturer, model, purchase_date, activation_date,
+        storage_location, quantity, unit_of_measurement, book_original_value, book_net_value, equipment_type, remark,
+        create_time, update_time, delete_status, taxed_unit_price, tax_rate, economic_service_life,
+        direct_observation_depreciation_rate, valuation_method, inquiry_basis, inquiry_location, price,
+        freight_and_miscellaneous_fee_rate, base_rate, installation_rate
         FROM assets_calculate_eqpt_data
         WHERE delete_status = 0
         AND assets_calculate_id = #{dto.calculateId}

+ 50 - 0
dao/src/main/resources/mapper/EqptPPIMapper.xml

@@ -0,0 +1,50 @@
+<?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.EqptPPIMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.dayou.entity.EqptPPI">
+        <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="ppi_name" property="ppiName" />
+        <result column="ppi_type" property="ppiType" />
+        <result column="ppi" property="ppi" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id,
+        create_time,
+        update_time,
+        delete_status,
+        ppi_name, ppi_type, ppi
+    </sql>
+
+    <!--获取所有PPI类型-->
+    <select id="getAllPPIType" resultType="java.lang.String">
+        SELECT DISTINCT ppi_type
+        FROM eqpt_ppi
+        WHERE delete_status = 0
+    </select>
+
+    <!--根据类型获取指数信息-->
+    <select id="getPPIByType" resultType="com.dayou.entity.EqptPPI">
+        SELECT id, ppi_name, ppi_type, ppi
+        FROM eqpt_ppi
+        WHERE delete_status = 0
+          AND ppi IS NOT NULL
+          AND ppi_type = #{type}
+    </select>
+
+    <!--根据ppi名和类型获取ppi-->
+    <select id="getPPIByNameType" resultType="com.dayou.entity.EqptPPI">
+        SELECT id, ppi_name, ppi_type, ppi
+        FROM eqpt_ppi
+        WHERE delete_status = 0
+        AND ppi_name = #{ppiName}
+        AND ppi_type = #{ppiType}
+    </select>
+
+</mapper>

+ 10 - 10
domain/src/main/java/com/dayou/common/CalculateFormula.java

@@ -13,21 +13,21 @@ public class CalculateFormula {
 
     public enum EquipmentMainFormula {
         不含税单价("L{0}/(1+M{0})",14),
-        原值("AQ{0}",16),
+        原值("AP{0}",16),
         成新率("Y{0}",17),
         净值("ROUND(P{0}*Q{0},0)",18),
         已使用年数("ROUND(($U$2-F{0})/365,2)",20),
         年限成新率("IF((S{0}-T{0})/S{0}<15%,15%,ROUND((S{0}-T{0})/S{0},2))",21),
         综合成新率("ROUND(U{0}*V{0}+W{0}*X{0},2)",25),
-        报价("AE{0}*H{0}",31),
-        运杂费("ROUND(AF{0}*AG{0},0)",33),
-        基础费("ROUND(AF{0}*AI{0},0)",35),
-        安装费("AF{0}*AK{0}",37),
-        设备工程费("ROUND(AF{0}+AH{0}+AJ{0}+AL{0},0)",38),
-        前期费("ROUND(AM{0}*AT3,0)",39),
-        资金成本("ROUND((AN{0}*((1+$AT$3)^($AT$1)-1)+AM{0}*((1+$AT$3)^($AT$1/2)-1)),0)",40),
-        可抵扣增值税("ROUND(AF{0}/(1+13%)*13%+(AH{0}+AJ{0}+AL{0})/(1+9%)*9%+AM{0}*($AT$3-$AT$4)/1.06*0.06,0)",41),
-        重置全价("ROUND(AM{0}+AN{0}+AO{0}-AP{0},0)",42);
+        报价("AD{0}*H{0}",31),
+        运杂费("ROUND(AE{0}*AF{0},0)",33),
+        基础费("ROUND(AE{0}*AH{0},0)",35),
+        安装费("AE{0}*AJ{0}",37),
+        设备工程费("ROUND(AE{0}+AG{0}+AI{0}+AK{0},0)",38),
+        前期费("ROUND(AL{0}*AS3,0)",39),
+        资金成本("ROUND((AM{0}*((1+$AS$3)^($AS$1)-1)+AL{0}*((1+$AS$3)^($AS$1/2)-1)),0)",40),
+        可抵扣增值税("ROUND(AE{0}/(1+13%)*13%+(AG{0}+AI{0}+AK{0})/(1+9%)*9%+AL{0}*($AS$3-$AS$4)/1.06*0.06,0)",41),
+        重置全价("ROUND(AL{0}+AM{0}+AN{0}-AO{0},0)",42);
 
         /**
          * 公式

+ 2 - 2
domain/src/main/java/com/dayou/entity/AssetsCalculateEqptData.java

@@ -188,13 +188,13 @@ public class AssetsCalculateEqptData extends BaseEntity implements Serializable
      * 权重1
      */
     @TableField(exist = false)
-    private Double weight01 = 40.00;
+    private Double weight01 = 0.4;
 
     /**
      * 权重2
      */
     @TableField(exist = false)
-    private Double weight02 = 60.00;
+    private Double weight02 = 0.6;
 
 
 }

+ 38 - 0
domain/src/main/java/com/dayou/entity/EqptPPI.java

@@ -0,0 +1,38 @@
+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-26
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class EqptPPI extends BaseEntity implements Serializable {
+
+    private static final long serialVersionUID=1L;
+
+    /**
+     * 指标名称/频率/单位
+     */
+    private String ppiName;
+
+    /**
+     * 指数行业类型
+     */
+    private String ppiType;
+
+    /**
+     * 指数值
+     */
+    private Float ppi;
+
+
+}

+ 15 - 0
domain/src/main/java/com/dayou/vo/EqptPPIDropDownData.java

@@ -0,0 +1,15 @@
+package com.dayou.vo;
+
+import com.dayou.entity.EqptPPI;
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class EqptPPIDropDownData {
+
+    private String ppiType;
+
+    private List<EqptPPI> eqptPPI;
+
+}

+ 7 - 0
service/src/main/java/com/dayou/service/AssetsCalculateEqptDataService.java

@@ -47,4 +47,11 @@ public interface AssetsCalculateEqptDataService extends IService<AssetsCalculate
      */
     Boolean deleteDataByCalculateId(Long calculateId);
 
+    /**
+     * 更新机器设备数据
+     * @param assetsCalculateEqptData 机器设备信息
+     * @return Boolean
+     */
+    Boolean updateData(AssetsCalculateEqptData assetsCalculateEqptData);
+
 }

+ 34 - 0
service/src/main/java/com/dayou/service/EqptPPIService.java

@@ -0,0 +1,34 @@
+package com.dayou.service;
+
+import com.dayou.entity.EqptPPI;
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.dayou.vo.EqptPPIDropDownData;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * <p>
+ * 机器设备物价指数表 服务类
+ * </p>
+ *
+ * @author mybatis-plus-generator
+ * @since 2024-11-26
+ */
+public interface EqptPPIService extends IService<EqptPPI> {
+
+
+    /**
+     * 获取所有PPI
+     */
+    List<EqptPPIDropDownData> getPPIDownData();
+
+    /**
+     * 根据ppi名和类型获取ppi
+     * @param ppiName 名
+     * @param ppiType 类型
+     * @return EqptPPI
+     */
+    EqptPPI getPPIByNameType(String ppiName, String ppiType);
+
+}

+ 5 - 0
service/src/main/java/com/dayou/service/impl/AssetsCalculateEqptDataServiceImpl.java

@@ -67,4 +67,9 @@ public class AssetsCalculateEqptDataServiceImpl extends ServiceImpl<AssetsCalcul
     public Boolean deleteDataByCalculateId(Long calculateId) {
         return dataMapper.deleteDataByCalculateId(calculateId);
     }
+
+    @Override
+    public Boolean updateData(AssetsCalculateEqptData assetsCalculateEqptData) {
+        return this.updateById(assetsCalculateEqptData);
+    }
 }

+ 57 - 0
service/src/main/java/com/dayou/service/impl/EqptPPIServiceImpl.java

@@ -0,0 +1,57 @@
+package com.dayou.service.impl;
+
+import com.dayou.entity.EqptPPI;
+import com.dayou.mapper.EqptPPIMapper;
+import com.dayou.service.EqptPPIService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.dayou.vo.EqptPPIDropDownData;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * <p>
+ * 机器设备物价指数表 服务实现类
+ * </p>
+ *
+ * @author mybatis-plus-generator
+ * @since 2024-11-26
+ */
+@Service
+public class EqptPPIServiceImpl extends ServiceImpl<EqptPPIMapper, EqptPPI> implements EqptPPIService {
+
+    @Autowired
+    private EqptPPIMapper eqptPPIMapper;
+
+    /**
+     * 获取所有PPI类型
+     * @return List<String>
+     */
+    @Override
+    public List<EqptPPIDropDownData> getPPIDownData() {
+        List<EqptPPIDropDownData> dropDownData = new ArrayList<>();
+        List<String> ppiType = eqptPPIMapper.getAllPPIType();
+        for (String type : ppiType) {
+            EqptPPIDropDownData ppi = new EqptPPIDropDownData();
+            ppi.setPpiType(type);
+            ppi.setEqptPPI(eqptPPIMapper.getPPIByType(type));
+            dropDownData.add(ppi);
+        }
+        return dropDownData;
+    }
+
+    /**
+     * 根据ppi名和类型获取ppi
+     * @param ppiName 名
+     * @param ppiType 类型
+     * @return EqptPPI
+     */
+    @Override
+    public EqptPPI getPPIByNameType(String ppiName, String ppiType) {
+        return eqptPPIMapper.getPPIByNameType(ppiName, ppiType);
+    }
+}

+ 29 - 0
sql/update_sql.sql

@@ -365,3 +365,32 @@ CREATE TABLE `eqpt_life_ifr_refs`  (
                                        `delete_status` bit(1) NOT NULL DEFAULT b'0' COMMENT '删除状态',
                                        PRIMARY KEY (`id`) USING BTREE
 ) ENGINE = InnoDB AUTO_INCREMENT = 1155 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '设备年限、安装费率参考信息表' ROW_FORMAT = Dynamic;
+
+/**
+  日期:2024-11-26
+  修改人:苟耕铨
+  未更新到test-env
+ */
+DROP TABLE IF EXISTS `eqpt_ppi`;
+CREATE TABLE `eqpt_ppi`  (
+                             `id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT '机器设备物价指数id',
+                             `ppi_name` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '指标名称/频率/单位',
+                             `ppi_type` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '指数行业类型',
+                             `ppi` float(11, 2) NULL DEFAULT NULL COMMENT '指数值',
+                             `create_time` datetime(0) NOT NULL DEFAULT CURRENT_TIMESTAMP(0) COMMENT '创建时间',
+                             `update_time` datetime(0) NOT NULL DEFAULT CURRENT_TIMESTAMP(0) ON UPDATE CURRENT_TIMESTAMP(0) COMMENT '修改时间',
+                             `delete_status` bit(1) NOT NULL DEFAULT b'0' COMMENT '删除状态',
+                             PRIMARY KEY (`id`) USING BTREE
+) ENGINE = InnoDB AUTO_INCREMENT = 70 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '机器设备物价指数表' ROW_FORMAT = Dynamic;
+# 将命名修改为下划线
+ALTER TABLE assets_calculate_eqpt_data CHANGE COLUMN taxedUnitPrice taxed_unit_price DECIMAL(11, 2) NULL COMMENT '含税单价';
+ALTER TABLE assets_calculate_eqpt_data CHANGE COLUMN taxRate tax_rate DECIMAL(11, 2) NULL COMMENT '税率';
+ALTER TABLE assets_calculate_eqpt_data CHANGE COLUMN economicServiceLife economic_service_life INT(11) NULL COMMENT '经济使用年数';
+ALTER TABLE assets_calculate_eqpt_data CHANGE COLUMN directObservationDepreciationRate direct_observation_depreciation_rate DECIMAL(11, 2) NULL COMMENT '直接观察成新率';
+ALTER TABLE assets_calculate_eqpt_data CHANGE COLUMN valuationMethod valuation_method VARCHAR(100) NULL COMMENT '作价方法';
+ALTER TABLE assets_calculate_eqpt_data CHANGE COLUMN inquiryBasis inquiry_basis VARCHAR(500) NULL COMMENT '询价依据';
+ALTER TABLE assets_calculate_eqpt_data CHANGE COLUMN inquiryLocation inquiry_location VARCHAR(500) NULL COMMENT '询价地点';
+ALTER TABLE assets_calculate_eqpt_data CHANGE COLUMN price price DECIMAL(11, 2) NULL COMMENT '单价';
+ALTER TABLE assets_calculate_eqpt_data CHANGE COLUMN freightAndMiscellaneousFeeRate freight_and_miscellaneous_fee_rate DECIMAL(11, 2) NULL COMMENT '运杂费率';
+ALTER TABLE assets_calculate_eqpt_data CHANGE COLUMN baseRate base_rate DECIMAL(11, 2) NULL COMMENT '基础费率';
+ALTER TABLE assets_calculate_eqpt_data CHANGE COLUMN installationRate installation_rate DECIMAL(11, 2) NULL COMMENT '安装费率';