Explorar o código

Merge branch 'invest-dev' of http://git.dgtis.com/15896567520/RuoYi-flowable-master into invest-dev

armg hai 1 ano
pai
achega
1fdbfc9aeb
Modificáronse 63 ficheiros con 3458 adicións e 2323 borrados
  1. 2 2
      ruoyi-admin/src/main/java/com/ruoyi/web/controller/invest/TProjectChannelController.java
  2. 2 2
      ruoyi-admin/src/main/java/com/ruoyi/web/controller/invest/TProjectCompanyController.java
  3. 2 2
      ruoyi-admin/src/main/java/com/ruoyi/web/controller/invest/TProjectContactsController.java
  4. 2 2
      ruoyi-admin/src/main/java/com/ruoyi/web/controller/invest/TProjectInformationController.java
  5. 2 2
      ruoyi-admin/src/main/java/com/ruoyi/web/controller/invest/TProjectMeetingController.java
  6. 2 2
      ruoyi-admin/src/main/java/com/ruoyi/web/controller/invest/TProjectPoolController.java
  7. 2 2
      ruoyi-admin/src/main/java/com/ruoyi/web/controller/invest/TProjectRecordController.java
  8. 104 0
      ruoyi-admin/src/main/java/com/ruoyi/web/controller/invest/TProjectScoringController.java
  9. 3 9
      ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysLoginController.java
  10. 104 0
      ruoyi-admin/src/main/java/com/ruoyi/web/controller/tool/TUnifyFileController.java
  11. 191 191
      ruoyi-system/src/main/java/com/ruoyi/system/domain/invest/TProjectChannel.java
  12. 219 219
      ruoyi-system/src/main/java/com/ruoyi/system/domain/invest/TProjectCompany.java
  13. 97 97
      ruoyi-system/src/main/java/com/ruoyi/system/domain/invest/TProjectContacts.java
  14. 1 1
      ruoyi-system/src/main/java/com/ruoyi/system/domain/invest/TProjectInformation.java
  15. 182 182
      ruoyi-system/src/main/java/com/ruoyi/system/domain/invest/TProjectMeeting.java
  16. 447 447
      ruoyi-system/src/main/java/com/ruoyi/system/domain/invest/TProjectPool.java
  17. 1 1
      ruoyi-system/src/main/java/com/ruoyi/system/domain/invest/TProjectRecord.java
  18. 500 0
      ruoyi-system/src/main/java/com/ruoyi/invest/domain/TProjectScoring.java
  19. 2 2
      ruoyi-system/src/main/java/com/ruoyi/system/mapper/invest/TProjectChannelMapper.java
  20. 2 2
      ruoyi-system/src/main/java/com/ruoyi/system/mapper/invest/TProjectCompanyMapper.java
  21. 2 2
      ruoyi-system/src/main/java/com/ruoyi/system/mapper/invest/TProjectContactsMapper.java
  22. 2 2
      ruoyi-system/src/main/java/com/ruoyi/system/mapper/invest/TProjectInformationMapper.java
  23. 2 2
      ruoyi-system/src/main/java/com/ruoyi/system/mapper/invest/TProjectMeetingMapper.java
  24. 2 2
      ruoyi-system/src/main/java/com/ruoyi/system/mapper/invest/TProjectPoolMapper.java
  25. 2 2
      ruoyi-system/src/main/java/com/ruoyi/system/mapper/invest/TProjectRecordMapper.java
  26. 61 0
      ruoyi-system/src/main/java/com/ruoyi/invest/mapper/TProjectScoringMapper.java
  27. 62 62
      ruoyi-system/src/main/java/com/ruoyi/system/service/invest/ITProjectChannelService.java
  28. 62 62
      ruoyi-system/src/main/java/com/ruoyi/system/service/invest/ITProjectCompanyService.java
  29. 62 62
      ruoyi-system/src/main/java/com/ruoyi/system/service/invest/ITProjectContactsService.java
  30. 2 2
      ruoyi-system/src/main/java/com/ruoyi/system/service/invest/ITProjectInformationService.java
  31. 62 62
      ruoyi-system/src/main/java/com/ruoyi/system/service/invest/ITProjectMeetingService.java
  32. 2 2
      ruoyi-system/src/main/java/com/ruoyi/system/service/invest/ITProjectPoolService.java
  33. 2 2
      ruoyi-system/src/main/java/com/ruoyi/system/service/invest/ITProjectRecordService.java
  34. 61 0
      ruoyi-system/src/main/java/com/ruoyi/invest/service/ITProjectScoringService.java
  35. 98 98
      ruoyi-system/src/main/java/com/ruoyi/system/service/invest/impl/TProjectChannelServiceImpl.java
  36. 98 98
      ruoyi-system/src/main/java/com/ruoyi/system/service/invest/impl/TProjectCompanyServiceImpl.java
  37. 98 98
      ruoyi-system/src/main/java/com/ruoyi/system/service/invest/impl/TProjectContactsServiceImpl.java
  38. 4 4
      ruoyi-system/src/main/java/com/ruoyi/system/service/invest/impl/TProjectInformationServiceImpl.java
  39. 98 98
      ruoyi-system/src/main/java/com/ruoyi/system/service/invest/impl/TProjectMeetingServiceImpl.java
  40. 4 6
      ruoyi-system/src/main/java/com/ruoyi/system/service/invest/impl/TProjectPoolServiceImpl.java
  41. 4 4
      ruoyi-system/src/main/java/com/ruoyi/system/service/invest/impl/TProjectRecordServiceImpl.java
  42. 98 0
      ruoyi-system/src/main/java/com/ruoyi/invest/service/impl/TProjectScoringServiceImpl.java
  43. 0 135
      ruoyi-system/src/main/java/com/ruoyi/system/domain/dhrm/DhrmCompany.java
  44. 1 1
      ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysMenuMapper.java
  45. 0 70
      ruoyi-system/src/main/java/com/ruoyi/system/mapper/dhrm/DhrmCompanyMapper.java
  46. 1 1
      ruoyi-system/src/main/java/com/ruoyi/system/service/ISysMenuService.java
  47. 0 69
      ruoyi-system/src/main/java/com/ruoyi/system/service/dhrm/IDhrmCompanyService.java
  48. 0 105
      ruoyi-system/src/main/java/com/ruoyi/system/service/dhrm/impl/DhrmCompanyServiceImpl.java
  49. 2 2
      ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysMenuServiceImpl.java
  50. 152 0
      ruoyi-system/src/main/java/com/ruoyi/tool/domain/TUnifyFile.java
  51. 61 0
      ruoyi-system/src/main/java/com/ruoyi/tool/mapper/TUnifyFileMapper.java
  52. 61 0
      ruoyi-system/src/main/java/com/ruoyi/tool/service/ITUnifyFileService.java
  53. 98 0
      ruoyi-system/src/main/java/com/ruoyi/tool/service/impl/TUnifyFileServiceImpl.java
  54. 0 96
      ruoyi-system/src/main/resources/mapper/dhrm/DhrmCompanyMapper.xml
  55. 1 1
      ruoyi-system/src/main/resources/mapper/invest/TProjectChannelMapper.xml
  56. 1 1
      ruoyi-system/src/main/resources/mapper/invest/TProjectCompanyMapper.xml
  57. 1 1
      ruoyi-system/src/main/resources/mapper/invest/TProjectContactsMapper.xml
  58. 1 1
      ruoyi-system/src/main/resources/mapper/invest/TProjectMeetingMapper.xml
  59. 1 1
      ruoyi-system/src/main/resources/mapper/invest/TProjectPoolMapper.xml
  60. 1 1
      ruoyi-system/src/main/resources/mapper/invest/TProjectRecordMapper.xml
  61. 213 0
      ruoyi-system/src/main/resources/mapper/invest/TProjectScoringMapper.xml
  62. 0 3
      ruoyi-system/src/main/resources/mapper/system/SysMenuMapper.xml
  63. 108 0
      ruoyi-system/src/main/resources/mapper/tool/TUnifyFileMapper.xml

+ 2 - 2
ruoyi-admin/src/main/java/com/ruoyi/web/controller/invest/TProjectChannelController.java

@@ -3,8 +3,8 @@ package com.ruoyi.web.controller.invest;
 import java.util.List;
 import javax.servlet.http.HttpServletResponse;
 
-import com.ruoyi.system.domain.invest.TProjectChannel;
-import com.ruoyi.system.service.invest.ITProjectChannelService;
+import com.ruoyi.invest.domain.TProjectChannel;
+import com.ruoyi.invest.service.ITProjectChannelService;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;

+ 2 - 2
ruoyi-admin/src/main/java/com/ruoyi/web/controller/invest/TProjectCompanyController.java

@@ -3,8 +3,8 @@ package com.ruoyi.web.controller.invest;
 import java.util.List;
 import javax.servlet.http.HttpServletResponse;
 
-import com.ruoyi.system.domain.invest.TProjectCompany;
-import com.ruoyi.system.service.invest.ITProjectCompanyService;
+import com.ruoyi.invest.domain.TProjectCompany;
+import com.ruoyi.invest.service.ITProjectCompanyService;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;

+ 2 - 2
ruoyi-admin/src/main/java/com/ruoyi/web/controller/invest/TProjectContactsController.java

@@ -3,8 +3,8 @@ package com.ruoyi.web.controller.invest;
 import java.util.List;
 import javax.servlet.http.HttpServletResponse;
 
-import com.ruoyi.system.domain.invest.TProjectContacts;
-import com.ruoyi.system.service.invest.ITProjectContactsService;
+import com.ruoyi.invest.domain.TProjectContacts;
+import com.ruoyi.invest.service.ITProjectContactsService;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;

+ 2 - 2
ruoyi-admin/src/main/java/com/ruoyi/web/controller/invest/TProjectInformationController.java

@@ -3,8 +3,8 @@ package com.ruoyi.web.controller.invest;
 import java.util.List;
 import javax.servlet.http.HttpServletResponse;
 
-import com.ruoyi.system.domain.invest.TProjectInformation;
-import com.ruoyi.system.service.invest.ITProjectInformationService;
+import com.ruoyi.invest.domain.TProjectInformation;
+import com.ruoyi.invest.service.ITProjectInformationService;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;

+ 2 - 2
ruoyi-admin/src/main/java/com/ruoyi/web/controller/invest/TProjectMeetingController.java

@@ -3,8 +3,8 @@ package com.ruoyi.web.controller.invest;
 import java.util.List;
 import javax.servlet.http.HttpServletResponse;
 
-import com.ruoyi.system.domain.invest.TProjectMeeting;
-import com.ruoyi.system.service.invest.ITProjectMeetingService;
+import com.ruoyi.invest.domain.TProjectMeeting;
+import com.ruoyi.invest.service.ITProjectMeetingService;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;

+ 2 - 2
ruoyi-admin/src/main/java/com/ruoyi/web/controller/invest/TProjectPoolController.java

@@ -3,8 +3,8 @@ package com.ruoyi.web.controller.invest;
 import java.util.List;
 import javax.servlet.http.HttpServletResponse;
 
-import com.ruoyi.system.domain.invest.TProjectPool;
-import com.ruoyi.system.service.invest.ITProjectPoolService;
+import com.ruoyi.invest.domain.TProjectPool;
+import com.ruoyi.invest.service.ITProjectPoolService;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;

+ 2 - 2
ruoyi-admin/src/main/java/com/ruoyi/web/controller/invest/TProjectRecordController.java

@@ -3,8 +3,8 @@ package com.ruoyi.web.controller.invest;
 import java.util.List;
 import javax.servlet.http.HttpServletResponse;
 
-import com.ruoyi.system.domain.invest.TProjectRecord;
-import com.ruoyi.system.service.invest.ITProjectRecordService;
+import com.ruoyi.invest.domain.TProjectRecord;
+import com.ruoyi.invest.service.ITProjectRecordService;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;

+ 104 - 0
ruoyi-admin/src/main/java/com/ruoyi/web/controller/invest/TProjectScoringController.java

@@ -0,0 +1,104 @@
+package com.ruoyi.web.controller.invest;
+
+import java.util.List;
+import javax.servlet.http.HttpServletResponse;
+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.ruoyi.common.annotation.Log;
+import com.ruoyi.common.core.controller.BaseController;
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.enums.BusinessType;
+import com.ruoyi.invest.domain.TProjectScoring;
+import com.ruoyi.invest.service.ITProjectScoringService;
+import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.common.core.page.TableDataInfo;
+
+/**
+ * 打分Controller
+ * 
+ * @author ruoyi
+ * @date 2024-02-23
+ */
+@RestController
+@RequestMapping("/invest/scoring")
+public class TProjectScoringController extends BaseController
+{
+    @Autowired
+    private ITProjectScoringService tProjectScoringService;
+
+    /**
+     * 查询打分列表
+     */
+    @PreAuthorize("@ss.hasPermi('invest:scoring:list')")
+    @GetMapping("/list")
+    public TableDataInfo list(TProjectScoring tProjectScoring)
+    {
+        startPage();
+        List<TProjectScoring> list = tProjectScoringService.selectTProjectScoringList(tProjectScoring);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出打分列表
+     */
+    @PreAuthorize("@ss.hasPermi('invest:scoring:export')")
+    @Log(title = "打分", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(HttpServletResponse response, TProjectScoring tProjectScoring)
+    {
+        List<TProjectScoring> list = tProjectScoringService.selectTProjectScoringList(tProjectScoring);
+        ExcelUtil<TProjectScoring> util = new ExcelUtil<TProjectScoring>(TProjectScoring.class);
+        util.exportExcel(response, list, "打分数据");
+    }
+
+    /**
+     * 获取打分详细信息
+     */
+    @PreAuthorize("@ss.hasPermi('invest:scoring:query')")
+    @GetMapping(value = "/{id}")
+    public AjaxResult getInfo(@PathVariable("id") String id)
+    {
+        return success(tProjectScoringService.selectTProjectScoringById(id));
+    }
+
+    /**
+     * 新增打分
+     */
+    @PreAuthorize("@ss.hasPermi('invest:scoring:add')")
+    @Log(title = "打分", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody TProjectScoring tProjectScoring)
+    {
+        return toAjax(tProjectScoringService.insertTProjectScoring(tProjectScoring));
+    }
+
+    /**
+     * 修改打分
+     */
+    @PreAuthorize("@ss.hasPermi('invest:scoring:edit')")
+    @Log(title = "打分", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@RequestBody TProjectScoring tProjectScoring)
+    {
+        return toAjax(tProjectScoringService.updateTProjectScoring(tProjectScoring));
+    }
+
+    /**
+     * 删除打分
+     */
+    @PreAuthorize("@ss.hasPermi('invest:scoring:remove')")
+    @Log(title = "打分", businessType = BusinessType.DELETE)
+	@DeleteMapping("/{ids}")
+    public AjaxResult remove(@PathVariable String[] ids)
+    {
+        return toAjax(tProjectScoringService.deleteTProjectScoringByIds(ids));
+    }
+}

+ 3 - 9
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysLoginController.java

@@ -2,8 +2,6 @@ package com.ruoyi.web.controller.system;
 
 import java.util.List;
 import java.util.Set;
-import com.ruoyi.system.domain.dhrm.DhrmCompany;
-import com.ruoyi.system.service.dhrm.IDhrmCompanyService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 import com.ruoyi.common.constant.Constants;
@@ -33,8 +31,6 @@ public class SysLoginController
     @Autowired
     private SysPermissionService permissionService;
 
-    @Autowired
-    private IDhrmCompanyService dhrmCompanyService;
 
     /**
      * 登录方法
@@ -83,13 +79,11 @@ public class SysLoginController
         Set<String> roles = permissionService.getRolePermission(user);
         // 权限集合
         Set<String> permissions = permissionService.getMenuPermission(user);
-        // 所属公司
-        DhrmCompany dhrmCompany = dhrmCompanyService.selectDhrmCompanyByEmployNo(user.getEmployNo());
+
         AjaxResult ajax = AjaxResult.success();
         ajax.put("user", user);
         ajax.put("roles", roles);
         ajax.put("permissions", permissions);
-        ajax.put("dhrmCompany",dhrmCompany);
         return ajax;
     }
 
@@ -99,10 +93,10 @@ public class SysLoginController
      * @return 路由信息
      */
     @GetMapping("getRouters")
-    public AjaxResult getRouters(String systemType)
+    public AjaxResult getRouters()
     {
         Long userId = SecurityUtils.getUserId();
-        List<SysMenu> menus = menuService.selectMenuTreeByUserId(userId,systemType);
+        List<SysMenu> menus = menuService.selectMenuTreeByUserId(userId);
         return AjaxResult.success(menuService.buildMenus(menus));
     }
 

+ 104 - 0
ruoyi-admin/src/main/java/com/ruoyi/web/controller/tool/TUnifyFileController.java

@@ -0,0 +1,104 @@
+package com.ruoyi.web.controller.tool;
+
+import java.util.List;
+import javax.servlet.http.HttpServletResponse;
+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.ruoyi.common.annotation.Log;
+import com.ruoyi.common.core.controller.BaseController;
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.enums.BusinessType;
+import com.ruoyi.tool.domain.TUnifyFile;
+import com.ruoyi.tool.service.ITUnifyFileService;
+import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.common.core.page.TableDataInfo;
+
+/**
+ * 附件Controller
+ * 
+ * @author ruoyi
+ * @date 2024-02-23
+ */
+@RestController
+@RequestMapping("/system/file")
+public class TUnifyFileController extends BaseController
+{
+    @Autowired
+    private ITUnifyFileService tUnifyFileService;
+
+    /**
+     * 查询附件列表
+     */
+    @PreAuthorize("@ss.hasPermi('system:file:list')")
+    @GetMapping("/list")
+    public TableDataInfo list(TUnifyFile tUnifyFile)
+    {
+        startPage();
+        List<TUnifyFile> list = tUnifyFileService.selectTUnifyFileList(tUnifyFile);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出附件列表
+     */
+    @PreAuthorize("@ss.hasPermi('system:file:export')")
+    @Log(title = "附件", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(HttpServletResponse response, TUnifyFile tUnifyFile)
+    {
+        List<TUnifyFile> list = tUnifyFileService.selectTUnifyFileList(tUnifyFile);
+        ExcelUtil<TUnifyFile> util = new ExcelUtil<TUnifyFile>(TUnifyFile.class);
+        util.exportExcel(response, list, "附件数据");
+    }
+
+    /**
+     * 获取附件详细信息
+     */
+    @PreAuthorize("@ss.hasPermi('system:file:query')")
+    @GetMapping(value = "/{id}")
+    public AjaxResult getInfo(@PathVariable("id") String id)
+    {
+        return success(tUnifyFileService.selectTUnifyFileById(id));
+    }
+
+    /**
+     * 新增附件
+     */
+    @PreAuthorize("@ss.hasPermi('system:file:add')")
+    @Log(title = "附件", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody TUnifyFile tUnifyFile)
+    {
+        return toAjax(tUnifyFileService.insertTUnifyFile(tUnifyFile));
+    }
+
+    /**
+     * 修改附件
+     */
+    @PreAuthorize("@ss.hasPermi('system:file:edit')")
+    @Log(title = "附件", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@RequestBody TUnifyFile tUnifyFile)
+    {
+        return toAjax(tUnifyFileService.updateTUnifyFile(tUnifyFile));
+    }
+
+    /**
+     * 删除附件
+     */
+    @PreAuthorize("@ss.hasPermi('system:file:remove')")
+    @Log(title = "附件", businessType = BusinessType.DELETE)
+	@DeleteMapping("/{ids}")
+    public AjaxResult remove(@PathVariable String[] ids)
+    {
+        return toAjax(tUnifyFileService.deleteTUnifyFileByIds(ids));
+    }
+}

+ 191 - 191
ruoyi-system/src/main/java/com/ruoyi/system/domain/invest/TProjectChannel.java

@@ -1,191 +1,191 @@
-package com.ruoyi.system.domain.invest;
-
-import org.apache.commons.lang3.builder.ToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
-import com.ruoyi.common.annotation.Excel;
-import com.ruoyi.common.core.domain.BaseEntity;
-
-/**
- * 渠道信息对象 t_project_channel
- * 
- * @author ruoyi
- * @date 2024-02-22
- */
-public class TProjectChannel extends BaseEntity
-{
-    private static final long serialVersionUID = 1L;
-
-    /** 主键ID */
-    private String id;
-
-    /** 渠道名称 */
-    @Excel(name = "渠道名称")
-    private String channelName;
-
-    /** 渠道编号 */
-    @Excel(name = "渠道编号")
-    private String channelCode;
-
-    /** 类别 */
-    @Excel(name = "类别")
-    private String channelType;
-
-    /** 简介 */
-    private String channelBlurb;
-
-    /** 联系人 */
-    @Excel(name = "联系人")
-    private String contacts;
-
-    /** 联系电话 */
-    @Excel(name = "联系电话")
-    private String telephone;
-
-    /** 地址 */
-    private String address;
-
-    /** 渠道负责人 */
-    @Excel(name = "渠道负责人")
-    private String channelHead;
-
-    /** 状态 */
-    @Excel(name = "状态")
-    private String status;
-
-    /** 备注 */
-    private String mark;
-
-    /** 是否删除 */
-    private String delFlag;
-
-    public void setId(String id) 
-    {
-        this.id = id;
-    }
-
-    public String getId() 
-    {
-        return id;
-    }
-    public void setChannelName(String channelName) 
-    {
-        this.channelName = channelName;
-    }
-
-    public String getChannelName() 
-    {
-        return channelName;
-    }
-    public void setChannelCode(String channelCode) 
-    {
-        this.channelCode = channelCode;
-    }
-
-    public String getChannelCode() 
-    {
-        return channelCode;
-    }
-    public void setChannelType(String channelType) 
-    {
-        this.channelType = channelType;
-    }
-
-    public String getChannelType() 
-    {
-        return channelType;
-    }
-    public void setChannelBlurb(String channelBlurb) 
-    {
-        this.channelBlurb = channelBlurb;
-    }
-
-    public String getChannelBlurb() 
-    {
-        return channelBlurb;
-    }
-    public void setContacts(String contacts) 
-    {
-        this.contacts = contacts;
-    }
-
-    public String getContacts() 
-    {
-        return contacts;
-    }
-    public void setTelephone(String telephone) 
-    {
-        this.telephone = telephone;
-    }
-
-    public String getTelephone() 
-    {
-        return telephone;
-    }
-    public void setAddress(String address) 
-    {
-        this.address = address;
-    }
-
-    public String getAddress() 
-    {
-        return address;
-    }
-    public void setChannelHead(String channelHead) 
-    {
-        this.channelHead = channelHead;
-    }
-
-    public String getChannelHead() 
-    {
-        return channelHead;
-    }
-    public void setStatus(String status) 
-    {
-        this.status = status;
-    }
-
-    public String getStatus() 
-    {
-        return status;
-    }
-    public void setMark(String mark) 
-    {
-        this.mark = mark;
-    }
-
-    public String getMark() 
-    {
-        return mark;
-    }
-    public void setDelFlag(String delFlag) 
-    {
-        this.delFlag = delFlag;
-    }
-
-    public String getDelFlag() 
-    {
-        return delFlag;
-    }
-
-    @Override
-    public String toString() {
-        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
-            .append("id", getId())
-            .append("channelName", getChannelName())
-            .append("channelCode", getChannelCode())
-            .append("channelType", getChannelType())
-            .append("channelBlurb", getChannelBlurb())
-            .append("contacts", getContacts())
-            .append("telephone", getTelephone())
-            .append("address", getAddress())
-            .append("channelHead", getChannelHead())
-            .append("status", getStatus())
-            .append("mark", getMark())
-            .append("delFlag", getDelFlag())
-            .append("createBy", getCreateBy())
-            .append("createTime", getCreateTime())
-            .append("updateBy", getUpdateBy())
-            .append("updateTime", getUpdateTime())
-            .toString();
-    }
-}
+package com.ruoyi.invest.domain;
+
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import com.ruoyi.common.annotation.Excel;
+import com.ruoyi.common.core.domain.BaseEntity;
+
+/**
+ * 渠道信息对象 t_project_channel
+ * 
+ * @author ruoyi
+ * @date 2024-02-22
+ */
+public class TProjectChannel extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 主键ID */
+    private String id;
+
+    /** 渠道名称 */
+    @Excel(name = "渠道名称")
+    private String channelName;
+
+    /** 渠道编号 */
+    @Excel(name = "渠道编号")
+    private String channelCode;
+
+    /** 类别 */
+    @Excel(name = "类别")
+    private String channelType;
+
+    /** 简介 */
+    private String channelBlurb;
+
+    /** 联系人 */
+    @Excel(name = "联系人")
+    private String contacts;
+
+    /** 联系电话 */
+    @Excel(name = "联系电话")
+    private String telephone;
+
+    /** 地址 */
+    private String address;
+
+    /** 渠道负责人 */
+    @Excel(name = "渠道负责人")
+    private String channelHead;
+
+    /** 状态 */
+    @Excel(name = "状态")
+    private String status;
+
+    /** 备注 */
+    private String mark;
+
+    /** 是否删除 */
+    private String delFlag;
+
+    public void setId(String id) 
+    {
+        this.id = id;
+    }
+
+    public String getId() 
+    {
+        return id;
+    }
+    public void setChannelName(String channelName) 
+    {
+        this.channelName = channelName;
+    }
+
+    public String getChannelName() 
+    {
+        return channelName;
+    }
+    public void setChannelCode(String channelCode) 
+    {
+        this.channelCode = channelCode;
+    }
+
+    public String getChannelCode() 
+    {
+        return channelCode;
+    }
+    public void setChannelType(String channelType) 
+    {
+        this.channelType = channelType;
+    }
+
+    public String getChannelType() 
+    {
+        return channelType;
+    }
+    public void setChannelBlurb(String channelBlurb) 
+    {
+        this.channelBlurb = channelBlurb;
+    }
+
+    public String getChannelBlurb() 
+    {
+        return channelBlurb;
+    }
+    public void setContacts(String contacts) 
+    {
+        this.contacts = contacts;
+    }
+
+    public String getContacts() 
+    {
+        return contacts;
+    }
+    public void setTelephone(String telephone) 
+    {
+        this.telephone = telephone;
+    }
+
+    public String getTelephone() 
+    {
+        return telephone;
+    }
+    public void setAddress(String address) 
+    {
+        this.address = address;
+    }
+
+    public String getAddress() 
+    {
+        return address;
+    }
+    public void setChannelHead(String channelHead) 
+    {
+        this.channelHead = channelHead;
+    }
+
+    public String getChannelHead() 
+    {
+        return channelHead;
+    }
+    public void setStatus(String status) 
+    {
+        this.status = status;
+    }
+
+    public String getStatus() 
+    {
+        return status;
+    }
+    public void setMark(String mark) 
+    {
+        this.mark = mark;
+    }
+
+    public String getMark() 
+    {
+        return mark;
+    }
+    public void setDelFlag(String delFlag) 
+    {
+        this.delFlag = delFlag;
+    }
+
+    public String getDelFlag() 
+    {
+        return delFlag;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("id", getId())
+            .append("channelName", getChannelName())
+            .append("channelCode", getChannelCode())
+            .append("channelType", getChannelType())
+            .append("channelBlurb", getChannelBlurb())
+            .append("contacts", getContacts())
+            .append("telephone", getTelephone())
+            .append("address", getAddress())
+            .append("channelHead", getChannelHead())
+            .append("status", getStatus())
+            .append("mark", getMark())
+            .append("delFlag", getDelFlag())
+            .append("createBy", getCreateBy())
+            .append("createTime", getCreateTime())
+            .append("updateBy", getUpdateBy())
+            .append("updateTime", getUpdateTime())
+            .toString();
+    }
+}

+ 219 - 219
ruoyi-system/src/main/java/com/ruoyi/system/domain/invest/TProjectCompany.java

@@ -1,219 +1,219 @@
-package com.ruoyi.system.domain.invest;
-
-import java.util.Date;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import org.apache.commons.lang3.builder.ToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
-import com.ruoyi.common.annotation.Excel;
-import com.ruoyi.common.core.domain.BaseEntity;
-
-/**
- * 项目公司信息对象 t_project_company
- * 
- * @author ruoyi
- * @date 2024-02-22
- */
-public class TProjectCompany extends BaseEntity
-{
-    private static final long serialVersionUID = 1L;
-
-    /** 主键ID */
-    private String id;
-
-    /** 公司名称 */
-    @Excel(name = "公司名称")
-    private String companyName;
-
-    /** 项目ID */
-    private String projectPoolId;
-
-    /** 企业统一社会信用代码 */
-    @Excel(name = "企业统一社会信用代码")
-    private String companyCode;
-
-    /** 营业开始时间 */
-    @JsonFormat(pattern = "yyyy-MM-dd")
-    @Excel(name = "营业开始时间", width = 30, dateFormat = "yyyy-MM-dd")
-    private Date startTime;
-
-    /** 营业结束时间 */
-    @JsonFormat(pattern = "yyyy-MM-dd")
-    @Excel(name = "营业结束时间", width = 30, dateFormat = "yyyy-MM-dd")
-    private Date endTime;
-
-    /** 注册资本 */
-    private String registeredCapital;
-
-    /** 注册地址 */
-    private String registeredAddress;
-
-    /** 实缴资本 */
-    private String paidCapital;
-
-    /** 办公地址 */
-    private String businessAddress;
-
-    /** 实控人 */
-    @Excel(name = "实控人")
-    private String actualBod;
-
-    /** 联系电话 */
-    private String phone;
-
-    /** 所属类型 */
-    private String type;
-
-    /** 状态 */
-    private String delFlag;
-
-    public void setId(String id) 
-    {
-        this.id = id;
-    }
-
-    public String getId() 
-    {
-        return id;
-    }
-    public void setCompanyName(String companyName) 
-    {
-        this.companyName = companyName;
-    }
-
-    public String getCompanyName() 
-    {
-        return companyName;
-    }
-    public void setProjectPoolId(String projectPoolId) 
-    {
-        this.projectPoolId = projectPoolId;
-    }
-
-    public String getProjectPoolId() 
-    {
-        return projectPoolId;
-    }
-    public void setCompanyCode(String companyCode) 
-    {
-        this.companyCode = companyCode;
-    }
-
-    public String getCompanyCode() 
-    {
-        return companyCode;
-    }
-    public void setStartTime(Date startTime) 
-    {
-        this.startTime = startTime;
-    }
-
-    public Date getStartTime() 
-    {
-        return startTime;
-    }
-    public void setEndTime(Date endTime) 
-    {
-        this.endTime = endTime;
-    }
-
-    public Date getEndTime() 
-    {
-        return endTime;
-    }
-    public void setRegisteredCapital(String registeredCapital) 
-    {
-        this.registeredCapital = registeredCapital;
-    }
-
-    public String getRegisteredCapital() 
-    {
-        return registeredCapital;
-    }
-    public void setRegisteredAddress(String registeredAddress) 
-    {
-        this.registeredAddress = registeredAddress;
-    }
-
-    public String getRegisteredAddress() 
-    {
-        return registeredAddress;
-    }
-    public void setPaidCapital(String paidCapital) 
-    {
-        this.paidCapital = paidCapital;
-    }
-
-    public String getPaidCapital() 
-    {
-        return paidCapital;
-    }
-    public void setBusinessAddress(String businessAddress) 
-    {
-        this.businessAddress = businessAddress;
-    }
-
-    public String getBusinessAddress() 
-    {
-        return businessAddress;
-    }
-    public void setActualBod(String actualBod) 
-    {
-        this.actualBod = actualBod;
-    }
-
-    public String getActualBod() 
-    {
-        return actualBod;
-    }
-    public void setPhone(String phone) 
-    {
-        this.phone = phone;
-    }
-
-    public String getPhone() 
-    {
-        return phone;
-    }
-    public void setType(String type) 
-    {
-        this.type = type;
-    }
-
-    public String getType() 
-    {
-        return type;
-    }
-    public void setDelFlag(String delFlag) 
-    {
-        this.delFlag = delFlag;
-    }
-
-    public String getDelFlag() 
-    {
-        return delFlag;
-    }
-
-    @Override
-    public String toString() {
-        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
-            .append("id", getId())
-            .append("companyName", getCompanyName())
-            .append("projectPoolId", getProjectPoolId())
-            .append("companyCode", getCompanyCode())
-            .append("startTime", getStartTime())
-            .append("endTime", getEndTime())
-            .append("registeredCapital", getRegisteredCapital())
-            .append("registeredAddress", getRegisteredAddress())
-            .append("paidCapital", getPaidCapital())
-            .append("businessAddress", getBusinessAddress())
-            .append("actualBod", getActualBod())
-            .append("phone", getPhone())
-            .append("type", getType())
-            .append("delFlag", getDelFlag())
-            .append("createBy", getCreateBy())
-            .append("createTime", getCreateTime())
-            .append("updateBy", getUpdateBy())
-            .append("updateTime", getUpdateTime())
-            .toString();
-    }
-}
+package com.ruoyi.invest.domain;
+
+import java.util.Date;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import com.ruoyi.common.annotation.Excel;
+import com.ruoyi.common.core.domain.BaseEntity;
+
+/**
+ * 项目公司信息对象 t_project_company
+ * 
+ * @author ruoyi
+ * @date 2024-02-22
+ */
+public class TProjectCompany extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 主键ID */
+    private String id;
+
+    /** 公司名称 */
+    @Excel(name = "公司名称")
+    private String companyName;
+
+    /** 项目ID */
+    private String projectPoolId;
+
+    /** 企业统一社会信用代码 */
+    @Excel(name = "企业统一社会信用代码")
+    private String companyCode;
+
+    /** 营业开始时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "营业开始时间", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date startTime;
+
+    /** 营业结束时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "营业结束时间", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date endTime;
+
+    /** 注册资本 */
+    private String registeredCapital;
+
+    /** 注册地址 */
+    private String registeredAddress;
+
+    /** 实缴资本 */
+    private String paidCapital;
+
+    /** 办公地址 */
+    private String businessAddress;
+
+    /** 实控人 */
+    @Excel(name = "实控人")
+    private String actualBod;
+
+    /** 联系电话 */
+    private String phone;
+
+    /** 所属类型 */
+    private String type;
+
+    /** 状态 */
+    private String delFlag;
+
+    public void setId(String id) 
+    {
+        this.id = id;
+    }
+
+    public String getId() 
+    {
+        return id;
+    }
+    public void setCompanyName(String companyName) 
+    {
+        this.companyName = companyName;
+    }
+
+    public String getCompanyName() 
+    {
+        return companyName;
+    }
+    public void setProjectPoolId(String projectPoolId) 
+    {
+        this.projectPoolId = projectPoolId;
+    }
+
+    public String getProjectPoolId() 
+    {
+        return projectPoolId;
+    }
+    public void setCompanyCode(String companyCode) 
+    {
+        this.companyCode = companyCode;
+    }
+
+    public String getCompanyCode() 
+    {
+        return companyCode;
+    }
+    public void setStartTime(Date startTime) 
+    {
+        this.startTime = startTime;
+    }
+
+    public Date getStartTime() 
+    {
+        return startTime;
+    }
+    public void setEndTime(Date endTime) 
+    {
+        this.endTime = endTime;
+    }
+
+    public Date getEndTime() 
+    {
+        return endTime;
+    }
+    public void setRegisteredCapital(String registeredCapital) 
+    {
+        this.registeredCapital = registeredCapital;
+    }
+
+    public String getRegisteredCapital() 
+    {
+        return registeredCapital;
+    }
+    public void setRegisteredAddress(String registeredAddress) 
+    {
+        this.registeredAddress = registeredAddress;
+    }
+
+    public String getRegisteredAddress() 
+    {
+        return registeredAddress;
+    }
+    public void setPaidCapital(String paidCapital) 
+    {
+        this.paidCapital = paidCapital;
+    }
+
+    public String getPaidCapital() 
+    {
+        return paidCapital;
+    }
+    public void setBusinessAddress(String businessAddress) 
+    {
+        this.businessAddress = businessAddress;
+    }
+
+    public String getBusinessAddress() 
+    {
+        return businessAddress;
+    }
+    public void setActualBod(String actualBod) 
+    {
+        this.actualBod = actualBod;
+    }
+
+    public String getActualBod() 
+    {
+        return actualBod;
+    }
+    public void setPhone(String phone) 
+    {
+        this.phone = phone;
+    }
+
+    public String getPhone() 
+    {
+        return phone;
+    }
+    public void setType(String type) 
+    {
+        this.type = type;
+    }
+
+    public String getType() 
+    {
+        return type;
+    }
+    public void setDelFlag(String delFlag) 
+    {
+        this.delFlag = delFlag;
+    }
+
+    public String getDelFlag() 
+    {
+        return delFlag;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("id", getId())
+            .append("companyName", getCompanyName())
+            .append("projectPoolId", getProjectPoolId())
+            .append("companyCode", getCompanyCode())
+            .append("startTime", getStartTime())
+            .append("endTime", getEndTime())
+            .append("registeredCapital", getRegisteredCapital())
+            .append("registeredAddress", getRegisteredAddress())
+            .append("paidCapital", getPaidCapital())
+            .append("businessAddress", getBusinessAddress())
+            .append("actualBod", getActualBod())
+            .append("phone", getPhone())
+            .append("type", getType())
+            .append("delFlag", getDelFlag())
+            .append("createBy", getCreateBy())
+            .append("createTime", getCreateTime())
+            .append("updateBy", getUpdateBy())
+            .append("updateTime", getUpdateTime())
+            .toString();
+    }
+}

+ 97 - 97
ruoyi-system/src/main/java/com/ruoyi/system/domain/invest/TProjectContacts.java

@@ -1,97 +1,97 @@
-package com.ruoyi.system.domain.invest;
-
-import org.apache.commons.lang3.builder.ToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
-import com.ruoyi.common.annotation.Excel;
-import com.ruoyi.common.core.domain.BaseEntity;
-
-/**
- * 项目联系人对象 t_project_contacts
- * 
- * @author ruoyi
- * @date 2024-02-22
- */
-public class TProjectContacts extends BaseEntity
-{
-    private static final long serialVersionUID = 1L;
-
-    /** 主键ID */
-    private String id;
-
-    /** 联系人姓名 */
-    @Excel(name = "联系人姓名")
-    private String name;
-
-    /** 职位 */
-    @Excel(name = "职位")
-    private String position;
-
-    /** 联系电话/微信 */
-    @Excel(name = "联系电话/微信")
-    private String contact;
-
-    /** 状态 */
-    private String delFlag;
-
-    public void setId(String id) 
-    {
-        this.id = id;
-    }
-
-    public String getId() 
-    {
-        return id;
-    }
-    public void setName(String name) 
-    {
-        this.name = name;
-    }
-
-    public String getName() 
-    {
-        return name;
-    }
-    public void setPosition(String position) 
-    {
-        this.position = position;
-    }
-
-    public String getPosition() 
-    {
-        return position;
-    }
-    public void setContact(String contact) 
-    {
-        this.contact = contact;
-    }
-
-    public String getContact() 
-    {
-        return contact;
-    }
-    public void setDelFlag(String delFlag) 
-    {
-        this.delFlag = delFlag;
-    }
-
-    public String getDelFlag() 
-    {
-        return delFlag;
-    }
-
-    @Override
-    public String toString() {
-        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
-            .append("id", getId())
-            .append("name", getName())
-            .append("position", getPosition())
-            .append("contact", getContact())
-            .append("remark", getRemark())
-            .append("delFlag", getDelFlag())
-            .append("createBy", getCreateBy())
-            .append("createTime", getCreateTime())
-            .append("updateBy", getUpdateBy())
-            .append("updateTime", getUpdateTime())
-            .toString();
-    }
-}
+package com.ruoyi.invest.domain;
+
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import com.ruoyi.common.annotation.Excel;
+import com.ruoyi.common.core.domain.BaseEntity;
+
+/**
+ * 项目联系人对象 t_project_contacts
+ * 
+ * @author ruoyi
+ * @date 2024-02-22
+ */
+public class TProjectContacts extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 主键ID */
+    private String id;
+
+    /** 联系人姓名 */
+    @Excel(name = "联系人姓名")
+    private String name;
+
+    /** 职位 */
+    @Excel(name = "职位")
+    private String position;
+
+    /** 联系电话/微信 */
+    @Excel(name = "联系电话/微信")
+    private String contact;
+
+    /** 状态 */
+    private String delFlag;
+
+    public void setId(String id) 
+    {
+        this.id = id;
+    }
+
+    public String getId() 
+    {
+        return id;
+    }
+    public void setName(String name) 
+    {
+        this.name = name;
+    }
+
+    public String getName() 
+    {
+        return name;
+    }
+    public void setPosition(String position) 
+    {
+        this.position = position;
+    }
+
+    public String getPosition() 
+    {
+        return position;
+    }
+    public void setContact(String contact) 
+    {
+        this.contact = contact;
+    }
+
+    public String getContact() 
+    {
+        return contact;
+    }
+    public void setDelFlag(String delFlag) 
+    {
+        this.delFlag = delFlag;
+    }
+
+    public String getDelFlag() 
+    {
+        return delFlag;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("id", getId())
+            .append("name", getName())
+            .append("position", getPosition())
+            .append("contact", getContact())
+            .append("remark", getRemark())
+            .append("delFlag", getDelFlag())
+            .append("createBy", getCreateBy())
+            .append("createTime", getCreateTime())
+            .append("updateBy", getUpdateBy())
+            .append("updateTime", getUpdateTime())
+            .toString();
+    }
+}

+ 1 - 1
ruoyi-system/src/main/java/com/ruoyi/system/domain/invest/TProjectInformation.java

@@ -1,4 +1,4 @@
-package com.ruoyi.system.domain.invest;
+package com.ruoyi.invest.domain;
 
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;

+ 182 - 182
ruoyi-system/src/main/java/com/ruoyi/system/domain/invest/TProjectMeeting.java

@@ -1,182 +1,182 @@
-package com.ruoyi.system.domain.invest;
-
-import java.util.Date;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import org.apache.commons.lang3.builder.ToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
-import com.ruoyi.common.annotation.Excel;
-import com.ruoyi.common.core.domain.BaseEntity;
-
-/**
- * 会议记录对象 t_project_meeting
- * 
- * @author ruoyi
- * @date 2024-02-22
- */
-public class TProjectMeeting extends BaseEntity
-{
-    private static final long serialVersionUID = 1L;
-
-    /** 主键ID */
-    private String id;
-
-    /** 会议主题 */
-    @Excel(name = "会议主题")
-    private String meetingTheme;
-
-    /** 会议编号 */
-    @Excel(name = "会议编号")
-    private String meetingCode;
-
-    /** 类别 */
-    @Excel(name = "类别")
-    private String meetingType;
-
-    /** 项目ID */
-    private String projectPoolId;
-
-    /** 会议开始时间 */
-    @JsonFormat(pattern = "yyyy-MM-dd")
-    @Excel(name = "会议开始时间", width = 30, dateFormat = "yyyy-MM-dd")
-    private Date startTime;
-
-    /** 会议结束时间 */
-    @JsonFormat(pattern = "yyyy-MM-dd")
-    @Excel(name = "会议结束时间", width = 30, dateFormat = "yyyy-MM-dd")
-    private Date endTime;
-
-    /** 会议地点 */
-    @Excel(name = "会议地点")
-    private String place;
-
-    /** 会议发起人 */
-    @Excel(name = "会议发起人")
-    private String promoter;
-
-    /** 会议参与人 */
-    private String participants;
-
-    /** 状态 */
-    private String delFlag;
-
-    public void setId(String id) 
-    {
-        this.id = id;
-    }
-
-    public String getId() 
-    {
-        return id;
-    }
-    public void setMeetingTheme(String meetingTheme) 
-    {
-        this.meetingTheme = meetingTheme;
-    }
-
-    public String getMeetingTheme() 
-    {
-        return meetingTheme;
-    }
-    public void setMeetingCode(String meetingCode) 
-    {
-        this.meetingCode = meetingCode;
-    }
-
-    public String getMeetingCode() 
-    {
-        return meetingCode;
-    }
-    public void setMeetingType(String meetingType) 
-    {
-        this.meetingType = meetingType;
-    }
-
-    public String getMeetingType() 
-    {
-        return meetingType;
-    }
-    public void setProjectPoolId(String projectPoolId) 
-    {
-        this.projectPoolId = projectPoolId;
-    }
-
-    public String getProjectPoolId() 
-    {
-        return projectPoolId;
-    }
-    public void setStartTime(Date startTime) 
-    {
-        this.startTime = startTime;
-    }
-
-    public Date getStartTime() 
-    {
-        return startTime;
-    }
-    public void setEndTime(Date endTime) 
-    {
-        this.endTime = endTime;
-    }
-
-    public Date getEndTime() 
-    {
-        return endTime;
-    }
-    public void setPlace(String place) 
-    {
-        this.place = place;
-    }
-
-    public String getPlace() 
-    {
-        return place;
-    }
-    public void setPromoter(String promoter) 
-    {
-        this.promoter = promoter;
-    }
-
-    public String getPromoter() 
-    {
-        return promoter;
-    }
-    public void setParticipants(String participants) 
-    {
-        this.participants = participants;
-    }
-
-    public String getParticipants() 
-    {
-        return participants;
-    }
-    public void setDelFlag(String delFlag) 
-    {
-        this.delFlag = delFlag;
-    }
-
-    public String getDelFlag() 
-    {
-        return delFlag;
-    }
-
-    @Override
-    public String toString() {
-        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
-            .append("id", getId())
-            .append("meetingTheme", getMeetingTheme())
-            .append("meetingCode", getMeetingCode())
-            .append("meetingType", getMeetingType())
-            .append("projectPoolId", getProjectPoolId())
-            .append("startTime", getStartTime())
-            .append("endTime", getEndTime())
-            .append("place", getPlace())
-            .append("promoter", getPromoter())
-            .append("participants", getParticipants())
-            .append("delFlag", getDelFlag())
-            .append("createBy", getCreateBy())
-            .append("createTime", getCreateTime())
-            .append("updateBy", getUpdateBy())
-            .append("updateTime", getUpdateTime())
-            .toString();
-    }
-}
+package com.ruoyi.invest.domain;
+
+import java.util.Date;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import com.ruoyi.common.annotation.Excel;
+import com.ruoyi.common.core.domain.BaseEntity;
+
+/**
+ * 会议记录对象 t_project_meeting
+ * 
+ * @author ruoyi
+ * @date 2024-02-22
+ */
+public class TProjectMeeting extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 主键ID */
+    private String id;
+
+    /** 会议主题 */
+    @Excel(name = "会议主题")
+    private String meetingTheme;
+
+    /** 会议编号 */
+    @Excel(name = "会议编号")
+    private String meetingCode;
+
+    /** 类别 */
+    @Excel(name = "类别")
+    private String meetingType;
+
+    /** 项目ID */
+    private String projectPoolId;
+
+    /** 会议开始时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "会议开始时间", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date startTime;
+
+    /** 会议结束时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "会议结束时间", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date endTime;
+
+    /** 会议地点 */
+    @Excel(name = "会议地点")
+    private String place;
+
+    /** 会议发起人 */
+    @Excel(name = "会议发起人")
+    private String promoter;
+
+    /** 会议参与人 */
+    private String participants;
+
+    /** 状态 */
+    private String delFlag;
+
+    public void setId(String id) 
+    {
+        this.id = id;
+    }
+
+    public String getId() 
+    {
+        return id;
+    }
+    public void setMeetingTheme(String meetingTheme) 
+    {
+        this.meetingTheme = meetingTheme;
+    }
+
+    public String getMeetingTheme() 
+    {
+        return meetingTheme;
+    }
+    public void setMeetingCode(String meetingCode) 
+    {
+        this.meetingCode = meetingCode;
+    }
+
+    public String getMeetingCode() 
+    {
+        return meetingCode;
+    }
+    public void setMeetingType(String meetingType) 
+    {
+        this.meetingType = meetingType;
+    }
+
+    public String getMeetingType() 
+    {
+        return meetingType;
+    }
+    public void setProjectPoolId(String projectPoolId) 
+    {
+        this.projectPoolId = projectPoolId;
+    }
+
+    public String getProjectPoolId() 
+    {
+        return projectPoolId;
+    }
+    public void setStartTime(Date startTime) 
+    {
+        this.startTime = startTime;
+    }
+
+    public Date getStartTime() 
+    {
+        return startTime;
+    }
+    public void setEndTime(Date endTime) 
+    {
+        this.endTime = endTime;
+    }
+
+    public Date getEndTime() 
+    {
+        return endTime;
+    }
+    public void setPlace(String place) 
+    {
+        this.place = place;
+    }
+
+    public String getPlace() 
+    {
+        return place;
+    }
+    public void setPromoter(String promoter) 
+    {
+        this.promoter = promoter;
+    }
+
+    public String getPromoter() 
+    {
+        return promoter;
+    }
+    public void setParticipants(String participants) 
+    {
+        this.participants = participants;
+    }
+
+    public String getParticipants() 
+    {
+        return participants;
+    }
+    public void setDelFlag(String delFlag) 
+    {
+        this.delFlag = delFlag;
+    }
+
+    public String getDelFlag() 
+    {
+        return delFlag;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("id", getId())
+            .append("meetingTheme", getMeetingTheme())
+            .append("meetingCode", getMeetingCode())
+            .append("meetingType", getMeetingType())
+            .append("projectPoolId", getProjectPoolId())
+            .append("startTime", getStartTime())
+            .append("endTime", getEndTime())
+            .append("place", getPlace())
+            .append("promoter", getPromoter())
+            .append("participants", getParticipants())
+            .append("delFlag", getDelFlag())
+            .append("createBy", getCreateBy())
+            .append("createTime", getCreateTime())
+            .append("updateBy", getUpdateBy())
+            .append("updateTime", getUpdateTime())
+            .toString();
+    }
+}

+ 447 - 447
ruoyi-system/src/main/java/com/ruoyi/system/domain/invest/TProjectPool.java

@@ -1,447 +1,447 @@
-package com.ruoyi.system.domain.invest;
-
-import java.util.Date;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import org.apache.commons.lang3.builder.ToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
-import com.ruoyi.common.annotation.Excel;
-import com.ruoyi.common.core.domain.BaseEntity;
-
-/**
- * 项目池对象 t_project_pool
- * 
- * @author ruoyi
- * @date 2024-02-21
- */
-public class TProjectPool extends BaseEntity
-{
-    private static final long serialVersionUID = 1L;
-
-    /** 主键id */
-
-    private String id;
-
-    /** 项目名称 */
-    @Excel(name = "项目名称")
-    private String porjectName;
-
-    /** 所属组别 */
-    @Excel(name = "所属组别")
-    private String porjectGroup;
-
-    /** 录入日期 */
-    private Date recordDate;
-
-    /** 项目编号 */
-    @Excel(name = "项目编号")
-    private String porjectCode;
-
-    /** 渠道 */
-    @Excel(name = "渠道")
-    private String channel;
-
-    /** 初次接触日期 */
-    @JsonFormat(pattern = "yyyy-MM-dd")
-    @Excel(name = "初次接触日期", width = 30, dateFormat = "yyyy-MM-dd")
-    private Date contactDate;
-
-    /** 立项通过日期 */
-    @JsonFormat(pattern = "yyyy-MM-dd")
-    @Excel(name = "立项通过日期", width = 30, dateFormat = "yyyy-MM-dd")
-    private Date projectDate;
-
-    /** 投决通过日期 */
-    @JsonFormat(pattern = "yyyy-MM-dd")
-    @Excel(name = "投决通过日期", width = 30, dateFormat = "yyyy-MM-dd")
-    private Date decisionDate;
-
-    /** 项目所属行业 */
-    @Excel(name = "项目所属行业")
-    private String industry;
-
-    /** 项目所属公司 */
-    @Excel(name = "项目所属公司")
-    private String company;
-
-    /** 项目情况描述 */
-    private String description;
-
-    /** 项目联系人 */
-    @Excel(name = "项目联系人")
-    private String projectContacts;
-
-    /** 投资负责人 */
-    @Excel(name = "投资负责人")
-    private String investHead;
-
-    /** 历次融资 */
-    @Excel(name = "历次融资")
-    private String previousFinancing;
-
-    /** 项目融资阶段 */
-    @Excel(name = "项目融资阶段")
-    private String financingStage;
-
-    /** 融资条件 */
-    private String financingCondition;
-
-    /** 预期融资金额(万元) */
-    @Excel(name = "预期融资金额", readConverterExp = "万=元")
-    private String financingMoney;
-
-    /** 预期融资时间 */
-    @JsonFormat(pattern = "yyyy-MM-dd")
-    @Excel(name = "预期融资时间", width = 30, dateFormat = "yyyy-MM-dd")
-    private Date financingDate;
-
-    /** 投资亮点 */
-    private String investSparkle;
-
-    /** 投前估值(万元) */
-    @Excel(name = "投前估值", readConverterExp = "万=元")
-    private String investValuation;
-
-    /** 预计投资金额(万元) */
-    @Excel(name = "预计投资金额", readConverterExp = "万=元")
-    private String investMoney;
-
-    /** 投资类型 */
-    @Excel(name = "投资类型")
-    private String investType;
-
-    /** 投资策略 */
-    @Excel(name = "投资策略")
-    private String investPloy;
-
-    /** 投资价值 */
-    @Excel(name = "投资价值")
-    private String investWorth;
-
-    /** 股权架构 */
-    private String shareholding;
-
-    /** 项目阶段 */
-    @Excel(name = "项目阶段")
-    private String projectStage;
-
-    /** 项目状态 */
-    @Excel(name = "项目状态")
-    private String projectState;
-
-    /** 备注 */
-    private String mark;
-
-    /** 状态 */
-    private String delFlag;
-
-    public void setId(String id) 
-    {
-        this.id = id;
-    }
-
-    public String getId() 
-    {
-        return id;
-    }
-    public void setPorjectName(String porjectName) 
-    {
-        this.porjectName = porjectName;
-    }
-
-    public String getPorjectName() 
-    {
-        return porjectName;
-    }
-    public void setPorjectGroup(String porjectGroup) 
-    {
-        this.porjectGroup = porjectGroup;
-    }
-
-    public String getPorjectGroup() 
-    {
-        return porjectGroup;
-    }
-    public void setRecordDate(Date recordDate) 
-    {
-        this.recordDate = recordDate;
-    }
-
-    public Date getRecordDate() 
-    {
-        return recordDate;
-    }
-    public void setPorjectCode(String porjectCode) 
-    {
-        this.porjectCode = porjectCode;
-    }
-
-    public String getPorjectCode() 
-    {
-        return porjectCode;
-    }
-    public void setChannel(String channel) 
-    {
-        this.channel = channel;
-    }
-
-    public String getChannel() 
-    {
-        return channel;
-    }
-    public void setContactDate(Date contactDate) 
-    {
-        this.contactDate = contactDate;
-    }
-
-    public Date getContactDate() 
-    {
-        return contactDate;
-    }
-    public void setProjectDate(Date projectDate) 
-    {
-        this.projectDate = projectDate;
-    }
-
-    public Date getProjectDate() 
-    {
-        return projectDate;
-    }
-    public void setDecisionDate(Date decisionDate) 
-    {
-        this.decisionDate = decisionDate;
-    }
-
-    public Date getDecisionDate() 
-    {
-        return decisionDate;
-    }
-    public void setIndustry(String industry) 
-    {
-        this.industry = industry;
-    }
-
-    public String getIndustry() 
-    {
-        return industry;
-    }
-    public void setCompany(String company) 
-    {
-        this.company = company;
-    }
-
-    public String getCompany() 
-    {
-        return company;
-    }
-    public void setDescription(String description) 
-    {
-        this.description = description;
-    }
-
-    public String getDescription() 
-    {
-        return description;
-    }
-    public void setProjectContacts(String projectContacts) 
-    {
-        this.projectContacts = projectContacts;
-    }
-
-    public String getProjectContacts() 
-    {
-        return projectContacts;
-    }
-    public void setInvestHead(String investHead) 
-    {
-        this.investHead = investHead;
-    }
-
-    public String getInvestHead() 
-    {
-        return investHead;
-    }
-    public void setPreviousFinancing(String previousFinancing) 
-    {
-        this.previousFinancing = previousFinancing;
-    }
-
-    public String getPreviousFinancing() 
-    {
-        return previousFinancing;
-    }
-    public void setFinancingStage(String financingStage) 
-    {
-        this.financingStage = financingStage;
-    }
-
-    public String getFinancingStage() 
-    {
-        return financingStage;
-    }
-    public void setFinancingCondition(String financingCondition) 
-    {
-        this.financingCondition = financingCondition;
-    }
-
-    public String getFinancingCondition() 
-    {
-        return financingCondition;
-    }
-    public void setFinancingMoney(String financingMoney) 
-    {
-        this.financingMoney = financingMoney;
-    }
-
-    public String getFinancingMoney() 
-    {
-        return financingMoney;
-    }
-    public void setFinancingDate(Date financingDate) 
-    {
-        this.financingDate = financingDate;
-    }
-
-    public Date getFinancingDate() 
-    {
-        return financingDate;
-    }
-    public void setInvestSparkle(String investSparkle) 
-    {
-        this.investSparkle = investSparkle;
-    }
-
-    public String getInvestSparkle() 
-    {
-        return investSparkle;
-    }
-    public void setInvestValuation(String investValuation) 
-    {
-        this.investValuation = investValuation;
-    }
-
-    public String getInvestValuation() 
-    {
-        return investValuation;
-    }
-    public void setInvestMoney(String investMoney) 
-    {
-        this.investMoney = investMoney;
-    }
-
-    public String getInvestMoney() 
-    {
-        return investMoney;
-    }
-    public void setInvestType(String investType) 
-    {
-        this.investType = investType;
-    }
-
-    public String getInvestType() 
-    {
-        return investType;
-    }
-    public void setInvestPloy(String investPloy) 
-    {
-        this.investPloy = investPloy;
-    }
-
-    public String getInvestPloy() 
-    {
-        return investPloy;
-    }
-    public void setInvestWorth(String investWorth) 
-    {
-        this.investWorth = investWorth;
-    }
-
-    public String getInvestWorth() 
-    {
-        return investWorth;
-    }
-    public void setShareholding(String shareholding) 
-    {
-        this.shareholding = shareholding;
-    }
-
-    public String getShareholding() 
-    {
-        return shareholding;
-    }
-    public void setProjectStage(String projectStage) 
-    {
-        this.projectStage = projectStage;
-    }
-
-    public String getProjectStage() 
-    {
-        return projectStage;
-    }
-    public void setProjectState(String projectState) 
-    {
-        this.projectState = projectState;
-    }
-
-    public String getProjectState() 
-    {
-        return projectState;
-    }
-    public void setMark(String mark) 
-    {
-        this.mark = mark;
-    }
-
-    public String getMark() 
-    {
-        return mark;
-    }
-    public void setDelFlag(String delFlag) 
-    {
-        this.delFlag = delFlag;
-    }
-
-    public String getDelFlag() 
-    {
-        return delFlag;
-    }
-
-    @Override
-    public String toString() {
-        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
-            .append("id", getId())
-            .append("porjectName", getPorjectName())
-            .append("porjectGroup", getPorjectGroup())
-            .append("recordDate", getRecordDate())
-            .append("porjectCode", getPorjectCode())
-            .append("channel", getChannel())
-            .append("contactDate", getContactDate())
-            .append("projectDate", getProjectDate())
-            .append("decisionDate", getDecisionDate())
-            .append("industry", getIndustry())
-            .append("company", getCompany())
-            .append("description", getDescription())
-            .append("projectContacts", getProjectContacts())
-            .append("investHead", getInvestHead())
-            .append("previousFinancing", getPreviousFinancing())
-            .append("financingStage", getFinancingStage())
-            .append("financingCondition", getFinancingCondition())
-            .append("financingMoney", getFinancingMoney())
-            .append("financingDate", getFinancingDate())
-            .append("investSparkle", getInvestSparkle())
-            .append("investValuation", getInvestValuation())
-            .append("investMoney", getInvestMoney())
-            .append("investType", getInvestType())
-            .append("investPloy", getInvestPloy())
-            .append("investWorth", getInvestWorth())
-            .append("shareholding", getShareholding())
-            .append("projectStage", getProjectStage())
-            .append("projectState", getProjectState())
-            .append("mark", getMark())
-            .append("delFlag", getDelFlag())
-            .append("createBy", getCreateBy())
-            .append("createTime", getCreateTime())
-            .append("updateBy", getUpdateBy())
-            .append("updateTime", getUpdateTime())
-            .toString();
-    }
-}
+package com.ruoyi.invest.domain;
+
+import java.util.Date;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import com.ruoyi.common.annotation.Excel;
+import com.ruoyi.common.core.domain.BaseEntity;
+
+/**
+ * 项目池对象 t_project_pool
+ * 
+ * @author ruoyi
+ * @date 2024-02-21
+ */
+public class TProjectPool extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 主键id */
+
+    private String id;
+
+    /** 项目名称 */
+    @Excel(name = "项目名称")
+    private String porjectName;
+
+    /** 所属组别 */
+    @Excel(name = "所属组别")
+    private String porjectGroup;
+
+    /** 录入日期 */
+    private Date recordDate;
+
+    /** 项目编号 */
+    @Excel(name = "项目编号")
+    private String porjectCode;
+
+    /** 渠道 */
+    @Excel(name = "渠道")
+    private String channel;
+
+    /** 初次接触日期 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "初次接触日期", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date contactDate;
+
+    /** 立项通过日期 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "立项通过日期", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date projectDate;
+
+    /** 投决通过日期 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "投决通过日期", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date decisionDate;
+
+    /** 项目所属行业 */
+    @Excel(name = "项目所属行业")
+    private String industry;
+
+    /** 项目所属公司 */
+    @Excel(name = "项目所属公司")
+    private String company;
+
+    /** 项目情况描述 */
+    private String description;
+
+    /** 项目联系人 */
+    @Excel(name = "项目联系人")
+    private String projectContacts;
+
+    /** 投资负责人 */
+    @Excel(name = "投资负责人")
+    private String investHead;
+
+    /** 历次融资 */
+    @Excel(name = "历次融资")
+    private String previousFinancing;
+
+    /** 项目融资阶段 */
+    @Excel(name = "项目融资阶段")
+    private String financingStage;
+
+    /** 融资条件 */
+    private String financingCondition;
+
+    /** 预期融资金额(万元) */
+    @Excel(name = "预期融资金额", readConverterExp = "万=元")
+    private String financingMoney;
+
+    /** 预期融资时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "预期融资时间", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date financingDate;
+
+    /** 投资亮点 */
+    private String investSparkle;
+
+    /** 投前估值(万元) */
+    @Excel(name = "投前估值", readConverterExp = "万=元")
+    private String investValuation;
+
+    /** 预计投资金额(万元) */
+    @Excel(name = "预计投资金额", readConverterExp = "万=元")
+    private String investMoney;
+
+    /** 投资类型 */
+    @Excel(name = "投资类型")
+    private String investType;
+
+    /** 投资策略 */
+    @Excel(name = "投资策略")
+    private String investPloy;
+
+    /** 投资价值 */
+    @Excel(name = "投资价值")
+    private String investWorth;
+
+    /** 股权架构 */
+    private String shareholding;
+
+    /** 项目阶段 */
+    @Excel(name = "项目阶段")
+    private String projectStage;
+
+    /** 项目状态 */
+    @Excel(name = "项目状态")
+    private String projectState;
+
+    /** 备注 */
+    private String mark;
+
+    /** 状态 */
+    private String delFlag;
+
+    public void setId(String id) 
+    {
+        this.id = id;
+    }
+
+    public String getId() 
+    {
+        return id;
+    }
+    public void setPorjectName(String porjectName) 
+    {
+        this.porjectName = porjectName;
+    }
+
+    public String getPorjectName() 
+    {
+        return porjectName;
+    }
+    public void setPorjectGroup(String porjectGroup) 
+    {
+        this.porjectGroup = porjectGroup;
+    }
+
+    public String getPorjectGroup() 
+    {
+        return porjectGroup;
+    }
+    public void setRecordDate(Date recordDate) 
+    {
+        this.recordDate = recordDate;
+    }
+
+    public Date getRecordDate() 
+    {
+        return recordDate;
+    }
+    public void setPorjectCode(String porjectCode) 
+    {
+        this.porjectCode = porjectCode;
+    }
+
+    public String getPorjectCode() 
+    {
+        return porjectCode;
+    }
+    public void setChannel(String channel) 
+    {
+        this.channel = channel;
+    }
+
+    public String getChannel() 
+    {
+        return channel;
+    }
+    public void setContactDate(Date contactDate) 
+    {
+        this.contactDate = contactDate;
+    }
+
+    public Date getContactDate() 
+    {
+        return contactDate;
+    }
+    public void setProjectDate(Date projectDate) 
+    {
+        this.projectDate = projectDate;
+    }
+
+    public Date getProjectDate() 
+    {
+        return projectDate;
+    }
+    public void setDecisionDate(Date decisionDate) 
+    {
+        this.decisionDate = decisionDate;
+    }
+
+    public Date getDecisionDate() 
+    {
+        return decisionDate;
+    }
+    public void setIndustry(String industry) 
+    {
+        this.industry = industry;
+    }
+
+    public String getIndustry() 
+    {
+        return industry;
+    }
+    public void setCompany(String company) 
+    {
+        this.company = company;
+    }
+
+    public String getCompany() 
+    {
+        return company;
+    }
+    public void setDescription(String description) 
+    {
+        this.description = description;
+    }
+
+    public String getDescription() 
+    {
+        return description;
+    }
+    public void setProjectContacts(String projectContacts) 
+    {
+        this.projectContacts = projectContacts;
+    }
+
+    public String getProjectContacts() 
+    {
+        return projectContacts;
+    }
+    public void setInvestHead(String investHead) 
+    {
+        this.investHead = investHead;
+    }
+
+    public String getInvestHead() 
+    {
+        return investHead;
+    }
+    public void setPreviousFinancing(String previousFinancing) 
+    {
+        this.previousFinancing = previousFinancing;
+    }
+
+    public String getPreviousFinancing() 
+    {
+        return previousFinancing;
+    }
+    public void setFinancingStage(String financingStage) 
+    {
+        this.financingStage = financingStage;
+    }
+
+    public String getFinancingStage() 
+    {
+        return financingStage;
+    }
+    public void setFinancingCondition(String financingCondition) 
+    {
+        this.financingCondition = financingCondition;
+    }
+
+    public String getFinancingCondition() 
+    {
+        return financingCondition;
+    }
+    public void setFinancingMoney(String financingMoney) 
+    {
+        this.financingMoney = financingMoney;
+    }
+
+    public String getFinancingMoney() 
+    {
+        return financingMoney;
+    }
+    public void setFinancingDate(Date financingDate) 
+    {
+        this.financingDate = financingDate;
+    }
+
+    public Date getFinancingDate() 
+    {
+        return financingDate;
+    }
+    public void setInvestSparkle(String investSparkle) 
+    {
+        this.investSparkle = investSparkle;
+    }
+
+    public String getInvestSparkle() 
+    {
+        return investSparkle;
+    }
+    public void setInvestValuation(String investValuation) 
+    {
+        this.investValuation = investValuation;
+    }
+
+    public String getInvestValuation() 
+    {
+        return investValuation;
+    }
+    public void setInvestMoney(String investMoney) 
+    {
+        this.investMoney = investMoney;
+    }
+
+    public String getInvestMoney() 
+    {
+        return investMoney;
+    }
+    public void setInvestType(String investType) 
+    {
+        this.investType = investType;
+    }
+
+    public String getInvestType() 
+    {
+        return investType;
+    }
+    public void setInvestPloy(String investPloy) 
+    {
+        this.investPloy = investPloy;
+    }
+
+    public String getInvestPloy() 
+    {
+        return investPloy;
+    }
+    public void setInvestWorth(String investWorth) 
+    {
+        this.investWorth = investWorth;
+    }
+
+    public String getInvestWorth() 
+    {
+        return investWorth;
+    }
+    public void setShareholding(String shareholding) 
+    {
+        this.shareholding = shareholding;
+    }
+
+    public String getShareholding() 
+    {
+        return shareholding;
+    }
+    public void setProjectStage(String projectStage) 
+    {
+        this.projectStage = projectStage;
+    }
+
+    public String getProjectStage() 
+    {
+        return projectStage;
+    }
+    public void setProjectState(String projectState) 
+    {
+        this.projectState = projectState;
+    }
+
+    public String getProjectState() 
+    {
+        return projectState;
+    }
+    public void setMark(String mark) 
+    {
+        this.mark = mark;
+    }
+
+    public String getMark() 
+    {
+        return mark;
+    }
+    public void setDelFlag(String delFlag) 
+    {
+        this.delFlag = delFlag;
+    }
+
+    public String getDelFlag() 
+    {
+        return delFlag;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("id", getId())
+            .append("porjectName", getPorjectName())
+            .append("porjectGroup", getPorjectGroup())
+            .append("recordDate", getRecordDate())
+            .append("porjectCode", getPorjectCode())
+            .append("channel", getChannel())
+            .append("contactDate", getContactDate())
+            .append("projectDate", getProjectDate())
+            .append("decisionDate", getDecisionDate())
+            .append("industry", getIndustry())
+            .append("company", getCompany())
+            .append("description", getDescription())
+            .append("projectContacts", getProjectContacts())
+            .append("investHead", getInvestHead())
+            .append("previousFinancing", getPreviousFinancing())
+            .append("financingStage", getFinancingStage())
+            .append("financingCondition", getFinancingCondition())
+            .append("financingMoney", getFinancingMoney())
+            .append("financingDate", getFinancingDate())
+            .append("investSparkle", getInvestSparkle())
+            .append("investValuation", getInvestValuation())
+            .append("investMoney", getInvestMoney())
+            .append("investType", getInvestType())
+            .append("investPloy", getInvestPloy())
+            .append("investWorth", getInvestWorth())
+            .append("shareholding", getShareholding())
+            .append("projectStage", getProjectStage())
+            .append("projectState", getProjectState())
+            .append("mark", getMark())
+            .append("delFlag", getDelFlag())
+            .append("createBy", getCreateBy())
+            .append("createTime", getCreateTime())
+            .append("updateBy", getUpdateBy())
+            .append("updateTime", getUpdateTime())
+            .toString();
+    }
+}

