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

dsk-admin/src/main/java/com/dsk/web/controller/system/SysTenantController.java

@@ -84,7 +84,7 @@ public class SysTenantController extends BaseController {
     @PostMapping()
     public R<Void> add(@Validated(AddGroup.class) @RequestBody SysTenantBo bo) {
         if (!tenantService.checkCompanyNameUnique(bo)) {
-            return R.fail("新增租户'" + bo.getCompanyName() + "'失败，企业名称已存在");
+            return R.fail("新增企业'" + bo.getCompanyName() + "'失败，企业名称已存在");
         }
         return toAjax(TenantHelper.ignore(() -> tenantService.insertByBo(bo)));
     }
@@ -100,7 +100,7 @@ public class SysTenantController extends BaseController {
     public R<Void> edit(@Validated(EditGroup.class) @RequestBody SysTenantBo bo) {
         tenantService.checkTenantAllowed(bo.getTenantId());
         if (!tenantService.checkCompanyNameUnique(bo)) {
-            return R.fail("修改租户'" + bo.getCompanyName() + "'失败，公司名称已存在");
+            return R.fail("修改企业'" + bo.getCompanyName() + "'失败，公司名称已存在");
         }
         return toAjax(tenantService.updateByBo(bo));
     }
@@ -162,8 +162,8 @@ public class SysTenantController extends BaseController {
     @SaCheckPermission("system:tenant:edit")
     @Log(title = "租户", businessType = BusinessType.UPDATE)
     @GetMapping("/syncTenantPackage")
-    public R<Void> syncTenantPackage(@NotBlank(message = "租户ID不能为空") String tenantId,
-                                     @NotNull(message = "套餐ID不能为空") Long packageId) {
+    public R<Void> syncTenantPackage(@NotBlank(message = "企业ID不能为空") String tenantId,
+                                     @NotNull(message = "企业方案ID不能为空") Long packageId) {
         return toAjax(TenantHelper.ignore(() -> tenantService.syncTenantPackage(tenantId, packageId)));
     }
 

dsk-common/src/main/java/com/dsk/common/annotation/Excel.java

@@ -77,7 +77,7 @@ public @interface Excel
     /**
      * 当值为空时,字段的默认值
      */
-    public String defaultValue() default "";
+    public String defaultValue() default "-";
 
     /**
      * 提示信息

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

@@ -7,6 +7,7 @@ import cn.hutool.core.util.StrUtil;
 import lombok.AccessLevel;
 import lombok.NoArgsConstructor;
 import org.springframework.util.AntPathMatcher;
+import org.springframework.util.ObjectUtils;
 
 import java.util.*;
 import java.util.function.Function;
@@ -329,6 +330,7 @@ public class StringUtils extends org.apache.commons.lang3.StringUtils {
 
     //去除字符串标红
     public static String removeRed(String str) {
+        if(ObjectUtils.isEmpty(str)) return null;
         return str.replace("<font color='#FF204E'>" ,"").replace("</font>","");
     }
 }

dsk-module/dsk-biz-api/src/main/java/com/dsk/jsk/domain/vo/ImportantProjectExportVo.java

+package com.dsk.jsk.domain.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 ImportantProjectExportVo implements Serializable {
+
+    @Excel(name = "序号",  width = 6)
+    private Integer id;
+
+    @Excel(name = "项目类型",  width = 15)
+    private String buildingProjectType;
+
+    @Excel(name = "项目名称",  width = 40)
+    private String projectName;
+
+    @Excel(name = "主管部门",  width = 35)
+    private String chargeDepartment;
+
+    @Excel(name = "项目法人",  width = 35)
+    private String constructUnit;
+
+    @Excel(name = "项目投资额" , suffix = "万元")
+    private Double projectTotalInvestment;
+
+    @Excel(name = "项目地区",  width = 15)
+    private String domicile;
+
+    @Excel(name = "建设规模",  width = 50)
+    private String projectScale;
+
+    @Excel(name = "附件名称",  width = 30)
+    private String fileTitle;
+
+    @Excel(name = "附件链接",  width = 30)
+    private String fileUrl;
+
+}
+

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

@@ -177,9 +177,11 @@ public class JskCombineInfoService {
             if(ObjectUtils.isEmpty(dto.getKeys())){
                 vo.setTenderee(MapUtil.getStr(list.get(i),"tenderee"));
                 vo.setProjectName(MapUtil.getStr(list.get(i),"projectName"));
+                vo.setAgency(MapUtil.getStr(list.get(i),"agency"));
             }else {
                 vo.setTenderee(StringUtils.removeRed(MapUtil.getStr(list.get(i),"tenderee")));
                 vo.setProjectName(StringUtils.removeRed(MapUtil.getStr(list.get(i),"projectName")));
+                vo.setAgency(StringUtils.removeRed(MapUtil.getStr(list.get(i),"agency")));
             }
             vo.setStockPercent(MapUtil.getDouble(list.get(i),"stockPercent"));
             vo.setMemberLevel(MapUtil.getStr(list.get(i),"memberLevel"));
@@ -187,7 +189,7 @@ public class JskCombineInfoService {
             vo.setAddress(MapUtil.getStr(list.get(i),"address"));
             vo.setSubjectMatter(MapUtil.getStr(list.get(i),"subjectMatter"));
             vo.setProjectType(MapUtil.getStr(list.get(i),"projectType"));
-            vo.setAgency(MapUtil.getStr(list.get(i),"agency"));
+
             result.add(vo);
         }
         return result;

dsk-module/dsk-biz-api/src/main/java/com/dsk/search/controller/BusinessOpportunityRadarController.java

 package com.dsk.search.controller;
 
+import cn.dev33.satoken.annotation.SaCheckPermission;
 import com.alibaba.fastjson2.JSONObject;
+import com.dsk.biz.utils.ExcelUtils;
 import com.dsk.common.core.domain.AjaxResult;
+import com.dsk.common.utils.poi.ExcelUtil;
 import com.dsk.jsk.domain.bo.ComposeQueryDto;
+import com.dsk.jsk.domain.vo.ImportantProjectExportVo;
 import com.dsk.search.service.BusinessOpportunityRadarService;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.annotation.Resource;
+import javax.servlet.http.HttpServletResponse;
+import java.util.List;
 
 
 /**
@@ -157,4 +163,31 @@ public class BusinessOpportunityRadarController {
         }
         return opportunityRadarService.importantPage(object);
     }
+
+    /*
+     * 重点项目清单关联查询
+     */
+    @RequestMapping("/importantSelect")
+    public AjaxResult importantSelect(@RequestBody JSONObject object) {
+        return opportunityRadarService.importantSelect(object);
+    }
+    /*
+     * 重点项目清单筛选条件
+     */
+    @RequestMapping("/importantCondition")
+    public AjaxResult importantCondition() {
+        return opportunityRadarService.importantCondition();
+    }
+
+    /**
+     * 导出重点项目清单
+     */
+    @RequestMapping("/export/important")
+    @SaCheckPermission("radar:export:important")
+    public void exportBid(@RequestBody JSONObject object, HttpServletResponse response) {
+        List<ImportantProjectExportVo> list = opportunityRadarService.exportImportant(object);
+//        ExcelUtil<ImportantProjectExportVo> util = new ExcelUtil<>(ImportantProjectExportVo.class);
+        ExcelUtils<ImportantProjectExportVo> util = new ExcelUtils<>(ImportantProjectExportVo.class);
+        util.exportExcel(response, list, "重点项目", "重点项目导出明细", true);
+    }
 }

dsk-module/dsk-biz-api/src/main/java/com/dsk/search/service/BusinessOpportunityRadarService.java

 package com.dsk.search.service;
 
 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.exception.ServiceException;
 import com.dsk.common.utils.DskOpenApiUtil;
+import com.dsk.common.utils.StringUtils;
+import com.dsk.jsk.domain.vo.ImportantProjectExportVo;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.util.ArrayList;
 import java.util.HashMap;
+import java.util.List;
 import java.util.Map;
 
 /**
@@ -98,4 +105,59 @@ public class BusinessOpportunityRadarService {
         Map<String, Object> map = dskOpenApiUtil.requestBody("/nationzj/bondProject/importantPage", object);
         return BeanUtil.toBean(map, AjaxResult.class);
     }
+
+    public AjaxResult importantSelect(JSONObject object) {
+        Map<String, Object> map = dskOpenApiUtil.requestBody("/nationzj/bondProject/importantSelect", object);
+        return BeanUtil.toBean(map, AjaxResult.class);
+    }
+
+    public AjaxResult importantCondition() {
+        Map<String, Object> map = dskOpenApiUtil.requestBody("/nationzj/bondProject/importantCondition", null);
+        return BeanUtil.toBean(map, AjaxResult.class);
+    }
+
+    public List<ImportantProjectExportVo> exportImportant(JSONObject object) {
+        if (ObjectUtil.isEmpty(object.get("page"))) {
+            throw new ServiceException("导出条数不能为空！");
+        }
+        Map<String, Object> page = (Map<String,Object>)object.get("page");
+        if (null==page.get("limit")|| MapUtil.getInt(page,"limit")>2000){
+            page.put("limit",2000);
+        }
+        page.put("page",1);
+        object.put("page",page);
+
+        Map<String, Object> map = dskOpenApiUtil.requestBody("/nationzj/bondProject/importantPage",object);
+        if (ObjectUtil.isEmpty(map.get("data"))) throw new ServiceException("导出失败，系统错误！");
+        Map<String, Object> data = BeanUtil.beanToMap(map.get("data"));
+        if (ObjectUtil.isEmpty(data.get("list"))) throw new ServiceException("导出失败，系统错误！");
+
+        List<Map<String, Object>> list = (List<Map<String, Object>>) data.get("list");
+        if (ObjectUtil.isEmpty(list)) throw new ServiceException("导出失败，无数据导出！");
+        List<ImportantProjectExportVo> result = new ArrayList<>();
+        for (int i = 0; i < list.size(); i++) {
+            ImportantProjectExportVo vo = new ImportantProjectExportVo();
+            vo.setId(i + 1);
+            vo.setBuildingProjectType(MapUtil.getStr(list.get(i),"buildingProjectType"));
+            if (null!=list.get(i).get("projectName")){
+                vo.setProjectName(StringUtils.removeRed(MapUtil.getStr(list.get(i),"projectName")));
+            }
+            if (null!=list.get(i).get("chargeDepartment")){
+                vo.setChargeDepartment(StringUtils.removeRed(MapUtil.getStr(list.get(i),"chargeDepartment")));
+            }
+            if (null!=list.get(i).get("constructUnit")){
+                vo.setConstructUnit(StringUtils.removeRed(MapUtil.getStr(list.get(i),"constructUnit")));
+            }
+            if (null!=list.get(i).get("projectScale")){
+                vo.setProjectScale(StringUtils.removeRed(MapUtil.getStr(list.get(i),"projectScale")));
+            }
+            vo.setProjectTotalInvestment(MapUtil.getDouble(list.get(i),"projectTotalInvestment"));
+            vo.setDomicile(MapUtil.getStr(list.get(i),"domicile"));
+            vo.setFileTitle(MapUtil.getStr(list.get(i),"fileTitle"));
+            vo.setFileUrl(MapUtil.getStr(list.get(i),"fileUrl"));
+            result.add(vo);
+        }
+        return result;
+
+    }
 }

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

@@ -68,7 +68,8 @@ public class ISysTenantPackageServiceImpl implements ISysTenantPackageService {
     @Override
     public List<SysTenantPackageSelectVo> selectList() {
         LambdaQueryWrapper<SysTenantPackage> wrapper = new LambdaQueryWrapper<SysTenantPackage>()
-                .eq(SysTenantPackage::getStatus, TenantPackageConstants.NORMAL);
+                .eq(SysTenantPackage::getStatus, TenantPackageConstants.NORMAL)
+                .orderByDesc(SysTenantPackage::getCreateTime);
         List<SysTenantPackageVo> tenantPackageVo = baseMapper.selectVoList(wrapper);
         return BeanUtil.copyToList(tenantPackageVo, SysTenantPackageSelectVo.class);
     }