Merge branch 'dev/20220228_v3.0.1通用版_渠道管理第一期' into test

daqe-center/src/main/java/com/lantone/daqe/facade/ColumnResultManagementFacade.java

@@ -126,7 +126,9 @@ public class ColumnResultManagementFacade {
         columnResultQueryWrapper.like(StringUtil.isNotBlank(getColumnResultPageVO.getBehospitalCode()), "behospital_code", getColumnResultPageVO.getBehospitalCode());
         columnResultQueryWrapper.like(StringUtil.isNotBlank(getColumnResultPageVO.getHosptialDatatmpCode()), "hosptial_datatmp_code", getColumnResultPageVO.getHosptialDatatmpCode());
         columnResultQueryWrapper.like(StringUtil.isNotBlank(getColumnResultPageVO.getHosptialDatatmpName()), "hosptial_datatmp_name", getColumnResultPageVO.getHosptialDatatmpName());
-
+        columnResultQueryWrapper.orderByAsc("is_solved");
+        columnResultQueryWrapper.orderByDesc("gmt_modified");
+        columnResultQueryWrapper.orderByAsc("behospital_code");
         Page<ColumnResult> columnResultPage = new Page<>(getColumnResultPageVO.getCurrent(), getColumnResultPageVO.getSize());
         columnResultFacade.page(columnResultPage, columnResultQueryWrapper);
         BeanUtil.copyProperties(columnResultPage, getColumnResultPageDTOPage);

daqe-center/src/main/java/com/lantone/daqe/facade/ColumnVerifyManagementFacade.java

@@ -237,6 +237,7 @@ public class ColumnVerifyManagementFacade {
         List<RegularInfo> regularInfoList = regularInfoFacade.getBaseMapper().selectList(new QueryWrapper<RegularInfo>()
                 .eq("is_deleted", IsDeleteEnum.N.getKey())
                 .like(StringUtil.isNotBlank(getRegularVO.getName()), "name", getRegularVO.getName())
+                .orderByDesc("gmt_create")
         );
         List<GetRegularDTO> regularDTOList = BeanUtil.listCopyTo(regularInfoList, GetRegularDTO.class);
         return regularDTOList;