+ 1 - 1
ruoyi-system/src/main/java/com/ruoyi/system/domain/invest/TProjectRecord.java

@@ -1,4 +1,4 @@
-package com.ruoyi.system.domain.invest;
+package com.ruoyi.invest.domain;
 
 import java.util.Date;
 import com.fasterxml.jackson.annotation.JsonFormat;

+ 500 - 0
ruoyi-system/src/main/java/com/ruoyi/invest/domain/TProjectScoring.java

@@ -0,0 +1,500 @@
+package com.ruoyi.invest.domain;
+
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import com.ruoyi.common.annotation.Excel;
+import com.ruoyi.common.core.domain.BaseEntity;
+
+/**
+ * 打分对象 t_project_scoring
+ * 
+ * @author ruoyi
+ * @date 2024-02-23
+ */
+public class TProjectScoring extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 主键ID */
+    private String id;
+
+    /** 项目ID */
+    @Excel(name = "项目ID")
+    private String projectPoolId;
+
+    /** 投资总监 */
+    @Excel(name = "投资总监")
+    private String investCommissioner;
+
+    /** 打分人 */
+    @Excel(name = "打分人")
+    private String scoringPerson;
+
+    /** 类型(1:立项;2:投决) */
+    @Excel(name = "类型", readConverterExp = "1=:立项;2:投决")
+    private String type;
+
+    /** 产业优势- */
+    private String industryAdvantage;
+
+    /** 产业优势-备注 */
+    private String industryAdvantageNote;
+
+    /** 商业模式- */
+    private String businessModel;
+
+    /** 商业模式-备注 */
+    private String businessModelNote;
+
+    /** 核心团队优秀- */
+    private String teamExperience;
+
+    /** 核心团队优秀-备注 */
+    private String teamExperienceNote;
+
+    /** 核心团队优秀- */
+    private String teamBackground;
+
+    /** 核心团队优秀-备注 */
+    private String teamBackgroundNote;
+
+    /** 核心团队优秀- */
+    private String teamHeart;
+
+    /** 核心团队优秀-备注 */
+    private String teamHeartNote;
+
+    /** 核心团队优秀- */
+    private String teamFaith;
+
+    /** 核心团队优秀-备注 */
+    private String teamFaithNote;
+
+    /** 初步产品原型- */
+    private String productBase;
+
+    /** 初步产品原型-备注 */
+    private String productBaseNote;
+
+    /** 初步产品原型- */
+    private String productProfit;
+
+    /** 初步产品原型-备注 */
+    private String productProfitNote;
+
+    /** 机构认可- */
+    private String organInvest;
+
+    /** 机构认可-备注 */
+    private String organInvestNote;
+
+    /** 机构认可- */
+    private String organValuation;
+
+    /** 机构认可-备注 */
+    private String organValuationNote;
+
+    /** 估值 */
+    private String valuation;
+
+    /** 估值-备注 */
+    private String valuationNote;
+
+    /** 市场空间大 */
+    private String marketSpace;
+
+    /** 市场空间大-备注 */
+    private String marketSpaceNote;
+
+    /** 成长空间大 */
+    private String developSpace;
+
+    /** 成长空间大-备注 */
+    private String developSpaceNote;
+
+    /** 退出方式 */
+    private String quitWay;
+
+    /** 退出方式-备注 */
+    private String quitWayNote;
+
+    /** 描述 */
+    private String illustrate;
+
+    /** 是否同意 */
+    private String examine;
+
+    /** 状态 */
+    private String delFlag;
+
+    public void setId(String id) 
+    {
+        this.id = id;
+    }
+
+    public String getId() 
+    {
+        return id;
+    }
+    public void setProjectPoolId(String projectPoolId) 
+    {
+        this.projectPoolId = projectPoolId;
+    }
+
+    public String getProjectPoolId() 
+    {
+        return projectPoolId;
+    }
+    public void setInvestCommissioner(String investCommissioner) 
+    {
+        this.investCommissioner = investCommissioner;
+    }
+
+    public String getInvestCommissioner() 
+    {
+        return investCommissioner;
+    }
+    public void setScoringPerson(String scoringPerson) 
+    {
+        this.scoringPerson = scoringPerson;
+    }
+
+    public String getScoringPerson() 
+    {
+        return scoringPerson;
+    }
+    public void setType(String type) 
+    {
+        this.type = type;
+    }
+
+    public String getType() 
+    {
+        return type;
+    }
+    public void setIndustryAdvantage(String industryAdvantage) 
+    {
+        this.industryAdvantage = industryAdvantage;
+    }
+
+    public String getIndustryAdvantage() 
+    {
+        return industryAdvantage;
+    }
+    public void setIndustryAdvantageNote(String industryAdvantageNote) 
+    {
+        this.industryAdvantageNote = industryAdvantageNote;
+    }
+
+    public String getIndustryAdvantageNote() 
+    {
+        return industryAdvantageNote;
+    }
+    public void setBusinessModel(String businessModel) 
+    {
+        this.businessModel = businessModel;
+    }
+
+    public String getBusinessModel() 
+    {
+        return businessModel;
+    }
+    public void setBusinessModelNote(String businessModelNote) 
+    {
+        this.businessModelNote = businessModelNote;
+    }
+
+    public String getBusinessModelNote() 
+    {
+        return businessModelNote;
+    }
+    public void setTeamExperience(String teamExperience) 
+    {
+        this.teamExperience = teamExperience;
+    }
+
+    public String getTeamExperience() 
+    {
+        return teamExperience;
+    }
+    public void setTeamExperienceNote(String teamExperienceNote) 
+    {
+        this.teamExperienceNote = teamExperienceNote;
+    }
+
+    public String getTeamExperienceNote() 
+    {
+        return teamExperienceNote;
+    }
+    public void setTeamBackground(String teamBackground) 
+    {
+        this.teamBackground = teamBackground;
+    }
+
+    public String getTeamBackground() 
+    {
+        return teamBackground;
+    }
+    public void setTeamBackgroundNote(String teamBackgroundNote) 
+    {
+        this.teamBackgroundNote = teamBackgroundNote;
+    }
+
+    public String getTeamBackgroundNote() 
+    {
+        return teamBackgroundNote;
+    }
+    public void setTeamHeart(String teamHeart) 
+    {
+        this.teamHeart = teamHeart;
+    }
+
+    public String getTeamHeart() 
+    {
+        return teamHeart;
+    }
+    public void setTeamHeartNote(String teamHeartNote) 
+    {
+        this.teamHeartNote = teamHeartNote;
+    }
+
+    public String getTeamHeartNote() 
+    {
+        return teamHeartNote;
+    }
+    public void setTeamFaith(String teamFaith) 
+    {
+        this.teamFaith = teamFaith;
+    }
+
+    public String getTeamFaith() 
+    {
+        return teamFaith;
+    }
+    public void setTeamFaithNote(String teamFaithNote) 
+    {
+        this.teamFaithNote = teamFaithNote;
+    }
+
+    public String getTeamFaithNote() 
+    {
+        return teamFaithNote;
+    }
+    public void setProductBase(String productBase) 
+    {
+        this.productBase = productBase;
+    }
+
+    public String getProductBase() 
+    {
+        return productBase;
+    }
+    public void setProductBaseNote(String productBaseNote) 
+    {
+        this.productBaseNote = productBaseNote;
+    }
+
+    public String getProductBaseNote() 
+    {
+        return productBaseNote;
+    }
+    public void setProductProfit(String productProfit) 
+    {
+        this.productProfit = productProfit;
+    }
+
+    public String getProductProfit() 
+    {
+        return productProfit;
+    }
+    public void setProductProfitNote(String productProfitNote) 
+    {
+        this.productProfitNote = productProfitNote;
+    }
+
+    public String getProductProfitNote() 
+    {
+        return productProfitNote;
+    }
+    public void setOrganInvest(String organInvest) 
+    {
+        this.organInvest = organInvest;
+    }
+
+    public String getOrganInvest() 
+    {
+        return organInvest;
+    }
+    public void setOrganInvestNote(String organInvestNote) 
+    {
+        this.organInvestNote = organInvestNote;
+    }
+
+    public String getOrganInvestNote() 
+    {
+        return organInvestNote;
+    }
+    public void setOrganValuation(String organValuation) 
+    {
+        this.organValuation = organValuation;
+    }
+
+    public String getOrganValuation() 
+    {
+        return organValuation;
+    }
+    public void setOrganValuationNote(String organValuationNote) 
+    {
+        this.organValuationNote = organValuationNote;
+    }
+
+    public String getOrganValuationNote() 
+    {
+        return organValuationNote;
+    }
+    public void setValuation(String valuation) 
+    {
+        this.valuation = valuation;
+    }
+
+    public String getValuation() 
+    {
+        return valuation;
+    }
+    public void setValuationNote(String valuationNote) 
+    {
+        this.valuationNote = valuationNote;
+    }
+
+    public String getValuationNote() 
+    {
+        return valuationNote;
+    }
+    public void setMarketSpace(String marketSpace) 
+    {
+        this.marketSpace = marketSpace;
+    }
+
+    public String getMarketSpace() 
+    {
+        return marketSpace;
+    }
+    public void setMarketSpaceNote(String marketSpaceNote) 
+    {
+        this.marketSpaceNote = marketSpaceNote;
+    }
+
+    public String getMarketSpaceNote() 
+    {
+        return marketSpaceNote;
+    }
+    public void setDevelopSpace(String developSpace) 
+    {
+        this.developSpace = developSpace;
+    }
+
+    public String getDevelopSpace() 
+    {
+        return developSpace;
+    }
+    public void setDevelopSpaceNote(String developSpaceNote) 
+    {
+        this.developSpaceNote = developSpaceNote;
+    }
+
+    public String getDevelopSpaceNote() 
+    {
+        return developSpaceNote;
+    }
+    public void setQuitWay(String quitWay) 
+    {
+        this.quitWay = quitWay;
+    }
+
+    public String getQuitWay() 
+    {
+        return quitWay;
+    }
+    public void setQuitWayNote(String quitWayNote) 
+    {
+        this.quitWayNote = quitWayNote;
+    }
+
+    public String getQuitWayNote() 
+    {
+        return quitWayNote;
+    }
+    public void setIllustrate(String illustrate) 
+    {
+        this.illustrate = illustrate;
+    }
+
+    public String getIllustrate() 
+    {
+        return illustrate;
+    }
+    public void setExamine(String examine) 
+    {
+        this.examine = examine;
+    }
+
+    public String getExamine() 
+    {
+        return examine;
+    }
+    public void setDelFlag(String delFlag) 
+    {
+        this.delFlag = delFlag;
+    }
+
+    public String getDelFlag() 
+    {
+        return delFlag;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("id", getId())
+            .append("projectPoolId", getProjectPoolId())
+            .append("investCommissioner", getInvestCommissioner())
+            .append("scoringPerson", getScoringPerson())
+            .append("type", getType())
+            .append("industryAdvantage", getIndustryAdvantage())
+            .append("industryAdvantageNote", getIndustryAdvantageNote())
+            .append("businessModel", getBusinessModel())
+            .append("businessModelNote", getBusinessModelNote())
+            .append("teamExperience", getTeamExperience())
+            .append("teamExperienceNote", getTeamExperienceNote())
+            .append("teamBackground", getTeamBackground())
+            .append("teamBackgroundNote", getTeamBackgroundNote())
+            .append("teamHeart", getTeamHeart())
+            .append("teamHeartNote", getTeamHeartNote())
+            .append("teamFaith", getTeamFaith())
+            .append("teamFaithNote", getTeamFaithNote())
+            .append("productBase", getProductBase())
+            .append("productBaseNote", getProductBaseNote())
+            .append("productProfit", getProductProfit())
+            .append("productProfitNote", getProductProfitNote())
+            .append("organInvest", getOrganInvest())
+            .append("organInvestNote", getOrganInvestNote())
+            .append("organValuation", getOrganValuation())
+            .append("organValuationNote", getOrganValuationNote())
+            .append("valuation", getValuation())
+            .append("valuationNote", getValuationNote())
+            .append("marketSpace", getMarketSpace())
+            .append("marketSpaceNote", getMarketSpaceNote())
+            .append("developSpace", getDevelopSpace())
+            .append("developSpaceNote", getDevelopSpaceNote())
+            .append("quitWay", getQuitWay())
+            .append("quitWayNote", getQuitWayNote())
+            .append("illustrate", getIllustrate())
+            .append("examine", getExamine())
+            .append("delFlag", getDelFlag())
+            .append("createBy", getCreateBy())
+            .append("createTime", getCreateTime())
+            .append("updateBy", getUpdateBy())
+            .append("updateTime", getUpdateTime())
+            .toString();
+    }
+}

+ 2 - 2
ruoyi-system/src/main/java/com/ruoyi/system/mapper/invest/TProjectChannelMapper.java

@@ -1,6 +1,6 @@
-package com.ruoyi.system.mapper.invest;
+package com.ruoyi.invest.mapper;
 
-import com.ruoyi.system.domain.invest.TProjectChannel;
+import com.ruoyi.invest.domain.TProjectChannel;
 
 import java.util.List;
 

+ 2 - 2
ruoyi-system/src/main/java/com/ruoyi/system/mapper/invest/TProjectCompanyMapper.java

@@ -1,6 +1,6 @@
-package com.ruoyi.system.mapper.invest;
+package com.ruoyi.invest.mapper;
 
-import com.ruoyi.system.domain.invest.TProjectCompany;
+import com.ruoyi.invest.domain.TProjectCompany;
 
 import java.util.List;
 

+ 2 - 2
ruoyi-system/src/main/java/com/ruoyi/system/mapper/invest/TProjectContactsMapper.java

@@ -1,6 +1,6 @@
-package com.ruoyi.system.mapper.invest;
+package com.ruoyi.invest.mapper;
 
-import com.ruoyi.system.domain.invest.TProjectContacts;
+import com.ruoyi.invest.domain.TProjectContacts;
 
 import java.util.List;
 

+ 2 - 2
ruoyi-system/src/main/java/com/ruoyi/system/mapper/invest/TProjectInformationMapper.java

