From 44ba80e050dc42d8673d30e9320ed9e2c97c5554 Mon Sep 17 00:00:00 2001
From: "zhaokaiyao@91isoft.com" <6922339zky>
Date: Thu, 16 Sep 2021 10:48:19 +0800
Subject: [PATCH 1/6] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E4=BA=86=E6=A0=87?=
 =?UTF-8?q?=E5=87=86=E9=A2=84=E8=AD=A6,=E6=9D=A1=E6=AC=BE=E9=A2=84?=
 =?UTF-8?q?=E8=AD=A6=E6=A0=87=E5=87=86=E5=8F=B7=E6=98=BE=E7=A4=BA=E4=B8=BA?=
 =?UTF-8?q?null=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mybatis/mapper/sarStandWarning/SarStandardItem.xml      | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandWarning/SarStandardItem.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandWarning/SarStandardItem.xml
index a6a1d552..18a45507 100644
--- a/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandWarning/SarStandardItem.xml
+++ b/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandWarning/SarStandardItem.xml
@@ -8,13 +8,15 @@
         <result column="STAND_ID" property="standId"/>
         <result column="ITEMS_NAME" property="itemsName"/>
         <result column="ITEMS_NUM" property="itemsNum"/>
-        <result column="STAND_NUMBER" property="standCode"/>
+        <result column="STAND_NUMBER" property="standNum"/>
         <result column="STAND_NAME" property="standName"/>
         <result column="XCXSSRQ" property="XCXSSRQ"/>
         <result column="ZCCSSRQ" property="ZCCSSRQ"/>
         <result column="CLLX" property="applyType"/>
         <result column="STAND_TYPE" property="standType"/>
         <result column="DUTY_ENGINEER" property="dutyEngineer"/>
+        <result column="STAND_SORT" property="standSort"/>
+        <result column="STAND_YEAR" property="standYear"/>
     </resultMap>
     <!-- 查询条件 -->
     <select id="selectWithinTerm" resultMap="resultMap" parameterType="com.adc.da.scheduled.entity.DataDTO">
@@ -25,6 +27,8 @@
             items.TERMS_CONDITIONS,
             items.DUTY_ENGINEER,
             items.STAND_ID,
+            info.STAND_SORT,
+            info.STAND_YEAR,
             info.STAND_NAME,
             info.STAND_TYPE,
             info.STAND_NUMBER,

From 3eb2ddce1ef13500b48e7bddff4a40576f89f215 Mon Sep 17 00:00:00 2001
From: "zhaokaiyao@91isoft.com" <6922339zky>
Date: Thu, 16 Sep 2021 16:47:03 +0800
Subject: [PATCH 2/6] =?UTF-8?q?=E5=88=86=E8=A7=A3=E5=8D=95=E9=BB=98?=
 =?UTF-8?q?=E8=AE=A4=E5=8D=87=E5=BA=8F=E6=8E=92=E5=BA=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../sarStandItems/service/impl/SarStandItemsServiceImpl.java   | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/service/impl/SarStandItemsServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/service/impl/SarStandItemsServiceImpl.java
index a0fbafa7..628a34a0 100644
--- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/service/impl/SarStandItemsServiceImpl.java
+++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/service/impl/SarStandItemsServiceImpl.java
@@ -214,6 +214,9 @@ public class SarStandItemsServiceImpl extends ServiceImpl<SarStandItemsDao, SarS
                 case "descending":page.setOrder("DESC");break;
                 default:page.setOrder("ASC");
             }
+        }else {
+            page.setOrderBy("ITEMS_NUM");
+            page.setOrder("DESC");
         }
 
 

