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/SysMenuController.java

 package com.dsk.web.controller.system;
 
 import cn.dev33.satoken.annotation.SaCheckPermission;
+import cn.dev33.satoken.annotation.SaCheckRole;
 import cn.hutool.core.lang.tree.Tree;
 import com.dsk.common.annotation.Log;
+import com.dsk.common.constant.TenantConstants;
 import com.dsk.common.constant.UserConstants;
 import com.dsk.common.core.controller.BaseController;
 import com.dsk.common.core.domain.R;
@@ -61,6 +63,17 @@ public class SysMenuController extends BaseController {
         return R.ok(menuService.buildMenuTreeSelect(menus));
     }
 
+    /**
+     * 获取企业方案菜单下拉树列表
+     * 剔除"企业管理"相关菜单
+     */
+    @SaCheckRole(TenantConstants.SUPER_ADMIN_ROLE_KEY)
+    @GetMapping("/tenantPackageTreeSelect")
+    public R<List<Tree<Long>>> tenantPackageTreeSelect(SysMenu menu) {
+        List<SysMenu> menus = menuService.selectTenantPackageMenuList(menu, getUserId());
+        return R.ok(menuService.buildMenuTreeSelect(menus));
+    }
+
     /**
      * 加载对应角色菜单列表树
      *

dsk-admin/src/main/resources/application.yml

@@ -99,6 +99,8 @@ spring:
     deserialization:
       # 允许对象忽略json中不存在的属性
       fail_on_unknown_properties: false
+  main:
+    allow-circular-references: true
 
 # Sa-Token配置
 sa-token:

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

+package com.dsk.common.utils;
+
+import java.math.BigDecimal;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+/**
+ * 邮箱和手机号验证
+ */
+public class CheckUtils {
+
+    public static final String REG_Moblie = "^((13[0-9])|(14(0|[5-7]|9))|(15([0-3]|[5-9]))|(16(2|[5-7]))|(17[0-8])|(18[0-9])|(19([0-3]|[5-9])))\\d{8}$";//手机号
+    public static final String REG_Landline = "(\\(\\d{3,4}\\)|\\d{3,4}-|\\s)?\\d{8}";//座机号
+
+    public static final String REG_EMAIL = "[a-zA-Z0-9]+@[a-zA-Z0-9]+\\.[a-zA-Z0-9]+";
+
+    /**
+     * 校验email
+     * @param email
+     * @return
+     */
+    public static boolean isEmail(String email){
+        if (email == null){
+            return false;
+        }else {
+            boolean isMatch = Pattern.matches(REG_EMAIL,email);
+            return isMatch;
+        }
+    }
+
+    /**
+     * 校验手机号
+     * @param phone
+     * @return
+     */
+    public static boolean isPhone(String phone){
+        if (phone == null){
+            return false;
+        }else {
+            Pattern mobilePattern = Pattern.compile(REG_Moblie);
+            Pattern landlinePattern = Pattern.compile(REG_Landline);
+            Matcher mobileMatcher = mobilePattern.matcher(phone);
+            Matcher landlineMatcher = landlinePattern.matcher(phone);
+            return mobileMatcher.matches() || landlineMatcher.matches();
+        }
+
+    }
+
+    /**
+     * Double小数点前的位数
+     * @param number
+     * @return
+     */
+    public static int checkIntegerPlaces(Double number) {
+        BigDecimal bigDecimal = new BigDecimal(String.valueOf(number));
+        String strNumber = bigDecimal.toString();
+        int integerPlaces = strNumber.indexOf('.');
+        if (integerPlaces == -1) {
+            return strNumber.length();
+        } else {
+            return integerPlaces;
+        }
+    }
+
+    /**
+     * Double小数点后的位数
+     * @param number
+     * @return
+     */
+    public static int checkDecimalPlaces(Double number) {
+        BigDecimal bigDecimal = new BigDecimal(String.valueOf(number));
+        String strNumber = bigDecimal.toString();
+        int decimalPlaces = 0;
+        int index = strNumber.indexOf('.');
+        if (index != -1) {
+            decimalPlaces = strNumber.length() - index - 1;
+        }
+        return decimalPlaces;
+    }
+}

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

+package com.dsk.biz.controller;
+
+import com.dsk.biz.domain.BusinessBacklog;
+import com.dsk.biz.domain.bo.BusinessBacklogListDto;
+import com.dsk.biz.domain.vo.BusinessBacklogListVo;
+import com.dsk.biz.service.IBusinessBacklogService;
+import com.dsk.common.core.controller.BaseController;
+import com.dsk.common.core.domain.AjaxResult;
+import com.dsk.common.core.domain.PageQuery;
+import com.dsk.common.core.domain.R;
+import com.dsk.common.core.page.TableDataInfo;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+/**
+ * 项目工作待办Controller
+ *
+ * @author lxl
+ * @date 2023-05-17
+ */
+@RestController
+@RequestMapping("/business/backlog")
+@Slf4j
+public class BusinessBacklogController extends BaseController
+{
+    @Autowired
+    private IBusinessBacklogService businessBacklogService;
+
+    /**
+     * 分页查询项目工作待办列表
+     */
+//    @PreAuthorize("@ss.hasPermi('system:backlog:list')")
+    @GetMapping("/list")
+    public TableDataInfo<BusinessBacklogListVo> list(BusinessBacklogListDto dto, PageQuery pageQuery)
+    {
+        return businessBacklogService.selectBusinessBacklogList(dto, pageQuery);
+    }
+
+    /**
+     * 新增项目工作待办
+     */
+//    @PreAuthorize("@ss.hasPermi('system:backlog:add')")
+//    @Log(title = "项目工作待办", businessType = BusinessType.INSERT)
+    @PostMapping("/add")
+    public R<Void> add(@RequestBody BusinessBacklog businessBacklog)
+    {
+        return toAjax(businessBacklogService.insertBusinessBacklog(businessBacklog));
+    }
+
+    /**
+     * 修改项目工作待办
+     */
+//    @PreAuthorize("@ss.hasPermi('system:backlog:edit')")
+//    @Log(title = "项目工作待办", businessType = BusinessType.UPDATE)
+    @PostMapping("/edit")
+    public R<Void> edit(@RequestBody BusinessBacklog businessBacklog)
+    {
+        return toAjax(businessBacklogService.updateBusinessBacklog(businessBacklog));
+    }
+
+    /**
+     * 获取项目工作代办逾期数量
+     */
+    @GetMapping("/overdue/count/{businessId}")
+    public R<Integer> overdueCount(@PathVariable Integer businessId)
+    {
+        return R.ok(businessBacklogService.overdueCount(businessId));
+    }
+}

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

+package com.dsk.biz.controller;
+
+import com.dsk.biz.domain.bo.BusinessIdDto;
+import com.dsk.biz.domain.vo.BusinessFileVo;
+import com.dsk.common.core.controller.BaseController;
+import com.dsk.common.core.domain.AjaxResult;
+import com.dsk.common.core.page.TableDataInfo;
+import com.dsk.common.utils.StringUtils;
+import com.dsk.common.utils.file.FileUtils;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.io.File;
+import java.io.IOException;
+import java.util.Comparator;
+import java.util.List;
+import java.util.stream.Collectors;
+
+/**
+ * @author lxl
+ * @Description: 项目文件管理Controller
+ * @Date 2023/5/30 上午 8:44
+ **/
+@Slf4j
+@RestController
+@RequestMapping("/business/file")
+public class BusinessFileController extends BaseController {
+
+//    @Autowired
+//    private ServerConfig serverConfig;
+//
+//    /**
+//     * 新建文件夹
+//     */
+////    @PreAuthorize("@ss.hasPermi('system:file:add')")
+////    @Log(title = "项目资料文档", businessType = BusinessType.INSERT)
+//    @PostMapping("/new")
+//    public AjaxResult newFolder(@RequestBody(required=false) BusinessIdDto filePath) {
+//        return FileUtils.newFolder(filePath.getFilePath()) ? AjaxResult.success() : AjaxResult.error();
+//    }
+//
+//    /**
+//     * 删除某个文件或整个文件夹
+//     */
+//    @PostMapping("/remove")
+//    public AjaxResult removeFile(@RequestBody(required=false) BusinessIdDto filePath) {
+//        return FileUtils.delFolder(filePath.getFilePath()) ? AjaxResult.success() : AjaxResult.error();
+//    }
+//
+//    /**
+//     * 分页查询项目的所有文件
+//     * 获取文件夹中所有文件
+//     */
+//    @GetMapping(value = "/list")
+//    public TableDataInfo getAllFiles(BusinessIdDto filePath) {
+//        startPage();
+//        List<BusinessFileVo> allFiles;
+//        if(StringUtils.isNumeric(filePath.getFilePath())) filePath.setFilePath(ShuZhiHuaConfig.getProfile() + filePath.getFilePath());
+//        allFiles = FileUtils.getAllFiles(filePath.getFilePath());
+//        //模糊查询文件
+//        if(StringUtils.isNotEmpty(filePath.getKeyword())){
+//            List<BusinessFileVo> allFileName = FileUtils.getAllFileNames(filePath.getFilePath());
+//            allFiles = allFileName.stream().filter(p -> p.getFilePath().contains(filePath.getKeyword())).collect(Collectors.toList());
+//        }
+//        //文件按照时间倒序
+//        allFiles = allFiles.stream().sorted(Comparator.comparing(BusinessFileVo::getCreatTime).reversed()).collect(Collectors.toList());
+//        return getDataTable(allFiles);
+//    }
+//
+//    /**
+//     * 上传文件及文件夹
+//     * @param file 文件流
+//     * @param request 请求头参数
+//     * @return
+//     */
+//    @PostMapping("/upload")
+//    public AjaxResult uploadFolder(@RequestPart("file") MultipartFile file, HttpServletRequest request) {
+//        try {
+//            //获取文件名
+//            String filename = file.getOriginalFilename();
+//            String businessFileName = request.getHeader("FilePath");
+//            // 上传文件路径
+//            String filePath = ShuZhiHuaConfig.getUploadPath() + businessFileName + "/";
+//
+//            //校验是否上传同名文件
+//            File newFile = new File(filePath);
+//            if (newFile.exists()) {
+//                // 获取当前目录下的文件和文件夹
+//                File[] files = newFile.listFiles();
+//                for (File allFile : files) {
+//                    if (filename.equals(allFile.getName())) return error("文件已存在");
+//                }
+//            }
+//
+//            // 上传并返回文件全路径
+//            String fileName = FileUploadUtils.upload(filePath, file);
+////            String url = serverConfig.getUrl() + fileName;
+//            AjaxResult ajax = AjaxResult.success();
+//            ajax.put("url", fileName);
+//            return ajax;
+//        } catch (IOException e) {
+//            return AjaxResult.error(e.getMessage());
+//        }
+//    }
+//
+//    /**
+//     * 下载文件
+//     * @param filePath 要下载的文件路径
+//     * @param response 返回的响应
+//     */
+//    @PostMapping("/download")
+//    public void downloadFolder(@RequestBody BusinessIdDto filePath, HttpServletResponse response) {
+//        FileUtils.downloadByFilePath(filePath.getFilePath(),response);
+//    }
+}

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

+package com.dsk.biz.controller;
+
+import com.dsk.biz.domain.BusinessFollowRecord;
+import com.dsk.biz.domain.bo.BusinessIdDto;
+import com.dsk.biz.domain.bo.BusinessListDto;
+import com.dsk.biz.domain.vo.BusinessListVo;
+import com.dsk.biz.service.IBusinessFollowRecordService;
+import com.dsk.common.core.controller.BaseController;
+import com.dsk.common.core.domain.AjaxResult;
+import com.dsk.common.core.domain.PageQuery;
+import com.dsk.common.core.domain.R;
+import com.dsk.common.core.page.TableDataInfo;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+/**
+ * 项目跟进记录Controller
+ *
+ * @author lxl
+ * @date 2023-05-17
+ */
+@RestController
+@RequestMapping("/business/record")
+public class BusinessFollowRecordController extends BaseController
+{
+    @Autowired
+    private IBusinessFollowRecordService businessFollowRecordService;
+
+
+
+    /**
+     * 查询关联项目
+     */
+    @GetMapping("/relate/project/{userId}")
+    public R<List<BusinessListVo>> selectRelateProject(@PathVariable("userId") Integer userId)
+    {
+        return R.ok(businessFollowRecordService.selectRelateProject(userId));
+    }
+
+    /**
+     * 查询关联业主企业
+     */
+    @GetMapping("/relate/company/{userId}")
+    public R<List<String>> selectRelateCompany(@PathVariable("userId") Integer userId)
+    {
+        return R.ok(businessFollowRecordService.selectRelateCompany(userId));
+    }
+
+    /**
+     * 新增项目跟进记录
+     */
+//    @PreAuthorize("@ss.hasPermi('system:record:add')")
+//    @Log(title = "项目跟进记录", businessType = BusinessType.INSERT)
+    @PostMapping("/add")
+    public R<Void> add(@RequestBody BusinessFollowRecord businessFollowRecord)
+    {
+        return toAjax(businessFollowRecordService.insertBusinessFollowRecord(businessFollowRecord));
+    }
+
+    /**
+     * 分页查询项目跟进记录
+     */
+//    @PreAuthorize("@ss.hasPermi('system:record:list')")
+    @GetMapping("/list")
+    public TableDataInfo<BusinessFollowRecord> list(BusinessIdDto dto, PageQuery pageQuery)
+    {
+        return businessFollowRecordService.selectBusinessFollowRecordList(dto, pageQuery);
+    }
+
+    /**
+     * 删除项目跟进记录
+     */
+//    @PreAuthorize("@ss.hasPermi('system:record:remove')")
+//    @Log(title = "项目跟进记录", businessType = BusinessType.DELETE)
+	@DeleteMapping("remove/{ids}")
+    public R<Void> remove(@PathVariable(value = "ids",required=false) Long[] ids)
+    {
+        return toAjax(businessFollowRecordService.deleteBusinessFollowRecordByIds(ids));
+    }
+
+    /**
+     * 分页查询跟进动态
+     */
+//    @PreAuthorize("@ss.hasPermi('system:record:list')")
+    @GetMapping("all/list")
+    public TableDataInfo<BusinessFollowRecord> allFollow(BusinessListDto dto, PageQuery pageQuery)
+    {
+        return businessFollowRecordService.allFollow(dto, pageQuery);
+    }
+
+
+}

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

-//package com.dsk.biz.controller;
-//
-//import com.dsk.biz.domain.BusinessInfo;
-//import com.dsk.biz.domain.bo.BusinessListDto;
-//import com.dsk.common.core.controller.BaseController;
-//import com.dsk.common.core.domain.AjaxResult;
-//import com.dsk.common.core.page.TableDataInfo;
-//import com.dsk.system.domain.business.dto.BusinessAddDto;
-//import com.dsk.system.domain.business.dto.BusinessListDto;
-//import com.dsk.system.service.IBusinessInfoService;
-//import org.springframework.beans.factory.annotation.Autowired;
-//import org.springframework.web.bind.annotation.*;
-//import org.springframework.web.multipart.MultipartFile;
-//
-///**
-// * 项目详情Controller
-// *
-// * @author lxl
-// * @date 2023-05-17
-// */
-//@RestController
-//@RequestMapping("/business/info")
-//public class BusinessInfoController extends BaseController
-//{
-//    @Autowired
-//    private IBusinessInfoService businessInfoService;
-//
-////    /**
-////     * 项目批量导入
-////     */
-////    @PostMapping("/upload")
-//////    public AjaxResult batchUpload(@RequestPart("file") MultipartFile file, HttpServletRequest request, HttpServletResponse response){
-////    public AjaxResult batchUpload(@RequestPart("file") MultipartFile file){
-////         return businessInfoService.batchUpload(file);
-////    }
-////
-////    /**
-////     * 查询所有项目名称(支持模糊查询)
-////     */
-////    @PostMapping("/query/project")
-////    public AjaxResult queryprojectName(@RequestBody BusinessListDto dto){
-////        return AjaxResult.success(businessInfoService.selectProjectName(dto));
-////    }
-//
-//    /**
-//     * 分页查询项目列表
-//     */
-////    @PreAuthorize("@ss.hasPermi('system:business:list')")
-//    @GetMapping("/list")
-//    public TableDataInfo list(BusinessListDto dto)
-//    {
-//        return businessInfoService.selectBusinessInfoList(dto);
-//    }
-//
-//    /**
-//     * 查询项目速览
-//     */
-////    @PreAuthorize("@ss.hasPermi('system:business:query')")
-//    @GetMapping("/browse/{businessId}")
-//    public AjaxResult browse(@PathVariable("businessId") Integer businessId)
-//    {
-//        return success(businessInfoService.browse(businessId));
-//    }
-//
-//    /**
-//     * 获取项目建设内容
-//     */
-////    @PreAuthorize("@ss.hasPermi('system:business:query')")
-//    @GetMapping(value = "/construction/{id}")
-//    public AjaxResult getConstruction(@PathVariable("id") Integer id)
-//    {
-//        return success(businessInfoService.getConstruction(id));
-//    }
-//
-//    /**
-//     * 删除项目列表
-//     */
-////    @PreAuthorize("@ss.hasPermi('system:business:remove')")
-////    @Log(title = "项目管理", businessType = BusinessType.DELETE)
-//    @DeleteMapping("/remove/{ids}")
-//    public AjaxResult remove(@PathVariable(value = "ids",required=false) Long[] ids)
-//    {
-//        return toAjax(businessInfoService.deleteBusinessInfoByIds(ids));
-//    }
-//
-////    /**
-////     * 新增项目详情
-////     */
-//////    @PreAuthorize("@ss.hasPermi('system:business:add')")Z
-//////    @Log(title = "项目管理", businessType = BusinessType.INSERT)
-////    @PostMapping("/add")
-////    public AjaxResult add(@RequestBody BusinessAddDto dto)
-////    {
-////        return businessInfoService.insertBusinessInfo(dto);
-////    }
-////
-////    /**
-////     * 修改项目详情
-////     */
-//////    @PreAuthorize("@ss.hasPermi('system:business:edit')")
-//////    @Log(title = "项目管理", businessType = BusinessType.UPDATE)
-////    @PostMapping("/edit")
-////    public AjaxResult edit(@RequestBody BusinessInfo businessInfo)
-////    {
-////        return toAjax(businessInfoService.updateBusinessInfo(businessInfo));
-////    }
-//
-////    /**
-////     * 获取项目详情详细信息
-////     */
-////    @PreAuthorize("@ss.hasPermi('system:info:query')")
-////    @GetMapping(value = "/{id}")
-////    public AjaxResult getInfo(@PathVariable("id") Integer id)
-////    {
-////        return success(businessInfoService.selectBusinessInfoById(id));
-////    }
-//
-////    /**
-////     * 导出项目详情列表
-////     */
-////    @PreAuthorize("@ss.hasPermi('system:info:export')")
-////    @Log(title = "项目详情", businessType = BusinessType.EXPORT)
-////    @PostMapping("/export")
-////    public void export(HttpServletResponse response, BusinessInfo businessInfo)
-////    {
-////        List<BusinessInfo> list = businessInfoService.selectBusinessInfoList(businessInfo);
-////        ExcelUtil<BusinessInfo> util = new ExcelUtil<BusinessInfo>(BusinessInfo.class);
-////        util.exportExcel(response, list, "项目详情数据");
-////    }
-//
-//}
+package com.dsk.biz.controller;
+
+import com.dsk.biz.domain.BusinessInfo;
+import com.dsk.biz.domain.bo.BusinessAddDto;
+import com.dsk.biz.domain.bo.BusinessListDto;
+import com.dsk.biz.domain.vo.BusinessBrowseVo;
+import com.dsk.biz.domain.vo.BusinessLikeProjectNameListVo;
+import com.dsk.biz.domain.vo.BusinessListVo;
+import com.dsk.biz.service.IBusinessInfoService;
+import com.dsk.common.core.controller.BaseController;
+import com.dsk.common.core.domain.AjaxResult;
+import com.dsk.common.core.domain.PageQuery;
+import com.dsk.common.core.domain.R;
+import com.dsk.common.core.page.TableDataInfo;
+import com.dsk.common.enums.BusinessType;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
+
+import javax.servlet.http.HttpServletResponse;
+import java.util.List;
+
+/**
+ * 项目详情Controller
+ *
+ * @author lxl
+ * @date 2023-05-17
+ */
+@RestController
+@RequestMapping("/business/info")
+public class BusinessInfoController extends BaseController
+{
+    @Autowired
+    private IBusinessInfoService businessInfoService;
+
+    /**
+     * 项目批量导入
+     */
+    @PostMapping("/upload")
+//    public AjaxResult batchUpload(@RequestPart("file") MultipartFile file, HttpServletRequest request, HttpServletResponse response){
+    public AjaxResult batchUpload(@RequestPart("file") MultipartFile file){
+         return businessInfoService.batchUpload(file);
+    }
+
+    /**
+     * 查询所有项目名称(支持模糊查询)
+     */
+    @PostMapping("/query/project")
+    public R<List<BusinessLikeProjectNameListVo>> queryprojectName(@RequestBody BusinessListDto dto){
+        return R.ok(businessInfoService.selectProjectName(dto));
+    }
+
+    /**
+     * 分页查询项目列表
+     */
+//    @PreAuthorize("@ss.hasPermi('system:business:list')")
+    @GetMapping("/list")
+    public TableDataInfo<BusinessListVo> list(BusinessListDto dto, PageQuery pageQuery)
+    {
+        return businessInfoService.selectBusinessInfoList(dto, pageQuery);
+    }
+
+    /**
+     * 查询项目速览
+     */
+//    @PreAuthorize("@ss.hasPermi('system:business:query')")
+    @GetMapping("/browse/{businessId}")
+    public R<BusinessBrowseVo> browse(@PathVariable("businessId") Integer businessId)
+    {
+        return R.ok(businessInfoService.browse(businessId));
+    }
+
+    /**
+     * 获取项目建设内容
+     */
+//    @PreAuthorize("@ss.hasPermi('system:business:query')")
+    @GetMapping(value = "/construction/{id}")
+    public R<BusinessInfo> getConstruction(@PathVariable("id") Integer id)
+    {
+        return R.ok(businessInfoService.getConstruction(id));
+    }
+
+    /**
+     * 删除项目列表
+     */
+//    @PreAuthorize("@ss.hasPermi('system:business:remove')")
+//    @Log(title = "项目管理", businessType = BusinessType.DELETE)
+    @DeleteMapping("/remove/{ids}")
+    public R<Void> remove(@PathVariable(value = "ids",required=false) Long[] ids)
+    {
+        return toAjax(businessInfoService.deleteBusinessInfoByIds(ids));
+    }
+
+    /**
+     * 新增项目详情
+     */
+//    @PreAuthorize("@ss.hasPermi('system:business:add')")Z
+//    @Log(title = "项目管理", businessType = BusinessType.INSERT)
+    @PostMapping("/add")
+    public R<Void> add(@RequestBody BusinessAddDto dto)
+    {
+        return toAjax(businessInfoService.insertBusinessInfo(dto));
+    }
+
+    /**
+     * 修改项目详情
+     */
+//    @PreAuthorize("@ss.hasPermi('system:business:edit')")
+//    @Log(title = "项目管理", businessType = BusinessType.UPDATE)
+    @PostMapping("/edit")
+    public R<Void> edit(@RequestBody BusinessInfo businessInfo)
+    {
+        return toAjax(businessInfoService.updateBusinessInfo(businessInfo));
+    }
+
+}

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

+package com.dsk.biz.controller;
+
+import com.dsk.biz.domain.BusinessLabel;
+import com.dsk.biz.domain.bo.BusinessIdDto;
+import com.dsk.biz.service.IBusinessLabelService;
+import com.dsk.common.core.controller.BaseController;
+import com.dsk.common.core.domain.AjaxResult;
+import com.dsk.common.core.domain.R;
+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;
+
+/**
+ * 项目标签Controller
+ *
+ * @author lxl
+ * @date 2023-05-17
+ */
+@RestController
+@RequestMapping("/business/label")
+public class BusinessLabelController extends BaseController
+{
+    @Autowired
+    private IBusinessLabelService businessLabelService;
+
+
+    /**
+     * 新增项目标签
+     */
+//    @PreAuthorize("@ss.hasPermi('system:label:add')")
+//    @Log(title = "项目标签", businessType = BusinessType.INSERT)
+    @PostMapping("/add")
+    public R<Void> add(@RequestBody BusinessLabel businessLabel)
+    {
+        return toAjax(businessLabelService.insertBusinessLabel(businessLabel));
+    }
+
+
+     /**
+     * 删除项目标签
+     */
+//    @PreAuthorize("@ss.hasPermi('system:label:remove')")
+//    @Log(title = "项目标签", businessType = BusinessType.DELETE)
+    @PostMapping("/remove")
+    public R<Void> remove(@RequestBody BusinessIdDto dto)
+    {
+        return toAjax(businessLabelService.deleteBusinessLabelById(dto));
+    }
+
+}

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

+package com.dsk.biz.controller;
+
+import com.dsk.biz.domain.bo.BusinessSearchDto;
+import com.dsk.biz.service.IBusinessOverviewService;
+import com.dsk.common.core.controller.BaseController;
+import com.dsk.common.core.domain.AjaxResult;
+import com.dsk.common.helper.LoginHelper;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.Map;
+
+/**
+ * 项目概览
+ *
+ * @author lcl
+ * @create 2023/8/14
+ */
+@RestController
+@RequestMapping("/business/overview")
+public class BusinessOverviewController extends BaseController {
+
+    @Autowired
+    private IBusinessOverviewService baseService;
+
+    /**
+     * 项目状态统计
+     */
+    @GetMapping("/status/statistics")
+    public AjaxResult statusStatistics() {
+        return AjaxResult.success(baseService.statusStatistics(new BusinessSearchDto(LoginHelper.getUserId())));
+    }
+
+    /**
+     * 项目资金分析
+     */
+    @GetMapping("/amount/analyze")
+    public AjaxResult amountAnalyze() {
+        return AjaxResult.success(baseService.amountAnalyze(new BusinessSearchDto(LoginHelper.getUserId(), 0)));
+    }
+
+    /**
+     * 项目类型分析
+     */
+    @GetMapping("/type/analyze/{status}")
+    public AjaxResult typeAnalyze(@PathVariable Integer status) {
+        return AjaxResult.success(baseService.typeAnalyze(new BusinessSearchDto(LoginHelper.getUserId(), status)));
+    }
+
+    /**
+     * 项目类别分析
+     */
+    @GetMapping("/category/analyze/{status}")
+    public AjaxResult categoryAnalyze(@PathVariable Integer status) {
+        return AjaxResult.success(baseService.categoryAnalyze(new BusinessSearchDto(LoginHelper.getUserId(), status)));
+    }
+
+    /**
+     * 公招项目地区统计
+     *
+     * @return
+     */
+    @RequestMapping("/countGroupByProvince")
+    public AjaxResult countGroupByProvince(@RequestBody Map<String,Object> object) {
+        return baseService.countGroupByProvince(object);
+    }
+
+    /**
+     * 公招项目投资金额统计
+     *
+     * @return
+     */
+    @RequestMapping("/rangByMoney")
+    public AjaxResult rangByMoney(@RequestBody Map<String,Object> object) {
+        return baseService.rangByMoney(object);
+    }
+}

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

+package com.dsk.biz.controller;
+
+import com.dsk.biz.domain.BusinessRelateCompany;
+import com.dsk.biz.domain.bo.BusinessIdDto;
+import com.dsk.biz.service.IBusinessRelateCompanyService;
+import com.dsk.common.core.controller.BaseController;
+import com.dsk.common.core.domain.AjaxResult;
+import com.dsk.common.core.domain.PageQuery;
+import com.dsk.common.core.domain.R;
+import com.dsk.common.core.page.TableDataInfo;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+/**
+ * 项目相关企业Controller
+ *
+ * @author lxl
+ * @date 2023-05-17
+ */
+@RestController
+@RequestMapping("/business/company")
+public class BusinessRelateCompanyController extends BaseController
+{
+    @Autowired
+    private IBusinessRelateCompanyService businessRelateCompanyService;
+
+    /**
+     * 查询相关企业角色
+     */
+    @PostMapping("/role/list")
+    public R<List<String>> companyRoleList(@RequestBody BusinessIdDto dto){
+        return R.ok(businessRelateCompanyService.companyRoleList(dto));
+    }
+
+    /**
+     * 查询项目相关企业列表
+     */
+//    @PreAuthorize("@ss.hasPermi('system:company:list')")
+    @GetMapping("/list")
+    public TableDataInfo<BusinessRelateCompany> list(BusinessRelateCompany bo, PageQuery pageQuery)
+    {
+        return businessRelateCompanyService.selectBusinessRelateCompanyList(bo, pageQuery);
+    }
+
+    /**
+     * 新增项目关联单位
+     */
+//    @PreAuthorize("@ss.hasPermi('system:company:add')")
+//    @Log(title = "项目关联单位", businessType = BusinessType.INSERT)
+    @PostMapping("/add")
+    public R<Void> add(@RequestBody BusinessRelateCompany businessRelateCompany)
+    {
+        return toAjax(businessRelateCompanyService.insertBusinessRelateCompany(businessRelateCompany));
+    }
+
+    /**
+     * 修改项目关联单位
+     */
+//    @PreAuthorize("@ss.hasPermi('system:company:edit')")
+//    @Log(title = "项目关联单位", businessType = BusinessType.UPDATE)
+    @PostMapping("/edit")
+    public R<Void> edit(@RequestBody BusinessRelateCompany businessRelateCompany)
+    {
+        return toAjax(businessRelateCompanyService.updateBusinessRelateCompany(businessRelateCompany));
+    }
+
+    /**
+     * 删除项目关联单位
+     */
+//    @PreAuthorize("@ss.hasPermi('system:company:remove')")
+//    @Log(title = "项目关联单位", businessType = BusinessType.DELETE)
+    @DeleteMapping("/remove/{ids}")
+    public R<Void> remove(@PathVariable Long[] ids)
+    {
+        return toAjax(businessRelateCompanyService.deleteBusinessRelateCompanyByIds(ids));
+    }
+
+//    /**
+//     * 导出项目关联单位列表
+//     */
+//    @PreAuthorize("@ss.hasPermi('system:company:export')")
+//    @Log(title = "项目关联单位", businessType = BusinessType.EXPORT)
+//    @PostMapping("/export")
+//    public void export(HttpServletResponse response, BusinessRelateCompany businessRelateCompany)
+//    {
+//        List<BusinessRelateCompany> list = businessRelateCompanyService.selectBusinessRelateCompanyList(businessRelateCompany);
+//        ExcelUtil<BusinessRelateCompany> util = new ExcelUtil<BusinessRelateCompany>(BusinessRelateCompany.class);
+//        util.exportExcel(response, list, "项目关联单位数据");
+//    }
+
+//    /**
+//     * 获取项目关联单位详细信息
+//     */
+//    @PreAuthorize("@ss.hasPermi('system:company:query')")
+//    @GetMapping(value = "/{id}")
+//    public AjaxResult getInfo(@PathVariable("id") Long id)
+//    {
+//        return success(businessRelateCompanyService.selectBusinessRelateCompanyById(id));
+//    }
+
+}

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

+package com.dsk.biz.domain;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * 项目工作待办对象 business_backlog
+ *
+ * @author lxl
+ * @date 2023-05-17
+ */
+@Data
+public class BusinessBacklog
+{
+    private static final long serialVersionUID = 1L;
+
+    /** $column.columnComment */
+    private Integer id;
+
+    /** 项目id */
+    private Integer businessId;
+
+    /** 关联客户 */
+    private String target;
+
+    /** 待办工作内容 */
+    private String task;
+
+    /** 完成时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date finishTime;
+
+    /** 完成时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date dueTime;
+
+    /** 状态(2已完成，1进行中，0逾期) */
+    private Integer state;
+
+    private Date createTime;
+
+    private Date updateTime;
+
+}

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

+package com.dsk.biz.domain;
+
+import com.dsk.common.core.domain.BaseEntity;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * 项目跟进记录对象 business_follow_record
+ *
+ * @author lxl
+ * @date 2023-05-17
+ */
+@Data
+public class BusinessFollowRecord extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 项目名称
+     */
+    private String projectName;
+
+    /**
+     * 业主单位
+     */
+    private String ownerCompany;
+
+    /** $column.columnComment */
+    private Integer id;
+
+    /** 项目id */
+    private Integer businessId;
+
+    /** 用户id */
+    private Integer userId;
+
+    /** 用户昵称 */
+    private String nickName;
+
+    /** 拜访对象 */
+    private String visitPerson;
+
+    /** 职位 */
+    private String position;
+
+    /** 拜访时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    private Date visitTime;
+
+    /** 下次拜访时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    private Date nextVisitTime;
+
+    /** 记录内容 */
+    private String recordInfo;
+
+    /** 拜访方式 */
+    private String visitWay;
+
+    /** 创建时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm")
+    private Date creatTime;
+}

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

+package com.dsk.biz.domain;
+
+import com.dsk.common.core.domain.BaseEntity;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+
+/**
+ * 项目标签对象 business_label
+ *
+ * @author lxl
+ * @date 2023-05-17
+ */
+@Data
+@NoArgsConstructor
+public class BusinessLabel extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** $column.columnComment */
+    private Integer id;
+
+    /** 项目id */
+    private Integer businessId;
+
+    /** 标签 */
+    private String label;
+
+    public BusinessLabel(Integer businessId) {
+        this.businessId = businessId;
+    }
+}

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

+package com.dsk.biz.domain;
+
+import com.dsk.common.core.domain.BaseEntity;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+/**
+ * 项目关联单位对象 business_relate_company
+ *
+ * @author lxl
+ * @date 2023-05-17
+ */
+@Data
+@NoArgsConstructor
+public class BusinessRelateCompany extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** $column.columnComment */
+    private Integer id;
+
+    /** 项目id */
+    private Integer businessId;
+
+    /** 单位建设库id */
+    private Integer companyId;
+
+    /** 单位城投id */
+    private String companyUipId;
+
+    /** 单位名称 */
+    private String companyName;
+
+    /** 单位角色 */
+    private String companyRole;
+
+    /** 负责任人 */
+    private String responsiblePerson;
+
+    /** 负责人电话 */
+    private String phone;
+
+    /** 对接深度/竞争力度 */
+    private String depth;
+
+    /** 是否业主单位 0：否 1：是 */
+    private Integer isProprietor;
+
+    private String remark;
+}

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

+package com.dsk.biz.domain;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.dsk.common.core.domain.BaseEntity;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import lombok.experimental.Accessors;
+
+/**
+ * 项目用户关联对象 business_user
+ *
+ * @author lxl
+ * @date 2023-05-17
+ */
+@Data
+@NoArgsConstructor
+@Accessors(chain = true)
+@TableName("business_user")
+public class BusinessUser extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** $column.columnComment */
+    @TableId(value = "id",type = IdType.INPUT)
+    private Integer id;
+
+    /** 项目id(business_info表id) */
+    private Integer businessId;
+
+    /** 部门id */
+    private Long deptId;
+
+    /** 用户id */
+    private Long userId;
+
+    /** 是否创建人(1 是,0 否) */
+    private Integer isFounder;
+
+    public BusinessUser(Integer businessId, Long deptId, Long userId, Integer isFounder) {
+        this.businessId = businessId;
+        this.deptId = deptId;
+        this.userId = userId;
+        this.isFounder = isFounder;
+    }
+}

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

+package com.dsk.biz.domain.bo;
+
+import lombok.Data;
+
+/**
+ * @author lxl
+ * @Description:
+ * @Date 2023/5/19 下午 5:58
+ **/
+@Data
+public class BusinessAddDto {
+
+    /**
+     * 项目名称
+     */
+    private String projectName;
+
+    /**
+     * 用户id
+     */
+    private Long userId;
+
+    /**
+     * 项目类型
+     */
+    private String projectType;
+
+    /**
+     * 项目类别
+     */
+    private String projectCategory;
+
+    /**
+     * 投资估算
+     */
+    private Double investmentAmount;
+
+    /**
+     * 项目阶段
+     */
+    private String projectStage;
+
+    /**
+     * 项目状态(0.储备中1.跟进中2.已合作)
+     */
+    private Integer status;
+
+    /**
+     * 业主单位
+     */
+    private String ownerCompany;
+
+    /**
+     * 单位id
+     */
+    private Integer companyId;
+
+    /**
+     * 可见范围
+     */
+    private Integer isPrivate;
+    /**
+     * 客户id
+     */
+    private String customerId;
+}

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

+package com.dsk.biz.domain.bo;
+
+import com.dsk.common.core.domain.BaseEntity;
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * 项目工作待办对象 business_backlog
+ *
+ * @author lxl
+ * @date 2023-05-17
+ */
+@Data
+public class BusinessBacklogListDto extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 项目id */
+    private Integer businessId;
+
+    /** 状态 (0进行中 1已完成 2逾期) */
+    private Integer state;
+
+    private Date startTime;
+
+    private Date endTime;
+
+}

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

+package com.dsk.biz.domain.bo;
+
+import lombok.Data;
+
+/**
+ * @author lxl
+ * @Description:
+ * @Date 2023/6/1 下午 6:41
+ **/
+@Data
+public class BusinessExcelDto {
+
+    /**
+     * 项目名称
+     */
+    private String projectName;
+    /**
+     * 投资估算（万元）
+     */
+    private String investmentAmount;
+    /**
+     * 业主单位
+     */
+    private String ownerCompany;
+}

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

+package com.dsk.biz.domain.bo;
+
+import lombok.Data;
+
+/**
+ * @author lxl
+ * @Description:
+ * @Date 2023/5/13 下午 3:58
+ **/
+@Data
+public class BusinessIdDto {
+
+    /**
+     * 项目id
+     */
+    private Integer businessId;
+
+    /**
+     * 项目标签id
+     */
+    private Integer labelId;
+
+    /**
+     * 项目标签名称
+     */
+    private String label;
+
+    /**
+     * 文件路径
+     */
+    private String filePath;
+
+    /**
+     * 文件搜索关键字
+     */
+    private String keyword;
+}

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

+package com.dsk.biz.domain.bo;
+
+import com.dsk.common.core.domain.BaseEntity;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.io.Serializable;
+
+/**
+ * @author lcl
+ * @create 2023/8/14
+ */
+@Data
+@NoArgsConstructor
+public class BusinessSearchDto extends BaseEntity implements Serializable {
+    /**
+     * 用户id
+     */
+    private Long userId;
+    /**
+     * 状态
+     */
+    private Integer status;
+
+    public BusinessSearchDto(Long userId) {
+        this.userId = userId;
+    }
+
+    public BusinessSearchDto(Long userId, Integer status) {
+        this.userId = userId;
+        this.status = status;
+    }
+}

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

+package com.dsk.biz.domain.vo;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * 项目金额分析
+ *
+ * @author lcl
+ * @create 2023/8/15
+ */
+@Data
+public class BusinessAnalyzeVo implements Serializable {
+    /**
+     * 项目类型
+     */
+    private String projectType;
+    /**
+     * 项目类别
+     */
+    private String projectCategory;
+    /**
+     * 资金来源
+     */
+    private String amountSource;
+    /**
+     * 项目数量
+     */
+    private Integer businessCount;
+    /**
+     * 总投资金额
+     */
+    private Double totalAmount;
+}

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

+package com.dsk.biz.domain.vo;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * 项目工作待办对象 business_backlog
+ *
+ * @author lxl
+ * @date 2023-05-17
+ */
+@Data
+public class BusinessBacklogListVo {
+    private static final long serialVersionUID = 1L;
+
+    /** $column.columnComment */
+    private Integer id;
+
+    /** 项目id */
+    private Integer businessId;
+
+    /** 关联客户 */
+    private String target;
+
+    /** 待办工作内容 */
+    private String task;
+
+    /** 完成时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date finishTime;
+
+    /** 完成时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date dueTime;
+
+    /** 状态(2已完成，1进行中，0逾期) */
+    private Integer state;
+}

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

+package com.dsk.biz.domain.vo;
+
+import lombok.Data;
+
+/**
+ * @author lxl
+ * @Description:
+ * @Date 2023/5/22 下午 5:19
+ **/
+@Data
+public class BusinessBrowseVo {
+
+    /**
+     * 项目名称
+     */
+    private String projectName;
+
+    /**
+     * 0 仅自己可见，1 他人可见
+     */
+    private Integer isPrivate;
+
+    /**
+     * 项目类型
+     */
+    private String projectType;
+
+    /**
+     * 项目类别
+     */
+    private String projectCategory;
+
+    /**
+     * 项目状态(0.储备中1.跟进中2.已合作)
+     */
+    private Integer status;
+
+    /**
+     * 投资估算
+     */
+    private Double investmentAmount;
+
+    /**
+     * 省
+     */
+    private String provinceName;
+
+    /**
+     * 市
+     */
+    private String cityName;
+
+    /**
+     * 区
+     */
+    private String districtName;
+
+    /**
+     * 省id
+     */
+    private Integer provinceId;
+
+    /**
+     * 市id
+     */
+    private Integer cityId;
+
+    /**
+     * 区id
+     */
+    private Integer districtId;
+
+    /**
+     * 商务团队
+     */
+    private String team;
+
+    /**
+     * 项目阶段
+     */
+    private String projectStage;
+
+    /**
+     * 项目级别
+     */
+    private String projectLevel;
+
+    /**
+     * 项目标签
+     */
+    private String labelList;
+
+    /** 建设单位 */
+    private String constructionUnit;
+
+    /** 建设单位负责人 */
+    private String constructionPrincipal;
+
+    /** 建设单位联系电话 */
+    private String constructionPhone;
+
+    /** 主管单位 */
+    private String supervisorUnit;
+
+    /** 主管单位负责人 */
+    private String supervisorPrincipal;
+
+    /** 主管单位联系电话 */
+    private String supervisorPhone;
+
+    /**
+     * 联系人统计
+     */
+    private Integer contactsCount;
+
+    /**
+     * 跟进记录统计
+     */
+    private Integer followRecordCount;
+
+    /**
+     * 工作待办统计
+     */
+    private Integer backlogCount;
+
+    /**
+     * 相关企业统计
+     */
+    private Integer relateCompanyCount;
+
+    /**
+     * 资料文档统计
+     */
+    private Integer fileCount;
+
+    /**
+     * 是否创建人(1 是,0 否)
+     */
+    private Integer isFounder;
+
+
+}

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

+package com.dsk.biz.domain.vo;
+
+import lombok.Data;
+
+/**
+ * @author lxl
+ * @Description:
+ * @Date 2023/6/7 上午 11:05
+ **/
+@Data
+public class BusinessFileVo {
+
+    private String filePath;
+    private String creatTime;
+
+    public BusinessFileVo(String filePath, String creatTime) {
+        this.filePath = filePath;
+        this.creatTime = creatTime == null ? "" : creatTime;
+    }
+}

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

+package com.dsk.biz.domain.vo;
+
+import lombok.Data;
+
+/**
+ * @author lxl
+ * @Description:
+ * @Date 2023/6/27 下午 2:51
+ **/
+@Data
+public class BusinessLabelVo {
+
+    //主键
+    private Integer id;
+
+    //标签
+    private String label;
+}

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

+package com.dsk.biz.domain.vo;
+
+import lombok.Data;
+
+/**
+ * @author lcl
+ * @create 2023/7/27
+ */
+@Data
+public class BusinessLikeProjectNameListVo {
+
+    private String projectName;
+
+    private String companyName;
+
+    /** 总投金额(万元) */
+    private Double investmentAmount;
+
+    /** 项目级别 */
+    private String projectLevel;
+
+    /** 项目阶段 */
+    private String projectStage;
+
+    /** 项目类型 */
+    private String projectType;
+
+    /** 项目类别 */
+    private String projectCategory;
+
+    /** 项目状态(0.储备中1.跟进中2.已合作) */
+    private Integer status;
+}

dsk-module/dsk-biz-api/src/main/java/com/dsk/biz/dskService/model/LoginBody.java

-package com.dsk.biz.dskService.model;
-
-/**
- * 用户登录对象
- *
- * @author dsk
- */
-public class LoginBody
-{
-    /**
-     * 用户名
-     */
-    private String username;
-
-    /**
-     * 用户密码
-     */
-    private String password;
-
-    /**
-     * 验证码
-     */
-    private String code;
-
-    /**
-     * 唯一标识
-     */
-    private String uuid;
-
-    public String getUsername()
-    {
-        return username;
-    }
-
-    public void setUsername(String username)
-    {
-        this.username = username;
-    }
-
-    public String getPassword()
-    {
-        return password;
-    }
-
-    public void setPassword(String password)
-    {
-        this.password = password;
-    }
-
-    public String getCode()
-    {
-        return code;
-    }
-
-    public void setCode(String code)
-    {
-        this.code = code;
-    }
-
-    public String getUuid()
-    {
-        return uuid;
-    }
-
-    public void setUuid(String uuid)
-    {
-        this.uuid = uuid;
-    }
-}

dsk-module/dsk-biz-api/src/main/java/com/dsk/biz/dskService/model/LoginUser.java

-//package com.dsk.biz.dskService.model;
-//
-//import com.alibaba.fastjson2.annotation.JSONField;
-//import com.dsk.common.core.domain.entity.SysUser;
-//import org.springframework.security.core.GrantedAuthority;
-//import org.springframework.security.core.userdetails.UserDetails;
-//
-//import java.util.Collection;
-//import java.util.Set;
-//
-///**
-// * 登录用户身份权限
-// *
-// * @author dsk
-// */
-//public class LoginUser implements UserDetails
-//{
-//    private static final long serialVersionUID = 1L;
-//
-//    /**
-//     * 用户ID
-//     */
-//    private Long userId;
-//
-//    /**
-//     * 部门ID
-//     */
-//    private Long deptId;
-//
-//    /**
-//     * 用户唯一标识
-//     */
-//    private String token;
-//
-//    /**
-//     * 登录时间
-//     */
-//    private Long loginTime;
-//
-//    /**
-//     * 过期时间
-//     */
-//    private Long expireTime;
-//
-//    /**
-//     * 登录IP地址
-//     */
-//    private String ipaddr;
-//
-//    /**
-//     * 登录地点
-//     */
-//    private String loginLocation;
-//
-//    /**
-//     * 浏览器类型
-//     */
-//    private String browser;
-//
-//    /**
-//     * 操作系统
-//     */
-//    private String os;
-//
-//    /**
-//     * 权限列表
-//     */
-//    private Set<String> permissions;
-//
-//    /**
-//     * 用户信息
-//     */
-//    private SysUser user;
-//
-//    public Long getUserId()
-//    {
-//        return userId;
-//    }
-//
-//    public void setUserId(Long userId)
-//    {
-//        this.userId = userId;
-//    }
-//
-//    public Long getDeptId()
-//    {
-//        return deptId;
-//    }
-//
-//    public void setDeptId(Long deptId)
-//    {
-//        this.deptId = deptId;
-//    }
-//
-//    public String getToken()
-//    {
-//        return token;
-//    }
-//
-//    public void setToken(String token)
-//    {
-//        this.token = token;
-//    }
-//
-//    public LoginUser()
-//    {
-//    }
-//
-//    public LoginUser(SysUser user, Set<String> permissions)
-//    {
-//        this.user = user;
-//        this.permissions = permissions;
-//    }
-//
-//    public LoginUser(Long userId, Long deptId, SysUser user, Set<String> permissions)
-//    {
-//        this.userId = userId;
-//        this.deptId = deptId;
-//        this.user = user;
-//        this.permissions = permissions;
-//    }
-//
-//    @JSONField(serialize = false)
-//    @Override
-//    public String getPassword()
-//    {
-//        return user.getPassword();
-//    }
-//
-//    @Override
-//    public String getUsername()
-//    {
-//        return user.getUserName();
-//    }
-//
-//    /**
-//     * 账户是否未过期,过期无法验证
-//     */
-//    @JSONField(serialize = false)
-//    @Override
-//    public boolean isAccountNonExpired()
-//    {
-//        return true;
-//    }
-//
-//    /**
-//     * 指定用户是否解锁,锁定的用户无法进行身份验证
-//     *
-//     * @return
-//     */
-//    @JSONField(serialize = false)
-//    @Override
-//    public boolean isAccountNonLocked()
-//    {
-//        return true;
-//    }
-//
-//    /**
-//     * 指示是否已过期的用户的凭据(密码),过期的凭据防止认证
-//     *
-//     * @return
-//     */
-//    @JSONField(serialize = false)
-//    @Override
-//    public boolean isCredentialsNonExpired()
-//    {
-//        return true;
-//    }
-//
-//    /**
-//     * 是否可用 ,禁用的用户不能身份验证
-//     *
-//     * @return
-//     */
-//    @JSONField(serialize = false)
-//    @Override
-//    public boolean isEnabled()
-//    {
-//        return true;
-//    }
-//
-//    public Long getLoginTime()
-//    {
-//        return loginTime;
-//    }
-//
-//    public void setLoginTime(Long loginTime)
-//    {
-//        this.loginTime = loginTime;
-//    }
-//
-//    public String getIpaddr()
-//    {
-//        return ipaddr;
-//    }
-//
-//    public void setIpaddr(String ipaddr)
-//    {
-//        this.ipaddr = ipaddr;
-//    }
-//
-//    public String getLoginLocation()
-//    {
-//        return loginLocation;
-//    }
-//
-//    public void setLoginLocation(String loginLocation)
-//    {
-//        this.loginLocation = loginLocation;
-//    }
-//
-//    public String getBrowser()
-//    {
-//        return browser;
-//    }
-//
-//    public void setBrowser(String browser)
-//    {
-//        this.browser = browser;
-//    }
-//
-//    public String getOs()
-//    {
-//        return os;
-//    }
-//
-//    public void setOs(String os)
-//    {
-//        this.os = os;
-//    }
-//
-//    public Long getExpireTime()
-//    {
-//        return expireTime;
-//    }
-//
-//    public void setExpireTime(Long expireTime)
-//    {
-//        this.expireTime = expireTime;
-//    }
-//
-//    public Set<String> getPermissions()
-//    {
-//        return permissions;
-//    }
-//
-//    public void setPermissions(Set<String> permissions)
-//    {
-//        this.permissions = permissions;
-//    }
-//
-//    public SysUser getUser()
-//    {
-//        return user;
-//    }
-//
-//    public void setUser(SysUser user)
-//    {
-//        this.user = user;
-//    }
-//
-//    @Override
-//    public Collection<? extends GrantedAuthority> getAuthorities()
-//    {
-//        return null;
-//    }
-//}

dsk-module/dsk-biz-api/src/main/java/com/dsk/biz/dskService/model/RegisterBody.java

-package com.dsk.biz.dskService.model;
-
-import com.dsk.common.core.domain.model.LoginBody;
-
-/**
- * 用户注册对象
- *
- * @author dsk
- */
-public class RegisterBody extends LoginBody
-{
-
-}

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

+package com.dsk.biz.mapper;
+
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.dsk.biz.domain.BusinessBacklog;
+import com.dsk.biz.domain.bo.BusinessBacklogListDto;
+import com.dsk.biz.domain.vo.BusinessBacklogListVo;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ * 项目工作待办Mapper接口
+ *
+ * @author lxl
+ * @date 2023-05-17
+ */
+public interface BusinessBacklogMapper
+{
+    /**
+     * 查询项目工作待办
+     *
+     * @param id 项目工作待办主键
+     * @return 项目工作待办
+     */
+    public BusinessBacklog selectBusinessBacklogById(Integer id);
+
+    /**
+     * 查询项目工作待办列表
+     */
+    public Page<BusinessBacklogListVo> selectBusinessBacklogList(IPage<BusinessBacklogListDto> page, @Param("dto") BusinessBacklogListDto dto);
+
+    /**
+     * 新增项目工作待办
+     *
+     * @param businessBacklog 项目工作待办
+     * @return 结果
+     */
+    public int insertBusinessBacklog(BusinessBacklog businessBacklog);
+
+    /**
+     * 修改项目工作待办
+     *
+     * @param businessBacklog 项目工作待办
+     * @return 结果
+     */
+    public int updateBusinessBacklog(BusinessBacklog businessBacklog);
+
+    /**
+     * 删除项目工作待办
+     *
+     * @param id 项目工作待办主键
+     * @return 结果
+     */
+    public int deleteBusinessBacklogById(Long id);
+
+    /**
+     * 批量删除项目工作待办
+     *
+     * @param ids 需要删除的数据主键集合
+     * @return 结果
+     */
+    public int deleteBusinessBacklogByIds(Long[] ids);
+
+    Integer overdueCount(Integer businessId);
+
+}

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

+package com.dsk.biz.mapper;
+
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.dsk.biz.domain.BusinessFollowRecord;
+import com.dsk.biz.domain.bo.BusinessIdDto;
+import com.dsk.biz.domain.bo.BusinessListDto;
+import com.dsk.biz.domain.vo.BusinessListVo;
+import com.dsk.common.annotation.DataColumn;
+import com.dsk.common.annotation.DataPermission;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ * 项目跟进记录Mapper接口
+ *
+ * @author lxl
+ * @date 2023-05-17
+ */
+public interface BusinessFollowRecordMapper
+{
+
+    /**
+     * 查询关联项目
+     * @param userId
+     * @return
+     */
+    List<BusinessListVo> selectRelateProject(Integer userId);
+
+    /**
+     * 查询关联业主企业
+     * @param userId
+     * @return
+     */
+    List<String> selectRelateCompany(Integer userId);
+
+    /**
+     * 查询项目跟进记录
+     *
+     * @param id 项目跟进记录主键
+     * @return 项目跟进记录
+     */
+    public BusinessFollowRecord selectBusinessFollowRecordById(Long id);
+
+    /**
+     * 分页查询项目跟进记录列表
+     *
+     * @param businessFollowRecord 项目跟进记录
+     * @return 项目跟进记录集合
+     */
+    public List<BusinessFollowRecord> businessFollowRecordPaging(BusinessFollowRecord businessFollowRecord);
+
+    /**
+     * 根据项目id查询项目跟进记录
+     *
+     * @param dto 项目id
+     * @return 项目跟进记录集合
+     */
+    public Page<BusinessFollowRecord> selectBusinessFollowRecordList(IPage<BusinessIdDto> page,@Param("dto") BusinessIdDto dto);
+
+    /**
+     * 新增项目跟进记录
+     *
+     * @param businessFollowRecord 项目跟进记录
+     * @return 结果
+     */
+    public int insertBusinessFollowRecord(BusinessFollowRecord businessFollowRecord);
+
+    /**
+     * 修改项目跟进记录
+     *
+     * @param businessFollowRecord 项目跟进记录
+     * @return 结果
+     */
+    public int updateBusinessFollowRecord(BusinessFollowRecord businessFollowRecord);
+
+    /**
+     * 删除项目跟进记录
+     *
+     * @param id 项目跟进记录主键
+     * @return 结果
+     */
+    public int deleteBusinessFollowRecordById(Long id);
+
+    /**
+     * 批量删除项目跟进记录
+     *
+     * @param ids 需要删除的数据主键集合
+     * @return 结果
+     */
+    public int deleteBusinessFollowRecordByIds(Long[] ids);
+
+    /**
+     * 分页查询跟进动态
+     *
+     * @param dto
+     * @return
+     */
+    @DataPermission({
+            @DataColumn(key = "deptName", value = "d.dept_id"),
+            @DataColumn(key = "userName", value = "u.user_id")
+    })
+    Page<BusinessFollowRecord> allFollow(IPage<BusinessListDto> page, @Param("dto") BusinessListDto dto);
+}

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

@@ -5,9 +5,9 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.dsk.biz.domain.BusinessInfo;
 import com.dsk.biz.domain.bo.BusinessListDto;
+import com.dsk.biz.domain.bo.BusinessSearchDto;
 import com.dsk.biz.domain.bo.CustomerBusinessSearchDto;
-import com.dsk.biz.domain.vo.BusinessListVo;
-import com.dsk.biz.domain.vo.CustomerBusinessListVo;
+import com.dsk.biz.domain.vo.*;
 import com.dsk.common.annotation.DataColumn;
 import com.dsk.common.annotation.DataPermission;
 import org.apache.ibatis.annotations.Mapper;
@@ -23,28 +23,28 @@ import java.util.List;
  */
 @Mapper
 public interface BusinessInfoMapper extends BaseMapper<BusinessInfo> {
-//    /**
-//     * 查询项目详情
-//     *
-//     * @param id 项目详情主键
-//     * @return 项目详情
-//     */
-//    public BusinessInfo selectBusinessInfoById(Integer id);
-//
-//    /**
-//     * 查询项目建设内容
-//     *
-//     * @param id 项目详情主键
-//     * @return
-//     */
-//    BusinessInfo getConstruction(Integer id);
-//
-//    /**
-//     * 查询所有项目名称(支持模糊查询)
-//     *
-//     * @return
-//     */
-//    List<BusinessLikeProjectNameListVo> selectProjectName(BusinessListDto dto);
+    /**
+     * 查询项目详情
+     *
+     * @param id 项目详情主键
+     * @return 项目详情
+     */
+    public BusinessInfo selectBusinessInfoById(Integer id);
+
+    /**
+     * 查询项目建设内容
+     *
+     * @param id 项目详情主键
+     * @return
+     */
+    BusinessInfo getConstruction(Integer id);
+
+    /**
+     * 查询所有项目名称(支持模糊查询)
+     *
+     * @return
+     */
+    List<BusinessLikeProjectNameListVo> selectProjectName(BusinessListDto dto);
 
     /**
      * 查询项目详情列表
@@ -58,66 +58,68 @@ public interface BusinessInfoMapper extends BaseMapper<BusinessInfo> {
     })
     public Page<BusinessListVo> selectBusinessInfoList(@Param("page") Page<BusinessListVo> page,@Param("dto")  BusinessListDto dto);
 
-//    /**
-//     * 新增项目详情
-//     *
-//     * @param businessInfo 项目详情
-//     * @return 结果
-//     */
-//    public int insertBusinessInfo(BusinessInfo businessInfo);
-//
-//    /**
-//     * 修改项目详情
-//     *
-//     * @param businessInfo 项目详情
-//     * @return 结果
-//     */
-//    public int updateBusinessInfo(BusinessInfo businessInfo);
-//
-//    /**
-//     * 删除项目详情
-//     *
-//     * @param id 项目详情主键
-//     * @return 结果
-//     */
-//    public int deleteBusinessInfoById(Long id);
-//
-//    /**
-//     * 批量删除项目
-//     * 项目关联的其他所有表数据一并删除
-//     *
-//     * @param ids 需要删除的数据主键集合
-//     * @return 结果
-//     */
-//    public int deleteBusinessInfoByIds(Long[] ids);
-//
-//    /**
-//     * 根据项目统计
-//     *
-//     * @param business
-//     * @return
-//     */
-//    BusinessBrowseVo selectTotal(Integer business);
-//
-//    /**
-//     * 查询项目名称是否存在
-//     *
-//     * @param projectName
-//     * @param userId
-//     * @return
-//     */
-//    int isRepetitionProjectName(@Param("projectName") String projectName,
-//                                @Param("userId") Long userId,
-//                                @Param("companyName") String companyName);
-//
-//    int selectCountByStatusAndCustomerId(@Param("status") Integer status, @Param("customerId") String customerId);
-//
+    /**
+     * 新增项目详情
+     *
+     * @param businessInfo 项目详情
+     * @return 结果
+     */
+    public int insertBusinessInfo(BusinessInfo businessInfo);
+
+    /**
+     * 修改项目详情
+     *
+     * @param businessInfo 项目详情
+     * @return 结果
+     */
+    public int updateBusinessInfo(BusinessInfo businessInfo);
+
+    /**
+     * 删除项目详情
+     *
+     * @param id 项目详情主键
+     * @return 结果
+     */
+    public int deleteBusinessInfoById(Long id);
+
+    /**
+     * 批量删除项目
+     * 项目关联的其他所有表数据一并删除
+     *
+     * @param ids 需要删除的数据主键集合
+     * @return 结果
+     */
+    public int deleteBusinessInfoByIds(Long[] ids);
+
+    /**
+     * 根据项目统计
+     *
+     * @param business
+     * @return
+     */
+    BusinessBrowseVo selectTotal(Integer business);
+
+    /**
+     * 查询项目名称是否存在
+     *
+     * @param projectName
+     * @param userId
+     * @return
+     */
+    int isRepetitionProjectName(@Param("projectName") String projectName,
+                                @Param("userId") Long userId,
+                                @Param("companyName") String companyName);
+
+    int selectCountByStatusAndCustomerId(@Param("status") Integer status, @Param("customerId") String customerId);
+
     Page<CustomerBusinessListVo> selectCustomerBusinessList(IPage<CustomerBusinessSearchDto> page,@Param("dto") CustomerBusinessSearchDto dto);
-//
-//    int selectCountByStatus(BusinessSearchDto dto);
-//
-//    List<BusinessAnalyzeVo> selectAmountAnalyze(BusinessSearchDto dto);
-//
-//    List<BusinessAnalyzeVo> selectTypeAnalyze(BusinessSearchDto dto);
+
+    int selectCountByStatus(BusinessSearchDto dto);
+
+    List<BusinessAnalyzeVo> selectAmountAnalyze(BusinessSearchDto dto);
+
+    List<BusinessAnalyzeVo> selectTypeAnalyze(BusinessSearchDto dto);
+
+    List<BusinessAnalyzeVo> selectCategoryAnalyze(BusinessSearchDto dto);
 
 }

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

+package com.dsk.biz.mapper;
+
+
+import com.dsk.biz.domain.BusinessLabel;
+import com.dsk.biz.domain.bo.BusinessIdDto;
+
+import java.util.List;
+
+/**
+ * 项目标签Mapper接口
+ *
+ * @date 2023-05-17
+ */
+public interface BusinessLabelMapper
+{
+    /**
+     * 查询项目标签
+     *
+     * @param id 项目标签主键
+     * @return 项目标签
+     */
+    public BusinessLabel selectBusinessLabelById(Long id);
+
+    /**
+     * 查询项目标签列表
+     *
+     * @param businessLabel 项目标签
+     * @return 项目标签集合
+     */
+    public List<BusinessLabel> selectBusinessLabelList(BusinessLabel businessLabel);
+
+    /**
+     * 新增项目标签
+     *
+     * @param businessLabel 项目标签
+     * @return 结果
+     */
+    public int insertBusinessLabel(BusinessLabel businessLabel);
+
+    /**
+     * 修改项目标签
+     *
+     * @param businessLabel 项目标签
+     * @return 结果
+     */
+    public int updateBusinessLabel(BusinessLabel businessLabel);
+
+    /**
+     * 删除项目标签
+     *
+     * @param dto 项目主键
+     * @return 结果
+     */
+    public int deleteBusinessLabelById(BusinessIdDto dto);
+
+    /**
+     * 批量删除项目标签
+     *
+     * @param ids 需要删除的数据主键集合
+     * @return 结果
+     */
+    public int deleteBusinessLabelByIds(Long[] ids);
+}

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

+package com.dsk.biz.mapper;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.dsk.biz.domain.BusinessRelateCompany;
+import com.dsk.common.core.mapper.BaseMapperPlus;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+
+/**
+ * 项目关联单位Mapper接口
+ *
+ * @author lxl
+ * @date 2023-05-17
+ */
+public interface BusinessRelateCompanyMapper extends BaseMapperPlus<BusinessRelateCompany,BusinessRelateCompany,BusinessRelateCompany>
+{
+    /**
+     * 查询项目关联单位
+     *
+     * @param id 项目关联单位主键
+     * @return 项目关联单位
+     */
+    public BusinessRelateCompany selectBusinessRelateCompanyById(Long id);
+
+    /**
+     * 查询项目关联单位列表
+     *
+     * @param bo 项目关联单位
+     * @return 项目关联单位集合
+     */
+    public Page<BusinessRelateCompany> selectBusinessRelateCompanyList(IPage<BusinessRelateCompany> page, @Param("bo") BusinessRelateCompany bo);
+
+    /**
+     * 新增项目关联单位
+     *
+     * @param businessRelateCompany 项目关联单位
+     * @return 结果
+     */
+    public int insertBusinessRelateCompany(BusinessRelateCompany businessRelateCompany);
+
+    /**
+     * 修改项目关联单位
+     *
+     * @param businessRelateCompany 项目关联单位
+     * @return 结果
+     */
+    public int updateBusinessRelateCompany(BusinessRelateCompany businessRelateCompany);
+
+    /**
+     * 删除项目关联单位
+     *
+     * @param id 项目关联单位主键
+     * @return 结果
+     */
+    public int deleteBusinessRelateCompanyById(Long id);
+
+    /**
+     * 批量删除项目关联单位
+     *
+     * @param ids 需要删除的数据主键集合
+     * @return 结果
+     */
+    public int deleteBusinessRelateCompanyByIds(Long[] ids);
+
+    BusinessRelateCompany selectByProprietor(Integer id);
+
+}

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