@@ -1,6 +1,6 @@
-package com.ruoyi.system.mapper.invest;
+package com.ruoyi.invest.mapper;
 
-import com.ruoyi.system.domain.invest.TProjectInformation;
+import com.ruoyi.invest.domain.TProjectInformation;
 
 import java.util.List;
 

+ 2 - 2
ruoyi-system/src/main/java/com/ruoyi/system/mapper/invest/TProjectMeetingMapper.java

@@ -1,6 +1,6 @@
-package com.ruoyi.system.mapper.invest;
+package com.ruoyi.invest.mapper;
 
-import com.ruoyi.system.domain.invest.TProjectMeeting;
+import com.ruoyi.invest.domain.TProjectMeeting;
 
 import java.util.List;
 

+ 2 - 2
ruoyi-system/src/main/java/com/ruoyi/system/mapper/invest/TProjectPoolMapper.java

@@ -1,6 +1,6 @@
-package com.ruoyi.system.mapper.invest;
+package com.ruoyi.invest.mapper;
 
-import com.ruoyi.system.domain.invest.TProjectPool;
+import com.ruoyi.invest.domain.TProjectPool;
 
 import java.util.List;
 

+ 2 - 2
ruoyi-system/src/main/java/com/ruoyi/system/mapper/invest/TProjectRecordMapper.java

@@ -1,6 +1,6 @@
-package com.ruoyi.system.mapper.invest;
+package com.ruoyi.invest.mapper;
 
-import com.ruoyi.system.domain.invest.TProjectRecord;
+import com.ruoyi.invest.domain.TProjectRecord;
 
 import java.util.List;
 

+ 61 - 0
ruoyi-system/src/main/java/com/ruoyi/invest/mapper/TProjectScoringMapper.java

@@ -0,0 +1,61 @@
+package com.ruoyi.invest.mapper;
+
+import java.util.List;
+import com.ruoyi.invest.domain.TProjectScoring;
+
+/**
+ * 打分Mapper接口
+ * 
+ * @author ruoyi
+ * @date 2024-02-23
+ */
+public interface TProjectScoringMapper 
+{
+    /**
+     * 查询打分
+     * 
+     * @param id 打分主键
+     * @return 打分
+     */
+    public TProjectScoring selectTProjectScoringById(String id);
+
+    /**
+     * 查询打分列表
+     * 
+     * @param tProjectScoring 打分
+     * @return 打分集合
+     */
+    public List<TProjectScoring> selectTProjectScoringList(TProjectScoring tProjectScoring);
+
+    /**
+     * 新增打分
+     * 
+     * @param tProjectScoring 打分
+     * @return 结果
+     */
+    public int insertTProjectScoring(TProjectScoring tProjectScoring);
+
+    /**
+     * 修改打分
+     * 
+     * @param tProjectScoring 打分
+     * @return 结果
+     */
+    public int updateTProjectScoring(TProjectScoring tProjectScoring);
+
+    /**
+     * 删除打分
+     * 
+     * @param id 打分主键
+     * @return 结果
+     */
+    public int deleteTProjectScoringById(String id);
+
+    /**
+     * 批量删除打分
+     * 
+     * @param ids 需要删除的数据主键集合
+     * @return 结果
+     */
+    public int deleteTProjectScoringByIds(String[] ids);
+}

+ 62 - 62
ruoyi-system/src/main/java/com/ruoyi/system/service/invest/ITProjectChannelService.java

@@ -1,62 +1,62 @@
-package com.ruoyi.system.service.invest;
-
-import com.ruoyi.system.domain.invest.TProjectChannel;
-
-import java.util.List;
-
-/**
- * 渠道信息Service接口
- * 
- * @author ruoyi
- * @date 2024-02-22
- */
-public interface ITProjectChannelService 
-{
-    /**
-     * 查询渠道信息
-     * 
-     * @param id 渠道信息主键
-     * @return 渠道信息
-     */
-    public TProjectChannel selectTProjectChannelById(String id);
-
-    /**
-     * 查询渠道信息列表
-     * 
-     * @param tProjectChannel 渠道信息
-     * @return 渠道信息集合
-     */
-    public List<TProjectChannel> selectTProjectChannelList(TProjectChannel tProjectChannel);
-
-    /**
-     * 新增渠道信息
-     * 
-     * @param tProjectChannel 渠道信息
-     * @return 结果
-     */
-    public int insertTProjectChannel(TProjectChannel tProjectChannel);
-
-    /**
-     * 修改渠道信息
-     * 
-     * @param tProjectChannel 渠道信息
-     * @return 结果
-     */
-    public int updateTProjectChannel(TProjectChannel tProjectChannel);
-
-    /**
-     * 批量删除渠道信息
-     * 
-     * @param ids 需要删除的渠道信息主键集合
-     * @return 结果
-     */
-    public int deleteTProjectChannelByIds(String[] ids);
-
-    /**
-     * 删除渠道信息信息
-     * 
-     * @param id 渠道信息主键
-     * @return 结果
-     */
-    public int deleteTProjectChannelById(String id);
-}
+package com.ruoyi.invest.service;
+
+import com.ruoyi.invest.domain.TProjectChannel;
+
+import java.util.List;
+
+/**
+ * 渠道信息Service接口
+ * 
+ * @author ruoyi
+ * @date 2024-02-22
+ */
+public interface ITProjectChannelService 
+{
+    /**
+     * 查询渠道信息
+     * 
+     * @param id 渠道信息主键
+     * @return 渠道信息
+     */
+    public TProjectChannel selectTProjectChannelById(String id);
+
+    /**
+     * 查询渠道信息列表
+     * 
+     * @param tProjectChannel 渠道信息
+     * @return 渠道信息集合
+     */
+    public List<TProjectChannel> selectTProjectChannelList(TProjectChannel tProjectChannel);
+
+    /**
+     * 新增渠道信息
+     * 
+     * @param tProjectChannel 渠道信息
+     * @return 结果
+     */
+    public int insertTProjectChannel(TProjectChannel tProjectChannel);
+
+    /**
+     * 修改渠道信息
+     * 
+     * @param tProjectChannel 渠道信息
+     * @return 结果
+     */
+    public int updateTProjectChannel(TProjectChannel tProjectChannel);
+
+    /**
+     * 批量删除渠道信息
+     * 
+     * @param ids 需要删除的渠道信息主键集合
+     * @return 结果
+     */
+    public int deleteTProjectChannelByIds(String[] ids);
+
+    /**
+     * 删除渠道信息信息
+     * 
+     * @param id 渠道信息主键
+     * @return 结果
+     */
+    public int deleteTProjectChannelById(String id);
+}

+ 62 - 62
ruoyi-system/src/main/java/com/ruoyi/system/service/invest/ITProjectCompanyService.java

@@ -1,62 +1,62 @@
-package com.ruoyi.system.service.invest;
-
-import com.ruoyi.system.domain.invest.TProjectCompany;
-
-import java.util.List;
-
-/**
- * 项目公司信息Service接口
- * 
- * @author ruoyi
- * @date 2024-02-22
- */
-public interface ITProjectCompanyService 
-{
-    /**
-     * 查询项目公司信息
-     * 
-     * @param id 项目公司信息主键
-     * @return 项目公司信息
-     */
-    public TProjectCompany selectTProjectCompanyById(String id);
-
-    /**
-     * 查询项目公司信息列表
-     * 
-     * @param tProjectCompany 项目公司信息
-     * @return 项目公司信息集合
-     */
-    public List<TProjectCompany> selectTProjectCompanyList(TProjectCompany tProjectCompany);
-
-    /**
-     * 新增项目公司信息
-     * 
-     * @param tProjectCompany 项目公司信息
-     * @return 结果
-     */
-    public int insertTProjectCompany(TProjectCompany tProjectCompany);
-
-    /**
-     * 修改项目公司信息
-     * 
-     * @param tProjectCompany 项目公司信息
-     * @return 结果
-     */
-    public int updateTProjectCompany(TProjectCompany tProjectCompany);
-
-    /**
-     * 批量删除项目公司信息
-     * 
-     * @param ids 需要删除的项目公司信息主键集合
-     * @return 结果
-     */
-    public int deleteTProjectCompanyByIds(String[] ids);
-
-    /**
-     * 删除项目公司信息信息
-     * 
-     * @param id 项目公司信息主键
-     * @return 结果
-     */
-    public int deleteTProjectCompanyById(String id);
-}
+package com.ruoyi.invest.service;
+
+import com.ruoyi.invest.domain.TProjectCompany;
+
+import java.util.List;
+
+/**
+ * 项目公司信息Service接口
+ * 
+ * @author ruoyi
+ * @date 2024-02-22
+ */
+public interface ITProjectCompanyService 
+{
+    /**
+     * 查询项目公司信息
+     * 
+     * @param id 项目公司信息主键
+     * @return 项目公司信息
+     */
+    public TProjectCompany selectTProjectCompanyById(String id);
+
+    /**
+     * 查询项目公司信息列表
+     * 
+     * @param tProjectCompany 项目公司信息
+     * @return 项目公司信息集合
+     */
+    public List<TProjectCompany> selectTProjectCompanyList(TProjectCompany tProjectCompany);
+
+    /**
+     * 新增项目公司信息
+     * 
+     * @param tProjectCompany 项目公司信息
+     * @return 结果
+     */
+    public int insertTProjectCompany(TProjectCompany tProjectCompany);
+
+    /**
+     * 修改项目公司信息
+     * 
+     * @param tProjectCompany 项目公司信息
+     * @return 结果
+     */
+    public int updateTProjectCompany(TProjectCompany tProjectCompany);
+
+    /**
+     * 批量删除项目公司信息
+     * 
+     * @param ids 需要删除的项目公司信息主键集合
+     * @return 结果
+     */
+    public int deleteTProjectCompanyByIds(String[] ids);
+
+    /**
+     * 删除项目公司信息信息
+     * 
+     * @param id 项目公司信息主键
+     * @return 结果
+     */
+    public int deleteTProjectCompanyById(String id);
+}

+ 62 - 62
ruoyi-system/src/main/java/com/ruoyi/system/service/invest/ITProjectContactsService.java

@@ -1,62 +1,62 @@
-package com.ruoyi.system.service.invest;
-
-import com.ruoyi.system.domain.invest.TProjectContacts;
-
-import java.util.List;
-
-/**
- * 项目联系人Service接口
- * 
- * @author ruoyi
- * @date 2024-02-22
- */
-public interface ITProjectContactsService 
-{
-    /**
-     * 查询项目联系人
-     * 
-     * @param id 项目联系人主键
-     * @return 项目联系人
-     */
-    public TProjectContacts selectTProjectContactsById(String id);
-
-    /**
-     * 查询项目联系人列表
-     * 
-     * @param tProjectContacts 项目联系人
-     * @return 项目联系人集合
-     */
-    public List<TProjectContacts> selectTProjectContactsList(TProjectContacts tProjectContacts);
-
-    /**
-     * 新增项目联系人
-     * 
-     * @param tProjectContacts 项目联系人
-     * @return 结果
-     */
-    public int insertTProjectContacts(TProjectContacts tProjectContacts);
-
-    /**
-     * 修改项目联系人
-     * 
-     * @param tProjectContacts 项目联系人
-     * @return 结果
-     */
-    public int updateTProjectContacts(TProjectContacts tProjectContacts);
-
-    /**
-     * 批量删除项目联系人
-     * 
-     * @param ids 需要删除的项目联系人主键集合
-     * @return 结果
-     */
-    public int deleteTProjectContactsByIds(String[] ids);
-
-    /**
-     * 删除项目联系人信息
-     * 
-     * @param id 项目联系人主键
-     * @return 结果
-     */
-    public int deleteTProjectContactsById(String id);
-}
+package com.ruoyi.invest.service;
+
+import com.ruoyi.invest.domain.TProjectContacts;
+
+import java.util.List;
+
+/**
+ * 项目联系人Service接口
+ * 
+ * @author ruoyi
+ * @date 2024-02-22
+ */
+public interface ITProjectContactsService 
+{
+    /**
+     * 查询项目联系人
+     * 
+     * @param id 项目联系人主键
+     * @return 项目联系人
+     */
+    public TProjectContacts selectTProjectContactsById(String id);
+
+    /**
+     * 查询项目联系人列表
+     * 
+     * @param tProjectContacts 项目联系人
+     * @return 项目联系人集合
+     */
+    public List<TProjectContacts> selectTProjectContactsList(TProjectContacts tProjectContacts);
+
+    /**
+     * 新增项目联系人
+     * 
+     * @param tProjectContacts 项目联系人
+     * @return 结果
+     */
+    public int insertTProjectContacts(TProjectContacts tProjectContacts);
+
+    /**
+     * 修改项目联系人
+     * 
+     * @param tProjectContacts 项目联系人
+     * @return 结果
+     */
+    public int updateTProjectContacts(TProjectContacts tProjectContacts);
+
+    /**
+     * 批量删除项目联系人
+     * 
+     * @param ids 需要删除的项目联系人主键集合
+     * @return 结果
+     */
+    public int deleteTProjectContactsByIds(String[] ids);
+
+    /**
+     * 删除项目联系人信息
+     * 
+     * @param id 项目联系人主键
+     * @return 结果
+     */
+    public int deleteTProjectContactsById(String id);
+}

+ 2 - 2
ruoyi-system/src/main/java/com/ruoyi/system/service/invest/ITProjectInformationService.java

@@ -1,6 +1,6 @@
-package com.ruoyi.system.service.invest;
+package com.ruoyi.invest.service;
 
-import com.ruoyi.system.domain.invest.TProjectInformation;
+import com.ruoyi.invest.domain.TProjectInformation;
 
 import java.util.List;
 

+ 62 - 62
ruoyi-system/src/main/java/com/ruoyi/system/service/invest/ITProjectMeetingService.java

@@ -1,62 +1,62 @@
-package com.ruoyi.system.service.invest;
-
-import com.ruoyi.system.domain.invest.TProjectMeeting;
-
-import java.util.List;
-
-/**
- * 会议记录Service接口
- * 
- * @author ruoyi
- * @date 2024-02-22
- */
-public interface ITProjectMeetingService 
-{
-    /**
-     * 查询会议记录
-     * 
-     * @param id 会议记录主键
-     * @return 会议记录
-     */
-    public TProjectMeeting selectTProjectMeetingById(String id);
-
-    /**
-     * 查询会议记录列表
-     * 
-     * @param tProjectMeeting 会议记录
-     * @return 会议记录集合
-     */
-    public List<TProjectMeeting> selectTProjectMeetingList(TProjectMeeting tProjectMeeting);
-
-    /**
-     * 新增会议记录
-     * 
-     * @param tProjectMeeting 会议记录
-     * @return 结果
-     */
-    public int insertTProjectMeeting(TProjectMeeting tProjectMeeting);
-
-    /**
-     * 修改会议记录
-     * 
-     * @param tProjectMeeting 会议记录
-     * @return 结果
-     */
-    public int updateTProjectMeeting(TProjectMeeting tProjectMeeting);
-
-    /**
-     * 批量删除会议记录
-     * 
-     * @param ids 需要删除的会议记录主键集合
-     * @return 结果
-     */
-    public int deleteTProjectMeetingByIds(String[] ids);
-
-    /**
-     * 删除会议记录信息
-     * 
-     * @param id 会议记录主键
-     * @return 结果
-     */
-    public int deleteTProjectMeetingById(String id);
-}
+package com.ruoyi.invest.service;
+
+import com.ruoyi.invest.domain.TProjectMeeting;
+
+import java.util.List;
+
+/**
+ * 会议记录Service接口
+ * 
+ * @author ruoyi
+ * @date 2024-02-22
+ */
+public interface ITProjectMeetingService 
+{
+    /**
+     * 查询会议记录
+     * 
+     * @param id 会议记录主键
+     * @return 会议记录
+     */
+    public TProjectMeeting selectTProjectMeetingById(String id);
+
+    /**
+     * 查询会议记录列表
+     * 
+     * @param tProjectMeeting 会议记录
+     * @return 会议记录集合
+     */
+    public List<TProjectMeeting> selectTProjectMeetingList(TProjectMeeting tProjectMeeting);
+
+    /**
+     * 新增会议记录
+     * 
+     * @param tProjectMeeting 会议记录
+     * @return 结果
+     */
+    public int insertTProjectMeeting(TProjectMeeting tProjectMeeting);
+
+    /**
+     * 修改会议记录
+     * 
+     * @param tProjectMeeting 会议记录
+     * @return 结果
+     */
+    public int updateTProjectMeeting(TProjectMeeting tProjectMeeting);
+
+    /**
+     * 批量删除会议记录
+     * 
+     * @param ids 需要删除的会议记录主键集合
+     * @return 结果
+     */
+    public int deleteTProjectMeetingByIds(String[] ids);
+
+    /**
+     * 删除会议记录信息
+     * 
+     * @param id 会议记录主键
+     * @return 结果
+     */
+    public int deleteTProjectMeetingById(String id);
+}

+ 2 - 2
ruoyi-system/src/main/java/com/ruoyi/system/service/invest/ITProjectPoolService.java

@@ -1,6 +1,6 @@
-package com.ruoyi.system.service.invest;
+package com.ruoyi.invest.service;
 
-import com.ruoyi.system.domain.invest.TProjectPool;
+import com.ruoyi.invest.domain.TProjectPool;
 
 import java.util.List;
 

+ 2 - 2
ruoyi-system/src/main/java/com/ruoyi/system/service/invest/ITProjectRecordService.java

@@ -1,6 +1,6 @@
-package com.ruoyi.system.service.invest;
+package com.ruoyi.invest.service;
 
-import com.ruoyi.system.domain.invest.TProjectRecord;
+import com.ruoyi.invest.domain.TProjectRecord;
 
 import java.util.List;
 

+ 61 - 0
ruoyi-system/src/main/java/com/ruoyi/invest/service/ITProjectScoringService.java

@@ -0,0 +1,61 @@
+package com.ruoyi.invest.service;
+
+import java.util.List;
+import com.ruoyi.invest.domain.TProjectScoring;
+
+/**
+ * 打分Service接口
+ * 
+ * @author ruoyi
+ * @date 2024-02-23
+ */
+public interface ITProjectScoringService 
+{
+    /**
+     * 查询打分
+     * 
+     * @param id 打分主键
+     * @return 打分
+     */
+    public TProjectScoring selectTProjectScoringById(String id);
+
+    /**
+     * 查询打分列表
+     * 
+     * @param tProjectScoring 打分
+     * @return 打分集合
+     */
+    public List<TProjectScoring> selectTProjectScoringList(TProjectScoring tProjectScoring);
+
+    /**
+     * 新增打分
+     * 
+     * @param tProjectScoring 打分
+     * @return 结果
+     */
+    public int insertTProjectScoring(TProjectScoring tProjectScoring);
+
+    /**
+     * 修改打分
+     * 
+     * @param tProjectScoring 打分
+     * @return 结果
+     */
+    public int updateTProjectScoring(TProjectScoring tProjectScoring);
+
+    /**
+     * 批量删除打分
+     * 
+     * @param ids 需要删除的打分主键集合
+     * @return 结果
+     */
+    public int deleteTProjectScoringByIds(String[] ids);
+
+    /**
+     * 删除打分信息
+     * 
+     * @param id 打分主键
+     * @return 结果
+     */
+    public int deleteTProjectScoringById(String id);
+}

+ 98 - 98
ruoyi-system/src/main/java/com/ruoyi/system/service/invest/impl/TProjectChannelServiceImpl.java

