Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
P
patzn-cloud-service-hmhj
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
wangweidong
patzn-cloud-service-hmhj
Commits
39d66f8f
Commit
39d66f8f
authored
Jul 10, 2021
by
ghxdhr
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修改打印文件的查询条件
parent
ad5beab0
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
3 additions
and
4 deletions
+3
-4
EntrustAnnexServiceImpl.java
...rvice/lims/hmhj/service/impl/EntrustAnnexServiceImpl.java
+3
-4
No files found.
src/main/java/com/patzn/cloud/service/lims/hmhj/service/impl/EntrustAnnexServiceImpl.java
View file @
39d66f8f
...
...
@@ -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
();
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment