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

# Conflicts:
#	dsk-operate-ui/src/views/radar/index.vue

dsk-admin/src/main/java/com/dsk/web/controller/dsk/JskCombineInfoController.java

 package com.dsk.web.controller.dsk;
 
+import cn.hutool.core.date.DateUtil;
 import com.alibaba.fastjson2.JSONObject;
 import com.dsk.common.core.controller.BaseController;
 import com.dsk.common.core.domain.AjaxResult;
 import com.dsk.common.core.domain.R;
 import com.dsk.common.core.page.TableDataInfo;
+import com.dsk.common.utils.poi.ExcelUtil;
 import com.dsk.system.domain.dsk.dto.JskCombineCertificateDto;
 import com.dsk.system.domain.dsk.dto.JskCombineSearchDto;
+import com.dsk.system.domain.dsk.vo.JskCombineBidProjectExportVo;
+import com.dsk.system.domain.dsk.vo.JskCombineWinBidProjectExportVo;
 import com.dsk.system.dskService.JskCombineInfoService;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.poi.util.IOUtils;
 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.security.access.prepost.PreAuthorize;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletResponse;
+import java.util.Date;
+import java.util.List;
+import java.util.Map;
 
 /**
  * 集团户相关信息
+ *
  * @author lcl
  * @create 2023/8/7
  */
