|
|
|
@ -34,21 +34,21 @@ public class CbamProdProcessDictServiceImpl extends BaseServiceImpl<CbamProdProc |
|
|
|
|
|
|
|
@Override |
|
|
|
public List<CbamProdProcessDictDTO> getByIndustryId(Long industryId) { |
|
|
|
return getByIndustryIdAndType(industryId, null,"yl", Constant.ASC); |
|
|
|
return getByPidIdAndType(industryId, null,"yl", Constant.ASC); |
|
|
|
} |
|
|
|
|
|
|
|
@Override |
|
|
|
public List<CbamProdProcessDictDTO> getByProdId(Long prodId) { |
|
|
|
return getByIndustryIdAndType(prodId, null,"gylx", Constant.ASC); |
|
|
|
return getByPidIdAndType(prodId, null,"gylx", Constant.ASC); |
|
|
|
} |
|
|
|
|
|
|
|
@Override |
|
|
|
public List<CbamProdProcessDictDTO> getByProdIds(List<Long> prodIds) { |
|
|
|
return getByIndustryIdAndType(null, prodIds,"gylx", Constant.ASC); |
|
|
|
return getByPidIdAndType(null, prodIds,"gylx", Constant.ASC); |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
public List<CbamProdProcessDictDTO> getByIndustryIdAndType(Long pidId,List<Long> pidIds, String type, String order) { |
|
|
|
public List<CbamProdProcessDictDTO> getByPidIdAndType(Long pidId, List<Long> pidIds, String type, String order) { |
|
|
|
boolean asc = true; |
|
|
|
if (StringUtils.equalsIgnoreCase(Constant.DESC, order)) { |
|
|
|
asc = false; |
|
|
|
|