Commit 3c0833f2 by lijingjing

计算组合判定合计值修约

parent bdc3f78a
......@@ -491,6 +491,8 @@ public class EntrustController extends ServiceController {
// 过滤当前人为检测人的委托数据 - 节点数据不为空,且为检测时,只查询当前人信息
if (EntrustFlowEnum.TEST.getName().equalsIgnoreCase(entrust.getSource())) {
entrust.setTesterId(getAccount().getUserId());
// 只看当前人没有处理完成的委托
entrust.setItemStatus(EntrustSampleItemStatusEnum.TEST);
}
// 获取当前用户分组
entrust.setGroupNameList(userInfoService.getCurGroupNameList());
......
......@@ -229,6 +229,10 @@
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
and esi.tester_id = #{vo.testerId}
-- 数据录入节点,处理完成的数据不再显示
<if test="null != vo.itemStatus">
and esi.status = #{vo.itemStatus}
</if>
)
</if>
order by e.entrust_time desc,e.code desc
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment