|
@@ -10,6 +10,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
|
|
|
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
|
|
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
|
|
|
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
|
|
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
|
|
|
import com.baomidou.mybatisplus.core.metadata.IPage;
|
|
import com.baomidou.mybatisplus.core.metadata.IPage;
|
|
|
|
|
+import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
|
|
|
import com.baomidou.mybatisplus.core.toolkit.StringUtils;
|
|
import com.baomidou.mybatisplus.core.toolkit.StringUtils;
|
|
|
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
|
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
|
|
import com.fasterxml.jackson.databind.ObjectMapper;
|
|
import com.fasterxml.jackson.databind.ObjectMapper;
|
|
@@ -109,6 +110,7 @@ public class BusinessReminderCardController extends JeecgController<BusinessRem
|
|
|
String upTimeStart = request.getParameterMap().get("upTimeStart")==null?"":Arrays.toString(request.getParameterMap().get("upTimeStart")).replace("[", "").replace("]", "").replace("*", "");
|
|
String upTimeStart = request.getParameterMap().get("upTimeStart")==null?"":Arrays.toString(request.getParameterMap().get("upTimeStart")).replace("[", "").replace("]", "").replace("*", "");
|
|
|
String upTimeEnd = request.getParameterMap().get("upTimeEnd")==null?"":Arrays.toString(request.getParameterMap().get("upTimeEnd")).replace("[", "").replace("]", "").replace("*", "");
|
|
String upTimeEnd = request.getParameterMap().get("upTimeEnd")==null?"":Arrays.toString(request.getParameterMap().get("upTimeEnd")).replace("[", "").replace("]", "").replace("*", "");
|
|
|
|
|
|
|
|
|
|
+ List<String> selectLanOrZi = request.getParameterMap().get("selectLanOrZi[]")==null?new ArrayList<>(): new ArrayList<>(Arrays.asList(request.getParameterMap().get("selectLanOrZi[]")));
|
|
|
|
|
|
|
|
businessReminderCard.setDelFlag( CommonConstant.DEL_FLAG_0);
|
|
businessReminderCard.setDelFlag( CommonConstant.DEL_FLAG_0);
|
|
|
String numberResults_MultiString = request.getParameterMap().get("numberResults_MultiString")==null?"":
|
|
String numberResults_MultiString = request.getParameterMap().get("numberResults_MultiString")==null?"":
|
|
@@ -161,6 +163,28 @@ public class BusinessReminderCardController extends JeecgController<BusinessRem
|
|
|
if (StringUtils.isNotBlank(numberResults_MultiString)){
|
|
if (StringUtils.isNotBlank(numberResults_MultiString)){
|
|
|
queryWrapper.like("number_results",numberResults_MultiString);
|
|
queryWrapper.like("number_results",numberResults_MultiString);
|
|
|
}
|
|
}
|
|
|
|
|
+
|
|
|
|
|
+ if (!CollectionUtils.isEmpty(selectLanOrZi)){
|
|
|
|
|
+
|
|
|
|
|
+ queryWrapper.and(wrapper -> {
|
|
|
|
|
+ for (String s : selectLanOrZi) {
|
|
|
|
|
+ if (s.equals("3,4")){
|
|
|
|
|
+ wrapper.eq("number_results","3,4")
|
|
|
|
|
+ .or();
|
|
|
|
|
+ wrapper.eq("number_results","4,3");
|
|
|
|
|
+ }else if (s.equals("0")){
|
|
|
|
|
+ wrapper.eq("number_results","1")
|
|
|
|
|
+ .or();
|
|
|
|
|
+ wrapper.eq("number_results","0");
|
|
|
|
|
+ }else {
|
|
|
|
|
+ wrapper.eq("number_results",s)
|
|
|
|
|
+ .or();
|
|
|
|
|
+ }
|
|
|
|
|
+ }
|
|
|
|
|
+ });
|
|
|
|
|
+
|
|
|
|
|
+ }
|
|
|
|
|
+
|
|
|
if (numberResults.size()!=0){
|
|
if (numberResults.size()!=0){
|
|
|
List<Integer> collect = numberResults.stream().map(Integer::valueOf)
|
|
List<Integer> collect = numberResults.stream().map(Integer::valueOf)
|
|
|
.collect(Collectors.toList());
|
|
.collect(Collectors.toList());
|