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

dsk-admin/src/main/java/com/dsk/web/controller/business/BusinessBacklogController.java

+package com.dsk.web.controller.business;
+
+import java.util.List;
+import javax.annotation.PostConstruct;
+import javax.servlet.http.HttpServletResponse;
+
+import com.dsk.common.core.domain.entity.BusinessBacklog;
+import com.dsk.common.utils.poi.ExcelUtil;
+import com.dsk.system.service.IBusinessBacklogService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import com.dsk.common.annotation.Log;
+import com.dsk.common.core.controller.BaseController;
+import com.dsk.common.core.domain.AjaxResult;
+import com.dsk.common.enums.BusinessType;
+import com.dsk.common.core.page.TableDataInfo;
+
+/**
+ * 项目工作待办Controller
+ *
+ * @author lxl
+ * @date 2023-05-17
+ */
+@Api("项目工作待办")
+@RestController
+@RequestMapping("/business/backlog")
+@Slf4j
+public class BusinessBacklogController extends BaseController
+{
+    @Autowired
+    private IBusinessBacklogService businessBacklogService;
+
+    /**
+     * 分页查询项目工作待办列表
+     */
+//    @PreAuthorize("@ss.hasPermi('system:backlog:list')")
+    @GetMapping("/list")
+    public TableDataInfo list(@RequestBody BusinessBacklog businessBacklog)
+    {
+        startPage();
+        List<BusinessBacklog> list = businessBacklogService.selectBusinessBacklogList(businessBacklog);
+        return getDataTable(list);
+    }
+
+    /**
+     * 新增项目工作待办
+     */
+    @ApiOperation("新增项目工作待办")
+//    @PreAuthorize("@ss.hasPermi('system:backlog:add')")
+//    @Log(title = "项目工作待办", businessType = BusinessType.INSERT)
+    @PostMapping("/add")
+    public AjaxResult add(@RequestBody BusinessBacklog businessBacklog)
+    {
+        return toAjax(businessBacklogService.insertBusinessBacklog(businessBacklog));
+    }
+
+    /**
+     * 修改项目工作待办
+     */
+//    @PreAuthorize("@ss.hasPermi('system:backlog:edit')")
+//    @Log(title = "项目工作待办", businessType = BusinessType.UPDATE)
+    @PostMapping("/edit")
+    public AjaxResult edit(@RequestBody BusinessBacklog businessBacklog)
+    {
+        return toAjax(businessBacklogService.updateBusinessBacklog(businessBacklog));
+    }
+
+//    /**
+//     * 导出项目工作待办列表
+//     */
+//    @PreAuthorize("@ss.hasPermi('system:backlog:export')")
+//    @Log(title = "项目工作待办", businessType = BusinessType.EXPORT)
+//    @PostMapping("/export")
+//    public void export(HttpServletResponse response, BusinessBacklog businessBacklog)
+//    {
+//        List<BusinessBacklog> list = businessBacklogService.selectBusinessBacklogList(businessBacklog);
+//        ExcelUtil<BusinessBacklog> util = new ExcelUtil<BusinessBacklog>(BusinessBacklog.class);
+//        util.exportExcel(response, list, "项目工作待办数据");
+//    }
+
+//    /**
+//     * 获取项目工作待办详细信息
+//     */
+//    @PreAuthorize("@ss.hasPermi('system:backlog:query')")
+//    @GetMapping(value = "/{id}")
+//    public AjaxResult getInfo(@PathVariable("id") Long id)
+//    {
+//        return success(businessBacklogService.selectBusinessBacklogById(id));
+//    }
+
+//    /**
+//     * 删除项目工作待办
+//     */
+//    @PreAuthorize("@ss.hasPermi('system:backlog:remove')")
+//    @Log(title = "项目工作待办", businessType = BusinessType.DELETE)
+//	@DeleteMapping("/{ids}")
+//    public AjaxResult remove(@PathVariable Long[] ids)
+//    {
+//        return toAjax(businessBacklogService.deleteBusinessBacklogByIds(ids));
+//    }
+}

dsk-admin/src/main/java/com/dsk/web/controller/business/BusinessContactsController.java

+package com.dsk.web.controller.business;
+
+import java.util.List;
+import javax.servlet.http.HttpServletResponse;
+
+import com.dsk.common.core.domain.entity.BusinessContacts;
+import com.dsk.common.utils.poi.ExcelUtil;
+import com.dsk.system.service.IBusinessContactsService;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import com.dsk.common.annotation.Log;
+import com.dsk.common.core.controller.BaseController;
+import com.dsk.common.core.domain.AjaxResult;
+import com.dsk.common.enums.BusinessType;
+import com.dsk.common.core.page.TableDataInfo;
+
+/**
+ * 项目联系人Controller
+ *
+ * @author lxl
+ * @date 2023-05-17
+ */
+@RestController
+@RequestMapping("/business/contacts")
+public class BusinessContactsController extends BaseController
+{
+    @Autowired
+    private IBusinessContactsService businessContactsService;
+
+    /**
+     * 分页查询项目联系人列表
+     */
+//    @PreAuthorize("@ss.hasPermi('system:contacts:list')")
+    @GetMapping("/list")
+    public TableDataInfo list(BusinessContacts businessContacts)
+    {
+        startPage();
+        List<BusinessContacts> list = businessContactsService.selectBusinessContactsList(businessContacts);
+        return getDataTable(list);
+    }
+
+    /**
+     * 新增项目联系人
+     */
+//    @PreAuthorize("@ss.hasPermi('system:contacts:add')")
+//    @Log(title = "项目联系人", businessType = BusinessType.INSERT)
+    @PostMapping("/add")
+    public AjaxResult add(@RequestBody BusinessContacts businessContacts)
+    {
+        return toAjax(businessContactsService.insertBusinessContacts(businessContacts));
+    }
+
+    /**
+     * 修改项目联系人
+     */
+//    @PreAuthorize("@ss.hasPermi('system:contacts:edit')")
+//    @Log(title = "项目联系人", businessType = BusinessType.UPDATE)
+    @PostMapping("/edit")
+    public AjaxResult edit(@RequestBody BusinessContacts businessContacts)
+    {
+        return toAjax(businessContactsService.updateBusinessContacts(businessContacts));
+    }
+
+//    /**
+//     * 导出项目联系人列表
+//     */
+//    @PreAuthorize("@ss.hasPermi('system:contacts:export')")
+//    @Log(title = "项目联系人", businessType = BusinessType.EXPORT)
+//    @PostMapping("/export")
+//    public void export(HttpServletResponse response, BusinessContacts businessContacts)
+//    {
+//        List<BusinessContacts> list = businessContactsService.selectBusinessContactsList(businessContacts);
+//        ExcelUtil<BusinessContacts> util = new ExcelUtil<BusinessContacts>(BusinessContacts.class);
+//        util.exportExcel(response, list, "项目联系人数据");
+//    }
+
+//    /**
+//     * 获取项目联系人详细信息
+//     */
+//    @PreAuthorize("@ss.hasPermi('system:contacts:query')")
+//    @GetMapping(value = "/{id}")
+//    public AjaxResult getInfo(@PathVariable("id") Long id)
+//    {
+//        return success(businessContactsService.selectBusinessContactsById(id));
+//    }
+
+//    /**
+//     * 删除项目联系人
+//     */
+//    @PreAuthorize("@ss.hasPermi('system:contacts:remove')")
+//    @Log(title = "项目联系人", businessType = BusinessType.DELETE)
+//	@DeleteMapping("/{ids}")
+//    public AjaxResult remove(@PathVariable Long[] ids)
+//    {
+//        return toAjax(businessContactsService.deleteBusinessContactsByIds(ids));
+//    }
+}

dsk-admin/src/main/java/com/dsk/web/controller/business/BusinessFollowRecordController.java

+package com.dsk.web.controller.business;
+
+import java.util.List;
+import javax.servlet.http.HttpServletResponse;
+
+import com.dsk.common.core.domain.entity.BusinessFollowRecord;
+import com.dsk.system.service.IBusinessFollowRecordService;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import com.dsk.common.annotation.Log;
+import com.dsk.common.core.controller.BaseController;
+import com.dsk.common.core.domain.AjaxResult;
+import com.dsk.common.enums.BusinessType;
+import com.dsk.common.utils.poi.ExcelUtil;
+import com.dsk.common.core.page.TableDataInfo;
+
+/**
+ * 项目跟进记录Controller
+ *
+ * @author lxl
+ * @date 2023-05-17
+ */
+@RestController
+@RequestMapping("/business/record")
+public class BusinessFollowRecordController extends BaseController
+{
+    @Autowired
+    private IBusinessFollowRecordService businessFollowRecordService;
+
+    /**
+     * 根据项目id查询项目跟进记录
+     */
+//    @PreAuthorize("@ss.hasPermi('system:record:list')")
+    @GetMapping("/list/{businessId}")
+    public AjaxResult list(@PathVariable Integer businessId)
+    {
+        return success(businessFollowRecordService.selectBusinessFollowRecordList(businessId));
+    }
+
+    /**
+     * 新增项目跟进记录
+     */
+//    @PreAuthorize("@ss.hasPermi('system:record:add')")
+//    @Log(title = "项目跟进记录", businessType = BusinessType.INSERT)
+    @PostMapping("/add")
+    public AjaxResult add(@RequestBody BusinessFollowRecord businessFollowRecord)
+    {
+        return toAjax(businessFollowRecordService.insertBusinessFollowRecord(businessFollowRecord));
+    }
+
+    /**
+     * 分页查询项目跟进记录
+     */
+//    @PreAuthorize("@ss.hasPermi('system:record:list')")
+//    @GetMapping("/list")
+//    public TableDataInfo list(BusinessFollowRecord businessFollowRecord)
+//    {
+//        startPage();
+//        List<BusinessFollowRecord> list = businessFollowRecordService.selectBusinessFollowRecordList(businessFollowRecord);
+//        return getDataTable(list);
+//    }
+
+//    /**
+//     * 导出项目跟进记录列表
+//     */
+//    @PreAuthorize("@ss.hasPermi('system:record:export')")
+//    @Log(title = "项目跟进记录", businessType = BusinessType.EXPORT)
+//    @PostMapping("/export")
+//    public void export(HttpServletResponse response, BusinessFollowRecord businessFollowRecord)
+//    {
+//        List<BusinessFollowRecord> list = businessFollowRecordService.selectBusinessFollowRecordList(businessFollowRecord);
+//        ExcelUtil<BusinessFollowRecord> util = new ExcelUtil<BusinessFollowRecord>(BusinessFollowRecord.class);
+//        util.exportExcel(response, list, "项目跟进记录数据");
+//    }
+
+//    /**
+//     * 获取项目跟进记录详细信息
+//     */
+//    @PreAuthorize("@ss.hasPermi('system:record:query')")
+//    @GetMapping(value = "/{id}")
+//    public AjaxResult getInfo(@PathVariable("id") Long id)
+//    {
+//        return success(businessFollowRecordService.selectBusinessFollowRecordById(id));
+//    }
+
+//    /**
+//     * 修改项目跟进记录
+//     */
+//    @PreAuthorize("@ss.hasPermi('system:record:edit')")
+//    @Log(title = "项目跟进记录", businessType = BusinessType.UPDATE)
+//    @PutMapping
+//    public AjaxResult edit(@RequestBody BusinessFollowRecord businessFollowRecord)
+//    {
+//        return toAjax(businessFollowRecordService.updateBusinessFollowRecord(businessFollowRecord));
+//    }
+
+//    /**
+//     * 删除项目跟进记录
+//     */
+//    @PreAuthorize("@ss.hasPermi('system:record:remove')")
+//    @Log(title = "项目跟进记录", businessType = BusinessType.DELETE)
+//	@DeleteMapping("/{ids}")
+//    public AjaxResult remove(@PathVariable Long[] ids)
+//    {
+//        return toAjax(businessFollowRecordService.deleteBusinessFollowRecordByIds(ids));
+//    }
+}

dsk-admin/src/main/java/com/dsk/web/controller/business/BusinessInfoController.java

