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

dsk-module/dsk-biz-api/src/main/java/com/dsk/jsk/controller/JskCombineInfoController.java

@@ -21,10 +21,7 @@ import com.dsk.system.domain.vo.SysOssVo;
 import com.dsk.system.service.ISysOssService;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 import javax.servlet.http.HttpServletResponse;
 import java.io.ByteArrayInputStream;
@@ -210,4 +207,28 @@ public class JskCombineInfoController extends BaseController {
         SysOssVo sysOssVo = ossService.buildResultEntity(title.concat(Constants.SUFFIX_XLSX), Constants.SUFFIX_XLSX, client.getConfigKey(), uploadResult);
         return R.ok(sysOssVo);
     }
+
+    /***
+     *@Description: 获取集团logo
+     *@Param:
+     *@return: com.dsk.common.core.domain.R
+     *@Author: Dgm
+     *@date: 2023/9/12 16:05
+     */
+    @RequestMapping(value = "/combineMemberLogo", method = RequestMethod.POST)
+    public R combineMemberLogo(@RequestBody Map<String,Object> paramMap) {
+        return baseService.combineMemberLogo(paramMap);
+    }
+
+    /***
+     *@Description: 集团统计展示调用允许
+     *@Param:
+     *@return: com.dsk.common.core.domain.R
+     *@Author: Dgm
+     *@date: 2023/9/12 16:05
+     */
+    @RequestMapping(value = "/memberCount", method = RequestMethod.POST)
+    public R memberCount(@RequestBody JskCombineSearchDto dto) throws Exception {
+        return baseService.memberCount(dto);
+    }
 }

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

@@ -17,6 +17,7 @@ import com.dsk.jsk.domain.vo.JskCombineWinBidProjectExportVo;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections4.MapUtils;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.HttpStatus;
 import org.springframework.stereotype.Service;
 import org.springframework.util.ObjectUtils;
 
@@ -215,4 +216,44 @@ public class JskCombineInfoService {
         }
         return dskOpenApiUtil.responsePage(map);
     }
+
+    /***
+     *@Description: 获取集团logo
+     *@Param:
+     *@return: com.dsk.common.core.domain.R
+     *@Author: Dgm
+     *@date: 2023/9/12 16:05
+     */
+    public R combineMemberLogo(Map<String,Object> object) {
+        Map<String, Object> map = dskOpenApiUtil.requestBody("/operate/enterprise/combineMemberLogo", object);
+        return BeanUtil.toBean(map, R.class);
+    }
+
+    /***
+     *@Description: 集团统计展示调用允许
+     *@Param:
+     *@return: com.dsk.common.core.domain.R
+     *@Author: Dgm
+     *@date: 2023/9/12 16:05
+     */
+    public R memberCount(JskCombineSearchDto dto) {
+        Map<String, Object> paramsMap = BeanUtil.beanToMap(dto, false, false);
+        Map<String, Object> map = dskOpenApiUtil.requestBody("/operate/combine/memberCount", paramsMap);
+        if (ObjectUtil.isNotEmpty(map.get("data"))) {
+            Map<String, Object> data = BeanUtil.beanToMap(map.get("data"));
+            data.put("performance", businessCount(paramsMap));
+        }
+        return BeanUtil.toBean(map, R.class);
+    }
+
+    public Integer businessCount(Map<String, Object> paramsMap) {
+        Integer performance = 0;
+        Map<String, Object> resMap = dskOpenApiUtil.requestBody("/nationzj/project/combine/projectList", paramsMap);
+        Integer code = MapUtils.getInteger(resMap, "code", 300);
+        Map data = MapUtils.getMap(resMap, "data", null);
+        if (code.equals(HttpStatus.OK.value())) {
+            performance = MapUtils.getInteger(data, "totalCount", 0);
+        }
+        return performance;
+    }
 }

dsk-operate-ui/src/views/component/noData.vue

@@ -2,8 +2,11 @@
   <div class="no-data">
     <div class="no-data-box">
       <img :src="noData" alt="抱歉，没找到相关数据" />
-      <div v-if="text">抱歉，您还未添加{{text}}项目</div>
-      <div v-else>抱歉，没找到相关数据</div>
+      <div v-if="record">抱歉，您还未添加跟进动态</div>
+      <template v-else>
+        <div v-if="text">抱歉，您还未添加{{text}}项目</div>
+        <div v-else>抱歉，没找到相关数据</div>
+      </template>
       <span v-if="condition">建议调整关键词或筛选条件，重新搜索</span>
     </div>
   </div>
@@ -13,6 +16,10 @@
 export default {
   name: "NoData",
   props: {
+    record: {
+      type: Boolean,
+      default: false
+    },
     condition: {
       type: Boolean,
       default: false

dsk-operate-ui/src/views/enterpriseData/components/Owner/index.vue

@@ -151,7 +151,7 @@
 			  <el-table  :data="tableData" :header-cell-style="{ background:'#f0f3fa',color: 'rgba(35,35,35,0.8)'}" v-horizontal-scroll="'hover'"  class="table-item1 fixed-table"  border  highlight-current-row>
 					<el-table-column type="index" label="序号" fixed width="60">
 					 <template slot-scope="scope">
-						 <span>{{(pageNum - 1) *20 + scope.$index + 1}}</span>
+						 <span>{{(pageNum - 1) *pageSize + scope.$index + 1}}</span>
 					 </template>
 					</el-table-column>
 					<el-table-column  label="公司名称" fixed width="380" >

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

@@ -345,7 +345,7 @@
               </div>
             </div>
           </template>
-          <no-data :condition="true" style="padding:40px" v-if="viewData6.length==0"/>
+          <no-data :record="true" style="padding:40px" v-if="viewData6.length==0"/>
         </div>
       </el-card>
     </div>

dsk-operate-ui/src/views/radar/components/MajorProject/index.vue

@@ -51,7 +51,7 @@
 				</div>
 				<el-dropdown @command="transactionPricehandleCommand" class="el-dropdown-land" placement="bottom-start" trigger="click" ref="transactionPriceShowPopper" :hide-on-click="false">
 					<span class="el-dropdown-link" :class="importantProjectDto.startMoney ||importantProjectDto.endMoney ? 'color_text': ''">
-						项目投资额（万元）{{importantProjectDto.startMoney ||importantProjectDto.endMoney? " 1项": ""}}<i class="el-icon-caret-bottom"></i>
+						项目投资额{{importantProjectDto.startMoney ||importantProjectDto.endMoney? " 1项": ""}}<i class="el-icon-caret-bottom"></i>
 					</span>
 					<el-dropdown-menu slot="dropdown">
 						<el-dropdown-item v-for="(item, i) in transactionPriceOptions" :class="importantProjectDto.startMoney == item.value[0] &&importantProjectDto.endMoney == item.value[1] &&