From af11a626dfc758f4f7f0ee756d7912ef3b9f4a91 Mon Sep 17 00:00:00 2001
From: yuezhihang <yuezhihang@91isoft.com>
Date: Thu, 24 Feb 2022 17:55:22 +0800
Subject: [PATCH] =?UTF-8?q?bug=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/adc/da/common/ActDefineStartMap.java  |  2 +
 .../sarStandIdea/entity/SarPublicIdeaAll.java |  1 +
 .../adc/da/utils/util/FieldConvertUtil.java   | 14 ++++--
 .../SarLawsAttrDetailedListMapper.xml         |  2 +-
 .../sarStandIdea/SarPublicIdeaAllMapper.xml   | 45 ++++++++++++++-----
 .../sarStandWarning/EarlyWraningEOMapper.xml  | 18 ++++----
 .../mapper/person/PersonCollectEOMapper.xml   |  2 +-
 7 files changed, 57 insertions(+), 27 deletions(-)

diff --git a/adc-da-activiti/src/main/java/com/adc/da/common/ActDefineStartMap.java b/adc-da-activiti/src/main/java/com/adc/da/common/ActDefineStartMap.java
index 41b5232e..f958b680 100644
--- a/adc-da-activiti/src/main/java/com/adc/da/common/ActDefineStartMap.java
+++ b/adc-da-activiti/src/main/java/com/adc/da/common/ActDefineStartMap.java
@@ -58,6 +58,8 @@ public class ActDefineStartMap {
         map.put("24","Aboliish");
         map.put("25","enterpriseStandardSystemRevisionPlan");
 
+        map.put("26","qbzxdlxjh");
+
         return map.get(type);
     }
 }
diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandIdea/entity/SarPublicIdeaAll.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandIdea/entity/SarPublicIdeaAll.java
index 589fb322..ca6aa7ba 100644
--- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandIdea/entity/SarPublicIdeaAll.java
+++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandIdea/entity/SarPublicIdeaAll.java
@@ -1,6 +1,7 @@
 package com.adc.da.slrs.sarStandIdea.entity;
 
 import com.adc.da.base.entity.BaseEntity;
