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

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

@@ -14,6 +14,7 @@ import com.ruoyi.invest.service.ITProjectChannelService;
 import com.ruoyi.tool.domain.TUnifyFile;
 import com.ruoyi.tool.service.ITUnifyFileService;
 import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -38,7 +39,7 @@ import org.springframework.web.multipart.MultipartFile;
  * @author ruoyi
  * @date 2024-02-22
  */
-@Api("渠道信息")
+@Api(tags = "渠道信息")
 @RestController
 @RequestMapping("/invest/channel")
 public class TProjectChannelController extends BaseController
@@ -55,6 +56,7 @@ public class TProjectChannelController extends BaseController
     /**
      * 查询渠道信息列表
      */
+    @ApiOperation("查询渠道信息列表")
     @PreAuthorize("@ss.hasPermi('invest:channel:list')")
     @GetMapping("/list")
     public TableDataInfo list(TProjectChannel tProjectChannel)
@@ -67,6 +69,7 @@ public class TProjectChannelController extends BaseController
     /**
      * 导出渠道信息列表
      */
+    @ApiOperation("导出渠道信息列表")
     @PreAuthorize("@ss.hasPermi('invest:channel:export')")
     @Log(title = "渠道信息", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
@@ -80,6 +83,7 @@ public class TProjectChannelController extends BaseController
     /**
      * 获取渠道信息详细信息
      */
+    @ApiOperation("获取渠道信息详细信息")
     @PreAuthorize("@ss.hasPermi('invest:channel:query')")
     @GetMapping(value = "/{id}")
     public AjaxResult getInfo(@PathVariable("id") String id)
@@ -90,6 +94,7 @@ public class TProjectChannelController extends BaseController
     /**
      * 新增渠道信息
      */
+    @ApiOperation("新增渠道信息")
     @PreAuthorize("@ss.hasPermi('invest:channel:add')")
     @Log(title = "渠道信息", businessType = BusinessType.INSERT)
     @PostMapping
@@ -127,6 +132,7 @@ public class TProjectChannelController extends BaseController
     /**
      * 修改渠道信息
      */
+    @ApiOperation("修改渠道信息")
     @PreAuthorize("@ss.hasPermi('invest:channel:edit')")
     @Log(title = "渠道信息", businessType = BusinessType.UPDATE)
     @PutMapping
@@ -138,6 +144,7 @@ public class TProjectChannelController extends BaseController
     /**
      * 删除渠道信息
      */
+    @ApiOperation("删除渠道信息")
     @PreAuthorize("@ss.hasPermi('invest:channel:remove')")
     @Log(title = "渠道信息", businessType = BusinessType.DELETE)
 	@DeleteMapping("/{ids}")

ruoyi-admin/src/main/java/com/ruoyi/web/controller/invest/TProjectCirculationController.java

@@ -0,0 +1,115 @@
+package com.ruoyi.web.controller.invest;
+
+import java.util.List;
+import javax.servlet.http.HttpServletResponse;
+
+import com.ruoyi.invest.domain.TProjectCirculation;
+import com.ruoyi.invest.service.ITProjectCirculationService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+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.common.utils.poi.ExcelUtil;
+import com.ruoyi.common.core.page.TableDataInfo;
+
+/**
+ * 项目流转记录Controller
+ * 
+ * @author ruoyi
+ * @date 2024-03-04
+ */
+@Api(tags = "项目流转记录")
+@RestController
+@RequestMapping("/system/circulation")
+public class TProjectCirculationController extends BaseController
+{
+    @Autowired
+    private ITProjectCirculationService tProjectCirculationService;
+
+    /**
+     * 查询项目流转记录列表
+     */
+    @ApiOperation("查询项目流转记录列表")
+    @PreAuthorize("@ss.hasPermi('system:circulation:list')")
+    @GetMapping("/list")
+    public TableDataInfo list(TProjectCirculation tProjectCirculation)
+    {
+        startPage();
+        List<TProjectCirculation> list = tProjectCirculationService.selectTProjectCirculationList(tProjectCirculation);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出项目流转记录列表
+     */
+    @ApiOperation("导出项目流转记录列表")
+    @PreAuthorize("@ss.hasPermi('system:circulation:export')")
+    @Log(title = "项目流转记录", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(HttpServletResponse response, TProjectCirculation tProjectCirculation)
+    {
+        List<TProjectCirculation> list = tProjectCirculationService.selectTProjectCirculationList(tProjectCirculation);
+        ExcelUtil<TProjectCirculation> util = new ExcelUtil<TProjectCirculation>(TProjectCirculation.class);
+        util.exportExcel(response, list, "项目流转记录数据");
+    }
+
+    /**
+     * 获取项目流转记录详细信息
+     */
+    @ApiOperation("获取项目流转记录详细信息")
+    @PreAuthorize("@ss.hasPermi('system:circulation:query')")
+    @GetMapping(value = "/{id}")
+    public AjaxResult getInfo(@PathVariable("id") String id)
+    {
+        return success(tProjectCirculationService.selectTProjectCirculationById(id));
+    }
+
+    /**
+     * 新增项目流转记录
+     */
+    @ApiOperation("新增项目流转记录")
+    @PreAuthorize("@ss.hasPermi('system:circulation:add')")
+    @Log(title = "项目流转记录", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody TProjectCirculation tProjectCirculation)
+    {
+
+        return toAjax(tProjectCirculationService.insertTProjectCirculation(tProjectCirculation));
+    }
+
+    /**
+     * 修改项目流转记录
+     */
+    @ApiOperation("修改项目流转记录")
+    @PreAuthorize("@ss.hasPermi('system:circulation:edit')")
+    @Log(title = "项目流转记录", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@RequestBody TProjectCirculation tProjectCirculation)
+    {
+        return toAjax(tProjectCirculationService.updateTProjectCirculation(tProjectCirculation));
+    }
+
+    /**
+     * 删除项目流转记录
+     */
+    @ApiOperation("删除项目流转记录")
+    @PreAuthorize("@ss.hasPermi('system:circulation:remove')")
+    @Log(title = "项目流转记录", businessType = BusinessType.DELETE)
+	@DeleteMapping("/{ids}")
+    public AjaxResult remove(@PathVariable String[] ids)
+    {
+        return toAjax(tProjectCirculationService.deleteTProjectCirculationByIds(ids));
+    }
+}

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

@@ -14,6 +14,7 @@ import com.ruoyi.invest.service.ITProjectCompanyService;
 import com.ruoyi.tool.domain.TUnifyFile;
 import com.ruoyi.tool.service.ITUnifyFileService;
 import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -38,7 +39,7 @@ import org.springframework.web.multipart.MultipartFile;
  * @author ruoyi
  * @date 2024-02-22
  */
-@Api("项目公司信息")
+@Api(tags = "项目公司信息")
 @RestController
 @RequestMapping("/invest/company")
 public class TProjectCompanyController extends BaseController
@@ -55,6 +56,7 @@ public class TProjectCompanyController extends BaseController
     /**
      * 查询项目公司信息列表
      */
+    @ApiOperation("查询项目公司信息列表")
     @PreAuthorize("@ss.hasPermi('invest:company:list')")
     @GetMapping("/list")
     public TableDataInfo list(TProjectCompany tProjectCompany)
@@ -67,6 +69,7 @@ public class TProjectCompanyController extends BaseController
     /**
      * 导出项目公司信息列表
      */
+    @ApiOperation("导出项目公司信息列表")
     @PreAuthorize("@ss.hasPermi('invest:company:export')")
     @Log(title = "项目公司信息", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
@@ -80,6 +83,7 @@ public class TProjectCompanyController extends BaseController
     /**
      * 获取项目公司信息详细信息
      */
+    @ApiOperation("获取项目公司信息详细信息")
     @PreAuthorize("@ss.hasPermi('invest:company:query')")
     @GetMapping(value = "/{id}")
     public AjaxResult getInfo(@PathVariable("id") String id)
@@ -90,6 +94,7 @@ public class TProjectCompanyController extends BaseController
     /**
      * 新增项目公司信息
      */
+    @ApiOperation("新增项目公司信息")
     @PreAuthorize("@ss.hasPermi('invest:company:add')")
     @Log(title = "项目公司信息", businessType = BusinessType.INSERT)
     @PostMapping
@@ -127,6 +132,7 @@ public class TProjectCompanyController extends BaseController
     /**
      * 修改项目公司信息
      */
+    @ApiOperation("修改项目公司信息")
     @PreAuthorize("@ss.hasPermi('invest:company:edit')")
     @Log(title = "项目公司信息", businessType = BusinessType.UPDATE)
     @PutMapping
@@ -138,6 +144,7 @@ public class TProjectCompanyController extends BaseController
     /**
      * 删除项目公司信息
      */
+    @ApiOperation("删除项目公司信息")
     @PreAuthorize("@ss.hasPermi('invest:company:remove')")
     @Log(title = "项目公司信息", businessType = BusinessType.DELETE)
 	@DeleteMapping("/{ids}")

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

@@ -6,6 +6,7 @@ import javax.servlet.http.HttpServletResponse;
 import com.ruoyi.invest.domain.TProjectContacts;
 import com.ruoyi.invest.service.ITProjectContactsService;
 import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -29,7 +30,7 @@ import com.ruoyi.common.core.page.TableDataInfo;
  * @author ruoyi
  * @date 2024-02-22
  */
-@Api("项目联系人")
+@Api(tags = "项目联系人")
 @RestController
 @RequestMapping("/invest/contacts")
 public class TProjectContactsController extends BaseController
@@ -40,6 +41,7 @@ public class TProjectContactsController extends BaseController
     /**
      * 查询项目联系人列表
      */
+    @ApiOperation("查询项目联系人列表")
     @PreAuthorize("@ss.hasPermi('invest:contacts:list')")
     @GetMapping("/list")
     public TableDataInfo list(TProjectContacts tProjectContacts)
@@ -52,6 +54,7 @@ public class TProjectContactsController extends BaseController
     /**
      * 导出项目联系人列表
      */
+    @ApiOperation("导出项目联系人列表")
     @PreAuthorize("@ss.hasPermi('invest:contacts:export')")
     @Log(title = "项目联系人", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
@@ -65,6 +68,7 @@ public class TProjectContactsController extends BaseController
     /**
      * 获取项目联系人详细信息
      */
+    @ApiOperation("获取项目联系人详细信息")
     @PreAuthorize("@ss.hasPermi('invest:contacts:query')")
     @GetMapping(value = "/{id}")
     public AjaxResult getInfo(@PathVariable("id") String id)
@@ -75,6 +79,7 @@ public class TProjectContactsController extends BaseController
     /**
      * 新增项目联系人
      */
+    @ApiOperation("新增项目联系人")
     @PreAuthorize("@ss.hasPermi('invest:contacts:add')")
     @Log(title = "项目联系人", businessType = BusinessType.INSERT)
     @PostMapping
@@ -87,6 +92,7 @@ public class TProjectContactsController extends BaseController
     /**
      * 修改项目联系人
      */
+    @ApiOperation("修改项目联系人")
     @PreAuthorize("@ss.hasPermi('invest:contacts:edit')")
     @Log(title = "项目联系人", businessType = BusinessType.UPDATE)
     @PutMapping
@@ -98,6 +104,7 @@ public class TProjectContactsController extends BaseController
     /**
      * 删除项目联系人
      */
+    @ApiOperation("删除项目联系人")
     @PreAuthorize("@ss.hasPermi('invest:contacts:remove')")
     @Log(title = "项目联系人", businessType = BusinessType.DELETE)
 	@DeleteMapping("/{ids}")

ruoyi-admin/src/main/java/com/ruoyi/web/controller/invest/TProjectContractController.java

@@ -12,6 +12,7 @@ import com.ruoyi.framework.config.ServerConfig;
 import com.ruoyi.tool.domain.TUnifyFile;
 import com.ruoyi.tool.service.ITUnifyFileService;
 import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -38,7 +39,7 @@ import org.springframework.web.multipart.MultipartFile;
  * @author ruoyi
  * @date 2024-02-23
  */
-@Api("合同管理")
+@Api(tags = "合同管理")
 @RestController
 @RequestMapping("/invest/contract")
 public class TProjectContractController extends BaseController
@@ -55,6 +56,7 @@ public class TProjectContractController extends BaseController
     /**
      * 查询合同管理列表
      */
+    @ApiOperation("查询合同管理列表")
     @PreAuthorize("@ss.hasPermi('invest:contract:list')")
     @GetMapping("/list")
     public TableDataInfo list(TProjectContract tProjectContract)
@@ -67,6 +69,7 @@ public class TProjectContractController extends BaseController
     /**
      * 导出合同管理列表
      */
+    @ApiOperation("导出合同管理列表")
     @PreAuthorize("@ss.hasPermi('invest:contract:export')")
     @Log(title = "合同管理", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
@@ -80,6 +83,7 @@ public class TProjectContractController extends BaseController
     /**
      * 获取合同管理详细信息
      */
+    @ApiOperation("获取合同管理详细信息")
     @PreAuthorize("@ss.hasPermi('invest:contract:query')")
     @GetMapping(value = "/{id}")
     public AjaxResult getInfo(@PathVariable("id") String id)
@@ -90,6 +94,7 @@ public class TProjectContractController extends BaseController
     /**
      * 新增合同管理
      */
+    @ApiOperation("新增合同管理")
     @PreAuthorize("@ss.hasPermi('invest:contract:add')")
     @Log(title = "合同管理", businessType = BusinessType.INSERT)
     @PostMapping
@@ -127,6 +132,7 @@ public class TProjectContractController extends BaseController
     /**
      * 修改合同管理
      */
+    @ApiOperation("修改合同管理")
     @PreAuthorize("@ss.hasPermi('invest:contract:edit')")
     @Log(title = "合同管理", businessType = BusinessType.UPDATE)
     @PutMapping
@@ -138,6 +144,7 @@ public class TProjectContractController extends BaseController
     /**
      * 删除合同管理
      */
+    @ApiOperation("删除合同管理")
     @PreAuthorize("@ss.hasPermi('invest:contract:remove')")
     @Log(title = "合同管理", businessType = BusinessType.DELETE)
 	@DeleteMapping("/{ids}")

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

@@ -14,6 +14,7 @@ import com.ruoyi.invest.service.ITProjectInformationService;
 import com.ruoyi.tool.domain.TUnifyFile;
 import com.ruoyi.tool.service.ITUnifyFileService;
 import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -38,7 +39,7 @@ import org.springframework.web.multipart.MultipartFile;
  * @author ruoyi
  * @date 2024-02-22
  */
-@Api("文件资料")
+@Api(tags = "文件资料")
 @RestController
 @RequestMapping("/invest/information")
 public class TProjectInformationController extends BaseController
@@ -55,6 +56,7 @@ public class TProjectInformationController extends BaseController
     /**
      * 查询文件资料列表
      */
+    @ApiOperation("查询文件资料列表")
     @PreAuthorize("@ss.hasPermi('invest:information:list')")
     @GetMapping("/list")
     public TableDataInfo list(TProjectInformation tProjectInformation)
@@ -67,6 +69,7 @@ public class TProjectInformationController extends BaseController
     /**
      * 导出文件资料列表
      */
+    @ApiOperation("导出文件资料列表")
     @PreAuthorize("@ss.hasPermi('invest:information:export')")
     @Log(title = "文件资料", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
@@ -80,6 +83,7 @@ public class TProjectInformationController extends BaseController
     /**
      * 获取文件资料详细信息
      */
+    @ApiOperation("获取文件资料详细信息")
     @PreAuthorize("@ss.hasPermi('invest:information:query')")
     @GetMapping(value = "/{id}")
     public AjaxResult getInfo(@PathVariable("id") String id)
@@ -90,6 +94,7 @@ public class TProjectInformationController extends BaseController
     /**
      * 新增文件资料
      */
+    @ApiOperation("新增文件资料")
     @PreAuthorize("@ss.hasPermi('invest:information:add')")
     @Log(title = "文件资料", businessType = BusinessType.INSERT)
     @PostMapping
@@ -127,6 +132,7 @@ public class TProjectInformationController extends BaseController
     /**
      * 修改文件资料
      */
+    @ApiOperation("修改文件资料")
     @PreAuthorize("@ss.hasPermi('invest:information:edit')")
     @Log(title = "文件资料", businessType = BusinessType.UPDATE)
     @PutMapping
@@ -138,6 +144,7 @@ public class TProjectInformationController extends BaseController
     /**
      * 删除文件资料
      */
+    @ApiOperation("删除文件资料")
     @PreAuthorize("@ss.hasPermi('invest:information:remove')")
     @Log(title = "文件资料", businessType = BusinessType.DELETE)
 	@DeleteMapping("/{ids}")

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

@@ -14,6 +14,7 @@ import com.ruoyi.invest.service.ITProjectMeetingService;
 import com.ruoyi.tool.domain.TUnifyFile;
 import com.ruoyi.tool.service.ITUnifyFileService;
 import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -38,7 +39,7 @@ import org.springframework.web.multipart.MultipartFile;
  * @author ruoyi
  * @date 2024-02-22
  */
-@Api("会议记录")
+@Api(tags = "会议记录")
 @RestController
 @RequestMapping("/invest/meeting")
 public class TProjectMeetingController extends BaseController
@@ -55,6 +56,7 @@ public class TProjectMeetingController extends BaseController
     /**
      * 查询会议记录列表
      */
+    @ApiOperation("查询会议记录列表")
     @PreAuthorize("@ss.hasPermi('invest:meeting:list')")
     @GetMapping("/list")
     public TableDataInfo list(TProjectMeeting tProjectMeeting)
@@ -67,6 +69,7 @@ public class TProjectMeetingController extends BaseController
     /**
      * 导出会议记录列表
      */
+    @ApiOperation("导出会议记录列表")
     @PreAuthorize("@ss.hasPermi('invest:meeting:export')")
     @Log(title = "会议记录", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
@@ -80,6 +83,7 @@ public class TProjectMeetingController extends BaseController
     /**
      * 获取会议记录详细信息
      */
+    @ApiOperation("获取会议记录详细信息")
     @PreAuthorize("@ss.hasPermi('invest:meeting:query')")
     @GetMapping(value = "/{id}")
     public AjaxResult getInfo(@PathVariable("id") String id)
@@ -90,6 +94,7 @@ public class TProjectMeetingController extends BaseController
     /**
      * 新增会议记录
      */
+    @ApiOperation("新增会议记录")
     @PreAuthorize("@ss.hasPermi('invest:meeting:add')")
     @Log(title = "会议记录", businessType = BusinessType.INSERT)
     @PostMapping
@@ -127,6 +132,7 @@ public class TProjectMeetingController extends BaseController
     /**
      * 修改会议记录
      */
+    @ApiOperation("修改会议记录")
     @PreAuthorize("@ss.hasPermi('invest:meeting:edit')")
     @Log(title = "会议记录", businessType = BusinessType.UPDATE)
     @PutMapping
@@ -138,6 +144,7 @@ public class TProjectMeetingController extends BaseController
     /**
      * 删除会议记录
      */
+    @ApiOperation("删除会议记录")
     @PreAuthorize("@ss.hasPermi('invest:meeting:remove')")
     @Log(title = "会议记录", businessType = BusinessType.DELETE)
 	@DeleteMapping("/{ids}")
@@ -149,6 +156,7 @@ public class TProjectMeetingController extends BaseController
     /**
      * 根据项目ID获取会议记录
      */
+    @ApiOperation("根据项目ID获取会议记录")
     @PreAuthorize("@ss.hasPermi('invest:meeting:query')")
     @GetMapping(value = "/listProjectPoolId")
     public AjaxResult listProjectPoolId(String projectPoolId)

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

@@ -3,9 +3,24 @@ package com.ruoyi.web.controller.invest;
 import java.util.List;
 import javax.servlet.http.HttpServletResponse;
 
+import com.ruoyi.common.config.RuoYiConfig;
+import com.ruoyi.common.enums.FileType;
+import com.ruoyi.common.utils.file.FileUploadUtils;
+import com.ruoyi.common.utils.file.FileUtils;
+import com.ruoyi.common.utils.uuid.IdUtils;
+import com.ruoyi.framework.config.ServerConfig;
+import com.ruoyi.invest.domain.TProjectCirculation;
+import com.ruoyi.invest.domain.TProjectCompany;
+import com.ruoyi.invest.domain.TProjectContacts;
 import com.ruoyi.invest.domain.TProjectPool;
+import com.ruoyi.invest.service.ITProjectCirculationService;
+import com.ruoyi.invest.service.ITProjectCompanyService;
+import com.ruoyi.invest.service.ITProjectContactsService;
 import com.ruoyi.invest.service.ITProjectPoolService;
+import com.ruoyi.tool.domain.TUnifyFile;
+import com.ruoyi.tool.service.ITUnifyFileService;
 import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -22,6 +37,7 @@ import com.ruoyi.common.core.domain.AjaxResult;
 import com.ruoyi.common.enums.BusinessType;
 import com.ruoyi.common.utils.poi.ExcelUtil;
 import com.ruoyi.common.core.page.TableDataInfo;
+import org.springframework.web.multipart.MultipartFile;
 
 /**
  * 项目池Controller
@@ -29,7 +45,7 @@ import com.ruoyi.common.core.page.TableDataInfo;
  * @author ruoyi
  * @date 2024-02-21
  */
-@Api("项目池")
+@Api(tags = "项目池")
 @RestController
 @RequestMapping("/invest/pool")
 public class TProjectPoolController extends BaseController
@@ -37,9 +53,25 @@ public class TProjectPoolController extends BaseController
     @Autowired
     private ITProjectPoolService tProjectPoolService;
 
+    @Autowired
+    private ITProjectCompanyService tProjectCompanyService;
+
+    @Autowired
+    private ITProjectContactsService tProjectContactsService;
+
+    @Autowired
+    private ITProjectCirculationService tProjectCirculationService;
+
+    @Autowired
+    private ITUnifyFileService tUnifyFileService;
+
+    @Autowired
+    private ServerConfig serverConfig;
+
     /**
      * 查询项目池列表
      */
+    @ApiOperation("查询项目池列表")
     @PreAuthorize("@ss.hasPermi('invest:pool:list')")
     @GetMapping("/list")
     public TableDataInfo list(TProjectPool tProjectPool)
@@ -52,6 +84,7 @@ public class TProjectPoolController extends BaseController
     /**
      * 导出项目池列表
      */
+    @ApiOperation("导出项目池列表")
     @PreAuthorize("@ss.hasPermi('invest:pool:export')")
     @Log(title = "项目池", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
@@ -65,39 +98,118 @@ public class TProjectPoolController extends BaseController
     /**
      * 获取项目池详细信息
      */
+    @ApiOperation("获取项目池详细信息")
     @PreAuthorize("@ss.hasPermi('invest:pool:query')")
     @GetMapping(value = "/{id}")
     public AjaxResult getInfo(@PathVariable("id") String id)
     {
-        return success(tProjectPoolService.selectTProjectPoolById(id));
+        TProjectPool tProjectPool = tProjectPoolService.selectTProjectPoolById(id);
+
+        return success(tProjectPool);
     }
 
     /**
      * 新增项目池
      */
+    @ApiOperation("新增项目池")
     @PreAuthorize("@ss.hasPermi('invest:pool:add')")
     @Log(title = "项目池", businessType = BusinessType.INSERT)
     @PostMapping
-    public AjaxResult add(@RequestBody TProjectPool tProjectPool)
+    public AjaxResult add(@RequestBody TProjectPool tProjectPool,List<MultipartFile> files)
     {
         tProjectPool.setCreateBy(getNickName());
+        tProjectPool.setId(IdUtils.fastSimpleUUID());
+        TProjectCompany tProjectCompany = tProjectPool.gettProjectCompany();
+        tProjectCompany.setCreateBy(getNickName());
+        tProjectCompany.setId(IdUtils.fastSimpleUUID());
+        TProjectContacts tProjectContacts = tProjectPool.gettProjectContacts();
+        tProjectContacts.setCreateBy(getNickName());
+        tProjectContacts.setId(IdUtils.fastSimpleUUID());
+        try {
+            // 上传文件路径
+            String filePath = RuoYiConfig.getUploadPath();
+            if(!files.isEmpty()){
+                for (MultipartFile file : files)
+                {
+                    // 上传并返回新文件名称
+                    String fileName = FileUploadUtils.upload(filePath, file);
+                    String url = serverConfig.getUrl() + fileName;
+                    TUnifyFile tUnifyFile = new TUnifyFile();
+                    tUnifyFile.setUploadPath(url);
+                    tUnifyFile.setUploadName(fileName);
+                    tUnifyFile.setNewUploadName(FileUtils.getName(fileName));
+                    tUnifyFile.setUploadFormat(file.getOriginalFilename());
+                    tUnifyFile.setFileBusinessId(tProjectCompany.getId());//公司ID
+                    tUnifyFile.setUploadType(String.valueOf(FileType.COMPANY.ordinal()));//文件类型:公司信息
+                    tUnifyFile.setCreateBy(getNickName());
+                    tUnifyFileService.insertTUnifyFile(tUnifyFile);
+                }
+            }
+        }
+        catch (Exception e)
+        {
+            return AjaxResult.error(e.getMessage());
+        }
+        tProjectCompanyService.insertTProjectCompany(tProjectCompany);
+        tProjectContactsService.insertTProjectContacts(tProjectContacts);
+        // todo 增加项目创建记录
+        TProjectCirculation tProjectCirculation = new TProjectCirculation();
+        tProjectCirculation.setProjectPoolId(tProjectPool.getId());
+        tProjectCirculation.setStageName("项目报备");
+        tProjectCirculation.setCreateBy(getNickName());
+        tProjectCirculationService.insertTProjectCirculation(tProjectCirculation);
+
         return toAjax(tProjectPoolService.insertTProjectPool(tProjectPool));
     }
 
     /**
      * 修改项目池
      */
+    @ApiOperation("修改项目池")
     @PreAuthorize("@ss.hasPermi('invest:pool:edit')")
     @Log(title = "项目池", businessType = BusinessType.UPDATE)
     @PutMapping
-    public AjaxResult edit(@RequestBody TProjectPool tProjectPool)
+    public AjaxResult edit(@RequestBody TProjectPool tProjectPool,List<MultipartFile> files)
     {
+        tProjectPool.setUpdateBy(getNickName());
+        TProjectCompany tProjectCompany = tProjectPool.gettProjectCompany();
+        tProjectCompany.setUpdateBy(getNickName());
+        TProjectContacts tProjectContacts = tProjectPool.gettProjectContacts();
+        tProjectContacts.setUpdateBy(getNickName());
+        try {
+            // 上传文件路径
+            String filePath = RuoYiConfig.getUploadPath();
+            for (MultipartFile file : files)
+            {
+                // 上传并返回新文件名称
+                String fileName = FileUploadUtils.upload(filePath, file);
+                String url = serverConfig.getUrl() + fileName;
+                TUnifyFile tUnifyFile = new TUnifyFile();
+                tUnifyFile.setUploadPath(url);
+                tUnifyFile.setUploadName(fileName);
+                tUnifyFile.setNewUploadName(FileUtils.getName(fileName));
+                tUnifyFile.setUploadFormat(file.getOriginalFilename());
+                tUnifyFile.setFileBusinessId(tProjectCompany.getId());//公司ID
+                tUnifyFile.setUploadType(String.valueOf(FileType.COMPANY.ordinal()));//文件类型:公司信息
+                tUnifyFile.setCreateBy(getNickName());
+                // todo 修改时删除原附件上传后保存新上传附件内容
+
+                tUnifyFileService.insertTUnifyFile(tUnifyFile);
+            }
+        }
+        catch (Exception e)
+        {
+            return AjaxResult.error(e.getMessage());
+        }
+        tProjectCompanyService.updateTProjectCompany(tProjectCompany);
+        tProjectContactsService.updateTProjectContacts(tProjectContacts);
         return toAjax(tProjectPoolService.updateTProjectPool(tProjectPool));
     }
 
     /**
      * 删除项目池
      */
+    @ApiOperation("删除项目池")
     @PreAuthorize("@ss.hasPermi('invest:pool:remove')")
     @Log(title = "项目池", businessType = BusinessType.DELETE)
 	@DeleteMapping("/{ids}")
@@ -105,4 +217,25 @@ public class TProjectPoolController extends BaseController
     {
         return toAjax(tProjectPoolService.updateTProjectPoolByIds(ids));
     }
+
+    /**
+     * 修改项目池状态
+     */
+    @ApiOperation("修改项目池状态")
+    @PreAuthorize("@ss.hasPermi('invest:pool:edit')")
+    @Log(title = "项目池", businessType = BusinessType.UPDATE)
+    @PutMapping("/editStage")
+    public AjaxResult editStage(@RequestBody TProjectPool tProjectPool)
+    {
+        tProjectPool.setUpdateBy(getNickName());
+        // todo 增加项目创建记录
+        TProjectCirculation tProjectCirculation = new TProjectCirculation();
+        tProjectCirculation.setProjectPoolId(tProjectPool.getId());
+        tProjectCirculation.setStageName("项目报备");
+        tProjectCirculation.setCreateBy(getNickName());
+        tProjectCirculationService.insertTProjectCirculation(tProjectCirculation);
+
+        return toAjax(tProjectPoolService.updateTProjectPool(tProjectPool));
+    }
+
 }

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

@@ -14,6 +14,7 @@ import com.ruoyi.invest.service.ITProjectRecordService;
 import com.ruoyi.tool.domain.TUnifyFile;
 import com.ruoyi.tool.service.ITUnifyFileService;
 import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -38,7 +39,7 @@ import org.springframework.web.multipart.MultipartFile;
  * @author ruoyi
  * @date 2024-02-21
  */
-@Api("跟进记录")
+@Api(tags = "跟进记录")
 @RestController
 @RequestMapping("/invest/record")
 public class TProjectRecordController extends BaseController
@@ -55,6 +56,7 @@ public class TProjectRecordController extends BaseController
     /**
      * 查询跟进记录列表
      */
+    @ApiOperation("查询跟进记录列表")
     @PreAuthorize("@ss.hasPermi('invest:record:list')")
     @GetMapping("/list")
     public TableDataInfo list(TProjectRecord tProjectRecord)
@@ -67,6 +69,7 @@ public class TProjectRecordController extends BaseController
     /**
      * 导出跟进记录列表
      */
+    @ApiOperation("导出跟进记录列表")
     @PreAuthorize("@ss.hasPermi('invest:record:export')")
     @Log(title = "跟进记录", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
@@ -80,6 +83,7 @@ public class TProjectRecordController extends BaseController
     /**
      * 获取跟进记录详细信息
      */
+    @ApiOperation("获取跟进记录详细信息")
     @PreAuthorize("@ss.hasPermi('invest:record:query')")
     @GetMapping(value = "/{id}")
     public AjaxResult getInfo(@PathVariable("id") String id)
@@ -90,6 +94,7 @@ public class TProjectRecordController extends BaseController
     /**
      * 新增跟进记录
      */
+    @ApiOperation("新增跟进记录")
     @PreAuthorize("@ss.hasPermi('invest:record:add')")
     @Log(title = "跟进记录", businessType = BusinessType.INSERT)
     @PostMapping
@@ -127,6 +132,7 @@ public class TProjectRecordController extends BaseController
     /**
      * 修改跟进记录
      */
+    @ApiOperation("修改跟进记录")
     @PreAuthorize("@ss.hasPermi('invest:record:edit')")
     @Log(title = "跟进记录", businessType = BusinessType.UPDATE)
     @PutMapping
@@ -138,6 +144,7 @@ public class TProjectRecordController extends BaseController
     /**
      * 删除跟进记录
      */
+    @ApiOperation("删除跟进记录")
     @PreAuthorize("@ss.hasPermi('invest:record:remove')")
     @Log(title = "跟进记录", businessType = BusinessType.DELETE)
 	@DeleteMapping("/{ids}")
@@ -149,6 +156,7 @@ public class TProjectRecordController extends BaseController
     /**
      * 根据项目ID获取跟进记录
      */
+    @ApiOperation("根据项目ID获取跟进记录")
     @PreAuthorize("@ss.hasPermi('invest:meeting:query')")
     @GetMapping(value = "/listPorjectId")
     public AjaxResult listPorjectId(String porjectId)

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

@@ -4,6 +4,7 @@ import java.util.List;
 import javax.servlet.http.HttpServletResponse;
 
 import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -29,7 +30,7 @@ import com.ruoyi.common.core.page.TableDataInfo;
  * @author ruoyi
  * @date 2024-02-23
  */
-@Api("打分表接口")
+@Api(tags = "打分表接口")
 @RestController
 @RequestMapping("/invest/scoring")
 public class TProjectScoringController extends BaseController
@@ -40,6 +41,7 @@ public class TProjectScoringController extends BaseController
     /**
      * 查询打分列表
      */
+    @ApiOperation("查询打分列表")
     @PreAuthorize("@ss.hasPermi('invest:scoring:list')")
     @GetMapping("/list")
     public TableDataInfo list(TProjectScoring tProjectScoring)
@@ -52,6 +54,7 @@ public class TProjectScoringController extends BaseController
     /**
      * 导出打分列表
      */
+    @ApiOperation("导出打分列表")
     @PreAuthorize("@ss.hasPermi('invest:scoring:export')")
     @Log(title = "打分", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
@@ -65,6 +68,7 @@ public class TProjectScoringController extends BaseController
     /**
      * 获取打分详细信息
      */
+    @ApiOperation("获取打分详细信息")
     @PreAuthorize("@ss.hasPermi('invest:scoring:query')")
     @GetMapping(value = "/{id}")
     public AjaxResult getInfo(@PathVariable("id") String id)
@@ -75,6 +79,7 @@ public class TProjectScoringController extends BaseController
     /**
      * 新增打分
      */
+    @ApiOperation("新增打分")
     @PreAuthorize("@ss.hasPermi('invest:scoring:add')")
     @Log(title = "打分", businessType = BusinessType.INSERT)
     @PostMapping
@@ -87,6 +92,7 @@ public class TProjectScoringController extends BaseController
     /**
      * 修改打分
      */
+    @ApiOperation("修改打分")
     @PreAuthorize("@ss.hasPermi('invest:scoring:edit')")
     @Log(title = "打分", businessType = BusinessType.UPDATE)
     @PutMapping
@@ -98,6 +104,7 @@ public class TProjectScoringController extends BaseController
     /**
      * 删除打分
      */
+    @ApiOperation("删除打分")
     @PreAuthorize("@ss.hasPermi('invest:scoring:remove')")
     @Log(title = "打分", businessType = BusinessType.DELETE)
 	@DeleteMapping("/{ids}")

ruoyi-admin/src/main/java/com/ruoyi/web/controller/invest/TStudyInformationController.java

@@ -12,6 +12,7 @@ import com.ruoyi.framework.config.ServerConfig;
 import com.ruoyi.tool.domain.TUnifyFile;
 import com.ruoyi.tool.service.ITUnifyFileService;
 import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -38,7 +39,7 @@ import org.springframework.web.multipart.MultipartFile;
  * @author ruoyi
  * @date 2024-02-26
  */
-@Api("研究资料管理")
+@Api(tags = "研究资料管理")
 @RestController
 @RequestMapping("/study/gen")
 public class TStudyInformationController extends BaseController
@@ -55,6 +56,7 @@ public class TStudyInformationController extends BaseController
     /**
      * 查询研究资料管理列表
      */
+    @ApiOperation("查询研究资料管理列表")
     @PreAuthorize("@ss.hasPermi('study:gen:list')")
     @GetMapping("/list")
     public TableDataInfo list(TStudyInformation tStudyInformation)
@@ -67,6 +69,7 @@ public class TStudyInformationController extends BaseController
     /**
      * 导出研究资料管理列表
      */
+    @ApiOperation("导出研究资料管理列表")
     @PreAuthorize("@ss.hasPermi('study:gen:export')")
     @Log(title = "研究资料管理", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
@@ -80,6 +83,7 @@ public class TStudyInformationController extends BaseController
     /**
      * 获取研究资料管理详细信息
      */
+    @ApiOperation("获取研究资料管理详细信息")
     @PreAuthorize("@ss.hasPermi('study:gen:query')")
     @GetMapping(value = "/{id}")
     public AjaxResult getInfo(@PathVariable("id") String id)
@@ -90,6 +94,7 @@ public class TStudyInformationController extends BaseController
     /**
      * 新增研究资料管理
      */
+    @ApiOperation("新增研究资料管理")
     @PreAuthorize("@ss.hasPermi('study:gen:add')")
     @Log(title = "研究资料管理", businessType = BusinessType.INSERT)
     @PostMapping
@@ -127,6 +132,7 @@ public class TStudyInformationController extends BaseController
     /**
      * 修改研究资料管理
      */
+    @ApiOperation("修改研究资料管理")
     @PreAuthorize("@ss.hasPermi('study:gen:edit')")
     @Log(title = "研究资料管理", businessType = BusinessType.UPDATE)
     @PutMapping
@@ -138,6 +144,7 @@ public class TStudyInformationController extends BaseController
     /**
      * 删除研究资料管理
      */
+    @ApiOperation("删除研究资料管理")
     @PreAuthorize("@ss.hasPermi('study:gen:remove')")
     @Log(title = "研究资料管理", businessType = BusinessType.DELETE)
 	@DeleteMapping("/{ids}")

ruoyi-system/src/main/java/com/ruoyi/invest/domain/TProjectCirculation.java

@@ -0,0 +1,67 @@
+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_circulation
+ * 
+ * @author ruoyi
+ * @date 2024-03-04
+ */
+public class TProjectCirculation extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 主键id */
+    private String id;
+
+    /** 阶段名称 */
+    @Excel(name = "阶段名称")
+    private String stageName;
+
+    /** 项目ID */
+    @Excel(name = "项目ID")
+    private String projectPoolId;
+
+    public void setId(String id) 
+    {
+        this.id = id;
+    }
+
+    public String getId() 
+    {
+        return id;
+    }
+    public void setStageName(String stageName) 
+    {
+        this.stageName = stageName;
+    }
+
+    public String getStageName() 
+    {
+        return stageName;
+    }
+    public void setProjectPoolId(String projectPoolId) 
+    {
+        this.projectPoolId = projectPoolId;
+    }
+
+    public String getProjectPoolId() 
+    {
+        return projectPoolId;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("id", getId())
+            .append("stageName", getStageName())
+            .append("projectPoolId", getProjectPoolId())
+            .append("createBy", getCreateBy())
+            .append("createTime", getCreateTime())
+            .toString();
+    }
+}

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

@@ -2,6 +2,7 @@ package com.ruoyi.invest.domain;
 
 import java.util.Date;
 import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModelProperty;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 import com.ruoyi.common.annotation.Excel;
@@ -18,7 +19,7 @@ public class TProjectPool extends BaseEntity
     private static final long serialVersionUID = 1L;
 
     /** 主键id */
-
+    @ApiModelProperty("主键id")
     private String id;
 
     /** 项目名称 */
@@ -134,6 +135,13 @@ public class TProjectPool extends BaseEntity
     /** 状态 */
     private String delFlag;
 
+    /** 公司信息 */
+    private TProjectCompany tProjectCompany;
+
+    /** 公司信息 */
+    private TProjectContacts tProjectContacts;
+
+
     public void setId(String id) 
     {
         this.id = id;
@@ -405,6 +413,22 @@ public class TProjectPool extends BaseEntity
         return delFlag;
     }
 
+    public TProjectCompany gettProjectCompany() {
+        return tProjectCompany;
+    }
+
+    public void settProjectCompany(TProjectCompany tProjectCompany) {
+        this.tProjectCompany = tProjectCompany;
+    }
+
+    public TProjectContacts gettProjectContacts() {
+        return tProjectContacts;
+    }
+
+    public void settProjectContacts(TProjectContacts tProjectContacts) {
+        this.tProjectContacts = tProjectContacts;
+    }
+
     @Override
     public String toString() {
         return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)

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

@@ -2,6 +2,7 @@ package com.ruoyi.invest.domain;
 
 import java.util.Date;
 import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModelProperty;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 import com.ruoyi.common.annotation.Excel;
@@ -18,36 +19,45 @@ public class TProjectRecord extends BaseEntity
     private static final long serialVersionUID = 1L;
 
     /** 主键ID */
+    @ApiModelProperty("主键ID")
     private String id;
 
     /** 项目ID */
+    @ApiModelProperty("项目ID")
     @Excel(name = "项目ID")
     private String porjectId;
 
     /** 联系人 */
+    @ApiModelProperty("联系人")
     @Excel(name = "联系人")
     private String contacts;
 
     /** 实际跟进日期 */
+    @ApiModelProperty("实际跟进日期")
     @JsonFormat(pattern = "yyyy-MM-dd")
     @Excel(name = "实际跟进日期", width = 30, dateFormat = "yyyy-MM-dd")
     private Date realityUpDate;
 
     /** 跟进人 */
+    @ApiModelProperty("跟进人")
     @Excel(name = "跟进人")
     private String upPerson;
 
     /** 跟进方式 */
+    @ApiModelProperty("跟进方式")
     @Excel(name = "跟进方式")
     private String upWay;
 
     /** 跟进内容 */
+    @ApiModelProperty("跟进内容")
     private String upContent;
 
     /** 备注 */
+    @ApiModelProperty("备注")
     private String mark;
 
     /** 状态 */
+    @ApiModelProperty("状态")
     private String delFlag;
 
     public void setId(String id) 

ruoyi-system/src/main/java/com/ruoyi/invest/mapper/TProjectCirculationMapper.java

@@ -0,0 +1,62 @@
+package com.ruoyi.invest.mapper;
+
+import com.ruoyi.invest.domain.TProjectCirculation;
+
+import java.util.List;
+
+/**
+ * 项目流转记录Mapper接口
+ * 
+ * @author ruoyi
+ * @date 2024-03-04
+ */
+public interface TProjectCirculationMapper 
+{
+    /**
+     * 查询项目流转记录
+     * 
+     * @param id 项目流转记录主键
+     * @return 项目流转记录
+     */
+    public TProjectCirculation selectTProjectCirculationById(String id);
+
+    /**
+     * 查询项目流转记录列表
+     * 
+     * @param tProjectCirculation 项目流转记录
+     * @return 项目流转记录集合
+     */
+    public List<TProjectCirculation> selectTProjectCirculationList(TProjectCirculation tProjectCirculation);
+
+    /**
+     * 新增项目流转记录
+     * 
+     * @param tProjectCirculation 项目流转记录
+     * @return 结果
+     */
+    public int insertTProjectCirculation(TProjectCirculation tProjectCirculation);
+
+    /**
+     * 修改项目流转记录
+     * 
+     * @param tProjectCirculation 项目流转记录
+     * @return 结果
+     */
+    public int updateTProjectCirculation(TProjectCirculation tProjectCirculation);
+
+    /**
+     * 删除项目流转记录
+     * 
+     * @param id 项目流转记录主键
+     * @return 结果
+     */
+    public int deleteTProjectCirculationById(String id);
+
+    /**
+     * 批量删除项目流转记录
+     * 
+     * @param ids 需要删除的数据主键集合
+     * @return 结果
+     */
+    public int deleteTProjectCirculationByIds(String[] ids);
+}

ruoyi-system/src/main/java/com/ruoyi/invest/service/ITProjectCirculationService.java

@@ -0,0 +1,62 @@
+package com.ruoyi.invest.service;
+
+import com.ruoyi.invest.domain.TProjectCirculation;
+
+import java.util.List;
+
+/**
+ * 项目流转记录Service接口
+ * 
+ * @author ruoyi
+ * @date 2024-03-04
+ */
+public interface ITProjectCirculationService 
+{
+    /**
+     * 查询项目流转记录
+     * 
+     * @param id 项目流转记录主键
+     * @return 项目流转记录
+     */
+    public TProjectCirculation selectTProjectCirculationById(String id);
+
+    /**
+     * 查询项目流转记录列表
+     * 
+     * @param tProjectCirculation 项目流转记录
+     * @return 项目流转记录集合
+     */
+    public List<TProjectCirculation> selectTProjectCirculationList(TProjectCirculation tProjectCirculation);
+
+    /**
+     * 新增项目流转记录
+     * 
+     * @param tProjectCirculation 项目流转记录
+     * @return 结果
+     */
+    public int insertTProjectCirculation(TProjectCirculation tProjectCirculation);
+
+    /**
+     * 修改项目流转记录
+     * 
+     * @param tProjectCirculation 项目流转记录
+     * @return 结果
+     */
+    public int updateTProjectCirculation(TProjectCirculation tProjectCirculation);
+
+    /**
+     * 批量删除项目流转记录
+     * 
+     * @param ids 需要删除的项目流转记录主键集合
+     * @return 结果
+     */
+    public int deleteTProjectCirculationByIds(String[] ids);
+
+    /**
+     * 删除项目流转记录信息
+     * 
+     * @param id 项目流转记录主键
+     * @return 结果
+     */
+    public int deleteTProjectCirculationById(String id);
+}

ruoyi-system/src/main/java/com/ruoyi/invest/service/impl/TProjectCirculationServiceImpl.java

@@ -0,0 +1,97 @@
+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.TProjectCirculation;
+import com.ruoyi.invest.mapper.TProjectCirculationMapper;
+import com.ruoyi.invest.service.ITProjectCirculationService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+/**
+ * 项目流转记录Service业务层处理
+ * 
+ * @author ruoyi
+ * @date 2024-03-04
+ */
+@Service
+public class TProjectCirculationServiceImpl implements ITProjectCirculationService
+{
+    @Autowired
+    private TProjectCirculationMapper tProjectCirculationMapper;
+
+    /**
+     * 查询项目流转记录
+     * 
+     * @param id 项目流转记录主键
+     * @return 项目流转记录
+     */
+    @Override
+    public TProjectCirculation selectTProjectCirculationById(String id)
+    {
+        return tProjectCirculationMapper.selectTProjectCirculationById(id);
+    }
+
+    /**
+     * 查询项目流转记录列表
+     * 
+     * @param tProjectCirculation 项目流转记录
+     * @return 项目流转记录
+     */
+    @Override
+    public List<TProjectCirculation> selectTProjectCirculationList(TProjectCirculation tProjectCirculation)
+    {
+        return tProjectCirculationMapper.selectTProjectCirculationList(tProjectCirculation);
+    }
+
+    /**
+     * 新增项目流转记录
+     * 
+     * @param tProjectCirculation 项目流转记录
+     * @return 结果
+     */
+    @Override
+    public int insertTProjectCirculation(TProjectCirculation tProjectCirculation)
+    {
+        tProjectCirculation.setCreateTime(DateUtils.getNowDate());
+        tProjectCirculation.setId(IdUtils.fastSimpleUUID());
+        return tProjectCirculationMapper.insertTProjectCirculation(tProjectCirculation);
+    }
+
+    /**
+     * 修改项目流转记录
+     * 
+     * @param tProjectCirculation 项目流转记录
+     * @return 结果
+     */
+    @Override
+    public int updateTProjectCirculation(TProjectCirculation tProjectCirculation)
+    {
+        return tProjectCirculationMapper.updateTProjectCirculation(tProjectCirculation);
+    }
+
+    /**
+     * 批量删除项目流转记录
+     * 
+     * @param ids 需要删除的项目流转记录主键
+     * @return 结果
+     */
+    @Override
+    public int deleteTProjectCirculationByIds(String[] ids)
+    {
+        return tProjectCirculationMapper.deleteTProjectCirculationByIds(ids);
+    }
+
+    /**
+     * 删除项目流转记录信息
+     * 
+     * @param id 项目流转记录主键
+     * @return 结果
+     */
+    @Override
+    public int deleteTProjectCirculationById(String id)
+    {
+        return tProjectCirculationMapper.deleteTProjectCirculationById(id);
+    }
+}

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

@@ -56,7 +56,6 @@ public class TProjectPoolServiceImpl implements ITProjectPoolService
     public int insertTProjectPool(TProjectPool tProjectPool)
     {
         tProjectPool.setCreateTime(DateUtils.getNowDate());
-        tProjectPool.setId(IdUtils.fastSimpleUUID());
         return tProjectPoolMapper.insertTProjectPool(tProjectPool);
     }
 

ruoyi-system/src/main/resources/mapper/invest/TProjectCirculationMapper.xml

@@ -0,0 +1,71 @@
+<?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.TProjectCirculationMapper">
+    
+    <resultMap type="TProjectCirculation" id="TProjectCirculationResult">
+        <result property="id"    column="id"    />
+        <result property="stageName"    column="stage_name"    />
+        <result property="projectPoolId"    column="project_pool_id"    />
+        <result property="createBy"    column="create_by"    />
+        <result property="createTime"    column="create_time"    />
+    </resultMap>
+
+    <sql id="selectTProjectCirculationVo">
+        select id, stage_name, project_pool_id, create_by, create_time from t_project_circulation
+    </sql>
+
+    <select id="selectTProjectCirculationList" parameterType="TProjectCirculation" resultMap="TProjectCirculationResult">
+        <include refid="selectTProjectCirculationVo"/>
+        <where>  
+            <if test="stageName != null  and stageName != ''"> and stage_name like concat('%', #{stageName}, '%')</if>
+            <if test="projectPoolId != null  and projectPoolId != ''"> and project_pool_id = #{projectPoolId}</if>
+        </where>
+    </select>
+    
+    <select id="selectTProjectCirculationById" parameterType="String" resultMap="TProjectCirculationResult">
+        <include refid="selectTProjectCirculationVo"/>
+        where id = #{id}
+    </select>
+        
+    <insert id="insertTProjectCirculation" parameterType="TProjectCirculation">
+        insert into t_project_circulation
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="id != null">id,</if>
+            <if test="stageName != null">stage_name,</if>
+            <if test="projectPoolId != null">project_pool_id,</if>
+            <if test="createBy != null">create_by,</if>
+            <if test="createTime != null">create_time,</if>
+         </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="id != null">#{id},</if>
+            <if test="stageName != null">#{stageName},</if>
+            <if test="projectPoolId != null">#{projectPoolId},</if>
+            <if test="createBy != null">#{createBy},</if>
+            <if test="createTime != null">#{createTime},</if>
+         </trim>
+    </insert>
+
+    <update id="updateTProjectCirculation" parameterType="TProjectCirculation">
+        update t_project_circulation
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="stageName != null">stage_name = #{stageName},</if>
+            <if test="projectPoolId != null">project_pool_id = #{projectPoolId},</if>
+            <if test="createBy != null">create_by = #{createBy},</if>
+            <if test="createTime != null">create_time = #{createTime},</if>
+        </trim>
+        where id = #{id}
+    </update>
+
+    <delete id="deleteTProjectCirculationById" parameterType="String">
+        delete from t_project_circulation where id = #{id}
+    </delete>
+
+    <delete id="deleteTProjectCirculationByIds" parameterType="String">
+        delete from t_project_circulation where id in 
+        <foreach item="id" collection="array" open="(" separator="," close=")">
+            #{id}
+        </foreach>
+    </delete>
+</mapper>