소스 검색

修改项目进度计算逻辑修改,新增判空

anderx 1 년 전
부모
커밋
667eb4b210

+ 3 - 2
src/main/java/com/goafanti/common/mapper/TaskDetailsLogMapper.xml

@@ -1148,8 +1148,9 @@ create_time = values(create_time)
         delete from task_details_log where id = #{id}
     </delete>
 
-    <select id="selectByTid" resultType="java.util.Map">
-    select id,tdid,aid,aname,create_time createTime
+    <select id="selectByTid" resultMap="TaskDetailsLogMap">
+        select
+        <include refid="TaskDetailsLogAllSql"/>
     from task_details_log
     where tdid = #{id}
     </select>

+ 3 - 0
src/main/java/com/goafanti/common/model/TaskDetailsLog.java

@@ -1,5 +1,7 @@
 package com.goafanti.common.model;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
+
 import java.io.Serializable;
 import java.math.BigDecimal;
 import java.util.Date;
@@ -1181,6 +1183,7 @@ public class TaskDetailsLog implements Serializable {
         this.aname = aname;
     }
 
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     public Date getCreateTime() {
         return createTime;
     }

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

@@ -4,6 +4,7 @@ import com.goafanti.common.bo.Result;
 import com.goafanti.common.constant.ErrorConstants;
 import com.goafanti.common.controller.BaseController;
 import com.goafanti.common.model.TaskDetails;
+import com.goafanti.common.model.TaskDetailsLog;
 import com.goafanti.common.model.TaskFeature;
 import com.goafanti.techproject.service.TaskDetailsService;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -12,6 +13,7 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.annotation.Resource;
+import java.util.List;
 
 /**
  * 项目申报详情(TaskDetails)表控制层
@@ -142,7 +144,7 @@ public class TaskDetailsController extends BaseController {
      *
      */
     @GetMapping("/logList")
-    public Result logList(Integer id) {
+    public Result<List<TaskDetailsLog>> logList(Integer id) {
         return new Result<>().data(this.taskDetailsService.logList(id));
     }