From ccf7d329456f739537c0e6a85b9c52f48ea82cd9 Mon Sep 17 00:00:00 2001
From: "zhaokaiyao@91isoft.com" <6922339zky>
Date: Thu, 16 Sep 2021 19:27:36 +0800
Subject: [PATCH 3/6] =?UTF-8?q?=E9=A6=96=E9=A1=B5=E6=A0=87=E5=87=86?=
 =?UTF-8?q?=E5=8F=91=E5=B8=83=20=E5=8F=AA=E6=9F=A5=E8=AF=A2=E6=96=87?=
 =?UTF-8?q?=E6=9C=AC=E7=8A=B6=E6=80=81=E4=B8=BA=E5=8D=B3=E5=B0=86=E5=AE=9E?=
 =?UTF-8?q?=E6=96=BD=E7=9A=84=E6=95=B0=E6=8D=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../dao/SarStandardsInfoDao.java              |  2 +-
 .../impl/SarStandardsInfoServiceImpl.java     | 31 ++++++++++++++++++-
 .../SarStandardsInfoMapper.xml                |  6 ++--
 3 files changed, 35 insertions(+), 4 deletions(-)

diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/dao/SarStandardsInfoDao.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/dao/SarStandardsInfoDao.java
index 59218feb..9e07c26a 100644
--- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/dao/SarStandardsInfoDao.java
+++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/dao/SarStandardsInfoDao.java
@@ -31,7 +31,7 @@ public interface SarStandardsInfoDao extends BaseMapper<SarStandardsInfo> {
 
     List<SarStandardsInfo> selectStandardsByStandnumber(SarStandardsInfo sarStandardsInfoEO);
 
-    List<SarStandardsInfo> queryStandInfoByList(@Param("limit") Integer limit);
+    List<SarStandardsInfo> queryStandInfoByList(@Param("limit") Integer limit,@Param("typeCode") String typeCode);
 
     Integer selectStandColumn(@Param("columnName") String columnName);
 
diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/service/impl/SarStandardsInfoServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/service/impl/SarStandardsInfoServiceImpl.java
index 31c274c3..5b3dc546 100644
--- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/service/impl/SarStandardsInfoServiceImpl.java
+++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/service/impl/SarStandardsInfoServiceImpl.java
@@ -49,6 +49,10 @@ import com.adc.da.slrs.sarStandardsInfo.service.ISarStandardsInfoService;
 import com.adc.da.slrs.sarUpdLog.service.ISarUpdLogService;
 import com.adc.da.slrs.sarUser.service.ITsUserService;
 import com.adc.da.slrs.sysInfo.service.SysInfoEOService;
+import com.adc.da.slrs.tsDictionaryType.dao.TsDicTypeDao;
+import com.adc.da.slrs.tsDictionaryType.dao.TsDictionaryDao;
+import com.adc.da.slrs.tsDictionaryType.entity.TsDicType;
+import com.adc.da.slrs.tsDictionaryType.entity.TsDictionary;
 import com.adc.da.sys.common.SelectionResult;
 import com.adc.da.sys.constant.ValueStateEnum;
 import com.adc.da.sys.dao.DicTypeEODao;
@@ -203,6 +207,12 @@ public class SarStandardsInfoServiceImpl extends ServiceImpl<SarStandardsInfoDao
     @Autowired
     private StandLawsSearchService standLawsSearchService;
 
+
+    @Autowired
+    private TsDictionaryDao tsDictionaryDao;
+
+    @Autowired
+    private TsDicTypeDao tsDicTypeDao;
 //    /**
 //     * 反向操作标准
 //     */
@@ -2032,9 +2042,28 @@ public class SarStandardsInfoServiceImpl extends ServiceImpl<SarStandardsInfoDao
         return strhours;
     }
 
+
+
     @Override
     public List<SarStandardsInfo> getStandInfoByList(String limit){
-        return dao.queryStandInfoByList(Integer.valueOf(limit));
+
+        //查询文本状态为即将实施的
+        QueryWrapper<TsDictionary> dictionaryWrapper = new QueryWrapper<>();
+        dictionaryWrapper.select("ID")
+                .eq("DICTIONARY_NAME","文本状态");
+        List<Map<String, Object>> dicMaps = tsDictionaryDao.selectMaps(dictionaryWrapper);
+
+
+        QueryWrapper<TsDicType> dicTypeWrapper = new QueryWrapper<>();
+        dicTypeWrapper.select("DIC_TYPE_CODE")
+                .eq("DIC_ID",dicMaps.get(0).get("ID").toString())
+                .eq("DIC_TYPE_NAME","即将实施");
+
+        List<Map<String, Object>> typeMaps = tsDicTypeDao.selectMaps(dicTypeWrapper);
+
+
+        List<SarStandardsInfo> standInfoList = dao.queryStandInfoByList(Integer.valueOf(limit), typeMaps.get(0).get("DIC_TYPE_CODE").toString());
+        return standInfoList;
     }
 
     /**
diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandardsInfo/SarStandardsInfoMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandardsInfo/SarStandardsInfoMapper.xml
index 7e1706b2..8fb675bc 100644
--- a/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandardsInfo/SarStandardsInfoMapper.xml
+++ b/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandardsInfo/SarStandardsInfoMapper.xml
@@ -646,12 +646,14 @@
         </if>
     </select>
 
-    <select id="queryStandInfoByList" resultMap="BaseResultMap" parameterType="java.lang.Integer">
+    <select id="queryStandInfoByList" resultMap="BaseResultMap">
         select
         <include refid="Base_Column_List"/>
         FROM sar_standards_info
         LEFT JOIN sar_stand_attr_info ssai ON ssai.STAND_ID = SAR_STANDARDS_INFO.ID
-        WHERE DATE_FORMAT(ssai.SSRQ,'%Y-%m-%D') &gt;= DATE_FORMAT(SAR_STANDARDS_INFO.ISSUE_TIME,'%Y-%m-%D')
+        WHERE
+        sar_standards_info.VALID_FLAG='0'
+        AND TEXT_STATUS=#{typeCode}
         ORDER BY SAR_STANDARDS_INFO.ISSUE_TIME DESC
         LIMIT #{limit}
     </select>

From fe0a0f7dbe8b56b83a9d67ef32c8ec2e129ccb6a Mon Sep 17 00:00:00 2001
From: "zhaokaiyao@91isoft.com" <6922339zky>
Date: Thu, 16 Sep 2021 20:03:40 +0800
Subject: [PATCH 4/6] =?UTF-8?q?=E5=9B=BD=E5=86=85=E5=A4=96=E6=A0=87?=
 =?UTF-8?q?=E5=87=86=20=E5=AE=9E=E6=96=BD=E6=97=A5=E6=9C=9F=E6=8E=92?=
 =?UTF-8?q?=E5=BA=8F=20=E7=A8=8B=E5=BA=8F=E5=BC=82=E5=B8=B8=20group=20by?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mapper/sarStandardsInfo/SarStandardsInfoMapper.xml     | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandardsInfo/SarStandardsInfoMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandardsInfo/SarStandardsInfoMapper.xml
index 8fb675bc..3744e28e 100644
--- a/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandardsInfo/SarStandardsInfoMapper.xml
+++ b/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandardsInfo/SarStandardsInfoMapper.xml
@@ -595,7 +595,7 @@
         ) AS issueTime
         from SAR_STANDARDS_INFO
         <include refid="SarStandardsInfo_Where_Clause"/>
-        GROUP BY <include refid="Group_Column_List_Show"/>,CHJL,SAR_STAND_ATTR_INFO.XCXSSRQ,SAR_STAND_ATTR_INFO.ZCCSSRQ
+        GROUP BY <include refid="Group_Column_List_Show"/>,CHJL,SAR_STAND_ATTR_INFO.XCXSSRQ,SAR_STAND_ATTR_INFO.ZCCSSRQ,SAR_STAND_ATTR_INFO.SSRQ
         order by
         ${orderBy1} ${order1},SAR_STANDARDS_INFO.id
         ) tmp_tb limit ${pager.startIndex-1},${pageSize}) a
@@ -652,6 +652,11 @@
         FROM sar_standards_info
         LEFT JOIN sar_stand_attr_info ssai ON ssai.STAND_ID = SAR_STANDARDS_INFO.ID
         WHERE
+        DATE_FORMAT(ssai.SSRQ, '%Y-%m-%D') >= DATE_FORMAT(
+        SAR_STANDARDS_INFO.ISSUE_TIME,
+        '%Y-%m-%D'
+        )
+        AND
         sar_standards_info.VALID_FLAG='0'
         AND TEXT_STATUS=#{typeCode}
         ORDER BY SAR_STANDARDS_INFO.ISSUE_TIME DESC

From 4d598a76a22c9c252282c587845fd3f77ee286bb Mon Sep 17 00:00:00 2001
From: yuezhihang <yuezhihang@91isoft.com>
Date: Thu, 16 Sep 2021 20:05:48 +0800
Subject: [PATCH 5/6] =?UTF-8?q?=E6=A0=87=E5=87=86=E8=A7=A3=E8=AF=BB=20?=
 =?UTF-8?q?=E7=AB=A0=E8=8A=821=20=E5=B1=95=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/SarFileSplitInfoEOServiceImpl.java        | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/service/impl/SarFileSplitInfoEOServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/service/impl/SarFileSplitInfoEOServiceImpl.java
index 91b02664..5ffde997 100644
--- a/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/service/impl/SarFileSplitInfoEOServiceImpl.java
+++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/service/impl/SarFileSplitInfoEOServiceImpl.java
@@ -335,7 +335,7 @@ public class SarFileSplitInfoEOServiceImpl implements SarFileSplitInfoEOService
             middle=messageList;
             for (SarFileSplitItemsEO mis:messageList) {
                 mis.setWorkFlowShow("1");
-                if (mis.getItemsNum().equals("1") || mis.getItemsNum().startsWith("1.") || mis.getItemsNum().equals("2") || mis.getItemsNum().startsWith("2.") || mis.getItemsNum().equals("3") || mis.getItemsNum().startsWith("3.")){
+                if (mis.getItemsNum().equals("2") || mis.getItemsNum().startsWith("2.") || mis.getItemsNum().equals("3") || mis.getItemsNum().startsWith("3.")){
                     mis.setWorkFlowShow("0");
                 }
                 else {
@@ -349,6 +349,11 @@ public class SarFileSplitInfoEOServiceImpl implements SarFileSplitInfoEOService
                     }
                 }
             }
+            messageList.forEach(sarFileSplitItemsEO -> {
+                if (sarFileSplitItemsEO.getItemsNum().equals("1")){
+                    sarFileSplitItemsEO.setWorkFlowShow("1");
+                }
+            });
             sarFileSplitMenuEODao.insertForeach(treeList);
             sarFileSplitItemsEODao.insertForeach(messageList);
             sarFileSplitItemsValEODao.insertForeach(itemValList);

From 7bc2d8124a44629313b4b7c5fb584a409995a84e Mon Sep 17 00:00:00 2001
From: "zhaokaiyao@91isoft.com" <6922339zky>
Date: Fri, 17 Sep 2021 09:31:52 +0800
Subject: [PATCH 6/6] =?UTF-8?q?=E9=A6=96=E9=A1=B5->=E6=A0=87=E5=87=86?=
 =?UTF-8?q?=E5=8F=91=E5=B8=83->=E5=AE=9E=E6=96=BD=E6=97=A5=E6=9C=9F?=
 =?UTF-8?q?=E5=92=8C=E5=8F=91=E5=B8=83=E6=97=A5=E6=9C=9F=E6=AF=94=E8=BE=83?=
 =?UTF-8?q?=E6=97=B6=E7=9A=84=E6=97=A5=E6=9C=9F=E6=A0=BC=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mapper/sarStandardsInfo/SarStandardsInfoMapper.xml        | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandardsInfo/SarStandardsInfoMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandardsInfo/SarStandardsInfoMapper.xml
index 3744e28e..661b3184 100644
--- a/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandardsInfo/SarStandardsInfoMapper.xml
+++ b/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandardsInfo/SarStandardsInfoMapper.xml
@@ -652,9 +652,9 @@
         FROM sar_standards_info
         LEFT JOIN sar_stand_attr_info ssai ON ssai.STAND_ID = SAR_STANDARDS_INFO.ID
         WHERE
-        DATE_FORMAT(ssai.SSRQ, '%Y-%m-%D') >= DATE_FORMAT(
+        DATE_FORMAT(ssai.SSRQ, '%Y-%m-%d') >= DATE_FORMAT(
         SAR_STANDARDS_INFO.ISSUE_TIME,
-        '%Y-%m-%D'
+        '%Y-%m-%d'
         )
         AND
         sar_standards_info.VALID_FLAG='0'