+package com.dsk.web.controller.business;
+
+import java.util.List;
+
+import com.dsk.common.core.domain.entity.BusinessInfo;
+import com.dsk.common.dtos.BusinessInfoDto;
+import com.dsk.system.domain.BusinessAddDto;
+import com.dsk.system.domain.BusinessListDto;
+import com.dsk.system.domain.vo.BusinessBrowseVo;
+import com.dsk.system.domain.vo.BusinessListVo;
+import com.dsk.system.service.IBusinessInfoService;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+import com.dsk.common.annotation.Log;
+import com.dsk.common.core.controller.BaseController;
+import com.dsk.common.core.domain.AjaxResult;
+import com.dsk.common.enums.BusinessType;
+import com.dsk.common.core.page.TableDataInfo;
+
+/**
+ * 项目详情Controller
+ *
+ * @author lxl
+ * @date 2023-05-17
+ */
+@RestController
+@RequestMapping("/business/info")
+public class BusinessInfoController extends BaseController
+{
+    @Autowired
+    private IBusinessInfoService businessInfoService;
+
+
+    /**
+     * 查询所有项目名称(支持模糊查询)
+     */
+//    @PreAuthorize("@ss.hasPermi('system:info:list')")
+    @PostMapping("/query/project")
+    public AjaxResult queryprojectName(@RequestBody BusinessListDto dto){
+        return AjaxResult.success(businessInfoService.selectProjectName(dto));
+    }
+
+    /**
+     * 查询项目列表
+     */
+//    @PreAuthorize("@ss.hasPermi('system:info:list')")
+    @GetMapping("/list")
+    public TableDataInfo list(@RequestBody BusinessListDto dto)
+    {
+        startPage();
+        List<BusinessListVo> list = businessInfoService.selectBusinessInfoList(dto);
+        return getDataTable(list);
+    }
+
+    /**
+     * 查询项目速览
+     */
+//    @PreAuthorize("@ss.hasPermi('system:info:list')")
+    @GetMapping("/browse/{businessId}")
+    public AjaxResult browse(@PathVariable Integer id)
+    {
+        return success(businessInfoService.browse(id));
+    }
+
+    /**
+     * 获取项目建设内容
+     */
+//    @PreAuthorize("@ss.hasPermi('system:info:query')")
+    @GetMapping(value = "/construction/{id}")
+    public AjaxResult getConstruction(@PathVariable("id") Integer id)
+    {
+        return success(businessInfoService.getConstruction(id));
+    }
+
+    /**
+     * 删除项目列表
+     */
+//    @PreAuthorize("@ss.hasPermi('system:info: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:info:add')")
+//    @Log(title = "项目详情", businessType = BusinessType.INSERT)
+    @PostMapping("/add")
+    public AjaxResult add(@RequestBody BusinessAddDto dto)
+    {
+        return businessInfoService.insertBusinessInfo(dto);
+    }
+
+    /**
+     * 修改项目详情
+     */
+//    @PreAuthorize("@ss.hasPermi('system:info: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, "项目详情数据");
+//    }
+
+}

dsk-admin/src/main/java/com/dsk/web/controller/business/BusinessLabelController.java

+package com.dsk.web.controller.business;
+
+import java.util.List;
+import javax.servlet.http.HttpServletResponse;
+
+import com.dsk.common.core.domain.entity.BusinessLabel;
+import com.dsk.common.utils.poi.ExcelUtil;
+import com.dsk.system.domain.BusinessIdDto;
+import com.dsk.system.service.IBusinessLabelService;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import com.dsk.common.annotation.Log;
+import com.dsk.common.core.controller.BaseController;
+import com.dsk.common.core.domain.AjaxResult;
+import com.dsk.common.enums.BusinessType;
+import com.dsk.common.core.page.TableDataInfo;
+
+/**
+ * 项目标签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 AjaxResult add(@RequestBody BusinessLabel businessLabel)
+    {
+        return toAjax(businessLabelService.insertBusinessLabel(businessLabel));
+    }
+
+
+     /**
+     * 删除项目标签
+     */
+//    @PreAuthorize("@ss.hasPermi('system:label:remove')")
+//    @Log(title = "项目标签", businessType = BusinessType.DELETE)
+    @PostMapping("/remove")
+    public AjaxResult remove(@RequestBody BusinessIdDto dto)
+    {
+        return toAjax(businessLabelService.deleteBusinessLabelById(dto));
+    }
+
+//    /**
+//     * 删除项目标签
+//     */
+//    @PreAuthorize("@ss.hasPermi('system:label:remove')")
+//    @Log(title = "项目标签", businessType = BusinessType.DELETE)
+//    @DeleteMapping("/remove/{ids}")
+//    public AjaxResult remove(@PathVariable Long[] ids)
+//    {
+//        return toAjax(businessLabelService.deleteBusinessLabelByIds(ids));
+//    }
+
+//    /**
+//     * 查询项目标签列表
+//     */
+//    @PreAuthorize("@ss.hasPermi('system:label:list')")
+//    @GetMapping("/list")
+//    public TableDataInfo list(BusinessLabel businessLabel)
+//    {
+//        startPage();
+//        List<BusinessLabel> list = businessLabelService.selectBusinessLabelList(businessLabel);
+//        return getDataTable(list);
+//    }
+
+//    /**
+//     * 导出项目标签列表
+//     */
+//    @PreAuthorize("@ss.hasPermi('system:label:export')")
+//    @Log(title = "项目标签", businessType = BusinessType.EXPORT)
+//    @PostMapping("/export")
+//    public void export(HttpServletResponse response, BusinessLabel businessLabel)
+//    {
+//        List<BusinessLabel> list = businessLabelService.selectBusinessLabelList(businessLabel);
+//        ExcelUtil<BusinessLabel> util = new ExcelUtil<BusinessLabel>(BusinessLabel.class);
+//        util.exportExcel(response, list, "项目标签数据");
+//    }
+
+//    /**
+//     * 获取项目标签详细信息
+//     */
+//    @PreAuthorize("@ss.hasPermi('system:label:query')")
+//    @GetMapping(value = "/{id}")
+//    public AjaxResult getInfo(@PathVariable("id") Long id)
+//    {
+//        return success(businessLabelService.selectBusinessLabelById(id));
+//    }
+
+
+//    /**
+//     * 修改项目标签
+//     */
+//    @PreAuthorize("@ss.hasPermi('system:label:edit')")
+//    @Log(title = "项目标签", businessType = BusinessType.UPDATE)
+//    @PutMapping
+//    public AjaxResult edit(@RequestBody BusinessLabel businessLabel)
+//    {
+//        return toAjax(businessLabelService.updateBusinessLabel(businessLabel));
+//    }
+}

dsk-admin/src/main/java/com/dsk/web/controller/business/BusinessRelateCompanyController.java

+package com.dsk.web.controller.business;
+
+import java.util.List;
+import javax.servlet.http.HttpServletResponse;
+
+import com.dsk.common.core.domain.entity.BusinessRelateCompany;
+import com.dsk.common.utils.poi.ExcelUtil;
+import com.dsk.system.domain.BusinessIdDto;
+import com.dsk.system.service.IBusinessRelateCompanyService;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import com.dsk.common.annotation.Log;
+import com.dsk.common.core.controller.BaseController;
+import com.dsk.common.core.domain.AjaxResult;
+import com.dsk.common.enums.BusinessType;
+import com.dsk.common.core.page.TableDataInfo;
+
+/**
+ * 项目关联单位Controller
+ *
+ * @author lxl
+ * @date 2023-05-17
+ */
+@RestController
+@RequestMapping("/business/company")
+public class BusinessRelateCompanyController extends BaseController
+{
+    @Autowired
+    private IBusinessRelateCompanyService businessRelateCompanyService;
+
+    /**
+     * 查询关联单位角色
+     */
+    @PostMapping("/role/list")
+    public AjaxResult companyRoleList(@RequestBody BusinessIdDto dto){
+        return success(businessRelateCompanyService.companyRoleList(dto));
+    }
+
+    /**
+     * 查询项目关联单位列表
+     */
+//    @PreAuthorize("@ss.hasPermi('system:company:list')")
+    @GetMapping("/list")
+    public TableDataInfo list(BusinessRelateCompany businessRelateCompany)
+    {
+        startPage();
+        List<BusinessRelateCompany> list = businessRelateCompanyService.selectBusinessRelateCompanyList(businessRelateCompany);
+        return getDataTable(list);
+    }
+
+    /**
+     * 新增项目关联单位
+     */
+//    @PreAuthorize("@ss.hasPermi('system:company:add')")
+//    @Log(title = "项目关联单位", businessType = BusinessType.INSERT)
+    @PostMapping("/add")
+    public AjaxResult add(@RequestBody BusinessRelateCompany businessRelateCompany)
+    {
+        return toAjax(businessRelateCompanyService.insertBusinessRelateCompany(businessRelateCompany));
+    }
+
+    /**
+     * 修改项目关联单位
+     */
+//    @PreAuthorize("@ss.hasPermi('system:company:edit')")
+//    @Log(title = "项目关联单位", businessType = BusinessType.UPDATE)
+    @PostMapping("/edit")
+    public AjaxResult edit(@RequestBody BusinessRelateCompany businessRelateCompany)
+    {
+        return toAjax(businessRelateCompanyService.updateBusinessRelateCompany(businessRelateCompany));
+    }
+
+//    /**
+//     * 导出项目关联单位列表
+//     */
+//    @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));
+//    }
+
+//
+//    /**
+//     * 删除项目关联单位
+//     */
+//    @PreAuthorize("@ss.hasPermi('system:company:remove')")
+//    @Log(title = "项目关联单位", businessType = BusinessType.DELETE)
+//	@DeleteMapping("/{ids}")
+//    public AjaxResult remove(@PathVariable Long[] ids)
+//    {
+//        return toAjax(businessRelateCompanyService.deleteBusinessRelateCompanyByIds(ids));
+//    }
+}

dsk-admin/src/main/java/com/dsk/web/controller/customer/CustomerController.java

 package com.dsk.web.controller.customer;
 
+import com.dsk.common.annotation.Log;
 import com.dsk.common.annotation.RepeatSubmit;
 import com.dsk.common.core.controller.BaseController;
 import com.dsk.common.core.domain.AjaxResult;
+import com.dsk.common.core.domain.entity.SysRole;
 import com.dsk.common.core.page.TableDataInfo;
-import com.dsk.common.utils.PageUtils;
+import com.dsk.common.enums.BusinessType;
+import com.dsk.common.utils.poi.ExcelUtil;
 import com.dsk.system.domain.customer.Customer;
+import com.dsk.system.domain.customer.dto.CustomerBusinessSearchDto;
 import com.dsk.system.domain.customer.dto.CustomerSearchDto;
 import com.dsk.system.service.ICustomerService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.util.CollectionUtils;
 import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
+
+import java.util.List;
 
 /**
  * 客户相关
@@ -30,7 +38,7 @@ public class CustomerController extends BaseController {
      */
     @PreAuthorize("@ss.hasPermi('customer:list')")
     @GetMapping("/list")
