楚江ERP-增加排序功能（厂房、科办、类型、品种）

@@ -23,7 +23,6 @@ import com.lframework.xingyun.basedata.service.type.TypeInfoService;
 import com.lframework.xingyun.basedata.vo.type.CreateTypeInfoVo;
 import com.lframework.xingyun.basedata.vo.type.QueryTypeInfoVo;
 import com.lframework.xingyun.basedata.vo.type.UpdateTypeInfoVo;
-import org.springframework.cache.annotation.Cacheable;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
@@ -68,7 +67,6 @@ public class TypeInfoServiceImpl extends BaseMpServiceImpl<TypeInfoMapper, TypeI
      * @param id    主键ID
      * @return  TypeInfo
      */
-    @Cacheable(value = TypeInfo.CACHE_NAME, key = "@cacheVariables.tenantId() + #id", unless = "#result == null")
     @Override
     public TypeInfo findById(String id) {
         return getBaseMapper().selectById(id);

 package com.lframework.xingyun.basedata.mappers;
 
+import com.lframework.starter.web.core.annotations.sort.Sort;
+import com.lframework.starter.web.core.annotations.sort.Sorts;
 import com.lframework.xingyun.basedata.entity.Office;
 import com.lframework.starter.web.core.mapper.BaseMapper;
 import com.lframework.xingyun.basedata.vo.office.QueryOfficeVo;
@@ -21,5 +23,11 @@ public interface OfficeMapper extends BaseMapper<Office> {
      * @param vo    查询参数
      * @return  List<Office>
      */
+    @Sorts({
+        @Sort(value = "code", autoParse = true),
+        @Sort(value = "name", autoParse = true),
+        @Sort(value = "createTime", autoParse = true),
+        @Sort(value = "updateTime", autoParse = true),
+    })
     List<Office> query(@Param("vo") QueryOfficeVo vo);
 }

 package com.lframework.xingyun.basedata.mappers;
 
+import com.lframework.starter.web.core.annotations.sort.Sort;
+import com.lframework.starter.web.core.annotations.sort.Sorts;
 import com.lframework.xingyun.basedata.entity.ProductVariety;
 import com.lframework.starter.web.core.mapper.BaseMapper;
 import com.lframework.xingyun.basedata.vo.product.variety.QueryProductVarietyVo;
@@ -17,8 +19,14 @@ public interface ProductVarietyMapper extends BaseMapper<ProductVariety> {
 
     /**
      * 查询列表
-     * @param vo
-     * @return
+     * @param vo    查询条件
+     * @return  List<ProductVariety>
      */
+    @Sorts({
+            @Sort(value = "code", autoParse = true),
+            @Sort(value = "name", autoParse = true),
+            @Sort(value = "createTime", autoParse = true),
+            @Sort(value = "updateTime", autoParse = true),
+    })
     List<ProductVariety> query(@Param("vo") QueryProductVarietyVo vo);
 }

 package com.lframework.xingyun.basedata.mappers;
 
+import com.lframework.starter.web.core.annotations.sort.Sort;
+import com.lframework.starter.web.core.annotations.sort.Sorts;
 import com.lframework.xingyun.basedata.entity.TypeInfo;
 import com.lframework.starter.web.core.mapper.BaseMapper;
 import com.lframework.xingyun.basedata.vo.type.QueryTypeInfoVo;
@@ -11,14 +13,20 @@ import java.util.List;
  * <p>
  * 类型信息 Mapper 接口
  * </p>
- *
  */
 public interface TypeInfoMapper extends BaseMapper<TypeInfo> {
 
     /**
      * 查询列表
-     * @param vo
-     * @return
+     *
+     * @param vo    查询条件
+     * @return  List<TypeInfo>
      */
+    @Sorts({
+        @Sort(value = "code", autoParse = true),
+        @Sort(value = "name", autoParse = true),
+        @Sort(value = "createTime", autoParse = true),
+        @Sort(value = "updateTime", autoParse = true),
+    })
     List<TypeInfo> query(@Param("vo") QueryTypeInfoVo vo);
 }

 package com.lframework.xingyun.basedata.mappers;
 
+import com.lframework.starter.web.core.annotations.sort.Sort;
+import com.lframework.starter.web.core.annotations.sort.Sorts;
 import com.lframework.starter.web.core.mapper.BaseMapper;
 import com.lframework.xingyun.basedata.entity.Workshop;
 import com.lframework.xingyun.basedata.vo.workshop.QueryWorkshopVo;
@@ -20,5 +22,11 @@ public interface WorkshopMapper extends BaseMapper<Workshop> {
      * @param vo 查询条件
      * @return Workshop
      */
+    @Sorts({
+        @Sort(value = "code", autoParse = true),
+        @Sort(value = "name", autoParse = true),
+        @Sort(value = "createTime", autoParse = true),
+        @Sort(value = "updateTime", autoParse = true),
+    })
     List<Workshop> query(@Param("vo") QueryWorkshopVo vo);
 }

 package com.lframework.xingyun.basedata.vo.office;
 
+import com.lframework.starter.web.core.vo.SortPageVo;
 import lombok.Data;
-import com.lframework.starter.web.core.vo.PageVo;
 import com.lframework.starter.web.core.vo.BaseVo;
 import io.swagger.annotations.ApiModelProperty;
 import java.io.Serializable;
 
 @Data
-public class QueryOfficeVo extends PageVo implements BaseVo, Serializable {
+public class QueryOfficeVo extends SortPageVo implements BaseVo, Serializable {
 
     private static final long serialVersionUID = 1L;
 

 package com.lframework.xingyun.basedata.vo.product.variety;
 
+import com.lframework.starter.web.core.vo.SortPageVo;
 import lombok.Data;
-import com.lframework.starter.web.core.vo.PageVo;
 import com.lframework.starter.web.core.vo.BaseVo;
 import io.swagger.annotations.ApiModelProperty;
 
 import java.io.Serializable;
 
 @Data
-public class QueryProductVarietyVo extends PageVo implements BaseVo, Serializable {
+public class QueryProductVarietyVo extends SortPageVo implements BaseVo, Serializable {
 
     private static final long serialVersionUID = 1L;
 

 package com.lframework.xingyun.basedata.vo.type;
 
+import com.lframework.starter.web.core.vo.SortPageVo;
 import lombok.Data;
-import com.lframework.starter.web.core.vo.PageVo;
 import com.lframework.starter.web.core.vo.BaseVo;
 import io.swagger.annotations.ApiModelProperty;
 import java.io.Serializable;
 
 @Data
-public class QueryTypeInfoVo extends PageVo implements BaseVo, Serializable {
+public class QueryTypeInfoVo extends SortPageVo implements BaseVo, Serializable {
 
     private static final long serialVersionUID = 1L;
 

 package com.lframework.xingyun.basedata.vo.workshop;
 
+import com.lframework.starter.web.core.vo.SortPageVo;
 import com.lframework.xingyun.basedata.enums.WorkshopType;
 import lombok.Data;
 import com.lframework.starter.web.core.components.validation.IsEnum;
-import com.lframework.starter.web.core.vo.PageVo;
 import com.lframework.starter.web.core.vo.BaseVo;
 import com.lframework.starter.web.core.components.validation.TypeMismatch;
 import io.swagger.annotations.ApiModelProperty;
 import java.io.Serializable;
 
 @Data
-public class QueryWorkshopVo extends PageVo implements BaseVo, Serializable {
+public class QueryWorkshopVo extends SortPageVo implements BaseVo, Serializable {
 
     private static final long serialVersionUID = 1L;