Compare commits
No commits in common. "4daa6983bebe099e2ee9c5480e80438eb7b8deb9" and "8d45b6beb5168e0921a22a1a71a718db823f7712" have entirely different histories.
4daa6983be
...
8d45b6beb5
|
|
@ -200,7 +200,6 @@ public class QmsInspectionStandardControllerService {
|
|||
detail.setUpdateUserId(standard.getUpdateUserId());
|
||||
detail.setUpdateUserName(standard.getUpdateUserName());
|
||||
detail.setUpdateTime(standard.getUpdateTime());
|
||||
detail.setIqeName(StrUtil.join(",",inspectionStandardService.getIQENames(standard.getId())));
|
||||
|
||||
// 填充检测方式、抽样方案、检验水平、AQL相关字段
|
||||
detail.setTestingMethodDictItemId(standard.getTestingMethodDictItemId());
|
||||
|
|
|
|||
|
|
@ -10,7 +10,6 @@ import com.nflg.wms.common.pojo.vo.QmsInspectionStandardVO;
|
|||
import com.nflg.wms.repository.entity.QmsInspectionStandard;
|
||||
import org.apache.ibatis.annotations.Param;
|
||||
|
||||
import java.util.Collection;
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
|
|
@ -29,6 +28,4 @@ public interface QmsInspectionStandardMapper extends BaseMapper<QmsInspectionSta
|
|||
QmsInspectionStandardDetailDTO getDetailById(@Param("id") Long id);
|
||||
|
||||
List<QmsIncomingInspectionTaskCheckItemVO> getItemsForCheck(Long id);
|
||||
|
||||
Collection<String> getIQENames(Long id);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -4,7 +4,6 @@ import com.baomidou.mybatisplus.extension.service.IService;
|
|||
import com.nflg.wms.common.pojo.vo.QmsIncomingInspectionTaskCheckItemVO;
|
||||
import com.nflg.wms.repository.entity.QmsInspectionStandard;
|
||||
|
||||
import java.util.Collection;
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
|
|
@ -26,6 +25,4 @@ public interface IQmsInspectionStandardService extends IService<QmsInspectionSta
|
|||
void enable(Long id, Boolean enable);
|
||||
|
||||
List<QmsIncomingInspectionTaskCheckItemVO> getItemsForCheck(Long id);
|
||||
|
||||
Collection<String> getIQENames(Long id);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -15,7 +15,6 @@ import org.springframework.stereotype.Service;
|
|||
import org.springframework.transaction.annotation.Transactional;
|
||||
|
||||
import java.time.LocalDateTime;
|
||||
import java.util.Collection;
|
||||
import java.util.List;
|
||||
import java.util.Objects;
|
||||
import java.util.stream.Collectors;
|
||||
|
|
@ -116,9 +115,4 @@ public class QmsInspectionStandardServiceImpl extends ServiceImpl<QmsInspectionS
|
|||
public List<QmsIncomingInspectionTaskCheckItemVO> getItemsForCheck(Long id) {
|
||||
return baseMapper.getItemsForCheck(id);
|
||||
}
|
||||
|
||||
@Override
|
||||
public Collection<String> getIQENames(Long id) {
|
||||
return baseMapper.getIQENames(id);
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -80,7 +80,7 @@
|
|||
FROM qms_inspection_standard s
|
||||
LEFT JOIN qms_qc_material m ON s.material_id = m.id
|
||||
LEFT JOIN qms_inspector_material_item imi ON imi.material_id = m.id
|
||||
LEFT JOIN qms_quality_inspector iqe ON imi.inspector_id = iqe.id AND iqe.inspection_type = 1 AND iqe.enable = true
|
||||
LEFT JOIN qms_quality_inspector iqe ON m.id = imi.inspector_id AND iqe.inspection_type = 1 AND iqe.enable = true
|
||||
LEFT JOIN "user" iqe_user ON iqe.user_id = iqe_user.id
|
||||
WHERE s.id = #{id}
|
||||
GROUP BY s.id, s.material_id, m.material_no, m.material_category_code_path_name, m.material_desc, m.drawing_no_ver,
|
||||
|
|
@ -106,13 +106,4 @@
|
|||
INNER JOIN qms_inspection_standard_item_content qisic ON qisi."id" = qisic.inspection_standard_item_id
|
||||
WHERE qisi.inspection_standard_id = #{id}
|
||||
</select>
|
||||
|
||||
<select id="getIQENames" resultType="java.lang.String">
|
||||
select iqe_user.user_name
|
||||
from qms_inspection_standard s
|
||||
LEFT JOIN qms_inspector_material_item imi ON imi.material_id = s.material_id
|
||||
LEFT JOIN qms_quality_inspector iqe ON imi.inspector_id = iqe.id AND iqe.inspection_type = 1 AND iqe.enable = true
|
||||
LEFT JOIN "user" iqe_user ON iqe.user_id = iqe_user.id
|
||||
where s.id = #{id}
|
||||
</select>
|
||||
</mapper>
|
||||
|
|
|
|||
|
|
@ -68,8 +68,6 @@ public class GlobalRestControllerAdvice {
|
|||
@ExceptionHandler(NotLoginException.class)
|
||||
@ResponseStatus(HttpStatus.UNAUTHORIZED) // 返回 401 状态码
|
||||
public String handleNotLoginException(NotLoginException e) {
|
||||
log.error("未登录异常类型: {}", e.getType());
|
||||
log.error("未登录异常信息: {}", e.getMessage());
|
||||
return "请重新登录";
|
||||
}
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue