Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in
Toggle navigation
D
data-acquisition
Project
Project
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
竹天卫
data-acquisition
Commits
e4f0764a
Commit
e4f0764a
authored
Jul 13, 2021
by
竹天卫
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
送样结果单列表展示 增加筛选条件 收样时间
parent
9c08069c
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
21 additions
and
5 deletions
+21
-5
TSampleLaboratorysheetController.java
...business/controller/TSampleLaboratorysheetController.java
+4
-2
ITSampleLaboratorysheetService.java
...tion/business/service/ITSampleLaboratorysheetService.java
+1
-1
TSampleLaboratorysheetServiceImpl.java
...iness/service/impl/TSampleLaboratorysheetServiceImpl.java
+16
-2
No files found.
acquisition-business/src/main/java/cn/wise/sc/acquisition/business/controller/TSampleLaboratorysheetController.java
View file @
e4f0764a
...
@@ -129,10 +129,12 @@ public class TSampleLaboratorysheetController {
...
@@ -129,10 +129,12 @@ public class TSampleLaboratorysheetController {
param
.
setYh
(
yh
);
param
.
setYh
(
yh
);
return
itSampleLaboratorysheetService
.
getImage
(
param
,
response
);
return
itSampleLaboratorysheetService
.
getImage
(
param
,
response
);
}
}
@ApiOperation
(
value
=
"送样结果单列表展示"
)
@ApiOperation
(
value
=
"送样结果单列表展示"
)
@RequestMapping
(
value
=
"/getList"
,
method
=
RequestMethod
.
GET
)
@RequestMapping
(
value
=
"/getList"
,
method
=
RequestMethod
.
GET
)
public
R
getList
()
{
public
R
getList
(
String
Sysj
)
{
return
itSampleLaboratorysheetService
.
getList
();
return
itSampleLaboratorysheetService
.
getList
(
Sysj
);
}
}
}
}
acquisition-business/src/main/java/cn/wise/sc/acquisition/business/service/ITSampleLaboratorysheetService.java
View file @
e4f0764a
...
@@ -31,7 +31,7 @@ public interface ITSampleLaboratorysheetService extends IService<TSampleLaborato
...
@@ -31,7 +31,7 @@ public interface ITSampleLaboratorysheetService extends IService<TSampleLaborato
R
getPage
(
TSampleLaboratorysheetQuery
tSampleLaboratorysheetQuery
,
Query
query
);
R
getPage
(
TSampleLaboratorysheetQuery
tSampleLaboratorysheetQuery
,
Query
query
);
R
getList
();
R
getList
(
String
Sysj
);
R
getSampleListByYh
(
TSampleListQuery
param
);
R
getSampleListByYh
(
TSampleListQuery
param
);
}
}
acquisition-business/src/main/java/cn/wise/sc/acquisition/business/service/impl/TSampleLaboratorysheetServiceImpl.java
View file @
e4f0764a
...
@@ -24,6 +24,8 @@ import org.springframework.stereotype.Service;
...
@@ -24,6 +24,8 @@ import org.springframework.stereotype.Service;
import
org.springframework.transaction.annotation.Transactional
;
import
org.springframework.transaction.annotation.Transactional
;
import
javax.servlet.http.HttpServletResponse
;
import
javax.servlet.http.HttpServletResponse
;
import
java.text.ParseException
;
import
java.text.SimpleDateFormat
;
import
java.time.format.DateTimeFormatter
;
import
java.time.format.DateTimeFormatter
;
import
java.util.HashMap
;
import
java.util.HashMap
;
import
java.util.List
;
import
java.util.List
;
...
@@ -224,8 +226,20 @@ public class TSampleLaboratorysheetServiceImpl extends ServiceImpl<TSampleLabora
...
@@ -224,8 +226,20 @@ public class TSampleLaboratorysheetServiceImpl extends ServiceImpl<TSampleLabora
}
}
@Override
@Override
public
R
getList
()
{
public
R
getList
(
String
Sysj
)
{
List
<
TSampleLaboratorysheet
>
list
=
baseMapper
.
getList
();
QueryWrapper
<
TSampleLaboratorysheet
>
queryWrapper
=
new
QueryWrapper
<>();
if
(
StringUtils
.
isNotBlank
(
Sysj
)){
try
{
SimpleDateFormat
formatter
=
new
SimpleDateFormat
(
"yyyy-MM-dd HH:mm:ss"
);
String
startDate
=
Sysj
+
" 00:00:00"
;
String
endDate
=
Sysj
+
" 23:59:59"
;
queryWrapper
.
between
(
"Sysj"
,
formatter
.
parse
(
startDate
),
formatter
.
parse
(
endDate
));
}
catch
(
ParseException
e
)
{
e
.
printStackTrace
();
}
}
List
<
TSampleLaboratorysheet
>
list
=
baseMapper
.
selectList
(
queryWrapper
);
return
R
.
ok
(
list
);
return
R
.
ok
(
list
);
}
}
...
...
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