1.机器设备测算表模板修改

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

@@ -22,7 +22,7 @@ import java.util.Objects;
 @RequestMapping("/file")
 @Slf4j
 @CrossOrigin
-@SaCheckRole("ADMIN")
+@SaCheckLogin
 public class FileUploadController {
 
     @Autowired

domain/src/main/java/com/dayou/dto/excel/equipment/EquipmentBaseDTO.java

@@ -1,4 +1,4 @@
-package com.dayou.dto.excel.equipment;
+package com.dayou.dto.calculate.equipment;
 
 import lombok.Data;
 

domain/src/main/java/com/dayou/dto/excel/equipment/EquipmentInfoDTO.java

@@ -1,4 +1,4 @@
-package com.dayou.dto.excel.equipment;
+package com.dayou.dto.calculate.equipment;
 
 import lombok.Data;
 
@@ -53,7 +53,12 @@ public class EquipmentInfoDTO {
     /**
      * 账面原值
      */
-    private Double originalCost;
+    private Double originalValue;
+
+    /**
+     * 账面净值
+     */
+    private Double netValue;
 
     /**
      * 含税单价
@@ -66,14 +71,9 @@ public class EquipmentInfoDTO {
     private Double taxRate;
 
     /**
-     * 备注01
+     * 备注
      */
-    private String remark01;
-
-    /**
-     * 备注002
-     */
-    private String remark02;
+    private String remark;
 
     /**
      * 经济使用年数
@@ -91,6 +91,11 @@ public class EquipmentInfoDTO {
     private String equipmentType;
 
     /**
+     * 设备详细类型
+     */
+    private String equipmentTypeDetail;
+
+    /**
      * 作价方法
      */
     private String valuationMethod;

domain/src/main/java/com/dayou/dto/excel/equipment/ImportedEquipmentBaseDTO.java

@@ -1,4 +1,4 @@
-package com.dayou.dto.excel.equipment;
+package com.dayou.dto.calculate.equipment;
 
 import lombok.Data;
 

domain/src/main/java/com/dayou/dto/excel/equipment/ImportedEquipmentInfoDTO.java

@@ -1,4 +1,4 @@
-package com.dayou.dto.excel.equipment;
+package com.dayou.dto.calculate.equipment;
 
 import lombok.Data;
 

domain/src/main/java/com/dayou/dto/excel/equipment/NonStandardEquipmentBaseDTO.java

@@ -1,4 +1,4 @@
-package com.dayou.dto.excel.equipment;
+package com.dayou.dto.calculate.equipment;
 
 import lombok.Data;
 

domain/src/main/java/com/dayou/dto/excel/equipment/NonStandardEquipmentInfoDTO.java

@@ -1,4 +1,4 @@
-package com.dayou.dto.excel.equipment;
+package com.dayou.dto.calculate.equipment;
 
 import lombok.Data;