1.机器设备测算表新增列inquiryWeb(询价网址)

2.新增下载资产测算表段落模板接口
3.机器设备测算表公式调整

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

@@ -2,8 +2,10 @@ package com.dayou.controller;
 
 import cn.hutool.core.lang.UUID;
 import com.dayou.config.FileNetConfig;
+import com.dayou.entity.TmplAssetCalculateSection;
 import com.dayou.result.Result;
 import com.dayou.result.Status;
+import com.dayou.service.TmplAssetCalculateSectionService;
 import com.dayou.utils.FileNetUtil;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -17,6 +19,7 @@ import java.util.Map;
 import java.util.Objects;
 
 import static com.dayou.constants.HouseGuarantyDoc.COLLECT1_XLSX;
+import static com.dayou.enums.EqptCalculateTmplCode.MAIN_DETAIL;
 
 @RestController
 @RequestMapping("/file")
@@ -26,6 +29,9 @@ import static com.dayou.constants.HouseGuarantyDoc.COLLECT1_XLSX;
 public class FileController {
 
     @Autowired
+    private TmplAssetCalculateSectionService tmplAssetCalculateSectionService;
+
+    @Autowired
     private FileNetConfig fileNetConfig;
 
     /**
@@ -116,4 +122,18 @@ public class FileController {
         FileNetUtil.writeFile2Response(request,response,file,fileName);
     }
 
+    /**
+     * 下载资产机器设备测算表段落模板
+     * @param request
+     * @param response
+     */
+    @GetMapping("/download/assets/declarationForm")
+    public void downloadDeclarationForm(HttpServletRequest request, HttpServletResponse response, String tmplCode){
+        // 获取模板
+        TmplAssetCalculateSection tmpl = tmplAssetCalculateSectionService.getTmplByCode(tmplCode);
+        String path = fileNetConfig.getBaseDir() + tmpl.getSectionFileUrl() + tmpl.getSectionFileName();
+        File file = new File(path);
+        FileNetUtil.writeFile2Response(request,response,file,tmpl.getSectionFileName());
+    }
+
 }

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

@@ -48,7 +48,7 @@
         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,
-        usage_situation
+        usage_situation, inquiry_web
         FROM assets_calculate_eqpt_data
         WHERE delete_status = 0
         AND assets_calculate_id = #{calculateId}
@@ -64,7 +64,7 @@
         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, usage_situation
+        freight_and_miscellaneous_fee_rate, base_rate, installation_rate, usage_situation, inquiry_web, evaluate_original_value, evaluate_net_value
         FROM assets_calculate_eqpt_data
         WHERE delete_status = 0
         AND assets_calculate_id = #{dto.calculateId}

domain/src/main/java/com/dayou/common/CalculateFormula.java

@@ -26,22 +26,22 @@ public class CalculateFormula {
      */
     public enum EquipmentMainFormula {
         不含税单价("ROUND(M{0,number,#}/(1+N{0,number,#}),2)",15),
-        原值("AR{0,number,#}",17),
+        原值("AS{0,number,#}",17),
         成新率("AA{0,number,#}",18),
         净值("ROUND(Q{0,number,#}*R{0,number,#},0)",19),
         增值率("ROUND((S{0,number,#}-L{0,number,#})/L{0,number,#},2)", 20),
         已使用年数("ROUND(($W$2-F{0,number,#})/365,2)",22),
         年限成新率("IF((U{0,number,#}-V{0,number,#})/U{0,number,#}<15%,15%,ROUND((U{0,number,#}-V{0,number,#})/U{0,number,#},2))",23),
         综合成新率("ROUND(W{0,number,#}*X{0,number,#}+Y{0,number,#}*Z{0,number,#},2)",27),
-        报价("AF{0,number,#}*I{0,number,#}",33),
-        运杂费("ROUND(AG{0,number,#}*AH{0,number,#},0)",35),
-        基础费("ROUND(AG{0,number,#}*AJ{0,number,#},0)",37),
-        安装费("AG{0,number,#}*AL{0,number,#}",39),
-        设备工程费("ROUND(AG{0,number,#}+AI{0,number,#}+AK{0,number,#}+AM{0,number,#},0)",40),
-        前期费("ROUND(AN{0,number,#}*$AU$3,0)",41),
-        资金成本("ROUND((AO{0,number,#}*((1+$AU$3)^($AU$1)-1)+AN{0,number,#}*((1+$AU$3)^($AU$1/2)-1)),0)",42),
-        可抵扣增值税("ROUND(AG{0,number,#}/(1+13%)*13%+(AI{0,number,#}+AK{0,number,#}+AM{0,number,#})/(1+9%)*9%+AN{0,number,#}*($AU$3-$AU$4)/1.06*0.06,0)",43),
-        重置全价("ROUND(AN{0,number,#}+AO{0,number,#}+AP{0,number,#}-AQ{0,number,#},0)",44);
+        报价("AG{0,number,#}*I{0,number,#}",34),
+        运杂费("ROUND(AH{0,number,#}*AI{0,number,#},0)",36),
+        基础费("ROUND(AH{0,number,#}*AK{0,number,#},0)",38),
+        安装费("AH{0,number,#}*AM{0,number,#}",40),
+        设备工程费("ROUND(AH{0,number,#}+AJ{0,number,#}+AL{0,number,#}+AN{0,number,#},0)",41),
+        前期费("ROUND(AO{0,number,#}*$AV$3,0)",42),
+        资金成本("ROUND((AP{0,number,#}*((1+$AV$3)^($AV$1)-1)+AO{0,number,#}*((1+$AV$3)^($AV$1/2)-1)),0)",43),
+        可抵扣增值税("ROUND(AH{0,number,#}/(1+13%)*13%+(AJ{0,number,#}+AL{0,number,#}+AN{0,number,#})/(1+9%)*9%+AO{0,number,#}*($AV$3-$AV$4)/1.06*0.06,0)",44),
+        重置全价("ROUND(AO{0,number,#}+AP{0,number,#}+AQ{0,number,#}-AR{0,number,#},0)",45);
 
         /**
          * 公式

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

@@ -178,6 +178,13 @@ public class AssetsCalculateEqptData extends BaseEntity implements Serializable
     private String inquiryBasis;
 
     /**
+     * 询价网址
+     */
+    @ExcelIgnore
+    @TableField(updateStrategy = FieldStrategy.IGNORED)
+    private String inquiryWeb;
+
+    /**
      * 询价地点
      */
     @ExcelIgnore

domain/src/main/java/com/dayou/enums/EqptCalculateTmplCode.java

@@ -5,7 +5,8 @@ public enum EqptCalculateTmplCode {
     MAIN("MAIN", "机器设备-主模板"),
     MAIN_DETAIL("MAIN_DETAIL", "机器设备-主模板-设备信息-段落模板"),
     IMPORTED("IMPORTED", "机器设备-进口设备-段落模板"),
-    NONSTANDARD("NONSTANDARD", "机器设备-非标设备-段落模板");
+    NONSTANDARD("NONSTANDARD", "机器设备-非标设备-段落模板"),
+    DECLARATION_FORM("DECLARATION_FORM", "机器设备-基础信息导入模板");
 
     private String code;
 

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

@@ -23,4 +23,6 @@ public interface TmplAssetCalculateSectionService extends IService<TmplAssetCalc
 
         Boolean delete(Long id);
 
+        TmplAssetCalculateSection getTmplByCode(String code);
+
 }

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

@@ -55,4 +55,9 @@ public class TmplAssetCalculateSectionServiceImpl extends ServiceImpl<TmplAssetC
         //逻辑删除
         return this.removeById(id);
     }
+
+    @Override
+    public TmplAssetCalculateSection getTmplByCode(String code) {
+        return baseMapper.getByTmplCode(code);
+    }
 }

sql/update_sql.sql

@@ -970,3 +970,10 @@ ALTER TABLE assets_calculate_eqpt_data ADD KEY `activation_date` (`activation_da
   未更新到test-env
  */
 ALTER TABLE assets_calculate_eqpt_data ADD KEY `manufacturer` (`manufacturer`) USING BTREE;
+
+/**
+  日期：2024-12-26
+  修改人:苟耕铨
+  未更新到test-env
+ */
+ALTER TABLE assets_calculate_eqpt_data ADD COLUMN inquiry_web VARCHAR(500) NULL COMMENT '询价网址';