1

src/main/java/com/fdkankan/fusion/entity/CaseEntity.java

@@ -62,6 +62,15 @@ public class CaseEntity implements Serializable {
     @TableField("dept_id")
     private String deptId;
 
+    @TableField("case_info")
+    private String caseInfo;
+
+    @TableField("case_creator")
+    private String caseCreator;
+
+    @TableField("case_info_video")
+    private String caseInfoVideo;
+
     @TableField(exist = false)
     private String deptName;
 }

src/main/java/com/fdkankan/fusion/entity/Model.java

@@ -86,6 +86,9 @@ public class Model implements Serializable {
     @TableField("dept_id")
     private String deptId;
 
+    @TableField("sys_level")
+    private Integer sysLevel;
+
     @TableField(exist = false)
     private String deptName;
 }

src/main/java/com/fdkankan/fusion/request/CaseParam.java

@@ -1,5 +1,6 @@
 package com.fdkankan.fusion.request;
 
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.fdkankan.fusion.common.RequestBase;
 import lombok.Data;
 
@@ -14,4 +15,13 @@ public class CaseParam extends RequestBase {
     private HashMap<Integer,List<String>> typeMap;
 
     private String deptId;
+
+    private String caseTitleOrder;
+    private String createTimeOrder ;
+
+    private String caseInfo;
+
+    private String caseCreator;
+
+    private String caseInfoVideo;
 }

src/main/java/com/fdkankan/fusion/service/impl/CaseServiceImpl.java

@@ -19,6 +19,7 @@ import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.awt.geom.GeneralPath;
 import java.time.Period;
 import java.util.*;
 import java.util.stream.Collectors;
@@ -69,7 +70,22 @@ public class CaseServiceImpl extends ServiceImpl<ICaseMapper, CaseEntity> implem
         wrapper.in(CaseEntity::getDeptId,deptIds);
         //wrapper.eq(CaseEntity::getUserName,userName);
         wrapper.eq(CaseEntity::getType,0);
-        wrapper.orderByDesc(CaseEntity::getCreateTime);
+        if(StringUtils.isNotBlank(param.getCaseTitleOrder()) && param.getCaseTitleOrder().equals("desc")){
+            wrapper.orderByDesc(CaseEntity::getCaseTitle);
+        }
+        if(StringUtils.isNotBlank(param.getCreateTimeOrder()) && param.getCreateTimeOrder().equals("desc")){
+            wrapper.orderByDesc(CaseEntity::getCreateTime);
+        }
+        if(StringUtils.isNotBlank(param.getCaseTitleOrder()) && param.getCaseTitleOrder().equals("asc")){
+            wrapper.orderByAsc(CaseEntity::getCaseTitle);
+        }
+        if(StringUtils.isNotBlank(param.getCreateTimeOrder()) && param.getCreateTimeOrder().equals("asc")){
+            wrapper.orderByAsc(CaseEntity::getCreateTime);
+        }
+        if(StringUtils.isBlank(param.getCaseTitleOrder()) && StringUtils.isBlank(param.getCreateTimeOrder())){
+            wrapper.orderByDesc(CaseEntity::getCreateTime);
+        }
+
         Page<CaseEntity> page = this.page( new Page<>(param.getPageNum(), param.getPageSize()), wrapper);
 
 
@@ -231,6 +247,9 @@ public class CaseServiceImpl extends ServiceImpl<ICaseMapper, CaseEntity> implem
             caseEntity = this.getById(param.getCaseId());
         }
         caseEntity.setCaseTitle(param.getCaseTitle());
+        caseEntity.setCaseCreator(param.getCaseCreator());
+        caseEntity.setCaseInfo(param.getCaseInfo());
+        caseEntity.setCaseInfoVideo(param.getCaseInfoVideo());
         caseEntity.setUpdateTime(null);
         this.saveOrUpdate(caseEntity);
     }