Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
P
patzn-cloud-service-soil
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-soil
Commits
9fcc95ab
Commit
9fcc95ab
authored
May 08, 2021
by
wangweidong
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
土工试验优化
parent
70a27b7b
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
3 additions
and
2 deletions
+3
-2
ReportUtil.java
.../java/com/patzn/cloud/service/lims/report/ReportUtil.java
+2
-1
SoilExperimentServiceImpl.java
...ice/lims/soil/service/impl/SoilExperimentServiceImpl.java
+1
-1
AttachmentTemplateSZYS.xlsx
...ain/resources/templates/excel/AttachmentTemplateSZYS.xlsx
+0
-0
SoilEntrustImport.xlsx
...in/resources/templates/excel/input/SoilEntrustImport.xlsx
+0
-0
No files found.
src/main/java/com/patzn/cloud/service/lims/report/ReportUtil.java
View file @
9fcc95ab
...
@@ -15,7 +15,7 @@ import java.util.Map;
...
@@ -15,7 +15,7 @@ import java.util.Map;
public
final
class
ReportUtil
{
public
final
class
ReportUtil
{
public
static
void
initChongSu
(
List
<
SoilExperimentVO
>
voList
,
List
<
SoilItem
>
soilItemList
){
public
static
List
<
SoilExperimentVO
>
initChongSu
(
List
<
SoilExperimentVO
>
voList
,
List
<
SoilItem
>
soilItemList
){
Map
<
String
,
Integer
>
checkChongSuMap
=
new
HashMap
<>();
Map
<
String
,
Integer
>
checkChongSuMap
=
new
HashMap
<>();
for
(
SoilExperimentVO
vo
:
voList
)
{
for
(
SoilExperimentVO
vo
:
voList
)
{
...
@@ -59,6 +59,7 @@ public final class ReportUtil {
...
@@ -59,6 +59,7 @@ public final class ReportUtil {
for
(
SoilItem
item
:
saveNewItemList
)
{
for
(
SoilItem
item
:
saveNewItemList
)
{
soilItemList
.
add
(
item
);
soilItemList
.
add
(
item
);
}
}
return
voList
;
}
}
...
...
src/main/java/com/patzn/cloud/service/lims/soil/service/impl/SoilExperimentServiceImpl.java
View file @
9fcc95ab
...
@@ -671,7 +671,7 @@ public class SoilExperimentServiceImpl extends BaseServiceImpl<SoilExperimentMap
...
@@ -671,7 +671,7 @@ public class SoilExperimentServiceImpl extends BaseServiceImpl<SoilExperimentMap
if
(
chong
){
if
(
chong
){
ReportUtil
.
initChongSu
(
voList
,
soilItemList
);
voList
=
ReportUtil
.
initChongSu
(
voList
,
soilItemList
);
}
}
Map
<
Long
,
List
<
SoilItem
>>
expItemMap
=
new
HashMap
<>();
Map
<
Long
,
List
<
SoilItem
>>
expItemMap
=
new
HashMap
<>();
for
(
SoilItem
item:
soilItemList
)
{
for
(
SoilItem
item:
soilItemList
)
{
...
...
src/main/resources/templates/excel/AttachmentTemplateSZYS.xlsx
View file @
9fcc95ab
No preview for this file type
src/main/resources/templates/excel/input/SoilEntrustImport.xlsx
View file @
9fcc95ab
No preview for this file type
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