Commit 21a2f384 authored by 竹天卫's avatar 竹天卫

炮孔设计 新增功能优化

parent 1cba656f
...@@ -28,6 +28,8 @@ import org.springframework.beans.factory.annotation.Autowired; ...@@ -28,6 +28,8 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional; import org.springframework.transaction.annotation.Transactional;
import javax.annotation.Resource;
import java.util.List;
/** /**
* <p> * <p>
...@@ -56,6 +58,9 @@ public class TProcessesBlastdesignHoleServiceImpl extends ServiceImpl<TProcesses ...@@ -56,6 +58,9 @@ public class TProcessesBlastdesignHoleServiceImpl extends ServiceImpl<TProcesses
@Autowired @Autowired
private ITSysUserService itSysUserService; private ITSysUserService itSysUserService;
@Resource
private TProcessesBlastdesignHoleMapper processesBlastdesignHoleMapper;
@Override @Override
public R getPage(TProcessesBlastdesignHoleQuery tProcessesBlastdesignHoleQuery, Query query) { public R getPage(TProcessesBlastdesignHoleQuery tProcessesBlastdesignHoleQuery, Query query) {
log.info(JSON.toJSONString(tProcessesBlastdesignHoleQuery)); log.info(JSON.toJSONString(tProcessesBlastdesignHoleQuery));
...@@ -261,8 +266,8 @@ public class TProcessesBlastdesignHoleServiceImpl extends ServiceImpl<TProcesses ...@@ -261,8 +266,8 @@ public class TProcessesBlastdesignHoleServiceImpl extends ServiceImpl<TProcesses
queryWrapper.eq(ProjectEnum.TProcessesBlastdesignHole.STEP_NAME.getLabel(), query.getStepName()); queryWrapper.eq(ProjectEnum.TProcessesBlastdesignHole.STEP_NAME.getLabel(), query.getStepName());
queryWrapper.eq(ProjectEnum.TProcessesBlastdesignHole.STOPE_NAME.getLabel(), query.getStopeName()); queryWrapper.eq(ProjectEnum.TProcessesBlastdesignHole.STOPE_NAME.getLabel(), query.getStopeName());
queryWrapper.eq(ProjectEnum.TProcessesBlastdesignHole.Blast_Area_Name.getLabel(), query.getBlastAreaName()); queryWrapper.eq(ProjectEnum.TProcessesBlastdesignHole.Blast_Area_Name.getLabel(), query.getBlastAreaName());
TProcessesBlastdesignHoleVo holeVo = baseMapper.getByQuery(queryWrapper); List<TProcessesBlastdesignHole> holeVoList = processesBlastdesignHoleMapper.selectList(queryWrapper);
if (holeVo != null) { if (holeVoList == null || holeVoList.size()==0) {
return R.failed("炮孔设计中->泡孔设计中爆区已存在,StopeName,StepName,BlastAreaName"); return R.failed("炮孔设计中->泡孔设计中爆区已存在,StopeName,StepName,BlastAreaName");
} }
//条件封装 //条件封装
......
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