修改排序

ruoyi-admin/src/main/java/com/ruoyi/jjh/ent/controller/JMemorandumController.java

@@ -89,8 +89,7 @@ public class JMemorandumController extends BaseController {
     @ApiOperation(value = "新增数据")
     @PostMapping
     public AjaxResult insert(@RequestBody JMemorandum jMemorandum) {
-        jMemorandum.setCreateTime(new Date());
-        return success(this.jMemorandumService.save(jMemorandum));
+        return success(jMemorandumService.save(jMemorandum));
     }
 
     /**
@@ -102,8 +101,7 @@ public class JMemorandumController extends BaseController {
     @ApiOperation(value = "修改数据")
     @PutMapping
     public AjaxResult update(@RequestBody JMemorandum jMemorandum) {
-        jMemorandum.setUpdateTime(new Date());
-        return success(this.jMemorandumService.updateById(jMemorandum));
+        return success(jMemorandumService.updateById(jMemorandum));
     }
 
     /**
@@ -115,7 +113,7 @@ public class JMemorandumController extends BaseController {
     @ApiOperation(value = "删除数据")
     @DeleteMapping
     public AjaxResult delete(@RequestParam("id") Long id) {
-        return success(this.jMemorandumService.removeById(id));
+        return success(jMemorandumService.removeById(id));
     }
 }
 

ruoyi-admin/src/main/java/com/ruoyi/jjh/ent/entity/JMemorandum.java

@@ -1,8 +1,6 @@
 package com.ruoyi.jjh.ent.entity;
 
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.*;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
@@ -47,26 +45,53 @@ public class JMemorandum {
      * 备忘内容
      */
     @ApiModelProperty("备忘内容")
-
     private String content;
 
+
+    /**
+     * 创建ID
+     */
+    @ApiModelProperty("创建ID")
+    @TableField(fill = FieldFill.INSERT)
     private Long createId;
 
+    /**
+     * 创建者
+     */
+    @ApiModelProperty("创建者")
+    @TableField(fill = FieldFill.INSERT)
     private String createBy;
 
-
+    /**
+     * 创建时间
+     */
+    @ApiModelProperty("创建时间")
     @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    @ApiModelProperty("创建时间")
+    @TableField(fill = FieldFill.INSERT)
     private Date createTime;
 
+    /**
+     * 更新者ID
+     */
+    @ApiModelProperty("更新者ID")
+    @TableField(fill = FieldFill.UPDATE)
     private Long updateId;
 
+    /**
+     * 更新者
+     */
+    @ApiModelProperty("更新者")
+    @TableField(fill = FieldFill.UPDATE)
     private String updateBy;
 
+    /**
+     * 更新时间
+     */
+    @ApiModelProperty("更新时间")
+    @TableField(fill = FieldFill.UPDATE)
     @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    @ApiModelProperty("更新时间")
     private Date updateTime;
 }
 

ruoyi-admin/src/main/java/com/ruoyi/jjh/ent/entity/JProject.java

@@ -1,14 +1,10 @@
 package com.ruoyi.jjh.ent.entity;
 
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.baomidou.mybatisplus.extension.activerecord.Model;
+import com.baomidou.mybatisplus.annotation.*;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.ruoyi.common.annotation.Excel;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
-import io.swagger.models.auth.In;
 import lombok.Data;
 import org.springframework.format.annotation.DateTimeFormat;
 
@@ -80,5 +76,51 @@ public class JProject{
      */
     @ApiModelProperty("状态")
     private Integer status;
+
+    /**
+     * 创建ID
+     */
+    @ApiModelProperty("创建ID")
+    @TableField(fill = FieldFill.INSERT)
+    private Long createId;
+
+    /**
+     * 创建者
+     */
+    @ApiModelProperty("创建者")
+    @TableField(fill = FieldFill.INSERT)
+    private String createBy;
+
+    /**
+     * 创建时间
+     */
+    @ApiModelProperty("创建时间")
+    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @TableField(fill = FieldFill.INSERT)
+    private Date createTime;
+
+    /**
+     * 更新者ID
+     */
+    @ApiModelProperty("更新者ID")
+    @TableField(fill = FieldFill.UPDATE)
+    private Long updateId;
+
+    /**
+     * 更新者
+     */
+    @ApiModelProperty("更新者")
+    @TableField(fill = FieldFill.UPDATE)
+    private String updateBy;
+
+    /**
+     * 更新时间
+     */
+    @ApiModelProperty("更新时间")
+    @TableField(fill = FieldFill.UPDATE)
+    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date updateTime;
 }
 

ruoyi-admin/src/main/resources/mapper/jjh/ent/JProjectMapper.xml

@@ -23,6 +23,6 @@
                 and project_year = #{req.projectYear}
             </if>
         </where>
-        order by project_year desc
+        order by create_time,project_year desc
     </select>
 </mapper>

ruoyi-framework/src/main/java/com/ruoyi/framework/config/MyMetaObjectHandler.java

@@ -7,7 +7,7 @@ import com.ruoyi.common.utils.SecurityUtils;
 import org.apache.ibatis.reflection.MetaObject;
 import org.springframework.stereotype.Component;
 
-import java.time.LocalDateTime;
+import java.util.Date;
 import java.util.Objects;
 
 /**
@@ -24,21 +24,28 @@ public class MyMetaObjectHandler implements MetaObjectHandler {
         // 获取当前登录用户
         LoginUser loginUser = SecurityUtils.getLoginUser();
         String userName = loginUser.getUsername();
+        Long userId = SecurityUtils.getUserId();
         if (!Objects.equals(userName, "")) {
             this.strictInsertFill(metaObject, "createBy", String.class, userName);
         }
-        this.strictInsertFill(metaObject, "createTime", LocalDateTime.class, LocalDateTime.now());
+        if (userId!=null) {
+            this.strictInsertFill(metaObject, "createId", Long.class, userId);
+        }
+        this.strictInsertFill(metaObject, "createTime", Date.class, new Date());
     }
 
     @Override
     public void updateFill(MetaObject metaObject) {
         // 获取当前登录用户
         LoginUser loginUser = SecurityUtils.getLoginUser();
-
         String userName = loginUser.getUsername();
+        Long userId = SecurityUtils.getUserId();
+        if (userId!=null) {
+            this.strictUpdateFill(metaObject, "updateId", Long.class, userId);
+        }
         if (!Objects.equals(userName, "")) {
-            this.strictInsertFill(metaObject, "createBy", String.class, userName);
+            this.strictUpdateFill(metaObject, "updateBy", String.class, userName);
         }
-        this.strictInsertFill(metaObject, "createTime", LocalDateTime.class, LocalDateTime.now());
+        this.strictUpdateFill(metaObject, "updateTime", Date.class, new Date());
     }
 }