1.生成机器设备融资项目报告时默认开启修订模式

2.单个新增机器设备信息接口
3.删除查询机器设备过滤条件，改为前端实现

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

@@ -1,10 +1,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.dto.calculate.equipment.EqptTableFilterQueryDTO;
-import com.dayou.entity.AssetsCalculate;
 import com.dayou.entity.AssetsCalculateEqptData;
 import com.dayou.entity.AssetsCalculateEqptImpData;
 import com.dayou.entity.AssetsCalculateEqptNonsData;
@@ -12,7 +9,6 @@ import com.dayou.result.Result;
 import com.dayou.service.AssetsCalculateEqptDataService;
 import com.dayou.vo.AssetsCalculateEqptImpDataVO;
 import com.dayou.vo.AssetsCalculateEqptNonsDataVO;
-import com.dayou.vo.EqptTableFilterVO;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
@@ -36,6 +32,16 @@ public class AssetsCalculateEqptDataController {
     private AssetsCalculateEqptDataService dataService;
 
     /**
+     * 新增机器设备信息
+     * @param assetsCalculateEqptData 设备信息
+     * @return Boolean
+     */
+    @PostMapping("/addEqptData")
+    public Result<Boolean> addEqptData(@RequestBody AssetsCalculateEqptData assetsCalculateEqptData) {
+        return Result.build(dataService.addEqptData(assetsCalculateEqptData));
+    }
+
+    /**
      * 获取是否有进口设备
      * @param calculateId 测算表id
      * @return Result<Boolean>
@@ -78,7 +84,6 @@ public class AssetsCalculateEqptDataController {
 
     /**
      * 分页查询进口设备信息
-     * @param page 分页
      * @param dto 查询dto
      * @return Page<AssetsCalculateEqptImpData>
      */
@@ -137,14 +142,4 @@ public class AssetsCalculateEqptDataController {
         return Result.build(dataService.updateBatchNonSData(dataList));
     }
 
-    /**
-     * 获取机器设备作价table的筛选条件
-     * @param eqptTableFilterQueryDTO 查询dto
-     * @return EqptTableFilterVO
-     */
-    @GetMapping("/getEqptTableFilterVO")
-    public Result<EqptTableFilterVO> getEqptTableFilterVO(EqptTableFilterQueryDTO eqptTableFilterQueryDTO) {
-        return Result.build(dataService.getEqptTableFilterVO(eqptTableFilterQueryDTO));
-    }
-
 }

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

@@ -1,6 +1,5 @@
 package com.dayou.mapper;
 
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.dayou.dto.calculate.equipment.EqptQueryDTO;
 import com.dayou.entity.AssetsCalculateEqptData;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
@@ -8,7 +7,6 @@ import com.dayou.entity.AssetsCalculateEqptImpData;
 import com.dayou.entity.AssetsCalculateEqptNonsData;
 import com.dayou.vo.AssetsCalculateEqptImpDataVO;
 import com.dayou.vo.AssetsCalculateEqptNonsDataVO;
-import com.dayou.vo.TableFilterVO;
 import org.apache.ibatis.annotations.Param;
 
 import java.math.BigDecimal;
@@ -116,36 +114,4 @@ public interface AssetsCalculateEqptDataMapper extends BaseMapper<AssetsCalculat
      */
     Boolean addNonSData(@Param("data") AssetsCalculateEqptNonsData data);
 
