Merge branch 'develop_master' into FOTON

adc-da-slrs/src/main/java/com/adc/da/slrs/regulations/service/impl/StandDataServiceImpl.java

@@ -36,6 +36,11 @@ public class StandDataServiceImpl extends ServiceImpl<StandDataDao, StandData> i
     public String searchStandData(SearchStandContext searchStandContext){
         List<FileResult> fileResultList = new ArrayList<>();
         try {
+            //TODO 此处接口优化  传入的VPPSCode 参数全部截取到第三位位置
+            logger.info("接口传递的VPPS编码为"+searchStandContext.getVppsCode());
+            String newVppsCode= convertVppsCode(searchStandContext.getVppsCode());
+            logger.info("经过处理后只获取前三级的VPPS编码为"+newVppsCode);
+            searchStandContext.setVsgCode(newVppsCode);
             List<StandData> standDataQuery = this.baseMapper.searchStandData(searchStandContext);
            if(!standDataQuery.isEmpty()){
                // 重组数据集合 只需documentName 及 documentUrl
@@ -72,4 +77,23 @@ public class StandDataServiceImpl extends ServiceImpl<StandDataDao, StandData> i
         }
         return str;
     }
+
+    private String convertVppsCode(String vppsCode){
+        if(StringUtils.isNotBlank(vppsCode)){
+            String[] splitData = vppsCode.split(".");
+            if(splitData.length<=3){
+                return vppsCode;
+            }else{
+                StringBuilder result = new StringBuilder();
+                result.append(splitData[0]).append(".").append(splitData[1]).append(".").append(splitData[2]);
+                return result.toString();
+            }
+
+
+        }else{
+            return null;
+        }
+    }
+
+
 }

adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandIdea/service/Impl/SarPublicIdeaServiceImpl.java

@@ -48,22 +48,26 @@ public class SarPublicIdeaServiceImpl extends ServiceImpl<SarPublicIdeaDao, SarP
         QueryWrapper<SarPublicIdea> list = new QueryWrapper<>();
         if ("1".equals(type)) {
             if (start!=null && end !=null){
+                String date1 = (new SimpleDateFormat("yyyy-MM-dd")).format(start);
+                String date2 = (new SimpleDateFormat("yyyy-MM-dd")).format(end);
                 list.like(StringUtils.isNotEmpty(category), "category", category)
                         .like(StringUtils.isNotEmpty(cname), "cid", cname)
-                        .ge(start != null, "start_time", start)
-                        .le(end != null, "end_time", end)
+                        .ge(start != null, "start_time", date1)
+                        .le(end != null, "end_time", date2)
                         .orderByDesc("start_time");
             }else if (start!=null){
+                String date1 = (new SimpleDateFormat("yyyy-MM-dd")).format(start);
                 list.like(StringUtils.isNotEmpty(category), "category", category)
                         .like(StringUtils.isNotEmpty(cname), "cid", cname)
-                        .le(start != null, "start_time", start)
-                        .ge(start != null, "end_time", start)
+                        .le(start != null, "start_time", date1)
+                        .ge(start != null, "end_time", date1)
                         .orderByDesc("start_time");
             }else if (end!=null){
+                String date2 = (new SimpleDateFormat("yyyy-MM-dd")).format(end);
                 list.like(StringUtils.isNotEmpty(category), "category", category)
                         .like(StringUtils.isNotEmpty(cname), "cid", cname)
-                        .le(end != null, "start_time", end)
-                        .ge(end != null, "end_time", end)
+                        .le(end != null, "start_time", date2)
+                        .ge(end != null, "end_time", date2)
                         .orderByDesc("start_time");
             }else {
                 list.like(StringUtils.isNotEmpty(category), "category", category)
@@ -71,9 +75,10 @@ public class SarPublicIdeaServiceImpl extends ServiceImpl<SarPublicIdeaDao, SarP
                         .orderByDesc("start_time");
             }
         } else {
+            String date = (new SimpleDateFormat("yyyy-MM-dd")).format(new Date());
             list.like(StringUtils.isNotEmpty(category), "category", category)
                     .like(StringUtils.isNotEmpty(cname), "cname", cname)
-                    .ge("end_time", new Date())
+                    .ge("end_time", date)
                     .orderByAsc("end_time");
         }
         Page<SarPublicIdea> page = new Page<>(p, size);

adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/service/impl/SarStandardsInfoServiceImpl.java

@@ -2123,6 +2123,7 @@ public class SarStandardsInfoServiceImpl extends ServiceImpl<SarStandardsInfoDao
         map.put("standEnName", verifyObj(sarStandardsInfoEO.getStandEnName()));
         map.put("standNature", verifyObj(sarStandardsInfoEO.getStandNature()));
         map.put("standState", verifyObj(sarStandardsInfoEO.getStandState()));
+        map.put("textStatus", verifyObj(sarStandardsInfoEO.getTextStatus()));
 //        if (sarStandardsInfoEO.getIssueTime() != null) {
 //            SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd");
 //            String issueStr = format.format(sarStandardsInfoEO.getIssueTime());

adc-da-slrs/src/main/resources/mybatis/mapper/SarStandItems/SarStandItemsMapper.xml

@@ -407,13 +407,13 @@
 
     <select id="querySarItemAndInterpretation" resultMap="sarItemVOResultMap"
             parameterType="com.adc.da.slrs.sarStandItems.entity.FindSarItemsPageReqDTO">
-            SELECT
-            sar_stand_items.*
-            FROM
-	            sar_stand_items
+        SELECT
+        sar_stand_items.*,split_pid(sar_stand_items.ITEMS_NUM,'.') as tt
+        FROM
+        sar_stand_items
         <include refid="sarItemWhere"/>
         <if test="orderBy !=null and orderBy!=''">
-            order by sar_stand_items.ITEMS_NUM ${order}
+            order by tt ${order}
         </if>
         LIMIT ${pager.startIndex-1},${pageSize}
     </select>

adc-da-slrs/src/main/resources/mybatis/mapper/sarBussionessStand/SarBussionessStandMapper.xml

@@ -386,6 +386,7 @@
         <if test="pager.orderCondition != null and pager.orderCondition != ''" >
             ${pager.orderCondition}
         </if>
+        order by SAR_BUSSIONESS_STAND.stand_year desc
     </select>
 
     <select id="queryByBussStateSync" resultMap="BaseResultMap"

adc-da-slrs/src/main/resources/mybatis/mapper/sarStandardsInfo/SarStandardsInfoMapper.xml

@@ -1565,6 +1565,7 @@
         <if test="sychronId != null">
             and id != #{sychronId}
         </if>
+        order by SAR_STANDARDS_INFO.stand_year desc
     </select>
 
     <select id="queryStandInfoByList" resultMap="BaseResultMap">