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
3c0833f2
Commit
3c0833f2
authored
Jul 30, 2021
by
lijingjing
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
计算组合判定合计值修约
parent
bdc3f78a
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
6 additions
and
0 deletions
+6
-0
EntrustController.java
...cloud/service/lims/hmhj/controller/EntrustController.java
+2
-0
EntrustMapper.xml
src/main/resources/mapper/hmhj/EntrustMapper.xml
+4
-0
No files found.
src/main/java/com/patzn/cloud/service/lims/hmhj/controller/EntrustController.java
View file @
3c0833f2
...
@@ -491,6 +491,8 @@ public class EntrustController extends ServiceController {
...
@@ -491,6 +491,8 @@ public class EntrustController extends ServiceController {
// 过滤当前人为检测人的委托数据 - 节点数据不为空,且为检测时,只查询当前人信息
// 过滤当前人为检测人的委托数据 - 节点数据不为空,且为检测时,只查询当前人信息
if
(
EntrustFlowEnum
.
TEST
.
getName
().
equalsIgnoreCase
(
entrust
.
getSource
()))
{
if
(
EntrustFlowEnum
.
TEST
.
getName
().
equalsIgnoreCase
(
entrust
.
getSource
()))
{
entrust
.
setTesterId
(
getAccount
().
getUserId
());
entrust
.
setTesterId
(
getAccount
().
getUserId
());
// 只看当前人没有处理完成的委托
entrust
.
setItemStatus
(
EntrustSampleItemStatusEnum
.
TEST
);
}
}
// 获取当前用户分组
// 获取当前用户分组
entrust
.
setGroupNameList
(
userInfoService
.
getCurGroupNameList
());
entrust
.
setGroupNameList
(
userInfoService
.
getCurGroupNameList
());
...
...
src/main/resources/mapper/hmhj/EntrustMapper.xml
View file @
3c0833f2
...
@@ -229,6 +229,10 @@
...
@@ -229,6 +229,10 @@
join entrust_sample_item esi on esi.entrust_sample_id = es.id
join entrust_sample_item esi on esi.entrust_sample_id = es.id
where es.deleted = 0 and esi.deleted = 0 and es.entrust_id = e.id
where es.deleted = 0 and esi.deleted = 0 and es.entrust_id = e.id
and esi.tester_id = #{vo.testerId}
and esi.tester_id = #{vo.testerId}
-- 数据录入节点,处理完成的数据不再显示
<if
test=
"null != vo.itemStatus"
>
and esi.status = #{vo.itemStatus}
</if>
)
)
</if>
</if>
order by e.entrust_time desc,e.code desc
order by e.entrust_time desc,e.code desc
...
...
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