Merge remote-tracking branch 'origin/dev20230707' 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/component/gzdb.vue

@@ -11,7 +11,7 @@
             <div class="writting" v-if="isEdit == true">
               <div class="wri_top">
                 <img src="@/assets/images/project/add_3.png">
-                <el-input v-model="queryParam.task" placeholder="新建一条跟进记录，如:周五上午预约客户上门拜访"></el-input>
+                <el-input v-model="queryParam.task"  maxlength="500" placeholder="新建一条跟进记录，如:周五上午预约客户上门拜访"></el-input>
               </div>
               <div class="wr_bot">
                 <div class="times"><img src="@/assets/images/project/ico_4.png">
@@ -23,7 +23,7 @@
                 </div>
                 <div class="sels">
                   <img src="@/assets/images/project/ico_2.png">
-                  <el-input v-model="queryParam.target" placeholder="拜访对象" maxlength="500" style="width: 100px;">
+                  <el-input v-model="queryParam.target" placeholder="拜访对象" style="width: 100px;">
                   </el-input>
                 </div>
                 <div class="wc">
@@ -111,6 +111,7 @@
           businessId:this.detailId ? this.detailId : parseInt(this.$route.query.id),
           pageSize:20,
           pageNum:1,
+          state:0
         },
         datalist:[],
         yqnum:'',//已逾期数量
@@ -164,7 +165,6 @@
         this.isSkeleton = true
         let params={
           ...this.searchPram,
-          state:this.activeName === 'first'? 0 : this.activeName === 'second'? 1 : 2,
           // cancelHttp: true
         }
         getGZDB(params).then(result=>{
@@ -177,6 +177,7 @@
         this.getList()
       },
       handleClick(){
+        this.searchPram.state=this.activeName === 'first'? 0 : this.activeName === 'second'? 1 : 2
         this.getList()
       },
       changes(id,state){
@@ -212,6 +213,10 @@
           color: #FF3C3C;
         }
       }
+      .task_name{
+        word-wrap: break-word;
+        width: 87%;
+      }
     }
   }
   .tabList{

dsk-operate-ui/src/views/project/projectList/component/xgqy.vue

@@ -159,7 +159,7 @@
             <el-input type="text" v-model="queryParam.responsiblePerson" placeholder="请输入"></el-input>
           </el-form-item>
           <el-form-item label="联系方式：" class="row">
-            <el-input type="text" v-model="queryParam.phonenumber" placeholder="请输入"></el-input>
+            <el-input type="text" oninput="value=value.replace(/[^\d]/g,'')" v-model="queryParam.phone" maxlength="11" placeholder="请输入"></el-input>
           </el-form-item>
           <el-form-item label="备注说明：" class="row">
             <el-input
@@ -210,7 +210,7 @@
         rules:{
           companyRole:[{ required: true, message: '请输入非空格字符！', trigger: 'blur' },],
           companyName:[{ required: true, message: '请输入非空格字符！', trigger: 'blur' },],
-          phonenumber: [
+          phone: [
             {
               pattern: /^1[3|4|5|6|7|8|9][0-9]\d{8}$/,
               message: "请输入正确的手机号码",
@@ -301,6 +301,9 @@
         })
       },
       addqy(){
+        if(this.queryParam.companyName === '' && this.queryParam.companyRole === ''){
+          return this.$message.warning('企业角色和企业名称需填写完整！')
+        }
         addXGQY(this.queryParam).then(res=>{
           this.hzhbVisible=false
           if(res.code == 200){
@@ -310,6 +313,7 @@
             this.$message.error(res.msg)
           }
         })
+
       },
       saveqy(){
         saveXGQY(this.queryParam).then(res=>{

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业务层处理
@@ -142,15 +139,40 @@ 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 = businessInfoMapper.selectProjectName(dto);
+        List<BusinessLikeProjectNameListVo> vos = new ArrayList<>();
+        try {
+            Map<String, Object> result = dskOpenApiUtil.requestBody("/nationzj/jskBid/news/findByName", toRequestMap(dto));
+            if (ObjectUtil.isNotEmpty(result.get("data"))) {
+                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(Double.parseDouble(MapUtil.getStr(map, "projectContractAmount")));
+                        vo.setProjectType(MapUtil.getStr(map, "projectType"));
+                        vo.setProjectCategory(MapUtil.getStr(map, "projectPurposes"));
+                        vos.add(vo);
+                    }
                 }
             }
+        }catch (Exception e) {
+            log.error("模糊查询项目名称调用失败！");
+        }
+
         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