diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsAttrDetailedList/controller/SarLawsAttrDetailedListController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsAttrDetailedList/controller/SarLawsAttrDetailedListController.java index 51315bbb..05aea921 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsAttrDetailedList/controller/SarLawsAttrDetailedListController.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsAttrDetailedList/controller/SarLawsAttrDetailedListController.java @@ -11,6 +11,7 @@ import com.adc.da.slrs.sarLawsAttrDetailedList.service.ISarLawsAttrDetailedListS import com.adc.da.sys.service.IDicTypeEOService; import com.alibaba.excel.EasyExcel; import com.alibaba.fastjson.JSON; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import io.swagger.annotations.ApiOperation; import org.apache.commons.lang3.StringUtils; @@ -118,7 +119,7 @@ public class SarLawsAttrDetailedListController extends BaseController lawsIds=new ArrayList<>(); + SarFindDto sarFindDto=new SarFindDto(); + sarFindDto.setId(standExcelVo.getId()); + data.forEach(lawsDto -> {lawsIds.add(lawsDto.getId());}); + List list = sarLawsAttrDetailedListDao.selectLawsById(lawsIds,sarFindDto); + for (LawsDto lawsDto:data){ + if (StringUtils.isNoneEmpty(lawsDto.getApplyArctic())){ + lawsDto.setApplyArctic(lawsDto.getApplyArctic()); + } + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.eq("stand_id",lawsDto.getId()) + .eq("detailed_list_id",sarFindDto.getId()); + List sarLawsAttrDetailedLists = sarLawsAttrDetailedListDao.selectList(queryWrapper); + if (StringUtils.isNoneEmpty(sarLawsAttrDetailedLists.get(0).getSsrq()) && "null" != sarLawsAttrDetailedLists.get(0).getSsrq()) { + lawsDto.setSSRQ(sarLawsAttrDetailedLists.get(0).getSsrq()); + } + if (StringUtils.isNoneEmpty(sarLawsAttrDetailedLists.get(0).getXcxssrq()) && "null" != sarLawsAttrDetailedLists.get(0).getXcxssrq()) { + lawsDto.setXCXSSRQGJ(sarLawsAttrDetailedLists.get(0).getXcxssrq()); + } + if (StringUtils.isNoneEmpty(sarLawsAttrDetailedLists.get(0).getZccssrq()) && "null" != sarLawsAttrDetailedLists.get(0).getZccssrq()) { + lawsDto.setZCCSSRQGJ(sarLawsAttrDetailedLists.get(0).getZccssrq()); + } + if ("INLAND".equals(lawsDto.getStandType())) lawsDto.setStandType("INLAND_STAND"); + if ("FOREIGN".equals(lawsDto.getStandType())) lawsDto.setStandType("FOREIGN_STAND"); + + } + } //适用车型 Map map= iDicTypeEOService.getDicTypeListCode(); List> typeApplicable = (List>)map.get("ENERGYTYPES"); @@ -227,13 +256,13 @@ public class SarLawsAttrDetailedListController extends BaseController> sycpx = (List>)map.get("SYCPXCLASS"); for (LawsDto list1:data){ if (list1.getSSRQ()!=null){ - list1.setSSRQ(list1.getSSRQ().substring(0,10)); + list1.setSSRQ(list1.getSSRQ()); } if (list1.getZCCSSRQGJ()!=null){ - list1.setZCCSSRQGJ(list1.getZCCSSRQGJ().substring(0,10)); + list1.setZCCSSRQGJ(list1.getZCCSSRQGJ()); } if (list1.getXCXSSRQGJ()!=null){ - list1.setXCXSSRQGJ(list1.getXCXSSRQGJ().substring(0,10)); + list1.setXCXSSRQGJ(list1.getXCXSSRQGJ()); } if (StringUtils.isNotBlank(list1.getSYCPX()) && list1.getSYCPX().contains(",")){