Browse Source

项目进度日志列表排序方式修改

anderx 1 year ago
parent
commit
ba1e044144

+ 0 - 2
src/main/java/com/goafanti/common/dao/TaskDetailsLogMapper.java

@@ -1,7 +1,6 @@
 package com.goafanti.common.dao;
 
 import com.goafanti.common.model.TaskDetailsLog;
-import com.goafanti.techproject.bo.OutTaskDetailsLog;
 import org.apache.ibatis.annotations.Param;
 import org.springframework.data.domain.Pageable;
 
@@ -82,6 +81,5 @@ public interface TaskDetailsLogMapper {
      */
     int deleteById(Integer id);
 
-    List<OutTaskDetailsLog> selectByTid(Integer id);
 }
 

File diff suppressed because it is too large
+ 18 - 15
src/main/java/com/goafanti/common/mapper/TaskDetailsLogMapper.xml


+ 15 - 0
src/main/java/com/goafanti/common/mapper/TaskDetailsMapper.xml

@@ -1166,5 +1166,20 @@ create_time = values(create_time)
         where tid = #{id}
     </select>
 
+
+    <select id="selectByTidList" resultType="com.goafanti.techproject.bo.OutTaskDetailsLog">
+        select
+            id,tdid,aid,aname,create_time createTime
+        from task_details_log
+        where tdid = #{tdid}
+        order by create_time desc
+    </select>
+
+    <select id="selectByTidCount" resultType="java.lang.Integer">
+        select
+            count(*)
+        from task_details_log
+        where tdid = #{tdid}
+    </select>
 </mapper>
 

+ 14 - 2
src/main/java/com/goafanti/common/model/TaskDetailsLog.java

@@ -11,10 +11,10 @@ import java.util.Date;
  * 项目申报详情日志(TaskDetailsLog)实体类
  *
  * @author makejava
- * @since 2025-01-09 09:58:44
+ * @since 2025-01-13 15:19:26
  */
 public class TaskDetailsLog implements Serializable {
-    private static final long serialVersionUID = -49067883905913137L;
+    private static final long serialVersionUID = -42460168996948180L;
 
     private Integer id;
 /**
@@ -394,6 +394,10 @@ public class TaskDetailsLog implements Serializable {
      */
     private Integer reviewCountryNumber;
 /**
+     * 备注说明
+     */
+    private String remarks;
+/**
      * 修改人
      */
     private String aid;
@@ -1167,6 +1171,14 @@ public class TaskDetailsLog implements Serializable {
         this.reviewCountryNumber = reviewCountryNumber;
     }
 
+    public String getRemarks() {
+        return remarks;
+    }
+
+    public void setRemarks(String remarks) {
+        this.remarks = remarks;
+    }
+
     public String getAid() {
         return aid;
     }

+ 5 - 1
src/main/java/com/goafanti/common/model/TaskFeatureLog.java

@@ -1,5 +1,7 @@
 package com.goafanti.common.model;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
+
 import java.io.Serializable;
 import java.util.Date;
 
@@ -104,6 +106,7 @@ public class TaskFeatureLog implements Serializable {
         this.tdlId = tdlId;
     }
 
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
     public Date getStartTime() {
         return startTime;
     }
@@ -111,7 +114,7 @@ public class TaskFeatureLog implements Serializable {
     public void setStartTime(Date startTime) {
         this.startTime = startTime;
     }
-
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
     public Date getEndTime() {
         return endTime;
     }
@@ -232,6 +235,7 @@ public class TaskFeatureLog implements Serializable {
         this.aname = aname;
     }
 
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     public Date getCreateTime() {
         return createTime;
     }

+ 4 - 4
src/main/java/com/goafanti/techproject/controller/TaskDetailsController.java

@@ -81,8 +81,8 @@ public class TaskDetailsController extends BaseController {
      * @return 编辑结果
      */
     @PostMapping("/update")
-    public Result edit(TaskDetails taskDetails) {
-        return new Result<>().data(this.taskDetailsService.update(taskDetails));
+    public Result edit(TaskDetails taskDetails,Integer type) {
+        return new Result<>().data(this.taskDetailsService.update(taskDetails,type));
     }
 
     /**
@@ -170,8 +170,8 @@ public class TaskDetailsController extends BaseController {
      *
      */
     @GetMapping("/logList")
-    public Result<List<TaskDetailsLog>> logList(Integer id) {
-        return new Result<>().data(this.taskDetailsService.logList(id));
+    public Result<List<TaskDetailsLog>> logList(Integer id,Integer pageNo, Integer pageSize) {
+        return new Result<>().data(this.taskDetailsService.logList(id, pageNo,pageSize));
     }
 
 

+ 2 - 2
src/main/java/com/goafanti/techproject/service/TaskDetailsService.java

@@ -37,7 +37,7 @@ public interface TaskDetailsService {
      * @param taskDetails 实例对象
      * @return 实例对象
      */
-    TaskDetails update(TaskDetails taskDetails);
+    TaskDetails update(TaskDetails taskDetails,Integer type);
 
     /**
      * 通过主键删除数据
@@ -68,7 +68,7 @@ public interface TaskDetailsService {
 
     TaskFeature updateFeature(InputTaskFeature in);
 
-    Object logList(Integer id);
+    Object logList(Integer id, Integer pageNo, Integer pageSize);
 
     Object logDetails(Integer id);
 

+ 12 - 4
src/main/java/com/goafanti/techproject/service/impl/TaskDetailsServiceImpl.java

@@ -323,12 +323,16 @@ public class TaskDetailsServiceImpl extends BaseMybatisDao<TaskDetailsMapper> im
      * @return 实例对象
      */
     @Override
-    public TaskDetails update(TaskDetails taskDetails) {
+    public TaskDetails update(TaskDetails taskDetails,Integer type) {
+
         taskDetails.setUpdateTime(new Date());
         countTaskDetails(taskDetails);
         this.taskDetailsMapper.update(taskDetails);
         TaskDetails res = this.queryById(taskDetails.getId());
-        addTaskDetailsLog(res);
+        //调用就保存,不需要区分不保存
+//        if (type !=null&&type==1){
+            addTaskDetailsLog(res);
+//        }
         return res;
     }
 
@@ -393,8 +397,12 @@ public class TaskDetailsServiceImpl extends BaseMybatisDao<TaskDetailsMapper> im
     }
 
     @Override
-    public Object logList(Integer id) {
-        return taskDetailsLogMapper.selectByTid(id);
+    public Object logList(Integer id, Integer pageNo, Integer pageSize) {
+        Map<String,Object> param=new HashMap<String, Object>();
+        param.put("tdid",id);
+        if (pageNo ==null)pageNo=1;
+        if (pageSize ==null)pageSize=10;
+        return findPage("selectByTidList", "selectByTidCount", param, pageNo, pageSize);
     }
 
     @Override