1、新增 导出知识库接口
2、任务模块导出接口 bugfix
This commit is contained in:
@@ -36,7 +36,7 @@ public interface SimulationNodeMapper extends BaseMapper<SimulationNode> {
|
||||
int addNodeExtraBatch(@Param("addNodeExtraList") List<SpdmNodeExtraReq> addNodeExtraList);
|
||||
|
||||
|
||||
List<SpdmNodeVo> getNodeList(@Param("nodeType") String nodeType, @Param("nodeSubType") String nodeSubType, @Param("progressStatus") Integer progressStatus, @Param("nodeCode") String nodeCode,
|
||||
List<SpdmNodeVo> getNodeList(@Param("nodeType") String nodeType, @Param("nodeSubType") String nodeSubType, @Param("exeStatus") String exeStatus, @Param("nodeCode") String nodeCode,
|
||||
@Param("manager") String manager, @Param("nodeName") String nodeName, @Param("tenantId") Long tenantId, @Param("pos") int pos, @Param("limit") int limit);
|
||||
|
||||
int getNodeListCount(@Param("nodeType") String nodeType, @Param("nodeSubType") String nodeSubType, @Param("progressStatus") Integer progressStatus, @Param("nodeCode") String nodeCode,
|
||||
|
||||
@@ -238,7 +238,7 @@ public class NodeServiceImpl extends ServiceImpl<SimulationNodeMapper, Simulatio
|
||||
int pos = (req.getCurrent() - 1) * req.getSize();
|
||||
int limit = req.getSize();
|
||||
Long tenantId = ThreadLocalContext.getTenantId();
|
||||
List<SpdmNodeVo> nodeList = nodeMapper.getNodeList(req.getNodeType(), req.getNodeSubType(), req.getProgressStatus(), req.getNodeCode(), req.getManager(), req.getNodeName(),
|
||||
List<SpdmNodeVo> nodeList = nodeMapper.getNodeList(req.getNodeType(), req.getNodeSubType(), req.getExeStatus(), req.getNodeCode(), req.getManager(), req.getNodeName(),
|
||||
tenantId, pos, limit);
|
||||
CoreLogger.info("getNodeList param:{},tenantId:{}", JSONObject.toJSONString(req), tenantId);
|
||||
if (CollectionUtils.isEmpty(nodeList)) {
|
||||
|
||||
@@ -202,8 +202,8 @@
|
||||
<if test="nodeSubType != null and nodeSubType != ''">
|
||||
and sn.nodeSubType = #{nodeSubType}
|
||||
</if>
|
||||
<if test="progressStatus != null">
|
||||
and sn.progress = #{progressStatus}
|
||||
<if test="exeStatus != null and exeStatus != ''">
|
||||
and sn.exe_status = #{exeStatus}
|
||||
</if>
|
||||
<if test="nodeCode != null and nodeCode != ''">
|
||||
and sn.nodeCode like CONCAT('%',#{nodeCode},'%')
|
||||
|
||||
@@ -50,7 +50,7 @@
|
||||
<select id="getTaskList" resultType="com.sdm.project.model.vo.SpdmTaskVo">
|
||||
select * from simulation_task where tenant_id = #{tenantId}
|
||||
<if test="req.taskName != null and req.taskName != ''">
|
||||
and task_name = #{req.taskName}
|
||||
and task_name like CONCAT('%',#{req.taskName},'%')
|
||||
</if>
|
||||
<if test="req.progress != null and req.progress != ''">
|
||||
and progress = #{req.progress}
|
||||
|
||||
Reference in New Issue
Block a user