修改bug

amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/resources/mapper/DynamicFormInstanceMapper.xml

@@ -108,7 +108,15 @@
                 </choose>
             </foreach>
         </if>
-        order by instanceId desc
+        <if test="params.date != null and params.lift == 'descend'">
+        order by endDate desc
+        </if>
+        <if test="params.date != null and params.lift == 'ascend'">
+            order by endDate ASC
+        </if>
+        <if test="params.date == null ">
+            order by instanceId ASC
+        </if>
     </select>
     <select id="listOneDayDutyPerson" resultType="java.util.Map">
         select

amos-boot-module/amos-boot-module-biz/amos-boot-module-common-biz/src/main/java/com/yeejoin/amos/boot/module/common/biz/service/impl/DynamicFormInstanceServiceImpl.java

@@ -140,6 +140,13 @@ public class DynamicFormInstanceServiceImpl extends BaseService<DynamicFormInsta
             page.setCurrent((long) (current - 1) *size);
             page.setSize(size);
         }
+        if (!params.isEmpty()&&params !=null){
+           if (!params.get("sort").isEmpty() && params.get("sort") != null){
+               String[] sorts = params.get("sort").split(",");
+               params.put("date",sorts[0]);
+               params.put("lift",sorts[1]);
+         }
+        }
         return this.getBaseMapper().pageList(page, RequestContext.getAppKey(), fieldCodes, groupCode, params);
     }
     // 不存在值班数据则不查找 修改sql 方法去除 by kongfm 2021-09-14