+package com.dsk.biz.mapper;
+
+import com.dsk.biz.domain.BusinessUser;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+
+/**
+ * 项目用户关联Mapper接口
+ *
+ * @author lxl
+ * @date 2023-05-17
+ */
+public interface BusinessUserMapper
+{
+    /**
+     * 查询项目用户关联
+     *
+     * @param id 项目用户关联主键
+     * @return 项目用户关联
+     */
+    public BusinessUser selectBusinessUserById(Long id);
+
+    /**
+     * 查询项目用户关联列表
+     *
+     * @param businessUser 项目用户关联
+     * @return 项目用户关联集合
+     */
+    public List<BusinessUser> selectBusinessUserList(BusinessUser businessUser);
+
+    /**
+     * 新增项目用户关联
+     *
+     * @param businessUser 项目用户关联
+     * @return 结果
+     */
+    public int insertBusinessUser(BusinessUser businessUser);
+
+    /**
+     * 修改项目用户关联
+     *
+     * @param businessUser 项目用户关联
+     * @return 结果
+     */
+    public int updateBusinessUser(BusinessUser businessUser);
+
+    /**
+     * 删除项目用户关联
+     *
+     * @param id 项目用户关联主键
+     * @return 结果
+     */
+    public int deleteBusinessUserById(Long id);
+
+    /**
+     * 批量删除项目用户关联
+     *
+     * @param ids 需要删除的数据主键集合
+     * @return 结果
+     */
+    public int deleteBusinessUserByIds(Long[] ids);
+
+    /**
+     * 根据项目id查询项目的创建人
+     * @param businessId
+     * @return
+     */
+    String selectCreatorByBusinessId(Integer businessId);
+
+    /**
+     * 查询是否为项目的创建人
+     * @param businessId
+     * @return
+     */
+    Integer selectFounder(@Param("businessId") Integer businessId, @Param("userId") Long userId);
+}

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

+package com.dsk.biz.service;
+
+
+import com.dsk.biz.domain.BusinessBacklog;
+import com.dsk.biz.domain.bo.BusinessBacklogListDto;
+import com.dsk.biz.domain.vo.BusinessBacklogListVo;
+import com.dsk.common.core.domain.PageQuery;
+import com.dsk.common.core.page.TableDataInfo;
+
+/**
+ * 项目工作待办Service接口
+ *
+ * @author llx
+ * @date 2023-05-17
+ */
+public interface IBusinessBacklogService
+{
+    /**
+     * 查询项目工作待办
+     *
+     * @param id 项目工作待办主键
+     * @return 项目工作待办
+     */
+    public BusinessBacklog selectBusinessBacklogById(Integer id);
+
+    /**
+     * 查询项目工作待办列表
+     */
+    public TableDataInfo<BusinessBacklogListVo> selectBusinessBacklogList(BusinessBacklogListDto dto, PageQuery pageQuery);
+
+    /**
+     * 新增项目工作待办
+     *
+     * @param businessBacklog 项目工作待办
+     * @return 结果
+     */
+    public int insertBusinessBacklog(BusinessBacklog businessBacklog);
+
+    /**
+     * 修改项目工作待办
+     *
+     * @param businessBacklog 项目工作待办
+     * @return 结果
+     */
+    public int updateBusinessBacklog(BusinessBacklog businessBacklog);
+
+    /**
+     * 批量删除项目工作待办
+     *
+     * @param ids 需要删除的项目工作待办主键集合
+     * @return 结果
+     */
+    public int deleteBusinessBacklogByIds(Long[] ids);
+
+    /**
+     * 删除项目工作待办信息
+     *
+     * @param id 项目工作待办主键
+     * @return 结果
+     */
+    public int deleteBusinessBacklogById(Long id);
+
+    Integer overdueCount(Integer businessId);
+
+}

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

+package com.dsk.biz.service;
+
+
+import com.dsk.biz.domain.BusinessFollowRecord;
+import com.dsk.biz.domain.bo.BusinessIdDto;
+import com.dsk.biz.domain.bo.BusinessListDto;
+import com.dsk.biz.domain.vo.BusinessListVo;
+import com.dsk.common.core.domain.PageQuery;
+import com.dsk.common.core.page.TableDataInfo;
+
+import java.util.List;
+
+/**
+ * 项目跟进记录Service接口
+ *
+ * @author lxl
+ * @date 2023-05-17
+ */
+public interface IBusinessFollowRecordService
+{
+    /**
+     * 查询项目跟进记录
+     *
+     * @param id 项目跟进记录主键
+     * @return 项目跟进记录
+     */
+    public BusinessFollowRecord selectBusinessFollowRecordById(Long id);
+
+    /**
+     * 根据项目id查询项目跟进记录
+     *
+     * @param dto 项目跟进记录
+     * @return 项目跟进记录集合
+     */
+    public TableDataInfo<BusinessFollowRecord> selectBusinessFollowRecordList(BusinessIdDto dto, PageQuery pageQuery);
+
+    /**
+     * 分页查询跟进动态
+     *
+     * @param dto
+     * @return
+     */
+    TableDataInfo<BusinessFollowRecord> allFollow(BusinessListDto dto, PageQuery pageQuery);
+
+    /**
+     * 分页查询项目跟进记录列表
+     *
+     * @param businessFollowRecord 项目跟进记录
+     * @return 项目跟进记录集合
+     */
+    public List<BusinessFollowRecord> businessFollowRecordPaging(BusinessFollowRecord businessFollowRecord);
+
+    /**
+     * 新增项目跟进记录
+     *
+     * @param businessFollowRecord 项目跟进记录
+     * @return 结果
+     */
+    public int insertBusinessFollowRecord(BusinessFollowRecord businessFollowRecord);
+
+    /**
+     * 查询关联项目
+     * @param userId
+     * @return
+     */
+    List<BusinessListVo> selectRelateProject(Integer userId);
+
+    /**
+     * 查询关联业主企业
+     * @param userId
+     * @return
+     */
+    List<String> selectRelateCompany(Integer userId);
+
+    /**
+     * 修改项目跟进记录
+     *
+     * @param businessFollowRecord 项目跟进记录
+     * @return 结果
+     */
+    public int updateBusinessFollowRecord(BusinessFollowRecord businessFollowRecord);
+
+    /**
+     * 批量删除项目跟进记录
+     *
+     * @param ids 需要删除的项目跟进记录主键集合
+     * @return 结果
+     */
+    public int deleteBusinessFollowRecordByIds(Long[] ids);
+
+    /**
+     * 删除项目跟进记录信息
+     *
+     * @param id 项目跟进记录主键
+     * @return 结果
+     */
+    public int deleteBusinessFollowRecordById(Long id);
+}

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

 package com.dsk.biz.service;
 
+import com.dsk.biz.domain.BusinessInfo;
+import com.dsk.biz.domain.bo.BusinessAddDto;
 import com.dsk.biz.domain.bo.BusinessListDto;
 import com.dsk.biz.domain.bo.CustomerBusinessSearchDto;
+import com.dsk.biz.domain.vo.BusinessBrowseVo;
+import com.dsk.biz.domain.vo.BusinessLikeProjectNameListVo;
 import com.dsk.biz.domain.vo.BusinessListVo;
 import com.dsk.biz.domain.vo.CustomerBusinessListVo;
+import com.dsk.common.core.domain.AjaxResult;
 import com.dsk.common.core.domain.PageQuery;
 import com.dsk.common.core.page.TableDataInfo;
 import org.springframework.web.multipart.MultipartFile;
@@ -17,21 +22,21 @@ import java.util.List;
  */
 public interface IBusinessInfoService
 {
-//    /**
-//     * 查询项目详情
-//     *
-//     * @param id 项目详情主键
-//     * @return 项目详情
-//     */
-//    public BusinessInfo selectBusinessInfoById(Integer id);
+    /**
+     * 查询项目详情
+     *
+     * @param id 项目详情主键
+     * @return 项目详情
+     */
+    public BusinessInfo selectBusinessInfoById(Integer id);
 
-//    /**
-//     * 查询项目建设内容
-//     *
-//     * @param id 项目详情主键
-//     * @return
-//     */
-//    BusinessInfo getConstruction(Integer id);
+    /**
+     * 查询项目建设内容
+     *
+     * @param id 项目详情主键
+     * @return
+     */
+    BusinessInfo getConstruction(Integer id);
 
     /**
      * 查询项目详情列表
@@ -41,58 +46,58 @@ public interface IBusinessInfoService
      */
     public TableDataInfo<BusinessListVo> selectBusinessInfoList(BusinessListDto dto, PageQuery pageQuery);
 
-//    /**
-//     * 查询项目速览
-//     * @param businessId
-//     * @return
-//     */
-//    BusinessBrowseVo browse(Integer businessId);
-//
-//    /**
-//     * 查询所有项目名称(支持模糊查询)
-//     * @return
-//     */
-//    List<BusinessLikeProjectNameListVo> selectProjectName(BusinessListDto dto);
+    /**
+     * 查询项目速览
+     * @param businessId
+     * @return
+     */
+    BusinessBrowseVo browse(Integer businessId);
+
+    /**
+     * 查询所有项目名称(支持模糊查询)
+     * @return
+     */
+    List<BusinessLikeProjectNameListVo> selectProjectName(BusinessListDto dto);
+
+    /**
+     * 项目批量导入
+     */
+    AjaxResult batchUpload(MultipartFile file);
+
+    /**
+     * 新增项目详情
+     *
+     * @param dto 项目详情
+     * @return 结果
+     */
+    public boolean insertBusinessInfo(BusinessAddDto dto);
+
+    /**
+     * 修改项目详情
+     *
+     * @param businessInfo 项目详情
+     * @return 结果
+     */
+    public int updateBusinessInfo(BusinessInfo businessInfo);
+
+    /**
+     * 批量删除项目详情
+     *
+     * @param ids 需要删除的项目详情主键集合
+     * @return 结果
+     */
+    public int deleteBusinessInfoByIds(Long[] ids);
+
+    /**
+     * 删除项目详情信息
+     *
+     * @param id 项目详情主键
+     * @return 结果
+     */
+    public int deleteBusinessInfoById(Long id);
+
+    int selectCountByStatusAndCustomerId(Integer status,String customerId);
 
-//    /**
-//     * 项目批量导入
-//     */
-//    AjaxResult batchUpload(MultipartFile file);
-//
-//    /**
-//     * 新增项目详情
-//     *
-//     * @param dto 项目详情
-//     * @return 结果
-//     */
-//    public AjaxResult insertBusinessInfo(BusinessAddDto dto);
-//
-//    /**
-//     * 修改项目详情
-//     *
-//     * @param businessInfo 项目详情
-//     * @return 结果
-//     */
-//    public int updateBusinessInfo(BusinessInfo businessInfo);
-//
-//    /**
-//     * 批量删除项目详情
-//     *
-//     * @param ids 需要删除的项目详情主键集合
-//     * @return 结果
-//     */
-//    public int deleteBusinessInfoByIds(Long[] ids);
-//
-//    /**
-//     * 删除项目详情信息
-//     *
-//     * @param id 项目详情主键
-//     * @return 结果
-//     */
-//    public int deleteBusinessInfoById(Long id);
-//
-//    int selectCountByStatusAndCustomerId(Integer status,String customerId);
-//
     TableDataInfo<CustomerBusinessListVo> selectCustomerBusinessList(CustomerBusinessSearchDto dto, PageQuery pageQuery);
 
 }

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

+package com.dsk.biz.service;
+
+import com.dsk.biz.domain.BusinessLabel;
+import com.dsk.biz.domain.bo.BusinessIdDto;
+
+import java.util.List;
+
+/**
+ * 项目标签Service接口
+ *
+ * @date 2023-05-17
+ */
+public interface IBusinessLabelService
+{
+    /**
+     * 查询项目标签
+     *
+     * @param id 项目标签主键
+     * @return 项目标签
+     */
+    public BusinessLabel selectBusinessLabelById(Long id);
+
+    /**
+     * 查询项目标签列表
+     *
+     * @param businessLabel 项目标签
+     * @return 项目标签集合
+     */
+    public List<BusinessLabel> selectBusinessLabelList(BusinessLabel businessLabel);
+
+    /**
+     * 新增项目标签
+     *
+     * @param businessLabel 项目标签
+     * @return 结果
+     */
+    public int insertBusinessLabel(BusinessLabel businessLabel);
+
+    /**
+     * 修改项目标签
+     *
+     * @param businessLabel 项目标签
+     * @return 结果
+     */
+    public int updateBusinessLabel(BusinessLabel businessLabel);
+
+    /**
+     * 批量删除项目标签
+     *
+     * @param ids 需要删除的项目标签主键集合
+     * @return 结果
+     */
+    public int deleteBusinessLabelByIds(Long[] ids);
+
+    /**
+     * 删除项目标签信息
+     *
+     * @param dto 项目主键
+     * @return 结果
+     */
+    public int deleteBusinessLabelById(BusinessIdDto dto);
+}

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

+package com.dsk.biz.service;
+
+import com.dsk.biz.domain.bo.BusinessSearchDto;
+import com.dsk.biz.domain.vo.BusinessAnalyzeVo;
+import com.dsk.common.core.domain.AjaxResult;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * @author lcl
+ * @create 2023/8/14
+ */
+public interface IBusinessOverviewService {
+
+    Map<String, Object> statusStatistics(BusinessSearchDto dto);
+
+    List<BusinessAnalyzeVo> amountAnalyze(BusinessSearchDto dto);
+
+    List<BusinessAnalyzeVo> typeAnalyze(BusinessSearchDto dto);
+
+    List<BusinessAnalyzeVo> categoryAnalyze(BusinessSearchDto dto);
+
+    AjaxResult countGroupByProvince(Map<String,Object> object);
+
+    AjaxResult rangByMoney(Map<String,Object> object);
+
+}

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

+package com.dsk.biz.service;
+
+
+import com.dsk.biz.domain.BusinessRelateCompany;
+import com.dsk.biz.domain.bo.BusinessIdDto;
+import com.dsk.common.core.domain.PageQuery;
+import com.dsk.common.core.page.TableDataInfo;
+
+import java.util.List;
+
+/**
+ * 项目关联单位Service接口
+ *
+ * @author lxl
+ * @date 2023-05-17
+ */
+public interface IBusinessRelateCompanyService
+{
+    /**
+     * 查询项目关联单位
+     *
+     * @param id 项目关联单位主键
+     * @return 项目关联单位
+     */
+    public BusinessRelateCompany selectBusinessRelateCompanyById(Long id);
+
+    /**
+     * 查询项目关联单位列表
+     *
+     * @param bo 项目关联单位
+     * @return 项目关联单位集合
+     */
+    public TableDataInfo<BusinessRelateCompany> selectBusinessRelateCompanyList(BusinessRelateCompany bo, PageQuery pageQuery);
+
+    /**
+     * 新增项目关联单位
+     *
+     * @param businessRelateCompany 项目关联单位
+     * @return 结果
+     */
+    public int insertBusinessRelateCompany(BusinessRelateCompany businessRelateCompany);
+
+    /**
+     * 修改项目关联单位
+     *
+     * @param businessRelateCompany 项目关联单位
+     * @return 结果
+     */
+    public int updateBusinessRelateCompany(BusinessRelateCompany businessRelateCompany);
+
+    /**
+     * 批量删除项目关联单位
+     *
+     * @param ids 需要删除的项目关联单位主键集合
+     * @return 结果
+     */
+    public int deleteBusinessRelateCompanyByIds(Long[] ids);
+
+    /**
+     * 删除项目关联单位信息
+     *
+     * @param id 项目关联单位主键
+     * @return 结果
+     */
+    public int deleteBusinessRelateCompanyById(Long id);
+
+    /**
+     * 查询关联单位角色
+     */
+     List<String> companyRoleList(BusinessIdDto dto);
+}

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

+package com.dsk.biz.service.impl;
+
+import cn.hutool.core.bean.BeanException;
+import cn.hutool.core.util.ObjectUtil;
+import com.dsk.biz.domain.BusinessBacklog;
+import com.dsk.biz.domain.bo.BusinessBacklogListDto;
+import com.dsk.biz.domain.vo.BusinessBacklogListVo;
+import com.dsk.biz.mapper.BusinessBacklogMapper;
+import com.dsk.biz.service.IBusinessBacklogService;
+import com.dsk.common.core.domain.PageQuery;
+import com.dsk.common.core.page.TableDataInfo;
+import com.dsk.common.exception.base.BaseException;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import javax.annotation.Resource;
+import java.util.Date;
+import java.util.List;
+
+/**
+ * 项目工作待办Service业务层处理
+ *
+ * @author lxl
+ * @date 2023-05-17
+ */
+@Service
+@Slf4j
+public class BusinessBacklogServiceImpl implements IBusinessBacklogService {
+    @Resource
+    private BusinessBacklogMapper businessBacklogMapper;
+
+    /**
+     * 查询项目工作待办
+     *
+     * @param id 项目工作待办主键
+     * @return 项目工作待办
+     */
+    @Override
+    public BusinessBacklog selectBusinessBacklogById(Integer id) {
+        return businessBacklogMapper.selectBusinessBacklogById(id);
+    }
+
+    /**
+     * 查询项目工作待办列表
+     *
+     * @param dto 项目工作待办
+     * @return 项目工作待办
+     */
+    @Override
+    public TableDataInfo<BusinessBacklogListVo> selectBusinessBacklogList(BusinessBacklogListDto dto, PageQuery pageQuery) {
+        if (ObjectUtil.isEmpty(dto.getBusinessId())) {
+            throw new BeanException("项目id不能为空！");
+        }
+        if (ObjectUtil.isEmpty(dto.getState())) {
+            throw new BeanException("工作代办状态不能为空！");
+        }
+        switch (dto.getState()) {
+            case 0:
+                dto.setStartTime(new Date());
+                break;
+            case 1:
+                break;
+            case 2:
+                dto.setState(0);
+                dto.setEndTime(new Date());
+                break;
+            default:
+                throw new BeanException("工作代办状态参数错误！");
+        }
+        return TableDataInfo.build(businessBacklogMapper.selectBusinessBacklogList(pageQuery.build(), dto));
+    }
+
+    /**
+     * 新增项目工作待办
+     *
+     * @param businessBacklog 项目工作待办
+     * @return 结果
+     */
+    @Override
+    @Transactional
+    public int insertBusinessBacklog(BusinessBacklog businessBacklog) {
+        if (ObjectUtil.isNotEmpty(businessBacklog.getDueTime())) {
+            if (businessBacklog.getDueTime().before(new Date())) throw new BaseException("到期时间必须大于当前时间");
+        }
+        return businessBacklogMapper.insertBusinessBacklog(businessBacklog);
+    }
+
+    /**
+     * 修改项目工作待办
+     *
+     * @param businessBacklog 项目工作待办
+     * @return 结果
+     */
+    @Override
+    @Transactional
+    public int updateBusinessBacklog(BusinessBacklog businessBacklog) {
+        if (ObjectUtil.isEmpty(businessBacklog.getId())) {
+            throw new BeanException("id不能为空！");
+        }
+        if (ObjectUtil.isEmpty(businessBacklog.getState())) {
+            throw new BeanException("状态不能为空！");
+        }
+        switch (businessBacklog.getState()) {
+            case 0:
+                businessBacklog.setFinishTime(null);
+                break;
+            case 1:
+                businessBacklog.setFinishTime(new Date());
+                break;
+            default:
+                throw new BeanException("状态参数错误！");
+        }
+        return businessBacklogMapper.updateBusinessBacklog(businessBacklog);
+    }
+
+    /**
+     * 批量删除项目工作待办
+     *
+     * @param ids 需要删除的项目工作待办主键
+     * @return 结果
+     */
+    @Override
+    public int deleteBusinessBacklogByIds(Long[] ids) {
+        return businessBacklogMapper.deleteBusinessBacklogByIds(ids);
+    }
+
+    /**
+     * 删除项目工作待办信息
+     *
+     * @param id 项目工作待办主键
+     * @return 结果
+     */
+    @Override
+    public int deleteBusinessBacklogById(Long id) {
+        return businessBacklogMapper.deleteBusinessBacklogById(id);
+    }
+
+    @Override
+    public Integer overdueCount(Integer businessId) {
+        return businessBacklogMapper.overdueCount(businessId);
+    }
+}

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

+package com.dsk.biz.service.impl;
+
+import com.dsk.biz.domain.BusinessFollowRecord;
+import com.dsk.biz.domain.bo.BusinessIdDto;
+import com.dsk.biz.domain.bo.BusinessListDto;
+import com.dsk.biz.domain.vo.BusinessListVo;
+import com.dsk.biz.mapper.BusinessFollowRecordMapper;
+import com.dsk.biz.service.IBusinessFollowRecordService;
+import com.dsk.common.core.domain.PageQuery;
+import com.dsk.common.core.page.TableDataInfo;
+import com.dsk.common.utils.DateUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import javax.annotation.Resource;
+import java.util.List;
+
+/**
+ * 项目跟进记录Service业务层处理
+ *
+ * @author lxl
+ * @date 2023-05-17
+ */
+@Service
+public class BusinessFollowRecordServiceImpl implements IBusinessFollowRecordService
+{
+    @Resource
+    private BusinessFollowRecordMapper businessFollowRecordMapper;
+
+    /**
+     * 查询项目跟进记录
+     *
+     * @param id 项目跟进记录主键
+     * @return 项目跟进记录
+     */
+    @Override
+    public BusinessFollowRecord selectBusinessFollowRecordById(Long id)
+    {
+        return businessFollowRecordMapper.selectBusinessFollowRecordById(id);
+    }
+
+    @Override
+    public TableDataInfo<BusinessFollowRecord> selectBusinessFollowRecordList(BusinessIdDto dto, PageQuery pageQuery)
+    {
+        return TableDataInfo.build(businessFollowRecordMapper.selectBusinessFollowRecordList(pageQuery.build(),dto));
+    }
+
+    @Override
+//    @DataScope(userAlias = "u",deptAlias = "d")
+    public TableDataInfo<BusinessFollowRecord> allFollow(BusinessListDto dto, PageQuery pageQuery) {
+        //userId不传值，就查询全部
+//        if (dto.getUserId() == null) {
+//            Long deptId = SecurityUtils.getLoginUser().getDeptId();
+//            if (deptId == null) throw new BaseException("请登录");
+//            dto.setDeptId(deptId.intValue());
+//        }
+        return TableDataInfo.build(businessFollowRecordMapper.allFollow(pageQuery.build(),dto));
+    }
+
+    @Override
+    public List<BusinessFollowRecord> businessFollowRecordPaging(BusinessFollowRecord businessFollowRecord) {
+        return businessFollowRecordMapper.businessFollowRecordPaging(businessFollowRecord);
+    }
+
+    /**
+     * 新增项目跟进记录
+     *
+     * @param businessFollowRecord 项目跟进记录
+     * @return 结果
+     */
+    @Override
+    @Transactional
+    public int insertBusinessFollowRecord(BusinessFollowRecord businessFollowRecord)
+    {
+        return businessFollowRecordMapper.insertBusinessFollowRecord(businessFollowRecord);
+    }
+
+    @Override
+    public List<BusinessListVo> selectRelateProject(Integer userId) {
+        return businessFollowRecordMapper.selectRelateProject(userId);
+    }
+
+    @Override
+    public List<String> selectRelateCompany(Integer userId) {
+        return businessFollowRecordMapper.selectRelateCompany(userId);
+    }
+
+    /**
+     * 修改项目跟进记录
+     *
+     * @param businessFollowRecord 项目跟进记录
+     * @return 结果
+     */
+    @Override
+    public int updateBusinessFollowRecord(BusinessFollowRecord businessFollowRecord)
+    {
+        businessFollowRecord.setUpdateTime(DateUtils.getNowDate());
+        return businessFollowRecordMapper.updateBusinessFollowRecord(businessFollowRecord);
+    }
+
+    /**
+     * 批量删除项目跟进记录
+     *
+     * @param ids 需要删除的项目跟进记录主键
+     * @return 结果
+     */
+    @Override
+    @Transactional
+    public int deleteBusinessFollowRecordByIds(Long[] ids)
+    {
+        return businessFollowRecordMapper.deleteBusinessFollowRecordByIds(ids);
+    }
+
+    /**
+     * 删除项目跟进记录信息
+     *
+     * @param id 项目跟进记录主键
+     * @return 结果
+     */
+    @Override
+    public int deleteBusinessFollowRecordById(Long id)
+    {
+        return businessFollowRecordMapper.deleteBusinessFollowRecordById(id);
+    }
+}

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

@@ -5,21 +5,29 @@ import cn.hutool.core.collection.CollectionUtil;
 import cn.hutool.core.map.MapUtil;
 import cn.hutool.core.util.ObjectUtil;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.dsk.biz.domain.BusinessInfo;
+import com.dsk.biz.domain.*;
+import com.dsk.biz.domain.bo.BusinessAddDto;
+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.BusinessListVo;
-import com.dsk.biz.domain.vo.CustomerBusinessListVo;
+import com.dsk.biz.domain.vo.*;
+import com.dsk.jsk.service.EnterpriseService;
 import com.dsk.biz.mapper.BusinessInfoMapper;
+import com.dsk.biz.mapper.BusinessLabelMapper;
+import com.dsk.biz.mapper.BusinessRelateCompanyMapper;
+import com.dsk.biz.mapper.BusinessUserMapper;
 import com.dsk.biz.service.IBusinessInfoService;
+import com.dsk.biz.service.ICustomerService;
+import com.dsk.common.core.domain.AjaxResult;
 import com.dsk.common.core.domain.PageQuery;
 import com.dsk.common.core.page.TableDataInfo;
 import com.dsk.common.exception.ServiceException;
 import com.dsk.common.exception.base.BaseException;
 import com.dsk.common.helper.LoginHelper;
+import com.dsk.common.utils.CheckUtils;
+import com.dsk.common.utils.DskOpenApiUtil;
+import com.dsk.common.utils.JsonUtils;
 import com.dsk.common.utils.StringUtils;
