查询分解单适用车型
This commit is contained in:
+22
@@ -13,6 +13,8 @@ import com.adc.da.slrs.sarStandardsInfo.entity.SarStandardsInfo;
|
|||||||
import com.adc.da.slrs.sarStandardsInfo.entity.SarStandardsInfoEOPage;
|
import com.adc.da.slrs.sarStandardsInfo.entity.SarStandardsInfoEOPage;
|
||||||
import com.adc.da.slrs.sarStandardsInfo.service.ISarStandardsInfoService;
|
import com.adc.da.slrs.sarStandardsInfo.service.ISarStandardsInfoService;
|
||||||
import com.adc.da.slrs.sysInfo.service.SysInfoEOService;
|
import com.adc.da.slrs.sysInfo.service.SysInfoEOService;
|
||||||
|
import com.adc.da.sys.entity.DicTypeEO;
|
||||||
|
import com.adc.da.sys.service.IDicTypeEOService;
|
||||||
import com.adc.da.utils.util.InitStandAttrUtil;
|
import com.adc.da.utils.util.InitStandAttrUtil;
|
||||||
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
|
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
|
||||||
import com.baomidou.mybatisplus.core.metadata.IPage;
|
import com.baomidou.mybatisplus.core.metadata.IPage;
|
||||||
@@ -47,6 +49,8 @@ public class SarStandItemsServiceImpl extends ServiceImpl<SarStandItemsDao, SarS
|
|||||||
private ISarStandardsInfoService sarStandardsInfoService;
|
private ISarStandardsInfoService sarStandardsInfoService;
|
||||||
@Autowired
|
@Autowired
|
||||||
private SarStandItemsDao sarStandItemsDao;
|
private SarStandItemsDao sarStandItemsDao;
|
||||||
|
@Autowired
|
||||||
|
private IDicTypeEOService iDicTypeEOService;
|
||||||
|
|
||||||
public List<ActSarItemsEO> queryItemsByList(SarStandItemsEOPage page, String resType){
|
public List<ActSarItemsEO> queryItemsByList(SarStandItemsEOPage page, String resType){
|
||||||
List<SarStandItems> itemsEOList = dao.queryItemsByList(page);
|
List<SarStandItems> itemsEOList = dao.queryItemsByList(page);
|
||||||
@@ -282,6 +286,24 @@ public class SarStandItemsServiceImpl extends ServiceImpl<SarStandItemsDao, SarS
|
|||||||
page.getPager().setRowCount(count);
|
page.getPager().setRowCount(count);
|
||||||
List<SarStandItems> sarStandItems = dao.querySarItemAndInterpretation(page);
|
List<SarStandItems> sarStandItems = dao.querySarItemAndInterpretation(page);
|
||||||
sarStandItems.forEach(sarStandItems1 -> sarStandItems1.setTermsConditions(StringUtils.replace(sarStandItems1.getTermsConditions(),"''","'")));
|
sarStandItems.forEach(sarStandItems1 -> sarStandItems1.setTermsConditions(StringUtils.replace(sarStandItems1.getTermsConditions(),"''","'")));
|
||||||
|
List<DicTypeEO> dicTypeEOList = iDicTypeEOService.getTypeIdByDicIdAndTypeName("VBMNNTHJG", null, null, null);
|
||||||
|
Map<String,String> dicTypeMap = dicTypeEOList.stream().collect(Collectors.toMap(DicTypeEO::getDicTypeCode,DicTypeEO::getDicTypeName));
|
||||||
|
for (SarStandItems sarStandItems1 : sarStandItems){
|
||||||
|
String srcx = sarStandItems1.getApplyArctic();
|
||||||
|
List<String> srcxList = new ArrayList<>();
|
||||||
|
if (!srcx.contains("[")){
|
||||||
|
String[] srcxArray = srcx.split(",");
|
||||||
|
for (String srcxString : srcxArray){
|
||||||
|
String ss = dicTypeMap.get(srcxString);
|
||||||
|
if (null != ss) {
|
||||||
|
srcxList.add(ss);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if (!CollectionUtils.isEmpty(srcxList)){
|
||||||
|
sarStandItems1.setApplyArctic(String.join(",",srcxList));
|
||||||
|
}
|
||||||
|
}
|
||||||
return sarStandItems;
|
return sarStandItems;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user