查询任务列表 添加筛选条件

common/common_utils/src/main/java/com/founder/commonutils/model/vo/param/SkRegionalsTaskParam.java

@@ -39,4 +39,14 @@ public class SkRegionalsTaskParam {
      * 列数
      */
     private Integer pageSize;
+    /**
+     * 任务状态
+     */
+    private String state;
+    /**
+     *任务编号（RW开头）
+     */
+    private String taskId;
+
+
 }

service/publicapi/src/main/java/com/founder/publicapi/mapper/mysqlMapper/xml/SkRegionalsTaskMapper.xml

@@ -77,7 +77,7 @@
     </insert>
     <!--任务查询-->
     <select id="queryTaskInfoList" parameterType="com.founder.commonutils.model.vo.param.SkRegionalsTaskParam" resultType="com.founder.commonutils.model.newPublicEntity.SkRegionalsTask">
-SELECT
+        SELECT
         	a.taskid,
         	a.taskcaseid,
         	a.taskname,
@@ -96,9 +96,9 @@ SELECT
             (SELECT count(distinct(t.objectValue)) FROM sk_regionals_result t WHERE t.taskId = a.taskId)
             ELSE
             ( SELECT count(*) FROM sk_regionals_result t WHERE t.taskId = a.taskId)end AS resultCount
-FROM
+        FROM
         	sk_regionals_task a
-WHERE isDeleted = '0' and (taskCaseId != 'test'or taskCaseId IS NULL)
+        WHERE isDeleted = '0' and (taskCaseId != 'test'or taskCaseId IS NULL)
            <if test="taskname != null and taskname != ''">
                 and a.taskName like  concat('%', #{taskname , jdbcType=VARCHAR }, '%')
            </if>
@@ -114,7 +114,13 @@ WHERE isDeleted = '0' and (taskCaseId != 'test'or taskCaseId IS NULL)
            <if test="jssj!= null and jssj!=''">
                     AND a.fssj <![CDATA[<=]]> DATE_FORMAT(#{jssj},'%Y-%m-%d %H:%i:%S')
            </if>
-ORDER BY
+           <if test="state != null and state != ''">
+               AND a.state = #{state , jdbcType=VARCHAR }
+           </if>
+           <if test="taskId != null and taskId != ''">
+               AND  a.taskId = #{taskId , jdbcType=VARCHAR }
+           </if>
+        ORDER BY
         	fssj DESC
         	LIMIT #{page},#{pageSize}
     </select>
@@ -140,6 +146,12 @@ ORDER BY
         <if test="jssj!= null and jssj!=''">
             AND a.fssj <![CDATA[<=]]> DATE_FORMAT(#{jssj},'%Y-%m-%d %H:%i:%S')
         </if>
+        <if test="state != null and state != ''">
+            AND a.state = #{state , jdbcType=VARCHAR }
+        </if>
+        <if test="taskId != null and taskId != ''">
+            AND  a.taskId = #{taskId , jdbcType=VARCHAR }
+        </if>
     </select>
     <!--根据任务id查询区域信息-->
     <select id="queryRegionalsList" parameterType="String" resultType="com.founder.commonutils.model.vo.param.RegionalsParam">