|
@@ -9,6 +9,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
|
|
|
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
|
|
|
import lombok.RequiredArgsConstructor;
|
|
|
import lombok.extern.slf4j.Slf4j;
|
|
|
+import org.dromara.system.domain.SysOss;
|
|
|
import org.springframework.stereotype.Service;
|
|
|
import org.dromara.system.domain.bo.TblEventBo;
|
|
|
import org.dromara.system.domain.vo.TblEventVo;
|
|
@@ -82,6 +83,15 @@ public class TblEventServiceImpl implements ITblEventService {
|
|
|
lqw.eq(StringUtils.isNotBlank(bo.getEmergencyPlan()), TblEvent::getEmergencyPlan, bo.getEmergencyPlan());
|
|
|
lqw.eq(StringUtils.isNotBlank(bo.getExt1()), TblEvent::getExt1, bo.getExt1());
|
|
|
lqw.eq(StringUtils.isNotBlank(bo.getExt2()), TblEvent::getExt2, bo.getExt2());
|
|
|
+ if(params.get("lx")!=null){
|
|
|
+ lqw.apply(StringUtils.format(" ext2->'$.lx' = {}", params.get("lx").toString()));
|
|
|
+ }
|
|
|
+ if(params.get("key")!=null){
|
|
|
+ lqw.apply(StringUtils.format(" ext2->'$.lx' like '%{}%'", params.get("key").toString()));
|
|
|
+ lqw.like(true, TblEvent::getAddr, params.get("key").toString());
|
|
|
+ }
|
|
|
+ lqw.between(params.get("beginCreateTime") != null && params.get("endCreateTime") != null,
|
|
|
+ TblEvent::getCreateTime, params.get("beginCreateTime"), params.get("endCreateTime"));
|
|
|
return lqw;
|
|
|
}
|
|
|
|