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

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

@@ -6,6 +6,7 @@ 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.system.domain.dsk.dto.JskCombineBidPageDto;
 import com.dsk.common.utils.poi.ExcelUtil;
 import com.dsk.system.domain.dsk.dto.JskCombineCertificateDto;
 import com.dsk.system.domain.dsk.dto.JskCombineSearchDto;
@@ -167,9 +168,18 @@ public class JskCombineInfoController extends BaseController {
      */
     @PostMapping("/export/bid")
     @PreAuthorize("@ss.hasPermi('combine:info:export:bid')")
-    public void exportBid(@RequestBody JskCombineSearchDto dto, HttpServletResponse response) {
+    public void exportBid(@RequestBody JskCombineBidPageDto dto, HttpServletResponse response) {
         List<JskCombineBidProjectExportVo> list = baseService.exportBid(dto);
         ExcelUtil<JskCombineBidProjectExportVo> util = new ExcelUtil<>(JskCombineBidProjectExportVo.class);
         util.exportExcel(response, list, "集团招标", dto.getCombineName().concat("招标公告清单"), true);
     }
+
+
+    /**
+     *  集团招标分页列表
+     */
+    @PostMapping("/bidPage")
+    public TableDataInfo bidPage(@RequestBody JskCombineBidPageDto dto) throws Exception {
+        return baseService.bidPage(dto);
+    }
 }

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

@@ -145,4 +145,16 @@ public class BusinessOpportunityRadarController {
     public AjaxResult bidSourceList(@RequestBody JSONObject object) {
         return opportunityRadarService.bidSourceList(object);
     }
+
+    /*
+     * 重点项目清单
+     */
+    @RequestMapping("/importantPage")
+    public AjaxResult importantPage(@RequestBody JSONObject object) {
+        ComposeQueryDto compose = JSONObject.parseObject(object.toJSONString(), ComposeQueryDto.class);
+        if (PageQueryLimit.pageLimit(compose.getPage())){
+            return AjaxResult.error("翻页已达到上限");
+        }
+        return opportunityRadarService.importantPage(object);
+    }
 }

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

+package com.dsk.system.domain.dsk.dto;
+
+import com.dsk.common.core.domain.model.BasePage;
+import lombok.Data;
+
+import javax.validation.constraints.NotNull;
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * 集团户相关查询条件实体类
+ *
+ * @author Dgm
+ * @create 2023/8/7
+ */
+@Data
+public class JskCombineBidPageDto extends BasePage implements Serializable {
+    /**
+     * 集团id
+     */
+    @NotNull(message = "集团id不能为空！")
+    private String combineId;
+    /**
+     * 集团名称
+     */
+    private String combineName;
+    /**
+     * 筛选参数
+     */
+    private String keys;
+    /**
+     * 集团层级
+     */
+    private List<String> combineMemberLevels;
+    /**
+     * 省id
+     */
+    private List<Integer> provinceIds;
+    /**
+     * 市id
+     */
+    private List<Integer> cityIds;
+    /**
+     * 区id
+     */
+    private List<Integer> areaIds;
+    /**
+     * 最大金额
+     */
+    private Integer maxAmount;
+    /**
+     * 最小金额
+     */
+    private Integer minAmount;
+    /**
+     * 业务类型
+     */
+    private String businessType;
+    /**
+     * 科技型企业类型
+     */
+    private List<String> companyTypes;
+    /**
+     * 企业类型
+     */
+    private String companyType;
+    /**
+     * 最大持股比例
+     */
+    private Double maxStockPercent;
+    /**
+     * 最小持股比例
+     */
+    private Double minStockPercent;
+    /**
+     * 时间（开始）
+     */
+    private String startTime;
+    /**
+     * 时间（结束）
+     */
+    private String endTime;
+    /**
+     * 招采类型
+     */
+    private List<String> subjectMatters;
+    /**
+     * 项目类型
+     */
+    private List<String> projectTypes;
+
+}

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

@@ -18,10 +18,10 @@ public class JskCombineBidProjectExportVo implements Serializable {
     private Integer id;
 
     @Excel(name = "招标发布时间",  width = 15, dateFormat = "yyyy/MM/dd")
-    private Date bidTime;
+    private Date issueTime;
 
     @Excel(name = "招标成员",  width = 30)
-    private String companyName;
+    private String tenderee;
 
     @Excel(name = "持股比例", suffix = "%" ,  width = 15)
     private Double stockPercent;
@@ -39,13 +39,13 @@ public class JskCombineBidProjectExportVo implements Serializable {
     private String address;
 
     @Excel(name = "招标采购分类",  width = 15)
-    private String bidType;
+    private String subjectMatter;
 
     @Excel(name = "项目类型",  width = 15)
     private String projectType;
 
     @Excel(name = "代理单位",  width = 30)
-    private String projectUnit;
+    private String agency;
 
 
 

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

@@ -2,12 +2,14 @@ package com.dsk.system.dskService;
 
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.map.MapUtil;
+import cn.hutool.core.util.ObjectUtil;
 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.JskCombineBidPageDto;
 import com.dsk.system.domain.dsk.dto.JskCombineCertificateDto;
 import com.dsk.system.domain.dsk.dto.JskCombineSearchDto;
 import com.dsk.system.domain.dsk.vo.JskCombineBidProjectExportVo;
@@ -173,11 +175,11 @@ public class JskCombineInfoService {
     }
 
 
-    public List<JskCombineBidProjectExportVo> exportBid(JskCombineSearchDto dto) {
+    public List<JskCombineBidProjectExportVo> exportBid(JskCombineBidPageDto 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));
+        Map<String, Object> map = dskOpenApiUtil.requestBody("/operate/combine/bidPage", 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("导出失败，系统错误！");
@@ -188,18 +190,39 @@ public class JskCombineInfoService {
         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.setIssueTime(MapUtil.getDate(list.get(i),"issueTime"));
+            vo.setTenderee(MapUtil.getStr(list.get(i),"tenderee"));
             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.setSubjectMatter(MapUtil.getStr(list.get(i),"subjectMatter"));
             vo.setProjectType(MapUtil.getStr(list.get(i),"projectType"));
-            vo.setProjectUnit(MapUtil.getStr(list.get(i),"projectUnit"));
+            vo.setAgency(MapUtil.getStr(list.get(i),"agency"));
             result.add(vo);
         }
         return result;
     }
+
+    public TableDataInfo bidPage(JskCombineBidPageDto dto) throws Exception {
+        Map<String, Object> map = dskOpenApiUtil.requestBody("/operate/combine/bidPage", BeanUtil.beanToMap(dto, false, false));
+        if (ObjectUtil.isNotEmpty(map.get("data"))) {
+            Map<String, Object> data = BeanUtil.beanToMap(map.get("data"));
+            if (!ObjectUtils.isEmpty(data.get("list"))) {
+                List<Map<String, Object>> list = (List<Map<String, Object>>) data.get("list");
+                list.parallelStream().forEach(res -> {
+                    //招标企业
+                    Integer tendereeId = MapUtils.getInteger(res, "tendereeId");
+                    String tenderee = MapUtils.getString(res, "tenderee");
+                    // 代理机构名称
+                    Integer agencyId = MapUtils.getInteger(res, "agencyId");
+                    String agency = MapUtils.getString(res, "agency");
+                    res.put("tendereeUipId", enterpriseService.getUipIdByCompanyNameOrCompanyId(tenderee, tendereeId));
+                    res.put("agencyUipId", enterpriseService.getUipIdByCompanyNameOrCompanyId(agency, agencyId));
+                });
+            }
+        }
+        return dskOpenApiUtil.responsePage(map);
+    }
 }

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

@@ -92,4 +92,10 @@ public class BusinessOpportunityRadarService {
         Map<String, Object> map = dskOpenApiUtil.requestBody("/nationzj/jskBid/source", object);
         return BeanUtil.toBean(map, AjaxResult.class);
     }
+
+
+    public AjaxResult importantPage(JSONObject object) {
+        Map<String, Object> map = dskOpenApiUtil.requestBody("/nationzj/bondProject/importantPage", object);
+        return BeanUtil.toBean(map, AjaxResult.class);
+    }
 }