Merge branch 'develop_3' into 'develop_master'

Develop 3

See merge request LiuChao/foton-slrs-system-rest!175

adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/service/impl/SarStandItemsServiceImpl.java

@@ -241,6 +241,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");
         }
 
 

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);
 

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;
     }
 
     /**

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,

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
@@ -646,12 +646,19 @@
         </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
+        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
         LIMIT #{limit}
     </select>