-import com.dsk.common.utils.file.FileUtils;
-import com.google.api.client.util.SecurityUtils;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.collections4.MapUtils;
@@ -42,38 +50,38 @@ import java.util.*;
 public class BusinessInfoServiceImpl implements IBusinessInfoService {
     @Resource
     private BusinessInfoMapper businessInfoMapper;
-//    @Resource
-//    private BusinessUserMapper businessUserMapper;
-//    @Resource
-//    private BusinessLabelMapper businessLabelMapper;
-//    @Resource
-//    private ReadBusinessInfoExcel readBusinessInfoExcel;
-//    @Resource
-//    private BusinessRelateCompanyMapper relateCompanyMapper;
-//    @Resource
-//    private DskOpenApiUtil dskOpenApiUtil;
-//    @Autowired
-//    private ICustomerService customerService;
-//    @Autowired
-//    private EnterpriseService enterpriseService;
-//
-//
-//    /**
-//     * 查询项目详情
-//     *
-//     * @param id 项目详情主键
-//     * @return 项目详情
-//     */
-//    @Override
-//    public BusinessInfo selectBusinessInfoById(Integer id) {
-//        return businessInfoMapper.selectBusinessInfoById(id);
-//    }
-//
-//    @Override
-//    public BusinessInfo getConstruction(Integer id) {
-//        BusinessInfo businessInfo = businessInfoMapper.getConstruction(id);
-//        return ObjectUtil.isEmpty(businessInfo) ? new BusinessInfo() : businessInfo;
-//    }
+    @Resource
+    private BusinessUserMapper businessUserMapper;
+    @Resource
+    private BusinessLabelMapper businessLabelMapper;
+    @Resource
+    private ReadBusinessInfoExcel readBusinessInfoExcel;
+    @Resource
+    private BusinessRelateCompanyMapper relateCompanyMapper;
+    @Resource
+    private DskOpenApiUtil dskOpenApiUtil;
+    @Autowired
+    private ICustomerService customerService;
+    @Autowired
+    private EnterpriseService enterpriseService;
+
+
+    /**
+     * 查询项目详情
+     *
+     * @param id 项目详情主键
+     * @return 项目详情
+     */
+    @Override
+    public BusinessInfo selectBusinessInfoById(Integer id) {
+        return businessInfoMapper.selectBusinessInfoById(id);
+    }
+
+    @Override
+    public BusinessInfo getConstruction(Integer id) {
+        BusinessInfo businessInfo = businessInfoMapper.getConstruction(id);
+        return ObjectUtil.isEmpty(businessInfo) ? new BusinessInfo() : businessInfo;
+    }
 
     /**
      * 查询项目详情列表
@@ -95,236 +103,241 @@ public class BusinessInfoServiceImpl implements IBusinessInfoService {
         return TableDataInfo.build(page);
     }
 
-    //
-//    @Override
-//    public BusinessBrowseVo browse(Integer businessId) {
-//        BusinessBrowseVo businessBrowseVo = new BusinessBrowseVo();
-//        //查询项目基本信息
-//        BusinessInfo businessInfo = businessInfoMapper.selectBusinessInfoById(businessId);
-//        if (ObjectUtil.isNotEmpty(businessInfo)) BeanUtil.copyProperties(businessInfo, businessBrowseVo);
-//        //商务团队
-//        businessBrowseVo.setTeam(businessUserMapper.selectCreatorByBusinessId(businessId));
-//        //查询是否是项目创建人
-//        Long userId = SecurityUtils.getLoginUser().getUserId();
-//        if (userId == null) throw new BaseException("请登录");
-//        Integer founder = businessUserMapper.selectFounder(businessId, userId);
-//        businessBrowseVo.setIsFounder(founder == null ? 0 : founder);
-//        //查询项目标签
-//        List<BusinessLabel> labels = businessLabelMapper.selectBusinessLabelList(new BusinessLabel(businessId));
-//        String labelList = CollectionUtil.isEmpty(labels) ? null : JSONObject.toJSONString(BeanUtil.copyToList(labels, BusinessLabelVo.class));
-//        businessBrowseVo.setLabelList(labelList);
-//        //相关数据统计
-//        BusinessBrowseVo total = businessInfoMapper.selectTotal(businessId);
-//        businessBrowseVo.setBacklogCount(total.getBacklogCount());
-//        businessBrowseVo.setContactsCount(total.getContactsCount());
-//        businessBrowseVo.setFollowRecordCount(total.getFollowRecordCount());
-//        businessBrowseVo.setRelateCompanyCount(total.getRelateCompanyCount());
-//        //资料文档统计
+
+    @Override
+    public BusinessBrowseVo browse(Integer businessId) {
+        BusinessBrowseVo businessBrowseVo = new BusinessBrowseVo();
+        //查询项目基本信息
+        BusinessInfo businessInfo = businessInfoMapper.selectBusinessInfoById(businessId);
+        if (ObjectUtil.isNotEmpty(businessInfo)) BeanUtil.copyProperties(businessInfo, businessBrowseVo);
+        //商务团队
+        businessBrowseVo.setTeam(businessUserMapper.selectCreatorByBusinessId(businessId));
+        //查询是否是项目创建人
+        Long userId = LoginHelper.getUserId();
+        if (userId == null) throw new BaseException("请登录");
+        Integer founder = businessUserMapper.selectFounder(businessId, userId);
+        businessBrowseVo.setIsFounder(founder == null ? 0 : founder);
+        //查询项目标签
+        List<BusinessLabel> labels = businessLabelMapper.selectBusinessLabelList(new BusinessLabel(businessId));
+
+        String labelList = CollectionUtil.isEmpty(labels) ? null : JsonUtils.toJsonString(BeanUtil.copyToList(labels, BusinessLabelVo.class));
+        businessBrowseVo.setLabelList(labelList);
+        //相关数据统计
+        BusinessBrowseVo total = businessInfoMapper.selectTotal(businessId);
+        businessBrowseVo.setBacklogCount(total.getBacklogCount());
+        businessBrowseVo.setContactsCount(total.getContactsCount());
+        businessBrowseVo.setFollowRecordCount(total.getFollowRecordCount());
+        businessBrowseVo.setRelateCompanyCount(total.getRelateCompanyCount());
+        //资料文档统计
 //        businessBrowseVo.setFileCount(FileUtils.getAllFileNames(ShuZhiHuaConfig.getProfile() + businessId).size());
-//        return businessBrowseVo;
-//    }
-//
-//    @Override
-//    public List<BusinessLikeProjectNameListVo> selectProjectName(BusinessListDto dto) {
-////        List<BusinessLikeProjectNameListVo> vos = businessInfoMapper.selectProjectName(dto);
-//        List<BusinessLikeProjectNameListVo> vos = new ArrayList<>();
-//        try {
-//            Map<String, Object> result = dskOpenApiUtil.requestBody("/nationzj/jskBid/news/findByName", toRequestMap(dto));
-//            if (ObjectUtil.isNotEmpty(result.get("data"))) {
-//                List<Map<String, Object>> list = (List<Map<String, Object>>) BeanUtil.beanToMap(result.get("data")).get("list");
-//                if (!CollectionUtils.isEmpty(list)) {
-//                    for (Map<String, Object> map : list) {
-//                        BusinessLikeProjectNameListVo vo = new BusinessLikeProjectNameListVo();
-//                        vo.setProjectName(StringUtils.markInRed(MapUtil.getStr(map, "projectName"), dto.getProjectName()));
-//                        vo.setCompanyName(MapUtil.getStr(map, "tenderee"));
-//                        if (null!=map.get("projectContractAmount")&&ObjectUtil.isNotEmpty(map.get("projectContractAmount"))){
-//                            vo.setInvestmentAmount(MapUtil.getDouble(map, "projectContractAmount"));
-//                        }
-////                        vo.setProjectType(MapUtil.getStr(map, "projectCategory"));
-//                        //项目阶段
-//                        vo.setProjectStage(MapUtil.getStr(map, "tenderStage"));
-//                        //项目类别
-//                        vo.setProjectCategory(MapUtil.getStr(map, "projectCategory"));
-//                        vos.add(vo);
-//                    }
-//                }
-//            }
-//        } catch (Exception e) {
-//            log.error("模糊查询项目名称调用失败！",e);
-//        }
-//
-//        return vos;
-//    }
-//
-//    private Map<String, Object> toRequestMap(BusinessListDto dto) {
-//        Map<String, Object> page = new HashMap<>();
-//        page.put("page", 1);
-//        page.put("limit", 20);
-//        Map<String, Object> map = new HashMap<>();
-//        map.put("keyword", dto.getProjectName());
-//        map.put("page", page);
-//        return map;
-//    }
-//
-//    @Override
-//    public AjaxResult batchUpload(MultipartFile file) {
-//        //获取当前登录用户id
-//        Long userId = SecurityUtils.getLoginUser().getUserId();
-//        if (userId == null) return AjaxResult.error("请登录");
-//        int row = 3;//起始行数
-//        int rowSuccess = 0;//成功条数
-//        Integer errorCount = 0;//失败条数
-//        List<String> result = new LinkedList();//导入结果汇总
-//        List<BusinessExcelDto> businessInfoList = readBusinessInfoExcel.getExcelInfo(file);
-//        if (CollectionUtil.isEmpty(businessInfoList)) return AjaxResult.error("文档中无项目信息,请按照模板文档格式上传");
-//        for (BusinessExcelDto businessInfo : businessInfoList) {
-//            //查询已有的项目名称
-//            Integer count = businessInfoMapper.isRepetitionProjectName(businessInfo.getProjectName(), userId, businessInfo.getOwnerCompany());
-//            row++;
-//            if (count > 0) {
-//                //如果存在，跳过该项目，不保存
-////                result.add("第" + row + "行的" + businessInfo.getProjectName() + "的项目已存在,跳过该项目，保存下一条");
-//                log.info("第" + row + "行的" + businessInfo.getProjectName() + "的项目已存在,跳过该项目，保存下一条");
-//                errorCount++;
-//            } else {
-//                //保存到数据库
-//                BusinessAddDto businessAddDto = new BusinessAddDto();
-//                BeanUtil.copyProperties(businessInfo, businessAddDto);
-//                businessAddDto.setUserId(userId);
-//                AjaxResult add = insertBusinessInfo(businessAddDto);
-//                if (add.get("code").equals(HttpStatus.SUCCESS)) rowSuccess++;
-//            }
-//        }
-//        result.add("导入项目成功条数" + rowSuccess);
-//        result.add("导入项目去重条数" + errorCount);
-//        AjaxResult success = AjaxResult.success(String.join(",", result));
-//        success.put("successCount", rowSuccess);
-//        return success;
-//    }
-//
-//    /**
-//     * 新增项目详情
-//     *
-//     * @param dto 项目详情
-//     * @return 结果
-//     */
-//    @Override
-//    @Transactional
-//    public AjaxResult insertBusinessInfo(BusinessAddDto dto) {
-//        //新增前查询是否已存在
-//        int count = businessInfoMapper.isRepetitionProjectName(dto.getProjectName(), dto.getUserId(), dto.getOwnerCompany());
-//        if (count > 0) return AjaxResult.error("项目名称已存在");
-//        //判断资金Double类型的位数
-//        if (dto.getInvestmentAmount() != null) {
-//            int front = CheckUtils.checkIntegerPlaces(dto.getInvestmentAmount());
-//            int later = CheckUtils.checkDecimalPlaces(dto.getInvestmentAmount());
-//            if (front > 9) return AjaxResult.error("小数点前最多支持9位");
-//            if (later > 6) return AjaxResult.error("小数点后最多支持6位");
-//        }
-//        //新增项目主信息
-//        BusinessInfo businessInfo = new BusinessInfo();
-//        BeanUtil.copyProperties(dto, businessInfo);
-//
-//        CustomerVo vo = new CustomerVo();
-//        if (ObjectUtil.isNotEmpty(dto.getCustomerId())) {
-//            vo = customerService.info(dto.getCustomerId());
-//        } else {
-//            Customer verifyCustomer = customerService.selectByCompanyNameAndUserId(dto.getOwnerCompany());
-//            if (ObjectUtil.isNotEmpty(verifyCustomer)) {
-//                BeanUtil.copyProperties(verifyCustomer, vo);
-//            } else {
-//                vo.setCompanyName(dto.getOwnerCompany());
-//                customerService.add(vo);
-//            }
-//            businessInfo.setCustomerId(vo.getCustomerId());
-//        }
-//        businessInfo.setConstructionUnit(vo.getCompanyName());
-//        businessInfo.setConstructionUnitUipId(vo.getUipId());
-//        businessInfo.setConstructionUnitCid(vo.getCompanyId());
-//        businessInfo.setConstructionPrincipal(vo.getLegalPerson());
-//
-//        int addBusiness = businessInfoMapper.insertBusinessInfo(businessInfo);
-//        if (addBusiness > 0) {
-//            //获取登陆用户的部门id
-//            //新增用户-项目关系信息
-//            int addbusinessUser = businessUserMapper.insertBusinessUser(new BusinessUser(businessInfo.getId(), SecurityUtils.getDeptId(), dto.getUserId(), 1));
-//            if (addbusinessUser == 0) {
-//                throw new ServiceException("项目关系信息添加失败！");
-//            }
-//        }
-//
-//        int i = relateCompanyMapper.insertBusinessRelateCompany(dealwithCustomer(businessInfo));
-//        if (i == 0) {
-//            throw new ServiceException("业主单位信息添加失败！");
-//        }
-//        return AjaxResult.success();
-//
-//    }
-//
-//    /**
-//     * 修改项目详情
-//     *
-//     * @param businessInfo 项目详情
-//     * @return 结果
-//     */
-//    @Override
-//    @Transactional
-//    public int updateBusinessInfo(BusinessInfo businessInfo) {
-//        if (ObjectUtil.isEmpty(businessInfo.getId())) {
-//            throw new BaseException("项目id不能为空！");
-//        }
-//        //判断资金Double类型的位数
-//        if (ObjectUtil.isNotEmpty(businessInfo.getInvestmentAmount())) {
-//            int front = CheckUtils.checkIntegerPlaces(businessInfo.getInvestmentAmount());
-//            int later = CheckUtils.checkDecimalPlaces(businessInfo.getInvestmentAmount());
-//            if (front > 9) throw new BaseException("500", "小数点前最多支持9位");
-//            if (later > 6) throw new BaseException("500", "小数点后最多支持6位");
-//        }
-//        if (StringUtils.isNotEmpty(businessInfo.getConstructionPhone()) && StringUtils.isNotEmpty(businessInfo.getSupervisorPhone())) {
-//            if (!CheckUtils.isPhone(businessInfo.getConstructionPhone()) || !CheckUtils.isPhone(businessInfo.getSupervisorPhone()))
-//                throw new BaseException("500", "请输入正确的电话号码");
-//        }
-//        //查询企业的城投id和建设库id
-//        BusinessRelateCompany relateCompany = relateCompanyMapper.selectByProprietor(businessInfo.getId());
-//        if (ObjectUtil.isNotEmpty(businessInfo.getConstructionUnit())) {
-//            Map<String, Object> map = enterpriseService.getCidAndUipIdByCompanyName(businessInfo.getConstructionUnit());
-//            businessInfo.setConstructionUnitUipId(MapUtils.getString(map, "uipId"));
-//            businessInfo.setConstructionUnitCid(MapUtils.getInteger(map, "companyId"));
-//            //相关企业
-//            if (ObjectUtil.isEmpty(relateCompany)) {
-//                relateCompanyMapper.insertBusinessRelateCompany(dealwithCustomer(businessInfo));
-//            }
-//            if (ObjectUtil.isNotEmpty(relateCompany) && !businessInfo.getConstructionUnit().equals(relateCompany.getCompanyName())) {
-//                relateCompany.setCompanyId(businessInfo.getConstructionUnitCid());
-//                relateCompany.setCompanyUipId(businessInfo.getConstructionUnitUipId());
-//                relateCompany.setCompanyName(businessInfo.getConstructionUnit());
-//                relateCompanyMapper.updateBusinessRelateCompany(relateCompany);
-//            }
-//
-//        }
-//        if (ObjectUtil.isNotEmpty(relateCompany) &&
-//                (ObjectUtil.isNotEmpty(businessInfo.getConstructionPhone())
-//                        || ObjectUtil.isNotEmpty(businessInfo.getConstructionPrincipal()))) {
-//            relateCompany.setPhone(businessInfo.getConstructionPhone());
-//            relateCompany.setResponsiblePerson(businessInfo.getConstructionPrincipal());
-//            relateCompanyMapper.updateBusinessRelateCompany(relateCompany);
-//        }
-//        return businessInfoMapper.updateBusinessInfo(businessInfo);
-//    }
-//
-//    /**
-//     * 批量删除项目
-//     * 项目关联的其他所有表数据一并删除
-//     *
-//     * @param ids 需要删除的项目详情主键
-//     * @return 结果
-//     */
-//    @Override
-//    @Transactional
-//    public int deleteBusinessInfoByIds(Long[] ids) {
-//        //删除项目详情，用户关联项目，项目工作代办，项目联系人，项目跟进记录，项目标签，项目相关企业
-//        int deleteBusiness = businessInfoMapper.deleteBusinessInfoByIds(ids);
-//        //删除项目上传的文件
+        return businessBrowseVo;
+    }
+
+    @Override
+    public List<BusinessLikeProjectNameListVo> selectProjectName(BusinessListDto dto) {
+//        List<BusinessLikeProjectNameListVo> vos = businessInfoMapper.selectProjectName(dto);
+        List<BusinessLikeProjectNameListVo> vos = new ArrayList<>();
+        try {
+            Map<String, Object> result = dskOpenApiUtil.requestBody("/nationzj/jskBid/news/findByName", toRequestMap(dto));
+            if (ObjectUtil.isNotEmpty(result.get("data"))) {
+                List<Map<String, Object>> list = (List<Map<String, Object>>) BeanUtil.beanToMap(result.get("data")).get("list");
+                if (!CollectionUtils.isEmpty(list)) {
+                    for (Map<String, Object> map : list) {
+                        BusinessLikeProjectNameListVo vo = new BusinessLikeProjectNameListVo();
+                        vo.setProjectName(StringUtils.markInRed(MapUtil.getStr(map, "projectName"), dto.getProjectName()));
+                        vo.setCompanyName(MapUtil.getStr(map, "tenderee"));
+                        if (null != map.get("projectContractAmount") && ObjectUtil.isNotEmpty(map.get("projectContractAmount"))) {
+                            vo.setInvestmentAmount(MapUtil.getDouble(map, "projectContractAmount"));
+                        }
+//                        vo.setProjectType(MapUtil.getStr(map, "projectCategory"));
+                        //项目阶段
+                        vo.setProjectStage(MapUtil.getStr(map, "tenderStage"));
+                        //项目类别
+                        vo.setProjectCategory(MapUtil.getStr(map, "projectCategory"));
+                        vos.add(vo);
+                    }
+                }
+            }
+        } catch (Exception e) {
+            log.error("模糊查询项目名称调用失败！", e);
+        }
+
+        return vos;
+    }
+
+    private Map<String, Object> toRequestMap(BusinessListDto dto) {
+        Map<String, Object> page = new HashMap<>();
+        page.put("page", 1);
+        page.put("limit", 20);
+        Map<String, Object> map = new HashMap<>();
+        map.put("keyword", dto.getProjectName());
+        map.put("page", page);
+        return map;
+    }
+
+    @Override
+    public AjaxResult batchUpload(MultipartFile file) {
+        //获取当前登录用户id
+        Long userId = LoginHelper.getUserId();
+        if (userId == null) return AjaxResult.error("请登录");
+        int row = 3;//起始行数
+        int rowSuccess = 0;//成功条数
+        Integer errorCount = 0;//失败条数
+        List<String> result = new LinkedList();//导入结果汇总
+        List<BusinessExcelDto> businessInfoList = readBusinessInfoExcel.getExcelInfo(file);
+        if (CollectionUtil.isEmpty(businessInfoList)) return AjaxResult.error("文档中无项目信息,请按照模板文档格式上传");
+        for (BusinessExcelDto businessInfo : businessInfoList) {
+            //查询已有的项目名称
+            Integer count = businessInfoMapper.isRepetitionProjectName(businessInfo.getProjectName(), userId, businessInfo.getOwnerCompany());
+            row++;
+            if (count > 0) {
+                //如果存在，跳过该项目，不保存
+//                result.add("第" + row + "行的" + businessInfo.getProjectName() + "的项目已存在,跳过该项目，保存下一条");
+                log.info("第" + row + "行的" + businessInfo.getProjectName() + "的项目已存在,跳过该项目，保存下一条");
+                errorCount++;
+            } else {
+                //保存到数据库
+                BusinessAddDto businessAddDto = new BusinessAddDto();
+                BeanUtil.copyProperties(businessInfo, businessAddDto);
+                businessAddDto.setUserId(userId);
+                try {
+                    new BusinessInfoServiceImpl().insertBusinessInfo(businessAddDto);
+                    rowSuccess++;
+                }catch (Exception e){
+                    errorCount++;
+                }
+            }
+        }
+        result.add("导入项目成功条数" + rowSuccess);
+        result.add("导入项目去重条数" + errorCount);
+        AjaxResult success = AjaxResult.success(String.join(",", result));
+        success.put("successCount", rowSuccess);
+        return success;
+    }
+
+    /**
+     * 新增项目详情
+     *
+     * @param dto 项目详情
+     * @return 结果
+     */
+    @Override
+    @Transactional
+    public boolean insertBusinessInfo(BusinessAddDto dto) {
+        //新增前查询是否已存在
+        int count = businessInfoMapper.isRepetitionProjectName(dto.getProjectName(), dto.getUserId(), dto.getOwnerCompany());
+        if (count > 0) throw new ServiceException("项目名称已存在");
+        //判断资金Double类型的位数
+        if (dto.getInvestmentAmount() != null) {
+            int front = CheckUtils.checkIntegerPlaces(dto.getInvestmentAmount());
+            int later = CheckUtils.checkDecimalPlaces(dto.getInvestmentAmount());
+            if (front > 9) throw new ServiceException("小数点前最多支持9位");
+            if (later > 6) throw new ServiceException("小数点后最多支持6位");
+        }
+        //新增项目主信息
+        BusinessInfo businessInfo = new BusinessInfo();
+        BeanUtil.copyProperties(dto, businessInfo);
+
+        CustomerVo vo = new CustomerVo();
+        if (ObjectUtil.isNotEmpty(dto.getCustomerId())) {
+            vo = customerService.info(dto.getCustomerId());
+        } else {
+            Customer verifyCustomer = customerService.selectByCompanyNameAndUserId(dto.getOwnerCompany());
+            if (ObjectUtil.isNotEmpty(verifyCustomer)) {
+                BeanUtil.copyProperties(verifyCustomer, vo);
+            } else {
+                vo.setCompanyName(dto.getOwnerCompany());
+                customerService.add(vo);
+            }
+            businessInfo.setCustomerId(vo.getCustomerId());
+        }
+        businessInfo.setConstructionUnit(vo.getCompanyName());
+        businessInfo.setConstructionUnitUipId(vo.getUipId());
+        businessInfo.setConstructionUnitCid(vo.getCompanyId());
+        businessInfo.setConstructionPrincipal(vo.getLegalPerson());
+
+        int addBusiness = businessInfoMapper.insertBusinessInfo(businessInfo);
+        if (addBusiness > 0) {
+            //获取登陆用户的部门id
+            //新增用户-项目关系信息
+            int addbusinessUser = businessUserMapper.insertBusinessUser(new BusinessUser(businessInfo.getId(), LoginHelper.getDeptId(), dto.getUserId(), 1));
+            if (addbusinessUser == 0) {
+                throw new ServiceException("项目关系信息添加失败！");
+            }
+        }
+
+        int i = relateCompanyMapper.insertBusinessRelateCompany(dealwithCustomer(businessInfo));
+        if (i == 0) {
+            throw new ServiceException("业主单位信息添加失败！");
+        }
+        return true;
+
+    }
+
+    /**
+     * 修改项目详情
+     *
+     * @param businessInfo 项目详情
+     * @return 结果
+     */
+    @Override
+    @Transactional
+    public int updateBusinessInfo(BusinessInfo businessInfo) {
+        if (ObjectUtil.isEmpty(businessInfo.getId())) {
+            throw new BaseException("项目id不能为空！");
+        }
+        //判断资金Double类型的位数
+        if (ObjectUtil.isNotEmpty(businessInfo.getInvestmentAmount())) {
+            int front = CheckUtils.checkIntegerPlaces(businessInfo.getInvestmentAmount());
+            int later = CheckUtils.checkDecimalPlaces(businessInfo.getInvestmentAmount());
+            if (front > 9) throw new BaseException("500", "小数点前最多支持9位");
+            if (later > 6) throw new BaseException("500", "小数点后最多支持6位");
+        }
+        if (StringUtils.isNotEmpty(businessInfo.getConstructionPhone()) && StringUtils.isNotEmpty(businessInfo.getSupervisorPhone())) {
+            if (!CheckUtils.isPhone(businessInfo.getConstructionPhone()) || !CheckUtils.isPhone(businessInfo.getSupervisorPhone()))
+                throw new BaseException("500", "请输入正确的电话号码");
+        }
+        //查询企业的城投id和建设库id
+        BusinessRelateCompany relateCompany = relateCompanyMapper.selectByProprietor(businessInfo.getId());
+        if (ObjectUtil.isNotEmpty(businessInfo.getConstructionUnit())) {
+            Map<String, Object> map = enterpriseService.getCidAndUipIdByCompanyName(businessInfo.getConstructionUnit());
+            businessInfo.setConstructionUnitUipId(MapUtils.getString(map, "uipId"));
+            businessInfo.setConstructionUnitCid(MapUtils.getInteger(map, "companyId"));
+            //相关企业
+            if (ObjectUtil.isEmpty(relateCompany)) {
+                relateCompanyMapper.insertBusinessRelateCompany(dealwithCustomer(businessInfo));
+            }
+            if (ObjectUtil.isNotEmpty(relateCompany) && !businessInfo.getConstructionUnit().equals(relateCompany.getCompanyName())) {
+                relateCompany.setCompanyId(businessInfo.getConstructionUnitCid());
+                relateCompany.setCompanyUipId(businessInfo.getConstructionUnitUipId());
+                relateCompany.setCompanyName(businessInfo.getConstructionUnit());
+                relateCompanyMapper.updateBusinessRelateCompany(relateCompany);
+            }
+
+        }
+        if (ObjectUtil.isNotEmpty(relateCompany) &&
+                (ObjectUtil.isNotEmpty(businessInfo.getConstructionPhone())
+                        || ObjectUtil.isNotEmpty(businessInfo.getConstructionPrincipal()))) {
+            relateCompany.setPhone(businessInfo.getConstructionPhone());
+            relateCompany.setResponsiblePerson(businessInfo.getConstructionPrincipal());
+            relateCompanyMapper.updateBusinessRelateCompany(relateCompany);
+        }
+        return businessInfoMapper.updateBusinessInfo(businessInfo);
+    }
+
+    /**
+     * 批量删除项目
+     * 项目关联的其他所有表数据一并删除
+     *
+     * @param ids 需要删除的项目详情主键
+     * @return 结果
+     */
+    @Override
+    @Transactional
+    public int deleteBusinessInfoByIds(Long[] ids) {
+        //删除项目详情，用户关联项目，项目工作代办，项目联系人，项目跟进记录，项目标签，项目相关企业
+        int deleteBusiness = businessInfoMapper.deleteBusinessInfoByIds(ids);
+        //删除项目上传的文件
 //        for (Long id : ids) {
 //            try {
 //                FileUtils.delFolder(ShuZhiHuaConfig.getUploadPath() + id);
@@ -332,48 +345,48 @@ public class BusinessInfoServiceImpl implements IBusinessInfoService {
 //                e.printStackTrace();
 //            }
 //        }
-//        return deleteBusiness;
-//    }
-//
-//    /**
-//     * 删除项目详情信息
-//     *
-//     * @param id 项目详情主键
-//     * @return 结果
-//     */
-//    @Override
-//    public int deleteBusinessInfoById(Long id) {
-//        return businessInfoMapper.deleteBusinessInfoById(id);
-//    }
-//
-//    /**
-//     * 查询项目数量
-//     *
-//     * @param status     项目状态
-//     * @param customerId 客户id
-//     * @return 项目数量
-//     */
-//    @Override
-//    public int selectCountByStatusAndCustomerId(Integer status, String customerId) {
-//        return businessInfoMapper.selectCountByStatusAndCustomerId(status, customerId);
-//    }
-//
+        return deleteBusiness;
+    }
+
+    /**
+     * 删除项目详情信息
+     *
+     * @param id 项目详情主键
+     * @return 结果
+     */
+    @Override
+    public int deleteBusinessInfoById(Long id) {
+        return businessInfoMapper.deleteBusinessInfoById(id);
+    }
+
+    /**
+     * 查询项目数量
+     *
+     * @param status     项目状态
+     * @param customerId 客户id
+     * @return 项目数量
+     */
+    @Override
+    public int selectCountByStatusAndCustomerId(Integer status, String customerId) {
+        return businessInfoMapper.selectCountByStatusAndCustomerId(status, customerId);
+    }
+
     @Override
     public TableDataInfo<CustomerBusinessListVo> selectCustomerBusinessList(CustomerBusinessSearchDto dto, PageQuery pageQuery) {
         return TableDataInfo.build(businessInfoMapper.selectCustomerBusinessList(pageQuery.build(), dto));
     }
-//
-//    private BusinessRelateCompany dealwithCustomer(BusinessInfo bean) {
-//        BusinessRelateCompany relateCompany = new BusinessRelateCompany();
-//        relateCompany.setBusinessId(bean.getId());
-//        relateCompany.setCompanyId(bean.getConstructionUnitCid());
-//        relateCompany.setCompanyUipId(bean.getConstructionUnitUipId());
-//        relateCompany.setCompanyName(bean.getConstructionUnit());
-//        relateCompany.setPhone(bean.getConstructionPhone());
-//        relateCompany.setCompanyRole("招采单位");
-//        relateCompany.setResponsiblePerson(bean.getConstructionPrincipal());
-//        relateCompany.setIsProprietor(1);
-//        relateCompany.setRemark("业主单位");
-//        return relateCompany;
-//    }
+
+    private BusinessRelateCompany dealwithCustomer(BusinessInfo bean) {
+        BusinessRelateCompany relateCompany = new BusinessRelateCompany();
+        relateCompany.setBusinessId(bean.getId());
+        relateCompany.setCompanyId(bean.getConstructionUnitCid());
+        relateCompany.setCompanyUipId(bean.getConstructionUnitUipId());
+        relateCompany.setCompanyName(bean.getConstructionUnit());
+        relateCompany.setPhone(bean.getConstructionPhone());
+        relateCompany.setCompanyRole("招采单位");
+        relateCompany.setResponsiblePerson(bean.getConstructionPrincipal());
+        relateCompany.setIsProprietor(1);
+        relateCompany.setRemark("业主单位");
+        return relateCompany;
+    }
 }

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

+package com.dsk.biz.service.impl;
+
+import com.dsk.biz.domain.BusinessLabel;
+import com.dsk.biz.domain.bo.BusinessIdDto;
+import com.dsk.biz.mapper.BusinessLabelMapper;
+import com.dsk.biz.service.IBusinessLabelService;
+import com.dsk.common.utils.DateUtils;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import javax.annotation.Resource;
+import java.util.List;
+
+/**
+ * 项目标签Service业务层处理
+ *
+ * @date 2023-05-17
+ */
+@Service
+public class BusinessLabelServiceImpl implements IBusinessLabelService
+{
+    @Resource
+    private BusinessLabelMapper businessLabelMapper;
+
+    /**
+     * 查询项目标签
+     *
+     * @param id 项目标签主键
+     * @return 项目标签
+     */
+    @Override
+    public BusinessLabel selectBusinessLabelById(Long id)
+    {
+        return businessLabelMapper.selectBusinessLabelById(id);
+    }
+
+    /**
+     * 查询项目标签列表
+     *
+     * @param businessLabel 项目标签
+     * @return 项目标签
+     */
+    @Override
+    public List<BusinessLabel> selectBusinessLabelList(BusinessLabel businessLabel)
+    {
+        return businessLabelMapper.selectBusinessLabelList(businessLabel);
+    }
+
+    /**
+     * 新增项目标签
+     *
+     * @param businessLabel 项目标签
+     * @return 结果
+     */
+    @Override
+    @Transactional
+    public int insertBusinessLabel(BusinessLabel businessLabel)
+    {
+        businessLabel.setCreateTime(DateUtils.getNowDate());
+        return businessLabelMapper.insertBusinessLabel(businessLabel);
+    }
+
+    /**
+     * 修改项目标签
+     *
+     * @param businessLabel 项目标签
+     * @return 结果
+     */
+    @Override
+    public int updateBusinessLabel(BusinessLabel businessLabel)
+    {
+        businessLabel.setUpdateTime(DateUtils.getNowDate());
+        return businessLabelMapper.updateBusinessLabel(businessLabel);
+    }
+
+    /**
+     * 批量删除项目标签
+     *
+     * @param ids 需要删除的项目标签主键
+     * @return 结果
+     */
+    @Override
+    public int deleteBusinessLabelByIds(Long[] ids)
+    {
+        return businessLabelMapper.deleteBusinessLabelByIds(ids);
+    }
+
+    /**
+     * 删除项目标签信息
+     *
+     * @param dto 项目主键
+     * @return 结果
+     */
+    @Override
+    @Transactional
+    public int deleteBusinessLabelById(BusinessIdDto dto)
+    {
+        return businessLabelMapper.deleteBusinessLabelById(dto);
+    }
+}

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

+package com.dsk.biz.service.impl;
+
+import cn.hutool.core.bean.BeanUtil;
+import com.dsk.biz.domain.bo.BusinessSearchDto;
+import com.dsk.biz.domain.vo.BusinessAnalyzeVo;
+import com.dsk.biz.mapper.BusinessInfoMapper;
+import com.dsk.biz.service.IBusinessOverviewService;
+import com.dsk.common.annotation.DataColumn;
+import com.dsk.common.annotation.DataPermission;
+import com.dsk.common.core.domain.AjaxResult;
+import com.dsk.common.utils.DskOpenApiUtil;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * @author lcl
+ * @create 2023/8/14
+ */
+@Service
+public class BusinessOverviewServiceImpl implements IBusinessOverviewService {
+
+    @Resource
+    private BusinessInfoMapper businessInfoMapper;
+
+    @Autowired
+    private DskOpenApiUtil dskOpenApiUtil;
+
+    @Override
+    @DataPermission({
+            @DataColumn(key = "deptName", value = "d.dept_id"),
+            @DataColumn(key = "userName", value = "u.user_id")
+    })
+    public Map<String, Object> statusStatistics(BusinessSearchDto dto) {
+        Map<String, Object> resultMap = new HashMap<>();
+        //总
+        resultMap.put("totalCount",businessInfoMapper.selectCountByStatus(dto));
+        //储备
+        dto.setStatus(0);
+        resultMap.put("reserveCount",businessInfoMapper.selectCountByStatus(dto));
+        //跟进
+        dto.setStatus(1);
+        resultMap.put("followUpCount",businessInfoMapper.selectCountByStatus(dto));
+        //中标(已合作)
+        dto.setStatus(2);
+        resultMap.put("bidCount",businessInfoMapper.selectCountByStatus(dto));
+        return resultMap;
+    }
+
+    @Override
+    @DataPermission({
+            @DataColumn(key = "deptName", value = "d.dept_id"),
+            @DataColumn(key = "userName", value = "u.user_id")
+    })
+    public List<BusinessAnalyzeVo> amountAnalyze(BusinessSearchDto dto) {
+        return businessInfoMapper.selectAmountAnalyze(dto);
+    }
+
+    @Override
+    @DataPermission({
+            @DataColumn(key = "deptName", value = "d.dept_id"),
+            @DataColumn(key = "userName", value = "u.user_id")
+    })
+    public List<BusinessAnalyzeVo> typeAnalyze(BusinessSearchDto dto) {
+        return businessInfoMapper.selectTypeAnalyze(dto);
+    }
+
+    @Override
+    @DataPermission({
+            @DataColumn(key = "deptName", value = "d.dept_id"),
+            @DataColumn(key = "userName", value = "u.user_id")
+    })
+    public List<BusinessAnalyzeVo> categoryAnalyze(BusinessSearchDto dto) {
+        return businessInfoMapper.selectCategoryAnalyze(dto);
+    }
+
+    @Override
+    public AjaxResult countGroupByProvince(Map<String,Object> object) {
+        Map<String, Object> map = dskOpenApiUtil.requestBody("/nationzj/marketAnalysis/project/countGroupByProvince", object);
+        return BeanUtil.toBean(map, AjaxResult.class);
+    }
+
+    @Override
+    public AjaxResult rangByMoney(Map<String,Object> object) {
+        Map<String, Object> map = dskOpenApiUtil.requestBody("/nationzj/marketAnalysis/project/rangByMoney", object);
+        return BeanUtil.toBean(map, AjaxResult.class);
+    }
+}

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

