diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsAttrDetailedList/service/impl/SarLawsAttrDetailedListServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsAttrDetailedList/service/impl/SarLawsAttrDetailedListServiceImpl.java index ea61ac36..037c2f22 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsAttrDetailedList/service/impl/SarLawsAttrDetailedListServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsAttrDetailedList/service/impl/SarLawsAttrDetailedListServiceImpl.java @@ -60,16 +60,16 @@ public class SarLawsAttrDetailedListServiceImpl extends ServiceImpl sarLawsAttrDetailedLists = sarLawsAttrDetailedListDao.selectList(queryWrapper);/ -// if (StringUtils.isNoneEmpty(sarLawsAttrDetailedLists.get(0).getSsrq())){ -// lawsDto.setSSRQ(sarLawsAttrDetailedLists.get(0).getSsrq()); -// } -// if (StringUtils.isNoneEmpty(sarLawsAttrDetailedLists.get(0).getXcxssrq())){ -// lawsDto.setXCXSSRQGJ(sarLawsAttrDetailedLists.get(0).getXcxssrq()); -// } -// if (StringUtils.isNoneEmpty(sarLawsAttrDetailedLists.get(0).getZccssrq())){ -// lawsDto.setZCCSSRQGJ(sarLawsAttrDetailedLists.get(0).getZccssrq()); -// } + List sarLawsAttrDetailedLists = sarLawsAttrDetailedListDao.selectList(queryWrapper); + if (StringUtils.isNoneEmpty(sarLawsAttrDetailedLists.get(0).getSsrq())){ + lawsDto.setSSRQ(sarLawsAttrDetailedLists.get(0).getSsrq()); + } + if (StringUtils.isNoneEmpty(sarLawsAttrDetailedLists.get(0).getXcxssrq())){ + lawsDto.setXCXSSRQGJ(sarLawsAttrDetailedLists.get(0).getXcxssrq()); + } + if (StringUtils.isNoneEmpty(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"); } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsDetailedList/service/impl/SarLawsDetailedListServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsDetailedList/service/impl/SarLawsDetailedListServiceImpl.java index d32c8f4c..41bb6724 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsDetailedList/service/impl/SarLawsDetailedListServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsDetailedList/service/impl/SarLawsDetailedListServiceImpl.java @@ -250,9 +250,9 @@ public class SarLawsDetailedListServiceImpl extends ServiceImpl timeDto = new ArrayList<>(); if (detailedUpDto.getInforlist().contains(",")) { String[] id = detailedUpDto.getInforlist().split(","); - String[] putTime = detailedUpDto.getInforlist1().split(","); - String[] zcc = detailedUpDto.getInforlist2().split(","); - String[] xcx = detailedUpDto.getInforlist3().split(","); + String[] putTime = detailedUpDto.getInforlist1().split(";"); + String[] zcc = detailedUpDto.getInforlist2().split(";"); + String[] xcx = detailedUpDto.getInforlist3().split(";"); for (int a = 0; a < id.length; a++) { TimeDto dto = new TimeDto(); dto.setStandId(id[a]);