From dd281f63ad055d93847b9aa6be4a2bfa78b12273 Mon Sep 17 00:00:00 2001
From: zzy <2041873787@qq.com>
Date: Thu, 29 Jul 2021 16:59:25 +0800
Subject: [PATCH] =?UTF-8?q?Update=EF=BC=9A=E6=B8=85=E5=8D=95=E9=AB=98?=
 =?UTF-8?q?=E7=BA=A7=E6=A3=80=E7=B4=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../slrs/sarLawsAttrDetailedList/entity/SarFindDto.java  | 6 +++---
 .../service/impl/SarLawsDetailedListServiceImpl.java     | 9 ++++-----
 .../SarLawsAttrDetailedListMapper.xml                    | 6 +++---
 3 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsAttrDetailedList/entity/SarFindDto.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsAttrDetailedList/entity/SarFindDto.java
index 3357aebb..06dc3d5d 100644
--- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsAttrDetailedList/entity/SarFindDto.java
+++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsAttrDetailedList/entity/SarFindDto.java
@@ -17,11 +17,11 @@ public class SarFindDto {
 //    private String standNumber;
     private String standEnName;
     private String typeApplicable;
-    private String NYLX;
+    private String nylx;
 //    private String putTime;
 //    private String XCXSSRQGJ;
 //    private String ZCCSSRQGJ;
-    private String ZRBM;
-    private String SYCPX;
+    private String zrbm;
+    private String sycpx;
 
 }
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 c22780bd..db177f68 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
@@ -94,7 +94,7 @@ public class SarLawsDetailedListServiceImpl extends ServiceImpl<SarLawsDetailedL
             }
             if ("admin".equals(getUserName()))sarLawsDetailedList.setUpdatePeople("管理员");
             else {sarLawsDetailedList.setUpdatePeople(getUserName());}
-
+            sarLawsDetailedListDao.insert(sarLawsDetailedList);
             if (addDetailedDto.getInforlist()!=null){
                 if (addDetailedDto.getInforlist().contains(",")){
                     String[] id = addDetailedDto.getInforlist().split(",");
@@ -104,17 +104,17 @@ public class SarLawsDetailedListServiceImpl extends ServiceImpl<SarLawsDetailedL
                     for (int a =0;a< id.length;a++){
                         TimeDto dto = new TimeDto();
                         dto.setStandId(id[a]);
-                        if (null==putTime[a]){
+                        if ("-".equals(putTime[a]) || null==putTime[a] ){
                             dto.setPutTime(null);
                         }else {
                             dto.setPutTime(putTime[a]);
                         }
-                        if (null == xcx[a]){
+                        if ("-".equals(putTime[a]) || null == xcx[a]){
                             dto.setXcxssrqgj(null);
                         }else {
                             dto.setXcxssrqgj(xcx[a]);
                         }
-                        if (null == zcc[a]){
+                        if ("-".equals(putTime[a]) || null == zcc[a]){
                             dto.setZccssrqgj(null);
                         }else {
                             dto.setZccssrqgj(zcc[a]);
@@ -132,7 +132,6 @@ public class SarLawsDetailedListServiceImpl extends ServiceImpl<SarLawsDetailedL
             }else {
                 timeDto=null;
             }
-            sarLawsDetailedListDao.insert(sarLawsDetailedList);
             service.insertDetailedList(sarLawsDetailedList.getId(),timeDto);
 
         } catch (Exception e) {
diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/sarLawsAttrDetailedList/SarLawsAttrDetailedListMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/sarLawsAttrDetailedList/SarLawsAttrDetailedListMapper.xml
index 745bb3e1..9ae9fbad 100644
--- a/adc-da-slrs/src/main/resources/mybatis/mapper/sarLawsAttrDetailedList/SarLawsAttrDetailedListMapper.xml
+++ b/adc-da-slrs/src/main/resources/mybatis/mapper/sarLawsAttrDetailedList/SarLawsAttrDetailedListMapper.xml
@@ -27,15 +27,15 @@
                 and
             </if>
             <if test="sarFindDto.NYLX != null">
-                b.NYLX LIKE concat ('%',#{sarFindDto.NYLX,jdbcType=VARCHAR},'%')
+                b.NYLX LIKE concat ('%',#{sarFindDto.nylx,jdbcType=VARCHAR},'%')
                 and
             </if>
             <if test="sarFindDto.ZRBM != null">
-                b.ZRBM LIKE concat ('%',#{sarFindDto.ZRBM,jdbcType=VARCHAR},'%')
+                b.ZRBM LIKE concat ('%',#{sarFindDto.zrbm,jdbcType=VARCHAR},'%')
                 and
             </if>
             <if test="sarFindDto.SYCPX != null">
-                b.SYCPX LIKE concat ('%',#{sarFindDto.SYCPX,jdbcType=VARCHAR},'%')
+                b.SYCPX LIKE concat ('%',#{sarFindDto.sycpx,jdbcType=VARCHAR},'%')
                 and
             </if>
             a.ID IN