+import com.baomidou.mybatisplus.annotation.FieldStrategy;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.baomidou.mybatisplus.annotation.TableField;
diff --git a/adc-da-slrs/src/main/java/com/adc/da/utils/util/FieldConvertUtil.java b/adc-da-slrs/src/main/java/com/adc/da/utils/util/FieldConvertUtil.java
index b21525e1..7b7035d0 100644
--- a/adc-da-slrs/src/main/java/com/adc/da/utils/util/FieldConvertUtil.java
+++ b/adc-da-slrs/src/main/java/com/adc/da/utils/util/FieldConvertUtil.java
@@ -106,10 +106,16 @@ public class FieldConvertUtil {
 
             if (StringUtils.isNotBlank(timeStr)) {
                 List<String> timeList = Arrays.asList(timeStr.split(","));
-
-                List<String> collect = timeList.stream()
-                        .map(item -> "str_to_date('" + item + "','%Y-%m-%d')")
-                        .collect(Collectors.toList());
+                List<String> collect;
+                if (timeStr.length()<=10) {
+                    collect = timeList.stream()
+                            .map(item -> "str_to_date('" + item + "','%Y-%m-%d')")
+                            .collect(Collectors.toList());
+                }else {
+                    collect = timeList.stream()
+                            .map(item -> "str_to_date('" + item.substring(0,10) + "','%Y-%m-%d ')")
+                            .collect(Collectors.toList());
+                }
                 timeStr ="concat(" + String.join(", \',\' ,", collect) + ")";
             } else {
                 timeStr = "null";
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 8470ad5b..2fdcaa54 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
@@ -31,7 +31,7 @@
                 b.NYLX LIKE concat ('%',#{sarFindDto.nylx,jdbcType=VARCHAR},'%')
                 and
             </if>
-            <if test="sarFindDto.ZRBM != null">
+            <if test="sarFindDto.zrbm != null">
                 b.ZRBM LIKE concat ('%',#{sarFindDto.zrbm,jdbcType=VARCHAR},'%')
                 and
             </if>
diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandIdea/SarPublicIdeaAllMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandIdea/SarPublicIdeaAllMapper.xml
index 94b5e2fa..c6dba835 100644
--- a/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandIdea/SarPublicIdeaAllMapper.xml
+++ b/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandIdea/SarPublicIdeaAllMapper.xml
@@ -15,16 +15,35 @@
     </select>
 
     <select id="getAllDataByIdea" resultType="com.adc.da.slrs.sarStandIdea.entity.SarPublicIdeaAll">
-         SELECT sar_public_idea_all.id,sar_public_idea_all.reason,ts_institution.name as dept_name,sar_public_idea_all.old_text,sar_public_idea_all.wk_flag,
-         sar_public_idea_all.new_text,ts_user.INSTITUTION_ID as dept_id,sar_public_idea_all.part_code,sar_public_idea_all.user_name,
-         sar_public_idea_all.user_id,sar_public_idea_all.content,sar_public_idea_all.idea_id,sar_public_idea_all.cid,sar_public_idea_all.chapter_name as chapterName,
-         sar_public_idea_all.cause
-         FROM sar_public_idea_all
-         left join ts_user on sar_public_idea_all.user_id=ts_user.USID
-         left join ts_institution on ts_institution.id=ts_user.INSTITUTION_ID
-         WHERE
-         sar_public_idea_all.idea_id = #{ideaId}
-         LIMIT ${(page-1)*size},${size}
+        <!--SELECT sar_public_idea_all.id,sar_public_idea_all.reason,ts_institution.name as dept_name,sar_public_idea_all.old_text,sar_public_idea_all.wk_flag,-->
+        <!--sar_public_idea_all.new_text,ts_user.INSTITUTION_ID as dept_id,sar_public_idea_all.part_code,sar_public_idea_all.user_name,-->
+        <!--sar_public_idea_all.user_id,sar_public_idea_all.content,sar_public_idea_all.idea_id,sar_public_idea_all.cid,sar_public_idea_all.chapter_name as chapterName,-->
+        <!--sar_public_idea_all.cause-->
+        <!--FROM sar_public_idea_all-->
+        <!--left join ts_user on sar_public_idea_all.user_id=ts_user.USID-->
+        <!--left join ts_institution on ts_institution.id=ts_user.INSTITUTION_ID-->
+        <!--WHERE-->
+        <!--sar_public_idea_all.idea_id = #{ideaId}-->
+        <!--LIMIT ${(page-1)*size},${size}-->
+        <!---->
+        SELECT
+        c.*
+        FROM
+        (
+        SELECT (@i:=@i+1) as rows,
+        sar_public_idea_all.id,sar_public_idea_all.reason,ts_institution.name as dept_name,sar_public_idea_all.old_text,
+        sar_public_idea_all.wk_flag,sar_public_idea_all.new_text,ts_user.INSTITUTION_ID as dept_id,
+        sar_public_idea_all.part_code,sar_public_idea_all.user_name,
+        sar_public_idea_all.user_id,sar_public_idea_all.content,sar_public_idea_all.idea_id,sar_public_idea_all.cid,
+        sar_public_idea_all.chapter_name as chapterName,sar_public_idea_all.cause
+        FROM (sar_public_idea_all,(SELECT @i:=0)j)
+        left join ts_user on sar_public_idea_all.user_id=ts_user.USID
+        left join ts_institution on ts_institution.id=ts_user.INSTITUTION_ID
+        WHERE
+        sar_public_idea_all.idea_id = #{ideaId}
+        LIMIT ${(page-1)*size},${size}
+        )c
+        ORDER BY CONVERT(SUBSTRING(c.part_code,1,(SELECT LOCATE('.',CONCAT(c.part_code,'.')))),SIGNED) ,c.rows
     </select>
 
     <select id="getAllDataByIdeaCount" resultType="java.lang.Integer">
@@ -34,7 +53,8 @@
     </select>
 
     <select id="getPublicAllIdea" resultType="com.adc.da.slrs.sarStandIdea.entity.SarPublicIdeaAll">
-        SELECT sar_public_idea_all.id,reason,ts_institution.name as deptName,old_text,new_text,dept_id,part_code,user_name,user_id,content,idea_id,cid,chapter_name,wk_flag,sar_public_idea_all.state,sar_public_idea_all.cause
+        SELECT sar_public_idea_all.id,reason,ts_institution.name as
+        deptName,old_text,new_text,dept_id,part_code,user_name,user_id,content,idea_id,cid,chapter_name,wk_flag,sar_public_idea_all.state,sar_public_idea_all.cause
         FROM sar_public_idea_all
         left join ts_user on ts_user.USID=sar_public_idea_all.user_id
         left join ts_institution on ts_institution.id=ts_user.INSTITUTION_ID
@@ -46,7 +66,8 @@
     </select>
 
     <select id="getPublicAllIdeaExport" resultType="com.adc.da.slrs.sarStandIdea.entity.SarPublicIdeaAll">
-        SELECT sar_public_idea_all.id,reason,ts_institution.name as deptName,old_text,new_text,dept_id,part_code,user_name,user_id,content,idea_id,cid,chapter_name,wk_flag,sar_public_idea_all.state,sar_public_idea_all.cause
+        SELECT sar_public_idea_all.id,reason,ts_institution.name as
+        deptName,old_text,new_text,dept_id,part_code,user_name,user_id,content,idea_id,cid,chapter_name,wk_flag,sar_public_idea_all.state,sar_public_idea_all.cause
         FROM sar_public_idea_all
         left join ts_user on ts_user.USID=sar_public_idea_all.user_id
         left join ts_institution on ts_institution.id=ts_user.INSTITUTION_ID
diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandWarning/EarlyWraningEOMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandWarning/EarlyWraningEOMapper.xml
index c0cb29b4..bbdbf4e5 100644
--- a/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandWarning/EarlyWraningEOMapper.xml
+++ b/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandWarning/EarlyWraningEOMapper.xml
@@ -12,7 +12,7 @@
         <result column="ISSUE_TIME" property="issueTime"></result>
         <result column="APPLY_TYPE"      property="applyType"></result>
         <result column="DUTY_ENGINEER"   property="dutyEngineer"></result>
-        <result column="ITEMS_ID"        property="itemsId"></result>
+        <result column="ITEM_ID"        property="itemsId"></result>
         <result column="ITEMS_NUM"       property="itemsNum"></result>
         <result column="ITEMS_NAME"      property="itemsName"></result>
         <result column="TERMS_CONDITIONS" property="termsConditions"></result>
@@ -102,7 +102,7 @@
         dicType.DIC_TYPE_NAME AS applyTypeShow,
         attr.CLLX AS APPLY_TYPE ,
         attr.ZRGCS AS DUTY_ENGINEER ,
-        NULL AS ITEMS_ID ,
+        NULL AS ITEM_ID ,
         NULL AS ITEMS_NUM ,
         NULL AS ITEMS_NAME ,
         NULL AS TERMS_CONDITIONS,
@@ -140,7 +140,7 @@
         dicType.DIC_TYPE_NAME AS applyTypeShow,
         items.APPLY_ARCTIC AS APPLY_TYPE ,
         items.DUTY_ENGINEER AS DUTY_ENGINEER ,
-        items.ID AS ITEMS_ID ,
+        items.ID AS ITEM_ID ,
         items.ITEMS_NUM ,
         items.ITEMS_NAME ,
         items.TERMS_CONDITIONS,
@@ -153,7 +153,7 @@
         FROM
         sar_stand_warning AS warning
         LEFT JOIN sar_standards_info AS sarInfo ON sarInfo.id = warning.STAND_ID
-        LEFT JOIN sar_stand_items AS items ON items.ID = warning.ITEMS_ID
+        LEFT JOIN sar_stand_items AS items ON items.ID = warning.ITEM_ID
         LEFT JOIN sar_stand_attr_info AS attr ON attr.STAND_ID = warning.STAND_ID
         LEFT JOIN ts_dictype as dicType on (dicType.DIC_TYPE_CODE = items.APPLY_ARCTIC  AND items.APPLY_ARCTIC !=null AND items.APPLY_ARCTIC != '')
         <where>
@@ -179,7 +179,7 @@
         GROUP BY warning_date.law_id,item_id
         ) warning_date
         ON warning_date.law_id = WARNING_RESULT.STAND_ID
-        AND warning_date.item_id = WARNING_RESULT.ITEMS_ID
+        AND warning_date.item_id = WARNING_RESULT.ITEM_ID
         ORDER BY warning_date.SSRQ_MIN
 
 
@@ -198,7 +198,7 @@
         APPLY_TYPE ,
         attr
         .ZRGCS AS DUTY_ENGINEER ,
-        ITEMS_ID ,
+        ITEM_ID ,
         NULL AS ITEMS_NUM ,
         NULL AS ITEMS_NAME ,
         NULL AS TERMS_CONDITIONS,
@@ -242,7 +242,7 @@
             <include refid="stand_column"/> ,
             items.APPLY_ARCTIC AS APPLY_TYPE ,
         	items.DUTY_ENGINEER AS DUTY_ENGINEER ,
-        	items.ID AS ITEMS_ID ,
+        	items.ID AS ITEM_ID ,
         	items.ITEMS_NUM ,
         	items.ITEMS_NAME ,
         	items.TERMS_CONDITIONS,
@@ -256,7 +256,7 @@
         	sar_stand_warning AS warning
         LEFT JOIN sar_standards_info AS sarInfo ON sarInfo.id = warning.STAND_ID
         LEFT JOIN sar_stand_attr_info AS attr ON attr.STAND_ID = warning.STAND_ID
-        LEFT JOIN sar_stand_items AS items ON items.ID = warning.ITEMS_ID
+        LEFT JOIN sar_stand_items AS items ON items.ID = warning.ITEM_ID
         <where>
             POWER = '1'
             AND (MARK = 'item')
@@ -289,7 +289,7 @@
         GROUP BY warning_date.law_id,item_id
         ) warning_date
         ON warning_date.law_id = WARNING_RESULT.STAND_ID
-        AND warning_date.item_id = WARNING_RESULT.ITEMS_ID
+        AND warning_date.item_id = WARNING_RESULT.ITEM_ID
         ORDER BY warning_date.SSRQ_MIN
 
     </select>
diff --git a/adc-da-sys/src/main/resources/mybatis/mapper/person/PersonCollectEOMapper.xml b/adc-da-sys/src/main/resources/mybatis/mapper/person/PersonCollectEOMapper.xml
index a30b2eaa..9e055bd9 100644
--- a/adc-da-sys/src/main/resources/mybatis/mapper/person/PersonCollectEOMapper.xml
+++ b/adc-da-sys/src/main/resources/mybatis/mapper/person/PersonCollectEOMapper.xml
@@ -404,7 +404,7 @@
         where collect_type=#{c}
     </select>
     <select id="countPersonCollectByStandInfo" resultType="java.lang.Integer">
-            SELECT COUNT(1)
+            SELECT COUNT(ts_person_collect.ID)
             from
             ts_person_collect
             WHERE