|
@@ -43,6 +43,7 @@
|
|
|
</delete>
|
|
</delete>
|
|
|
<resultMap type="com.ruoyi.interfaces.domain.vo.MdFlowDispatchVo" id="MdFlowDispatchMap">
|
|
<resultMap type="com.ruoyi.interfaces.domain.vo.MdFlowDispatchVo" id="MdFlowDispatchMap">
|
|
|
<result property="flowJobId" column="FLOW_JOB_ID"/>
|
|
<result property="flowJobId" column="FLOW_JOB_ID"/>
|
|
|
|
|
+ <result property="flowJobName" column="FLOW_JOB_NAME"/>
|
|
|
<result property="appId" column="APP_ID"/>
|
|
<result property="appId" column="APP_ID"/>
|
|
|
<result property="id" column="ID"/>
|
|
<result property="id" column="ID"/>
|
|
|
<result property="groupName" column="GROUP_NAME"/>
|
|
<result property="groupName" column="GROUP_NAME"/>
|
|
@@ -77,6 +78,7 @@
|
|
|
|
|
|
|
|
<select id="selectFlowDispatch" resultMap="MdFlowDispatchMap">
|
|
<select id="selectFlowDispatch" resultMap="MdFlowDispatchMap">
|
|
|
select fj.FLOW_JOB_ID,
|
|
select fj.FLOW_JOB_ID,
|
|
|
|
|
+ fj.FLOW_JOB_NAME,
|
|
|
fj.APP_ID,
|
|
fj.APP_ID,
|
|
|
fj.ID,
|
|
fj.ID,
|
|
|
j.JOB_NAME,
|
|
j.JOB_NAME,
|
|
@@ -94,8 +96,8 @@
|
|
|
<if test="appId != null and appId != ''">
|
|
<if test="appId != null and appId != ''">
|
|
|
and fj.APP_ID = #{appId}
|
|
and fj.APP_ID = #{appId}
|
|
|
</if>
|
|
</if>
|
|
|
- <if test="jobName != null and jobName != ''">
|
|
|
|
|
- and j.JOB_NAME like CONCAT('%', #{jobName}, '%')
|
|
|
|
|
|
|
+ <if test="flowJobName != null and flowJobName != ''">
|
|
|
|
|
+ and fj.FLOW_JOB_NAME like CONCAT('%', #{flowJobName}, '%')
|
|
|
</if>
|
|
</if>
|
|
|
<if test="jobStatus != null and jobStatus != ''">
|
|
<if test="jobStatus != null and jobStatus != ''">
|
|
|
and j.JOB_STATUS = #{jobStatus}
|
|
and j.JOB_STATUS = #{jobStatus}
|
|
@@ -104,6 +106,7 @@
|
|
|
</select>
|
|
</select>
|
|
|
<select id="getInfo" resultMap="MdFlowDispatchMap" >
|
|
<select id="getInfo" resultMap="MdFlowDispatchMap" >
|
|
|
select fj.FLOW_JOB_ID,
|
|
select fj.FLOW_JOB_ID,
|
|
|
|
|
+ fj.FLOW_JOB_NAME,
|
|
|
fj.APP_ID,
|
|
fj.APP_ID,
|
|
|
fj.ID,
|
|
fj.ID,
|
|
|
j.GROUP_NAME,
|
|
j.GROUP_NAME,
|