Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in / Register
Toggle navigation
T
tianjin-cement
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
竹天卫
tianjin-cement
Commits
e1fa3d83
Commit
e1fa3d83
authored
Oct 10, 2020
by
竹天卫
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
校核 检测详情 平行样样品梳理
parent
69520eee
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
97 additions
and
51 deletions
+97
-51
SampleDistributionMapper.java
...e/sc/cement/business/mapper/SampleDistributionMapper.java
+0
-1
SampleDistributionMapper.xml
...c/cement/business/mapper/xml/SampleDistributionMapper.xml
+1
-1
EntrustServiceImpl.java
...e/sc/cement/business/service/impl/EntrustServiceImpl.java
+95
-48
CheckCountUtil.java
.../java/cn/wise/sc/cement/business/util/CheckCountUtil.java
+1
-1
No files found.
cement-business/src/main/java/cn/wise/sc/cement/business/mapper/SampleDistributionMapper.java
View file @
e1fa3d83
...
...
@@ -29,7 +29,6 @@ public interface SampleDistributionMapper extends BaseMapper<SampleDistribution>
IPage
<
SampleDistributionVo
>
getPage
(
@Param
(
"page"
)
Page
page
,
@Param
(
"params"
)
Map
<
String
,
Object
>
params
);
List
<
SampleDistributionTeamVo
>
getDistributionTeamList
(
@Param
(
"sampleId"
)
Integer
sampleId
,
@Param
(
"sampleId2"
)
Integer
sampleId2
,
@Param
(
"userId"
)
Integer
userId
);
List
<
SampleCheckGroupVo
>
getSampleCheckGroupList
(
@Param
(
"sampleId"
)
Integer
sampleId
);
...
...
cement-business/src/main/java/cn/wise/sc/cement/business/mapper/xml/SampleDistributionMapper.xml
View file @
e1fa3d83
...
...
@@ -54,7 +54,7 @@
left join sys_user su on su.id = t.user_id
left join team s on s.id = t.team_id
left join team_group tg on tg.id = t.team_group_id
where
(t.sample_id = #{sampleId} or t.sample_id = #{sampleId2})
where
t.sample_id = #{sampleId}
<if
test=
"userId != null"
>
and t.user_id = #{userId}
</if>
...
...
cement-business/src/main/java/cn/wise/sc/cement/business/service/impl/EntrustServiceImpl.java
View file @
e1fa3d83
...
...
@@ -22,6 +22,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
import
com.baomidou.mybatisplus.core.toolkit.CollectionUtils
;
import
com.baomidou.mybatisplus.extension.plugins.pagination.Page
;
import
com.baomidou.mybatisplus.extension.service.impl.ServiceImpl
;
import
net.bytebuddy.description.field.FieldDescription
;
import
org.apache.commons.lang3.StringUtils
;
import
org.springframework.beans.BeanUtils
;
import
org.springframework.beans.factory.annotation.Autowired
;
...
...
@@ -312,7 +313,7 @@ public class EntrustServiceImpl extends ServiceImpl<EntrustMapper, Entrust> impl
sampleVo
.
setTeamName
(
teamName
);
//评审人员可以查看所有的检测项内容
List
<
SampleDistributionTeamVo
>
sampleDistributionTeamVoList
=
distributionMapper
.
getDistributionTeamList
(
sample
.
getId
(),
null
,
null
);
distributionMapper
.
getDistributionTeamList
(
sample
.
getId
(),
null
);
if
(
sampleDistributionTeamVoList
!=
null
&&
sampleDistributionTeamVoList
.
size
()
>
0
)
{
sampleVo
.
setSampleDistributionTeamVoList
(
sampleDistributionTeamVoList
);
}
else
{
...
...
@@ -502,7 +503,9 @@ public class EntrustServiceImpl extends ServiceImpl<EntrustMapper, Entrust> impl
for
(
Sample
sample
:
sampleList
)
{
SampleVo
sampleVo
=
new
SampleVo
();
BeanUtils
.
copyProperties
(
sample
,
sampleVo
);
//判断是否为平行样
List
<
SampleDistributionTeamVo
>
sampleDistributionTeamVoList
=
distributionMapper
.
getDistributionTeamList
(
sample
.
getId
(),
null
);
/*//判断是否为平行样
List<SampleDistributionTeamVo> sampleDistributionTeamVoList = null;
if (sample.getIsParallel() == 0) {
//检测人员只能看到自己则的检测内容
...
...
@@ -518,7 +521,7 @@ public class EntrustServiceImpl extends ServiceImpl<EntrustMapper, Entrust> impl
sampleDistributionTeamVoList =
distributionMapper.getDistributionTeamList(sample.getId(), null, null);
}
}
}
*/
if
(
sampleDistributionTeamVoList
!=
null
&&
sampleDistributionTeamVoList
.
size
()
>
0
)
{
sampleVo
.
setSampleDistributionTeamVoList
(
sampleDistributionTeamVoList
);
}
...
...
@@ -556,6 +559,7 @@ public class EntrustServiceImpl extends ServiceImpl<EntrustMapper, Entrust> impl
maxCementCode
=
yesrString
+
"-0000"
;
}
}
System
.
out
.
println
(
"redis获取最大值时的最大本所编号*******************************************"
+
maxCementCode
);
redisUtil
.
setString
(
"maxCementCode"
,
maxCementCode
);
return
BaseResponse
.
okData
(
maxCementCode
);
}
...
...
@@ -639,6 +643,7 @@ public class EntrustServiceImpl extends ServiceImpl<EntrustMapper, Entrust> impl
}
sampleService
.
saveBatch
(
sampleList
);
//最大的平行样编号放入redis
System
.
out
.
println
(
"审批时的最大本所编号*******************************************"
+
maxCementCode
);
redisUtil
.
setString
(
"maxCementCode"
,
maxCementCode
);
}
entrust
.
setStatus
(
1
).
setProjectType
(
query
.
getProjectType
());
...
...
@@ -1016,9 +1021,9 @@ public class EntrustServiceImpl extends ServiceImpl<EntrustMapper, Entrust> impl
}
}
if
(
entrust
!=
null
)
{
if
(
entrust
.
getStatus
()
!=
3
)
{
/*
if (entrust.getStatus() != 3) {
return BaseResponse.errorMsg("委托单状态错误");
}
}
*/
List
<
Sample
>
sampleList
=
sampleMapper
.
getNoHandleList
(
sample
.
getEntrustId
());
if
(
sampleList
==
null
||
sampleList
.
size
()
==
0
)
{
entrust
.
setStatus
(
4
);
...
...
@@ -1174,15 +1179,17 @@ public class EntrustServiceImpl extends ServiceImpl<EntrustMapper, Entrust> impl
if
(
entrust
==
null
)
{
return
BaseResponse
.
errorMsg
(
"信息错误"
);
}
List
<
Sample
>
sampleList
=
sampleMapper
.
getSampleList
(
id
);
List
<
Sample
>
sampleList
=
sampleMapper
.
getSample
Check
List
(
id
);
List
<
SampleVo
>
sampleVoList
=
new
ArrayList
<>();
Integer
distributionStatus
=
null
;
if
(
sampleList
!=
null
&&
sampleList
.
size
()
>
0
)
{
for
(
Sample
sample
:
sampleList
)
{
SampleVo
sampleVo
=
new
SampleVo
();
BeanUtils
.
copyProperties
(
sample
,
sampleVo
);
List
<
SampleDistributionTeamVo
>
sampleDistributionTeamVoList
=
distributionMapper
.
getDistributionTeamList
(
sample
.
getId
(),
loginUser
.
getId
());
//判断是否为平行样
List
<
SampleDistributionTeamVo
>
sampleDistributionTeamVoList
=
null
;
/*
List<SampleDistributionTeamVo> sampleDistributionTeamVoList = null;
if (sample.getIsParallel() == 0) {
//检测人员只能看到自己则的检测内容
sampleDistributionTeamVoList =
...
...
@@ -1197,7 +1204,7 @@ public class EntrustServiceImpl extends ServiceImpl<EntrustMapper, Entrust> impl
sampleDistributionTeamVoList =
distributionMapper.getDistributionTeamList(sample.getId(), null, loginUser.getId());
}
}
}
*/
if
(
sampleDistributionTeamVoList
!=
null
&&
sampleDistributionTeamVoList
.
size
()
>
0
)
{
sampleVo
.
setSampleDistributionTeamVoList
(
sampleDistributionTeamVoList
);
for
(
SampleDistributionTeamVo
sdVo
:
sampleDistributionTeamVoList
)
{
...
...
@@ -1206,8 +1213,10 @@ public class EntrustServiceImpl extends ServiceImpl<EntrustMapper, Entrust> impl
}
distributionStatus
=
sdVo
.
getStatus
()
==
1
?
1
:
(
sdVo
.
getStatus
()
==
2
?
2
:
0
);
}
//一个平行样样品 主样和副样不能为同一个用户检测
sampleVoList
.
add
(
sampleVo
);
}
sampleVoList
.
add
(
sampleVo
);
}
}
entrust
.
setIsDistribution
(
distributionStatus
);
//0显示接受按钮,1显示完成按钮(可以上传附件),2和null不显示按钮
...
...
@@ -1326,9 +1335,9 @@ public class EntrustServiceImpl extends ServiceImpl<EntrustMapper, Entrust> impl
sampleMapper
.
updateById
(
sample
);
entrust
=
entrustMapper
.
selectById
(
sample
.
getEntrustId
());
if
(
entrust
!=
null
)
{
if
(
entrust
.
getStatus
()
!=
5
)
{
/*
if (entrust.getStatus() != 5) {
return BaseResponse.errorMsg("委托单状态错误");
}
}
*/
List
<
Sample
>
sampleList
=
sampleMapper
.
getNoDistributionList
(
sample
.
getEntrustId
());
if
(
sampleList
==
null
||
sampleList
.
size
()
==
0
)
{
entrust
.
setStatus
(
6
);
...
...
@@ -1437,8 +1446,28 @@ public class EntrustServiceImpl extends ServiceImpl<EntrustMapper, Entrust> impl
for
(
Sample
sample
:
sampleList
)
{
SampleVo
sampleVo
=
new
SampleVo
();
BeanUtils
.
copyProperties
(
sample
,
sampleVo
);
List
<
SampleDistributionTeamVo
>
sampleDistributionTeamVoList
=
distributionMapper
.
getDistributionTeamList
(
sample
.
getId
(),
null
,
null
);
List
<
SampleDistributionTeamVo
>
sampleDistributionTeamVoList
=
distributionMapper
.
getDistributionTeamList
(
sample
.
getId
(),
null
);
if
(
sampleDistributionTeamVoList
!=
null
&&
sampleDistributionTeamVoList
.
size
()
>
0
)
{
//判断是否为平行样
if
(
sample
.
getIsParallel
()
==
1
)
{
List
<
Sample
>
sampleList1
=
sampleMapper
.
getByCementCode
(
entrust
.
getId
(),
sample
.
getCementCode
());
//检测人员只能看到自己则的检测内容
if
(
sampleList1
.
size
()
==
2
)
{
List
<
SampleDistributionTeamVo
>
sampleDistributionTeamVoList2
=
distributionMapper
.
getDistributionTeamList
(
sampleList1
.
get
(
1
).
getId
(),
null
);
if
(
sampleDistributionTeamVoList2
.
size
()
==
sampleDistributionTeamVoList
.
size
()){
for
(
int
i
=
0
;
i
<
sampleDistributionTeamVoList
.
size
();
i
++){
SampleDistributionTeamVo
sdtvo
=
sampleDistributionTeamVoList
.
get
(
i
);
sdtvo
.
setUserName
(
sdtvo
.
getUserName
()+
"、"
+
sampleDistributionTeamVoList2
.
get
(
i
).
getUserName
());
}
}
else
{
sampleDistributionTeamVoList
=
distributionMapper
.
getDistributionTeamList
(
sample
.
getId
(),
null
);
}
}
else
{
sampleDistributionTeamVoList
=
distributionMapper
.
getDistributionTeamList
(
sample
.
getId
(),
null
);
}
}
sampleVo
.
setSampleDistributionTeamVoList
(
sampleDistributionTeamVoList
);
}
else
{
sampleVo
.
setSampleDistributionTeamVoList
(
null
);
...
...
@@ -2159,7 +2188,7 @@ public class EntrustServiceImpl extends ServiceImpl<EntrustMapper, Entrust> impl
if
(!
CollectionUtils
.
isEmpty
(
list
))
{
Map
<
String
,
Object
>
map
=
list
.
get
(
0
);
String
[]
headers
=
new
String
[
map
.
size
()];
String
[]
headers
=
new
String
[
map
.
size
()
+
1
];
headers
[
0
]
=
"序号"
;
headers
[
1
]
=
"委托编号"
;
headers
[
2
]
=
"是否加急"
;
...
...
@@ -2173,8 +2202,54 @@ public class EntrustServiceImpl extends ServiceImpl<EntrustMapper, Entrust> impl
headers
[
10
]
=
"检测依据编号"
;
headers
[
11
]
=
"状态"
;
List
<
Object
[]>
datas
=
new
ArrayList
<>(
list
.
size
()
);
List
<
Object
[]>
datas
=
new
ArrayList
<>(
headers
.
length
);
for
(
Map
<
String
,
Object
>
m
:
list
)
{
//获取委托单的检测项目 检测依据编号
//根据委托编号id 获取所有样品的检测项目 和 检测依据编号
Integer
entrustId
=
Integer
.
valueOf
(
m
.
get
(
"entrustId"
).
toString
());
System
.
out
.
println
(
entrustId
);
QueryWrapper
<
SampleTmp
>
queryWrapper
=
new
QueryWrapper
<>();
queryWrapper
.
eq
(
"entrust_id"
,
entrustId
);
List
<
SampleTmp
>
sampleTmpList
=
sampleTmpService
.
list
(
queryWrapper
);
// String sampleNames = "";
/**
* 检测项目名称
* 格式:
* 样品1:Mad、Vad、Cao
* 样品2:Mad、Vad、Cao
* 样品3:Mad、Vad、Cao
*/
String
checkTeamStr
=
""
;
/**
* 检测依据编号
* 格式:
* 样品1:0012、0013
* 样品2:0014、0015
* 样品3:0016、0017
*/
String
checkMethodStr
=
""
;
if
(
sampleTmpList
!=
null
&&
sampleTmpList
.
size
()
>
0
)
{
//样品名称 列表中的拼接
for
(
SampleTmp
sampleTmp
:
sampleTmpList
)
{
// sampleNames = sampleNames.equals("") ? sampleTmp.getName() : (sampleNames + "、" + sampleTmp.getName());
String
teamIds
=
sampleTmp
.
getTeamIds
();
String
checkTeam
=
""
;
if
(
teamIds
!=
null
)
{
String
[]
teamIdS
=
teamIds
.
split
(
"、"
);
for
(
String
teamId
:
teamIdS
)
{
Team
team
=
teamMapper
.
selectById
(
Integer
.
valueOf
(
teamId
));
if
(
team
!=
null
)
{
checkTeam
=
checkTeam
.
equals
(
""
)
?
team
.
getName
()
:
(
checkTeam
+
"、"
+
team
.
getName
());
}
}
}
String
spampe_checkTeam
=
sampleTmp
.
getName
()+
":"
+
checkTeam
;
checkTeamStr
=
checkTeamStr
.
equals
(
""
)
?
spampe_checkTeam
:
(
checkTeamStr
+
"\n"
+
spampe_checkTeam
);
;
checkMethodStr
=
checkMethodStr
.
equals
(
""
)
?
sampleTmp
.
getMethodNumbers
()
:
(
checkMethodStr
+
"\n"
+
sampleTmp
.
getMethodNumbers
());
}
}
Object
[]
objects
=
new
Object
[
headers
.
length
];
for
(
int
j
=
0
;
j
<
headers
.
length
;
j
++)
{
String
obj
=
m
.
get
(
headers
[
j
]).
toString
();
...
...
@@ -2182,43 +2257,15 @@ public class EntrustServiceImpl extends ServiceImpl<EntrustMapper, Entrust> impl
if
(
j
==
0
)
{
obj
=
obj
.
split
(
"\\."
)[
0
];
}
if
(
j
==
9
){
obj
=
checkTeamStr
;
}
if
(
j
==
10
){
obj
=
checkMethodStr
;
}
objects
[
j
]
=
obj
;
}
//根据委托编号id 获取所有样品的检测项目 和 检测依据编号
Integer
entrustId
=
Integer
.
valueOf
(
m
.
get
(
"entrustId"
).
toString
());
System
.
out
.
println
(
entrustId
);
QueryWrapper
<
SampleTmp
>
queryWrapper
=
new
QueryWrapper
<>();
queryWrapper
.
eq
(
"entrust_id"
,
entrustId
);
List
<
SampleTmp
>
sampleTmpList
=
sampleTmpService
.
list
(
queryWrapper
);
//检测项目名称
String
sampleNames
=
""
;
if
(
sampleTmpList
!=
null
&&
sampleTmpList
.
size
()
>
0
)
{
//样品名称 列表中的拼接
for
(
SampleTmp
sampleTmp
:
sampleTmpList
)
{
sampleNames
=
sampleNames
.
equals
(
""
)
?
sampleTmp
.
getName
()
:
(
sampleNames
+
"、"
+
sampleTmp
.
getName
());
}
// entrustVo.setSampleNames(sampleNames);
//检测项 和检测依据 列表里只显示第一个样品的
SampleTmp
sampleTmp
=
sampleTmpList
.
get
(
0
);
String
teamIds
=
sampleTmp
.
getTeamIds
();
String
checkTeam
=
""
;
if
(
teamIds
!=
null
)
{
String
[]
teamIdS
=
teamIds
.
split
(
"、"
);
for
(
String
teamId
:
teamIdS
)
{
Team
team
=
teamMapper
.
selectById
(
Integer
.
valueOf
(
teamId
));
if
(
team
!=
null
)
{
checkTeam
=
checkTeam
.
equals
(
""
)
?
team
.
getName
()
:
(
checkTeam
+
"、"
+
team
.
getName
());
}
}
}
// entrustVo.setCheckTeam(checkTeam);
// entrustVo.setCheckMethodNumber(sampleTmp.getMethodNumbers());
}
datas
.
add
(
objects
);
}
ExcelUtil
.
excelExport
(
...
...
cement-business/src/main/java/cn/wise/sc/cement/business/util/CheckCountUtil.java
View file @
e1fa3d83
...
...
@@ -178,7 +178,7 @@ public class CheckCountUtil {
BigDecimal
m
=
getBigDecimal
(
resultMap
.
get
(
"样重m"
));
//计算的核心公式结果
BigDecimal
countResult
=
m2
.
subtract
(
m1
).
subtract
(
m3
).
divide
(
m
,
4
).
multiply
(
new
BigDecimal
(
0.343
));
endResult
=
countResult
.
multiply
(
param100
);
endResult
=
countResult
.
multiply
(
param100
)
.
setScale
(
4
,
BigDecimal
.
ROUND_HALF_UP
)
;
}
else
if
(
name
.
equals
(
"K2O"
)){
BigDecimal
CK2O
=
getBigDecimal
(
resultMap
.
get
(
"CK2O"
));
BigDecimal
V
=
getBigDecimal
(
resultMap
.
get
(
"V"
));
...
...
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