Commit 39d66f8f by ghxdhr

修改打印文件的查询条件

parent ad5beab0
......@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.mapper.Condition;
import com.baomidou.mybatisplus.toolkit.CollectionUtils;
import com.patzn.cloud.commons.api.RestAssert;
import com.patzn.cloud.commons.controller.Account;
import com.patzn.cloud.commons.toolkit.DateUtils;
import com.patzn.cloud.oss.starter.OssClient;
import com.patzn.cloud.oss.starter.OssFileResult;
import com.patzn.cloud.service.hmhj.entity.EntrustAnnex;
......@@ -22,10 +23,7 @@ import org.springframework.web.multipart.MultipartFile;
import org.springframework.web.multipart.MultipartHttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import java.util.ArrayList;
import java.util.Collections;
import java.util.Iterator;
import java.util.List;
import java.util.*;
/**
* 服务实现类
......@@ -117,6 +115,7 @@ public class EntrustAnnexServiceImpl extends BaseServiceImpl<EntrustAnnexMapper,
.eq("type",entrustIdAndType[1].equals("word") ? "docx" : "")
/* 这个remark写死,保证取到是生成的检测委托书,不是用户自己上传的 */
.eq("remark","打印检测委托书时上传生成的文件")
.ge("ctime", DateUtils.toDate(DateUtils.toYearMonthDay(new Date())))
.orderBy("ctime", false));
if (CollectionUtils.isNotEmpty(entrustAnnexes)) {
return entrustAnnexes.get(0).getObjectKey();
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment