From 2623bb0954f86e7e1f374b48218fa34f31e4150e Mon Sep 17 00:00:00 2001
From: yuezhihang <yuezhihang@91isoft.com>
Date: Fri, 10 Dec 2021 14:49:41 +0800
Subject: [PATCH] =?UTF-8?q?=E5=9B=BD=E5=86=85=E6=B8=85=E5=8D=95!!?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../SarLawsAttrDetailedListServiceImpl.java   | 20 +++++++++----------
 .../impl/SarLawsDetailedListServiceImpl.java  | 12 +++++------
 2 files changed, 16 insertions(+), 16 deletions(-)

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<SarLawsAttrD
             /**
              *2021/9/13 摒弃使用清单实施日期,改用标准实施日期
              */
-//            List<SarLawsAttrDetailedList> 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<SarLawsAttrDetailedList> 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<SarLawsDetailedL
             if (addDetailedDto.getInforlist() != null) {
                 if (addDetailedDto.getInforlist().contains(",")) {
                     String[] id = addDetailedDto.getInforlist().split(",");
-                    String[] putTime = addDetailedDto.getInforlist1().split(",");
-                    String[] zcc = addDetailedDto.getInforlist2().split(",");
-                    String[] xcx = addDetailedDto.getInforlist3().split(",");
+                    String[] putTime = addDetailedDto.getInforlist1().split(";");
+                    String[] zcc = addDetailedDto.getInforlist2().split(";");
+                    String[] xcx = addDetailedDto.getInforlist3().split(";");
                     for (int a = 0; a < id.length; a++) {
                         TimeDto dto = new TimeDto();
                         dto.setStandId(id[a]);
@@ -555,9 +555,9 @@ public class SarLawsDetailedListServiceImpl extends ServiceImpl<SarLawsDetailedL
             List<TimeDto> 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]);