Merge branch 'dev-hujianchun-bug' of province-qinghai/province-all into dev

unis-plugin/unis-plugin-biz/src/main/java/com/unis/policy/info/modular/mlpAdviceCollect/service/impl/MlpAdviceCollectServiceImpl.java

@@ -95,7 +95,7 @@ public class MlpAdviceCollectServiceImpl extends ServiceImpl<MlpAdviceCollectMap
             queryWrapper.orderBy(true, mlpAdviceCollectPageParam.getSortOrder().equals(CommonSortOrderEnum.ASC.getValue()),
                     StrUtil.toUnderlineCase(mlpAdviceCollectPageParam.getSortField()));
         } else {
-            queryWrapper.lambda().orderByDesc(MlpAdviceCollect::getCreateTime);
+            queryWrapper.lambda().orderByDesc(MlpAdviceCollect::getCollectionDeadline);
         }
 
         return this.page(CommonPageRequest.defaultPage(), queryWrapper);

unis-plugin/unis-plugin-biz/src/main/java/com/unis/policy/info/modular/mlpAdviceCollectFeedback/mapper/mapping/MlpAdviceCollectOrgFeedbackMapper.xml

@@ -18,7 +18,7 @@
                 and t2.collection_deadline =#{collectionDeadline}
             </if>
         </where>
-        order by t2.create_time desc
+        order by t2.collection_deadline desc
 
     </select>
 </mapper>

unis-plugin/unis-plugin-biz/src/main/java/com/unis/policy/info/modular/mlpDraftAudit/mapper/mapping/MlpDraftAuditMapper.xml

@@ -40,7 +40,7 @@
                 and t1.plan_name like concat("%",#{planName},"%")
             </if>
         </where>
-        order by t1.create_time desc
+        order by t2.publish_time desc
     </select>
 
 

unis-plugin/unis-plugin-biz/src/main/java/com/unis/policy/info/modular/mlpDraftAuditExpert/service/impl/MlpDraftAuditExpertServiceImpl.java

@@ -55,7 +55,7 @@ public class MlpDraftAuditExpertServiceImpl extends ServiceImpl<MlpDraftAuditExp
             queryWrapper.orderBy(true, mlpDraftAuditExpertPageParam.getSortOrder().equals(CommonSortOrderEnum.ASC.getValue()),
                     StrUtil.toUnderlineCase(mlpDraftAuditExpertPageParam.getSortField()));
         } else {
-            queryWrapper.lambda().orderByAsc(MlpDraftAuditExpert::getId);
+            queryWrapper.lambda().orderByDesc(MlpDraftAuditExpert::getCreateTime);
         }
         return this.page(CommonPageRequest.defaultPage(), queryWrapper);
     }

unis-plugin/unis-plugin-biz/src/main/java/com/unis/policy/info/modular/mlpDraftModify/service/impl/MlpDraftModifyServiceImpl.java

@@ -56,7 +56,7 @@ public class MlpDraftModifyServiceImpl extends ServiceImpl<MlpDraftModifyMapper,
             queryWrapper.orderBy(true, mlpDraftModifyPageParam.getSortOrder().equals(CommonSortOrderEnum.ASC.getValue()),
                     StrUtil.toUnderlineCase(mlpDraftModifyPageParam.getSortField()));
         } else {
-            queryWrapper.lambda().orderByAsc(MlpDraftModify::getId);
+            queryWrapper.lambda().orderByDesc(MlpDraftModify::getModifyTime);
         }
         return this.page(CommonPageRequest.defaultPage(), queryWrapper);
     }

unis-plugin/unis-plugin-biz/src/main/java/com/unis/policy/info/modular/mlpFirstDraft/service/impl/MlpFirstDraftServiceImpl.java

@@ -79,7 +79,7 @@ public class MlpFirstDraftServiceImpl extends ServiceImpl<MlpFirstDraftMapper, M
             queryWrapper.orderBy(true, mlpFirstDraftPageParam.getSortOrder().equals(CommonSortOrderEnum.ASC.getValue()),
                     StrUtil.toUnderlineCase(mlpFirstDraftPageParam.getSortField()));
         } else {
-            queryWrapper.lambda().orderByAsc(MlpFirstDraft::getId);
+            queryWrapper.lambda().orderByDesc(MlpFirstDraft::getDeadline);
         }
         return this.page(CommonPageRequest.defaultPage(), queryWrapper);
     }