Merge branch 'zuhuduan' of http://192.168.60.201/root/dsk-operate-sys into zuhuduan

dsk-admin/src/main/resources/i18n/messages_en_US.properties

@@ -48,7 +48,7 @@ email.code.retry.limit.count=Email code input error {0} times
 email.code.retry.limit.exceed=Email code input error {0} times, account locked for {1} minutes
 xcx.code.not.blank=Mini program code cannot be blank
 ##\u79DF\u6237
-tenant.number.not.blank=company number cannot be blank
-tenant.not.exists=Sorry, your company does not exist. Please contact the administrator
-tenant.blocked=Sorry, your company is disabled. Please contact the administrator
-tenant.expired=Sorry, your company has expired. Please contact the administrator.
+company.number.not.blank=company number cannot be blank
+company.not.exists=Sorry, your company does not exist. Please contact the administrator
+company.blocked=Sorry, your company is disabled. Please contact the administrator
+company.expired=Sorry, your company has expired. Please contact the administrator.
\ No newline at end of file

dsk-admin/src/main/resources/i18n/messages_zh_CN.properties

@@ -48,7 +48,7 @@ email.code.retry.limit.count=\u90AE\u7BB1\u9A8C\u8BC1\u7801\u8F93\u5165\u9519\u8
 email.code.retry.limit.exceed=\u90AE\u7BB1\u9A8C\u8BC1\u7801\u8F93\u5165\u9519\u8BEF{0}\u6B21\uFF0C\u5E10\u6237\u9501\u5B9A{1}\u5206\u949F
 xcx.code.not.blank=\u5C0F\u7A0B\u5E8Fcode\u4E0D\u80FD\u4E3A\u7A7A
 ##\u79DF\u6237
-tenant.number.not.blank=\u4F01\u4E1A\u7F16\u53F7\u4E0D\u80FD\u4E3A\u7A7A
-tenant.not.exists=\u5BF9\u4E0D\u8D77, \u60A8\u7684\u4F01\u4E1A\u4E0D\u5B58\u5728\uFF0C\u8BF7\u8054\u7CFB\u7BA1\u7406\u5458
-tenant.blocked=\u5BF9\u4E0D\u8D77\uFF0C\u60A8\u7684\u4F01\u4E1A\u5DF2\u7981\u7528\uFF0C\u8BF7\u8054\u7CFB\u7BA1\u7406\u5458
-tenant.expired=\u5BF9\u4E0D\u8D77\uFF0C\u60A8\u7684\u4F01\u4E1A\u5DF2\u8FC7\u671F\uFF0C\u8BF7\u8054\u7CFB\u7BA1\u7406\u5458
+company.number.not.blank=\u4F01\u4E1A\u7F16\u53F7\u4E0D\u80FD\u4E3A\u7A7A
+company.not.exists=\u5BF9\u4E0D\u8D77, \u60A8\u7684\u4F01\u4E1A\u4E0D\u5B58\u5728\uFF0C\u8BF7\u8054\u7CFB\u7BA1\u7406\u5458
+company.blocked=\u5BF9\u4E0D\u8D77\uFF0C\u60A8\u7684\u4F01\u4E1A\u5DF2\u7981\u7528\uFF0C\u8BF7\u8054\u7CFB\u7BA1\u7406\u5458
+company.expired=\u5BF9\u4E0D\u8D77\uFF0C\u60A8\u7684\u4F01\u4E1A\u5DF2\u8FC7\u671F\uFF0C\u8BF7\u8054\u7CFB\u7BA1\u7406\u5458
\ No newline at end of file

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"));

dsk-system/src/main/resources/mapper/system/SysTenantMapper.xml

@@ -6,8 +6,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
     <select id="selectTenantList" resultType="com.dsk.system.domain.vo.SysTenantVo">
         select t.id, t.tenant_id,t.company_name from sys_tenant t
-        inner join  sys_user t1 on t1.tenant_id=t.tenant_id
+        inner join  sys_user t1 on t1.tenant_id=t.tenant_id and t1.del_flag=0
         where t.del_flag=0
+        and t.status=0
         and t1.phonenumber=#{username}
         order by t1.create_time desc
     </select>