修改真实ip、任务列表添加筛选条件（西藏）

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

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

common/service_base/src/main/java/com/founder/servicebase/controller/SysUserController.java

@@ -79,7 +79,7 @@ public class SysUserController extends ApiController {
         JwtUser util = new JwtUser();
         String ip = request.getRemoteAddr();
         //密码加密与刑专一致
-        Token tokenEntity=new Token(one.getUsername(),ip, DigestUtil.encrypt(password));
+        Token tokenEntity=new Token(one.getUsername(),one.getIp(), DigestUtil.encrypt(password));
         JSONObject jsonObject = (JSONObject) JSONObject.toJSON(tokenEntity);
         //用户JWT生成token
         String token = util.createJWT(jsonObject.toString());
@@ -121,7 +121,7 @@ public class SysUserController extends ApiController {
         one.setIp(NetworkUtil.getIpAddr(request));
         JwtUser util = new JwtUser();
         String ip = request.getRemoteAddr();
-        Token tokenEntity=new Token(one.getUsername(),ip,one.getPassword());
+        Token tokenEntity=new Token(one.getUsername(),one.getIp(),one.getPassword());
         JSONObject jsonObject = (JSONObject) JSONObject.toJSON(tokenEntity);
         // 用户JWT生成token
         String token = util.createJWT(jsonObject.toString());

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

@@ -112,6 +112,18 @@
         <if test="jssj!= null and jssj!=''">
             AND a.fssj <![CDATA[<=]]> DATE_FORMAT(#{jssj},'%Y-%m-%d %H:%i:%S')
         </if>
+        <if test="state == 1">
+            AND (a.state = '1' or  a.state = '2')
+        </if>
+        <if test="state == 2">
+            AND a.state = '3'
+        </if>
+        <if test="state == 3">
+            AND (a.state = '1' or  a.state = '2' or a.state = '3')
+        </if>
+        <if test="taskId != null and taskId != ''">
+            AND  a.taskId = #{taskId , jdbcType=VARCHAR }
+        </if>
         ORDER BY
         fssj DESC
         LIMIT #{page},#{pageSize}
@@ -138,6 +150,18 @@
         <if test="jssj!= null and jssj!=''">
             AND a.fssj <![CDATA[<=]]> DATE_FORMAT(#{jssj},'%Y-%m-%d %H:%i:%S')
         </if>
+        <if test="state == 1">
+            AND (a.state = '1' or  a.state = '2')
+        </if>
+        <if test="state == 2">
+            AND a.state = '3'
+        </if>
+        <if test="state == 3">
+            AND (a.state = '1' or  a.state = '2' or a.state = '3')
+        </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">