+package com.dsk.biz.service.impl;
+
+import cn.hutool.core.util.ObjectUtil;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.dsk.biz.domain.BusinessRelateCompany;
+import com.dsk.biz.domain.bo.BusinessIdDto;
+import com.dsk.jsk.service.EnterpriseService;
+import com.dsk.biz.mapper.BusinessRelateCompanyMapper;
+import com.dsk.biz.service.IBusinessRelateCompanyService;
+import com.dsk.common.core.domain.PageQuery;
+import com.dsk.common.core.page.TableDataInfo;
+import com.dsk.common.exception.base.BaseException;
+import com.dsk.common.utils.CheckUtils;
+import org.apache.commons.collections4.MapUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import javax.annotation.Resource;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+
+/**
+ * 项目关联单位Service业务层处理
+ *
+ * @author lxl
+ * @date 2023-05-17
+ */
+@Service
+public class BusinessRelateCompanyServiceImpl implements IBusinessRelateCompanyService {
+    @Resource
+    private BusinessRelateCompanyMapper businessRelateCompanyMapper;
+    @Autowired
+    private EnterpriseService enterpriseService;
+
+    /**
+     * 查询项目关联单位
+     *
+     * @param id 项目关联单位主键
+     * @return 项目关联单位
+     */
+    @Override
+    public BusinessRelateCompany selectBusinessRelateCompanyById(Long id) {
+        return businessRelateCompanyMapper.selectBusinessRelateCompanyById(id);
+    }
+
+    /**
+     * 查询项目关联单位列表
+     *
+     * @param bo 项目关联单位
+     * @return 项目关联单位
+     */
+    @Override
+    public TableDataInfo<BusinessRelateCompany> selectBusinessRelateCompanyList(BusinessRelateCompany bo, PageQuery pageQuery) {
+        return TableDataInfo.build(businessRelateCompanyMapper.selectBusinessRelateCompanyList(pageQuery.build(), bo));
+    }
+
+    /**
+     * 新增项目关联单位
+     *
+     * @param businessRelateCompany 项目关联单位
+     * @return 结果
+     */
+    @Override
+    @Transactional
+    public int insertBusinessRelateCompany(BusinessRelateCompany businessRelateCompany) {
+        if (ObjectUtil.isNotEmpty(businessRelateCompany.getPhone()) && !CheckUtils.isPhone(businessRelateCompany.getPhone())) {
+            throw new BaseException("500", "请输入正确的电话号码");
+        }
+        //查询企业的城投id和建设库id
+        Map<String, Object> map = enterpriseService.getCidAndUipIdByCompanyName(businessRelateCompany.getCompanyName());
+        businessRelateCompany.setCompanyUipId(MapUtils.getString(map, "uipId", null));
+        businessRelateCompany.setCompanyId(MapUtils.getInteger(map, "companyId", null));
+        return businessRelateCompanyMapper.insertBusinessRelateCompany(businessRelateCompany);
+    }
+
+    /**
+     * 修改项目关联单位
+     *
+     * @param businessRelateCompany 项目关联单位
+     * @return 结果
+     */
+    @Override
+    @Transactional
+    public int updateBusinessRelateCompany(BusinessRelateCompany businessRelateCompany) {
+        if (ObjectUtil.isNotEmpty(businessRelateCompany.getPhone()) && !CheckUtils.isPhone(businessRelateCompany.getPhone())) {
+            throw new BaseException("500", "请输入正确的电话号码");
+        }
+        //查询企业的城投id和建设库id
+        Map<String, Object> map = enterpriseService.getCidAndUipIdByCompanyName(businessRelateCompany.getCompanyName());
+        businessRelateCompany.setCompanyUipId(MapUtils.getString(map, "uipId", null));
+        businessRelateCompany.setCompanyId(MapUtils.getInteger(map, "companyId", null));
+        return businessRelateCompanyMapper.updateBusinessRelateCompany(businessRelateCompany);
+    }
+
+    /**
+     * 批量删除项目关联单位
+     *
+     * @param ids 需要删除的项目关联单位主键
+     * @return 结果
+     */
+    @Override
+    public int deleteBusinessRelateCompanyByIds(Long[] ids) {
+        return businessRelateCompanyMapper.deleteBusinessRelateCompanyByIds(ids);
+    }
+
+    /**
+     * 删除项目关联单位信息
+     *
+     * @param id 项目关联单位主键
+     * @return 结果
+     */
+    @Override
+    public int deleteBusinessRelateCompanyById(Long id) {
+        return businessRelateCompanyMapper.deleteBusinessRelateCompanyById(id);
+    }
+
+    @Override
+    public List<String> companyRoleList(BusinessIdDto dto) {
+        List<BusinessRelateCompany> roleList = businessRelateCompanyMapper.selectList(Wrappers.<BusinessRelateCompany>lambdaQuery()
+                .select(BusinessRelateCompany::getCompanyRole)
+                .eq(BusinessRelateCompany::getBusinessId, dto.getBusinessId())
+                .groupBy(BusinessRelateCompany::getCompanyRole)
+                .orderByDesc(BusinessRelateCompany::getCreateTime));
+        return roleList.stream().map(p -> p.getCompanyRole()).collect(Collectors.toList());
+    }
+}

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

@@ -4,14 +4,13 @@ import cn.hutool.core.bean.BeanException;
 import com.dsk.biz.domain.ContactInfo;
 import com.dsk.biz.domain.bo.ContactInfoSearchDto;
 import com.dsk.biz.domain.vo.ContactInfoListVo;
-import com.dsk.biz.dskService.EnterpriseService;
+import com.dsk.jsk.service.EnterpriseService;
 import com.dsk.biz.mapper.ContactInfoMapper;
 import com.dsk.biz.service.IContactInfoService;
 import com.dsk.common.core.domain.PageQuery;
 import com.dsk.common.core.domain.model.LoginUser;
 import com.dsk.common.core.page.TableDataInfo;
 import com.dsk.common.helper.LoginHelper;
-import com.google.api.client.util.SecurityUtils;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections4.MapUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -19,7 +18,6 @@ import org.springframework.stereotype.Service;
 import org.springframework.util.ObjectUtils;
 
 import javax.annotation.Resource;
