退料负责机具权限
This commit is contained in:
parent
364a09f8ed
commit
80cb178f52
|
|
@ -1702,6 +1702,7 @@ public class BackApplyInfoServiceImpl implements IBackApplyInfoService {
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public AjaxResult getMachineByCode(BackApplyInfo dto) {
|
public AjaxResult getMachineByCode(BackApplyInfo dto) {
|
||||||
|
dto.setUserId(SecurityUtils.getLoginUser().getUserid());
|
||||||
return backApplyInfoMapper.getMachineByCode(dto);
|
return backApplyInfoMapper.getMachineByCode(dto);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -45,4 +45,6 @@ public class SelectDto {
|
||||||
private String teamId;
|
private String teamId;
|
||||||
|
|
||||||
private Long proId;
|
private Long proId;
|
||||||
|
|
||||||
|
private Long userId;
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -379,6 +379,7 @@ public class SelectServiceImpl implements SelectService {
|
||||||
List<TypeTreeNode> listL21 = new ArrayList<>();
|
List<TypeTreeNode> listL21 = new ArrayList<>();
|
||||||
try {
|
try {
|
||||||
// 先查第四层类型
|
// 先查第四层类型
|
||||||
|
dto.setUserId(SecurityUtils.getLoginUser().getUserid());
|
||||||
listL4 = mapper.getUseTypeTreeL4Back(dto);
|
listL4 = mapper.getUseTypeTreeL4Back(dto);
|
||||||
if (CollectionUtils.isNotEmpty(listL4)) {
|
if (CollectionUtils.isNotEmpty(listL4)) {
|
||||||
List<Long> list4ParentIds = listL4.stream().map(o -> o.getParentId()).collect(Collectors.toList());
|
List<Long> list4ParentIds = listL4.stream().map(o -> o.getParentId()).collect(Collectors.toList());
|
||||||
|
|
@ -536,6 +537,7 @@ public class SelectServiceImpl implements SelectService {
|
||||||
@Override
|
@Override
|
||||||
public AjaxResult getUseType(BackApplyInfo bean) {
|
public AjaxResult getUseType(BackApplyInfo bean) {
|
||||||
//四级类型只查询数量管理类型数据
|
//四级类型只查询数量管理类型数据
|
||||||
|
bean.setUserId(SecurityUtils.getLoginUser().getUserid());
|
||||||
List<TypeTreeNode> listL4 = mapper.getUseTypeTreeApp(bean);
|
List<TypeTreeNode> listL4 = mapper.getUseTypeTreeApp(bean);
|
||||||
if (CollectionUtils.isEmpty(listL4)) {
|
if (CollectionUtils.isEmpty(listL4)) {
|
||||||
return AjaxResult.success();
|
return AjaxResult.success();
|
||||||
|
|
|
||||||
|
|
@ -1125,7 +1125,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
||||||
LEFT JOIN bm_unit bu on bu.unit_id = ba.unit_id
|
LEFT JOIN bm_unit bu on bu.unit_id = ba.unit_id
|
||||||
LEFT JOIN sys_dict_data sd on sd.dict_value = mm.ma_status and sd.dict_type = "ma_machine_status"
|
LEFT JOIN sys_dict_data sd on sd.dict_value = mm.ma_status and sd.dict_type = "ma_machine_status"
|
||||||
AND bu.del_flag = '0'
|
AND bu.del_flag = '0'
|
||||||
|
LEFT JOIN ma_type_repair mtr ON mm.type_id = mtr.type_id
|
||||||
WHERE sai.`status`=0 and mm.ma_status = '2'
|
WHERE sai.`status`=0 and mm.ma_status = '2'
|
||||||
|
<if test="userId != null">
|
||||||
|
and mtr.user_id = #{userId}
|
||||||
|
</if>
|
||||||
and mm.ma_code = #{maCode}
|
and mm.ma_code = #{maCode}
|
||||||
GROUP BY mm.ma_id
|
GROUP BY mm.ma_id
|
||||||
</select>
|
</select>
|
||||||
|
|
|
||||||
|
|
@ -400,9 +400,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
||||||
ma_type mt
|
ma_type mt
|
||||||
LEFT JOIN slt_agreement_info sai ON mt.type_id = sai.type_id
|
LEFT JOIN slt_agreement_info sai ON mt.type_id = sai.type_id
|
||||||
LEFT JOIN ma_type mt1 ON mt.parent_id = mt1.type_id and mt1.del_flag = '0'
|
LEFT JOIN ma_type mt1 ON mt.parent_id = mt1.type_id and mt1.del_flag = '0'
|
||||||
|
LEFT JOIN ma_type_repair mtr ON mt.type_id = mtr.type_id
|
||||||
WHERE
|
WHERE
|
||||||
sai.agreement_id = #{agreementId} AND sai.STATUS = '0'
|
sai.agreement_id = #{agreementId} AND sai.STATUS = '0'
|
||||||
and mt.manage_type = '1'
|
and mt.manage_type = '1'
|
||||||
|
<if test="userId != null">
|
||||||
|
and mtr.user_id = #{userId}
|
||||||
|
</if>
|
||||||
GROUP BY
|
GROUP BY
|
||||||
mt.type_id
|
mt.type_id
|
||||||
HAVING num> 0
|
HAVING num> 0
|
||||||
|
|
@ -806,8 +810,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
||||||
LEFT JOIN ma_type mt1 ON mt.parent_id = mt1.type_id
|
LEFT JOIN ma_type mt1 ON mt.parent_id = mt1.type_id
|
||||||
AND mt1.del_flag = '0'
|
AND mt1.del_flag = '0'
|
||||||
LEFT JOIN bm_agreement_info ba ON sai.agreement_id = ba.agreement_id
|
LEFT JOIN bm_agreement_info ba ON sai.agreement_id = ba.agreement_id
|
||||||
|
LEFT JOIN ma_type_repair mtr ON mm.type_id = mtr.type_id
|
||||||
WHERE
|
WHERE
|
||||||
mm.ma_status = '2'
|
mm.ma_status = '2'
|
||||||
|
and mtr.user_id = #{userId}
|
||||||
AND ba.unit_id = #{unitId}
|
AND ba.unit_id = #{unitId}
|
||||||
AND ba.project_id = #{proId}
|
AND ba.project_id = #{proId}
|
||||||
GROUP BY mm.type_id
|
GROUP BY mm.type_id
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue