|
|
@@ -4,11 +4,13 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; |
|
|
|
import com.baomidou.mybatisplus.core.metadata.IPage; |
|
|
|
import com.baomidou.mybatisplus.core.toolkit.ObjectUtils; |
|
|
|
import com.cnbm.basic.dto.UnitDTO; |
|
|
|
import com.cnbm.basic.dto.WorkingProcedureTypeDTO; |
|
|
|
import com.cnbm.basic.entity.Machine; |
|
|
|
import com.cnbm.basic.entity.ProductWorkingprocedureRelation; |
|
|
|
import com.cnbm.basic.entity.WorkingProcedureType; |
|
|
|
import com.cnbm.basic.mapper.ProductWorkingprocedureRelationMapper; |
|
|
|
import com.cnbm.basic.mapper.UnitMapper; |
|
|
|
import com.cnbm.basic.mapper.WorkingProcedureTypeMapper; |
|
|
|
import com.cnbm.common.page.PageData; |
|
|
|
import com.cnbm.common.service.impl.CrudServiceImpl; |
|
|
|
import com.cnbm.basic.dto.WorkingProcedureDTO; |
|
|
@@ -153,11 +155,36 @@ public class WorkingProcedureServiceImpl extends CrudServiceImpl<WorkingProcedur |
|
|
|
@Autowired |
|
|
|
private WorkingProcedureMapper workingProcedureMapper; |
|
|
|
|
|
|
|
@Autowired |
|
|
|
private WorkingProcedureTypeMapper workingProcedureTypeMapper; |
|
|
|
|
|
|
|
@Override |
|
|
|
@Transactional(rollbackFor = Exception.class) |
|
|
|
public List<WorkingProcedureDTO> list() { |
|
|
|
List<WorkingProcedureDTO> list = workingProcedureMapper.list(); |
|
|
|
|
|
|
|
return list; |
|
|
|
} |
|
|
|
|
|
|
|
@Override |
|
|
|
@Transactional(rollbackFor = Exception.class) |
|
|
|
public List<WorkingProcedure> listByType(Long typeId) { |
|
|
|
QueryWrapper<WorkingProcedure> wrapper = new QueryWrapper<>(); |
|
|
|
wrapper.eq(ObjectUtils.isNotNull(typeId), "working_procedure_type_id", typeId); |
|
|
|
List<WorkingProcedure> listOfType = workingProcedureMapper.selectList(wrapper); |
|
|
|
|
|
|
|
return listOfType; |
|
|
|
} |
|
|
|
|
|
|
|
@Override |
|
|
|
@Transactional(rollbackFor = Exception.class) |
|
|
|
public List<WorkingProcedureTypeDTO> listWithType () { |
|
|
|
List<WorkingProcedureTypeDTO> workingProcedureTypeDTOList = workingProcedureTypeMapper.list(); |
|
|
|
for(WorkingProcedureTypeDTO workingProcedureTypeDTO: workingProcedureTypeDTOList){ |
|
|
|
List<WorkingProcedure> workingProcedureList = listByType(workingProcedureTypeDTO.getId()); |
|
|
|
if(workingProcedureList!=null & workingProcedureList.size() > 0) |
|
|
|
workingProcedureTypeDTO.setWorkingProcedureList(workingProcedureList); |
|
|
|
} |
|
|
|
return workingProcedureTypeDTOList; |
|
|
|
} |
|
|
|
} |