@@ -1,98 +1,98 @@
-package com.ruoyi.system.service.invest.impl;
-
-import java.util.List;
-import com.ruoyi.common.utils.DateUtils;
-import com.ruoyi.common.utils.uuid.IdUtils;
-import com.ruoyi.system.domain.invest.TProjectChannel;
-import com.ruoyi.system.mapper.invest.TProjectChannelMapper;
-import com.ruoyi.system.service.invest.ITProjectChannelService;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
-/**
- * 渠道信息Service业务层处理
- * 
- * @author ruoyi
- * @date 2024-02-22
- */
-@Service
-public class TProjectChannelServiceImpl implements ITProjectChannelService
-{
-    @Autowired
-    private TProjectChannelMapper tProjectChannelMapper;
-
-    /**
-     * 查询渠道信息
-     * 
-     * @param id 渠道信息主键
-     * @return 渠道信息
-     */
-    @Override
-    public TProjectChannel selectTProjectChannelById(String id)
-    {
-        return tProjectChannelMapper.selectTProjectChannelById(id);
-    }
-
-    /**
-     * 查询渠道信息列表
-     * 
-     * @param tProjectChannel 渠道信息
-     * @return 渠道信息
-     */
-    @Override
-    public List<TProjectChannel> selectTProjectChannelList(TProjectChannel tProjectChannel)
-    {
-        return tProjectChannelMapper.selectTProjectChannelList(tProjectChannel);
-    }
-
-    /**
-     * 新增渠道信息
-     * 
-     * @param tProjectChannel 渠道信息
-     * @return 结果
-     */
-    @Override
-    public int insertTProjectChannel(TProjectChannel tProjectChannel)
-    {
-        tProjectChannel.setCreateTime(DateUtils.getNowDate());
-        tProjectChannel.setId(IdUtils.fastSimpleUUID());
-        return tProjectChannelMapper.insertTProjectChannel(tProjectChannel);
-    }
-
-    /**
-     * 修改渠道信息
-     * 
-     * @param tProjectChannel 渠道信息
-     * @return 结果
-     */
-    @Override
-    public int updateTProjectChannel(TProjectChannel tProjectChannel)
-    {
-        tProjectChannel.setUpdateTime(DateUtils.getNowDate());
-        return tProjectChannelMapper.updateTProjectChannel(tProjectChannel);
-    }
-
-    /**
-     * 批量删除渠道信息
-     * 
-     * @param ids 需要删除的渠道信息主键
-     * @return 结果
-     */
-    @Override
-    public int deleteTProjectChannelByIds(String[] ids)
-    {
-        return tProjectChannelMapper.deleteTProjectChannelByIds(ids);
-    }
-
-    /**
-     * 删除渠道信息信息
-     * 
-     * @param id 渠道信息主键
-     * @return 结果
-     */
-    @Override
-    public int deleteTProjectChannelById(String id)
-    {
-        return tProjectChannelMapper.deleteTProjectChannelById(id);
-    }
-}
+package com.ruoyi.invest.service.impl;
+
+import java.util.List;
+import com.ruoyi.common.utils.DateUtils;
+import com.ruoyi.common.utils.uuid.IdUtils;
+import com.ruoyi.invest.domain.TProjectChannel;
+import com.ruoyi.invest.mapper.TProjectChannelMapper;
+import com.ruoyi.invest.service.ITProjectChannelService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+/**
+ * 渠道信息Service业务层处理
+ * 
+ * @author ruoyi
+ * @date 2024-02-22
+ */
+@Service
+public class TProjectChannelServiceImpl implements ITProjectChannelService
+{
+    @Autowired
+    private TProjectChannelMapper tProjectChannelMapper;
+
+    /**
+     * 查询渠道信息
+     * 
+     * @param id 渠道信息主键
+     * @return 渠道信息
+     */
+    @Override
+    public TProjectChannel selectTProjectChannelById(String id)
+    {
+        return tProjectChannelMapper.selectTProjectChannelById(id);
+    }
+
+    /**
+     * 查询渠道信息列表
+     * 
+     * @param tProjectChannel 渠道信息
+     * @return 渠道信息
+     */
+    @Override
+    public List<TProjectChannel> selectTProjectChannelList(TProjectChannel tProjectChannel)
+    {
+        return tProjectChannelMapper.selectTProjectChannelList(tProjectChannel);
+    }
+
+    /**
+     * 新增渠道信息
+     * 
+     * @param tProjectChannel 渠道信息
+     * @return 结果
+     */
+    @Override
+    public int insertTProjectChannel(TProjectChannel tProjectChannel)
+    {
+        tProjectChannel.setCreateTime(DateUtils.getNowDate());
+        tProjectChannel.setId(IdUtils.fastSimpleUUID());
+        return tProjectChannelMapper.insertTProjectChannel(tProjectChannel);
+    }
+
+    /**
+     * 修改渠道信息
+     * 
+     * @param tProjectChannel 渠道信息
+     * @return 结果
+     */
+    @Override
+    public int updateTProjectChannel(TProjectChannel tProjectChannel)
+    {
+        tProjectChannel.setUpdateTime(DateUtils.getNowDate());
+        return tProjectChannelMapper.updateTProjectChannel(tProjectChannel);
+    }
+
+    /**
+     * 批量删除渠道信息
+     * 
+     * @param ids 需要删除的渠道信息主键
+     * @return 结果
+     */
+    @Override
+    public int deleteTProjectChannelByIds(String[] ids)
+    {
+        return tProjectChannelMapper.deleteTProjectChannelByIds(ids);
+    }
+
+    /**
+     * 删除渠道信息信息
+     * 
+     * @param id 渠道信息主键
+     * @return 结果
+     */
+    @Override
+    public int deleteTProjectChannelById(String id)
+    {
+        return tProjectChannelMapper.deleteTProjectChannelById(id);
+    }
+}

+ 98 - 98
ruoyi-system/src/main/java/com/ruoyi/system/service/invest/impl/TProjectCompanyServiceImpl.java

@@ -1,98 +1,98 @@
-package com.ruoyi.system.service.invest.impl;
-
-import java.util.List;
-import com.ruoyi.common.utils.DateUtils;
-import com.ruoyi.common.utils.uuid.IdUtils;
-import com.ruoyi.system.domain.invest.TProjectCompany;
-import com.ruoyi.system.mapper.invest.TProjectCompanyMapper;
-import com.ruoyi.system.service.invest.ITProjectCompanyService;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
-/**
- * 项目公司信息Service业务层处理
- * 
- * @author ruoyi
- * @date 2024-02-22
- */
-@Service
-public class TProjectCompanyServiceImpl implements ITProjectCompanyService
-{
-    @Autowired
-    private TProjectCompanyMapper tProjectCompanyMapper;
-
-    /**
-     * 查询项目公司信息
-     * 
-     * @param id 项目公司信息主键
-     * @return 项目公司信息
-     */
-    @Override
-    public TProjectCompany selectTProjectCompanyById(String id)
-    {
-        return tProjectCompanyMapper.selectTProjectCompanyById(id);
-    }
-
-    /**
-     * 查询项目公司信息列表
-     * 
-     * @param tProjectCompany 项目公司信息
-     * @return 项目公司信息
-     */
-    @Override
-    public List<TProjectCompany> selectTProjectCompanyList(TProjectCompany tProjectCompany)
-    {
-        return tProjectCompanyMapper.selectTProjectCompanyList(tProjectCompany);
-    }
-
-    /**
-     * 新增项目公司信息
-     * 
-     * @param tProjectCompany 项目公司信息
-     * @return 结果
-     */
-    @Override
-    public int insertTProjectCompany(TProjectCompany tProjectCompany)
-    {
-        tProjectCompany.setCreateTime(DateUtils.getNowDate());
-        tProjectCompany.setId(IdUtils.fastSimpleUUID());
-        return tProjectCompanyMapper.insertTProjectCompany(tProjectCompany);
-    }
-
-    /**
-     * 修改项目公司信息
-     * 
-     * @param tProjectCompany 项目公司信息
-     * @return 结果
-     */
-    @Override
-    public int updateTProjectCompany(TProjectCompany tProjectCompany)
-    {
-        tProjectCompany.setUpdateTime(DateUtils.getNowDate());
-        return tProjectCompanyMapper.updateTProjectCompany(tProjectCompany);
-    }
-
-    /**
-     * 批量删除项目公司信息
-     * 
-     * @param ids 需要删除的项目公司信息主键
-     * @return 结果
-     */
-    @Override
-    public int deleteTProjectCompanyByIds(String[] ids)
-    {
-        return tProjectCompanyMapper.deleteTProjectCompanyByIds(ids);
-    }
-
-    /**
-     * 删除项目公司信息信息
-     * 
-     * @param id 项目公司信息主键
-     * @return 结果
-     */
-    @Override
-    public int deleteTProjectCompanyById(String id)
-    {
-        return tProjectCompanyMapper.deleteTProjectCompanyById(id);
-    }
-}
+package com.ruoyi.invest.service.impl;
+
+import java.util.List;
+import com.ruoyi.common.utils.DateUtils;
+import com.ruoyi.common.utils.uuid.IdUtils;
+import com.ruoyi.invest.domain.TProjectCompany;
+import com.ruoyi.invest.mapper.TProjectCompanyMapper;
+import com.ruoyi.invest.service.ITProjectCompanyService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+/**
+ * 项目公司信息Service业务层处理
+ * 
+ * @author ruoyi
+ * @date 2024-02-22
+ */
+@Service
+public class TProjectCompanyServiceImpl implements ITProjectCompanyService
+{
+    @Autowired
+    private TProjectCompanyMapper tProjectCompanyMapper;
+
+    /**
+     * 查询项目公司信息
+     * 
+     * @param id 项目公司信息主键
+     * @return 项目公司信息
+     */
+    @Override
+    public TProjectCompany selectTProjectCompanyById(String id)
+    {
+        return tProjectCompanyMapper.selectTProjectCompanyById(id);
+    }
+
+    /**
+     * 查询项目公司信息列表
+     * 
+     * @param tProjectCompany 项目公司信息
+     * @return 项目公司信息
+     */
+    @Override
+    public List<TProjectCompany> selectTProjectCompanyList(TProjectCompany tProjectCompany)
+    {
+        return tProjectCompanyMapper.selectTProjectCompanyList(tProjectCompany);
+    }
+
+    /**
+     * 新增项目公司信息
+     * 
+     * @param tProjectCompany 项目公司信息
+     * @return 结果
+     */
+    @Override
+    public int insertTProjectCompany(TProjectCompany tProjectCompany)
+    {
+        tProjectCompany.setCreateTime(DateUtils.getNowDate());
+        tProjectCompany.setId(IdUtils.fastSimpleUUID());
+        return tProjectCompanyMapper.insertTProjectCompany(tProjectCompany);
+    }
+
+    /**
+     * 修改项目公司信息
+     * 
+     * @param tProjectCompany 项目公司信息
+     * @return 结果
+     */
+    @Override
+    public int updateTProjectCompany(TProjectCompany tProjectCompany)
+    {
+        tProjectCompany.setUpdateTime(DateUtils.getNowDate());
+        return tProjectCompanyMapper.updateTProjectCompany(tProjectCompany);
+    }
+
+    /**
+     * 批量删除项目公司信息
+     * 
+     * @param ids 需要删除的项目公司信息主键
+     * @return 结果
+     */
+    @Override
+    public int deleteTProjectCompanyByIds(String[] ids)
+    {
+        return tProjectCompanyMapper.deleteTProjectCompanyByIds(ids);
+    }
+
+    /**
+     * 删除项目公司信息信息
+     * 
+     * @param id 项目公司信息主键
+     * @return 结果
+     */
+    @Override
+    public int deleteTProjectCompanyById(String id)
+    {
+        return tProjectCompanyMapper.deleteTProjectCompanyById(id);
+    }
+}

+ 98 - 98
ruoyi-system/src/main/java/com/ruoyi/system/service/invest/impl/TProjectContactsServiceImpl.java

@@ -1,98 +1,98 @@
-package com.ruoyi.system.service.invest.impl;
-
-import java.util.List;
-import com.ruoyi.common.utils.DateUtils;
-import com.ruoyi.common.utils.uuid.IdUtils;
-import com.ruoyi.system.domain.invest.TProjectContacts;
-import com.ruoyi.system.mapper.invest.TProjectContactsMapper;
-import com.ruoyi.system.service.invest.ITProjectContactsService;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
-/**
- * 项目联系人Service业务层处理
- * 
- * @author ruoyi
- * @date 2024-02-22
- */
-@Service
-public class TProjectContactsServiceImpl implements ITProjectContactsService
-{
-    @Autowired
-    private TProjectContactsMapper tProjectContactsMapper;
-
-    /**
-     * 查询项目联系人
-     * 
-     * @param id 项目联系人主键
-     * @return 项目联系人
-     */
-    @Override
-    public TProjectContacts selectTProjectContactsById(String id)
-    {
-        return tProjectContactsMapper.selectTProjectContactsById(id);
-    }
-
-    /**
-     * 查询项目联系人列表
-     * 
-     * @param tProjectContacts 项目联系人
-     * @return 项目联系人
-     */
-    @Override
-    public List<TProjectContacts> selectTProjectContactsList(TProjectContacts tProjectContacts)
-    {
-        return tProjectContactsMapper.selectTProjectContactsList(tProjectContacts);
-    }
-
-    /**
-     * 新增项目联系人
-     * 
-     * @param tProjectContacts 项目联系人
-     * @return 结果
-     */
-    @Override
-    public int insertTProjectContacts(TProjectContacts tProjectContacts)
-    {
-        tProjectContacts.setCreateTime(DateUtils.getNowDate());
-        tProjectContacts.setId(IdUtils.fastSimpleUUID());
-        return tProjectContactsMapper.insertTProjectContacts(tProjectContacts);
-    }
-
-    /**
-     * 修改项目联系人
-     * 
-     * @param tProjectContacts 项目联系人
-     * @return 结果
-     */
-    @Override
-    public int updateTProjectContacts(TProjectContacts tProjectContacts)
-    {
-        tProjectContacts.setUpdateTime(DateUtils.getNowDate());
-        return tProjectContactsMapper.updateTProjectContacts(tProjectContacts);
-    }
-
-    /**
-     * 批量删除项目联系人
-     * 
-     * @param ids 需要删除的项目联系人主键
-     * @return 结果
-     */
-    @Override
-    public int deleteTProjectContactsByIds(String[] ids)
-    {
-        return tProjectContactsMapper.deleteTProjectContactsByIds(ids);
-    }
-
-    /**
-     * 删除项目联系人信息
-     * 
-     * @param id 项目联系人主键
-     * @return 结果
-     */
-    @Override
-    public int deleteTProjectContactsById(String id)
-    {
-        return tProjectContactsMapper.deleteTProjectContactsById(id);
-    }
-}
+package com.ruoyi.invest.service.impl;
+
+import java.util.List;
+import com.ruoyi.common.utils.DateUtils;
+import com.ruoyi.common.utils.uuid.IdUtils;
+import com.ruoyi.invest.domain.TProjectContacts;
+import com.ruoyi.invest.mapper.TProjectContactsMapper;
+import com.ruoyi.invest.service.ITProjectContactsService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+/**
+ * 项目联系人Service业务层处理
+ * 
+ * @author ruoyi
+ * @date 2024-02-22
+ */
+@Service
+public class TProjectContactsServiceImpl implements ITProjectContactsService
+{
+    @Autowired
+    private TProjectContactsMapper tProjectContactsMapper;
+
+    /**
+     * 查询项目联系人
+     * 
+     * @param id 项目联系人主键
+     * @return 项目联系人
+     */
+    @Override
+    public TProjectContacts selectTProjectContactsById(String id)
+    {
+        return tProjectContactsMapper.selectTProjectContactsById(id);
+    }
+
+    /**
+     * 查询项目联系人列表
+     * 
+     * @param tProjectContacts 项目联系人
+     * @return 项目联系人
+     */
+    @Override
+    public List<TProjectContacts> selectTProjectContactsList(TProjectContacts tProjectContacts)
+    {
+        return tProjectContactsMapper.selectTProjectContactsList(tProjectContacts);
+    }
+
+    /**
+     * 新增项目联系人
+     * 
+     * @param tProjectContacts 项目联系人
+     * @return 结果
+     */
+    @Override
+    public int insertTProjectContacts(TProjectContacts tProjectContacts)
+    {
+        tProjectContacts.setCreateTime(DateUtils.getNowDate());
+        tProjectContacts.setId(IdUtils.fastSimpleUUID());
+        return tProjectContactsMapper.insertTProjectContacts(tProjectContacts);
+    }
+
+    /**
+     * 修改项目联系人
+     * 
+     * @param tProjectContacts 项目联系人
+     * @return 结果
+     */
+    @Override
+    public int updateTProjectContacts(TProjectContacts tProjectContacts)
+    {
+        tProjectContacts.setUpdateTime(DateUtils.getNowDate());
+        return tProjectContactsMapper.updateTProjectContacts(tProjectContacts);
+    }
+
+    /**
+     * 批量删除项目联系人
+     * 
+     * @param ids 需要删除的项目联系人主键
+     * @return 结果
+     */
+    @Override
+    public int deleteTProjectContactsByIds(String[] ids)
+    {
+        return tProjectContactsMapper.deleteTProjectContactsByIds(ids);
+    }
+
+    /**
+     * 删除项目联系人信息
+     * 
+     * @param id 项目联系人主键
+     * @return 结果
+     */
+    @Override
+    public int deleteTProjectContactsById(String id)
+    {
+        return tProjectContactsMapper.deleteTProjectContactsById(id);
+    }
+}

+ 4 - 4
ruoyi-system/src/main/java/com/ruoyi/system/service/invest/impl/TProjectInformationServiceImpl.java

@@ -1,11 +1,11 @@
-package com.ruoyi.system.service.invest.impl;
+package com.ruoyi.invest.service.impl;
 
 import java.util.List;
 import com.ruoyi.common.utils.DateUtils;
 import com.ruoyi.common.utils.uuid.IdUtils;
-import com.ruoyi.system.domain.invest.TProjectInformation;
-import com.ruoyi.system.mapper.invest.TProjectInformationMapper;
-import com.ruoyi.system.service.invest.ITProjectInformationService;
+import com.ruoyi.invest.domain.TProjectInformation;
+import com.ruoyi.invest.mapper.TProjectInformationMapper;
+import com.ruoyi.invest.service.ITProjectInformationService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 

+ 98 - 98
ruoyi-system/src/main/java/com/ruoyi/system/service/invest/impl/TProjectMeetingServiceImpl.java

@@ -1,98 +1,98 @@
-package com.ruoyi.system.service.invest.impl;
-
-import java.util.List;
-import com.ruoyi.common.utils.DateUtils;
-import com.ruoyi.common.utils.uuid.IdUtils;
-import com.ruoyi.system.domain.invest.TProjectMeeting;
-import com.ruoyi.system.mapper.invest.TProjectMeetingMapper;
-import com.ruoyi.system.service.invest.ITProjectMeetingService;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
-/**
- * 会议记录Service业务层处理
- * 
- * @author ruoyi
- * @date 2024-02-22
- */
-@Service
-public class TProjectMeetingServiceImpl implements ITProjectMeetingService
-{
-    @Autowired
-    private TProjectMeetingMapper tProjectMeetingMapper;
-
-    /**
-     * 查询会议记录
-     * 
-     * @param id 会议记录主键
-     * @return 会议记录
-     */
-    @Override
-    public TProjectMeeting selectTProjectMeetingById(String id)
-    {
-        return tProjectMeetingMapper.selectTProjectMeetingById(id);
-    }
-
-    /**
-     * 查询会议记录列表
-     * 
-     * @param tProjectMeeting 会议记录
-     * @return 会议记录
-     */
-    @Override
-    public List<TProjectMeeting> selectTProjectMeetingList(TProjectMeeting tProjectMeeting)
-    {
-        return tProjectMeetingMapper.selectTProjectMeetingList(tProjectMeeting);
-    }
-
-    /**
-     * 新增会议记录
-     * 
-     * @param tProjectMeeting 会议记录
-     * @return 结果
-     */
-    @Override
-    public int insertTProjectMeeting(TProjectMeeting tProjectMeeting)
-    {
-        tProjectMeeting.setCreateTime(DateUtils.getNowDate());
-        tProjectMeeting.setId(IdUtils.fastSimpleUUID());
-        return tProjectMeetingMapper.insertTProjectMeeting(tProjectMeeting);
-    }
-
-    /**
-     * 修改会议记录
-     * 
-     * @param tProjectMeeting 会议记录
-     * @return 结果
-     */
-    @Override
-    public int updateTProjectMeeting(TProjectMeeting tProjectMeeting)
-    {
-        tProjectMeeting.setUpdateTime(DateUtils.getNowDate());
-        return tProjectMeetingMapper.updateTProjectMeeting(tProjectMeeting);
-    }
-
-    /**
-     * 批量删除会议记录
-     * 
-     * @param ids 需要删除的会议记录主键
-     * @return 结果
-     */
-    @Override
-    public int deleteTProjectMeetingByIds(String[] ids)
-    {
-        return tProjectMeetingMapper.deleteTProjectMeetingByIds(ids);
-    }
-
-    /**
-     * 删除会议记录信息
-     * 
-     * @param id 会议记录主键
-     * @return 结果
-     */
-    @Override
-    public int deleteTProjectMeetingById(String id)
-    {
-        return tProjectMeetingMapper.deleteTProjectMeetingById(id);
-    }
-}
+package com.ruoyi.invest.service.impl;
+
+import java.util.List;
+import com.ruoyi.common.utils.DateUtils;
+import com.ruoyi.common.utils.uuid.IdUtils;
+import com.ruoyi.invest.domain.TProjectMeeting;
+import com.ruoyi.invest.mapper.TProjectMeetingMapper;
+import com.ruoyi.invest.service.ITProjectMeetingService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+/**
+ * 会议记录Service业务层处理
+ * 
+ * @author ruoyi
+ * @date 2024-02-22
+ */
+@Service
+public class TProjectMeetingServiceImpl implements ITProjectMeetingService
+{
+    @Autowired
+    private TProjectMeetingMapper tProjectMeetingMapper;
+
+    /**
+     * 查询会议记录
+     * 
+     * @param id 会议记录主键
+     * @return 会议记录
+     */
+    @Override
+    public TProjectMeeting selectTProjectMeetingById(String id)
+    {
+        return tProjectMeetingMapper.selectTProjectMeetingById(id);
+    }
+
+    /**
+     * 查询会议记录列表
+     * 
+     * @param tProjectMeeting 会议记录
+     * @return 会议记录
+     */
+    @Override
+    public List<TProjectMeeting> selectTProjectMeetingList(TProjectMeeting tProjectMeeting)
+    {
+        return tProjectMeetingMapper.selectTProjectMeetingList(tProjectMeeting);
+    }
+
+    /**
+     * 新增会议记录
+     * 
+     * @param tProjectMeeting 会议记录
+     * @return 结果
+     */
+    @Override
+    public int insertTProjectMeeting(TProjectMeeting tProjectMeeting)
+    {
+        tProjectMeeting.setCreateTime(DateUtils.getNowDate());
+        tProjectMeeting.setId(IdUtils.fastSimpleUUID());
+        return tProjectMeetingMapper.insertTProjectMeeting(tProjectMeeting);
+    }
+
+    /**
+     * 修改会议记录
+     * 
+     * @param tProjectMeeting 会议记录
+     * @return 结果
+     */
+    @Override
+    public int updateTProjectMeeting(TProjectMeeting tProjectMeeting)
+    {
+        tProjectMeeting.setUpdateTime(DateUtils.getNowDate());
+        return tProjectMeetingMapper.updateTProjectMeeting(tProjectMeeting);
+    }
+
+    /**
+     * 批量删除会议记录
+     * 
+     * @param ids 需要删除的会议记录主键
+     * @return 结果
+     */
+    @Override
+    public int deleteTProjectMeetingByIds(String[] ids)
+    {
+        return tProjectMeetingMapper.deleteTProjectMeetingByIds(ids);
+    }
+
+    /**
+     * 删除会议记录信息
+     * 
+     * @param id 会议记录主键
+     * @return 结果
+     */
+    @Override
+    public int deleteTProjectMeetingById(String id)
+    {
+        return tProjectMeetingMapper.deleteTProjectMeetingById(id);
+    }
+}