-import java.util.List;
 import java.util.Map;
 
 /**

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

@@ -13,9 +13,8 @@ import com.dsk.biz.domain.vo.CustomerBusinessListVo;
 import com.dsk.biz.domain.vo.CustomerListVo;
 import com.dsk.biz.domain.vo.CustomerStatusListVo;
 import com.dsk.biz.domain.vo.CustomerVo;
-import com.dsk.biz.dskService.BusinessOpportunityRadarService;
-import com.dsk.biz.dskService.EnterpriseCommonService;
-import com.dsk.biz.dskService.EnterpriseService;
+import com.dsk.jsk.service.BusinessOpportunityRadarService;
+import com.dsk.jsk.service.EnterpriseCommonService;
 import com.dsk.biz.mapper.CustomerMapper;
 import com.dsk.biz.mapper.CustomerUserMapper;
 import com.dsk.biz.service.IBusinessInfoService;
@@ -29,7 +28,6 @@ import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
-import org.springframework.util.CollectionUtils;
 import org.springframework.util.ObjectUtils;
 
 import javax.annotation.Resource;

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

+package com.dsk.biz.service.impl;
+
+import com.dsk.biz.domain.bo.BusinessExcelDto;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.poi.hssf.usermodel.HSSFWorkbook;
+import org.apache.poi.ss.usermodel.*;
+import org.apache.poi.xssf.usermodel.XSSFWorkbook;
+import org.springframework.stereotype.Service;
+import org.springframework.web.multipart.MultipartFile;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * @author lxl
+ * @Description:
+ * @Date 2023/6/1 下午 4:30
+ **/
+@Slf4j
+@Service
+public class ReadBusinessInfoExcel {
+
+    // 总行数
+    private int totalRows = 0;
+    // 总条数
+    private int totalCells = 0;
+
+    public int getTotalRows() {
+        return totalRows;
+    }
+
+    public void setTotalRows(int totalRows) {
+        this.totalRows = totalRows;
+    }
+
+    public int getTotalCells() {
+        return totalCells;
+    }
+
+    public void setTotalCells(int totalCells) {
+        this.totalCells = totalCells;
+    }
+
+    /**
+     * 读EXCEL文件，获取信息集合
+     *
+     * @param mFile
+     * @return
+     */
+    public List<BusinessExcelDto> getExcelInfo(MultipartFile mFile) {
+        String fileName = mFile.getOriginalFilename();// 获取文件名
+        try {
+            // 验证文件名是否合格
+            if (!validateExcel(fileName)) return null;
+            // 根据文件名判断文件是2003版本还是2007版本
+            boolean isExcel2003 = true;
+            if (isExcel2007(fileName)) isExcel2003 = false;
+            return createExcel(mFile.getInputStream(), isExcel2003);
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        return null;
+    }
+
+
+    /**
+     * 根据excel里面的内容读取信息
+     *
+     * @param is          输入流
+     * @param isExcel2003 excel是2003还是2007版本
+     * @return
+     */
+    public List<BusinessExcelDto> createExcel(InputStream is, boolean isExcel2003) {
+        try {
+            Workbook wb = null;
+            // 当excel是2003时,创建excel2003
+            if (isExcel2003) {
+                wb = new HSSFWorkbook(is);
+            } else {
+                // 当excel是2007时,创建excel2007
+                wb = new XSSFWorkbook(is);
+            }
+            return readExcelValue(wb);// 读取Excel里面客户的信息
+        } catch (IOException e) {
+            e.printStackTrace();
+        }
+        return null;
+    }
+
+
+    /**
+     * 读取Excel内容
+     *
+     * @param wb
+     * @return
+     */
+    private List<BusinessExcelDto> readExcelValue(Workbook wb) {
+        //得到第一个shell
+        Sheet sheet = wb.getSheetAt(0);
+        //得到Excel的行数
+        this.totalRows = sheet.getPhysicalNumberOfRows();
+        //得到Excel的列数(前提是有行数)
+        if (totalRows > 1 && sheet.getRow(0) != null) {
+            this.totalCells = sheet.getRow(0).getPhysicalNumberOfCells();
+        }
+//        List<Map<String, Object>> list = new ArrayList<Map<String, Object>>();
+        ArrayList<BusinessExcelDto> list = new ArrayList<>();
+        //循环Excel行数
+        //
+        for (int r = 3; r < totalRows; r++) {
+            Row row = sheet.getRow(r);
+            if (row == null) {
+                continue;
+            }
+            //循环Excel的列
+//            Map<String, Object> map = new HashMap<String, Object>();
+            BusinessExcelDto businessExcelDto = new BusinessExcelDto();
+            for (int c = 0; c < this.totalCells; c++) {
+                Cell cell = row.getCell(c);
+                if (null != cell) {
+                    //项目名称
+                    if (c == 0) {
+                        //如果是纯数字,比如你写的是25,cell.getNumericCellValue()获得是25.0,通过截取字符串去掉.0获得25
+                        if (cell.getCellType() == CellType.NUMERIC) {
+                            String name = String.valueOf(cell.getNumericCellValue());
+                            businessExcelDto.setProjectName(name.substring(0, name.length() - 2 > 0 ? name.length() - 2 : 1));
+                        } else {
+                            businessExcelDto.setProjectName(cell.getStringCellValue());
+                        }
+                        //业主单位
+                    } else if (c == 1) {
+                        if (cell.getCellType() == CellType.NUMERIC) {
+                            String company = String.valueOf(cell.getNumericCellValue());
+                            businessExcelDto.setOwnerCompany(company.substring(0, company.length() - 2 > 0 ? company.length() - 2 : 1));
+                        } else {
+                            businessExcelDto.setOwnerCompany(cell.getStringCellValue());
+                        }
+                        //投资估算（万元）
+                    } else if (c == 2) {
+                        if (cell.getCellType() == CellType.NUMERIC) {
+                            String amount = String.valueOf(cell.getNumericCellValue());
+//                            businessExcelDto.setInvestmentAmount(amount.substring(0, amount.length() - 2 > 0 ? amount.length() - 2 : 1));
+                            businessExcelDto.setInvestmentAmount(amount);
+                        } else {
+                            businessExcelDto.setInvestmentAmount(cell.getStringCellValue());
+                        }
+                    }
+                }
+            }
+            //添加到list
+            list.add(businessExcelDto);
+        }
+        log.info("项目批量导入Excel数据,{}",list);
+        return list;
+    }
+
+    /**
+     * 验证EXCEL文件
+     * @param filePath
+     * @return
+     */
+    public boolean validateExcel(String filePath) {
+        if (filePath == null || !(isExcel2003(filePath) || isExcel2007(filePath))) {
+            log.info("文件不是excel格式");
+            return false;
+        }
+        return true;
+    }
+
+    // @描述：是否是2003的excel，返回true是2003
+    public static boolean isExcel2003(String filePath) {
+        return filePath.matches("^.+\\.(?i)(xls)$");
+    }
+
+    // @描述：是否是2007的excel，返回true是2007
+    public static boolean isExcel2007(String filePath) {
+        return filePath.matches("^.+\\.(?i)(xlsx)$");
+    }
+}

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

+package com.dsk.jsk.controller;
+
+
+import com.dsk.common.core.domain.R;
+import com.dsk.common.core.page.TableDataInfo;
+import com.dsk.jsk.domain.*;
+import com.dsk.jsk.service.EnterpriseBussinessService;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.validation.Valid;
+
+/**
+*@Description: 央企经营管理系统企业业务相关
+*@Author: zhangyi
+*@date: 2023/5/17 9:03
+*/
+@Slf4j
+@RestController
+@RequestMapping(value = "/enterpriseBussiness")
+public class EnterpriseBussinessController {
+    @Autowired
+    EnterpriseBussinessService enterpriseBussinessService;
+
+
+
+    @RequestMapping(value = "/customSelect", method = RequestMethod.GET)
+    public R customSelect() throws Exception {
+        return enterpriseBussinessService.customSelect();
+    }
+
+    @RequestMapping(value = "/clientPage", method = RequestMethod.POST)
+    public TableDataInfo clientPage(@RequestBody @Valid EnterpriseBussinessClientPageBody paramMap) throws Exception {
+        return enterpriseBussinessService.clientPage(paramMap);
+    }
+
+    @RequestMapping(value = "/clientProjectPage", method = RequestMethod.POST)
+    public TableDataInfo clientProjectPage(@RequestBody @Valid EnterpriseBussinessClientProjectPageBody paramMap) throws Exception {
+        return enterpriseBussinessService.clientProjectPage(paramMap);
+    }
+
+    @RequestMapping(value = "/tenderPage",method = RequestMethod.POST)
+    public TableDataInfo tenderPage(@RequestBody @Valid EnterpriseBussinessTenderPageBody paramMap) throws Exception {
+        return enterpriseBussinessService.tenderPage(paramMap);
+    }
+
+    @RequestMapping(value = "/tenderDetail",method = RequestMethod.POST)
+    public R tenderDetail(@RequestBody @Valid EnterpriseBussinessTenderDetailBody paramMap) throws Exception {
+        return enterpriseBussinessService.tenderDetail(paramMap);
+    }
+
+    @RequestMapping(value = "/supplierPage",method = RequestMethod.POST)
+    public TableDataInfo supplierPage(@RequestBody @Valid EnterpriseBussinessSupplierPageBody paramMap) throws Exception {
+        return enterpriseBussinessService.supplierPage(paramMap);
+    }
+
+    @RequestMapping(value = "/supplierProjectPage",method = RequestMethod.POST)
+    public TableDataInfo supplierProjectPage(@RequestBody @Valid EnterpriseBussinessSupplierProjectPageBody paramMap) throws Exception {
+        return enterpriseBussinessService.supplierProjectPage(paramMap);
+    }
+
+    @RequestMapping(value = "/projectDetail", method = RequestMethod.POST)
+    public R projectDetail(@RequestBody @Valid EnterpriseBussinessProjectDetailBody paramMap) throws Exception {
+        return enterpriseBussinessService.projectDetail(paramMap);
+    }
+
+    @RequestMapping(value = "/oftenAgencyPage",method = RequestMethod.POST)
+    public TableDataInfo oftenAgencyPage(@RequestBody @Valid EnterpriseBussinessOftenAgencyPageBody paramMap) throws Exception {
+        return enterpriseBussinessService.oftenAgencyPage(paramMap);
+    }
+
+    @RequestMapping(value = "/bidCooperatePage", method = RequestMethod.POST)
+    public TableDataInfo bidCooperatePage(@RequestBody @Valid EnterpriseBussinessBidCooperatePageBody paramMap) throws Exception {
+        return enterpriseBussinessService.bidCooperatePage(paramMap);
+    }
+
+    @RequestMapping(value = "/historySendPage", method = RequestMethod.POST)
+    public TableDataInfo historySendPage(@RequestBody @Valid EnterpriseBussinessHistorySendPageBody paramMap) throws Exception {
+        return enterpriseBussinessService.historySendPage(paramMap);
+    }
+
+    @RequestMapping(value = "/historySendProvince", method = RequestMethod.POST)
+    public R historySendProvince(@RequestBody @Valid EnterpriseBussinessHistorySendProvinceBody paramMap) throws Exception {
+        return enterpriseBussinessService.historySendProvince(paramMap);
+    }
+
+    @RequestMapping(value = "/bidWinMergeDetail", method = RequestMethod.POST)
+    public R bidWinMergeDetail(@RequestBody EnterpriseBusinessBidWinMergeDetailBody paramMap) throws Exception {
+        return enterpriseBussinessService.bidWinMergeDetail(paramMap);
+    }
+
+    @RequestMapping(value = "/skyProjectDetail", method = RequestMethod.POST)
+    public R skyProjectDetail(@RequestBody EnterpriseBusinessSkyProjectDetailBody paramMap) throws Exception {
+        return enterpriseBussinessService.skyProjectDetail(paramMap);
+    }
+
+    @RequestMapping(value = "/awardDetail", method = RequestMethod.POST)
+    public R awardDetail(@RequestBody EnterpriseBusinessAwardDetailBody paramMap) throws Exception {
+        return enterpriseBussinessService.awardDetail(paramMap);
+    }
+
+    @RequestMapping(value = "/select", method = RequestMethod.POST)
+    public R select(@RequestBody EnterpriseBusinessAwardDetailBody paramMap) throws Exception {
+        return enterpriseBussinessService.select(paramMap);
+    }
+
+}

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

+package com.dsk.jsk.controller;
+
+import com.dsk.common.core.domain.R;
+import com.dsk.common.core.page.TableDataInfo;
+import com.dsk.jsk.domain.*;
+import com.dsk.jsk.service.EnterpriseService;
+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 javax.validation.Valid;
+import java.util.List;
+
+
+/**
+ * @ClassName EnterpriseController
+ * @Description TODO
+ * @Author zhangyi
+ * @Date 2023/5/15 12:01
+ * @Version 1.0
+ */
+@RestController
+@RequestMapping("/enterprise")
+public class EnterpriseController {
+
+    @Autowired
+    private EnterpriseService enterpriseService;
+
+
+    @PostMapping("/label")
+    public R label(@RequestBody @Valid EnterpriseInfoLabelBody body) throws Exception {
+        return enterpriseService.label(body);
+    }
+
+    @PostMapping("/infoHeader")
+    public R infoHeader(@RequestBody @Valid EnterpriseInfoHeaderBody body) throws Exception {
+        return enterpriseService.infoHeader(body);
+    }
+
+    @PostMapping(value = "statistic")
+    public R statistic(@RequestBody @Valid EnterpriseStatisticBody vo) throws Exception {
+        return enterpriseService.statistic(vo);
+    }
+
+    @PostMapping(value = "bidDataGroup")
+    public R bidDataGroup(@RequestBody @Valid EnterpriseBidDataGroupBody vo) throws Exception {
+        return enterpriseService.bidDataGroup(vo);
+    }
+
+    @PostMapping(value = "projectTenderDataGroup")
+    public R projectTenderDataGroup(@RequestBody @Valid EnterpriseProjectTenderDataGroupBody vo) throws Exception {
+        return enterpriseService.projectTenderDataGroup(vo);
+    }
+
+    @PostMapping(value = "partners")
+    public TableDataInfo partners(@RequestBody @Valid EnterprisePartnersBody vo) throws Exception {
+        return enterpriseService.partners(vo);
+    }
+
+    @PostMapping(value = "investment")
+    public TableDataInfo investment(@RequestBody @Valid EnterpriseInvestmentBody vo) throws Exception {
+        return enterpriseService.investment(vo);
+    }
+
+    @PostMapping(value = "affiliates")
+    public TableDataInfo affiliates(@RequestBody @Valid EnterpriseAffiliatesBody vo) throws Exception {
+        return enterpriseService.affiliates(vo);
+    }
+
+    @PostMapping(value = "dynamicPage")
+    public TableDataInfo dynamicPage(@RequestBody @Valid EnterpriseDynamicPageBody vo) throws Exception {
+        return enterpriseService.dynamicPage(vo);
+    }
+
+    @PostMapping(value = "icInfo")
+    public R icInfo(@RequestBody @Valid EnterpriseIcInfoBody vo) throws Exception {
+        return enterpriseService.icInfo(vo);
+    }
+
+    @PostMapping(value = "changeInfo")
+    public TableDataInfo changeInfo(@RequestBody @Valid EnterpriseChangeInfoBody vo) throws Exception {
+        return enterpriseService.changeInfo(vo);
+    }
+
+    @PostMapping(value = "keymembers")
+    public TableDataInfo keymembers(@RequestBody @Valid EnterpriseKeymembersBody vo) throws Exception {
+        return enterpriseService.keymembers(vo);
+    }
+
+    @PostMapping(value = "bestStockPage")
+    public TableDataInfo bestStockPage(@RequestBody @Valid EnterpriseBestStockPageBody vo) throws Exception {
+        return enterpriseService.bestStockPage(vo);
+    }
+
+    @PostMapping(value = "financial")
+    public R financial(@RequestBody @Valid EnterpriseFinancialBody vo) throws Exception {
+        return enterpriseService.financial(vo);
+    }
+
+    @PostMapping(value = "uipSerach")
+    public TableDataInfo uipSerach(@RequestBody @Valid EnterpriseUipSearchBody vo) throws Exception {
+        return enterpriseService.uipSerach(vo);
+    }
+
+    @PostMapping(value = "uipGroupData")
+    public R financial() throws Exception {
+        return enterpriseService.uipGroupData();
+    }
+
+    @PostMapping(value = "remark")
+    public R remark(@RequestBody @Valid EnterpriseRemarkBody vo) throws Exception {
+        return enterpriseService.remark(vo);
+    }
+
+    @PostMapping(value = "bondCreditRating")
+    public R bondCreditRating(@RequestBody @Valid EnterpriseBondCreditRatingBody vo) throws Exception {
+        return enterpriseService.bondCreditRating(vo);
+    }
+
+    @PostMapping(value = "getUipIdByCid")
+    public R getUipIdByCid(@RequestBody List<Integer> vo) throws Exception {
+        return enterpriseService.getUipIdByCid(vo);
+    }
+
+    @PostMapping(value = "financialData")
+    public R financialData(@RequestBody EnterpriseFinancialDataBody vo) throws Exception {
+        return enterpriseService.financialData(vo);
+    }
+
+}

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

+package com.dsk.jsk.controller;
+
+
+import com.dsk.common.core.domain.R;
+import com.dsk.common.core.page.TableDataInfo;
+import com.dsk.jsk.domain.*;
+import com.dsk.jsk.service.EnterpriseCreditService;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import javax.validation.Valid;
+
+/**
+ * @Description: 央企经营管理系统企业风险相关
+ * @Author: zhangyi
+ * @date: 2023/5/17 9:03
+ */
+@Slf4j
+@RestController
+@RequestMapping(value = "/enterpriseCredit")
+public class EnterpriseCreditController {
+    @Autowired
+    EnterpriseCreditService enterpriseCreditService;
+
+    @PostMapping(value = "/penalizePage")
+    public TableDataInfo penalizePage(@RequestBody @Valid EnterpriseCreditPenalizePageBody body) throws Exception {
+        return enterpriseCreditService.penalizePage(body);
+    }
+
+    @PostMapping(value = "/penalizeReasonType")
+    public R penalizeReasonType(@RequestBody @Valid EnterpriseCreditPenalizeReasonTypeBody body) throws Exception {
+        return enterpriseCreditService.penalizeReasonType(body);
+    }
+
+    @PostMapping(value = "/abnormalPage")
+    public TableDataInfo abnormalPage(@RequestBody @Valid EnterpriseCreditAbnormalPageBody body) throws Exception {
+        return enterpriseCreditService.abnormalPage(body);
+    }
+
+    @PostMapping(value = "/abnormalYears")
+    public R abnormalYears(@RequestBody @Valid EnterpriseCreditAbnormalYearsBody body) throws Exception {
+        return enterpriseCreditService.abnormalYears(body);
+    }
+
+    @PostMapping(value = "/executedPersonsPage")
+    public TableDataInfo executedPersonsPage(@RequestBody @Valid EnterpriseCreditExecutedPersonsPageBody body) throws Exception {
+        return enterpriseCreditService.executedPersonsPage(body);
+    }
+
+    @PostMapping(value = "/executedPage")
+    public TableDataInfo executedPage(@RequestBody @Valid EnterpriseCreditExecutedPageBody body) throws Exception {
+        return enterpriseCreditService.executedPage(body);
+    }
+
+    @PostMapping(value = "/lawsuitsPage")
+    public TableDataInfo lawsuitsPage(@RequestBody @Valid EnterpriseCreditLawsuitsPageBody body) throws Exception {
+        return enterpriseCreditService.lawsuitsPage(body);
+    }
+
+    @PostMapping(value = "/lawsuitsCauseAction")
+    public R lawsuitsCauseAction(@RequestBody @Valid EnterpriseCreditLawsuitsCauseActionBody body) throws Exception {
+        return enterpriseCreditService.lawsuitsCauseAction(body);
+    }
+
+    @PostMapping(value = "/lawsuitsRole")
+    public R lawsuitsRole(@RequestBody @Valid EnterpriseCreditLawsuitsRoleBody body) throws Exception {
+        return enterpriseCreditService.lawsuitsRole(body);
+    }
+
+    @PostMapping(value = "/noticesPage")
+    public TableDataInfo noticesPage(@RequestBody @Valid EnterpriseCreditNoticePageBody body) throws Exception {
+        return enterpriseCreditService.noticesPage(body);
+    }
+
+    @PostMapping(value = "/noticesType")
+    public R noticesType(@RequestBody @Valid EnterpriseCreditNoticeTypeBody body) throws Exception {
+        return enterpriseCreditService.noticesType(body);
+    }
+
+    @PostMapping(value = "/noticesRole")
+    public R noticesRole(@RequestBody @Valid EnterpriseCreditNoticeRoleBody body) throws Exception {
+        return enterpriseCreditService.noticesRole(body);
+    }
+
+    @PostMapping(value = "/noticesCaseReason")
+    public R noticesCaseReason(@RequestBody @Valid EnterpriseCreditNoticeCaseReasonBody body) throws Exception {
+        return enterpriseCreditService.noticesCaseReason(body);
+    }
+
+    @PostMapping(value = "/kaitingPage")
+    public TableDataInfo kaitingPage(@RequestBody @Valid EnterpriseCreditKaitingPageBody body) throws Exception {
+        return enterpriseCreditService.kaitingPage(body);
+    }
+
+    @PostMapping(value = "/kaitingCauseAction")
+    public R kaitingCauseAction(@RequestBody @Valid EnterpriseCreditKaitingCauseActionBody body) throws Exception {
+        return enterpriseCreditService.kaitingCauseAction(body);
+    }
+
+    @PostMapping(value = "/kaitingPureRole")
+    public R kaitingPureRole(@RequestBody @Valid EnterpriseCreditKaitingPureRoleBody body) throws Exception {
+        return enterpriseCreditService.kaitingPureRole(body);
+    }
+
+}

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

+package com.dsk.jsk.controller;
+
+
+import com.dsk.common.core.domain.R;
+import com.dsk.common.core.page.TableDataInfo;
+import com.dsk.jsk.domain.*;
+import com.dsk.jsk.service.EnterpriseProjectService;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import javax.validation.Valid;
+
+/**
+*@Description: 央企经营管理系统企业项目相关
+*@Author: zhangyi
+*@date: 2023/5/17 9:03
+*/
+@Slf4j
+@RestController
+@RequestMapping(value = "/enterpriseProject")
+public class EnterpriseProjectController {
+    @Autowired
+    EnterpriseProjectService enterpriseProjectService;
+
+    @PostMapping(value = "/landTransactionPage")
+    public TableDataInfo landTransactionPage(@RequestBody @Valid EnterpriseProjectLandTransactionPageBody body) throws Exception {
+        return enterpriseProjectService.landTransactionPage(body);
+    }
+
+    @PostMapping(value = "/landUse")
+    public R landUse(@RequestBody @Valid EnterpriseProjectLandUseBody body) throws Exception {
+        return enterpriseProjectService.landUse(body);
+    }
+
+    @PostMapping(value = "/landDetail")
+    public R landDetail(@RequestBody @Valid EnterpriseProjectLandDetailBody body) throws Exception {
+        return enterpriseProjectService.landDetail(body);
+    }
+
+    @PostMapping(value = "/approvalProjectPage")
+    public TableDataInfo approvalProjectPage(@RequestBody @Valid EnterpriseProjectApprovalProjectPageBody body) throws Exception {
+        return enterpriseProjectService.approvalProjectPage(body);
+    }
+
+    @PostMapping(value = "/approvalInfoDetail")
+    public R approvalInfoDetail(@RequestBody @Valid EnterpriseProjectApprovalInfoDetailBody body) throws Exception {
+        return enterpriseProjectService.approvalInfoDetail(body);
+    }
+
+    @PostMapping(value = "/approvalExaminePage")
+    public TableDataInfo approvalExaminePage(@RequestBody @Valid EnterpriseProjectApprovalExaminePageBody body) throws Exception {
+        return enterpriseProjectService.approvalExaminePage(body);
+    }
+
+    @PostMapping(value = "/approvalMarketingPage")
+    public TableDataInfo approvalMarketingPage(@RequestBody @Valid EnterpriseProjectApprovalMarketingPageBody body) throws Exception {
+        return enterpriseProjectService.approvalMarketingPage(body);
+    }
+
+    @PostMapping(value = "/specialDebtProjectPage")
+    public TableDataInfo specialDebtProjectPage(@RequestBody @Valid EnterpriseProjectSpecialDebtProjectPageBody  body) throws Exception {
+        return enterpriseProjectService.specialDebtProjectPage(body);
+    }
+
+    @PostMapping(value = "/specialDebtProjectDetail")
+    public R specialDebtProjectDetail(@RequestBody @Valid EnterpriseProjectSpecialDebtProjectDetailBody body) throws Exception {
+        return enterpriseProjectService.specialDebtProjectDetail(body);
+    }
+
+    @PostMapping(value = "/specialDebtPage")
+    public TableDataInfo specialDebtPage(@RequestBody @Valid EnterpriseProjectSpecialDebtPageBody body) throws Exception {
+        return enterpriseProjectService.specialDebtPage(body);
+    }
+
+    @PostMapping(value = "/bidNoticePage")
+    public TableDataInfo bidNoticePage(@RequestBody @Valid EnterpriseProjectBidNoticePageBody body) throws Exception {
+        return enterpriseProjectService.bidNoticePage(body);
+    }
+
+    @PostMapping(value = "/bidNoticeTenderStage")
+    public R bidNoticeTenderStage(@RequestBody @Valid EnterpriseProjectBidNoticeTenderStageBody body) throws Exception {
+        return enterpriseProjectService.bidNoticeTenderStage(body);
+    }
+
+    @PostMapping(value = "/bidNoticeArea")
+    public R bidNoticeArea(@RequestBody @Valid EnterpriseProjectBidNoticeAreaBody body) throws Exception {
+        return enterpriseProjectService.bidNoticeArea(body);
+    }
+
+    @PostMapping(value = "/bidNoticeDetail")
+    public R bidNoticeDetail(@RequestBody @Valid EnterpriseProjectBidNoticeDetailBody body) throws Exception {
+        return enterpriseProjectService.bidNoticeDetail(body);
+    }
+
+    @PostMapping(value = "/bidPlanPage")
+    public TableDataInfo bidPlanPage(@RequestBody @Valid EnterpriseProjectBidPlanPageBody body) throws Exception {
+        return enterpriseProjectService.bidPlanPage(body);
+    }
+
+    @PostMapping(value = "/bidPlanProjectType")
+    public R bidPlanProjectType(@RequestBody @Valid EnterpriseProjectBidPlanProjectTypeBody body) throws Exception {
+        return enterpriseProjectService.bidPlanProjectType(body);
+    }
+
+    @PostMapping(value = "/bidPlanDetail")
+    public R bidPlanDetail(@RequestBody @Valid EnterpriseProjectBidPlanDetailBody body) throws Exception {
+        return enterpriseProjectService.bidPlanDetail(body);
+    }
+
+    @PostMapping(value = "/bidNoticeProPage")
+    public TableDataInfo bidNoticeProPage(@RequestBody @Valid EnterpriseProjectBidNoticeProPageBody body) throws Exception {
+        return enterpriseProjectService.bidNoticeProPage(body);
+    }
+
+    @PostMapping(value = "/bidNoticeProProjectType")
+    public R bidNoticeProProjectType(@RequestBody @Valid EnterpriseProjectBidNoticeProProjectTypeBody body) throws Exception {
+        return enterpriseProjectService.bidNoticeProProjectType(body);
+    }
+
+    @PostMapping(value = "/bidNoticeProProjectPurposes")
+    public R bidNoticeProProjectPurposes(@RequestBody @Valid EnterpriseProjectBidNoticeProProjectPurposesBody body) throws Exception {
+        return enterpriseProjectService.bidNoticeProProjectPurposes(body);
+    }
+
+    @PostMapping(value = "/bidNoticeProAssessmentWay")
+    public R bidNoticeProAssessmentWay(@RequestBody @Valid EnterpriseProjectBidNoticeProAssessmentWayBody body) throws Exception {
+        return enterpriseProjectService.bidNoticeProAssessmentWay(body);
+    }
+
+    @PostMapping(value = "/bidNoticeProDetail")
+    public R bidNoticeProDetail(@RequestBody @Valid EnterpriseProjectBidNoticeProDetailBody body) throws Exception {
+        return enterpriseProjectService.bidNoticeProDetail(body);
+    }
+
+    @PostMapping(value = "/creditXzxkPage")
+    public TableDataInfo creditXzxkPage(@RequestBody @Valid EnterpriseProjectCreditXzxkPageBody body) throws Exception {
+        return enterpriseProjectService.creditXzxkPage(body);
+    }
+
+}

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

+package com.dsk.jsk.controller;
+
+import cn.hutool.json.JSONObject;
+import com.dsk.common.core.domain.AjaxResult;
+import com.dsk.jsk.service.IndexService;
+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;
+
+
+/**
+ * @ClassName IndexController
+ * @Description TODO
+ * @Author Dgm
+ * @Date 2023/8/15 12:01
+ * @Version 1.0
+ */
+@RestController
+@RequestMapping("/index")
+public class IndexController {
+
+    @Autowired
+    private IndexService enterpriseService;
+
+    @PostMapping(value = "bigWinningBidsPage")
+    public AjaxResult bigWinningBidsPage(@RequestBody JSONObject object) throws Exception {
+        return enterpriseService.bigWinningBidsPage(object);
+    }
+
+    @PostMapping(value = "bigBidPage")
+    public AjaxResult bigBidPage(@RequestBody JSONObject object) throws Exception {
+        return enterpriseService.bigBidPage(object);
+    }
+
+    @PostMapping("/countByCompany")
+    public AjaxResult countByCompany(@RequestBody JSONObject object) {
+        return enterpriseService.countByCompany(object);
+    }
+
+    @PostMapping("/bidRank")
+    public AjaxResult bidRank(@RequestBody JSONObject object) {
+        return enterpriseService.bidRank(object);
+    }
+}

dsk-module/dsk-biz-api/src/main/java/com/dsk/biz/dskService/model/BasePage.java → dsk-module/dsk-biz-api/src/main/java/com/dsk/jsk/domain/BasePage.java

-package com.dsk.biz.dskService.model;
+package com.dsk.jsk.domain;
 
 /**
  * 基础分页类

dsk-module/dsk-biz-api/src/main/java/com/dsk/biz/dskService/model/EnterpriseAffiliatesBody.java → dsk-module/dsk-biz-api/src/main/java/com/dsk/jsk/domain/EnterpriseAffiliatesBody.java

-package com.dsk.biz.dskService.model;
+package com.dsk.jsk.domain;
 
 import lombok.Data;
 import lombok.EqualsAndHashCode;

dsk-module/dsk-biz-api/src/main/java/com/dsk/biz/dskService/model/EnterpriseBestStockPageBody.java → dsk-module/dsk-biz-api/src/main/java/com/dsk/jsk/domain/EnterpriseBestStockPageBody.java

-package com.dsk.biz.dskService.model;
+package com.dsk.jsk.domain;
 
 import lombok.Data;
 import lombok.EqualsAndHashCode;

dsk-module/dsk-biz-api/src/main/java/com/dsk/biz/dskService/model/EnterpriseBidDataGroupBody.java → dsk-module/dsk-biz-api/src/main/java/com/dsk/jsk/domain/EnterpriseBidDataGroupBody.java

-package com.dsk.biz.dskService.model;
+package com.dsk.jsk.domain;
 
 import lombok.Data;
 import lombok.EqualsAndHashCode;

dsk-module/dsk-biz-api/src/main/java/com/dsk/biz/dskService/model/EnterpriseBidNoticeDetailBody.java → dsk-module/dsk-biz-api/src/main/java/com/dsk/jsk/domain/EnterpriseBidNoticeDetailBody.java

-package com.dsk.biz.dskService.model;
+package com.dsk.jsk.domain;
 
 import lombok.Data;
 import lombok.EqualsAndHashCode;

dsk-module/dsk-biz-api/src/main/java/com/dsk/biz/dskService/model/EnterpriseBidNoticePageBody.java → dsk-module/dsk-biz-api/src/main/java/com/dsk/jsk/domain/EnterpriseBidNoticePageBody.java

-package com.dsk.biz.dskService.model;
+package com.dsk.jsk.domain;
 
 import lombok.Data;
 import lombok.EqualsAndHashCode;

dsk-module/dsk-biz-api/src/main/java/com/dsk/biz/dskService/model/EnterpriseBidNoticeProvinceBody.java → dsk-module/dsk-biz-api/src/main/java/com/dsk/jsk/domain/EnterpriseBidNoticeProvinceBody.java

-package com.dsk.biz.dskService.model;
+package com.dsk.jsk.domain;
 
 import lombok.Data;
 import lombok.EqualsAndHashCode;

dsk-module/dsk-biz-api/src/main/java/com/dsk/biz/dskService/model/EnterpriseBidNoticeTenderStageBody.java → dsk-module/dsk-biz-api/src/main/java/com/dsk/jsk/domain/EnterpriseBidNoticeTenderStageBody.java

-package com.dsk.biz.dskService.model;
+package com.dsk.jsk.domain;
 
 import lombok.Data;
 import lombok.EqualsAndHashCode;

dsk-module/dsk-biz-api/src/main/java/com/dsk/biz/dskService/model/EnterpriseBondCreditRatingBody.java → dsk-module/dsk-biz-api/src/main/java/com/dsk/jsk/domain/EnterpriseBondCreditRatingBody.java

-package com.dsk.biz.dskService.model;
+package com.dsk.jsk.domain;
 
 import lombok.Data;
 import lombok.EqualsAndHashCode;

dsk-module/dsk-biz-api/src/main/java/com/dsk/biz/dskService/model/EnterpriseBusinessAwardDetailBody.java → dsk-module/dsk-biz-api/src/main/java/com/dsk/jsk/domain/EnterpriseBusinessAwardDetailBody.java

-package com.dsk.biz.dskService.model;
+package com.dsk.jsk.domain;
 
 import lombok.Data;
 import lombok.EqualsAndHashCode;

dsk-module/dsk-biz-api/src/main/java/com/dsk/biz/dskService/model/EnterpriseBusinessAwardDetailVo.java → dsk-module/dsk-biz-api/src/main/java/com/dsk/jsk/domain/EnterpriseBusinessAwardDetailVo.java

-package com.dsk.biz.dskService.model;
+package com.dsk.jsk.domain;
 
 import lombok.Data;
 import lombok.EqualsAndHashCode;

dsk-module/dsk-biz-api/src/main/java/com/dsk/biz/dskService/model/EnterpriseBusinessBidWinMergeDetailBody.java → dsk-module/dsk-biz-api/src/main/java/com/dsk/jsk/domain/EnterpriseBusinessBidWinMergeDetailBody.java

-package com.dsk.biz.dskService.model;
+package com.dsk.jsk.domain;
 
 import lombok.Data;
 import lombok.EqualsAndHashCode;

dsk-module/dsk-biz-api/src/main/java/com/dsk/biz/dskService/model/EnterpriseBusinessSkyProjectDetailBody.java → dsk-module/dsk-biz-api/src/main/java/com/dsk/jsk/domain/EnterpriseBusinessSkyProjectDetailBody.java

-package com.dsk.biz.dskService.model;
+package com.dsk.jsk.domain;
 
 import lombok.Data;
 import lombok.EqualsAndHashCode;

dsk-module/dsk-biz-api/src/main/java/com/dsk/biz/dskService/model/EnterpriseBussinessBidCooperatePageBody.java → dsk-module/dsk-biz-api/src/main/java/com/dsk/jsk/domain/EnterpriseBussinessBidCooperatePageBody.java

-package com.dsk.biz.dskService.model;
+package com.dsk.jsk.domain;
 
 import lombok.Data;
 import lombok.EqualsAndHashCode;

dsk-module/dsk-biz-api/src/main/java/com/dsk/biz/dskService/model/EnterpriseBussinessClientPageBody.java → dsk-module/dsk-biz-api/src/main/java/com/dsk/jsk/domain/EnterpriseBussinessClientPageBody.java

-package com.dsk.biz.dskService.model;
+package com.dsk.jsk.domain;
 
 import lombok.Data;
 import lombok.EqualsAndHashCode;

dsk-module/dsk-biz-api/src/main/java/com/dsk/biz/dskService/model/EnterpriseBussinessClientProjectPageBody.java → dsk-module/dsk-biz-api/src/main/java/com/dsk/jsk/domain/EnterpriseBussinessClientProjectPageBody.java

-package com.dsk.biz.dskService.model;
+package com.dsk.jsk.domain;
 
 import lombok.Data;
 import lombok.EqualsAndHashCode;

dsk-module/dsk-biz-api/src/main/java/com/dsk/biz/dskService/model/EnterpriseBussinessHistorySendPageBody.java → dsk-module/dsk-biz-api/src/main/java/com/dsk/jsk/domain/EnterpriseBussinessHistorySendPageBody.java

-package com.dsk.biz.dskService.model;
+package com.dsk.jsk.domain;
 
 import lombok.Data;
 import lombok.EqualsAndHashCode;

dsk-module/dsk-biz-api/src/main/java/com/dsk/biz/dskService/model/EnterpriseBussinessHistorySendProvinceBody.java → dsk-module/dsk-biz-api/src/main/java/com/dsk/jsk/domain/EnterpriseBussinessHistorySendProvinceBody.java

-package com.dsk.biz.dskService.model;
+package com.dsk.jsk.domain;
 
 import lombok.Data;
 import lombok.EqualsAndHashCode;

dsk-module/dsk-biz-api/src/main/java/com/dsk/biz/dskService/model/EnterpriseBussinessOftenAgencyPageBody.java → dsk-module/dsk-biz-api/src/main/java/com/dsk/jsk/domain/EnterpriseBussinessOftenAgencyPageBody.java

-package com.dsk.biz.dskService.model;
+package com.dsk.jsk.domain;
 
 import lombok.Data;
 import lombok.EqualsAndHashCode;

dsk-module/dsk-biz-api/src/main/java/com/dsk/biz/dskService/model/EnterpriseBussinessProjectDetailBody.java → dsk-module/dsk-biz-api/src/main/java/com/dsk/jsk/domain/EnterpriseBussinessProjectDetailBody.java

-package com.dsk.biz.dskService.model;
+package com.dsk.jsk.domain;
 
 import lombok.Data;
 import lombok.EqualsAndHashCode;

dsk-module/dsk-biz-api/src/main/java/com/dsk/biz/dskService/model/EnterpriseBussinessSupplierPageBody.java → dsk-module/dsk-biz-api/src/main/java/com/dsk/jsk/domain/EnterpriseBussinessSupplierPageBody.java

-package com.dsk.biz.dskService.model;
+package com.dsk.jsk.domain;
 
 import lombok.Data;
 import lombok.EqualsAndHashCode;

dsk-module/dsk-biz-api/src/main/java/com/dsk/biz/dskService/model/EnterpriseBussinessSupplierProjectPageBody.java → dsk-module/dsk-biz-api/src/main/java/com/dsk/jsk/domain/EnterpriseBussinessSupplierProjectPageBody.java

-package com.dsk.biz.dskService.model;
+package com.dsk.jsk.domain;
 
 import lombok.Data;
 import lombok.EqualsAndHashCode;

dsk-module/dsk-biz-api/src/main/java/com/dsk/biz/dskService/model/EnterpriseBussinessTenderDetailBody.java → dsk-module/dsk-biz-api/src/main/java/com/dsk/jsk/domain/EnterpriseBussinessTenderDetailBody.java

-package com.dsk.biz.dskService.model;
+package com.dsk.jsk.domain;
 
 import lombok.Data;
 import lombok.EqualsAndHashCode;

dsk-module/dsk-biz-api/src/main/java/com/dsk/biz/dskService/model/EnterpriseBussinessTenderPageBody.java → dsk-module/dsk-biz-api/src/main/java/com/dsk/jsk/domain/EnterpriseBussinessTenderPageBody.java

-package com.dsk.biz.dskService.model;
+package com.dsk.jsk.domain;
 
 import lombok.Data;
 import lombok.EqualsAndHashCode;

dsk-module/dsk-biz-api/src/main/java/com/dsk/biz/dskService/model/EnterpriseBussinessVo.java → dsk-module/dsk-biz-api/src/main/java/com/dsk/jsk/domain/EnterpriseBussinessVo.java

-package com.dsk.biz.dskService.model;
+package com.dsk.jsk.domain;
 
 import lombok.Data;
 import lombok.EqualsAndHashCode;

dsk-module/dsk-biz-api/src/main/java/com/dsk/biz/dskService/model/EnterpriseChangeInfoBody.java → dsk-module/dsk-biz-api/src/main/java/com/dsk/jsk/domain/EnterpriseChangeInfoBody.java

-package com.dsk.biz.dskService.model;
+package com.dsk.jsk.domain;
 
 import lombok.Data;
 import lombok.EqualsAndHashCode;

dsk-module/dsk-biz-api/src/main/java/com/dsk/biz/dskService/model/EnterpriseCreditAbnormalPageBody.java → dsk-module/dsk-biz-api/src/main/java/com/dsk/jsk/domain/EnterpriseCreditAbnormalPageBody.java

-package com.dsk.biz.dskService.model;
+package com.dsk.jsk.domain;
 
 import lombok.Data;
 import lombok.EqualsAndHashCode;

dsk-module/dsk-biz-api/src/main/java/com/dsk/biz/dskService/model/EnterpriseCreditAbnormalYearsBody.java → dsk-module/dsk-biz-api/src/main/java/com/dsk/jsk/domain/EnterpriseCreditAbnormalYearsBody.java

-package com.dsk.biz.dskService.model;
+package com.dsk.jsk.domain;
 
 import lombok.Data;
 import lombok.EqualsAndHashCode;

dsk-module/dsk-biz-api/src/main/java/com/dsk/biz/dskService/model/EnterpriseCreditExecutedPageBody.java → dsk-module/dsk-biz-api/src/main/java/com/dsk/jsk/domain/EnterpriseCreditExecutedPageBody.java

-package com.dsk.biz.dskService.model;
+package com.dsk.jsk.domain;
 
 import lombok.Data;
 import lombok.EqualsAndHashCode;

dsk-module/dsk-biz-api/src/main/java/com/dsk/biz/dskService/model/EnterpriseCreditExecutedPersonsPageBody.java → dsk-module/dsk-biz-api/src/main/java/com/dsk/jsk/domain/EnterpriseCreditExecutedPersonsPageBody.java

-package com.dsk.biz.dskService.model;
+package com.dsk.jsk.domain;
 
 import lombok.Data;
 import lombok.EqualsAndHashCode;

dsk-module/dsk-biz-api/src/main/java/com/dsk/biz/dskService/model/EnterpriseCreditKaitingCauseActionBody.java → dsk-module/dsk-biz-api/src/main/java/com/dsk/jsk/domain/EnterpriseCreditKaitingCauseActionBody.java

-package com.dsk.biz.dskService.model;
+package com.dsk.jsk.domain;
 
 import lombok.Data;
 import lombok.EqualsAndHashCode;

dsk-module/dsk-biz-api/src/main/java/com/dsk/biz/dskService/model/EnterpriseCreditKaitingPageBody.java → dsk-module/dsk-biz-api/src/main/java/com/dsk/jsk/domain/EnterpriseCreditKaitingPageBody.java

-package com.dsk.biz.dskService.model;
+package com.dsk.jsk.domain;
 
 import lombok.Data;
 import lombok.EqualsAndHashCode;

dsk-module/dsk-biz-api/src/main/java/com/dsk/biz/dskService/model/EnterpriseCreditKaitingPureRoleBody.java → dsk-module/dsk-biz-api/src/main/java/com/dsk/jsk/domain/EnterpriseCreditKaitingPureRoleBody.java

-package com.dsk.biz.dskService.model;
+package com.dsk.jsk.domain;
 
 import lombok.Data;
 import lombok.EqualsAndHashCode;

dsk-module/dsk-biz-api/src/main/java/com/dsk/biz/dskService/model/EnterpriseCreditLawsuitsCauseActionBody.java → dsk-module/dsk-biz-api/src/main/java/com/dsk/jsk/domain/EnterpriseCreditLawsuitsCauseActionBody.java

-package com.dsk.biz.dskService.model;
+package com.dsk.jsk.domain;
 
 import lombok.Data;
 import lombok.EqualsAndHashCode;

dsk-module/dsk-biz-api/src/main/java/com/dsk/biz/dskService/model/EnterpriseCreditLawsuitsPageBody.java → dsk-module/dsk-biz-api/src/main/java/com/dsk/jsk/domain/EnterpriseCreditLawsuitsPageBody.java

-package com.dsk.biz.dskService.model;
+package com.dsk.jsk.domain;
 
 import lombok.Data;
 import lombok.EqualsAndHashCode;

dsk-module/dsk-biz-api/src/main/java/com/dsk/biz/dskService/model/EnterpriseCreditLawsuitsRoleBody.java → dsk-module/dsk-biz-api/src/main/java/com/dsk/jsk/domain/EnterpriseCreditLawsuitsRoleBody.java

-package com.dsk.biz.dskService.model;
+package com.dsk.jsk.domain;
 
 import lombok.Data;
 import lombok.EqualsAndHashCode;

dsk-module/dsk-biz-api/src/main/java/com/dsk/biz/dskService/model/EnterpriseCreditNoticeCaseReasonBody.java → dsk-module/dsk-biz-api/src/main/java/com/dsk/jsk/domain/EnterpriseCreditNoticeCaseReasonBody.java

-package com.dsk.biz.dskService.model;
+package com.dsk.jsk.domain;
 
 import lombok.Data;
 import lombok.EqualsAndHashCode;

dsk-module/dsk-biz-api/src/main/java/com/dsk/biz/dskService/model/EnterpriseCreditNoticePageBody.java → dsk-module/dsk-biz-api/src/main/java/com/dsk/jsk/domain/EnterpriseCreditNoticePageBody.java

-package com.dsk.biz.dskService.model;
+package com.dsk.jsk.domain;
 
 import lombok.Data;
 import lombok.EqualsAndHashCode;

dsk-module/dsk-biz-api/src/main/java/com/dsk/biz/dskService/model/EnterpriseCreditNoticeRoleBody.java → dsk-module/dsk-biz-api/src/main/java/com/dsk/jsk/domain/EnterpriseCreditNoticeRoleBody.java

-package com.dsk.biz.dskService.model;
+package com.dsk.jsk.domain;
 
 import lombok.Data;
 import lombok.EqualsAndHashCode;

dsk-module/dsk-biz-api/src/main/java/com/dsk/biz/dskService/model/EnterpriseCreditNoticeTypeBody.java → dsk-module/dsk-biz-api/src/main/java/com/dsk/jsk/domain/EnterpriseCreditNoticeTypeBody.java

-package com.dsk.biz.dskService.model;
+package com.dsk.jsk.domain;
 
 import lombok.Data;
 import lombok.EqualsAndHashCode;

dsk-module/dsk-biz-api/src/main/java/com/dsk/biz/dskService/model/EnterpriseCreditPenalizePageBody.java → dsk-module/dsk-biz-api/src/main/java/com/dsk/jsk/domain/EnterpriseCreditPenalizePageBody.java

-package com.dsk.biz.dskService.model;
+package com.dsk.jsk.domain;
 
 import lombok.Data;
 import lombok.EqualsAndHashCode;

dsk-module/dsk-biz-api/src/main/java/com/dsk/biz/dskService/model/EnterpriseCreditPenalizeReasonTypeBody.java → dsk-module/dsk-biz-api/src/main/java/com/dsk/jsk/domain/EnterpriseCreditPenalizeReasonTypeBody.java

-package com.dsk.biz.dskService.model;
+package com.dsk.jsk.domain;
 
 import lombok.Data;
 import lombok.EqualsAndHashCode;

dsk-module/dsk-biz-api/src/main/java/com/dsk/biz/dskService/model/EnterpriseDynamicPageBody.java → dsk-module/dsk-biz-api/src/main/java/com/dsk/jsk/domain/EnterpriseDynamicPageBody.java

-package com.dsk.biz.dskService.model;
+package com.dsk.jsk.domain;
 
 import lombok.Data;
 import lombok.EqualsAndHashCode;

dsk-module/dsk-biz-api/src/main/java/com/dsk/biz/dskService/model/EnterpriseFinancialBody.java → dsk-module/dsk-biz-api/src/main/java/com/dsk/jsk/domain/EnterpriseFinancialBody.java

-package com.dsk.biz.dskService.model;
+package com.dsk.jsk.domain;
 
 import lombok.Data;
 import lombok.EqualsAndHashCode;

dsk-module/dsk-biz-api/src/main/java/com/dsk/biz/dskService/model/EnterpriseFinancialDataBody.java → dsk-module/dsk-biz-api/src/main/java/com/dsk/jsk/domain/EnterpriseFinancialDataBody.java

-package com.dsk.biz.dskService.model;
+package com.dsk.jsk.domain;
 
 import lombok.Data;
 import lombok.EqualsAndHashCode;

dsk-module/dsk-biz-api/src/main/java/com/dsk/biz/dskService/model/EnterpriseIcInfoBody.java → dsk-module/dsk-biz-api/src/main/java/com/dsk/jsk/domain/EnterpriseIcInfoBody.java

-package com.dsk.biz.dskService.model;
+package com.dsk.jsk.domain;
 
 import lombok.Data;
 import lombok.EqualsAndHashCode;

dsk-module/dsk-biz-api/src/main/java/com/dsk/biz/dskService/model/EnterpriseInfoHeaderBody.java → dsk-module/dsk-biz-api/src/main/java/com/dsk/jsk/domain/EnterpriseInfoHeaderBody.java

-package com.dsk.biz.dskService.model;
+package com.dsk.jsk.domain;
 
 import lombok.Data;
 import lombok.EqualsAndHashCode;

dsk-module/dsk-biz-api/src/main/java/com/dsk/biz/dskService/model/EnterpriseInfoLabelBody.java → dsk-module/dsk-biz-api/src/main/java/com/dsk/jsk/domain/EnterpriseInfoLabelBody.java

-package com.dsk.biz.dskService.model;
+package com.dsk.jsk.domain;
 
 import lombok.Data;
 import lombok.EqualsAndHashCode;

dsk-module/dsk-biz-api/src/main/java/com/dsk/biz/dskService/model/EnterpriseInvestmentBody.java → dsk-module/dsk-biz-api/src/main/java/com/dsk/jsk/domain/EnterpriseInvestmentBody.java

-package com.dsk.biz.dskService.model;
+package com.dsk.jsk.domain;
 
 import lombok.Data;
 import lombok.EqualsAndHashCode;

dsk-module/dsk-biz-api/src/main/java/com/dsk/biz/dskService/model/EnterpriseKeymembersBody.java → dsk-module/dsk-biz-api/src/main/java/com/dsk/jsk/domain/EnterpriseKeymembersBody.java

-package com.dsk.biz.dskService.model;
+package com.dsk.jsk.domain;
 
 import lombok.Data;
 import lombok.EqualsAndHashCode;

dsk-module/dsk-biz-api/src/main/java/com/dsk/biz/dskService/model/EnterprisePartnersBody.java → dsk-module/dsk-biz-api/src/main/java/com/dsk/jsk/domain/EnterprisePartnersBody.java

-package com.dsk.biz.dskService.model;
+package com.dsk.jsk.domain;
 
 import lombok.Data;
 import lombok.EqualsAndHashCode;

dsk-module/dsk-biz-api/src/main/java/com/dsk/biz/dskService/model/EnterpriseProjectApprovalExaminePageBody.java → dsk-module/dsk-biz-api/src/main/java/com/dsk/jsk/domain/EnterpriseProjectApprovalExaminePageBody.java

-package com.dsk.biz.dskService.model;
+package com.dsk.jsk.domain;
 
 import lombok.Data;
 import lombok.EqualsAndHashCode;

dsk-module/dsk-biz-api/src/main/java/com/dsk/biz/dskService/model/EnterpriseProjectApprovalInfoDetailBody.java → dsk-module/dsk-biz-api/src/main/java/com/dsk/jsk/domain/EnterpriseProjectApprovalInfoDetailBody.java

-package com.dsk.biz.dskService.model;
+package com.dsk.jsk.domain;
 
 import lombok.Data;
 import lombok.EqualsAndHashCode;

dsk-module/dsk-biz-api/src/main/java/com/dsk/biz/dskService/model/EnterpriseProjectApprovalMarketingPageBody.java → dsk-module/dsk-biz-api/src/main/java/com/dsk/jsk/domain/EnterpriseProjectApprovalMarketingPageBody.java

-package com.dsk.biz.dskService.model;
+package com.dsk.jsk.domain;
 
 import lombok.Data;
 import lombok.EqualsAndHashCode;

dsk-module/dsk-biz-api/src/main/java/com/dsk/biz/dskService/model/EnterpriseProjectApprovalProjectPageBody.java → dsk-module/dsk-biz-api/src/main/java/com/dsk/jsk/domain/EnterpriseProjectApprovalProjectPageBody.java

-package com.dsk.biz.dskService.model;
+package com.dsk.jsk.domain;
 
 import lombok.Data;
 import lombok.EqualsAndHashCode;

dsk-module/dsk-biz-api/src/main/java/com/dsk/biz/dskService/model/EnterpriseProjectBidNoticeAreaBody.java → dsk-module/dsk-biz-api/src/main/java/com/dsk/jsk/domain/EnterpriseProjectBidNoticeAreaBody.java

-package com.dsk.biz.dskService.model;
+package com.dsk.jsk.domain;
 
 import lombok.Data;
 import lombok.EqualsAndHashCode;

dsk-module/dsk-biz-api/src/main/java/com/dsk/biz/dskService/model/EnterpriseProjectBidNoticeDetailBody.java → dsk-module/dsk-biz-api/src/main/java/com/dsk/jsk/domain/EnterpriseProjectBidNoticeDetailBody.java

-package com.dsk.biz.dskService.model;
+package com.dsk.jsk.domain;
 
 import lombok.Data;
 import lombok.EqualsAndHashCode;

dsk-module/dsk-biz-api/src/main/java/com/dsk/biz/dskService/model/EnterpriseProjectBidNoticePageBody.java → dsk-module/dsk-biz-api/src/main/java/com/dsk/jsk/domain/EnterpriseProjectBidNoticePageBody.java

-package com.dsk.biz.dskService.model;
+package com.dsk.jsk.domain;
 
 import lombok.Data;
 import lombok.EqualsAndHashCode;

dsk-module/dsk-biz-api/src/main/java/com/dsk/biz/dskService/model/EnterpriseProjectBidNoticeProAssessmentWayBody.java → dsk-module/dsk-biz-api/src/main/java/com/dsk/jsk/domain/EnterpriseProjectBidNoticeProAssessmentWayBody.java

-package com.dsk.biz.dskService.model;
+package com.dsk.jsk.domain;
 
 import lombok.Data;
 import lombok.EqualsAndHashCode;

dsk-module/dsk-biz-api/src/main/java/com/dsk/biz/dskService/model/EnterpriseProjectBidNoticeProDetailBody.java → dsk-module/dsk-biz-api/src/main/java/com/dsk/jsk/domain/EnterpriseProjectBidNoticeProDetailBody.java

-package com.dsk.biz.dskService.model;
+package com.dsk.jsk.domain;
 
 import lombok.Data;
 import lombok.EqualsAndHashCode;

dsk-module/dsk-biz-api/src/main/java/com/dsk/biz/dskService/model/EnterpriseProjectBidNoticeProPageBody.java → dsk-module/dsk-biz-api/src/main/java/com/dsk/jsk/domain/EnterpriseProjectBidNoticeProPageBody.java

-package com.dsk.biz.dskService.model;
+package com.dsk.jsk.domain;
 
 import lombok.Data;
 import lombok.EqualsAndHashCode;

dsk-module/dsk-biz-api/src/main/java/com/dsk/biz/dskService/model/EnterpriseProjectBidNoticeProProjectPurposesBody.java → dsk-module/dsk-biz-api/src/main/java/com/dsk/jsk/domain/EnterpriseProjectBidNoticeProProjectPurposesBody.java

-package com.dsk.biz.dskService.model;
+package com.dsk.jsk.domain;
 
 import lombok.Data;
 import lombok.EqualsAndHashCode;

dsk-module/dsk-biz-api/src/main/java/com/dsk/biz/dskService/model/EnterpriseProjectBidNoticeProProjectTypeBody.java → dsk-module/dsk-biz-api/src/main/java/com/dsk/jsk/domain/EnterpriseProjectBidNoticeProProjectTypeBody.java

-package com.dsk.biz.dskService.model;
+package com.dsk.jsk.domain;
 
 import lombok.Data;
 import lombok.EqualsAndHashCode;

dsk-module/dsk-biz-api/src/main/java/com/dsk/biz/dskService/model/EnterpriseProjectBidNoticeTenderStageBody.java → dsk-module/dsk-biz-api/src/main/java/com/dsk/jsk/domain/EnterpriseProjectBidNoticeTenderStageBody.java

-package com.dsk.biz.dskService.model;
+package com.dsk.jsk.domain;
 
 import lombok.Data;
 import lombok.EqualsAndHashCode;

dsk-module/dsk-biz-api/src/main/java/com/dsk/biz/dskService/model/EnterpriseProjectBidPlanDetailBody.java → dsk-module/dsk-biz-api/src/main/java/com/dsk/jsk/domain/EnterpriseProjectBidPlanDetailBody.java

-package com.dsk.biz.dskService.model;
+package com.dsk.jsk.domain;
 
 import lombok.Data;
 import lombok.EqualsAndHashCode;

dsk-module/dsk-biz-api/src/main/java/com/dsk/biz/dskService/model/EnterpriseProjectBidPlanPageBody.java → dsk-module/dsk-biz-api/src/main/java/com/dsk/jsk/domain/EnterpriseProjectBidPlanPageBody.java

-package com.dsk.biz.dskService.model;
+package com.dsk.jsk.domain;
 
 import lombok.Data;
 import lombok.EqualsAndHashCode;

dsk-module/dsk-biz-api/src/main/java/com/dsk/biz/dskService/model/EnterpriseProjectBidPlanProjectTypeBody.java → dsk-module/dsk-biz-api/src/main/java/com/dsk/jsk/domain/EnterpriseProjectBidPlanProjectTypeBody.java

-package com.dsk.biz.dskService.model;
+package com.dsk.jsk.domain;
 
 import lombok.Data;
 import lombok.EqualsAndHashCode;

dsk-module/dsk-biz-api/src/main/java/com/dsk/biz/dskService/model/EnterpriseProjectCreditXzxkPageBody.java → dsk-module/dsk-biz-api/src/main/java/com/dsk/jsk/domain/EnterpriseProjectCreditXzxkPageBody.java

-package com.dsk.biz.dskService.model;
+package com.dsk.jsk.domain;
 
 import lombok.Data;
 import lombok.EqualsAndHashCode;

dsk-module/dsk-biz-api/src/main/java/com/dsk/biz/dskService/model/EnterpriseProjectLandDetailBody.java → dsk-module/dsk-biz-api/src/main/java/com/dsk/jsk/domain/EnterpriseProjectLandDetailBody.java

-package com.dsk.biz.dskService.model;
+package com.dsk.jsk.domain;
 
 import lombok.Data;
 import lombok.EqualsAndHashCode;

dsk-module/dsk-biz-api/src/main/java/com/dsk/biz/dskService/model/EnterpriseProjectLandTransactionPageBody.java → dsk-module/dsk-biz-api/src/main/java/com/dsk/jsk/domain/EnterpriseProjectLandTransactionPageBody.java

-package com.dsk.biz.dskService.model;
+package com.dsk.jsk.domain;
 
 import lombok.Data;
 import lombok.EqualsAndHashCode;

dsk-module/dsk-biz-api/src/main/java/com/dsk/biz/dskService/model/EnterpriseProjectLandUseBody.java → dsk-module/dsk-biz-api/src/main/java/com/dsk/jsk/domain/EnterpriseProjectLandUseBody.java

-package com.dsk.biz.dskService.model;
+package com.dsk.jsk.domain;
 
 import lombok.Data;
 import lombok.EqualsAndHashCode;

dsk-module/dsk-biz-api/src/main/java/com/dsk/biz/dskService/model/EnterpriseProjectSpecialDebtPageBody.java → dsk-module/dsk-biz-api/src/main/java/com/dsk/jsk/domain/EnterpriseProjectSpecialDebtPageBody.java

-package com.dsk.biz.dskService.model;
+package com.dsk.jsk.domain;
 
 import lombok.Data;
 import lombok.EqualsAndHashCode;

dsk-module/dsk-biz-api/src/main/java/com/dsk/biz/dskService/model/EnterpriseProjectSpecialDebtProjectDetailBody.java → dsk-module/dsk-biz-api/src/main/java/com/dsk/jsk/domain/EnterpriseProjectSpecialDebtProjectDetailBody.java

-package com.dsk.biz.dskService.model;
+package com.dsk.jsk.domain;
 
 import lombok.Data;
 import lombok.EqualsAndHashCode;

dsk-module/dsk-biz-api/src/main/java/com/dsk/biz/dskService/model/EnterpriseProjectSpecialDebtProjectPageBody.java → dsk-module/dsk-biz-api/src/main/java/com/dsk/jsk/domain/EnterpriseProjectSpecialDebtProjectPageBody.java

-package com.dsk.biz.dskService.model;
+package com.dsk.jsk.domain;
 
 import lombok.Data;
 import lombok.EqualsAndHashCode;

dsk-module/dsk-biz-api/src/main/java/com/dsk/biz/dskService/model/EnterpriseProjectTenderDataGroupBody.java → dsk-module/dsk-biz-api/src/main/java/com/dsk/jsk/domain/EnterpriseProjectTenderDataGroupBody.java

-package com.dsk.biz.dskService.model;
+package com.dsk.jsk.domain;
 
 import lombok.Data;
 import lombok.EqualsAndHashCode;

dsk-module/dsk-biz-api/src/main/java/com/dsk/biz/dskService/model/EnterpriseRemarkBody.java → dsk-module/dsk-biz-api/src/main/java/com/dsk/jsk/domain/EnterpriseRemarkBody.java

-package com.dsk.biz.dskService.model;
+package com.dsk.jsk.domain;
 
 import lombok.Data;
 import lombok.EqualsAndHashCode;

dsk-module/dsk-biz-api/src/main/java/com/dsk/biz/dskService/model/EnterpriseStatisticBody.java → dsk-module/dsk-biz-api/src/main/java/com/dsk/jsk/domain/EnterpriseStatisticBody.java

-package com.dsk.biz.dskService.model;
+package com.dsk.jsk.domain;
 
 import lombok.Data;
 import lombok.EqualsAndHashCode;

dsk-module/dsk-biz-api/src/main/java/com/dsk/biz/dskService/model/EnterpriseSupplierPageBody.java → dsk-module/dsk-biz-api/src/main/java/com/dsk/jsk/domain/EnterpriseSupplierPageBody.java

-package com.dsk.biz.dskService.model;
+package com.dsk.jsk.domain;
 
 import lombok.Data;
 import lombok.EqualsAndHashCode;

dsk-module/dsk-biz-api/src/main/java/com/dsk/biz/dskService/model/EnterpriseUipSearchBody.java → dsk-module/dsk-biz-api/src/main/java/com/dsk/jsk/domain/EnterpriseUipSearchBody.java

-package com.dsk.biz.dskService.model;
+package com.dsk.jsk.domain;
 
 import lombok.Data;
 import lombok.EqualsAndHashCode;

dsk-module/dsk-biz-api/src/main/java/com/dsk/biz/dskService/model/IndexBigBidPageBody.java → dsk-module/dsk-biz-api/src/main/java/com/dsk/jsk/domain/IndexBigBidPageBody.java

-package com.dsk.biz.dskService.model;
+package com.dsk.jsk.domain;
 
 import com.dsk.common.utils.DateUtils;
 import lombok.Data;

dsk-module/dsk-biz-api/src/main/java/com/dsk/biz/dskService/model/IndexBigWinningBidsPageBody.java → dsk-module/dsk-biz-api/src/main/java/com/dsk/jsk/domain/IndexBigWinningBidsPageBody.java

-package com.dsk.biz.dskService.model;
+package com.dsk.jsk.domain;
 
 import com.dsk.common.utils.DateUtils;
 import lombok.Data;

dsk-module/dsk-biz-api/src/main/java/com/dsk/biz/dskService/model/JskCombineBidPageDto.java → dsk-module/dsk-biz-api/src/main/java/com/dsk/jsk/domain/JskCombineBidPageDto.java

-package com.dsk.biz.dskService.model;
+package com.dsk.jsk.domain;
 
 import lombok.Data;
 

dsk-module/dsk-biz-api/src/main/java/com/dsk/biz/dskService/model/JskCombineCertificateDto.java → dsk-module/dsk-biz-api/src/main/java/com/dsk/jsk/domain/JskCombineCertificateDto.java

-package com.dsk.biz.dskService.model;
+package com.dsk.jsk.domain;
 
 import lombok.Data;
 

dsk-module/dsk-biz-api/src/main/java/com/dsk/biz/dskService/model/JskCombineSearchDto.java → dsk-module/dsk-biz-api/src/main/java/com/dsk/jsk/domain/JskCombineSearchDto.java

-package com.dsk.biz.dskService.model;
+package com.dsk.jsk.domain;
 
 import lombok.Data;
 

dsk-module/dsk-biz-api/src/main/java/com/dsk/biz/dskService/BusinessOpportunityRadarService.java → dsk-module/dsk-biz-api/src/main/java/com/dsk/jsk/service/BusinessOpportunityRadarService.java

-package com.dsk.biz.dskService;
+package com.dsk.jsk.service;
 
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.json.JSONObject;

dsk-module/dsk-biz-api/src/main/java/com/dsk/biz/dskService/EnterpriseBussinessService.java → dsk-module/dsk-biz-api/src/main/java/com/dsk/jsk/service/EnterpriseBussinessService.java

-package com.dsk.biz.dskService;
+package com.dsk.jsk.service;
 
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.json.JSONUtil;
 import com.dsk.acc.openapi.client.util.CommonUtils;
-import com.dsk.biz.dskService.model.*;
 import com.dsk.common.core.domain.R;
 import com.dsk.common.core.page.TableDataInfo;
 import com.dsk.common.utils.DskOpenApiUtil;
+import com.dsk.jsk.domain.*;
 import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.collections4.MapUtils;
 import org.slf4j.Logger;

dsk-module/dsk-biz-api/src/main/java/com/dsk/biz/dskService/EnterpriseCommonService.java → dsk-module/dsk-biz-api/src/main/java/com/dsk/jsk/service/EnterpriseCommonService.java

-package com.dsk.biz.dskService;
+package com.dsk.jsk.service;
 
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.map.MapUtil;

dsk-module/dsk-biz-api/src/main/java/com/dsk/biz/dskService/EnterpriseCreditService.java → dsk-module/dsk-biz-api/src/main/java/com/dsk/jsk/service/EnterpriseCreditService.java

-package com.dsk.biz.dskService;
+package com.dsk.jsk.service;
 
 import cn.hutool.core.bean.BeanUtil;
-import com.dsk.biz.dskService.model.*;
 import com.dsk.common.core.domain.R;
 import com.dsk.common.core.page.TableDataInfo;
 import com.dsk.common.utils.DskOpenApiUtil;
+import com.dsk.jsk.domain.*;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;

dsk-module/dsk-biz-api/src/main/java/com/dsk/biz/dskService/EnterpriseProjectService.java → dsk-module/dsk-biz-api/src/main/java/com/dsk/jsk/service/EnterpriseProjectService.java

-package com.dsk.biz.dskService;
+package com.dsk.jsk.service;
 
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.json.JSONUtil;
-import com.dsk.biz.dskService.model.*;
 import com.dsk.common.core.domain.R;
 import com.dsk.common.core.page.TableDataInfo;
 import com.dsk.common.utils.DskOpenApiUtil;
+import com.dsk.jsk.domain.*;
 import org.apache.commons.collections4.MapUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

dsk-module/dsk-biz-api/src/main/java/com/dsk/biz/dskService/EnterpriseService.java → dsk-module/dsk-biz-api/src/main/java/com/dsk/jsk/service/EnterpriseService.java

-package com.dsk.biz.dskService;
+package com.dsk.jsk.service;
 
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.map.MapUtil;
 import cn.hutool.core.util.ObjectUtil;
 import com.dsk.acc.openapi.client.util.CommonUtils;
 import com.dsk.biz.domain.vo.CustomerStatusListVo;
-import com.dsk.biz.dskService.model.*;
 import com.dsk.biz.service.ICustomerService;
 import com.dsk.common.constant.CacheConstants;
 import com.dsk.common.core.domain.R;
@@ -13,12 +12,12 @@ import com.dsk.common.core.page.TableDataInfo;
 import com.dsk.common.utils.DskOpenApiUtil;
 import com.dsk.common.utils.EncodeIdUtil;
 import com.dsk.common.utils.redis.RedisUtils;
+import com.dsk.jsk.domain.*;
 import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.collections4.MapUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.data.redis.cache.RedisCache;
 import org.springframework.http.HttpStatus;
 import org.springframework.stereotype.Service;
 import org.springframework.util.ObjectUtils;

dsk-module/dsk-biz-api/src/main/java/com/dsk/biz/dskService/IndexService.java → dsk-module/dsk-biz-api/src/main/java/com/dsk/jsk/service/IndexService.java

-package com.dsk.biz.dskService;
+package com.dsk.jsk.service;
 
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.util.ObjectUtil;
@@ -14,7 +14,6 @@ import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
-import java.util.ArrayList;
 import java.util.Date;
 import java.util.HashMap;
 import java.util.Map;

dsk-module/dsk-biz-api/src/main/resources/mapper/biz/BusinessBacklogMapper.xml

+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.dsk.biz.mapper.BusinessBacklogMapper">
+
+    <resultMap type="com.dsk.biz.domain.BusinessBacklog" id="BusinessBacklogResult">
+        <result property="id" column="id"/>
+        <result property="businessId" column="business_id"/>
+        <result property="target" column="target"/>
+        <result property="task" column="task"/>
+        <result property="finishTime" column="finish_time"/>
+        <result property="state" column="state"/>
+        <result property="createTime" column="create_time"/>
+        <result property="updateTime" column="update_time"/>
+    </resultMap>
+
+    <sql id="selectBusinessBacklogVo">
+        select id,
+               business_id,
+               target,
+               task,
+               finish_time,
+               due_time,
+               if(due_time &lt; now() and state = 0, 2 ,state) state,
+               create_time,
+               update_time
+        from business_backlog
+    </sql>
+
+    <select id="selectBusinessBacklogList" parameterType="com.dsk.biz.domain.bo.BusinessBacklogListDto"
+            resultType="com.dsk.biz.domain.vo.BusinessBacklogListVo">
+        <include refid="selectBusinessBacklogVo"/>
+        where business_id = #{dto.businessId}
+        <if test="dto.state != null "> and state = #{dto.state} </if>
+        <if test="dto.startTime != null "> and(due_time &gt;= #{dto.startTime} or due_time is null)  </if>
+        <if test="dto.endTime != null "> and due_time &lt;= #{dto.endTime} </if>
+        ORDER BY create_time DESC
+    </select>
+
+    <select id="selectBusinessBacklogById" resultMap="BusinessBacklogResult">
+        <include refid="selectBusinessBacklogVo"/>
+        where id = #{id}
+    </select>
+
+    <insert id="insertBusinessBacklog" parameterType="com.dsk.biz.domain.BusinessBacklog"
+            useGeneratedKeys="true" keyProperty="id">
+        insert into business_backlog
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="businessId != null">business_id,</if>
+            <if test="target != null">target,</if>
+            <if test="task != null">task,</if>
+            <if test="dueTime != null">due_time,</if>
+        </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="businessId != null">#{businessId},</if>
+            <if test="target != null">#{target},</if>
+            <if test="task != null">#{task},</if>
+            <if test="dueTime != null">#{dueTime},</if>
+        </trim>
+    </insert>
+
+    <update id="updateBusinessBacklog" parameterType="com.dsk.biz.domain.BusinessBacklog">
+        update business_backlog set finish_time = #{finishTime}, state = #{state} where id = #{id}
+    </update>
+
+    <delete id="deleteBusinessBacklogById" parameterType="Long">
+        delete
+        from business_backlog
+        where id = #{id}
+    </delete>
+
+    <delete id="deleteBusinessBacklogByIds" parameterType="String">
+        delete from business_backlog where id in
+        <foreach item="id" collection="array" open="(" separator="," close=")">
+            #{id}
+        </foreach>
+    </delete>
+
+    <select id="overdueCount" resultType="java.lang.Integer">
+        select count(id) from business_backlog where business_id = #{businessId} and due_time &lt; now() and state = 0
+    </select>
+</mapper>

dsk-module/dsk-biz-api/src/main/resources/mapper/biz/BusinessFollowRecordMapper.xml

+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.dsk.biz.mapper.BusinessFollowRecordMapper">
+
+    <resultMap type="com.dsk.biz.domain.BusinessFollowRecord" id="BusinessFollowRecordResult">
+        <result property="id" column="id"/>
+        <result property="businessId" column="business_id"/>
+        <result property="userId" column="user_id"/>
+        <result property="visitPerson" column="visit_person"/>
+        <result property="position" column="position"/>
+        <result property="visitTime" column="visit_time"/>
+        <result property="nextVisitTime" column="next_visit_time"/>
+        <result property="recordInfo" column="record_info"/>
+        <result property="visitWay" column="visit_way"/>
+        <result property="creatTime" column="creat_time"/>
+        <result property="updateTime" column="update_time"/>
+    </resultMap>
+
+    <sql id="selectBusinessFollowRecordVo">
+        select id,
+               business_id,
+               user_id,
+               visit_person,
+               position,
+               visit_time,
+               next_visit_time,
+               record_info,
+               visit_way,
+               creat_time,
+               update_time
+        from business_follow_record
+    </sql>
+
+    <select id="selectBusinessFollowRecordList" resultType="com.dsk.biz.domain.BusinessFollowRecord">
+        select f.*,u.nick_name as nickName
+        from business_follow_record f
+        left join sys_user u on f.user_id = u.user_id
+        where f.business_id = #{dto.businessId}
+        ORDER BY f.creat_time DESC
+    </select>
+
+    <select id="selectBusinessFollowRecordById" parameterType="Long" resultMap="BusinessFollowRecordResult">
+        <include refid="selectBusinessFollowRecordVo"/>
+        where id = #{id}
+    </select>
+    <select id="businessFollowRecordPaging" resultType="com.dsk.biz.domain.BusinessFollowRecord">
+        <include refid="selectBusinessFollowRecordVo"></include>
+        <where>
+            <if test="businessId != null ">and f.business_id = #{businessId}</if>
+            <if test="userId != null ">and f.user_id = #{userId}</if>
+            <if test="visitPerson != null and visitPerson != ''">and f.visit_person = #{visitPerson}</if>
+            <if test="position != null and position != ''">and f.position = #{position}</if>
+            <if test="visitTime != null ">and f.visit_time = #{visitTime}</if>
+            <if test="nextVisitTime != null ">and f.next_visit_time = #{nextVisitTime}</if>
+            <if test="recordInfo != null  and recordInfo != ''">and f.record_info = #{recordInfo}</if>
+            <if test="visitWay != null  and visitWay != ''">and f.visit_way = #{visitWay}</if>
+            <if test="creatTime != null ">and f.creat_time = #{creatTime}</if>
+        </where>
+        ORDER BY creat_time DESC
+    </select>
+    <select id="allFollow" resultType="com.dsk.biz.domain.BusinessFollowRecord">
+        select f.*,
+               i.project_name as projectName,
+               i.construction_unit as ownerCompany,
+               u.nick_name as nickName
+        from business_follow_record f
+        left join business_info i on i.id = f.business_id
+        left join sys_user u on f.user_id = u.user_id
+        left join sys_dept d on u.dept_id = d.dept_id
+        <where>
+            <if test="dto.userId != null"> and (f.user_id = #{dto.userId} or i.is_private = 1)</if>
+            <if test="dto.startTime != null and dto.startTime != '' "> and f.visit_time &gt;= #{dto.startTime} </if>
+            <if test="dto.endTime != null and dto.endTime != '' "> and f.visit_time &lt;= #{dto.endTime} </if>
+            ${dto.params.dataScope}
+        </where>
+        ORDER BY f.visit_time DESC
+    </select>
+    <select id="selectRelateProject" resultType="com.dsk.biz.domain.vo.BusinessListVo">
+        select i.id,i.project_name as projectName
+        from business_info i
+        left join business_user u on u.business_id = i.id
+        where u.user_id = #{userId}
+    </select>
+    <select id="selectRelateCompany" resultType="java.lang.String">
+        select i.construction_unit
+        from business_info i
+        left join business_user u on u.business_id = i.id
+        where u.user_id = #{userId}
+    </select>
+
+    <insert id="insertBusinessFollowRecord" parameterType="com.dsk.biz.domain.BusinessFollowRecord" useGeneratedKeys="true"
+            keyProperty="id">
+        insert into business_follow_record
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="businessId != null">business_id,</if>
+            <if test="userId != null">user_id,</if>
+            <if test="visitPerson != null and visitPerson != ''">visit_person,</if>
+            <if test="position != null and position != ''">position,</if>
+            <if test="visitTime != null">visit_time,</if>
+            <if test="nextVisitTime != null">next_visit_time,</if>
+            <if test="recordInfo != null">record_info,</if>
+            <if test="visitWay != null">visit_way,</if>
+            <if test="creatTime != null">creat_time,</if>
+            <if test="updateTime != null">update_time,</if>
+        </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="businessId != null">#{businessId},</if>
+            <if test="userId != null">#{userId},</if>
+            <if test="visitPerson != null and visitPerson != ''">#{visitPerson},</if>
+            <if test="position != null and position != ''">#{position},</if>
+            <if test="visitTime != null">#{visitTime},</if>
+            <if test="nextVisitTime != null">#{nextVisitTime},</if>
+            <if test="recordInfo != null">#{recordInfo},</if>
+            <if test="visitWay != null">#{visitWay},</if>
+            <if test="creatTime != null">#{creatTime},</if>
+            <if test="updateTime != null">#{updateTime},</if>
+        </trim>
+    </insert>
+
+    <update id="updateBusinessFollowRecord" parameterType="com.dsk.biz.domain.BusinessFollowRecord">
+        update business_follow_record
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="businessId != null">business_id = #{businessId},</if>
+            <if test="userId != null">user_id = #{userId},</if>
+            <if test="visitPerson != null and visitPerson != ''">visit_person = #{visitPerson},</if>
+            <if test="position != null and position != ''">position = #{position},</if>
+            <if test="visitTime != null">visit_time = #{visitTime},</if>
+            <if test="nextVisitTime != null">next_visit_time = #{nextVisitTime},</if>
+            <if test="recordInfo != null">record_info = #{recordInfo},</if>
+            <if test="visitWay != null">visit_way = #{visitWay},</if>
+            <if test="creatTime != null">creat_time = #{creatTime},</if>
+            <if test="updateTime != null">update_time = #{updateTime},</if>
+        </trim>
+        where id = #{id}
+    </update>
+
+    <delete id="deleteBusinessFollowRecordById" parameterType="Long">
+        delete
+        from business_follow_record
+        where id = #{id}
+    </delete>
+
+    <delete id="deleteBusinessFollowRecordByIds" parameterType="String">
+        delete from business_follow_record where id in
+        <foreach item="id" collection="array" open="(" separator="," close=")">
+            #{id}
+        </foreach>
+    </delete>
+</mapper>

dsk-module/dsk-biz-api/src/main/resources/mapper/biz/BusinessInfoMapper.xml

@@ -153,188 +153,188 @@
         ORDER BY i.create_time DESC
     </select>
 
-<!--    <select id="selectProjectName" resultType="com.dsk.system.domain.business.vo.BusinessLikeProjectNameListVo">-->
-<!--        SELECT-->
-<!--            project_name, investment_amount, project_level, project_stage, project_type,-->
-<!--            project_category, status-->
-<!--        FROM business_info-->
-<!--        where project_name like concat('%',#{projectName},'%')-->
-<!--        order by project_name desc-->
-<!--        limit 20-->
-<!--    </select>-->
+    <select id="selectProjectName" resultType="com.dsk.biz.domain.vo.BusinessLikeProjectNameListVo">
+        SELECT
+            project_name, investment_amount, project_level, project_stage, project_type,
+            project_category, status
+        FROM business_info
+        where project_name like concat('%',#{projectName},'%')
+        order by project_name desc
+        limit 20
+    </select>
 
-<!--    <select id="selectBusinessInfoById" parameterType="integer" resultMap="BusinessInfoResult">-->
-<!--        <include refid="selectBusinessInfoVo"/>-->
-<!--        where id = #{id}-->
-<!--    </select>-->
+    <select id="selectBusinessInfoById" parameterType="integer" resultMap="BusinessInfoResult">
+        <include refid="selectBusinessInfoVo"/>
+        where id = #{id}
+    </select>
 
-<!--    <select id="selectTotal" resultType="com.dsk.system.domain.business.vo.BusinessBrowseVo">-->
-<!--        SELECT-->
-<!--            count(DISTINCT ci.id) contactsCount,-->
-<!--            count(DISTINCT f.id) followRecordCount,-->
-<!--            count(DISTINCT b.id) backlogCount,-->
-<!--            count(DISTINCT r.id) relateCompanyCount-->
-<!--        FROM-->
-<!--            business_info i-->
-<!--                LEFT JOIN contact_info ci on ci.business_id = i.id-->
-<!--                LEFT JOIN business_follow_record f on f.business_id = i.id-->
-<!--                LEFT JOIN business_backlog b on b.business_id = i.id-->
-<!--                LEFT JOIN business_relate_company r on r.business_id = i.id-->
-<!--        WHERE i.id = #{business}-->
-<!--    </select>-->
+    <select id="selectTotal" resultType="com.dsk.biz.domain.vo.BusinessBrowseVo">
+        SELECT
+            count(DISTINCT ci.id) contactsCount,
+            count(DISTINCT f.id) followRecordCount,
+            count(DISTINCT b.id) backlogCount,
+            count(DISTINCT r.id) relateCompanyCount
+        FROM
+            business_info i
+                LEFT JOIN contact_info ci on ci.business_id = i.id
+                LEFT JOIN business_follow_record f on f.business_id = i.id
+                LEFT JOIN business_backlog b on b.business_id = i.id
+                LEFT JOIN business_relate_company r on r.business_id = i.id
+        WHERE i.id = #{business}
+    </select>
 
-<!--    <insert id="insertBusinessInfo" parameterType="com.dsk.common.core.domain.entity.BusinessInfo" useGeneratedKeys="true" keyProperty="id">-->
-<!--        insert into business_info-->
-<!--        <trim prefix="(" suffix=")" suffixOverrides=",">-->
-<!--            <if test="projectName != null">project_name,</if>-->
-<!--            <if test="investmentAmount != null">investment_amount,</if>-->
-<!--            <if test="amountSource != null">amount_source,</if>-->
-<!--            <if test="planBidTime != null">plan_bid_time,</if>-->
-<!--            <if test="planStartTime != null">plan_start_time,</if>-->
-<!--            <if test="projectLevel != null">project_level,</if>-->
-<!--            <if test="projectStage != null">project_stage,</if>-->
-<!--            <if test="buildProperty != null">build_property,</if>-->
-<!--            <if test="planCompleteTime != null">plan_complete_time,</if>-->
-<!--            <if test="projectDetails != null">project_details,</if>-->
-<!--            <if test="provinceName != null">province_name,</if>-->
-<!--            <if test="provinceId != null">province_id,</if>-->
-<!--            <if test="cityName != null">city_name,</if>-->
-<!--            <if test="cityId != null">city_id,</if>-->
-<!--            <if test="districtName != null">district_name,</if>-->
-<!--            <if test="districtId != null">district_id,</if>-->
-<!--            <if test="projectType != null">project_type,</if>-->
-<!--            <if test="projectCategory != null">project_category,</if>-->
-<!--            <if test="isPrivate != null">is_private,</if>-->
-<!--            <if test="createTime != null">create_time,</if>-->
-<!--            <if test="updateTime != null">update_time,</if>-->
-<!--            <if test="status != null">status,</if>-->
-<!--            <if test="customerId != null">customer_id,</if>-->
-<!--            <if test="evaluationBidWay != null">evaluation_bid_way,</if>-->
-<!--            <if test="bidOpenTime != null">bid_open_time,</if>-->
-<!--            <if test="bidOpenPlace != null">bid_open_place,</if>-->
-<!--            <if test="earnestMoneyPay != null">earnest_money_pay,</if>-->
-<!--            <if test="earnestMoney != null">earnest_money,</if>-->
-<!--            <if test="evaluationBidCouncil != null">evaluation_bid_council,</if>-->
-<!--            <if test="constructionUnit != null">construction_unit,</if>-->
-<!--            <if test="constructionPrincipal != null">construction_principal,</if>-->
-<!--            <if test="constructionPhone != null">construction_phone,</if>-->
-<!--            <if test="supervisorUnit != null">supervisor_unit,</if>-->
-<!--            <if test="supervisorPrincipal != null">supervisor_principal,</if>-->
-<!--            <if test="supervisorPhone != null">supervisor_phone,</if>-->
-<!--            <if test="constructionUnitUipId != null">construction_unit_uip_id,</if>-->
-<!--            <if test="constructionUnitCid != null">construction_unit_cid,</if>-->
-<!--        </trim>-->
-<!--        <trim prefix="values (" suffix=")" suffixOverrides=",">-->
-<!--            <if test="projectName != null">#{projectName},</if>-->
-<!--            <if test="investmentAmount != null">#{investmentAmount},</if>-->
-<!--            <if test="amountSource != null">#{amountSource},</if>-->
-<!--            <if test="planBidTime != null">#{planBidTime},</if>-->
-<!--            <if test="planStartTime != null">#{planStartTime},</if>-->
-<!--            <if test="projectLevel != null">#{projectLevel},</if>-->
-<!--            <if test="projectStage != null">#{projectStage},</if>-->
-<!--            <if test="buildProperty != null">#{buildProperty},</if>-->
-<!--            <if test="planCompleteTime != null">#{planCompleteTime},</if>-->
-<!--            <if test="projectDetails != null">#{projectDetails},</if>-->
-<!--            <if test="provinceName != null">#{provinceName},</if>-->
-<!--            <if test="provinceId != null">#{provinceId},</if>-->
-<!--            <if test="cityName != null">#{cityName},</if>-->
-<!--            <if test="cityId != null">#{cityId},</if>-->
-<!--            <if test="districtName != null">#{districtName},</if>-->
-<!--            <if test="districtId != null">#{districtId},</if>-->
-<!--            <if test="projectType != null">#{projectType},</if>-->
-<!--            <if test="projectCategory != null">#{projectCategory},</if>-->
-<!--            <if test="isPrivate != null">#{isPrivate},</if>-->
-<!--            <if test="createTime != null">#{createTime},</if>-->
-<!--            <if test="updateTime != null">#{updateTime},</if>-->
-<!--            <if test="status != null">#{status},</if>-->
-<!--            <if test="customerId != null">#{customerId},</if>-->
-<!--            <if test="evaluationBidWay != null">#{evaluationBidWay},</if>-->
-<!--            <if test="bidOpenTime != null">#{bidOpenTime},</if>-->
-<!--            <if test="bidOpenPlace != null">#{bidOpenPlace},</if>-->
-<!--            <if test="earnestMoneyPay != null">#{earnestMoneyPay},</if>-->
-<!--            <if test="earnestMoney != null">#{earnestMoney},</if>-->
-<!--            <if test="evaluationBidCouncil != null">#{evaluationBidCouncil},</if>-->
-<!--            <if test="constructionUnit != null">#{constructionUnit},</if>-->
-<!--            <if test="constructionPrincipal != null">#{constructionPrincipal},</if>-->
-<!--            <if test="constructionPhone != null">#{constructionPhone},</if>-->
-<!--            <if test="supervisorUnit != null">#{supervisorUnit},</if>-->
-<!--            <if test="supervisorPrincipal != null">#{supervisorPrincipal},</if>-->
-<!--            <if test="supervisorPhone != null">#{supervisorPhone},</if>-->
-<!--            <if test="constructionUnitUipId != null">#{constructionUnitUipId},</if>-->
-<!--            <if test="constructionUnitCid != null">#{constructionUnitCid},</if>-->
-<!--        </trim>-->
-<!--    </insert>-->
+    <insert id="insertBusinessInfo" parameterType="com.dsk.biz.domain.BusinessInfo" useGeneratedKeys="true" keyProperty="id">
+        insert into business_info
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="projectName != null">project_name,</if>
+            <if test="investmentAmount != null">investment_amount,</if>
+            <if test="amountSource != null">amount_source,</if>
+            <if test="planBidTime != null">plan_bid_time,</if>
+            <if test="planStartTime != null">plan_start_time,</if>
+            <if test="projectLevel != null">project_level,</if>
+            <if test="projectStage != null">project_stage,</if>
+            <if test="buildProperty != null">build_property,</if>
+            <if test="planCompleteTime != null">plan_complete_time,</if>
+            <if test="projectDetails != null">project_details,</if>
+            <if test="provinceName != null">province_name,</if>
+            <if test="provinceId != null">province_id,</if>
+            <if test="cityName != null">city_name,</if>
+            <if test="cityId != null">city_id,</if>
+            <if test="districtName != null">district_name,</if>
+            <if test="districtId != null">district_id,</if>
+            <if test="projectType != null">project_type,</if>
+            <if test="projectCategory != null">project_category,</if>
+            <if test="isPrivate != null">is_private,</if>
+            <if test="createTime != null">create_time,</if>
+            <if test="updateTime != null">update_time,</if>
+            <if test="status != null">status,</if>
+            <if test="customerId != null">customer_id,</if>
+            <if test="evaluationBidWay != null">evaluation_bid_way,</if>
+            <if test="bidOpenTime != null">bid_open_time,</if>
+            <if test="bidOpenPlace != null">bid_open_place,</if>
+            <if test="earnestMoneyPay != null">earnest_money_pay,</if>
+            <if test="earnestMoney != null">earnest_money,</if>
+            <if test="evaluationBidCouncil != null">evaluation_bid_council,</if>
+            <if test="constructionUnit != null">construction_unit,</if>
+            <if test="constructionPrincipal != null">construction_principal,</if>
+            <if test="constructionPhone != null">construction_phone,</if>
+            <if test="supervisorUnit != null">supervisor_unit,</if>
+            <if test="supervisorPrincipal != null">supervisor_principal,</if>
+            <if test="supervisorPhone != null">supervisor_phone,</if>
+            <if test="constructionUnitUipId != null">construction_unit_uip_id,</if>
+            <if test="constructionUnitCid != null">construction_unit_cid,</if>
+        </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="projectName != null">#{projectName},</if>
+            <if test="investmentAmount != null">#{investmentAmount},</if>
+            <if test="amountSource != null">#{amountSource},</if>
+            <if test="planBidTime != null">#{planBidTime},</if>
+            <if test="planStartTime != null">#{planStartTime},</if>
+            <if test="projectLevel != null">#{projectLevel},</if>
+            <if test="projectStage != null">#{projectStage},</if>
+            <if test="buildProperty != null">#{buildProperty},</if>
+            <if test="planCompleteTime != null">#{planCompleteTime},</if>
+            <if test="projectDetails != null">#{projectDetails},</if>
+            <if test="provinceName != null">#{provinceName},</if>
+            <if test="provinceId != null">#{provinceId},</if>
+            <if test="cityName != null">#{cityName},</if>
+            <if test="cityId != null">#{cityId},</if>
+            <if test="districtName != null">#{districtName},</if>
+            <if test="districtId != null">#{districtId},</if>
+            <if test="projectType != null">#{projectType},</if>
+            <if test="projectCategory != null">#{projectCategory},</if>
+            <if test="isPrivate != null">#{isPrivate},</if>
+            <if test="createTime != null">#{createTime},</if>
+            <if test="updateTime != null">#{updateTime},</if>
+            <if test="status != null">#{status},</if>
+            <if test="customerId != null">#{customerId},</if>
+            <if test="evaluationBidWay != null">#{evaluationBidWay},</if>
+            <if test="bidOpenTime != null">#{bidOpenTime},</if>
+            <if test="bidOpenPlace != null">#{bidOpenPlace},</if>
+            <if test="earnestMoneyPay != null">#{earnestMoneyPay},</if>
+            <if test="earnestMoney != null">#{earnestMoney},</if>
+            <if test="evaluationBidCouncil != null">#{evaluationBidCouncil},</if>
+            <if test="constructionUnit != null">#{constructionUnit},</if>
+            <if test="constructionPrincipal != null">#{constructionPrincipal},</if>
+            <if test="constructionPhone != null">#{constructionPhone},</if>
+            <if test="supervisorUnit != null">#{supervisorUnit},</if>
+            <if test="supervisorPrincipal != null">#{supervisorPrincipal},</if>
+            <if test="supervisorPhone != null">#{supervisorPhone},</if>
+            <if test="constructionUnitUipId != null">#{constructionUnitUipId},</if>
+            <if test="constructionUnitCid != null">#{constructionUnitCid},</if>
+        </trim>
+    </insert>
 
-<!--    <update id="updateBusinessInfo" parameterType="com.dsk.common.core.domain.entity.BusinessInfo">-->
-<!--        update business_info-->
-<!--        <trim prefix="SET" suffixOverrides=",">-->
-<!--            <if test="projectName != null">project_name = #{projectName},</if>-->
-<!--            <if test="investmentAmount != null">investment_amount = #{investmentAmount},</if>-->
-<!--            <if test="amountSource != null">amount_source = #{amountSource},</if>-->
-<!--            <if test="planBidTime != null">plan_bid_time = #{planBidTime},</if>-->
-<!--            <if test="planStartTime != null">plan_start_time = #{planStartTime},</if>-->
-<!--            <if test="projectLevel != null">project_level = #{projectLevel},</if>-->
-<!--            <if test="projectStage != null">project_stage = #{projectStage},</if>-->
-<!--            <if test="buildProperty != null">build_property = #{buildProperty},</if>-->
-<!--            <if test="planCompleteTime != null">plan_complete_time = #{planCompleteTime},</if>-->
-<!--            <if test="projectDetails != null">project_details = #{projectDetails},</if>-->
-<!--            province_name = #{provinceName},-->
-<!--            province_id = #{provinceId},-->
-<!--            city_name = #{cityName},-->
-<!--            city_id = #{cityId},-->
-<!--            district_name = #{districtName},-->
-<!--            district_id = #{districtId},-->
-<!--            construction_unit_uip_id = #{constructionUnitUipId},-->
-<!--            construction_unit_cid = #{constructionUnitCid},-->
-<!--            <if test="projectType != null">project_type = #{projectType},</if>-->
-<!--            <if test="projectCategory != null">project_category = #{projectCategory},</if>-->
-<!--            <if test="isPrivate != null">is_private = #{isPrivate},</if>-->
-<!--            <if test="status != null">status = #{status},</if>-->
-<!--            <if test="customerId != null">customer_id = #{customerId},</if>-->
-<!--            <if test="evaluationBidWay != null">evaluation_bid_way = #{evaluationBidWay},</if>-->
-<!--            <if test="bidOpenTime != null">bid_open_time = #{bidOpenTime},</if>-->
-<!--            <if test="bidOpenPlace != null">bid_open_place = #{bidOpenPlace},</if>-->
-<!--            <if test="earnestMoneyPay != null">earnest_money_pay = #{earnestMoneyPay},</if>-->
-<!--            <if test="earnestMoney != null">earnest_money = #{earnestMoney},</if>-->
-<!--            <if test="evaluationBidCouncil != null">evaluation_bid_council = #{evaluationBidCouncil},</if>-->
-<!--            <if test="constructionUnit != null">construction_unit = #{constructionUnit},</if>-->
-<!--            <if test="constructionPrincipal != null">construction_principal = #{constructionPrincipal},</if>-->
-<!--            <if test="constructionPhone != null">construction_phone = #{constructionPhone},</if>-->
-<!--            <if test="supervisorUnit != null">supervisor_unit = #{supervisorUnit},</if>-->
-<!--            <if test="supervisorPrincipal != null">supervisor_principal = #{supervisorPrincipal},</if>-->
-<!--            <if test="supervisorPhone != null">supervisor_phone = #{supervisorPhone},</if>-->
-<!--        </trim>-->
-<!--        where id = #{id}-->
-<!--    </update>-->
+    <update id="updateBusinessInfo" parameterType="com.dsk.biz.domain.BusinessInfo">
+        update business_info
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="projectName != null">project_name = #{projectName},</if>
+            <if test="investmentAmount != null">investment_amount = #{investmentAmount},</if>
+            <if test="amountSource != null">amount_source = #{amountSource},</if>
+            <if test="planBidTime != null">plan_bid_time = #{planBidTime},</if>
+            <if test="planStartTime != null">plan_start_time = #{planStartTime},</if>
+            <if test="projectLevel != null">project_level = #{projectLevel},</if>
+            <if test="projectStage != null">project_stage = #{projectStage},</if>
+            <if test="buildProperty != null">build_property = #{buildProperty},</if>
+            <if test="planCompleteTime != null">plan_complete_time = #{planCompleteTime},</if>
+            <if test="projectDetails != null">project_details = #{projectDetails},</if>
+            province_name = #{provinceName},
+            province_id = #{provinceId},
+            city_name = #{cityName},
+            city_id = #{cityId},
+            district_name = #{districtName},
+            district_id = #{districtId},
+            construction_unit_uip_id = #{constructionUnitUipId},
+            construction_unit_cid = #{constructionUnitCid},
+            <if test="projectType != null">project_type = #{projectType},</if>
+            <if test="projectCategory != null">project_category = #{projectCategory},</if>
+            <if test="isPrivate != null">is_private = #{isPrivate},</if>
+            <if test="status != null">status = #{status},</if>
+            <if test="customerId != null">customer_id = #{customerId},</if>
+            <if test="evaluationBidWay != null">evaluation_bid_way = #{evaluationBidWay},</if>
+            <if test="bidOpenTime != null">bid_open_time = #{bidOpenTime},</if>
+            <if test="bidOpenPlace != null">bid_open_place = #{bidOpenPlace},</if>
+            <if test="earnestMoneyPay != null">earnest_money_pay = #{earnestMoneyPay},</if>
+            <if test="earnestMoney != null">earnest_money = #{earnestMoney},</if>
+            <if test="evaluationBidCouncil != null">evaluation_bid_council = #{evaluationBidCouncil},</if>
+            <if test="constructionUnit != null">construction_unit = #{constructionUnit},</if>
+            <if test="constructionPrincipal != null">construction_principal = #{constructionPrincipal},</if>
+            <if test="constructionPhone != null">construction_phone = #{constructionPhone},</if>
+            <if test="supervisorUnit != null">supervisor_unit = #{supervisorUnit},</if>
+            <if test="supervisorPrincipal != null">supervisor_principal = #{supervisorPrincipal},</if>
+            <if test="supervisorPhone != null">supervisor_phone = #{supervisorPhone},</if>
+        </trim>
+        where id = #{id}
+    </update>
 
-<!--    <delete id="deleteBusinessInfoById" parameterType="Long">-->
-<!--        delete-->
-<!--        from business_info-->
-<!--        where id = #{id}-->
-<!--    </delete>-->
+    <delete id="deleteBusinessInfoById" parameterType="Long">
+        delete
+        from business_info
+        where id = #{id}
+    </delete>
 
-<!--    <delete id="deleteBusinessInfoByIds" parameterType="Long">-->
-<!--        delete i,b,co,f,l,r,u-->
-<!--        from business_info i-->
-<!--        left join business_backlog b on b.business_id = i.id-->
-<!--        left join business_contacts co on co.business_id = i.id-->
-<!--        left join business_follow_record f on f.business_id = i.id-->
-<!--        left join business_label l on l.business_id = i.id-->
-<!--        left join business_relate_company r on r.business_id = i.id-->
-<!--        left join business_user u on u.business_id = i.id-->
-<!--        where i.id in-->
-<!--        <foreach item="id" collection="array" open="(" separator="," close=")">-->
-<!--            #{id}-->
-<!--        </foreach>-->
-<!--    </delete>-->
+    <delete id="deleteBusinessInfoByIds" parameterType="Long">
+        delete i,b,co,f,l,r,u
+        from business_info i
+        left join business_backlog b on b.business_id = i.id
+        left join business_contacts co on co.business_id = i.id
+        left join business_follow_record f on f.business_id = i.id
+        left join business_label l on l.business_id = i.id
+        left join business_relate_company r on r.business_id = i.id
+        left join business_user u on u.business_id = i.id
+        where i.id in
+        <foreach item="id" collection="array" open="(" separator="," close=")">
+            #{id}
+        </foreach>
+    </delete>
 
-<!--    <select id="selectCountByStatusAndCustomerId" resultType="java.lang.Integer">-->
-<!--        select count(id) from business_info-->
-<!--        <where>-->
-<!--            <if test="status != null "> and `status` = #{status} </if>-->
-<!--            <if test="customerId != null and customerId != ''"> and `customer_id` = #{customerId} </if>-->
-<!--        </where>-->
-<!--    </select>-->
+    <select id="selectCountByStatusAndCustomerId" resultType="java.lang.Integer">
+        select count(id) from business_info
+        <where>
+            <if test="status != null "> and `status` = #{status} </if>
+            <if test="customerId != null and customerId != ''"> and `customer_id` = #{customerId} </if>
+        </where>
+    </select>
 
     <select id="selectCustomerBusinessList" resultType="com.dsk.biz.domain.vo.CustomerBusinessListVo">
         select
@@ -347,60 +347,75 @@
         <if test="dto.status != null "> and bi.status = #{dto.status}</if>
         order by bi.create_time desc
     </select>
-<!--    <select id="getConstruction" resultType="com.dsk.common.core.domain.entity.BusinessInfo">-->
-<!--        select-->
-<!--            investment_amount,-->
-<!--            amount_source,-->
-<!--            plan_bid_time,-->
-<!--            plan_start_time,-->
-<!--            plan_complete_time,-->
-<!--            build_property,-->
-<!--            project_details,-->
-<!--            evaluation_bid_way,-->
-<!--            bid_open_time,-->
-<!--            bid_open_place,-->
-<!--            earnest_money_pay,-->
-<!--            earnest_money,-->
-<!--            evaluation_bid_council-->
-<!--        from business_info-->
-<!--        where id = #{id}-->
-<!--    </select>-->
-<!--    <select id="isRepetitionProjectName" resultType="java.lang.Integer">-->
-<!--        select count(i.id)-->
-<!--        from business_info i-->
-<!--        join business_user u on u.business_id = i.id-->
-<!--        left join customer ct on ct.customer_id = i.customer_id-->
-<!--        where  i.project_name = #{projectName}-->
-<!--        and u.user_id = #{userId}-->
-<!--        <if test="companyName != null and companyName != '' "> and ct.company_name =#{companyName}</if>-->
-<!--    </select>-->
+    <select id="getConstruction" resultType="com.dsk.biz.domain.BusinessInfo">
+        select
+            investment_amount,
+            amount_source,
+            plan_bid_time,
+            plan_start_time,
+            plan_complete_time,
+            build_property,
+            project_details,
+            evaluation_bid_way,
+            bid_open_time,
+            bid_open_place,
+            earnest_money_pay,
+            earnest_money,
+            evaluation_bid_council
+        from business_info
+        where id = #{id}
+    </select>
+    <select id="isRepetitionProjectName" resultType="java.lang.Integer">
+        select count(i.id)
+        from business_info i
+        join business_user u on u.business_id = i.id
+        left join customer ct on ct.customer_id = i.customer_id
+        where  i.project_name = #{projectName}
+        and u.user_id = #{userId}
+        <if test="companyName != null and companyName != '' "> and ct.company_name =#{companyName}</if>
+    </select>
+
+    <sql id="businessSearchSql">
+        from business_info bi
+        join business_user bu on bu.business_id = bi.id
+        left join sys_user u on bu.user_id = u.user_id
+        left join sys_dept d on u.dept_id = d.dept_id
+        where (bu.user_id = #{userId} or bi.is_private = 1)
+        <if test="status != null"> and bi.status = #{status} </if>
+        ${params.dataScope}
+    </sql>
 
-<!--    <sql id="businessSearchSql">-->
-<!--        from business_info bi-->
-<!--        join business_user bu on bu.business_id = bi.id-->
-<!--        left join sys_user u on bu.user_id = u.user_id-->
-<!--        left join sys_dept d on u.dept_id = d.dept_id-->
-<!--        where (bu.user_id = #{userId} or bi.is_private = 1)-->
-<!--        <if test="status != null"> and bi.status = #{status} </if>-->
-<!--        ${params.dataScope}-->
-<!--    </sql>-->
+    <select id="selectCountByStatus" resultType="java.lang.Integer">
+        select count(bi.id) <include refid="businessSearchSql"/>
+    </select>
 
-<!--    <select id="selectCountByStatus" resultType="java.lang.Integer">-->
-<!--        select count(bi.id) <include refid="businessSearchSql"/>-->
-<!--    </select>-->
+    <select id="selectAmountAnalyze" resultType="com.dsk.biz.domain.vo.BusinessAnalyzeVo">
+        select
+            bi.amount_source,count(bi.id) businessCount, ROUND(sum(bi.investment_amount), 4) totalAmount
+        <include refid="businessSearchSql"/>
+        and bi.amount_source is not null
+        group by bi.amount_source
+        having businessCount > 0
+    </select>
 
-<!--    <select id="selectAmountAnalyze" resultType="com.dsk.system.domain.business.vo.BusinessAnalyzeVo">-->
-<!--        select-->
-<!--            bi.amount_source,count(bi.id) businessCount,sum(bi.investment_amount) totalAmount-->
-<!--        <include refid="businessSearchSql"/>-->
-<!--        group by bi.amount_source-->
-<!--    </select>-->
+    <select id="selectTypeAnalyze" resultType="com.dsk.biz.domain.vo.BusinessAnalyzeVo">
+        select
+        bi.project_type,count(bi.id) businessCount, ROUND(sum(bi.investment_amount), 4) totalAmount
+        <include refid="businessSearchSql"/>
+        and bi.project_type is not null
+        group by bi.project_type
+        <if test="status != null and status == 0 "> order by businessCount desc </if>
+        <if test="status != null and status == 2 "> order by totalAmount desc </if>
+    </select>
 
-<!--    <select id="selectTypeAnalyze" resultType="com.dsk.system.domain.business.vo.BusinessAnalyzeVo">-->
-<!--        select-->
-<!--        bi.project_type,count(bi.id) businessCount,sum(bi.investment_amount) totalAmount-->
-<!--        <include refid="businessSearchSql"/>-->
-<!--        group by bi.project_type-->
-<!--    </select>-->
+    <select id="selectCategoryAnalyze" resultType="com.dsk.biz.domain.vo.BusinessAnalyzeVo">
+        select
+        bi.project_category,count(bi.id) businessCount, ROUND(sum(bi.investment_amount), 4) totalAmount
+        <include refid="businessSearchSql"/>
+        and bi.project_category is not null
+        group by bi.project_category
+        <if test="status != null and status == 0 "> order by businessCount desc </if>
+        <if test="status != null and status == 2 "> order by totalAmount desc </if>
+    </select>
 
 </mapper>

dsk-module/dsk-biz-api/src/main/resources/mapper/biz/BusinessLabelMapper.xml

+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.dsk.biz.mapper.BusinessLabelMapper">
+
+    <resultMap type="com.dsk.biz.domain.BusinessLabel" id="BusinessLabelResult">
+        <result property="id" column="id"/>
+        <result property="businessId" column="business_id"/>
+        <result property="label" column="label"/>
+        <result property="createTime" column="create_time"/>
+        <result property="updateTime" column="update_time"/>
+    </resultMap>
+
+    <sql id="selectBusinessLabelVo">
+        select id, business_id, label, create_time, update_time
+        from business_label
+    </sql>
+
+    <select id="selectBusinessLabelList" parameterType="com.dsk.biz.domain.BusinessLabel"
+            resultMap="BusinessLabelResult">
+        <include refid="selectBusinessLabelVo"/>
+        <where>
+            <if test="businessId != null ">and business_id = #{businessId}</if>
+            <if test="label != null  and label != ''">and label = #{label}</if>
+        </where>
+    </select>
+
+    <select id="selectBusinessLabelById" parameterType="Long" resultMap="BusinessLabelResult">
+        <include refid="selectBusinessLabelVo"/>
+        where id = #{id}
+    </select>
+
+    <insert id="insertBusinessLabel" parameterType="com.dsk.biz.domain.BusinessLabel"
+            useGeneratedKeys="true" keyProperty="id">
+        insert into business_label
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="businessId != null">business_id,</if>
+            <if test="label != null">label,</if>
+            <if test="createTime != null">create_time,</if>
+            <if test="updateTime != null">update_time,</if>
+        </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="businessId != null">#{businessId},</if>
+            <if test="label != null">#{label},</if>
+            <if test="createTime != null">#{createTime},</if>
+            <if test="updateTime != null">#{updateTime},</if>
+        </trim>
+    </insert>
+
+    <update id="updateBusinessLabel" parameterType="com.dsk.biz.domain.BusinessLabel">
+        update business_label
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="businessId != null">business_id = #{businessId},</if>
+            <if test="label != null">label = #{label},</if>
+            <if test="createTime != null">create_time = #{createTime},</if>
+            <if test="updateTime != null">update_time = #{updateTime},</if>
+        </trim>
+        where id = #{id}
+    </update>
+
+    <delete id="deleteBusinessLabelById">
+        delete
+        from business_label
+        where id = #{labelId}
+    </delete>
+
+    <delete id="deleteBusinessLabelByIds" parameterType="String">
+        delete from business_label where id in
+        <foreach item="id" collection="array" open="(" separator="," close=")">
+            #{id}
+        </foreach>
+    </delete>
+</mapper>

dsk-module/dsk-biz-api/src/main/resources/mapper/biz/BusinessRelateCompanyMapper.xml

+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.dsk.biz.mapper.BusinessRelateCompanyMapper">
+
+    <resultMap type="com.dsk.biz.domain.BusinessRelateCompany" id="BusinessRelateCompanyResult">
+        <result property="id" column="id"/>
+        <result property="businessId" column="business_id"/>
+        <result property="companyId" column="company_id"/>
+        <result property="companyName" column="company_name"/>
+        <result property="companyRole" column="company_role"/>
+        <result property="responsiblePerson" column="responsible_person"/>
+        <result property="phone" column="phone"/>
+        <result property="isProprietor" column="is_proprietor"/>
+        <result property="remark" column="remark"/>
+        <result property="createTime" column="create_time"/>
+        <result property="updateTime" column="update_time"/>
+        <result property="depth" column="depth"/>
+        <result property="companyUipId" column="company_uip_id"/>
+    </resultMap>
+
+    <sql id="selectBusinessRelateCompanyVo">
+        select id,
+               business_id,
+               company_id,
+               company_name,
+               company_role,
+               responsible_person,
+               phone,
+               depth,
+               is_proprietor,
+               remark,
+               create_time,
+               update_time,
+               company_uip_id
+        from business_relate_company
+    </sql>
+
+    <select id="selectBusinessRelateCompanyList" parameterType="com.dsk.biz.domain.BusinessRelateCompany"
+            resultMap="BusinessRelateCompanyResult">
+        <include refid="selectBusinessRelateCompanyVo"/>
+        <where>
+            <if test="bo.businessId != null ">and business_id = #{bo.businessId}</if>
+            <if test="bo.companyId != null ">and company_id = #{bo.companyId}</if>
+            <if test="bo.companyName != null  and bo.companyName != ''">and company_name like concat('%', #{bo.companyName},
+                '%')
+            </if>
+            <if test="bo.companyRole != null  and bo.companyRole != ''">and company_role = #{bo.companyRole}</if>
+            <if test="bo.depth != null  and bo.depth != ''">and depth = #{bo.depth}</if>
+            <if test="bo.responsiblePerson != null  and bo.responsiblePerson != ''">and responsible_person = #{bo.responsiblePerson} </if>
+            <if test="bo.phone != null  and bo.phone != ''">and phone = #{bo.phone}</if>
+        </where>
+    </select>
+
+    <select id="selectBusinessRelateCompanyById" parameterType="Long" resultMap="BusinessRelateCompanyResult">
+        <include refid="selectBusinessRelateCompanyVo"/>
+        where id = #{id}
+    </select>
+
+    <insert id="insertBusinessRelateCompany" parameterType="com.dsk.biz.domain.BusinessRelateCompany" useGeneratedKeys="true"
+            keyProperty="id">
+        insert into business_relate_company
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="businessId != null">business_id,</if>
+            <if test="companyId != null">company_id,</if>
+            <if test="companyName != null">company_name,</if>
+            <if test="depth != null">depth,</if>
+            <if test="companyRole != null">company_role,</if>
+            <if test="responsiblePerson != null">responsible_person,</if>
+            <if test="phone != null">phone,</if>
+            <if test="isProprietor != null">is_proprietor,</if>
+            <if test="remark != null and remark != '' ">remark,</if>
+            <if test="companyUipId != null">company_uip_id,</if>
+        </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="businessId != null">#{businessId},</if>
+            <if test="companyId != null">#{companyId},</if>
+            <if test="companyName != null">#{companyName},</if>
+            <if test="depth != null">#{depth},</if>
+            <if test="companyRole != null">#{companyRole},</if>
+            <if test="responsiblePerson != null">#{responsiblePerson},</if>
+            <if test="phone != null">#{phone},</if>
+            <if test="isProprietor != null">#{isProprietor},</if>
+            <if test="remark != null and remark != ''">#{remark},</if>
+            <if test="companyUipId != null">#{companyUipId},</if>
+        </trim>
+    </insert>
+
+    <update id="updateBusinessRelateCompany" parameterType="com.dsk.biz.domain.BusinessRelateCompany">
+        update business_relate_company
+        <set>
+            <if test="companyId != null">company_id = #{companyId},</if>
+            <if test="companyUipId != null">company_uip_id = #{companyUipId},</if>
+            <if test="companyName != null">company_name = #{companyName},</if>
+            <if test="depth != null">depth = #{depth},</if>
+            <if test="companyRole != null">company_role = #{companyRole},</if>
+            <if test="responsiblePerson != null">responsible_person = #{responsiblePerson},</if>
+            <if test="phone != null">phone = #{phone},</if>
+            <if test="remark != null">remark = #{remark},</if>
+        </set>
+        where id = #{id}
+    </update>
+
+    <delete id="deleteBusinessRelateCompanyById" parameterType="Long">
+        delete
+        from business_relate_company
+        where id = #{id}
+    </delete>
+
+    <delete id="deleteBusinessRelateCompanyByIds" parameterType="String">
+        delete from business_relate_company where id in
+        <foreach item="id" collection="array" open="(" separator="," close=")">
+            #{id}
+        </foreach>
+    </delete>
+
+    <select id="selectByProprietor" resultType="com.dsk.biz.domain.BusinessRelateCompany">
+        <include refid="selectBusinessRelateCompanyVo"/>
+        where business_id = #{businessId} and is_proprietor = 1
+    </select>
+</mapper>

dsk-module/dsk-biz-api/src/main/resources/mapper/biz/BusinessUserMapper.xml

+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.dsk.biz.mapper.BusinessUserMapper">
+
+    <resultMap type="com.dsk.biz.domain.BusinessUser" id="BusinessUserResult">
+        <result property="id" column="id"/>
+        <result property="businessId" column="business_id"/>
+        <result property="deptId" column="dept_id"/>
+        <result property="userId" column="user_id"/>
+        <result property="isFounder" column="is_founder"/>
+        <result property="createTime" column="create_time"/>
+        <result property="updateTime" column="update_time"/>
+    </resultMap>
+
+    <sql id="selectBusinessUserVo">
+        select id, business_id, dept_id, user_id, is_founder, create_time, update_time
+        from business_user
+    </sql>
+
+    <select id="selectBusinessUserList" parameterType="com.dsk.biz.domain.BusinessUser" resultMap="BusinessUserResult">
+        <include refid="selectBusinessUserVo"/>
+        <where>
+            <if test="businessId != null ">and business_id = #{businessId}</if>
+            <if test="deptId != null ">and company_id = #{deptId}</if>
+            <if test="userId != null ">and user_id = #{userId}</if>
+            <if test="isFounder != null ">and is_founder = #{isFounder}</if>
+        </where>
+    </select>
+
+    <select id="selectBusinessUserById" parameterType="Long" resultMap="BusinessUserResult">
+        <include refid="selectBusinessUserVo"/>
+        where id = #{id}
+    </select>
+    <select id="selectCreatorByBusinessId" resultType="java.lang.String">
+        select u.nick_name
+        from business_user bu
+        left join business_info i on i.id = bu.business_id
+        left join sys_user u on u.user_id = bu.user_id
+        where bu.is_founder = 1
+        and i.id = #{BusinessId}
+    </select>
+    <select id="selectFounder" resultType="java.lang.Integer">
+        select is_founder
+        from business_user
+        where business_id = #{businessId}
+        and user_id = #{userId}
+    </select>
+
+    <insert id="insertBusinessUser" parameterType="com.dsk.biz.domain.BusinessUser" useGeneratedKeys="true" keyProperty="id">
+        insert into business_user
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="businessId != null">business_id,</if>
+            <if test="deptId != null">dept_id,</if>
+            <if test="userId != null">user_id,</if>
+            <if test="isFounder != null">is_founder,</if>
+            <if test="createTime != null">create_time,</if>
+            <if test="updateTime != null">update_time,</if>
+        </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="businessId != null">#{businessId},</if>
+            <if test="deptId != null">#{deptId},</if>
+            <if test="userId != null">#{userId},</if>
+            <if test="isFounder != null">#{isFounder},</if>
+            <if test="createTime != null">#{createTime},</if>
+            <if test="updateTime != null">#{updateTime},</if>
+        </trim>
+    </insert>
+
+    <update id="updateBusinessUser" parameterType="com.dsk.biz.domain.BusinessUser">
+        update business_user
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="businessId != null">business_id = #{businessId},</if>
+            <if test="deptId != null">dept_id = #{deptId},</if>
+            <if test="userId != null">user_id = #{userId},</if>
+            <if test="isFounder != null">is_founder = #{isFounder},</if>
+            <if test="createTime != null">create_time = #{createTime},</if>
+            <if test="updateTime != null">update_time = #{updateTime},</if>
+        </trim>
+        where id = #{id}
+    </update>
+
+    <delete id="deleteBusinessUserById" parameterType="Long">
+        delete
+        from business_user
+        where id = #{id}
+    </delete>
+
+    <delete id="deleteBusinessUserByIds" parameterType="String">
+        delete from business_user where id in
+        <foreach item="id" collection="array" open="(" separator="," close=")">
+            #{id}
+        </foreach>
+    </delete>
+</mapper>

dsk-module/dsk-biz-api/src/main/resources/mapper/biz/CustomerFollowRecordMapper.xml

@@ -22,7 +22,7 @@
             <if test="dto.endTime != null and dto.endTime != '' "> and cfr.visit_time &lt;= #{dto.endTime} </if>
             <!-- 数据范围过滤 -->
             <if test="ew.getCustomSqlSegment != null and ew.getCustomSqlSegment != '' "> ${ew.getCustomSqlSegment}</if>
-            <if test="params.dataScope != null and params.dataScope != '' "> ${params.dataScope}</if>
+            <if test="dto.params.dataScope != null and params.dataScope != '' "> ${dto.params.dataScope}</if>
         </where>
         order by cfr.visit_time desc
     </select>

dsk-system/src/main/java/com/dsk/system/service/ISysMenuService.java

@@ -31,6 +31,16 @@ public interface ISysMenuService {
      */
     List<SysMenu> selectMenuList(SysMenu menu, Long userId);
 
+    /**
+     * 获取企业方案菜单下拉树列表
+     * 剔除"企业管理"相关菜单
+     *
+     * @param menu   菜单信息
+     * @param userId 用户ID
+     * @return 菜单列表
+     */
+    List<SysMenu> selectTenantPackageMenuList(SysMenu menu, Long userId);
+
     /**
      * 根据用户ID查询权限
      *
@@ -134,4 +144,5 @@ public interface ISysMenuService {
      * @return 结果
      */
     boolean checkMenuNameUnique(SysMenu menu);
+
 }

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