@@ -59,6 +68,7 @@ public class JskCombineInfoController extends BaseController {
     public TableDataInfo certificateList(@RequestBody JskCombineSearchDto dto) throws Exception {
         return baseService.certificateList(dto);
     }
+
     /**
      * 集团成员资质列表
      */
@@ -138,4 +148,28 @@ public class JskCombineInfoController extends BaseController {
     public AjaxResult centralEnterprseSocialPage(@RequestBody JSONObject object) {
         return baseService.centralEnterprseSocialPage(object);
     }
+
+
+    /**
+     * 导出中标业绩
+     */
+    @PostMapping("/export/win/bid")
+    @PreAuthorize("@ss.hasPermi('combine:info:export:win:bid')")
+    public void exportWinBid(@RequestBody JskCombineSearchDto dto, HttpServletResponse response) {
+        List<JskCombineWinBidProjectExportVo> list = baseService.exportWinBid(dto);
+        ExcelUtil<JskCombineWinBidProjectExportVo> util = new ExcelUtil<>(JskCombineWinBidProjectExportVo.class);
+        util.exportExcel(response, list, "集团中标", dto.getCombineName().concat("中标业绩清单"), true);
+//        String fileName = util.localInit(list, "集团中标", dto.getCombineName().concat("中标业绩清单"), true);
+    }
+
+    /**
+     * 导出招标业绩
+     */
+    @PostMapping("/export/bid")
+    @PreAuthorize("@ss.hasPermi('combine:info:export:bid')")
+    public void exportBid(@RequestBody JskCombineSearchDto dto, HttpServletResponse response) {
+        List<JskCombineBidProjectExportVo> list = baseService.exportBid(dto);
+        ExcelUtil<JskCombineBidProjectExportVo> util = new ExcelUtil<>(JskCombineBidProjectExportVo.class);
+        util.exportExcel(response, list, "集团招标", dto.getCombineName().concat("招标公告清单"), true);
+    }
 }

dsk-operate-ui/src/assets/styles/public.css

@@ -1217,4 +1217,5 @@ select {
   }
 .enterprise_contatiner{
 	padding: 0;
+	padding-bottom: 16px;
 }
\ No newline at end of file

dsk-operate-ui/src/layout/index.vue

@@ -2,7 +2,7 @@
   <div :class="classObj" class="app-wrapper" :style="{'--current-color': theme}">
     <div v-if="device==='mobile'&&sidebar.opened" class="drawer-bg" @click="handleClickOutside"/>
     <sidebar v-if="!sidebar.hide" class="sidebar-container" @handleBar="handleSideBar" id="sidebar"/>
-    <div :class="{hasTagsView:needTagsView,sidebarHide:sidebar.hide,EnterpriseData:$route.name=='EnterpriseData'}" class="main-container">
+    <div :class="{hasTagsView:needTagsView,sidebarHide:sidebar.hide,EnterpriseData:$route.name=='Group'}" class="main-container">
       <div :class="{'fixed-header':fixedHeader}">
         <navbar :offsetWidth="offsetWidth"/>
       </div>
@@ -129,6 +129,6 @@ export default {
     width: 100%;
   }
   .EnterpriseData{
-    min-width: 1648px;
+    min-width: 1710px;
   }
 </style>

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

@@ -312,8 +312,8 @@ export default {
         anchorClick(i) {
             var a = document.getElementById('anchor-'+i)
             a.scrollIntoView()
-            document.body.scrollTop += -56
-            document.documentElement.scrollTop += -56
+            // document.body.scrollTop += -40
+            // document.documentElement.scrollTop += -40
             setTimeout(() => {
                 this.anchorIndex = i
             }, 1);
@@ -498,7 +498,7 @@ export default {
             background: #FFFFFF;
             border-radius: 4px 4px 4px 4px;
             padding: 16px;
-            max-height: 700px;
+            max-height: 848px;
             .anchor{
                 height: 24px;
             }

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

@@ -14,6 +14,8 @@
 			</div>
 			<p class="solid"></p>
 		</div>
+		<!-- 重点项目清单 -->
+		<MajorProject v-if="personnelHerf=='MajorProject'" />
 		<!-- 政府专项债 -->
 		<debtProject v-if="personnelHerf=='debtProject'" />
 		<!-- 土地交易 -->
@@ -41,15 +43,23 @@
 	import Tender from "./components/Tender/index.vue";
 	import BidRecord from "./components/BidRecord/index.vue";
 	import Bidding from "./components/Bidding/index.vue";
+	import MajorProject from "./components/MajorProject/index.vue";
 
 	import "@/assets/styles/public.css";
 	export default {
 		name: 'Radar',
-		components: { debtProject,Land,Establishment,bxprozbgg,Tender,BidRecord,Bidding },
+		components: { MajorProject,debtProject,Land,Establishment,bxprozbgg,Tender,BidRecord,Bidding },
 		data() {
 			return {
 				// tablist
-				personnelList: [{
+				personnelList: [
+					// {
+					// 	key: 'MajorProject',
+					// 	status: true,
+					// 	value: '重点项目清单',
+
+					// },
+					{
 						key: 'debtProject',
 						status: true,
 						value: '政府专项债项目',

dsk-system/src/main/java/com/dsk/system/domain/dsk/dto/JskCombineSearchDto.java

@@ -20,6 +20,10 @@ public class JskCombineSearchDto implements Serializable {
      */
     @NotNull(message = "集团id不能为空！")
     private String combineId;
+    /**
+     * 集团名称
+     */
+    private String combineName;
     /**
      * 筛选参数
      */

dsk-system/src/main/java/com/dsk/system/domain/dsk/vo/JskCombineBidProjectExportVo.java

+package com.dsk.system.domain.dsk.vo;
+
+import com.dsk.common.annotation.Excel;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * 集团中标业绩
+ * @author lcl
+ * @create 2023/8/28
+ */
+@Data
+public class JskCombineBidProjectExportVo implements Serializable {
+
+    @Excel(name = "序号",  width = 6)
+    private Integer id;
+
+    @Excel(name = "招标发布时间",  width = 15, dateFormat = "yyyy/MM/dd")
+    private Date bidTime;
+
+    @Excel(name = "招标成员",  width = 30)
+    private String companyName;
+
+    @Excel(name = "持股比例", suffix = "%" ,  width = 15)
+    private Double stockPercent;
+
+    @Excel(name = "成员等级",  width = 15)
+    private String memberLevel;
+
+    @Excel(name = "项目名称",  width = 50)
+    private String projectName;
+
+    @Excel(name = "预算金额" , suffix = "万元")
+    private Double bidAmount;
+
+    @Excel(name = "项目地区",  width = 20)
+    private String address;
+
+    @Excel(name = "招标采购分类",  width = 15)
+    private String bidType;
+
+    @Excel(name = "项目类型",  width = 15)
+    private String projectType;
+
+    @Excel(name = "代理单位",  width = 30)
+    private String projectUnit;
+
+
+
+
+
+}
+

dsk-system/src/main/java/com/dsk/system/domain/dsk/vo/JskCombineWinBidProjectExportVo.java

+package com.dsk.system.domain.dsk.vo;
+
+import com.dsk.common.annotation.Excel;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * 集团中标业绩
+ * @author lcl
+ * @create 2023/8/28
+ */
+@Data
+public class JskCombineWinBidProjectExportVo implements Serializable {
+
+    @Excel(name = "序号",  width = 6)
+    private Integer id;
+
+    @Excel(name = "中标时间",  width = 15, dateFormat = "yyyy/MM/dd")
+    private Date bidTime;
+
+    @Excel(name = "成员名称",  width = 30)
+    private String companyName;
+
+    @Excel(name = "持股比例", suffix = "%" ,  width = 15)
+    private Double stockPercent;
+
+    @Excel(name = "成员等级",  width = 15)
+    private String memberLevel;
+
+    @Excel(name = "项目名称",  width = 50)
+    private String projectName;
+
+    @Excel(name = "中标金额" , suffix = "万元")
+    private Double bidAmount;
+
+    @Excel(name = "中标地区",  width = 20)
+    private String address;
+
+    @Excel(name = "业绩类型",  width = 15)
+    private String boundType;
+
+    @Excel(name = "项目类型",  width = 15)
+    private String projectType;
+
+    @Excel(name = "业主单位",  width = 30)
+    private String projectUnit;
+
+
+
+
+
+}
+

dsk-system/src/main/java/com/dsk/system/dskService/JskCombineInfoService.java

 package com.dsk.system.dskService;
 
-import cn.hutool.core.bean.BeanException;
 import cn.hutool.core.bean.BeanUtil;
-import cn.hutool.core.util.ObjectUtil;
+import cn.hutool.core.map.MapUtil;
 import com.alibaba.fastjson2.JSONObject;
 import com.dsk.common.core.domain.AjaxResult;
 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.system.domain.dsk.dto.JskCombineCertificateDto;
 import com.dsk.system.domain.dsk.dto.JskCombineSearchDto;
+import com.dsk.system.domain.dsk.vo.JskCombineBidProjectExportVo;
+import com.dsk.system.domain.dsk.vo.JskCombineWinBidProjectExportVo;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections4.MapUtils;
-import org.apache.ibatis.util.MapUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.util.ObjectUtils;
 
 import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.List;
 import java.util.Map;
 
@@ -81,7 +81,7 @@ public class JskCombineInfoService {
         return dskOpenApiUtil.responsePage(map);
     }
 
-    public TableDataInfo menberCertificateList(JskCombineCertificateDto dto)throws Exception {
+    public TableDataInfo menberCertificateList(JskCombineCertificateDto dto) throws Exception {
         Map<String, Object> map = dskOpenApiUtil.requestBody("/operate/combine/member/certificateList", BeanUtil.beanToMap(dto, false, false));
 //        if (!ObjectUtils.isEmpty(map.get("data"))) {
 //            Map<String, Object> data = BeanUtil.beanToMap(map.get("data"));
@@ -141,4 +141,65 @@ public class JskCombineInfoService {
         Map<String, Object> map = dskOpenApiUtil.requestBody("/nationzj/enterprice/centralEnterprse/social/page", object);
         return BeanUtil.toBean(map, AjaxResult.class);
     }
+
+    public List<JskCombineWinBidProjectExportVo> exportWinBid(JskCombineSearchDto dto) {
+        if (ObjectUtils.isEmpty(dto.getPageSize())) throw new ServiceException("导出条数不能为空！");
+        if (dto.getPageSize() > 2000) dto.setPageSize(2000);
+
+        Map<String, Object> map = dskOpenApiUtil.requestBody("/operate/combine/businessList", 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("导出失败，系统错误！");
+
+        List<Map<String, Object>> list = (List<Map<String, Object>>) data.get("list");
+        if (ObjectUtils.isEmpty(list)) throw new ServiceException("导出失败，无数据导出！");
+        List<JskCombineWinBidProjectExportVo> result = new ArrayList<>();
+        for (int i = 0; i < list.size(); i++) {
+            JskCombineWinBidProjectExportVo vo = new JskCombineWinBidProjectExportVo();
+            vo.setId(i + 1);
+            vo.setBidTime(MapUtil.getDate(list.get(i),"bidTime"));
+            vo.setCompanyName(MapUtil.getStr(list.get(i),"companyName"));
+            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"));
+            vo.setProjectType(MapUtil.getStr(list.get(i),"projectType"));
+            vo.setProjectUnit(MapUtil.getStr(list.get(i),"projectUnit"));
+            result.add(vo);
+        }
+        return result;
+    }
+
+
+    public List<JskCombineBidProjectExportVo> exportBid(JskCombineSearchDto dto) {
+        if (ObjectUtils.isEmpty(dto.getPageSize())) throw new ServiceException("导出条数不能为空！");
+        if (dto.getPageSize() > 2000) dto.setPageSize(2000);
+
+        Map<String, Object> map = dskOpenApiUtil.requestBody("/operate/combine/businessList", 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("导出失败，系统错误！");
+
+        List<Map<String, Object>> list = (List<Map<String, Object>>) data.get("list");
+        if (ObjectUtils.isEmpty(list)) throw new ServiceException("导出失败，无数据导出！");
+        List<JskCombineBidProjectExportVo> result = new ArrayList<>();
+        for (int i = 0; i < list.size(); i++) {
+            JskCombineBidProjectExportVo vo = new JskCombineBidProjectExportVo();
+            vo.setId(i + 1);
+            vo.setBidTime(MapUtil.getDate(list.get(i),"bidTime"));
+            vo.setCompanyName(MapUtil.getStr(list.get(i),"companyName"));
+            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.setBidType(MapUtil.getStr(list.get(i),"boundType"));
+            vo.setProjectType(MapUtil.getStr(list.get(i),"projectType"));
+            vo.setProjectUnit(MapUtil.getStr(list.get(i),"projectUnit"));
+            result.add(vo);
+        }
+        return result;
+    }
 }