入库修改状态

als-modules/agile-assurance/src/main/java/org/eco/als/service/impl/KGraphClauseServiceImpl.java

@@ -50,7 +50,7 @@ public class KGraphClauseServiceImpl extends BaseServiceImpl<KGraphClauseMapper,
             (kGraphClauseBo.getStatus()));
         queryWrapper.and(K_GRAPH_CLAUSE.REMARKS.eq
             (kGraphClauseBo.getRemarks()));
-
+        queryWrapper.orderBy(K_GRAPH_CLAUSE.UPDATE_TIME.desc());
         return queryWrapper;
     }
 
@@ -101,7 +101,8 @@ public class KGraphClauseServiceImpl extends BaseServiceImpl<KGraphClauseMapper,
     @Override
     public boolean insert(KGraphClauseBo kGraphClauseBo) {
         KGraphClause kGraphClause = MapstructUtils.convert(kGraphClauseBo, KGraphClause.class);
-        return this.save(kGraphClause);//使用全局配置的雪花算法主键生成器生成ID值
+        //使用全局配置的雪花算法主键生成器生成ID值
+        return this.save(kGraphClause);
     }
 
     @Override
@@ -122,9 +123,8 @@ public class KGraphClauseServiceImpl extends BaseServiceImpl<KGraphClauseMapper,
     @Override
     public boolean insertWithPk(KGraphClauseBo kGraphClauseBo) {
         KGraphClause kGraphClause = MapstructUtils.convert(kGraphClauseBo, KGraphClause.class);
-
-
-        return kGraphClauseMapper.insertWithPk(kGraphClause) > 0;//前台传来主键值
+        //前台传来主键值
+        return kGraphClauseMapper.insertWithPk(kGraphClause) > 0;
     }
 
     /**
@@ -137,8 +137,7 @@ public class KGraphClauseServiceImpl extends BaseServiceImpl<KGraphClauseMapper,
     public boolean update(KGraphClauseBo kGraphClauseBo) {
         KGraphClause kGraphClause = MapstructUtils.convert(kGraphClauseBo, KGraphClause.class);
         if (ObjectUtil.isNotNull(kGraphClause) && ObjectUtil.isNotNull(kGraphClause.getId())) {
-            boolean updated = this.updateById(kGraphClause);
-            return updated;
+            return this.updateById(kGraphClause);
         }
         return false;
     }

als-modules/agile-assurance/src/main/java/org/eco/als/service/impl/KGraphEntityServiceImpl.java

@@ -59,6 +59,7 @@ public class KGraphEntityServiceImpl extends BaseServiceImpl<KGraphEntityMapper,
             (kGraphEntityBo.getStatus()));
         queryWrapper.and(K_GRAPH_ENTITY.REMARKS.eq
             (kGraphEntityBo.getRemarks()));
+        queryWrapper.orderBy(K_GRAPH_ENTITY.UPDATE_TIME.desc());
 
         return queryWrapper;
     }
@@ -89,7 +90,7 @@ public class KGraphEntityServiceImpl extends BaseServiceImpl<KGraphEntityMapper,
     }
 
     @Override
-    public List<KGraphEntityVo> selectListByTaskId(Long TaskId) {
+    public List<KGraphEntityVo> selectListByTaskId(Long taskId) {
         QueryWrapper queryWrapper = super.buildBaseQueryWrapper();
         queryWrapper.select(
                 K_GRAPH_ENTITY.HEAD_ENTITY,
@@ -98,7 +99,7 @@ public class KGraphEntityServiceImpl extends BaseServiceImpl<KGraphEntityMapper,
                 K_GRAPH_ENTITY.TAIL_ENTITY,
                 K_GRAPH_ENTITY.TAIL_ENTITY_CLASS)
             .from(K_GRAPH_ENTITY).join(K_GRAPH_CLAUSE).on(K_GRAPH_ENTITY.CLAUSE_ID.eq(K_GRAPH_CLAUSE.ID))
-            .where(K_GRAPH_CLAUSE.TASK_ID.eq(TaskId));
+            .where(K_GRAPH_CLAUSE.TASK_ID.eq(taskId)).and(K_GRAPH_CLAUSE.STATUS.eq(1));
         return this.listAs(queryWrapper, KGraphEntityVo.class);
     }
 

als-modules/agile-assurance/src/main/java/org/eco/als/service/impl/KGraphTaskServiceImpl.java

@@ -9,7 +9,10 @@ import com.mybatisflex.core.query.QueryWrapper;
 import jakarta.annotation.Resource;
 import lombok.extern.slf4j.Slf4j;
 import org.eco.als.domain.KGraphTask;
-import org.eco.als.domain.bo.*;
+import org.eco.als.domain.bo.ExtraKGraphTaskBo;
+import org.eco.als.domain.bo.ExtraKGraphTaskStatusBo;
+import org.eco.als.domain.bo.KGraphClauseBo;
+import org.eco.als.domain.bo.KGraphTaskBo;
 import org.eco.als.domain.vo.ExtraKGraphTaskVo;
 import org.eco.als.domain.vo.KGraphClauseVo;
 import org.eco.als.domain.vo.KGraphEntityVo;
@@ -78,7 +81,7 @@ public class KGraphTaskServiceImpl extends BaseServiceImpl<KGraphTaskMapper, KGr
             (kGraphTaskBo.getStatus()));
         queryWrapper.and(K_GRAPH_TASK.REMARKS.eq
             (kGraphTaskBo.getRemarks()));
-
+        queryWrapper.orderBy(K_GRAPH_TASK.UPDATE_TIME.desc());
         return queryWrapper;
     }
 
@@ -129,8 +132,8 @@ public class KGraphTaskServiceImpl extends BaseServiceImpl<KGraphTaskMapper, KGr
     @Override
     public boolean insert(KGraphTaskBo kGraphTaskBo) {
         KGraphTask kGraphTask = MapstructUtils.convert(kGraphTaskBo, KGraphTask.class);
-
-        return this.save(kGraphTask);//使用全局配置的雪花算法主键生成器生成ID值
+        //使用全局配置的雪花算法主键生成器生成ID值
+        return this.save(kGraphTask);
     }
 
     @Override