-    public TableDataInfo selectPageList(CustomerSearchDto dto){
+    public TableDataInfo selectPageList(CustomerSearchDto dto) {
         startPage();
         return getDataTable(baseService.selectList(dto));
     }
@@ -40,7 +48,7 @@ public class CustomerController extends BaseController {
      */
     @PreAuthorize("@ss.hasPermi('customer:info')")
     @GetMapping("/{customerId}")
-    public AjaxResult info(@PathVariable("customerId") String customerId){
+    public AjaxResult info(@PathVariable("customerId") String customerId) {
         return AjaxResult.success(baseService.info(customerId));
     }
 
@@ -50,7 +58,7 @@ public class CustomerController extends BaseController {
     @PreAuthorize("@ss.hasPermi('customer:add')")
     @PostMapping()
     @RepeatSubmit
-    public AjaxResult add(@RequestBody Customer customer){
+    public AjaxResult add(@RequestBody Customer customer) {
         return AjaxResult.success(baseService.add(customer));
     }
 
@@ -60,17 +68,32 @@ public class CustomerController extends BaseController {
     @PreAuthorize("@ss.hasPermi('customer:edit')")
     @PutMapping()
     @RepeatSubmit
-    public AjaxResult edit(@RequestBody Customer customer){
+    public AjaxResult edit(@RequestBody Customer customer) {
         return AjaxResult.success(baseService.edit(customer));
     }
 
     /**
      * 获取个人客户列表
      */
-    @PreAuthorize("@ss.hasPermi('customer:user:list')")
     @GetMapping("/user/list")
-    public AjaxResult selectUserList(){
+    public AjaxResult userList() {
         return AjaxResult.success(baseService.selectUserList());
     }
 
+    /**
+     * 获取客户项目（合作情况）列表
+     */
+//    @PreAuthorize("@ss.hasPermi('customer:business:list')")
+    @GetMapping("/business/list")
+    public TableDataInfo businessList(CustomerBusinessSearchDto dto) {
+        startPage();
+        return getDataTable(baseService.selectBusinessList(dto));
+    }
+
+    @Log(title = "客户数据导入", businessType = BusinessType.IMPORT)
+    //@PreAuthorize("@ss.hasPermi('customer:importData')")
+    @PostMapping("/importData")
+    public AjaxResult importData(@RequestPart("file") MultipartFile file) throws Exception {
+        return AjaxResult.success(baseService.importData(new ExcelUtil<>(Customer.class).importExcel(file.getInputStream(), 3)));
+    }
 }

dsk-admin/src/main/java/com/dsk/web/controller/customer/CustomerDecisionChainController.java

@@ -26,7 +26,7 @@ public class CustomerDecisionChainController extends BaseController {
     /**
      * 获取客户决策链条列表
      */
-    @PreAuthorize("@ss.hasPermi('customer:decision:chain:list')")
+//    @PreAuthorize("@ss.hasPermi('customer:decision:chain:list')")
     @GetMapping("/list")
     public TableDataInfo selectPageList(CustomerDecisionChainSearchDto dto){
         startPage();
@@ -36,7 +36,7 @@ public class CustomerDecisionChainController extends BaseController {
     /**
      * 添加客户决策链条
      */
-    @PreAuthorize("@ss.hasPermi('customer:decision:chain:add')")
+//    @PreAuthorize("@ss.hasPermi('customer:decision:chain:add')")
     @PostMapping()
     @RepeatSubmit()
     public AjaxResult add(@RequestBody CustomerDecisionChain customerDecisionChain){
@@ -46,7 +46,7 @@ public class CustomerDecisionChainController extends BaseController {
     /**
      * 编辑客户决策链条
      */
-    @PreAuthorize("@ss.hasPermi('customer:decision:chain:edit')")
+//    @PreAuthorize("@ss.hasPermi('customer:decision:chain:edit')")
     @PutMapping()
     @RepeatSubmit()
     public AjaxResult edit(@RequestBody CustomerDecisionChain customerDecisionChain){
@@ -56,7 +56,7 @@ public class CustomerDecisionChainController extends BaseController {
     /**
      * 删除客户决策链条
      */
-    @PreAuthorize("@ss.hasPermi('customer:decision:chain:del')")
+//    @PreAuthorize("@ss.hasPermi('customer:decision:chain:del')")
     @DeleteMapping("/{id}")
     @RepeatSubmit()
     public AjaxResult del(@PathVariable("id") Long id){

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

+package com.dsk.web.controller.dsk;
+
+
+import com.dsk.common.core.domain.R;
+import com.dsk.common.core.page.TableDataInfo;
+import com.dsk.system.dskService.EnterpriseBussinessService;
+import io.swagger.annotations.ApiOperation;
+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 java.util.Map;
+
+/**
+*@Description: 央企经营管理系统企业业务相关
+*@Author: zhangyi
+*@date: 2023/5/17 9:03
+*/
+@Slf4j
+@RestController
+@RequestMapping(value = "/enterpriseBussiness")
+public class EnterpriseBussinessController {
+    @Autowired
+    EnterpriseBussinessService enterpriseBussinessService;
+
+    @ApiOperation(value = "客户信息列表")
+    @RequestMapping(value = "/clientPage", method = RequestMethod.POST)
+    public TableDataInfo clientPage(@RequestBody Map<String, Object> paramMap) throws Exception {
+        return enterpriseBussinessService.clientPage(paramMap);
+    }
+
+    @ApiOperation(value = "客户项目列表")
+    @RequestMapping(value = "/clientProjectPage", method = RequestMethod.POST)
+    public TableDataInfo clientProjectPage(@RequestBody Map<String, Object> paramMap) throws Exception {
+        return enterpriseBussinessService.clientProjectPage(paramMap);
+    }
+
+    @ApiOperation(value = "投标记录列表（开标记录）")
+    @RequestMapping(value = "/tenderPage",method = RequestMethod.POST)
+    public TableDataInfo tenderPage(@RequestBody Map<String, Object> paramMap) throws Exception {
+        return enterpriseBussinessService.tenderPage(paramMap);
+    }
+
+    @ApiOperation(value = "投标记录详情（开标记录）")
+    @RequestMapping(value = "/tenderDetail",method = RequestMethod.POST)
+    public R tenderDetail(@RequestBody Map<String, Object> paramMap) throws Exception {
+        return enterpriseBussinessService.tenderDetail(paramMap);
+    }
+
+    @ApiOperation(value = "供应商列表")
+    @RequestMapping(value = "/supplierPage",method = RequestMethod.POST)
+    public TableDataInfo supplierPage(@RequestBody Map<String, Object> paramMap) throws Exception {
+        return enterpriseBussinessService.supplierPage(paramMap);
+    }
+
+    @ApiOperation(value = "供应商项目列表")
+    @RequestMapping(value = "/supplierProjectPage",method = RequestMethod.POST)
+    public TableDataInfo supplierProjectPage(@RequestBody Map<String, Object> paramMap) throws Exception {
+        return enterpriseBussinessService.supplierProjectPage(paramMap);
+    }
+
+    @ApiOperation(value = "中标项目详情")
+    @RequestMapping(value = "/projectDetail", method = RequestMethod.POST)
+    public R projectDetail(@RequestBody Map<String, Object> paramMap) throws Exception {
+        return enterpriseBussinessService.projectDetail(paramMap);
+    }
+
+    @ApiOperation(value = "招标代理常合作代理机构列表")
+    @RequestMapping(value = "/oftenAgencyPage",method = RequestMethod.POST)
+    public TableDataInfo oftenAgencyPage(@RequestBody Map<String, Object> paramMap) throws Exception {
+        return enterpriseBussinessService.oftenAgencyPage(paramMap);
+    }
+
+    @ApiOperation(value = "招标合作明细列表")
+    @RequestMapping(value = "/bidCooperatePage", method = RequestMethod.POST)
+    public TableDataInfo bidCooperatePage(@RequestBody Map<String, Object> paramMap) throws Exception {
+        return enterpriseBussinessService.bidCooperatePage(paramMap);
+    }
+
+    @ApiOperation(value = "历史发包列表")
+    @RequestMapping(value = "/historySendPage", method = RequestMethod.POST)
+    public TableDataInfo historySendPage(@RequestBody Map<String, Object> paramMap) throws Exception {
+        return enterpriseBussinessService.historySendPage(paramMap);
+    }
+
+    @ApiOperation(value = "历史发包省份")
+    @RequestMapping(value = "/historySendProvince", method = RequestMethod.POST)
+    public R historySendProvince(@RequestBody Map<String, Object> paramMap) throws Exception {
+        return enterpriseBussinessService.historySendProvince(paramMap);
+    }
+
+
+}

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

@@ -2,6 +2,7 @@ package com.dsk.web.controller.dsk;
 
 import com.dsk.common.core.domain.R;
 import com.dsk.common.core.domain.model.*;
+import com.dsk.common.core.page.TableDataInfo;
 import com.dsk.system.dskService.EnterpriseService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -28,8 +29,7 @@ public class EnterpriseController {
 
     @ApiOperation(value = "企业详情头部信息（建设库）")
     @PostMapping("/infoHeader")
-    public R infoHeader(@RequestBody @Valid EnterpriseInfoHeaderBody body) throws Exception
-    {
+    public R infoHeader(@RequestBody @Valid EnterpriseInfoHeaderBody body) throws Exception {
         return enterpriseService.infoHeader(body);
     }
 
@@ -59,19 +59,19 @@ public class EnterpriseController {
 
     @ApiOperation(value = "股东列表（openApi）")
     @PostMapping(value = "partners")
-    public R partners(@RequestBody @Valid EnterprisePartnersBody vo) throws Exception {
+    public TableDataInfo partners(@RequestBody @Valid EnterprisePartnersBody vo) throws Exception {
         return enterpriseService.partners(vo);
     }
 
     @ApiOperation(value = "对外投资列表（openApi）")
     @PostMapping(value = "investment")
-    public R investment(@RequestBody @Valid EnterpriseInvestmentBody vo) throws Exception {
+    public TableDataInfo investment(@RequestBody @Valid EnterpriseInvestmentBody vo) throws Exception {
         return enterpriseService.investment(vo);
     }
 
     @ApiOperation(value = "分支机构列表（openApi）")
     @PostMapping(value = "affiliates")
-    public R affiliates(@RequestBody @Valid EnterpriseAffiliatesBody vo) throws Exception {
+    public TableDataInfo affiliates(@RequestBody @Valid EnterpriseAffiliatesBody vo) throws Exception {
         return enterpriseService.affiliates(vo);
     }
 
@@ -101,7 +101,7 @@ public class EnterpriseController {
 
     @ApiOperation(value = "企业动态列表（建设库）")
     @PostMapping(value = "dynamicPage")
-    public R dynamicPage(@RequestBody @Valid EnterpriseDynamicPageBody vo) throws Exception {
+    public TableDataInfo dynamicPage(@RequestBody @Valid EnterpriseDynamicPageBody vo) throws Exception {
         return enterpriseService.dynamicPage(vo);
     }
 
@@ -113,19 +113,19 @@ public class EnterpriseController {
 
     @ApiOperation(value = "工商变更信息列表（openApi）")
     @PostMapping(value = "changeInfo")
-    public R changeInfo(@RequestBody @Valid EnterpriseChangeInfoBody vo) throws Exception {
+    public TableDataInfo changeInfo(@RequestBody @Valid EnterpriseChangeInfoBody vo) throws Exception {
         return enterpriseService.changeInfo(vo);
     }
 
     @ApiOperation(value = "高管信息列表（openApi）")
     @PostMapping(value = "keymembers")
-    public R keymembers(@RequestBody @Valid EnterpriseKeymembersBody vo) throws Exception {
+    public TableDataInfo keymembers(@RequestBody @Valid EnterpriseKeymembersBody vo) throws Exception {
         return enterpriseService.keymembers(vo);
     }
 
     @ApiOperation(value = "工商股东信息（openApi）")
     @PostMapping(value = "bestStockPage")
-    public R bestStockPage(@RequestBody @Valid EnterpriseKeymembersBody vo) throws Exception {
+    public TableDataInfo bestStockPage(@RequestBody @Valid EnterpriseKeymembersBody vo) throws Exception {
         return enterpriseService.bestStockPage(vo);
     }
 

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

+package com.dsk.web.controller.dsk;
+
+
+import com.dsk.common.core.controller.BaseController;
+import com.dsk.common.core.domain.R;
+import com.dsk.common.core.domain.model.*;
+import com.dsk.common.core.page.TableDataInfo;
+import com.dsk.system.dskService.EnterpriseCreditService;
+import io.swagger.annotations.ApiOperation;
+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 = "/enterpriseCredit")
+public class EnterpriseCreditController {
+    @Autowired
+    EnterpriseCreditService enterpriseCreditService;
+
+    @RequestMapping(value = "/penalizePage", method = RequestMethod.POST)
+    @ApiOperation(value = "行政处罚列表")
+    public TableDataInfo penalizePage(@RequestBody @Valid EnterpriseCreditPenalizePageBody body) throws Exception {
+        return enterpriseCreditService.penalizePage(body);
+    }
+
+    @RequestMapping(value = "/penalizeReasonType", method = RequestMethod.POST)
+    @ApiOperation(value = "行政处罚类型")
+    public R penalizeReasonType(@RequestBody @Valid EnterpriseCreditPenalizeReasonTypeBody body) throws Exception {
+        return enterpriseCreditService.penalizeReasonType(body);
+    }
+
+    @RequestMapping(value = "/abnormalPage", method = RequestMethod.POST)
+    @ApiOperation(value = "经营异常列表")
+    public TableDataInfo abnormalPage(@RequestBody @Valid EnterpriseCreditAbnormalPageBody body) throws Exception {
+        return enterpriseCreditService.abnormalPage(body);
+    }
+
+    @RequestMapping(value = "/abnormalYears", method = RequestMethod.POST)
+    @ApiOperation(value = "经营异常年份")
+    public R abnormalYears(@RequestBody @Valid EnterpriseCreditAbnormalYearsBody body) throws Exception {
+        return enterpriseCreditService.abnormalYears(body);
+    }
+
+    @RequestMapping(value = "/executedPersonsPage", method = RequestMethod.POST)
+    @ApiOperation(value = "被执行人列表")
+    public TableDataInfo executedPersonsPage(@RequestBody @Valid EnterpriseCreditExecutedPersonsPageBody body) throws Exception {
+        return enterpriseCreditService.executedPersonsPage(body);
+    }
+
+    @RequestMapping(value = "/executedPage", method = RequestMethod.POST)
+    @ApiOperation(value = "失信被执行人列表")
+    public TableDataInfo executedPage(@RequestBody @Valid EnterpriseCreditExecutedPageBody body) throws Exception {
+        return enterpriseCreditService.executedPage(body);
+    }
+
+    @RequestMapping(value = "/lawsuitsPage", method = RequestMethod.POST)
+    @ApiOperation(value = "裁判文书列表")
+    public TableDataInfo lawsuitsPage(@RequestBody @Valid EnterpriseCreditLawsuitsPageBody body) throws Exception {
+        return enterpriseCreditService.lawsuitsPage(body);
+    }
+
+    @RequestMapping(value = "/lawsuitsCauseAction", method = RequestMethod.POST)
+    @ApiOperation(value = "裁判文书案由")
+    public R lawsuitsCauseAction(@RequestBody @Valid EnterpriseCreditLawsuitsCauseActionBody body) throws Exception {
+        return enterpriseCreditService.lawsuitsCauseAction(body);
+    }
+
+    @RequestMapping(value = "/lawsuitsRole", method = RequestMethod.POST)
+    @ApiOperation(value = "裁判文书身份")
+    public R lawsuitsRole(@RequestBody @Valid EnterpriseCreditLawsuitsRoleBody body) throws Exception {
+        return enterpriseCreditService.lawsuitsRole(body);
+    }
+
+    @RequestMapping(value = "/noticesPage", method = RequestMethod.POST)
+    @ApiOperation(value = "法院公告列表")
+    public TableDataInfo noticesPage(@RequestBody @Valid EnterpriseCreditNoticePageBody body) throws Exception {
+        return enterpriseCreditService.noticesPage(body);
+    }
+
+    @RequestMapping(value = "/noticesType", method = RequestMethod.POST)
+    @ApiOperation(value = "法院公告类型")
+    public R noticesType(@RequestBody @Valid EnterpriseCreditNoticeTypeBody body) throws Exception {
+        return enterpriseCreditService.noticesType(body);
+    }
+
+    @RequestMapping(value = "/noticesRole", method = RequestMethod.POST)
+    @ApiOperation(value = "法院公告身份")
+    public R noticesRole(@RequestBody @Valid EnterpriseCreditNoticeRoleBody body) throws Exception {
+        return enterpriseCreditService.noticesRole(body);
+    }
+
+    @RequestMapping(value = "/noticesCaseReason", method = RequestMethod.POST)
+    @ApiOperation(value = "法院公告案由")
+    public R noticesCaseReason(@RequestBody @Valid EnterpriseCreditNoticeCaseReasonBody body) throws Exception {
+        return enterpriseCreditService.noticesCaseReason(body);
+    }
+
+    @RequestMapping(value = "/kaitingPage", method = RequestMethod.POST)
+    @ApiOperation(value = "开庭公告列表")
+    public TableDataInfo kaitingPage(@RequestBody @Valid EnterpriseCreditKaitingPageBody body) throws Exception {
+        return enterpriseCreditService.kaitingPage(body);
+    }
+
+    @RequestMapping(value = "/kaitingCauseAction", method = RequestMethod.POST)
+    @ApiOperation(value = "开庭公告案由")
+    public R kaitingCauseAction(@RequestBody @Valid EnterpriseCreditKaitingCauseActionBody body) throws Exception {
+        return enterpriseCreditService.kaitingCauseAction(body);
+    }
+
+    @RequestMapping(value = "/kaitingPureRole", method = RequestMethod.POST)
+    @ApiOperation(value = "开庭公告当事人身份")
+    public R kaitingPureRole(@RequestBody @Valid EnterpriseCreditKaitingPureRoleBody body) throws Exception {
+        return enterpriseCreditService.kaitingPureRole(body);
+    }
+
+}

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

+package com.dsk.web.controller.dsk;
+
+
+import com.dsk.common.core.domain.R;
+import com.dsk.common.core.page.TableDataInfo;
+import com.dsk.system.dskService.EnterpriseProjectService;
+import io.swagger.annotations.ApiOperation;
+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 java.util.Map;
+
+/**
+*@Description: 央企经营管理系统企业项目相关
+*@Author: zhangyi
+*@date: 2023/5/17 9:03
+*/
+@Slf4j
+@RestController
+@RequestMapping(value = "/enterpriseProject")
+public class EnterpriseProjectController {
+    @Autowired
+    EnterpriseProjectService enterpriseProjectService;
+
+
+    @ApiOperation(value = "土地交易员列表")
+    @RequestMapping(value = "/landTransactionPage", method = RequestMethod.POST)
+    public TableDataInfo landTransactionPage(@RequestBody Map<String, Object> paramMap) throws Exception {
+        return enterpriseProjectService.landTransactionPage(paramMap);
+    }
+
+    @ApiOperation(value = "土地用途列表")
+    @RequestMapping(value = "/landUse", method = RequestMethod.POST)
+    public R landUse(@RequestBody Map<String, Object> paramMap) throws Exception {
+        return enterpriseProjectService.landUse(paramMap);
+    }
+
+    @ApiOperation(value = "土地信息详情")
+    @RequestMapping(value = "/landDetail",method = RequestMethod.POST)
+    public R landDetail(@RequestBody Map<String, Object> paramMap) throws Exception {
+        return enterpriseProjectService.landDetail(paramMap);
+    }
+
+    @ApiOperation(value = "拟建项目列表")
+    @RequestMapping(value = "/approvalProjectPage",method = RequestMethod.POST)
+    public TableDataInfo approvalProjectPage(@RequestBody Map<String, Object> paramMap) throws Exception {
+        return enterpriseProjectService.approvalProjectPage(paramMap);
+    }
+
+    @ApiOperation(value = "拟建项目详情基本信息")
+    @RequestMapping(value = "/approvalInfoDetail",method = RequestMethod.POST)
+    public R approvalInfoDetail(@RequestBody Map<String, Object> paramMap) throws Exception {
+        return enterpriseProjectService.approvalInfoDetail(paramMap);
+    }
+
+    @ApiOperation(value = "拟建项目详情立项审批列表")
+    @RequestMapping(value = "/approvalExaminePage",method = RequestMethod.POST)
+    public TableDataInfo approvalExaminePage(@RequestBody Map<String, Object> paramMap) throws Exception {
+        return enterpriseProjectService.approvalExaminePage(paramMap);
+    }
+
+    @ApiOperation(value = "拟建项目详情民间推介列表")
+    @RequestMapping(value = "/approvalMarketingPage", method = RequestMethod.POST)
+    public TableDataInfo approvalMarketingPage(@RequestBody Map<String, Object> paramMap) throws Exception {
+        return enterpriseProjectService.approvalMarketingPage(paramMap);
+    }
+
+    @ApiOperation(value = "专项债项目列表")
+    @RequestMapping(value = "/specialDebtPage", method = RequestMethod.POST)
+    public TableDataInfo specialDebtPage(@RequestBody Map<String, Object> paramMap) throws Exception {
+        return enterpriseProjectService.specialDebtPage(paramMap);
+    }
+
+    @ApiOperation(value = "专项债项目详情")
+    @RequestMapping(value = "/specialDebtDetail", method = RequestMethod.POST)
+    public R specialDebtDetail(@RequestBody Map<String, Object> paramMap) throws Exception {
+        return enterpriseProjectService.specialDebtDetail(paramMap);
+    }
+
+    @ApiOperation(value = "招标公告列表")
+    @RequestMapping(value = "/bidNoticePage",method = RequestMethod.POST)
+    public TableDataInfo bidNoticePage(@RequestBody Map<String, Object> paramMap) throws Exception {
+        return enterpriseProjectService.bidNoticePage(paramMap);
+    }
+
+    @ApiOperation(value = "招标公告招标类别")
+    @RequestMapping(value = "/bidNoticeTenderStage", method = RequestMethod.POST)
+    public R bidNoticeTenderStage(@RequestBody Map<String, Object> paramMap) throws Exception {
+        return enterpriseProjectService.bidNoticeTenderStage(paramMap);
+    }
+
+    @ApiOperation(value = "招标公告招标地区")
+    @RequestMapping(value = "/bidNoticeProvince", method = RequestMethod.POST)
+    public R bidNoticeProvince(@RequestBody Map<String, Object> paramMap) throws Exception {
+        return enterpriseProjectService.bidNoticeProvince(paramMap);
+    }
+
+    @ApiOperation(value = "招标公告详情")
+    @RequestMapping(value = "/bidNoticeDetail", method = RequestMethod.POST)
+    public R bidNoticeDetail(@RequestBody Map<String, Object> paramMap) throws Exception {
+        return enterpriseProjectService.bidNoticeDetail(paramMap);
+    }
+
+    @ApiOperation(value = "招标计划列表")
+    @RequestMapping(value = "/bidPlanPage",method = RequestMethod.POST)
+    public TableDataInfo bidPlanPage(@RequestBody Map<String, Object> paramMap) throws Exception {
+        return enterpriseProjectService.bidPlanPage(paramMap);
+    }
+
+    @ApiOperation(value = "招标计划详情")
+    @RequestMapping(value = "/bidPlanDetail", method = RequestMethod.POST)
+    public R bidPlanDetail(@RequestBody Map<String, Object> paramMap) throws Exception {
+        return enterpriseProjectService.bidPlanDetail(paramMap);
+    }
+
+    @ApiOperation(value = "标讯pro招标公告列表")
+    @RequestMapping(value = "/bidNoticeProPage", method = RequestMethod.POST)
+    public TableDataInfo bidNoticeProPage(@RequestBody Map<String, Object> paramMap) throws Exception {
+        return enterpriseProjectService.bidNoticeProPage(paramMap);
+    }
+
+    @ApiOperation(value = "标讯pro招标公告详情")
+    @RequestMapping(value = "/bidNoticeProDetail", method = RequestMethod.POST)
+    public R bidNoticeProDetail(@RequestBody Map<String, Object> paramMap) throws Exception {
+        return enterpriseProjectService.bidNoticeProDetail(paramMap);
+    }
+
+    @ApiOperation(value = "行政许可列表")
+    @RequestMapping(value = "/creditXzxkPage", method = RequestMethod.POST)
+    public TableDataInfo creditXzxkPage(@RequestBody Map<String, Object> paramMap) throws Exception {
+        return enterpriseProjectService.creditXzxkPage(paramMap);
+    }
+
+}

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

+package com.dsk.web.controller.search.controller;
+
+import com.alibaba.fastjson2.JSONObject;
+import com.dsk.common.core.domain.AjaxResult;
+import com.dsk.common.dtos.ComposeQueryDto;
+import com.dsk.web.controller.search.service.BusinessOpportunityRadarService;
+import com.dsk.web.controller.search.service.MarketAnalysisService;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.annotation.Resource;
+
+
+/**
+ * 商机雷达 查询接口
+ * @author Administrator
+ *
+ */
+@RequestMapping("/radar")
+@RestController
+public class BusinessOpportunityRadarController {
+
+
+    @Resource
+    BusinessOpportunityRadarService opportunityRadarService;
+
+    /*
+     * 土地交易
+     */
+    @RequestMapping("/landMarketPage")
+    public AjaxResult landMarketPage(@RequestBody ComposeQueryDto compose) {
+        return opportunityRadarService.landMarketPage(compose);
+    }
+
+    /*
+     * 拟建项目
+     */
+    @RequestMapping("/establishmentPage")
+    public AjaxResult establishmentPage(@RequestBody ComposeQueryDto compose) {
+        return opportunityRadarService.establishmentPage(compose);
+    }
+
+    /*
+     * 开标记录
+     */
+    @RequestMapping("/jskBidTenderPage")
+    public AjaxResult jskBidTenderPage(@RequestBody ComposeQueryDto compose) {
+        return opportunityRadarService.jskBidTenderPage(compose);
+    }
+
+
+    /*
+     * 标讯pro
+     */
+    @RequestMapping("/jskBidNewsPage")
+    public AjaxResult jskBidNewsPage(@RequestBody ComposeQueryDto compose) {
+        return opportunityRadarService.jskBidNewsPage(compose);
+    }
+
+}

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

+package com.dsk.web.controller.search.controller;
+
+import com.dsk.common.core.domain.AjaxResult;
+import com.dsk.common.dtos.ComposeQueryDto;
+import com.dsk.web.controller.search.service.BusinessOpportunityRadarService;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.annotation.Resource;
+
+
+/**
+ * 查企业
+ * @author Administrator
+ *
+ */
+@RequestMapping("/enterprise")
+@RestController
+public class CompanySearchController {
+
+
+    @Resource
+    BusinessOpportunityRadarService opportunityRadarService;
+
+    /*
+     * 模糊查询企业名称
+     */
+    @RequestMapping("/index")
+    public AjaxResult landMarketPage(@RequestBody ComposeQueryDto compose) {
+        return opportunityRadarService.enterprisePage(compose);
+    }
+
+    /*
+     * 完全匹配企业名称
+     */
+    @RequestMapping("/findByName")
+    public AjaxResult findByName(@RequestBody ComposeQueryDto compose) {
+        return opportunityRadarService.enterpriseByName(compose);
+    }
+}

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

-package com.dsk.web.controller.search;
+package com.dsk.web.controller.search.controller;
 
+import com.alibaba.fastjson2.JSONObject;
 import com.dsk.common.core.domain.AjaxResult;
 import com.dsk.common.dtos.ComposeQueryDto;
 import com.dsk.web.controller.search.service.MarketAnalysisService;
@@ -51,6 +52,32 @@ public class MarketAnalysisController {
         return marketAnalysisService.certGroupByMajorProvinceLevel();
     }
 
+
+
+    /*
+     * 产业结构-按年份选择  各个项目类型项目总数
+     */
+    @RequestMapping("/bidGroupCountByProjectType")
+    public AjaxResult bidGroupCountByProjectType(@RequestBody JSONObject object) {
+        return marketAnalysisService.bidGroupCountByProjectType(object);
+    }
+    /*
+     * 产业结构-近两年各个项目类型项目总数及金额占比
+     */
+    @RequestMapping("/bidMoneyGroupByProjectType")
+    public AjaxResult bidMoneyGroupByProjectType(@RequestBody JSONObject object) {
+        return marketAnalysisService.bidMoneyGroupByProjectType(object);
+    }
+
+
+
+
+
+
+
+
+
+
     /*
      * 中标数量按省份分组
      */

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

+package com.dsk.web.controller.search.service;
+
+import com.alibaba.fastjson2.JSONObject;
+import com.dsk.common.core.domain.AjaxResult;
+import com.dsk.common.dtos.ComposeQueryDto;
+
+/**
+ * @Author liujie
+ * @ClassName MarketAnalysisService
+ * @Date 2023/5/15 16:39
+ **/
+public interface BusinessOpportunityRadarService {
+
+
+    AjaxResult jskBidNewsPage(ComposeQueryDto compose);
+    AjaxResult jskBidTenderPage(ComposeQueryDto compose);
+
+    AjaxResult landMarketPage(ComposeQueryDto compose);
+    AjaxResult establishmentPage(ComposeQueryDto compose);
+
+    AjaxResult enterprisePage(ComposeQueryDto compose);
+
+    AjaxResult enterpriseByName(ComposeQueryDto compose);
+}

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

 package com.dsk.web.controller.search.service;
 
+import com.alibaba.fastjson2.JSONObject;
 import com.dsk.common.core.domain.AjaxResult;
 import com.dsk.common.dtos.ComposeQueryDto;
 
@@ -19,4 +20,8 @@ public interface MarketAnalysisService {
     AjaxResult countGroupByProvince(ComposeQueryDto compose);
 
     AjaxResult countGroupByMonth(ComposeQueryDto compose);
+
+    AjaxResult bidMoneyGroupByProjectType(JSONObject object);
+
+    AjaxResult bidGroupCountByProjectType(JSONObject object);
 }

dsk-admin/src/main/java/com/dsk/web/controller/search/service/impl/BusinessOpportunityRadarServiceImpl.java

+package com.dsk.web.controller.search.service.impl;
+
+import cn.hutool.core.bean.BeanUtil;
+import com.alibaba.fastjson2.JSONObject;
+import com.dsk.common.core.domain.AjaxResult;
+import com.dsk.common.dtos.ComposeQueryDto;
+import com.dsk.common.utils.DskOpenApiUtil;
+import com.dsk.web.controller.search.service.BusinessOpportunityRadarService;
+import com.dsk.web.controller.search.service.MarketAnalysisService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.Map;
+
+/**
+ * @Author liujie
+ * @ClassName MarketAnalysisServiceImpl
+ * @Date 2023/5/15 16:40
+ **/
+@Service
+public class BusinessOpportunityRadarServiceImpl implements BusinessOpportunityRadarService {
+
+    @Autowired
+    private DskOpenApiUtil dskOpenApiUtil;
+
+
+    @Override
+    public AjaxResult jskBidNewsPage(ComposeQueryDto compose) {
+        Map<String, Object> map = dskOpenApiUtil.requestBody("/api/nationzj/jskBid/news/page", BeanUtil.beanToMap(compose, false, false));
+        return BeanUtil.toBean(map, AjaxResult.class);
+    }
+
+
+    @Override
+    public AjaxResult jskBidTenderPage(ComposeQueryDto compose) {
+        Map<String, Object> map = dskOpenApiUtil.requestBody("/api/nationzj/jskBidTender/page", BeanUtil.beanToMap(compose, false, false));
+        return BeanUtil.toBean(map, AjaxResult.class);
+    }
+
+    @Override
+    public AjaxResult establishmentPage(ComposeQueryDto compose) {
+        Map<String, Object> map = dskOpenApiUtil.requestBody("/api/nationzj/establishment/page", BeanUtil.beanToMap(compose, false, false));
+        return BeanUtil.toBean(map, AjaxResult.class);
+    }
+
+    @Override
+    public AjaxResult landMarketPage(ComposeQueryDto compose) {
+        Map<String, Object> map = dskOpenApiUtil.requestBody("/api/nationzj/landMarket/page", BeanUtil.beanToMap(compose, false, false));
+        return BeanUtil.toBean(map, AjaxResult.class);
+    }
+
+    @Override
+    public AjaxResult enterprisePage(ComposeQueryDto compose) {
+        Map<String, Object> map = dskOpenApiUtil.requestBody("/api/nationzj/enterprice/index", BeanUtil.beanToMap(compose, false, false));
+        return BeanUtil.toBean(map, AjaxResult.class);
+    }
+
+    @Override
+    public AjaxResult enterpriseByName(ComposeQueryDto compose){
+        Map<String, Object> map = dskOpenApiUtil.requestBody("/api/nationzj/enterprice/findByName", BeanUtil.beanToMap(compose, false, false));
+//        Map<String, Object> map = dskOpenApiUtil.requestBody("/nationzj/enterprice/findByName", BeanUtil.beanToMap(compose, false, false));
+        return BeanUtil.toBean(map, AjaxResult.class);
+    }
+}

dsk-admin/src/main/java/com/dsk/web/controller/search/service/impl/MarketAnalysisServiceImpl.java

 package com.dsk.web.controller.search.service.impl;
 
 import cn.hutool.core.bean.BeanUtil;
+import com.alibaba.fastjson2.JSONObject;
 import com.dsk.common.core.domain.AjaxResult;
 import com.dsk.common.core.domain.R;
 import com.dsk.common.dtos.ComposeQueryDto;
@@ -24,33 +25,45 @@ public class MarketAnalysisServiceImpl implements MarketAnalysisService {
     private DskOpenApiUtil dskOpenApiUtil;
     @Override
     public AjaxResult areaGroupByProvince() {
-
-        Map<String, Object> map = dskOpenApiUtil.requestBody("/marketAnalysis/areaGroupByProvince", null);
+        Map<String, Object> map = dskOpenApiUtil.requestBody("/api/nationzj/marketAnalysis/areaGroupByProvince", null);
         return BeanUtil.toBean(map, AjaxResult.class);
     }
 
     @Override
     public AjaxResult certGroupByMajorAndLevel() {
-        Map<String, Object> map = dskOpenApiUtil.requestBody("/marketAnalysis/certGroupByMajorAndLevel", null);
+        Map<String, Object> map = dskOpenApiUtil.requestBody("/api/nationzj/marketAnalysis/certGroupByMajorAndLevel", null);
         return BeanUtil.toBean(map, AjaxResult.class);
     }
 
 
     @Override
     public AjaxResult certGroupByMajorProvinceLevel()  {
-        Map<String, Object> map = dskOpenApiUtil.requestBody("/marketAnalysis/certGroupByMajorProvinceLevel", null);
+        Map<String, Object> map = dskOpenApiUtil.requestBody("/api/nationzj/marketAnalysis/certGroupByMajorProvinceLevel", null);
+        return BeanUtil.toBean(map, AjaxResult.class);
+    }
+
+
+    @Override
+    public AjaxResult bidMoneyGroupByProjectType(JSONObject object) {
+        Map<String, Object> map = dskOpenApiUtil.requestBody("/api/nationzj/marketAnalysis/bidMoneyGroupByProjectType", object);
+        return BeanUtil.toBean(map, AjaxResult.class);
+    }
+
+    @Override
+    public AjaxResult bidGroupCountByProjectType(JSONObject object) {
+        Map<String, Object> map = dskOpenApiUtil.requestBody("/api/nationzj/marketAnalysis/bidGroupCountByProjectType", object);
         return BeanUtil.toBean(map, AjaxResult.class);
     }
 
     @Override
     public AjaxResult countGroupByProvince(ComposeQueryDto compose) {
-        Map<String, Object> map = dskOpenApiUtil.requestBody("/marketAnalysis/countGroupByProvince", BeanUtil.beanToMap(compose, false, false));
+        Map<String, Object> map = dskOpenApiUtil.requestBody("/api/nationzj/marketAnalysis/countGroupByProvince", BeanUtil.beanToMap(compose, false, false));
         return BeanUtil.toBean(map, AjaxResult.class);
     }
 
     @Override
     public AjaxResult countGroupByMonth(ComposeQueryDto compose) {
-        Map<String, Object> map = dskOpenApiUtil.requestBody("/marketAnalysis/countGroupByDate", BeanUtil.beanToMap(compose, false, false));
+        Map<String, Object> map = dskOpenApiUtil.requestBody("/api/nationzj/marketAnalysis/countGroupByDate", BeanUtil.beanToMap(compose, false, false));
         return BeanUtil.toBean(map, AjaxResult.class);
     }
 }

dsk-common/src/main/java/com/dsk/common/core/domain/entity/BusinessBacklog.java

+package com.dsk.common.core.domain.entity;
+
+import java.util.Date;
+
+import com.dsk.common.core.domain.BaseEntity;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.dsk.common.annotation.Excel;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+
+/**
+ * 项目工作待办对象 business_backlog
+ *
+ * @author lxl
+ * @date 2023-05-17
+ */
+public class BusinessBacklog extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** $column.columnComment */
+    private Integer id;
+
+    /** 项目id */
+    @Excel(name = "项目id")
+    private Integer businessId;
+
+    /** 关联客户 */
+    @Excel(name = "关联客户")
+    private String target;
+
+    /** 待办工作内容 */
+    @Excel(name = "待办工作内容")
+    private String task;
+
+    /** 完成时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "完成时间", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date finishTime;
+
+    /** 状态(2已完成，1进行中，0逾期) */
+    @Excel(name = "状态(2已完成，1进行中，0逾期)")
+    private Integer state;
+
+
+
+    public void setId(Integer id)
+    {
+        this.id = id;
+    }
+
+    public Integer getId()
+    {
+        return id;
+    }
+    public void setBusinessId(Integer businessId)
+    {
+        this.businessId = businessId;
+    }
+
+    public Integer getBusinessId()
+    {
+        return businessId;
+    }
+    public void setTarget(String target)
+    {
+        this.target = target;
+    }
+
+    public String getTarget()
+    {
+        return target;
+    }
+    public void setTask(String task)
+    {
+        this.task = task;
+    }
+
+    public String getTask()
+    {
+        return task;
+    }
+    public void setFinishTime(Date finishTime)
+    {
+        this.finishTime = finishTime;
+    }
+
+    public Date getFinishTime()
+    {
+        return finishTime;
+    }
+    public void setState(Integer state)
+    {
+        this.state = state;
+    }
+
+    public Integer getState()
+    {
+        return state;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)
+            .append("id", getId())
+            .append("businessId", getBusinessId())
+            .append("target", getTarget())
+            .append("task", getTask())
+            .append("finishTime", getFinishTime())
+            .append("state", getState())
+            .append("createTime", getCreateTime())
+            .append("updateTime", getUpdateTime())
+            .toString();
+    }
+}

dsk-common/src/main/java/com/dsk/common/core/domain/entity/BusinessContacts.java

+package com.dsk.common.core.domain.entity;
+
+import java.util.Date;
+
+import com.dsk.common.core.domain.BaseEntity;
+import com.dsk.common.utils.CheckUtils;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.dsk.common.annotation.Excel;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+
+import javax.validation.constraints.Pattern;
+
+/**
+ * 项目联系人对象 business_contacts
+ *
+ * @author lxl
+ * @date 2023-05-17
+ */
+public class BusinessContacts extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** $column.columnComment */
+    private Integer id;
+
+    /** 项目id */
+    @Excel(name = "项目id")
+    private Integer businessId;
+
+    /** 姓名 */
+    @Excel(name = "姓名")
+    private String name;
+
+    /** 角色 */
+    @Excel(name = "角色")
+    private String role;
+
+    /** 公司/机关 */
+    @Excel(name = "公司/机关")
+    private String office;
+
+    /** 职位 */
+    @Excel(name = "职位")
+    private String position;
+
+    /** 联系电话 */
+    @Excel(name = "联系电话")
+    private String phone;
+
+    /** 维护人员 */
+    @Excel(name = "维护人员")
+    private String accendant;
+
+    /** 创建时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "创建时间", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date creatTime;
+
+    public void setId(Integer id)
+    {
+        this.id = id;
+    }
+
+    public Integer getId()
+    {
+        return id;
+    }
+    public void setBusinessId(Integer businessId)
+    {
+        this.businessId = businessId;
+    }
+
+    public Integer getBusinessId()
+    {
+        return businessId;
+    }
+    public void setName(String name)
+    {
+        this.name = name;
+    }
+
+    public String getName()
+    {
+        return name;
+    }
+    public void setRole(String role)
+    {
+        this.role = role;
+    }
+
+    public String getRole()
+    {
+        return role;
+    }
+    public void setOffice(String office)
+    {
+        this.office = office;
+    }
+
+    public String getOffice()
+    {
+        return office;
+    }
+    public void setPosition(String position)
+    {
+        this.position = position;
+    }
+
+    public String getPosition()
+    {
+        return position;
+    }
+    public void setPhone(String phone)
+    {
+        this.phone = phone;
+    }
+
+    public String getPhone()
+    {
+        return phone;
+    }
+    public void setAccendant(String accendant)
+    {
+        this.accendant = accendant;
+    }
+
+    public String getAccendant()
+    {
+        return accendant;
+    }
+    public void setCreatTime(Date creatTime)
+    {
+        this.creatTime = creatTime;
+    }
+
+    public Date getCreatTime()
+    {
+        return creatTime;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)
+            .append("id", getId())
+            .append("businessId", getBusinessId())
+            .append("name", getName())
+            .append("role", getRole())
+            .append("office", getOffice())
+            .append("position", getPosition())
+            .append("phone", getPhone())
+            .append("accendant", getAccendant())
+            .append("creatTime", getCreatTime())
+            .append("updateTime", getUpdateTime())
+            .toString();
+    }
+}

dsk-common/src/main/java/com/dsk/common/core/domain/entity/BusinessFollowRecord.java

+package com.dsk.common.core.domain.entity;
+
+import java.util.Date;
+
+import com.dsk.common.core.domain.BaseEntity;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.dsk.common.annotation.Excel;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+
+/**
+ * 项目跟进记录对象 business_follow_record
+ *
+ * @author lxl
+ * @date 2023-05-17
+ */
+public class BusinessFollowRecord extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** $column.columnComment */
+    private Integer id;
+
+    /** 项目id */
+    @Excel(name = "项目id")
+    private Integer businessId;
+
+    /** 用户id */
+    @Excel(name = "用户id")
+    private Integer userId;
+
+    /** 用户昵称 */
+    @Excel(name = "用户昵称")
+    private Integer userName;
+
+    /** 拜访对象 */
+    @Excel(name = "拜访对象")
+    private String visitPerson;
+
+    /** 职位 */
+    @Excel(name = "职位")
+    private String position;
+
+    /** 拜访时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "拜访时间", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date visitTime;
+
+    /** 下次拜访时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "下次拜访时间", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date nextVisitTime;
+
+    /** 记录内容 */
+    @Excel(name = "记录内容")
+    private String recordInfo;
+
+    /** 拜访方式 */
+    @Excel(name = "拜访方式")
+    private String visitWay;
+
+    /** 创建时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "创建时间", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date creatTime;
+
+    public Integer getUserName() {
+        return userName;
+    }
+
+    public String getVisitPerson() {
+        return visitPerson;
+    }
+
+    public String getPosition() {
+        return position;
+    }
+
+    public void setUserName(Integer userName) {
+        this.userName = userName;
+    }
+
+    public void setVisitPerson(String visitPerson) {
+        this.visitPerson = visitPerson;
+    }
+
+    public void setPosition(String position) {
+        this.position = position;
+    }
+
+    public void setId(Integer id)
+    {
+        this.id = id;
+    }
+
+    public Integer getId()
+    {
+        return id;
+    }
+    public void setBusinessId(Integer businessId)
+    {
+        this.businessId = businessId;
+    }
+
+    public Integer getBusinessId()
+    {
+        return businessId;
+    }
+    public void setUserId(Integer userId)
+    {
+        this.userId = userId;
+    }
+
+    public Integer getUserId()
+    {
+        return userId;
+    }
+
+    public void setVisitTime(Date visitTime)
+    {
+        this.visitTime = visitTime;
+    }
+
+    public Date getVisitTime()
+    {
+        return visitTime;
+    }
+    public void setNextVisitTime(Date nextVisitTime)
+    {
+        this.nextVisitTime = nextVisitTime;
+    }
+
+    public Date getNextVisitTime()
+    {
+        return nextVisitTime;
+    }
+    public void setRecordInfo(String recordInfo)
+    {
+        this.recordInfo = recordInfo;
+    }
+
+    public String getRecordInfo()
+    {
+        return recordInfo;
+    }
+    public void setVisitWay(String visitWay)
+    {
+        this.visitWay = visitWay;
+    }
+
+    public String getVisitWay()
+    {
+        return visitWay;
+    }
+    public void setCreatTime(Date creatTime)
+    {
+        this.creatTime = creatTime;
+    }
+
+    public Date getCreatTime()
+    {
+        return creatTime;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)
+            .append("id", getId())
+            .append("businessId", getBusinessId())
+            .append("userId", getUserId())
+            .append("userName", getUserName())
+            .append("visitPerson", getVisitPerson())
+            .append("position", getPosition())
+            .append("visitTime", getVisitTime())
+            .append("nextVisitTime", getNextVisitTime())
+            .append("recordInfo", getRecordInfo())
+            .append("visitWay", getVisitWay())
+            .append("creatTime", getCreatTime())
+            .append("updateTime", getUpdateTime())
+            .toString();
+    }
+}

dsk-common/src/main/java/com/dsk/common/core/domain/entity/BusinessInfo.java

+package com.dsk.common.core.domain.entity;
+
+import java.util.Date;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.dsk.common.core.domain.BaseEntity;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.dsk.common.annotation.Excel;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+
+/**
+ * 项目详情对象 business_info
+ *
+ * @author lxl
+ * @date 2023-05-17
+ */
+public class BusinessInfo extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 用户id
+     */
+    private Integer userId;
+
+    /** $column.columnComment */
+    private Integer id;
+
+    /** 项目名称 */
+    @Excel(name = "项目名称")
+    private String projectName;
+
+    /** 总投金额(万元) */
+    @Excel(name = "总投金额(万元)")
+    private Double investmentAmount;
+
+    /** 资金来源 */
+    @Excel(name = "资金来源")
+    private String amountSource;
+
+    /** 计划招标时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "计划招标时间", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date planBidTime;
+
+    /** 计划开工时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "计划开工时间", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date planStartTime;
+
+    /** 项目级别 */
+    @Excel(name = "项目级别")
+    private String projectLevel;
+
+    /** 项目阶段 */
+    @Excel(name = "项目阶段")
+    private String projectStage;
+
+    /** 建设性质 */
+    @Excel(name = "建设性质")
+    private String buildProperty;
+
+    /** 计划竣工时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "计划竣工时间", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date planCompleteTime;
+
+    /** 项目概况与建设规模 */
+    @Excel(name = "项目概况与建设规模")
+    private String projectDetails;
+
+    /** 省 */
+    @Excel(name = "省")
+    private String provinceName;
+
+    /** 省id */
+    @Excel(name = "省id")
+    private Integer provinceId;
+
+    /** 市 */
+    @Excel(name = "市")
+    private String cityName;
+
+    /** 市id */
+    @Excel(name = "市id")
+    private Integer cityId;
+
+    /** 区 */
+    @Excel(name = "区")
+    private String districtName;
+
+    /** 区id */
+    @Excel(name = "区id")
+    private Integer districtId;
+
+    /** 项目类型 */
+    @Excel(name = "项目类型")
+    private String projectType;
+
+    /** 项目类别 */
+    @Excel(name = "项目类别")
+    private String projectCategory;
+
+    /** 商务团队 */
+    @Excel(name = "商务团队")
+    private String team;
+
+    /** 0 仅自己可见，1 他人可见 */
+    @Excel(name = "0 仅自己可见，1 他人可见")
+    private Integer isPrivate;
+
+    /** 客户id */
+    @Excel(name = "客户id")
+    private String customerId;
+
+    /** 项目状态 */
+    @Excel(name = "项目状态")
+    private Integer status;
+
+    public Integer getStatus() {
+        return status;
+    }
+
+    public void setStatus(Integer status) {
+        this.status = status;
+    }
+
+    public String getCustomerId() {
+        return customerId;
+    }
+
+    public void setCustomerId(String customerId) {
+        this.customerId = customerId;
+    }
+
+    public Integer getUserId() {
+        return userId;
+    }
+
+    public void setUserId(Integer userId) {
+        this.userId = userId;
+    }
+
+    public void setId(Integer id)
+    {
+        this.id = id;
+    }
+
+    public Integer getId()
+    {
+        return id;
+    }
+    public void setProjectName(String projectName)
+    {
+        this.projectName = projectName;
+    }
+
+    public String getProjectName()
+    {
+        return projectName;
+    }
+    public void setInvestmentAmount(Double investmentAmount)
+    {
+        this.investmentAmount = investmentAmount;
+    }
+
+    public Double getInvestmentAmount()
+    {
+        return investmentAmount;
+    }
+    public void setAmountSource(String amountSource)
+    {
+        this.amountSource = amountSource;
+    }
+
+    public String getAmountSource()
+    {
+        return amountSource;
+    }
+    public void setPlanBidTime(Date planBidTime)
+    {
+        this.planBidTime = planBidTime;
+    }
+
+    public Date getPlanBidTime()
+    {
+        return planBidTime;
+    }
+    public void setPlanStartTime(Date planStartTime)
+    {
+        this.planStartTime = planStartTime;
+    }
+
+    public Date getPlanStartTime()
+    {
+        return planStartTime;
+    }
+    public void setProjectLevel(String projectLevel)
+    {
+        this.projectLevel = projectLevel;
+    }
+
+    public String getProjectLevel()
+    {
+        return projectLevel;
+    }
+    public void setProjectStage(String projectStage)
+    {
+        this.projectStage = projectStage;
+    }
+
+    public String getProjectStage()
+    {
+        return projectStage;
+    }
+    public void setBuildProperty(String buildProperty)
+    {
+        this.buildProperty = buildProperty;
+    }
+
+    public String getBuildProperty()
+    {
+        return buildProperty;
+    }
+    public void setPlanCompleteTime(Date planCompleteTime)
+    {
+        this.planCompleteTime = planCompleteTime;
+    }
+
+    public Date getPlanCompleteTime()
+    {
+        return planCompleteTime;
+    }
+    public void setProjectDetails(String projectDetails)
+    {
+        this.projectDetails = projectDetails;
+    }
+
+    public String getProjectDetails()
+    {
+        return projectDetails;
+    }
+    public void setProvinceName(String provinceName)
+    {
+        this.provinceName = provinceName;
+    }
+
+    public String getProvinceName()
+    {
+        return provinceName;
+    }
+    public void setProvinceId(Integer provinceId)
+    {
+        this.provinceId = provinceId;
+    }
+
+    public Integer getProvinceId()
+    {
+        return provinceId;
+    }
+    public void setCityName(String cityName)
+    {
+        this.cityName = cityName;
+    }
+
+    public String getCityName()
+    {
+        return cityName;
+    }
+    public void setCityId(Integer cityId)
+    {
+        this.cityId = cityId;
+    }
+
+    public Integer getCityId()
+    {
+        return cityId;
+    }
+    public void setDistrictName(String districtName)
+    {
+        this.districtName = districtName;
+    }
+
+    public String getDistrictName()
+    {
+        return districtName;
+    }
+    public void setDistrictId(Integer districtId)
+    {
+        this.districtId = districtId;
+    }
+
+    public Integer getDistrictId()
+    {
+        return districtId;
+    }
+    public void setProjectType(String projectType)
+    {
+        this.projectType = projectType;
+    }
+
+    public String getProjectType()
+    {
+        return projectType;
+    }
+    public void setProjectCategory(String projectCategory)
+    {
+        this.projectCategory = projectCategory;
+    }
+
+    public String getProjectCategory()
+    {
+        return projectCategory;
+    }
+    public void setTeam(String team)
+    {
+        this.team = team;
+    }
+
+    public String getTeam()
+    {
+        return team;
+    }
+    public void setIsPrivate(Integer isPrivate)
+    {
+        this.isPrivate = isPrivate;
+    }
+
+    public Integer getIsPrivate()
+    {
+        return isPrivate;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)
+            .append("id", getId())
+            .append("projectName", getProjectName())
+            .append("investmentAmount", getInvestmentAmount())
+            .append("amountSource", getAmountSource())
+            .append("planBidTime", getPlanBidTime())
+            .append("planStartTime", getPlanStartTime())
+            .append("projectLevel", getProjectLevel())
+            .append("projectStage", getProjectStage())
+            .append("buildProperty", getBuildProperty())
+            .append("planCompleteTime", getPlanCompleteTime())
+            .append("projectDetails", getProjectDetails())
+            .append("provinceName", getProvinceName())
+            .append("provinceId", getProvinceId())
+            .append("cityName", getCityName())
+            .append("cityId", getCityId())
+            .append("districtName", getDistrictName())
+            .append("districtId", getDistrictId())
+            .append("projectType", getProjectType())
+            .append("projectCategory", getProjectCategory())
+            .append("team", getTeam())
+            .append("isPrivate", getIsPrivate())
+            .append("createTime", getCreateTime())
+            .append("updateTime", getUpdateTime())
+            .append("customerId", getCustomerId())
+            .append("status", getStatus())
+            .toString();
+    }
+}

dsk-common/src/main/java/com/dsk/common/core/domain/entity/BusinessLabel.java

+package com.dsk.common.core.domain.entity;
+
+import com.dsk.common.annotation.Excel;
+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 */
+    @Excel(name = "项目id")
+    private Integer businessId;
+
+    /** 标签 */
+    @Excel(name = "标签")
+    private String label;
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)
+            .append("id", getId())
+            .append("businessId", getBusinessId())
+            .append("label", getLabel())
+            .append("createTime", getCreateTime())
+            .append("updateTime", getUpdateTime())
+            .toString();
+    }
+
+    public BusinessLabel(Integer businessId) {
+        this.businessId = businessId;
+    }
+}

dsk-common/src/main/java/com/dsk/common/core/domain/entity/BusinessRelateCompany.java

+package com.dsk.common.core.domain.entity;
+
+import com.dsk.common.annotation.Excel;
+import com.dsk.common.core.domain.BaseEntity;
+import com.dsk.common.utils.CheckUtils;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+
+import javax.validation.constraints.Pattern;
+
+/**
+ * 项目关联单位对象 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 */
+    @Excel(name = "项目id")
+    private Integer businessId;
+
+    /** 单位id */
+    @Excel(name = "单位id")
+    private Integer companyId;
+
+    /** 单位名称 */
+    @Excel(name = "单位名称")
+    private String companyName;
+
+    /** 单位角色 */
+    @Excel(name = "单位角色")
+    private String companyRole;
+
+    /** 负责任人 */
+    @Excel(name = "负责任人")
+    private String responsiblePerson;
+
+    /** 负责人电话 */
+    @Excel(name = "负责人电话")
+    private String phone;
+
+    /** 对接深度/竞争力度 */
+    @Excel(name = "对接深度/竞争力度")
+    private String depth;
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)
+            .append("id", getId())
+            .append("businessId", getBusinessId())
+            .append("companyId", getCompanyId())
+            .append("companyName", getCompanyName())
+            .append("companyRole", getCompanyRole())
+            .append("responsiblePerson", getResponsiblePerson())
+            .append("phone", getPhone())
+            .append("createTime", getCreateTime())
+            .append("updateTime", getUpdateTime())
+            .append("depth", getDepth())
+            .toString();
+    }
+
+    public BusinessRelateCompany(Integer businessId, Integer companyId, String companyName, String companyRole) {
+        this.businessId = businessId;
+        this.companyId = companyId;
+        this.companyName = companyName;
+        this.companyRole = companyRole;
+    }
+
+    public BusinessRelateCompany(Integer businessId) {
+        this.businessId = businessId;
+    }
+}

dsk-common/src/main/java/com/dsk/common/core/domain/entity/BusinessUser.java

+package com.dsk.common.core.domain.entity;
+
+import com.dsk.common.annotation.Excel;
+import com.dsk.common.core.domain.BaseEntity;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+
+/**
+ * 项目用户关联对象 business_user
+ *
+ * @author lxl
+ * @date 2023-05-17
+ */
+public class BusinessUser extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** $column.columnComment */
+    private Integer id;
+
+    /** 项目id(business_info表id) */
+    @Excel(name = "项目id(business_info表id)")
+    private Integer businessId;
+
+    /** 部门id */
+    @Excel(name = "部门id")
+    private Integer deptId;
+
+    /** 用户id */
+    @Excel(name = "用户id")
+    private Integer userId;
+
+    /** 是否创建人(1 是,0 否) */
+    @Excel(name = "是否创建人(1 是,0 否)")
+    private Integer isFounder;
+
+    public void setId(Integer id)
+    {
+        this.id = id;
+    }
+
+    public Integer getId()
+    {
+        return id;
+    }
+    public void setBusinessId(Integer businessId)
+    {
+        this.businessId = businessId;
+    }
+
+    public Integer getBusinessId()
+    {
+        return businessId;
+    }
+    public void setDeptId(Integer deptId)
+    {
+        this.deptId = deptId;
+    }
+
+    public Integer getDeptId()
+    {
+        return deptId;
+    }
+    public void setUserId(Integer userId)
+    {
+        this.userId = userId;
+    }
+
+    public Integer getUserId()
+    {
+        return userId;
+    }
+    public void setIsFounder(Integer isFounder)
+    {
+        this.isFounder = isFounder;
+    }
+
+    public Integer getIsFounder()
+    {
+        return isFounder;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)
+            .append("id", getId())
+            .append("businessId", getBusinessId())
+            .append("deptId",getDeptId() )
+            .append("userId", getUserId())
+            .append("isFounder", getIsFounder())
+            .append("createTime", getCreateTime())
+            .append("updateTime", getUpdateTime())
+            .toString();
+    }
+
+    public BusinessUser(Integer businessId, Integer deptId, Integer userId, Integer isFounder) {
+        this.businessId = businessId;
+        this.deptId = deptId;
+        this.userId = userId;
+        this.isFounder = isFounder;
+    }
+}

dsk-common/src/main/java/com/dsk/common/core/domain/model/BasePage.java

@@ -9,11 +9,16 @@ package com.dsk.common.core.domain.model;
  */
 public class BasePage {
 	
+	/**
+	 * 当前页码
+	 */
+	private Integer pageNum = 1;
+
 	/**
 	 * 当前页码
 	 */
 	private Integer pageIndex = 1;
-	
+
 	/**
 	 * 每页数量
 	 */
@@ -22,7 +27,7 @@ public class BasePage {
 	/**
 	 * 最大页码
 	 */
-	private Integer pageMaxIndex;
+	private Integer pageMaxNum;
 	
 	/**
 	 * 最大条数
@@ -31,11 +36,14 @@ public class BasePage {
 
 	
 	public Integer getPageIndex() {
-		return pageMaxIndex != null && pageIndex > pageMaxIndex?  pageMaxIndex : pageIndex;
+		return pageNum;
+	}
+	public Integer getPageNum() {
+		return pageMaxNum != null && pageNum > pageMaxNum?  pageMaxNum : pageNum;
 	}
 
-	public void setPageIndex(Integer pageIndex) {
-		this.pageIndex = pageIndex;
+	public void setPageNum(Integer pageNum) {
+		this.pageNum = pageNum;
 	}
 
 	public Integer getPageSize() {
@@ -46,12 +54,12 @@ public class BasePage {
 		this.pageSize = pageSize;
 	}
 
-	public Integer getPageMaxIndex() {
-		return pageMaxIndex;
+	public Integer getPageMaxNum() {
+		return pageMaxNum;
 	}
 
-	public void setPageMaxIndex(Integer pageMaxIndex) {
-		this.pageMaxIndex = pageMaxIndex;
+	public void setPageMaxNum(Integer pageMaxNum) {
+		this.pageMaxNum = pageMaxNum;
 	}
 
 	public Integer getPageMaxSize() {
@@ -62,11 +70,15 @@ public class BasePage {
 		this.pageMaxSize = pageMaxSize;
 	}
 
+	public void setPageIndex(Integer pageIndex) {
+		this.pageIndex = pageNum;
+	}
+
 	@Override
 	public String toString() {
 		StringBuilder builder = new StringBuilder();
 		builder.append("BasePageVo [pageIndex=");
-		builder.append(pageIndex);
+		builder.append(pageNum);
 		builder.append(", pageSize=");
 		builder.append(pageSize);
 		builder.append("]");

dsk-common/src/main/java/com/dsk/common/core/domain/model/EnterpriseCreditAbnormalPageBody.java

+package com.dsk.common.core.domain.model;
+
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.NoArgsConstructor;
+import lombok.ToString;
+
+import javax.validation.constraints.NotNull;
+import java.util.List;
+
+@Data
+@ToString
+@NoArgsConstructor
+@EqualsAndHashCode(callSuper = false)
+public class EnterpriseCreditAbnormalPageBody extends BasePage {
+    /**
+     * 企业id
+     */
+    @NotNull(message = "企业id不能为空")
+    private Integer cid;
+
+    /**
+     * 年份列表
+     */
+    private List<String> years;
+
+
+}

dsk-common/src/main/java/com/dsk/common/core/domain/model/EnterpriseCreditAbnormalYearsBody.java

+package com.dsk.common.core.domain.model;
+
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.NoArgsConstructor;
+import lombok.ToString;
+
+import javax.validation.constraints.NotNull;
+import java.util.List;
+
+@Data
+@ToString
+@NoArgsConstructor
+@EqualsAndHashCode(callSuper = false)
+public class EnterpriseCreditAbnormalYearsBody {
+    /**
+     * 企业id
+     */
+    @NotNull(message = "企业id不能为空")
+    private Integer cid;
+
+
+}

dsk-common/src/main/java/com/dsk/common/core/domain/model/EnterpriseCreditExecutedPageBody.java

+package com.dsk.common.core.domain.model;
+
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.NoArgsConstructor;
+import lombok.ToString;
+
+import javax.validation.constraints.NotNull;
+
+@Data
+@ToString
+@NoArgsConstructor
+@EqualsAndHashCode(callSuper = false)
+public class EnterpriseCreditExecutedPageBody extends BasePage {
+    /**
+     * 企业id
+     */
+    @NotNull(message = "企业id不能为空")
+    private Integer cid;
+    /**
+     * 开始时间（年月日）
+     */
+    private String dateFrom;
+    /**
+     * 截止时间（年月日）
+     */
+    private String dateTo;
+
+
+}

dsk-common/src/main/java/com/dsk/common/core/domain/model/EnterpriseCreditExecutedPersonsPageBody.java

+package com.dsk.common.core.domain.model;
+
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.NoArgsConstructor;
+import lombok.ToString;
+
+import javax.validation.constraints.NotNull;
+import java.util.List;
+
+@Data
+@ToString
+@NoArgsConstructor
+@EqualsAndHashCode(callSuper = false)
+public class EnterpriseCreditExecutedPersonsPageBody extends BasePage {
+    /**
+     * 企业id
+     */
+    @NotNull(message = "企业id不能为空")
+    private Integer cid;
+
+    /**
+     * 开始时间（年月日）
+     */
+    private String dateFrom;
+    /**
+     * 截止时间（年月日）
+     */
+    private String dateTo;
+
+
+}

dsk-common/src/main/java/com/dsk/common/core/domain/model/EnterpriseCreditKaitingCauseActionBody.java

+package com.dsk.common.core.domain.model;
+
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.NoArgsConstructor;
+import lombok.ToString;
+
+import javax.validation.constraints.NotNull;
+
+@Data
+@ToString
+@NoArgsConstructor
+@EqualsAndHashCode(callSuper = false)
+public class EnterpriseCreditKaitingCauseActionBody {
+    /**
+     * 企业id
+     */
+    @NotNull(message = "企业id不能为空")
+    private Integer cid;
+
+
+}

dsk-common/src/main/java/com/dsk/common/core/domain/model/EnterpriseCreditKaitingPageBody.java

+package com.dsk.common.core.domain.model;
+
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.NoArgsConstructor;
+import lombok.ToString;
+
+import javax.validation.constraints.NotNull;
+
+@Data
+@ToString
+@NoArgsConstructor
+@EqualsAndHashCode(callSuper = false)
+public class EnterpriseCreditKaitingPageBody extends BasePage {
+    /**
+     * 企业id
+     */
+    @NotNull(message = "企业id不能为空")
+    private Integer cid;
+
+    /**
+     * 案由
+     */
+    private String causeAction;
+
+    /**
+     * 身份
+     */
+    private String pureRole;
+
+    /**
+     * 查询关键词
+     */
+    private String keys;
+
+    /**
+     * 开始时间（年月日）
+     */
+    private String dateFrom;
+
+    /**
+     * 截止时间（年月日）
+     */
+    private String dateTo;
+
+
+}

dsk-common/src/main/java/com/dsk/common/core/domain/model/EnterpriseCreditKaitingPureRoleBody.java

+package com.dsk.common.core.domain.model;
+
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.NoArgsConstructor;
+import lombok.ToString;
+
+import javax.validation.constraints.NotNull;
+
+@Data
+@ToString
+@NoArgsConstructor
+@EqualsAndHashCode(callSuper = false)
+public class EnterpriseCreditKaitingPureRoleBody {
+    /**
+     * 企业id
+     */
+    @NotNull(message = "企业id不能为空")
+    private Integer cid;
+
+
+}

dsk-common/src/main/java/com/dsk/common/core/domain/model/EnterpriseCreditLawsuitsCauseActionBody.java

+package com.dsk.common.core.domain.model;
+
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.NoArgsConstructor;
+import lombok.ToString;
+
+import javax.validation.constraints.NotNull;
+
+@Data
+@ToString
+@NoArgsConstructor
+@EqualsAndHashCode(callSuper = false)
+public class EnterpriseCreditLawsuitsCauseActionBody {
+    /**
+     * 企业id
+     */
+    @NotNull(message = "企业id不能为空")
+    private Integer cid;
+
+
+}

dsk-common/src/main/java/com/dsk/common/core/domain/model/EnterpriseCreditLawsuitsPageBody.java

+package com.dsk.common.core.domain.model;
+
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.NoArgsConstructor;
+import lombok.ToString;
+
+import javax.validation.constraints.NotNull;
+
+@Data
+@ToString
+@NoArgsConstructor
+@EqualsAndHashCode(callSuper = false)
+public class EnterpriseCreditLawsuitsPageBody extends BasePage {
+    /**
+     * 企业id
+     */
+    @NotNull(message = "企业id不能为空")
+    private Integer cid;
+
+    /**
+     * 裁判文书案由
+     */
+    private String causeAction;
+    /**
+     * 裁判文书身份
+     */
+    private String role;
+
+    /**
+     * 查询关键词
+     */
+    private String keys;
+
+
+}

dsk-common/src/main/java/com/dsk/common/core/domain/model/EnterpriseCreditLawsuitsRoleBody.java

+package com.dsk.common.core.domain.model;
+
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.NoArgsConstructor;
+import lombok.ToString;
+
+import javax.validation.constraints.NotNull;
+
+@Data
+@ToString
+@NoArgsConstructor
+@EqualsAndHashCode(callSuper = false)
+public class EnterpriseCreditLawsuitsRoleBody {
+    /**
+     * 企业id
+     */
+    @NotNull(message = "企业id不能为空")
+    private Integer cid;
+
+
+}

dsk-common/src/main/java/com/dsk/common/core/domain/model/EnterpriseCreditNoticeCaseReasonBody.java

+package com.dsk.common.core.domain.model;
+
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.NoArgsConstructor;
+import lombok.ToString;
+
+import javax.validation.constraints.NotNull;
+
+@Data
+@ToString
+@NoArgsConstructor
+@EqualsAndHashCode(callSuper = false)
+public class EnterpriseCreditNoticeCaseReasonBody {
+    /**
+     * 企业id
+     */
+    @NotNull(message = "企业id不能为空")
+    private Integer cid;
+
+
+}

dsk-common/src/main/java/com/dsk/common/core/domain/model/EnterpriseCreditNoticePageBody.java

+package com.dsk.common.core.domain.model;
+
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.NoArgsConstructor;
+import lombok.ToString;
+
+import javax.validation.constraints.NotNull;
+
+@Data
+@ToString
+@NoArgsConstructor
+@EqualsAndHashCode(callSuper = false)
+public class EnterpriseCreditNoticePageBody extends BasePage {
+    /**
+     * 企业id
+     */
+    @NotNull(message = "企业id不能为空")
+    private Integer cid;
+
+    /**
+     * 公告类型
+     */
+    private String type;
+
+    /**
+     * 身份
+     */
+    private String role;
+
+    /**
+     * 案由
+     */
+    private String caseReason;
+
+    /**
+     * 开始时间（年月日）
+     */
+    private String dateFrom;
+
+    /**
+     * 截止时间（年月日）
+     */
+    private String dateTo;
+
+
+}

dsk-common/src/main/java/com/dsk/common/core/domain/model/EnterpriseCreditNoticeRoleBody.java

+package com.dsk.common.core.domain.model;
+
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.NoArgsConstructor;
+import lombok.ToString;
+
+import javax.validation.constraints.NotNull;
+
+@Data
+@ToString
+@NoArgsConstructor
+@EqualsAndHashCode(callSuper = false)
+public class EnterpriseCreditNoticeRoleBody {
+    /**
+     * 企业id
+     */
+    @NotNull(message = "企业id不能为空")
+    private Integer cid;
+
+
+}

dsk-common/src/main/java/com/dsk/common/core/domain/model/EnterpriseCreditNoticeTypeBody.java

+package com.dsk.common.core.domain.model;
+
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.NoArgsConstructor;
+import lombok.ToString;
+
+import javax.validation.constraints.NotNull;
+
+@Data
+@ToString
+@NoArgsConstructor
+@EqualsAndHashCode(callSuper = false)
+public class EnterpriseCreditNoticeTypeBody {
+    /**
+     * 企业id
+     */
+    @NotNull(message = "企业id不能为空")
+    private Integer cid;
+
+
+}

dsk-common/src/main/java/com/dsk/common/core/domain/model/EnterpriseCreditPenalizePageBody.java

+package com.dsk.common.core.domain.model;
+
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.NoArgsConstructor;
+import lombok.ToString;
+
+import javax.validation.constraints.NotNull;
+
+@Data
+@ToString
+@NoArgsConstructor
+@EqualsAndHashCode(callSuper = false)
+public class EnterpriseCreditPenalizePageBody extends BasePage {
+    /**
+     * 企业id
+     */
+    @NotNull(message = "企业id不能为空")
+    private Integer cid;
+
+    /**
+     * 处罚原因类型
+     */
+    private Integer penalizeReasonType;
+
+    /**
+     * 查询关键字
+     */
+    private String keys;
+
+}

dsk-common/src/main/java/com/dsk/common/core/domain/model/EnterpriseCreditPenalizeReasonTypeBody.java

+package com.dsk.common.core.domain.model;
+
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.NoArgsConstructor;
+import lombok.ToString;
+
+import javax.validation.constraints.NotNull;
+
+@Data
+@ToString
+@NoArgsConstructor
+@EqualsAndHashCode(callSuper = false)
+public class EnterpriseCreditPenalizeReasonTypeBody {
+    /**
+     * 企业id
+     */
+    @NotNull(message = "企业id不能为空")
+    private Integer cid;
+
+}

dsk-common/src/main/java/com/dsk/common/core/page/TableDataInfo.java

 package com.dsk.common.core.page;
 
+import com.dsk.common.constant.HttpStatus;
+
 import java.io.Serializable;
 import java.util.List;
 
@@ -41,6 +43,8 @@ public class TableDataInfo implements Serializable
     {
         this.rows = list;
         this.total = total;
+        this.code = HttpStatus.SUCCESS;
+        this.msg = "查询成功";
     }
 
     public long getTotal()

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

+package com.dsk.common.utils;
+
+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_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 p = Pattern.compile(REG_Moblie);
+            Matcher m = p.matcher(phone);
+            return m.matches();
+        }
+
+    }
+}

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

 package com.dsk.common.utils;
 
+import cn.hutool.http.HttpUtil;
+import cn.hutool.json.JSONConfig;
+import cn.hutool.json.JSONUtil;
 import com.dsk.acc.openapi.api.AccClient;
 import com.dsk.acc.openapi.client.Config;
 import com.dsk.acc.openapi.client.util.CommonUtils;
 import com.dsk.common.config.DskOpenApiConfig;
+import com.dsk.common.core.page.TableDataInfo;
+import org.apache.commons.collections4.MapUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
+import java.util.ArrayList;
+import java.util.List;
 import java.util.Map;
 
 @Component
@@ -24,6 +31,10 @@ public class DskOpenApiUtil {
 		return request(path, bodyMap, "json");
 	}
 
+	public Map<String,Object> requestBodyLocal(String path, Map<String, Object> bodyMap){
+		return JSONUtil.toBean(HttpUtil.post("http://127.0.0.1:8766"+path, JSONUtil.toJsonStr(bodyMap)), JSONConfig.create().setIgnoreNullValue(true), Map.class);
+	}
+
 	public Map<String,Object> requestBodyWithHeader(String path, Map<String, Object> bodyMap, Map<String, String> headerMap){
 		return requestWithHeader(path, bodyMap, "json", headerMap);
 	}
@@ -88,4 +99,14 @@ public class DskOpenApiUtil {
 		}
 	}
 
+
+	public TableDataInfo responsePage(Map<String, Object> resMap) throws Exception {
+		Integer code = MapUtils.getInteger(resMap, "code", 300);
+		Map data = MapUtils.getMap(resMap, "data", null);
+		if (200 != code) throw new RuntimeException();
+		Integer count = MapUtils.getInteger(data, "totalCount", 0);
+		Object list = MapUtils.getObject(data, "list", "");
+		return new TableDataInfo((List<?>) list, count);
+	}
+
 }
\ No newline at end of file

dsk-operate-ui/package.json

@@ -40,7 +40,7 @@
     "axios": "0.24.0",
     "clipboard": "2.0.8",
     "core-js": "3.25.3",
-    "echarts": "5.4.0",
+    "echarts": "^5.4.0",
     "element-resize-detector": "^1.2.4",
     "element-ui": "2.15.12",
     "file-saver": "2.0.5",