@@ -228,7 +228,11 @@ public class ISysTenantServiceImpl implements ISysTenantService {
 
         //租户新增成功,发送短信通知租户
         //此处暂用钉钉机器人模拟发送短信
-        String content = "【央企数字经营管理系统通知】：" + bo.getCompanyName() + "您好，您已经成功注册央企数字经营管理系统，请使用手机号码登录，初始密码为" + password + "。友情提示：为了您的账号安全，请勿泄露密码。若需要修改密码，请联系管理员。";
+        String content = "【央企数字经营管理系统通知】："
+                + bo.getCompanyName()
+                + "您好，您已经成功注册央企数字经营管理系统，请使用手机号码登录，初始密码为"
+                + password
+                + "。友情提示：为了您的账号安全，请勿泄露密码。若需要修改密码，请联系管理员。";
         DingTalkUtil.sendDingTalkMsg(content);
         System.out.println("👉🏻:" + content);
         return true;
@@ -236,7 +240,7 @@ public class ISysTenantServiceImpl implements ISysTenantService {
 
     // 生成随机密码
     public static String generatePassword(int length) {
-        String characters = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789!@#$%^&*_+=";
+        String characters = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789";
         StringBuilder password = new StringBuilder();
 
         Random random = new Random();

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

@@ -24,6 +24,7 @@ import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
 
 import java.util.*;
+import java.util.stream.Collectors;
 
 /**
  * 菜单 业务层处理
@@ -81,6 +82,30 @@ public class SysMenuServiceImpl implements ISysMenuService {
         return menuList;
     }
 
+    /**
+     * 获取企业方案菜单下拉树列表
+     * 剔除"企业管理"相关菜单
+     *
+     * @param menu   菜单信息
+     * @param userId 用户ID
+     * @return 菜单列表
+     */
+    @Override
+    public List<SysMenu> selectTenantPackageMenuList(SysMenu menu, Long userId) {
+        List<SysMenu> menuList = null;
+        // 管理员显示所有菜单信息
+        if (LoginHelper.isSuperAdmin(userId)) {
+            menuList = baseMapper.selectList(new LambdaQueryWrapper<SysMenu>()
+                    .like(StringUtils.isNotBlank(menu.getMenuName()), SysMenu::getMenuName, menu.getMenuName())
+                    .eq(StringUtils.isNotBlank(menu.getVisible()), SysMenu::getVisible, menu.getVisible())
+                    .eq(StringUtils.isNotBlank(menu.getStatus()), SysMenu::getStatus, menu.getStatus())
+                    .orderByAsc(SysMenu::getParentId)
+                    .orderByAsc(SysMenu::getOrderNum));
+            menuList = menuList.stream().filter(menu1 -> !menu1.getMenuName().equals("企业管理")).collect(Collectors.toList());
+        }
+        return menuList;
+    }
+
     /**
      * 根据用户ID查询权限
      *