1.修改通用下载接口

2.资产保存文档信息不保存完整磁盘路径
3.文档查询接口修改

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

@@ -2,6 +2,7 @@ package com.dayou.controller;
 
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.dayou.dto.DocumentProductionQueryDTO;
 import com.dayou.entity.DocumentProduction;
 import com.dayou.result.Result;
 import com.dayou.service.DocumentProductionService;
@@ -22,12 +23,12 @@ public class DocumentProductionController {
 
     /**
      * 文档列表
-     * @param documentProduction
+     * @param dto
      * @return
      */
     @GetMapping("")
-    public Result<Page<DocumentProduction>> documentProduction(DocumentProduction documentProduction,Page page) {
-        Page<DocumentProduction> ret = documentProductionService.getPage(documentProduction,page);
+    public Result<Page<DocumentProduction>> documentProduction(DocumentProductionQueryDTO dto, Page page) {
+        Page<DocumentProduction> ret = documentProductionService.getPage(dto,page);
         return Result.build(ret);
 
     }

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

@@ -118,7 +118,7 @@ public class FileController {
      */
     @GetMapping("/download")
     public void downloadFile(HttpServletRequest request, HttpServletResponse response, String fileDiskPath, String fileName){
-        File file = new File(fileDiskPath);
+        File file = new File(fileNetConfig.getBaseDir() + fileDiskPath);
         FileNetUtil.writeFile2Response(request,response,file,fileName);
     }
 

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

@@ -2,12 +2,13 @@ package com.dayou.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.dayou.dto.DocumentProductionQueryDTO;
 import com.dayou.entity.DocumentProduction;
 import org.apache.ibatis.annotations.Param;
 
 public interface DocumentProductionMapper extends BaseMapper<DocumentProduction> {
 
-    Page<DocumentProduction> getPage(Page page, @Param("doc") DocumentProduction doc);
+    Page<DocumentProduction> getPage(Page page, @Param("dto") DocumentProductionQueryDTO dto);
 
     /**
      * 通过业务id获取文档信息

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

@@ -19,8 +19,11 @@
             consignor
         FROM
             document_production
-        WHERE
-            business_type != 'ASSETS'
+        WHERE business_type = 'ASSETS'
+            AND DATE(create_time) = #{dto.createDate}
+            <if test="dto != null and dto.docName != null ">
+                AND doc_name LIKE CONCAT('%', #{dto.docName}, '%')
+            </if>
             AND delete_status = 0 ORDER by update_time DESC
     </select>
 

domain/src/main/java/com/dayou/dto/DocumentProductionQueryDTO.java

@@ -0,0 +1,21 @@
+package com.dayou.dto;
+
+import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.time.LocalDate;
+
+@Data
+public class DocumentProductionQueryDTO {
+
+    /**
+     * 创建时间
+     */
+    @DateTimeFormat(pattern = "yyyy-M-d")
+    private LocalDate createDate;
+
+    /**
+     * 文件名称
+     */
+    private String docName;
+}

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

@@ -3,11 +3,12 @@ package com.dayou.service;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.dayou.dto.DocumentProductionQueryDTO;
 import com.dayou.entity.DocumentProduction;
 
 public interface DocumentProductionService extends IService<DocumentProduction> {
 
-    Page<DocumentProduction> getPage(DocumentProduction documentProduction, Page page);
+    Page<DocumentProduction> getPage(DocumentProductionQueryDTO dto, Page page);
 
     /**
      * 保存文档信息

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

@@ -213,7 +213,8 @@ public class AssetsCalculateServiceImpl extends ServiceImpl<AssetsCalculateMappe
 
         // 第三步:将 机器设备-主模板-设备信息-段落模板 拼接到 写入数据到 机器设备-主模板
         // 合并后文件的位置
-        String mainMergePath = fileNetConfig.getBaseDir() + fileNetConfig.getAssetOutputCalculatePath() + System.currentTimeMillis() + "_机器设备测算表.xlsx";
+        String docUrl = fileNetConfig.getAssetOutputCalculatePath() + System.currentTimeMillis() + "_机器设备测算表.xlsx";
+        String mainMergePath = fileNetConfig.getBaseDir() + docUrl;
         Workbook workbook = EasyExcelUtil.mergeExcel(mainDetailPath, mainPath, 0, 4, 0, 0);
 
         // 第四步:主模板设置公式
@@ -379,7 +380,7 @@ public class AssetsCalculateServiceImpl extends ServiceImpl<AssetsCalculateMappe
                 .setDocType(EQPT_CALCULATE.getName())
                 .setDocName(assetsCalculateVO.getCalculateName() + ".xlsx")
                 .setConsignor(assetsCalculateVO.getPrincipal())
-                .setDocUrl(mainMergePath)
+                .setDocUrl(docUrl)
                 .setCreateUserId(StpUtil.getLoginIdAsLong())
                 .setBusinessCate(assetsCalculateVO.getProjectTypeName())
                 .setDocNo("")

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

@@ -267,7 +267,8 @@ public class AssetsReportServiceImpl extends ServiceImpl<AssetsReportMapper, Ass
         // 获取框架模板
         TmplAssetReport mainTmpl = tmplAssetReportMapper.getTmplByCode(MAIN.getCode());
         // 框架生成后文件位置
-        String mainPath = fileNetConfig.getBaseDir() + fileNetConfig.getAssetOutputReportPath() + System.currentTimeMillis() + "_设备融资报告.docx";
+        String docUrl = fileNetConfig.getAssetOutputReportPath() + System.currentTimeMillis() + "_设备融资报告.docx";
+        String mainPath = fileNetConfig.getBaseDir() + docUrl;
         // 框架模板文件位置
         String mainTmplPath = fileNetConfig.getBaseDir() + mainTmpl.getFileUrl() + mainTmpl.getFileName();
 
@@ -365,7 +366,7 @@ public class AssetsReportServiceImpl extends ServiceImpl<AssetsReportMapper, Ass
                 .setDocType(EQPT_REPORT.getName())
                 .setDocName(assetsReportVO.getReportName() + ".docx")
                 .setConsignor(assetsReportVO.getPrincipal())
-                .setDocUrl(mainPath)
+                .setDocUrl(docUrl)
                 .setCreateUserId(StpUtil.getLoginIdAsLong())
                 .setBusinessCate(assetsReportVO.getProjectTypeName())
                 .setDocNo(ObjectUtil.isNotNull(eqptReportFillBO.getProductionNo()) ? eqptReportFillBO.getProductionNo() : "")

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

@@ -3,6 +3,7 @@ package com.dayou.service.impl;
 import cn.hutool.core.util.ObjectUtil;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.dayou.dto.DocumentProductionQueryDTO;
 import com.dayou.entity.DocumentProduction;
 import com.dayou.mapper.DocumentProductionMapper;
 import com.dayou.service.DocumentProductionService;
@@ -17,8 +18,8 @@ public class DocumentProductionServiceImpl extends ServiceImpl<DocumentProductio
     private DocumentProductionMapper documentProductionMapper;
 
     @Override
-    public Page<DocumentProduction> getPage(DocumentProduction documentProduction, Page page) {
-        return  documentProductionMapper.getPage(page,documentProduction);
+    public Page<DocumentProduction> getPage(DocumentProductionQueryDTO dto, Page page) {
+        return  documentProductionMapper.getPage(page,dto);
     }
 
     /**

sql/update_sql.sql

@@ -977,3 +977,11 @@ ALTER TABLE assets_calculate_eqpt_data ADD KEY `manufacturer` (`manufacturer`) U
   未更新到test-env
  */
 ALTER TABLE assets_calculate_eqpt_data ADD COLUMN inquiry_web VARCHAR(500) NULL COMMENT '询价网址';
+
+/**
+  日期：2024-12-28
+  修改人:苟耕铨
+  未更新到test-env
+ */
+ALTER TABLE assets_calculate_eqpt_data MODIFY COLUMN manufacturer VARCHAR(255) NULL COMMENT '生产厂家';
+ALTER TABLE assets_calculate_eqpt_data MODIFY COLUMN model VARCHAR(255) NULL COMMENT '型号规格';