+ 4 - 6
ruoyi-system/src/main/java/com/ruoyi/system/service/invest/impl/TProjectPoolServiceImpl.java

@@ -1,14 +1,12 @@
-package com.ruoyi.system.service.invest.impl;
+package com.ruoyi.invest.service.impl;
 
 import java.util.List;
-import java.util.UUID;
 
-import com.fasterxml.jackson.annotation.ObjectIdGenerators;
 import com.ruoyi.common.utils.DateUtils;
 import com.ruoyi.common.utils.uuid.IdUtils;
-import com.ruoyi.system.domain.invest.TProjectPool;
-import com.ruoyi.system.mapper.invest.TProjectPoolMapper;
-import com.ruoyi.system.service.invest.ITProjectPoolService;
+import com.ruoyi.invest.domain.TProjectPool;
+import com.ruoyi.invest.mapper.TProjectPoolMapper;
+import com.ruoyi.invest.service.ITProjectPoolService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 

+ 4 - 4
ruoyi-system/src/main/java/com/ruoyi/system/service/invest/impl/TProjectRecordServiceImpl.java

@@ -1,11 +1,11 @@
-package com.ruoyi.system.service.invest.impl;
+package com.ruoyi.invest.service.impl;
 
 import java.util.List;
 import com.ruoyi.common.utils.DateUtils;
 import com.ruoyi.common.utils.uuid.IdUtils;
-import com.ruoyi.system.domain.invest.TProjectRecord;
-import com.ruoyi.system.mapper.invest.TProjectRecordMapper;
-import com.ruoyi.system.service.invest.ITProjectRecordService;
+import com.ruoyi.invest.domain.TProjectRecord;
+import com.ruoyi.invest.mapper.TProjectRecordMapper;
+import com.ruoyi.invest.service.ITProjectRecordService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 

+ 98 - 0
ruoyi-system/src/main/java/com/ruoyi/invest/service/impl/TProjectScoringServiceImpl.java

@@ -0,0 +1,98 @@
+package com.ruoyi.invest.service.impl;
+
+import java.util.List;
+import com.ruoyi.common.utils.DateUtils;
+import com.ruoyi.common.utils.uuid.IdUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import com.ruoyi.invest.mapper.TProjectScoringMapper;
+import com.ruoyi.invest.domain.TProjectScoring;
+import com.ruoyi.invest.service.ITProjectScoringService;
+
+/**
+ * 打分Service业务层处理
+ * 
+ * @author ruoyi
+ * @date 2024-02-23
+ */
+@Service
+public class TProjectScoringServiceImpl implements ITProjectScoringService 
+{
+    @Autowired
+    private TProjectScoringMapper tProjectScoringMapper;
+
+    /**
+     * 查询打分
+     * 
+     * @param id 打分主键
+     * @return 打分
+     */
+    @Override
+    public TProjectScoring selectTProjectScoringById(String id)
+    {
+        return tProjectScoringMapper.selectTProjectScoringById(id);
+    }
+
+    /**
+     * 查询打分列表
+     * 
+     * @param tProjectScoring 打分
+     * @return 打分
+     */
+    @Override
+    public List<TProjectScoring> selectTProjectScoringList(TProjectScoring tProjectScoring)
+    {
+        return tProjectScoringMapper.selectTProjectScoringList(tProjectScoring);
+    }
+
+    /**
+     * 新增打分
+     * 
+     * @param tProjectScoring 打分
+     * @return 结果
+     */
+    @Override
+    public int insertTProjectScoring(TProjectScoring tProjectScoring)
+    {
+        tProjectScoring.setCreateTime(DateUtils.getNowDate());
+        tProjectScoring.setId(IdUtils.fastSimpleUUID());
+        return tProjectScoringMapper.insertTProjectScoring(tProjectScoring);
+    }
+
+    /**
+     * 修改打分
+     * 
+     * @param tProjectScoring 打分
+     * @return 结果
+     */
+    @Override
+    public int updateTProjectScoring(TProjectScoring tProjectScoring)
+    {
+        tProjectScoring.setUpdateTime(DateUtils.getNowDate());
+        return tProjectScoringMapper.updateTProjectScoring(tProjectScoring);
+    }
+
+    /**
+     * 批量删除打分
+     * 
+     * @param ids 需要删除的打分主键
+     * @return 结果
+     */
+    @Override
+    public int deleteTProjectScoringByIds(String[] ids)
+    {
+        return tProjectScoringMapper.deleteTProjectScoringByIds(ids);
+    }
+
+    /**
+     * 删除打分信息
+     * 
+     * @param id 打分主键
+     * @return 结果
+     */
+    @Override
+    public int deleteTProjectScoringById(String id)
+    {
+        return tProjectScoringMapper.deleteTProjectScoringById(id);
+    }
+}

+ 0 - 135
ruoyi-system/src/main/java/com/ruoyi/system/domain/dhrm/DhrmCompany.java

@@ -1,135 +0,0 @@
-package com.ruoyi.system.domain.dhrm;
-
-import org.apache.commons.lang3.builder.ToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
-import com.ruoyi.common.annotation.Excel;
-import com.ruoyi.common.core.domain.BaseEntity;
-
-/**
- * 公司管理对象 dhrm_company
- * 
- * @author ruoyi
- * @date 2023-11-16
- */
-public class DhrmCompany extends BaseEntity
-{
-    private static final long serialVersionUID = 1L;
-
-    /** $column.columnComment */
-    private Long dhrmId;
-
-    /** $column.columnComment */
-    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
-    private String dhrmCompanyId;
-
-    /** $column.columnComment */
-    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
-    private String dhrmCompanyName;
-
-    /** DSK */
-    @Excel(name = "DSK")
-    private String dhrmCompanyDsk;
-
-    /** $column.columnComment */
-    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
-    private String isClose;
-
-    /** 开户行 */
-    @Excel(name = "开户行")
-    private String bankName;
-
-    /** 账号 */
-    @Excel(name = "账号")
-    private String bankNum;
-
-    /** 所属公司 */
-    @Excel(name = "所属公司")
-    private String companyId;
-
-    public void setDhrmId(Long dhrmId) 
-    {
-        this.dhrmId = dhrmId;
-    }
-
-    public Long getDhrmId() 
-    {
-        return dhrmId;
-    }
-    public void setDhrmCompanyId(String dhrmCompanyId) 
-    {
-        this.dhrmCompanyId = dhrmCompanyId;
-    }
-
-    public String getDhrmCompanyId() 
-    {
-        return dhrmCompanyId;
-    }
-    public void setDhrmCompanyName(String dhrmCompanyName) 
-    {
-        this.dhrmCompanyName = dhrmCompanyName;
-    }
-
-    public String getDhrmCompanyName() 
-    {
-        return dhrmCompanyName;
-    }
-    public void setDhrmCompanyDsk(String dhrmCompanyDsk) 
-    {
-        this.dhrmCompanyDsk = dhrmCompanyDsk;
-    }
-
-    public String getDhrmCompanyDsk() 
-    {
-        return dhrmCompanyDsk;
-    }
-    public void setIsClose(String isClose) 
-    {
-        this.isClose = isClose;
-    }
-
-    public String getIsClose() 
-    {
-        return isClose;
-    }
-    public void setBankName(String bankName) 
-    {
-        this.bankName = bankName;
-    }
-
-    public String getBankName() 
-    {
-        return bankName;
-    }
-    public void setBankNum(String bankNum) 
-    {
-        this.bankNum = bankNum;
-    }
-
-    public String getBankNum() 
-    {
-        return bankNum;
-    }
-    public void setCompanyId(String companyId) 
-    {
-        this.companyId = companyId;
-    }
-
-    public String getCompanyId() 
-    {
-        return companyId;
-    }
-
-    @Override
-    public String toString() {
-        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
-            .append("dhrmId", getDhrmId())
-            .append("dhrmCompanyId", getDhrmCompanyId())
-            .append("dhrmCompanyName", getDhrmCompanyName())
-            .append("dhrmCompanyDsk", getDhrmCompanyDsk())
-            .append("isClose", getIsClose())
-            .append("bankName", getBankName())
-            .append("bankNum", getBankNum())
-            .append("companyId", getCompanyId())
-            .toString();
-    }
-}

+ 1 - 1
ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysMenuMapper.java

@@ -63,7 +63,7 @@ public interface SysMenuMapper
      * @param userId 用户ID
      * @return 菜单列表
      */
-    public List<SysMenu> selectMenuTreeByUserId(@Param("userId")Long userId,@Param("systemType")String systemType);
+    public List<SysMenu> selectMenuTreeByUserId(@Param("userId")Long userId);
 
     /**
      * 根据角色ID查询菜单树信息

+ 0 - 70
ruoyi-system/src/main/java/com/ruoyi/system/mapper/dhrm/DhrmCompanyMapper.java

@@ -1,70 +0,0 @@
-package com.ruoyi.system.mapper.dhrm;
-
-import com.ruoyi.system.domain.dhrm.DhrmCompany;
-
-import java.util.List;
-
-/**
- * 公司管理Mapper接口
- * 
- * @author ruoyi
- * @date 2023-11-16
- */
-public interface DhrmCompanyMapper 
-{
-    /**
-     * 查询公司管理
-     * 
-     * @param dhrmId 公司管理主键
-     * @return 公司管理
-     */
-    public DhrmCompany selectDhrmCompanyByDhrmId(Long dhrmId);
-
-    /**
-     * 查询公司管理列表
-     * 
-     * @param dhrmCompany 公司管理
-     * @return 公司管理集合
-     */
-    public List<DhrmCompany> selectDhrmCompanyList(DhrmCompany dhrmCompany);
-
-    /**
-     * 新增公司管理
-     * 
-     * @param dhrmCompany 公司管理
-     * @return 结果
-     */
-    public int insertDhrmCompany(DhrmCompany dhrmCompany);
-
-    /**
-     * 修改公司管理
-     * 
-     * @param dhrmCompany 公司管理
-     * @return 结果
-     */
-    public int updateDhrmCompany(DhrmCompany dhrmCompany);
-
-    /**
-     * 删除公司管理
-     * 
-     * @param dhrmId 公司管理主键
-     * @return 结果
-     */
-    public int deleteDhrmCompanyByDhrmId(Long dhrmId);
-
-    /**
-     * 批量删除公司管理
-     * 
-     * @param dhrmIds 需要删除的数据主键集合
-     * @return 结果
-     */
-    public int deleteDhrmCompanyByDhrmIds(Long[] dhrmIds);
-
-    /**
-     * 根据员工编号查询公司数据
-     *
-     * @param employNo
-     * @return
-     */
-    public DhrmCompany selectDhrmCompanyByEmployNo(String employNo);
-}

+ 1 - 1
ruoyi-system/src/main/java/com/ruoyi/system/service/ISysMenuService.java

@@ -53,7 +53,7 @@ public interface ISysMenuService
      * @param menuType 菜单类型
      * @return 菜单列表
      */
-    public List<SysMenu> selectMenuTreeByUserId(Long userId,String menuType);
+    public List<SysMenu> selectMenuTreeByUserId(Long userId);
 
     /**
      * 根据角色ID查询菜单树信息

+ 0 - 69
ruoyi-system/src/main/java/com/ruoyi/system/service/dhrm/IDhrmCompanyService.java

@@ -1,69 +0,0 @@
-package com.ruoyi.system.service.dhrm;
-
-import com.ruoyi.system.domain.dhrm.DhrmCompany;
-
-import java.util.List;
-
-/**
- * 公司管理Service接口
- * 
- * @author ruoyi
- * @date 2023-11-16
- */
-public interface IDhrmCompanyService 
-{
-    /**
-     * 查询公司管理
-     * 
-     * @param dhrmId 公司管理主键
-     * @return 公司管理
-     */
-    public DhrmCompany selectDhrmCompanyByDhrmId(Long dhrmId);
-
-    /**
-     * 查询公司管理列表
-     * 
-     * @param dhrmCompany 公司管理
-     * @return 公司管理集合
-     */
-    public List<DhrmCompany> selectDhrmCompanyList(DhrmCompany dhrmCompany);
-
-    /**
-     * 新增公司管理
-     * 
-     * @param dhrmCompany 公司管理
-     * @return 结果
-     */
-    public int insertDhrmCompany(DhrmCompany dhrmCompany);
-
-    /**
-     * 修改公司管理
-     * 
-     * @param dhrmCompany 公司管理
-     * @return 结果
-     */
-    public int updateDhrmCompany(DhrmCompany dhrmCompany);
-
-    /**
-     * 批量删除公司管理
-     * 
-     * @param dhrmIds 需要删除的公司管理主键集合
-     * @return 结果
-     */
-    public int deleteDhrmCompanyByDhrmIds(Long[] dhrmIds);
-
-    /**
-     * 删除公司管理信息
-     * 
-     * @param dhrmId 公司管理主键
-     * @return 结果
-     */
-    public int deleteDhrmCompanyByDhrmId(Long dhrmId);
-
-    /**
-     * 根据员工编号查询公司数据
-     * @param employNo
-     * @return
-     */
-    public DhrmCompany selectDhrmCompanyByEmployNo(String employNo);
-}

+ 0 - 105
ruoyi-system/src/main/java/com/ruoyi/system/service/dhrm/impl/DhrmCompanyServiceImpl.java

@@ -1,105 +0,0 @@
-package com.ruoyi.system.service.dhrm.impl;
-
-import java.util.List;
-
-import com.ruoyi.system.domain.dhrm.DhrmCompany;
-import com.ruoyi.system.mapper.dhrm.DhrmCompanyMapper;
-import com.ruoyi.system.service.dhrm.IDhrmCompanyService;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
-/**
- * 公司管理Service业务层处理
- * 
- * @author ruoyi
- * @date 2023-11-16
- */
-@Service
-public class DhrmCompanyServiceImpl implements IDhrmCompanyService
-{
-    @Autowired
-    private DhrmCompanyMapper dhrmCompanyMapper;
-
-    /**
-     * 查询公司管理
-     * 
-     * @param dhrmId 公司管理主键
-     * @return 公司管理
-     */
-    @Override
-    public DhrmCompany selectDhrmCompanyByDhrmId(Long dhrmId)
-    {
-        return dhrmCompanyMapper.selectDhrmCompanyByDhrmId(dhrmId);
-    }
-
-    /**
-     * 查询公司管理列表
-     * 
-     * @param dhrmCompany 公司管理
-     * @return 公司管理
-     */
-    @Override
-    public List<DhrmCompany> selectDhrmCompanyList(DhrmCompany dhrmCompany)
-    {
-        return dhrmCompanyMapper.selectDhrmCompanyList(dhrmCompany);
-    }
-
-    /**
-     * 新增公司管理
-     * 
-     * @param dhrmCompany 公司管理
-     * @return 结果
-     */
-    @Override
-    public int insertDhrmCompany(DhrmCompany dhrmCompany)
-    {
-        return dhrmCompanyMapper.insertDhrmCompany(dhrmCompany);
-    }
-
-    /**
-     * 修改公司管理
-     * 
-     * @param dhrmCompany 公司管理
-     * @return 结果
-     */
-    @Override
-    public int updateDhrmCompany(DhrmCompany dhrmCompany)
-    {
-        return dhrmCompanyMapper.updateDhrmCompany(dhrmCompany);
-    }
-
-    /**
-     * 批量删除公司管理
-     * 
-     * @param dhrmIds 需要删除的公司管理主键
-     * @return 结果
-     */
-    @Override
-    public int deleteDhrmCompanyByDhrmIds(Long[] dhrmIds)
-    {
-        return dhrmCompanyMapper.deleteDhrmCompanyByDhrmIds(dhrmIds);
-    }
-
-    /**
-     * 删除公司管理信息
-     * 
-     * @param dhrmId 公司管理主键
-     * @return 结果
-     */
-    @Override
-    public int deleteDhrmCompanyByDhrmId(Long dhrmId)
-    {
-        return dhrmCompanyMapper.deleteDhrmCompanyByDhrmId(dhrmId);
-    }
-
-    /**
-     *
-     * 根据员工编号查询公司数据
-     * @param employNo
-     * @return
-     */
-    @Override
-    public DhrmCompany selectDhrmCompanyByEmployNo(String employNo) {
-        return dhrmCompanyMapper.selectDhrmCompanyByEmployNo(employNo);
-    }
-}

+ 2 - 2
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysMenuServiceImpl.java

@@ -132,7 +132,7 @@ public class SysMenuServiceImpl implements ISysMenuService
      * @return 菜单列表
      */
     @Override
-    public List<SysMenu> selectMenuTreeByUserId(Long userId,String systemType)
+    public List<SysMenu> selectMenuTreeByUserId(Long userId)
     {
         List<SysMenu> menus = null;
         if (SecurityUtils.isAdmin(userId))
@@ -141,7 +141,7 @@ public class SysMenuServiceImpl implements ISysMenuService
         }
         else
         {
-            menus = menuMapper.selectMenuTreeByUserId(userId,systemType);
+            menus = menuMapper.selectMenuTreeByUserId(userId);
         }
         return getChildPerms(menus, 0);
     }

+ 152 - 0
ruoyi-system/src/main/java/com/ruoyi/tool/domain/TUnifyFile.java

@@ -0,0 +1,152 @@
+package com.ruoyi.tool.domain;
+
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import com.ruoyi.common.annotation.Excel;
+import com.ruoyi.common.core.domain.BaseEntity;
+
+/**
+ * 附件对象 t_unify_file
+ * 
+ * @author ruoyi
+ * @date 2024-02-23
+ */
+public class TUnifyFile extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 主键ID */
+    private String id;
+
+    /** 文件ID */
+    @Excel(name = "文件ID")
+    private String fileId;
+
+    /** 文件名称 */
+    @Excel(name = "文件名称")
+    private String uploadName;
+
+    /** 文件类别 */
+    @Excel(name = "文件类别")
+    private String uploadType;
+
+    /** 文件地址 */
+    @Excel(name = "文件地址")
+    private String uploadPath;
+
+    /** 文件格式 */
+    @Excel(name = "文件格式")
+    private String uploadFormat;
+
+    /** 新文件名称 */
+    @Excel(name = "新文件名称")
+    private String newUploadName;
+
+    /** 状态 */
+    private String delFlag;
+
+    /** 附件业务ID */
+    @Excel(name = "附件业务ID")
+    private String fileBusinessId;
+
+    public void setId(String id) 
+    {
+        this.id = id;
+    }
+
+    public String getId() 
+    {
+        return id;
+    }
+    public void setFileId(String fileId) 
+    {
+        this.fileId = fileId;
+    }
+
+    public String getFileId() 
+    {
+        return fileId;
+    }
+    public void setUploadName(String uploadName) 
+    {
+        this.uploadName = uploadName;
+    }
+
+    public String getUploadName() 
+    {
+        return uploadName;
+    }
+    public void setUploadType(String uploadType) 
+    {
+        this.uploadType = uploadType;
+    }
+
+    public String getUploadType() 
+    {
+        return uploadType;
+    }
+    public void setUploadPath(String uploadPath) 
+    {
+        this.uploadPath = uploadPath;
+    }
+
+    public String getUploadPath() 
+    {
+        return uploadPath;
+    }
+    public void setUploadFormat(String uploadFormat) 
+    {
+        this.uploadFormat = uploadFormat;
+    }
+
+    public String getUploadFormat() 
+    {
+        return uploadFormat;
+    }
+    public void setNewUploadName(String newUploadName) 
+    {
+        this.newUploadName = newUploadName;
+    }
+
+    public String getNewUploadName() 
+    {
+        return newUploadName;
+    }
+    public void setDelFlag(String delFlag) 
+    {
+        this.delFlag = delFlag;
+    }
+
+    public String getDelFlag() 
+    {
+        return delFlag;
+    }
+    public void setFileBusinessId(String fileBusinessId) 
+    {
+        this.fileBusinessId = fileBusinessId;
+    }
+
+    public String getFileBusinessId() 
+    {
+        return fileBusinessId;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("id", getId())
+            .append("fileId", getFileId())
+            .append("uploadName", getUploadName())
+            .append("uploadType", getUploadType())
+            .append("uploadPath", getUploadPath())
+            .append("uploadFormat", getUploadFormat())
+            .append("newUploadName", getNewUploadName())
+            .append("delFlag", getDelFlag())
+            .append("fileBusinessId", getFileBusinessId())
+            .append("createBy", getCreateBy())
+            .append("createTime", getCreateTime())
+            .append("updateBy", getUpdateBy())
+            .append("updateTime", getUpdateTime())
+            .toString();
+    }
+}

