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

dsk-admin/src/main/java/com/dsk/web/controller/search/controller/BusinessOpportunityRadarController.java

@@ -85,6 +85,18 @@ public class BusinessOpportunityRadarController {
         return opportunityRadarService.jskBidNewsPage(object);
     }
 
+    /*
+     * 标讯pro   商机项目关联查询
+     */
+    @RequestMapping("/jskBidNewsPage/findByName")
+    public AjaxResult findByName(@RequestBody JSONObject object) {
+        ComposeQueryDto compose = JSONObject.parseObject(object.toJSONString(), ComposeQueryDto.class);
+        if (PageQueryLimit.pageLimit(compose.getPage())){
+            return AjaxResult.error("翻页已达到上限");
+        }
+        return opportunityRadarService.findByName(object);
+    }
+
 
     /*
      * 专项债查询

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

@@ -52,7 +52,7 @@ public class CheckUtils {
      * @return
      */
     public static int checkIntegerPlaces(Double number) {
-        BigDecimal bigDecimal = new BigDecimal(number);
+        BigDecimal bigDecimal = new BigDecimal(String.valueOf(number));
         String strNumber = bigDecimal.toString();
         int integerPlaces = strNumber.indexOf('.');
         if (integerPlaces == -1) {
@@ -68,7 +68,7 @@ public class CheckUtils {
      * @return
      */
     public static int checkDecimalPlaces(Double number) {
-        BigDecimal bigDecimal = new BigDecimal(number);
+        BigDecimal bigDecimal = new BigDecimal(String.valueOf(number));
         String strNumber = bigDecimal.toString();
         int decimalPlaces = 0;
         int index = strNumber.indexOf('.');

dsk-operate-ui/src/views/detail/party-a/overview/component/bidding.vue

@@ -168,7 +168,7 @@ export default {
         grid:{
           left:'5%',
           top:'8%',
-          right:'5%',
+          right:'8%',
           bottom:'8%',
           containLabel: true
         },

dsk-operate-ui/src/views/project/projectList/index.vue

@@ -139,7 +139,8 @@
             </div>
             <div class="det-con" v-if="item.ownerCompany ">
               <span>业主单位：</span>
-              <span class="wordprimary" @click="toEnterprise(item)">{{item.ownerCompany}}</span>
+              <span class="wordprimary" v-if="item.ownerCompanyCid||item.ownerCompanyUipId" @click="toEnterprise(item)">{{item.ownerCompany}}</span>
+              <span v-else>{{item.ownerCompany}}</span>
             </div>
           </div>
           <el-divider v-if="index != datalist.length-1"></el-divider>
@@ -391,8 +392,8 @@ export default {
     },
     toEnterprise(item){
       if(item.ownerCompanyUipId){
-        this.$router.push({ path: '/enterprise/'+this.encodeStr(item.ownerCompanyUipId)});
-      }else{
+        this.$router.push({ path: '/enterprise/'+this.encodeStr(item.ownerCompanyCid)});
+      }else if(item.ownerCompanyCid){
         this.$router.push({ path: '/company/'+this.encodeStr(item.ownerCompanyCid)});
       }
     },

dsk-operate-ui/src/views/radar/BidRecord/details.vue

@@ -54,7 +54,7 @@
 			  
 		      <el-table-column  label="企业名称" >
 				  <template slot-scope="scope">
-					  <router-link v-if="scope.row.uipId||scope.row.companyId" :to="scope.row.uipId?'/enterprise/' + encodeStr(scope.row.uipId) :'/company/' + encodeStr(scope.row.companyId) " tag="a" class="list-titel-a blue" v-html="scope.row.companyName"></router-link>
+					  <router-link v-if="scope.row.uipId||scope.row.companyId" :to="scope.row.uipId?'/enterprise/' + encodeStr(scope.row.companyId) :'/company/' + encodeStr(scope.row.companyId) " tag="a" class="list-titel-a blue" v-html="scope.row.companyName"></router-link>
 					  <span v-else>{{ scope.row.companyName||'--' }}</span>
 				  </template>
 			  </el-table-column>

dsk-system/src/main/java/com/dsk/system/searchService/BusinessOpportunityRadarService.java

@@ -26,6 +26,11 @@ public class BusinessOpportunityRadarService {
         return BeanUtil.toBean(map, AjaxResult.class);
     }
 
+    public AjaxResult findByName(JSONObject object) {
+        Map<String, Object> map = dskOpenApiUtil.requestBody("/nationzj/jskBid/news/findByName", object);
+        return BeanUtil.toBean(map, AjaxResult.class);
+    }
+
     public AjaxResult jskBidTenderPage(JSONObject object) {
         Map<String, Object> map = dskOpenApiUtil.requestBody("/nationzj/jskBidTender/page", object);
         return BeanUtil.toBean(map, AjaxResult.class);

dsk-system/src/main/java/com/dsk/system/service/impl/BusinessInfoServiceImpl.java

@@ -43,10 +43,7 @@ import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.multipart.MultipartFile;
 
 import javax.annotation.Resource;
-import java.util.ArrayList;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 
 /**
  * 项目详情Service业务层处理
@@ -143,14 +140,36 @@ public class BusinessInfoServiceImpl implements IBusinessInfoService {
     @Override
     public List<BusinessLikeProjectNameListVo> selectProjectName(BusinessListDto dto) {
         List<BusinessLikeProjectNameListVo> vos = businessInfoMapper.selectProjectName(dto);
-        if (!CollectionUtils.isEmpty(vos)) {
-            for (BusinessLikeProjectNameListVo vo : vos) {
-                vo.setProjectName(vo.getProjectName().replace(dto.getProjectName(), "<font color='#FF204E'>" + dto.getProjectName() + "</font>"));
-            }
-        }
+//        List<BusinessLikeProjectNameListVo> vos = new ArrayList<>();
+//        Map<String, Object> result = dskOpenApiUtil.requestBody("/company/bidding/newZhaoBiao/list", toRequestMap(dto));
+//        if ("200".equals(result.get("code")) && ObjectUtil.isNotEmpty(result.get("data"))
+//                && ObjectUtil.isNotEmpty(BeanUtil.beanToMap(result.get("data")).get("list"))) {
+//            List<Map<String, Object>> list = (List<Map<String, Object>>) BeanUtil.beanToMap(result.get("data")).get("list");
+//            if (!CollectionUtils.isEmpty(list)) {
+//                for (Map<String, Object> map : list) {
+//                    BusinessLikeProjectNameListVo vo = new BusinessLikeProjectNameListVo();
+//                    vo.setProjectName(MapUtil.getStr(map, "projectName").replace(dto.getProjectName(), "<font color='#FF204E'>" + dto.getProjectName() + "</font>"));
+//                    vo.setInvestmentAmount(MapUtil.getDouble(map, "bidMoney"));
+//                    vo.setProjectLevel(MapUtil.getStr(map, "bidMoney"));
+//                    vo.setProjectStage(MapUtil.getStr(map, "tenderStage"));
+//                    vo.setProjectType(MapUtil.getStr(map, "projectType"));
+//                    vo.setProjectCategory(MapUtil.getStr(map, "projectType"));
+//                }
+//            }
+//        }
         return vos;
     }
 
+    private Map<String, Object> toRequestMap(BusinessListDto dto) {
+        Map<String, Object> page = new HashMap<>();
+        page.put("page", 1);
+        page.put("limit", 20);
+        Map<String, Object> map = new HashMap<>();
+        map.put("keyword", dto.getProjectName());
+        map.put("page", page);
+        return map;
+    }
+
     @Override
     public AjaxResult batchUpload(MultipartFile file) {
         //获取当前登录用户id