Merge remote-tracking branch 'origin/matser' into matser

ibps-provider-root/modules/provider-business/src/main/java/com/lc/ibps/components/sqlzdy/Service/SwdlServiceImpl.java

@@ -677,6 +677,12 @@ public class SwdlServiceImpl extends GenericProvider implements SwdlService {
                     stringObjectHashMap.put("paperState",String.join(",", (ArrayList)param.get("paperState")));
                 }
             }
+            Map sortParam = (Map) map.get("sort");
+            if(BeanUtils.isNotEmpty(sortParam)){
+                stringObjectHashMap.put("startDate",sortParam.get("startDate").toString().toUpperCase());
+            }else{
+                stringObjectHashMap.put("startDate","DESC");
+            }
         }
         return stringObjectHashMap;
     }

ibps-provider-root/modules/provider-business/src/main/resources/com/lc/ibps/klimsibps/mapping/UpdateDataTableMapper.xml

@@ -612,8 +612,16 @@
                 AND FIND_IN_SET(a.paperState, #{map.paperState})
             </if>
             AND examState='已发布'
+            <if test="map.startDate != null and map.startDate == 'ASC'">
+                ORDER BY startDate ASC
+            </if>
+            <if test="map.startDate != null and map.startDate == 'DESC'">
+                ORDER BY startDate DESC
+            </if>
+            <if test="map.startDate == null">
+                ORDER BY startDate DESC
+            </if>
         </where>
-        ORDER BY startDate
         limit ${map.startPage},${map.limit}
     </select>
     <select id="selectMobileExInfoCount" resultType="java.lang.Integer" parameterType="java.util.Map">
@@ -646,7 +654,7 @@
                 AND a.limitDate <![CDATA[ <= ]]> #{map.limitDateLower}
             </if>
             <if test="@o.Ognl@isNotEmpty(map.paperState)">
-                AND a.paperState = #{map.paperState}
+                AND FIND_IN_SET(a.paperState, #{map.paperState})
             </if>
             AND examState='已发布'
         </where>