+ 61 - 0
ruoyi-system/src/main/java/com/ruoyi/tool/mapper/TUnifyFileMapper.java

@@ -0,0 +1,61 @@
+package com.ruoyi.tool.mapper;
+
+import java.util.List;
+import com.ruoyi.tool.domain.TUnifyFile;
+
+/**
+ * 附件Mapper接口
+ * 
+ * @author ruoyi
+ * @date 2024-02-23
+ */
+public interface TUnifyFileMapper 
+{
+    /**
+     * 查询附件
+     * 
+     * @param id 附件主键
+     * @return 附件
+     */
+    public TUnifyFile selectTUnifyFileById(String id);
+
+    /**
+     * 查询附件列表
+     * 
+     * @param tUnifyFile 附件
+     * @return 附件集合
+     */
+    public List<TUnifyFile> selectTUnifyFileList(TUnifyFile tUnifyFile);
+
+    /**
+     * 新增附件
+     * 
+     * @param tUnifyFile 附件
+     * @return 结果
+     */
+    public int insertTUnifyFile(TUnifyFile tUnifyFile);
+
+    /**
+     * 修改附件
+     * 
+     * @param tUnifyFile 附件
+     * @return 结果
+     */
+    public int updateTUnifyFile(TUnifyFile tUnifyFile);
+
+    /**
+     * 删除附件
+     * 
+     * @param id 附件主键
+     * @return 结果
+     */
+    public int deleteTUnifyFileById(String id);
+
+    /**
+     * 批量删除附件
+     * 
+     * @param ids 需要删除的数据主键集合
+     * @return 结果
+     */
+    public int deleteTUnifyFileByIds(String[] ids);
+}

+ 61 - 0
ruoyi-system/src/main/java/com/ruoyi/tool/service/ITUnifyFileService.java

@@ -0,0 +1,61 @@
+package com.ruoyi.tool.service;
+
+import java.util.List;
+import com.ruoyi.tool.domain.TUnifyFile;
+
+/**
+ * 附件Service接口
+ * 
+ * @author ruoyi
+ * @date 2024-02-23
+ */
+public interface ITUnifyFileService 
+{
+    /**
+     * 查询附件
+     * 
+     * @param id 附件主键
+     * @return 附件
+     */
+    public TUnifyFile selectTUnifyFileById(String id);
+
+    /**
+     * 查询附件列表
+     * 
+     * @param tUnifyFile 附件
+     * @return 附件集合
+     */
+    public List<TUnifyFile> selectTUnifyFileList(TUnifyFile tUnifyFile);
+
+    /**
+     * 新增附件
+     * 
+     * @param tUnifyFile 附件
+     * @return 结果
+     */
+    public int insertTUnifyFile(TUnifyFile tUnifyFile);
+
+    /**
+     * 修改附件
+     * 
+     * @param tUnifyFile 附件
+     * @return 结果
+     */
+    public int updateTUnifyFile(TUnifyFile tUnifyFile);
+
+    /**
+     * 批量删除附件
+     * 
+     * @param ids 需要删除的附件主键集合
+     * @return 结果
+     */
+    public int deleteTUnifyFileByIds(String[] ids);
+
+    /**
+     * 删除附件信息
+     * 
+     * @param id 附件主键
+     * @return 结果
+     */
+    public int deleteTUnifyFileById(String id);
+}

+ 98 - 0
ruoyi-system/src/main/java/com/ruoyi/tool/service/impl/TUnifyFileServiceImpl.java

@@ -0,0 +1,98 @@
+package com.ruoyi.tool.service.impl;
+
+import java.util.List;
+import com.ruoyi.common.utils.DateUtils;
+import com.ruoyi.common.utils.uuid.IdUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import com.ruoyi.tool.mapper.TUnifyFileMapper;
+import com.ruoyi.tool.domain.TUnifyFile;
+import com.ruoyi.tool.service.ITUnifyFileService;
+
+/**
+ * 附件Service业务层处理
+ * 
+ * @author ruoyi
+ * @date 2024-02-23
+ */
+@Service
+public class TUnifyFileServiceImpl implements ITUnifyFileService 
+{
+    @Autowired
+    private TUnifyFileMapper tUnifyFileMapper;
+
+    /**
+     * 查询附件
+     * 
+     * @param id 附件主键
+     * @return 附件
+     */
+    @Override
+    public TUnifyFile selectTUnifyFileById(String id)
+    {
+        return tUnifyFileMapper.selectTUnifyFileById(id);
+    }
+
+    /**
+     * 查询附件列表
+     * 
+     * @param tUnifyFile 附件
+     * @return 附件
+     */
+    @Override
+    public List<TUnifyFile> selectTUnifyFileList(TUnifyFile tUnifyFile)
+    {
+        return tUnifyFileMapper.selectTUnifyFileList(tUnifyFile);
+    }
+
+    /**
+     * 新增附件
+     * 
+     * @param tUnifyFile 附件
+     * @return 结果
+     */
+    @Override
+    public int insertTUnifyFile(TUnifyFile tUnifyFile)
+    {
+        tUnifyFile.setCreateTime(DateUtils.getNowDate());
+        tUnifyFile.setId(IdUtils.fastSimpleUUID());
+        return tUnifyFileMapper.insertTUnifyFile(tUnifyFile);
+    }
+
+    /**
+     * 修改附件
+     * 
+     * @param tUnifyFile 附件
+     * @return 结果
+     */
+    @Override
+    public int updateTUnifyFile(TUnifyFile tUnifyFile)
+    {
+        tUnifyFile.setUpdateTime(DateUtils.getNowDate());
+        return tUnifyFileMapper.updateTUnifyFile(tUnifyFile);
+    }
+
+    /**
+     * 批量删除附件
+     * 
+     * @param ids 需要删除的附件主键
+     * @return 结果
+     */
+    @Override
+    public int deleteTUnifyFileByIds(String[] ids)
+    {
+        return tUnifyFileMapper.deleteTUnifyFileByIds(ids);
+    }
+
+    /**
+     * 删除附件信息
+     * 
+     * @param id 附件主键
+     * @return 结果
+     */
+    @Override
+    public int deleteTUnifyFileById(String id)
+    {
+        return tUnifyFileMapper.deleteTUnifyFileById(id);
+    }
+}

+ 0 - 96
ruoyi-system/src/main/resources/mapper/dhrm/DhrmCompanyMapper.xml

@@ -1,96 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE mapper
-PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
-"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.ruoyi.system.mapper.dhrm.DhrmCompanyMapper">
-    
-    <resultMap type="DhrmCompany" id="DhrmCompanyResult">
-        <result property="dhrmId"    column="dhrm_id"    />
-        <result property="dhrmCompanyId"    column="dhrm_company_id"    />
-        <result property="dhrmCompanyName"    column="dhrm_company_name"    />
-        <result property="dhrmCompanyDsk"    column="dhrm_company_DSK"    />
-        <result property="isClose"    column="is_close"    />
-        <result property="bankName"    column="bank_name"    />
-        <result property="bankNum"    column="bank_num"    />
-        <result property="companyId"    column="companyId"    />
-    </resultMap>
-
-    <sql id="selectDhrmCompanyVo">
-        select dhrm_id, dhrm_company_id, dhrm_company_name, dhrm_company_DSK, is_close, bank_name, bank_num, companyId from dhrm_company
-    </sql>
-
-    <select id="selectDhrmCompanyList" parameterType="DhrmCompany" resultMap="DhrmCompanyResult">
-        <include refid="selectDhrmCompanyVo"/>
-        <where>  
-            <if test="dhrmCompanyId != null  and dhrmCompanyId != ''"> and dhrm_company_id = #{dhrmCompanyId}</if>
-            <if test="dhrmCompanyName != null  and dhrmCompanyName != ''"> and dhrm_company_name like concat('%', #{dhrmCompanyName}, '%')</if>
-            <if test="dhrmCompanyDsk != null  and dhrmCompanyDsk != ''"> and dhrm_company_DSK = #{dhrmCompanyDsk}</if>
-            <if test="isClose != null  and isClose != ''"> and is_close = #{isClose}</if>
-            <if test="bankName != null  and bankName != ''"> and bank_name like concat('%', #{bankName}, '%')</if>
-            <if test="bankNum != null  and bankNum != ''"> and bank_num = #{bankNum}</if>
-            <if test="companyId != null  and companyId != ''"> and companyId = #{companyId}</if>
-        </where>
-    </select>
-    
-    <select id="selectDhrmCompanyByDhrmId" parameterType="Long" resultMap="DhrmCompanyResult">
-        <include refid="selectDhrmCompanyVo"/>
-        where dhrm_id = #{dhrmId}
-    </select>
-        
-    <insert id="insertDhrmCompany" parameterType="DhrmCompany" useGeneratedKeys="true" keyProperty="dhrmId">
-        insert into dhrm_company
-        <trim prefix="(" suffix=")" suffixOverrides=",">
-            <if test="dhrmCompanyId != null and dhrmCompanyId != ''">dhrm_company_id,</if>
-            <if test="dhrmCompanyName != null">dhrm_company_name,</if>
-            <if test="dhrmCompanyDsk != null">dhrm_company_DSK,</if>
-            <if test="isClose != null">is_close,</if>
-            <if test="bankName != null">bank_name,</if>
-            <if test="bankNum != null">bank_num,</if>
-            <if test="companyId != null">companyId,</if>
-         </trim>
-        <trim prefix="values (" suffix=")" suffixOverrides=",">
-            <if test="dhrmCompanyId != null and dhrmCompanyId != ''">#{dhrmCompanyId},</if>
-            <if test="dhrmCompanyName != null">#{dhrmCompanyName},</if>
-            <if test="dhrmCompanyDsk != null">#{dhrmCompanyDsk},</if>
-            <if test="isClose != null">#{isClose},</if>
-            <if test="bankName != null">#{bankName},</if>
-            <if test="bankNum != null">#{bankNum},</if>
-            <if test="companyId != null">#{companyId},</if>
-         </trim>
-    </insert>
-
-    <update id="updateDhrmCompany" parameterType="DhrmCompany">
-        update dhrm_company
-        <trim prefix="SET" suffixOverrides=",">
-            <if test="dhrmCompanyId != null and dhrmCompanyId != ''">dhrm_company_id = #{dhrmCompanyId},</if>
-            <if test="dhrmCompanyName != null">dhrm_company_name = #{dhrmCompanyName},</if>
-            <if test="dhrmCompanyDsk != null">dhrm_company_DSK = #{dhrmCompanyDsk},</if>
-            <if test="isClose != null">is_close = #{isClose},</if>
-            <if test="bankName != null">bank_name = #{bankName},</if>
-            <if test="bankNum != null">bank_num = #{bankNum},</if>
-            <if test="companyId != null">companyId = #{companyId},</if>
-        </trim>
-        where dhrm_id = #{dhrmId}
-    </update>
-
-    <delete id="deleteDhrmCompanyByDhrmId" parameterType="Long">
-        delete from dhrm_company where dhrm_id = #{dhrmId}
-    </delete>
-
-    <delete id="deleteDhrmCompanyByDhrmIds" parameterType="String">
-        delete from dhrm_company where dhrm_id in 
-        <foreach item="dhrmId" collection="array" open="(" separator="," close=")">
-            #{dhrmId}
-        </foreach>
-    </delete>
-
-    <select id="selectDhrmCompanyByEmployNo" parameterType="String" resultMap="DhrmCompanyResult">
-        select
-            c.dhrm_id, c.dhrm_company_id, c.dhrm_company_name, c.dhrm_company_DSK, c.is_close, c.bank_name, c.bank_num, c.companyId
-        from
-            dhrm_company c
-        LEFT JOIN dhrm_employee_info e ON e.dhrm_company = c.dhrm_company_id
-        where e.employee_no = #{employNo}
-    </select>
-
-</mapper>

+ 1 - 1
ruoyi-system/src/main/resources/mapper/invest/TProjectChannelMapper.xml

@@ -2,7 +2,7 @@
 <!DOCTYPE mapper
 PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.ruoyi.system.mapper.invest.TProjectChannelMapper">
+<mapper namespace="com.ruoyi.invest.mapper.TProjectChannelMapper">
     
     <resultMap type="TProjectChannel" id="TProjectChannelResult">
         <result property="id"    column="id"    />

+ 1 - 1
ruoyi-system/src/main/resources/mapper/invest/TProjectCompanyMapper.xml

@@ -2,7 +2,7 @@
 <!DOCTYPE mapper
 PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.ruoyi.system.mapper.invest.TProjectCompanyMapper">
+<mapper namespace="com.ruoyi.invest.mapper.TProjectCompanyMapper">
     
     <resultMap type="TProjectCompany" id="TProjectCompanyResult">
         <result property="id"    column="id"    />

+ 1 - 1
ruoyi-system/src/main/resources/mapper/invest/TProjectContactsMapper.xml

@@ -2,7 +2,7 @@
 <!DOCTYPE mapper
 PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.ruoyi.system.mapper.invest.TProjectContactsMapper">
+<mapper namespace="com.ruoyi.invest.mapper.TProjectContactsMapper">
     
     <resultMap type="TProjectContacts" id="TProjectContactsResult">
         <result property="id"    column="id"    />

+ 1 - 1
ruoyi-system/src/main/resources/mapper/invest/TProjectMeetingMapper.xml

@@ -2,7 +2,7 @@
 <!DOCTYPE mapper
 PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.ruoyi.system.mapper.invest.TProjectMeetingMapper">
+<mapper namespace="com.ruoyi.invest.mapper.TProjectMeetingMapper">
     
     <resultMap type="TProjectMeeting" id="TProjectMeetingResult">
         <result property="id"    column="id"    />

+ 1 - 1
ruoyi-system/src/main/resources/mapper/invest/TProjectPoolMapper.xml

@@ -2,7 +2,7 @@
 <!DOCTYPE mapper
 PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.ruoyi.system.mapper.invest.TProjectPoolMapper">
+<mapper namespace="com.ruoyi.invest.mapper.TProjectPoolMapper">
     
     <resultMap type="TProjectPool" id="TProjectPoolResult">
         <result property="id"    column="id"    />

+ 1 - 1
ruoyi-system/src/main/resources/mapper/invest/TProjectRecordMapper.xml

@@ -2,7 +2,7 @@
 <!DOCTYPE mapper
 PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.ruoyi.system.mapper.invest.TProjectRecordMapper">
+<mapper namespace="com.ruoyi.invest.mapper.TProjectRecordMapper">
     
     <resultMap type="TProjectRecord" id="TProjectRecordResult">
         <result property="id"    column="id"    />

A diferenza do arquivo foi suprimida porque é demasiado grande
+ 213 - 0
ruoyi-system/src/main/resources/mapper/invest/TProjectScoringMapper.xml


+ 0 - 3
ruoyi-system/src/main/resources/mapper/system/SysMenuMapper.xml

@@ -82,9 +82,6 @@
 			 left join sys_role ro on ur.role_id = ro.role_id
 			 left join sys_user u on ur.user_id = u.user_id
 		where u.user_id = #{userId} and m.menu_type in ('M', 'C') and m.status = 0  AND ro.status = 0
-		<if test="systemType != null and systemType != ''">
-			AND m.system_type = #{systemType}
-		</if>
 		order by m.parent_id, m.order_num
 	</select>
 	

+ 108 - 0
ruoyi-system/src/main/resources/mapper/tool/TUnifyFileMapper.xml

@@ -0,0 +1,108 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.ruoyi.tool.mapper.TUnifyFileMapper">
+    
+    <resultMap type="TUnifyFile" id="TUnifyFileResult">
+        <result property="id"    column="id"    />
+        <result property="fileId"    column="file_id"    />
+        <result property="uploadName"    column="upload_name"    />
+        <result property="uploadType"    column="upload_type"    />
+        <result property="uploadPath"    column="upload_path"    />
+        <result property="uploadFormat"    column="upload_format"    />
+        <result property="newUploadName"    column="new_upload_name"    />
+        <result property="delFlag"    column="del_flag"    />
+        <result property="fileBusinessId"    column="file_business_id"    />
+        <result property="createBy"    column="create_by"    />
+        <result property="createTime"    column="create_time"    />
+        <result property="updateBy"    column="update_by"    />
+        <result property="updateTime"    column="update_time"    />
+    </resultMap>
+
+    <sql id="selectTUnifyFileVo">
+        select id, file_id, upload_name, upload_type, upload_path, upload_format, new_upload_name, del_flag, file_business_id, create_by, create_time, update_by, update_time from t_unify_file
+    </sql>
+
+    <select id="selectTUnifyFileList" parameterType="TUnifyFile" resultMap="TUnifyFileResult">
+        <include refid="selectTUnifyFileVo"/>
+        <where>  
+            <if test="fileId != null  and fileId != ''"> and file_id = #{fileId}</if>
+            <if test="uploadName != null  and uploadName != ''"> and upload_name like concat('%', #{uploadName}, '%')</if>
+            <if test="uploadType != null  and uploadType != ''"> and upload_type = #{uploadType}</if>
+            <if test="uploadPath != null  and uploadPath != ''"> and upload_path = #{uploadPath}</if>
+            <if test="uploadFormat != null  and uploadFormat != ''"> and upload_format = #{uploadFormat}</if>
+            <if test="newUploadName != null  and newUploadName != ''"> and new_upload_name like concat('%', #{newUploadName}, '%')</if>
+            <if test="fileBusinessId != null  and fileBusinessId != ''"> and file_business_id = #{fileBusinessId}</if>
+        </where>
+    </select>
+    
+    <select id="selectTUnifyFileById" parameterType="String" resultMap="TUnifyFileResult">
+        <include refid="selectTUnifyFileVo"/>
+        where id = #{id}
+    </select>
+        
+    <insert id="insertTUnifyFile" parameterType="TUnifyFile">
+        insert into t_unify_file
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="id != null">id,</if>
+            <if test="fileId != null">file_id,</if>
+            <if test="uploadName != null">upload_name,</if>
+            <if test="uploadType != null">upload_type,</if>
+            <if test="uploadPath != null">upload_path,</if>
+            <if test="uploadFormat != null">upload_format,</if>
+            <if test="newUploadName != null">new_upload_name,</if>
+            <if test="delFlag != null">del_flag,</if>
+            <if test="fileBusinessId != null">file_business_id,</if>
+            <if test="createBy != null">create_by,</if>
+            <if test="createTime != null">create_time,</if>
+            <if test="updateBy != null">update_by,</if>
+            <if test="updateTime != null">update_time,</if>
+         </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="id != null">#{id},</if>
+            <if test="fileId != null">#{fileId},</if>
+            <if test="uploadName != null">#{uploadName},</if>
+            <if test="uploadType != null">#{uploadType},</if>
+            <if test="uploadPath != null">#{uploadPath},</if>
+            <if test="uploadFormat != null">#{uploadFormat},</if>
+            <if test="newUploadName != null">#{newUploadName},</if>
+            <if test="delFlag != null">#{delFlag},</if>
+            <if test="fileBusinessId != null">#{fileBusinessId},</if>
+            <if test="createBy != null">#{createBy},</if>
+            <if test="createTime != null">#{createTime},</if>
+            <if test="updateBy != null">#{updateBy},</if>
+            <if test="updateTime != null">#{updateTime},</if>
+         </trim>
+    </insert>
+
+    <update id="updateTUnifyFile" parameterType="TUnifyFile">
+        update t_unify_file
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="fileId != null">file_id = #{fileId},</if>
+            <if test="uploadName != null">upload_name = #{uploadName},</if>
+            <if test="uploadType != null">upload_type = #{uploadType},</if>
+            <if test="uploadPath != null">upload_path = #{uploadPath},</if>
+            <if test="uploadFormat != null">upload_format = #{uploadFormat},</if>
+            <if test="newUploadName != null">new_upload_name = #{newUploadName},</if>
+            <if test="delFlag != null">del_flag = #{delFlag},</if>
+            <if test="fileBusinessId != null">file_business_id = #{fileBusinessId},</if>
+            <if test="createBy != null">create_by = #{createBy},</if>
+            <if test="createTime != null">create_time = #{createTime},</if>
+            <if test="updateBy != null">update_by = #{updateBy},</if>
+            <if test="updateTime != null">update_time = #{updateTime},</if>
+        </trim>
+        where id = #{id}
+    </update>
+
+    <delete id="deleteTUnifyFileById" parameterType="String">
+        delete from t_unify_file where id = #{id}
+    </delete>
+
+    <delete id="deleteTUnifyFileByIds" parameterType="String">
+        delete from t_unify_file where id in 
+        <foreach item="id" collection="array" open="(" separator="," close=")">
+            #{id}
+        </foreach>
+    </delete>
+</mapper>