Merge remote-tracking branch 'origin/zuhuduan' into zuhuduan

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

@@ -34,7 +34,7 @@ public class BusinessFollowRecordController extends BaseController
      * 查询关联项目
      */
     @GetMapping("/relate/project/{userId}")
-    public R<List<BusinessListVo>> selectRelateProject(@PathVariable("userId") Integer userId)
+    public R<List<BusinessListVo>> selectRelateProject(@PathVariable("userId") Long userId)
     {
         return R.ok(businessFollowRecordService.selectRelateProject(userId));
     }
@@ -43,7 +43,7 @@ public class BusinessFollowRecordController extends BaseController
      * 查询关联业主企业
      */
     @GetMapping("/relate/company/{userId}")
-    public R<List<String>> selectRelateCompany(@PathVariable("userId") Integer userId)
+    public R<List<String>> selectRelateCompany(@PathVariable("userId") Long userId)
     {
         return R.ok(businessFollowRecordService.selectRelateCompany(userId));
     }

dsk-module/dsk-biz-api/src/main/java/com/dsk/biz/domain/BusinessFollowRecord.java

@@ -34,7 +34,7 @@ public class BusinessFollowRecord extends BaseEntity
     private Integer businessId;
 
     /** 用户id */
-    private Integer userId;
+    private Long userId;
 
     /** 用户昵称 */
     private String nickName;

dsk-module/dsk-biz-api/src/main/java/com/dsk/biz/domain/bo/BusinessExcelDto.java

 package com.dsk.biz.domain.bo;
 
+import com.dsk.common.annotation.Excel;
 import lombok.Data;
 
 /**
@@ -13,13 +14,16 @@ public class BusinessExcelDto {
     /**
      * 项目名称
      */
+    @Excel(name = "项目名称（必填）")
     private String projectName;
     /**
      * 投资估算（万元）
      */
+    @Excel(name = "投资估算（万元）")
     private String investmentAmount;
     /**
      * 业主单位
      */
+    @Excel(name = "业主单位（必填）")
     private String ownerCompany;
 }

dsk-module/dsk-biz-api/src/main/java/com/dsk/biz/mapper/BusinessFollowRecordMapper.java

@@ -27,14 +27,14 @@ public interface BusinessFollowRecordMapper
      * @param userId
      * @return
      */
-    List<BusinessListVo> selectRelateProject(Integer userId);
+    List<BusinessListVo> selectRelateProject(Long userId);
 
     /**
      * 查询关联业主企业
      * @param userId
      * @return
      */
-    List<String> selectRelateCompany(Integer userId);
+    List<String> selectRelateCompany(Long userId);
 
     /**
      * 查询项目跟进记录

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

@@ -63,14 +63,14 @@ public interface IBusinessFollowRecordService
      * @param userId
      * @return
      */
-    List<BusinessListVo> selectRelateProject(Integer userId);
+    List<BusinessListVo> selectRelateProject(Long userId);
 
     /**
      * 查询关联业主企业
      * @param userId
      * @return
      */
-    List<String> selectRelateCompany(Integer userId);
+    List<String> selectRelateCompany(Long userId);
 
     /**
      * 修改项目跟进记录

dsk-module/dsk-biz-api/src/main/java/com/dsk/biz/service/impl/BusinessFollowRecordServiceImpl.java

@@ -77,12 +77,12 @@ public class BusinessFollowRecordServiceImpl implements IBusinessFollowRecordSer
     }
 
     @Override
-    public List<BusinessListVo> selectRelateProject(Integer userId) {
+    public List<BusinessListVo> selectRelateProject(Long userId) {
         return businessFollowRecordMapper.selectRelateProject(userId);
     }
 
     @Override
-    public List<String> selectRelateCompany(Integer userId) {
+    public List<String> selectRelateCompany(Long userId) {
         return businessFollowRecordMapper.selectRelateCompany(userId);
     }
 

dsk-module/dsk-biz-api/src/main/java/com/dsk/biz/service/impl/BusinessInfoServiceImpl.java

@@ -11,6 +11,7 @@ import com.dsk.biz.domain.bo.BusinessExcelDto;
 import com.dsk.biz.domain.bo.BusinessListDto;
 import com.dsk.biz.domain.bo.CustomerBusinessSearchDto;
 import com.dsk.biz.domain.vo.*;
+import com.dsk.biz.utils.ExcelUtils;
 import com.dsk.common.annotation.DataColumn;
 import com.dsk.common.annotation.DataPermission;
 import com.dsk.jsk.service.EnterpriseService;
@@ -185,7 +186,13 @@ public class BusinessInfoServiceImpl implements IBusinessInfoService {
         int rowSuccess = 0;//成功条数
         Integer errorCount = 0;//失败条数
         List<String> result = new LinkedList();//导入结果汇总
-        List<BusinessExcelDto> businessInfoList = readBusinessInfoExcel.getExcelInfo(file);
+        List<BusinessExcelDto> businessInfoList = null;
+        try {
+           businessInfoList = new ExcelUtils<>(BusinessExcelDto.class).importExcel(file.getInputStream(), 2);
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+//        List<BusinessExcelDto> businessInfoList = readBusinessInfoExcel.getExcelInfo(file);
         if (CollectionUtil.isEmpty(businessInfoList)) return AjaxResult.error("文档中无项目信息,请按照模板文档格式上传");
         for (BusinessExcelDto businessInfo : businessInfoList) {
             //查询已有的项目名称

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

@@ -72,7 +72,7 @@ public class SysMenuServiceImpl implements ISysMenuService {
             QueryWrapper<SysMenu> wrapper = Wrappers.query();
             wrapper.eq("sur.user_id", userId)
                     .like(StringUtils.isNotBlank(menu.getMenuName()), "m.menu_name", menu.getMenuName())
-                    .eq("m.visible", 0)
+                    //.eq("m.visible", 0)
                     .eq("m.status", 0)
                     .orderByAsc("m.parent_id")
                     .orderByAsc("m.order_num");