Commit 32ade521 authored by Administrator's avatar Administrator

-

parent d50433f3
...@@ -2,10 +2,12 @@ package com.dsk.system.dskService; ...@@ -2,10 +2,12 @@ package com.dsk.system.dskService;
import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.bean.BeanUtil;
import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.ObjectUtil;
import cn.hutool.json.JSONUtil;
import com.alibaba.fastjson2.JSONObject; import com.alibaba.fastjson2.JSONObject;
import com.dsk.common.core.domain.AjaxResult; import com.dsk.common.core.domain.AjaxResult;
import com.dsk.common.utils.DateUtils; import com.dsk.common.utils.DateUtils;
import com.dsk.common.utils.DskOpenApiUtil; import com.dsk.common.utils.DskOpenApiUtil;
import org.apache.commons.collections4.MapUtils;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
...@@ -48,6 +50,11 @@ public class IndexService { ...@@ -48,6 +50,11 @@ public class IndexService {
objectMap.put("recentlyBidQueryDto", recentlyBidQueryDtoList); objectMap.put("recentlyBidQueryDto", recentlyBidQueryDtoList);
} else { } else {
Map<String,Object> recentlyBidQueryMap = (Map<String,Object>)recentlyBidQueryDtoList.get(0); Map<String,Object> recentlyBidQueryMap = (Map<String,Object>)recentlyBidQueryDtoList.get(0);
String startMoney = MapUtils.getString(recentlyBidQueryMap, "startMoney", "");
String endMoney = MapUtils.getString(recentlyBidQueryMap, "endMoney", "");
if (ObjectUtil.isEmpty(startMoney) && ObjectUtil.isEmpty(endMoney)) {
recentlyBidQueryMap.put("startMoney", 20000);
}
recentlyBidQueryMap.put("tenderType","施工,工程总承包"); recentlyBidQueryMap.put("tenderType","施工,工程总承包");
objectMap.put("recentlyBidQueryDto", recentlyBidQueryDtoList); objectMap.put("recentlyBidQueryDto", recentlyBidQueryDtoList);
} }
...@@ -71,7 +78,13 @@ public class IndexService { ...@@ -71,7 +78,13 @@ public class IndexService {
jskBidQueryDtoMap.put("startBidMoney", 20000); jskBidQueryDtoMap.put("startBidMoney", 20000);
objectMap.put("jskBidQueryDto", jskBidQueryDtoMap); objectMap.put("jskBidQueryDto", jskBidQueryDtoMap);
} else { } else {
objectMap.put("jskBidQueryDto", jskBidQueryDto); Map<String,Object> map = JSONUtil.toBean(JSONUtil.toJsonStr(jskBidQueryDto), Map.class);
String startBidMoney = MapUtils.getString(map, "startBidMoney", "");
String endBidMoney = MapUtils.getString(map, "endBidMoney", "");
if (ObjectUtil.isEmpty(startBidMoney) && ObjectUtil.isEmpty(endBidMoney)) {
map.put("startBidMoney", 20000);
}
objectMap.put("jskBidQueryDto", map);
} }
Map<String, Object> map = dskOpenApiUtil.requestBody("/nationzj/jskBid/page", objectMap); Map<String, Object> map = dskOpenApiUtil.requestBody("/nationzj/jskBid/page", objectMap);
return BeanUtil.toBean(map, AjaxResult.class); return BeanUtil.toBean(map, AjaxResult.class);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment