Browse Source

场景列表深时模糊查询

lyhzzz 2 years ago
parent
commit
1ef0f987a0

+ 1 - 0
src/main/java/com/fdkankan/agent/httpClient/request/LaserSceneParam.java

@@ -10,6 +10,7 @@ public class LaserSceneParam {
     private Integer pageSize;
     private Integer pageSize;
     private Integer selectType = 1;
     private Integer selectType = 1;
     private List<String> sceneCodes;
     private List<String> sceneCodes;
+    private String sceneCode;
     private String title;
     private String title;
     private Integer status;
     private Integer status;
     private String snCode;
     private String snCode;

+ 1 - 1
src/main/java/com/fdkankan/agent/httpClient/service/LaserService.java

@@ -111,7 +111,7 @@ public class LaserService {
             param.getSnCodes().retainAll(strings);
             param.getSnCodes().retainAll(strings);
         }
         }
         if(StringUtils.isNotBlank(param.getNum())){
         if(StringUtils.isNotBlank(param.getNum())){
-            newParam.setSceneCodes(Arrays.asList(param.getNum()));
+            newParam.setSceneCode(param.getNum());
         }
         }
         BeanUtils.copyProperties(param,newParam);
         BeanUtils.copyProperties(param,newParam);
         newParam.setTitle(param.getSceneName());
         newParam.setTitle(param.getSceneName());

+ 2 - 0
src/main/java/com/fdkankan/agent/service/impl/AgentNewServiceImpl.java

@@ -1,6 +1,7 @@
 package com.fdkankan.agent.service.impl;
 package com.fdkankan.agent.service.impl;
 import java.util.Date;
 import java.util.Date;
 
 
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.fdkankan.agent.entity.AgentNew;
 import com.fdkankan.agent.entity.AgentNew;
@@ -58,6 +59,7 @@ public class AgentNewServiceImpl extends ServiceImpl<IAgentNewMapper, AgentNew>
         if(count == null || count <=0){
         if(count == null || count <=0){
             return;
             return;
         }
         }
+        totalTime = totalTime == null ? 1: totalTime;
         AgentNewLog agentNewLog = new AgentNewLog();
         AgentNewLog agentNewLog = new AgentNewLog();
         agentNewLog.setAgentId(agentNewVo.getId());
         agentNewLog.setAgentId(agentNewVo.getId());
         agentNewLog.setUserId(userId);
         agentNewLog.setUserId(userId);