u

dsk-common/src/main/java/com/dsk/common/utils/StringUtils.java

@@ -327,4 +327,8 @@ public class StringUtils extends org.apache.commons.lang3.StringUtils {
         return oldStr.replace(str, "<font color='#FF204E'>" + str + "</font>");
     }
 
+    //去除字符串标红
+    public static String removeRed(String str) {
+        return str.replace("<font color='#FF204E'>" ,"").replace("</font>","");
+    }
 }

dsk-module/dsk-biz-api/src/main/java/com/dsk/jsk/service/JskCombineInfoService.java

@@ -8,6 +8,7 @@ import com.dsk.common.core.domain.R;
 import com.dsk.common.core.page.TableDataInfo;
 import com.dsk.common.exception.ServiceException;
 import com.dsk.common.utils.DskOpenApiUtil;
+import com.dsk.common.utils.StringUtils;
 import com.dsk.jsk.domain.JskCombineBidPageDto;
 import com.dsk.jsk.domain.JskCombineCertificateDto;
 import com.dsk.jsk.domain.JskCombineSearchDto;
@@ -137,10 +138,15 @@ public class JskCombineInfoService {
             JskCombineWinBidProjectExportVo vo = new JskCombineWinBidProjectExportVo();
             vo.setId(i + 1);
             vo.setBidTime(MapUtil.getDate(list.get(i),"bidTime"));
-            vo.setCompanyName(MapUtil.getStr(list.get(i),"companyName"));
+            if(ObjectUtils.isEmpty(dto.getSearchValue())){
+                vo.setCompanyName(MapUtil.getStr(list.get(i),"companyName"));
+                vo.setProjectName(MapUtil.getStr(list.get(i),"projectName"));
+            }else {
+                vo.setCompanyName(StringUtils.removeRed(MapUtil.getStr(list.get(i),"companyName")));
+                vo.setProjectName(StringUtils.removeRed(MapUtil.getStr(list.get(i),"projectName")));
+            }
             vo.setStockPercent(MapUtil.getDouble(list.get(i),"stockPercent"));
             vo.setMemberLevel(MapUtil.getStr(list.get(i),"memberLevel"));
-            vo.setProjectName(MapUtil.getStr(list.get(i),"projectName"));
             vo.setBidAmount(MapUtil.getDouble(list.get(i),"bidAmount"));
             vo.setAddress(MapUtil.getStr(list.get(i),"address"));
             vo.setBoundType(MapUtil.getStr(list.get(i),"boundType"));
@@ -156,7 +162,7 @@ public class JskCombineInfoService {
         if (ObjectUtils.isEmpty(dto.getPageSize())) throw new ServiceException("导出条数不能为空！");
         if (dto.getPageSize() > 2000) dto.setPageSize(2000);
         dto.setPageNum(1);
-        Map<String, Object> map = dskOpenApiUtil.requestBody("/operate/combine/bidPage", BeanUtil.beanToMap(dto, false, false));
+        Map<String, Object> map = dskOpenApiUtil.requestBody("/nationzj/project/combine/tenderList", BeanUtil.beanToMap(dto, false, false));
         if (ObjectUtils.isEmpty(map.get("data"))) throw new ServiceException("导出失败，系统错误！");
         Map<String, Object> data = BeanUtil.beanToMap(map.get("data"));
         if (ObjectUtils.isEmpty(data.get("list"))) throw new ServiceException("导出失败，系统错误！");
@@ -168,10 +174,15 @@ public class JskCombineInfoService {
             JskCombineBidProjectExportVo vo = new JskCombineBidProjectExportVo();
             vo.setId(i + 1);
             vo.setIssueTime(MapUtil.getDate(list.get(i),"issueTime"));
-            vo.setTenderee(MapUtil.getStr(list.get(i),"tenderee"));
+            if(ObjectUtils.isEmpty(dto.getKeys())){
+                vo.setTenderee(MapUtil.getStr(list.get(i),"tenderee"));
+                vo.setProjectName(MapUtil.getStr(list.get(i),"projectName"));
+            }else {
+                vo.setTenderee(StringUtils.removeRed(MapUtil.getStr(list.get(i),"tenderee")));
+                vo.setProjectName(StringUtils.removeRed(MapUtil.getStr(list.get(i),"projectName")));
+            }
             vo.setStockPercent(MapUtil.getDouble(list.get(i),"stockPercent"));
             vo.setMemberLevel(MapUtil.getStr(list.get(i),"memberLevel"));
-            vo.setProjectName(MapUtil.getStr(list.get(i),"projectName"));
             vo.setBidAmount(MapUtil.getDouble(list.get(i),"bidAmount"));
             vo.setAddress(MapUtil.getStr(list.get(i),"address"));
             vo.setSubjectMatter(MapUtil.getStr(list.get(i),"subjectMatter"));