-    /**
-     * 获取机器设备作价table设备名称的筛选条件
-     * @param calculateId 测算表id
-     * @param equipmentName 设备名称
-     * @return EqptTableFilterVO
-     */
-    List<TableFilterVO> getEqptTableNameFilters(@Param("calculateId") Long calculateId, @Param("equipmentName") String equipmentName, @Param("eqptType") String eqptType);
-
-    /**
-     * 获取机器设备作价table型号的筛选条件
-     * @param calculateId 测算表id
-     * @param model 设备型号
-     * @return EqptTableFilterVO
-     */
-    List<TableFilterVO> getEqptTableModelFilters(@Param("calculateId") Long calculateId,@Param("model") String model, @Param("eqptType") String eqptType);
-
-    /**
-     * 获取机器设备作价table购买日期的筛选条件
-     * @param calculateId 测算表id
-     * @param purchaseDate 购买日期
-     * @return EqptTableFilterVO
-     */
-    List<TableFilterVO> getEqptTablePurchaseDateFilters(@Param("calculateId") Long calculateId,@Param("purchaseDate") String purchaseDate, @Param("eqptType") String eqptType);
-
-    /**
-     * 获取机器设备作价table启用日期的筛选条件
-     * @param calculateId 测算表id
-     * @param activationDate 启用日期
-     * @return EqptTableFilterVO
-     */
-    List<TableFilterVO> getEqptTableActivationDateFilters(@Param("calculateId") Long calculateId,@Param("activationDate") String activationDate, @Param("eqptType") String eqptType);
-
 }

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

@@ -101,6 +101,12 @@
                 #{item}
             </foreach>
         </if>
+        <if test="dto != null and dto.manufacturerFilters.size() > 0">
+            AND manufacturer IN
+            <foreach item="item" collection="dto.manufacturerFilters" open="(" separator="," close=")">
+                #{item}
+            </foreach>
+        </if>
         ORDER BY sort_id
     </select>
 
@@ -176,6 +182,12 @@
                 #{item}
             </foreach>
         </if>
+        <if test="dto != null and dto.manufacturerFilters.size() > 0">
+            AND manufacturer IN
+            <foreach item="item" collection="dto.manufacturerFilters" open="(" separator="," close=")">
+                #{item}
+            </foreach>
+        </if>
         ORDER BY data.sort_id
     </select>
 
@@ -321,6 +333,12 @@
                 #{item}
             </foreach>
         </if>
+        <if test="dto != null and dto.manufacturerFilters.size() > 0">
+            AND manufacturer IN
+            <foreach item="item" collection="dto.manufacturerFilters" open="(" separator="," close=")">
+                #{item}
+            </foreach>
+        </if>
         ORDER BY data.sort_id
     </select>
 
@@ -401,64 +419,4 @@
               #{data.material1},#{data.material2},#{data.material1Quantity},#{data.material2Quantity},#{data.material1UseRatio},#{data.material2UseRatio},#{data.material1Price},#{data.material2Price})
     </insert>
 
-    <!--获取机器设备作价table设备名称的筛选条件-->
-    <select id="getEqptTableNameFilters" resultType="com.dayou.vo.TableFilterVO">
-        SELECT DISTINCT equipment_name AS filter,
-        (SELECT COUNT(equipment_name) FROM assets_calculate_eqpt_data AS subquery WHERE subquery.equipment_name = mainquery.equipment_name AND subquery.delete_status = 0) AS count
-        FROM assets_calculate_eqpt_data AS mainquery
-        WHERE delete_status = 0
-        AND assets_calculate_id = #{calculateId}
-        <if test="eqptType != null and eqptType != ''">
-            AND equipment_type = #{eqptType}
-        </if>
-        <if test="equipmentName != null and equipmentName != ''">
-            AND equipment_name LIKE CONCAT('%', #{equipmentName}, '%')
-        </if>
-    </select>
-
-    <!--获取机器设备作价table型号的筛选条件-->
-    <select id="getEqptTableModelFilters" resultType="com.dayou.vo.TableFilterVO">
-        SELECT DISTINCT model AS filter,
-        (SELECT COUNT(model) FROM assets_calculate_eqpt_data AS subquery WHERE subquery.model = mainquery.model AND subquery.delete_status = 0) AS count
-        FROM assets_calculate_eqpt_data AS mainquery
-        WHERE delete_status = 0
-          AND assets_calculate_id = #{calculateId}
-        <if test="eqptType != null and eqptType != ''">
-            AND equipment_type = #{eqptType}
-        </if>
-        <if test="model != null and model != ''">
-            AND model LIKE CONCAT('%', #{model}, '%')
-        </if>
-    </select>
-
-    <!--获取机器设备作价table购买日期的筛选条件-->
-    <select id="getEqptTablePurchaseDateFilters" resultType="com.dayou.vo.TableFilterVO">
-        SELECT DISTINCT purchase_date AS filter,
-        (SELECT COUNT(purchase_date) FROM assets_calculate_eqpt_data AS subquery WHERE subquery.purchase_date = mainquery.purchase_date AND subquery.delete_status = 0) AS count
-        FROM assets_calculate_eqpt_data AS mainquery
-        WHERE delete_status = 0
-          AND assets_calculate_id = #{calculateId}
-        <if test="eqptType != null and eqptType != ''">
-            AND equipment_type = #{eqptType}
-        </if>
-        <if test="purchaseDate != null and purchaseDate != ''">
-            AND purchase_date = #{purchaseDate}
-        </if>
-    </select>
-
-    <!--获取机器设备作价table启用日期的筛选条件-->
-    <select id="getEqptTableActivationDateFilters" resultType="com.dayou.vo.TableFilterVO">
-        SELECT DISTINCT activation_date AS filter,
-        (SELECT COUNT(activation_date) FROM assets_calculate_eqpt_data AS subquery WHERE subquery.activation_date = mainquery.activation_date AND subquery.delete_status = 0) AS count
-        FROM assets_calculate_eqpt_data AS mainquery
-        WHERE delete_status = 0
-          AND assets_calculate_id = #{calculateId}
-        <if test="eqptType != null and eqptType != ''">
-            AND equipment_type = #{eqptType}
-        </if>
-        <if test="activationDate != null and activationDate != ''">
-            AND activation_date = #{activationDate}
-        </if>
-    </select>
-
 </mapper>

domain/src/main/java/com/dayou/dto/calculate/equipment/EqptQueryDTO.java

@@ -47,5 +47,10 @@ public class EqptQueryDTO {
      */
     private List<String> activationDateFilters;
 
+    /**
+     * 机器设备生产厂家筛选条件
+     */
+    private List<String> manufacturerFilters;
+
 
 }

domain/src/main/java/com/dayou/dto/calculate/equipment/EqptTableFilterQueryDTO.java

@@ -1,43 +0,0 @@
-package com.dayou.dto.calculate.equipment;
-
-import lombok.Data;
-
-@Data
-public class EqptTableFilterQueryDTO {
-
-    /**
-     * 测算表id
-     */
-    private Long calculateId;
-
-    /**
-     * 设备名
-     */
-    private String equipmentName;
-
-    /**
-     * 型号
-     */
-    private String model;
-
-    /**
-     * 购买日期
-     */
-    private String purchaseDate;
-
-    /**
-     * 启用日期
-     */
-    private String activationDate;
-
-    /**
-     * 查询类型(all、equipmentName、model、purchaseDate、activationDate)
-     */
-    private String queryType;
-
-    /**
-     * 设备类型(国产设备、进口设备、非标设备)
-     */
-    private String eqptType;
-
-}

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

@@ -1,33 +0,0 @@
-package com.dayou.vo;
-
-import lombok.Data;
-
-import java.util.List;
-
-/**
- * 机器设备作价页面列筛选条件
- */
-@Data
-public class EqptTableFilterVO {
-
-    /**
-     * 机器设备名称筛选条件
-     */
-    private List<TableFilterVO> equipmentNameFilters;
-
-    /**
-     * 机器设备型号筛选条件
-     */
-    private List<TableFilterVO> modelFilters;
-
-    /**
-     * 机器设备购买日期筛选条件
-     */
-    private List<TableFilterVO> purchaseDateFilters;
-
-    /**
-     * 机器设备启用日期筛选条件
-     */
-    private List<TableFilterVO> activationDateFilters;
-
-}

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

@@ -1,17 +0,0 @@
-package com.dayou.vo;
-
-import lombok.Data;
-
-@Data
-public class TableFilterVO {
-
-    /**
-     * 筛选条件
-     */
-    private String filter;
-
-    /**
-     * 符合条件的数据数量
-     */
-    private Integer count;
-}

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

@@ -1,15 +1,11 @@
 package com.dayou.service;
 import com.dayou.dto.calculate.equipment.EqptQueryDTO;
-import com.dayou.dto.calculate.equipment.EqptTableFilterQueryDTO;
-import com.dayou.entity.AssetsCalculate;
 import com.dayou.entity.AssetsCalculateEqptData;
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.dayou.entity.AssetsCalculateEqptImpData;
 import com.dayou.entity.AssetsCalculateEqptNonsData;
 import com.dayou.vo.AssetsCalculateEqptImpDataVO;
 import com.dayou.vo.AssetsCalculateEqptNonsDataVO;
-import com.dayou.vo.EqptTableFilterVO;
 
 import java.util.List;
 
@@ -24,6 +20,13 @@ import java.util.List;
 public interface AssetsCalculateEqptDataService extends IService<AssetsCalculateEqptData> {
 
     /**
+     * 新增机器设备信息
+     * @param assetsCalculateEqptData 设备信息
+     * @return Boolean
+     */
+    Boolean addEqptData(AssetsCalculateEqptData assetsCalculateEqptData);
+
+    /**
      * 获取是否有进口设备
      * @param calculateId 测算表id
      * @return Boolean
@@ -122,11 +125,4 @@ public interface AssetsCalculateEqptDataService extends IService<AssetsCalculate
      */
     Boolean updateBatchNonSData(List<AssetsCalculateEqptNonsData> dataList);
 
-    /**
-     * 获取机器设备作价table的筛选条件
-     * @param eqptTableFilterQueryDTO 查询dto
-     * @return EqptTableFilterVO
-     */
-    EqptTableFilterVO getEqptTableFilterVO(EqptTableFilterQueryDTO eqptTableFilterQueryDTO);
-
 }

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

@@ -2,7 +2,6 @@ package com.dayou.service.impl;
 
 import cn.hutool.core.util.ObjectUtil;
 import com.dayou.dto.calculate.equipment.EqptQueryDTO;
-import com.dayou.dto.calculate.equipment.EqptTableFilterQueryDTO;
 import com.dayou.entity.AssetsCalculateEqptData;
 import com.dayou.entity.AssetsCalculateEqptImpData;
 import com.dayou.entity.AssetsCalculateEqptNonsData;
@@ -11,18 +10,11 @@ import com.dayou.service.AssetsCalculateEqptDataService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.dayou.vo.AssetsCalculateEqptImpDataVO;
 import com.dayou.vo.AssetsCalculateEqptNonsDataVO;
-import com.dayou.vo.EqptTableFilterVO;
 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;
 
 /**
@@ -40,6 +32,16 @@ public class AssetsCalculateEqptDataServiceImpl extends ServiceImpl<AssetsCalcul
     private AssetsCalculateEqptDataMapper dataMapper;
 
     /**
+     * 新增机器设备信息
+     * @param assetsCalculateEqptData 设备信息
+     * @return Boolean
+     */
+    @Override
+    public Boolean addEqptData(AssetsCalculateEqptData assetsCalculateEqptData) {
+        return this.save(assetsCalculateEqptData);
+    }
+
+    /**
      * 获取是否有进口设备
      * @param calculateId 测算表id
      * @return Boolean
@@ -199,27 +201,4 @@ public class AssetsCalculateEqptDataServiceImpl extends ServiceImpl<AssetsCalcul
         }
         return Boolean.TRUE;
     }
-
-    /**
-     * 获取机器设备作价table的筛选条件
-     * @param eqptTableFilterQueryDTO 查询dto
-     * @return EqptTableFilterVO
-     */
-    @Override
-    public EqptTableFilterVO getEqptTableFilterVO(EqptTableFilterQueryDTO eqptTableFilterQueryDTO) {
-        EqptTableFilterVO eqptTableFilterVO = new EqptTableFilterVO();
-        if (eqptTableFilterQueryDTO.getQueryType().equals("all") || eqptTableFilterQueryDTO.getQueryType().equals("equipmentName")) {
-            eqptTableFilterVO.setEquipmentNameFilters(dataMapper.getEqptTableNameFilters(eqptTableFilterQueryDTO.getCalculateId(), eqptTableFilterQueryDTO.getEquipmentName(), eqptTableFilterQueryDTO.getEqptType()));
-        }
-        if (eqptTableFilterQueryDTO.getQueryType().equals("all") || eqptTableFilterQueryDTO.getQueryType().equals("model")) {
-            eqptTableFilterVO.setModelFilters(dataMapper.getEqptTableModelFilters(eqptTableFilterQueryDTO.getCalculateId(), eqptTableFilterQueryDTO.getModel(), eqptTableFilterQueryDTO.getEqptType()));
-        }
-        if (eqptTableFilterQueryDTO.getQueryType().equals("all") || eqptTableFilterQueryDTO.getQueryType().equals("purchaseDate")) {
-            eqptTableFilterVO.setPurchaseDateFilters(dataMapper.getEqptTablePurchaseDateFilters(eqptTableFilterQueryDTO.getCalculateId(), eqptTableFilterQueryDTO.getPurchaseDate(), eqptTableFilterQueryDTO.getEqptType()));
-        }
-        if (eqptTableFilterQueryDTO.getQueryType().equals("all") || eqptTableFilterQueryDTO.getQueryType().equals("activationDate")) {
-            eqptTableFilterVO.setActivationDateFilters(dataMapper.getEqptTableActivationDateFilters(eqptTableFilterQueryDTO.getCalculateId(), eqptTableFilterQueryDTO.getActivationDate(), eqptTableFilterQueryDTO.getEqptType()));
-        }
-        return eqptTableFilterVO;
-    }
 }

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

@@ -34,6 +34,7 @@ import java.math.RoundingMode;
 import java.nio.file.Files;
 import java.nio.file.Paths;
 import java.text.DecimalFormat;
+import java.util.Date;
 import java.util.List;
 import java.util.stream.Collectors;
 
@@ -332,6 +333,10 @@ public class AssetsReportServiceImpl extends ServiceImpl<AssetsReportMapper, Ass
         coverDoc.appendDocument(mainDoc, ImportFormatMode.KEEP_SOURCE_FORMATTING);
         // 更新目录页码
         AsposeWordUtil.updateCatalogueLink(coverDoc);
+
+        // 开启word的修订模式(修改留痕)
+        coverDoc.setTrackRevisions(true);
+
         coverDoc.save(mainPath);
 
         // 关闭各个段落的流

sql/update_sql.sql

@@ -963,3 +963,10 @@ ALTER TABLE assets_calculate_eqpt_data ADD KEY `equipment_name` (`equipment_name
 ALTER TABLE assets_calculate_eqpt_data ADD KEY `model` (`model`) USING BTREE;
 ALTER TABLE assets_calculate_eqpt_data ADD KEY `purchase_date` (`purchase_date`) USING BTREE;
 ALTER TABLE assets_calculate_eqpt_data ADD KEY `activation_date` (`activation_date`) USING BTREE;
+
+/**
+  日期：2024-12-26
+  修改人:苟耕铨
+  未更新到test-env
+ */
+ALTER TABLE assets_calculate_eqpt_data ADD KEY `manufacturer` (`manufacturer`) USING BTREE;