Browse Source

项目进度日志详情修改

anderx 1 year ago
parent
commit
56a061cd61

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

@@ -1,5 +1,6 @@
 package com.goafanti.common.dao;
 
+import com.goafanti.common.model.TaskFeature;
 import com.goafanti.common.model.TaskFeatureLog;
 import org.apache.ibatis.annotations.Param;
 import org.springframework.data.domain.Pageable;
@@ -82,5 +83,6 @@ public interface TaskFeatureLogMapper {
      */
     int deleteById(Integer id);
 
+    List<TaskFeature> selectByTdlid(Integer tdlId);
 }
 

+ 9 - 0
src/main/java/com/goafanti/common/mapper/TaskFeatureLogMapper.xml

@@ -274,10 +274,19 @@ create_time = values(create_time)
         </where>
     </select>
 
+
     <!--通过主键删除-->
     <delete id="deleteById">
         delete from task_feature_log where id = #{id}
     </delete>
 
+
+
+    <select id="selectByTdlid" resultMap="TaskFeatureLogMap">
+        select
+            <include refid="TaskFeatureLogAllSql"/>
+            from task_feature_log
+        where tdl_id = #{tdlId}
+    </select>
 </mapper>
 

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

@@ -410,7 +410,7 @@ public class TaskDetailsServiceImpl extends BaseMybatisDao<TaskDetailsMapper> im
         //如果是会员
         TOrderTaskBo thisTask = null;
         for (TOrderTaskBo e : tOrderTaskBos) {
-            if (e.getId().equals(id)){
+            if (e.getId().equals(tid)){
                 thisTask=e;
                 break;
             }
@@ -447,7 +447,7 @@ public class TaskDetailsServiceImpl extends BaseMybatisDao<TaskDetailsMapper> im
         }
         res.setMemberLvl(lvl);
         res.setTaskList(list);
-        res.setFeatureList(taskFeatureMapper.selectByTdId(id));
+        res.setFeatureList(taskFeatureLogMapper.selectByTdlid(id));
         return res;
     }