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

@@ -13,6 +13,7 @@ import com.ruoyi.invest.domain.TProjectChannel;
 import com.ruoyi.invest.service.ITProjectChannelService;
 import com.ruoyi.tool.domain.TUnifyFile;
 import com.ruoyi.tool.service.ITUnifyFileService;
+import io.swagger.annotations.Api;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -37,6 +38,7 @@ import org.springframework.web.multipart.MultipartFile;
  * @author ruoyi
  * @date 2024-02-22
  */
+@Api("渠道信息")
 @RestController
 @RequestMapping("/invest/channel")
 public class TProjectChannelController extends BaseController
@@ -94,6 +96,7 @@ public class TProjectChannelController extends BaseController
     public AjaxResult add(@RequestBody TProjectChannel tProjectChannel,List<MultipartFile> files)
     {
         tProjectChannel.setId(IdUtils.fastSimpleUUID());
+        tProjectChannel.setCreateBy(getNickName());
         try
         {
             // 上传文件路径
@@ -110,6 +113,7 @@ public class TProjectChannelController extends BaseController
                 tUnifyFile.setUploadFormat(file.getOriginalFilename());
                 tUnifyFile.setFileBusinessId(tProjectChannel.getId());//渠道信息ID
                 tUnifyFile.setUploadType(String.valueOf(FileType.CHANNEL.ordinal()));//文件类型:渠道信息
+                tUnifyFile.setCreateBy(getNickName());
                 tUnifyFileService.insertTUnifyFile(tUnifyFile);
             }
         }

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

@@ -13,6 +13,7 @@ import com.ruoyi.invest.domain.TProjectCompany;
 import com.ruoyi.invest.service.ITProjectCompanyService;
 import com.ruoyi.tool.domain.TUnifyFile;
 import com.ruoyi.tool.service.ITUnifyFileService;
+import io.swagger.annotations.Api;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -37,6 +38,7 @@ import org.springframework.web.multipart.MultipartFile;
  * @author ruoyi
  * @date 2024-02-22
  */
+@Api("项目公司信息")
 @RestController
 @RequestMapping("/invest/company")
 public class TProjectCompanyController extends BaseController
@@ -94,6 +96,7 @@ public class TProjectCompanyController extends BaseController
     public AjaxResult add(@RequestBody TProjectCompany tProjectCompany,List<MultipartFile> files)
     {
         tProjectCompany.setId(IdUtils.fastSimpleUUID());
+        tProjectCompany.setCreateBy(getNickName());
         try
         {
             // 上传文件路径
@@ -110,6 +113,7 @@ public class TProjectCompanyController extends BaseController
                 tUnifyFile.setUploadFormat(file.getOriginalFilename());
                 tUnifyFile.setFileBusinessId(tProjectCompany.getId());//公司ID
                 tUnifyFile.setUploadType(String.valueOf(FileType.COMPANY.ordinal()));//文件类型:公司信息
+                tUnifyFile.setCreateBy(getNickName());
                 tUnifyFileService.insertTUnifyFile(tUnifyFile);
             }
         }

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

@@ -5,6 +5,7 @@ import javax.servlet.http.HttpServletResponse;
 
 import com.ruoyi.invest.domain.TProjectContacts;
 import com.ruoyi.invest.service.ITProjectContactsService;
+import io.swagger.annotations.Api;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -28,6 +29,7 @@ import com.ruoyi.common.core.page.TableDataInfo;
  * @author ruoyi
  * @date 2024-02-22
  */
+@Api("项目联系人")
 @RestController
 @RequestMapping("/invest/contacts")
 public class TProjectContactsController extends BaseController
@@ -78,6 +80,7 @@ public class TProjectContactsController extends BaseController
     @PostMapping
     public AjaxResult add(@RequestBody TProjectContacts tProjectContacts)
     {
+        tProjectContacts.setCreateBy(getNickName());
         return toAjax(tProjectContactsService.insertTProjectContacts(tProjectContacts));
     }
 

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

@@ -11,6 +11,7 @@ import com.ruoyi.common.utils.uuid.IdUtils;
 import com.ruoyi.framework.config.ServerConfig;
 import com.ruoyi.tool.domain.TUnifyFile;
 import com.ruoyi.tool.service.ITUnifyFileService;
+import io.swagger.annotations.Api;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -37,6 +38,7 @@ import org.springframework.web.multipart.MultipartFile;
  * @author ruoyi
  * @date 2024-02-23
  */
+@Api("合同管理")
 @RestController
 @RequestMapping("/invest/contract")
 public class TProjectContractController extends BaseController
@@ -94,6 +96,7 @@ public class TProjectContractController extends BaseController
     public AjaxResult add(@RequestBody TProjectContract tProjectContract,List<MultipartFile> files)
     {
         tProjectContract.setId(IdUtils.fastSimpleUUID());
+        tProjectContract.setCreateBy(getNickName());
         try
         {
             // 上传文件路径
@@ -110,6 +113,7 @@ public class TProjectContractController extends BaseController
                 tUnifyFile.setUploadFormat(file.getOriginalFilename());
                 tUnifyFile.setFileBusinessId(tProjectContract.getId());//合同管理ID
                 tUnifyFile.setUploadType(String.valueOf(FileType.CONTRACT.ordinal()));//文件类型:合同管理
+                tUnifyFile.setCreateBy(getNickName());
                 tUnifyFileService.insertTUnifyFile(tUnifyFile);
             }
         }

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

@@ -13,6 +13,7 @@ import com.ruoyi.invest.domain.TProjectInformation;
 import com.ruoyi.invest.service.ITProjectInformationService;
 import com.ruoyi.tool.domain.TUnifyFile;
 import com.ruoyi.tool.service.ITUnifyFileService;
+import io.swagger.annotations.Api;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -37,6 +38,7 @@ import org.springframework.web.multipart.MultipartFile;
  * @author ruoyi
  * @date 2024-02-22
  */
+@Api("文件资料")
 @RestController
 @RequestMapping("/invest/information")
 public class TProjectInformationController extends BaseController
@@ -94,6 +96,7 @@ public class TProjectInformationController extends BaseController
     public AjaxResult add(@RequestBody TProjectInformation tProjectInformation,List<MultipartFile> files)
     {
         tProjectInformation.setId(IdUtils.fastSimpleUUID());
+        tProjectInformation.setCreateBy(getNickName());
         try
         {
             // 上传文件路径
@@ -110,6 +113,7 @@ public class TProjectInformationController extends BaseController
                 tUnifyFile.setUploadFormat(file.getOriginalFilename());
                 tUnifyFile.setFileBusinessId(tProjectInformation.getId());//文件资料ID
                 tUnifyFile.setUploadType(String.valueOf(FileType.INFORMATION.ordinal()));//文件类型:文件资料
+                tUnifyFile.setCreateBy(getNickName());
                 tUnifyFileService.insertTUnifyFile(tUnifyFile);
             }
         }

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

@@ -13,6 +13,7 @@ import com.ruoyi.invest.domain.TProjectMeeting;
 import com.ruoyi.invest.service.ITProjectMeetingService;
 import com.ruoyi.tool.domain.TUnifyFile;
 import com.ruoyi.tool.service.ITUnifyFileService;
+import io.swagger.annotations.Api;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -37,6 +38,7 @@ import org.springframework.web.multipart.MultipartFile;
  * @author ruoyi
  * @date 2024-02-22
  */
+@Api("会议记录")
 @RestController
 @RequestMapping("/invest/meeting")
 public class TProjectMeetingController extends BaseController
@@ -94,6 +96,7 @@ public class TProjectMeetingController extends BaseController
     public AjaxResult add(@RequestBody TProjectMeeting tProjectMeeting,List<MultipartFile> files)
     {
         tProjectMeeting.setId(IdUtils.fastSimpleUUID());
+        tProjectMeeting.setCreateBy(getNickName());
         try
         {
             // 上传文件路径
@@ -110,6 +113,7 @@ public class TProjectMeetingController extends BaseController
                 tUnifyFile.setUploadFormat(file.getOriginalFilename());
                 tUnifyFile.setFileBusinessId(tProjectMeeting.getId());//会议记录ID
                 tUnifyFile.setUploadType(String.valueOf(FileType.MEETING.ordinal()));//文件类型:会议记录
+                tUnifyFile.setCreateBy(getNickName());
                 tUnifyFileService.insertTUnifyFile(tUnifyFile);
             }
         }
@@ -141,4 +145,15 @@ public class TProjectMeetingController extends BaseController
     {
         return toAjax(tProjectMeetingService.updateTProjectMeetingByIds(ids));
     }
+
+    /**
+     * 根据项目ID获取会议记录
+     */
+    @PreAuthorize("@ss.hasPermi('invest:meeting:query')")
+    @GetMapping(value = "/listProjectPoolId")
+    public AjaxResult listProjectPoolId(String projectPoolId)
+    {
+        return success(tProjectMeetingService.listProjectPoolId(projectPoolId));
+    }
+
 }

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

@@ -5,6 +5,7 @@ import javax.servlet.http.HttpServletResponse;
 
 import com.ruoyi.invest.domain.TProjectPool;
 import com.ruoyi.invest.service.ITProjectPoolService;
+import io.swagger.annotations.Api;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -28,6 +29,7 @@ import com.ruoyi.common.core.page.TableDataInfo;
  * @author ruoyi
  * @date 2024-02-21
  */
+@Api("项目池")
 @RestController
 @RequestMapping("/invest/pool")
 public class TProjectPoolController extends BaseController
@@ -78,6 +80,7 @@ public class TProjectPoolController extends BaseController
     @PostMapping
     public AjaxResult add(@RequestBody TProjectPool tProjectPool)
     {
+        tProjectPool.setCreateBy(getNickName());
         return toAjax(tProjectPoolService.insertTProjectPool(tProjectPool));
     }
 

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

@@ -13,6 +13,7 @@ import com.ruoyi.invest.domain.TProjectRecord;
 import com.ruoyi.invest.service.ITProjectRecordService;
 import com.ruoyi.tool.domain.TUnifyFile;
 import com.ruoyi.tool.service.ITUnifyFileService;
+import io.swagger.annotations.Api;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -37,6 +38,7 @@ import org.springframework.web.multipart.MultipartFile;
  * @author ruoyi
  * @date 2024-02-21
  */
+@Api("跟进记录")
 @RestController
 @RequestMapping("/invest/record")
 public class TProjectRecordController extends BaseController
@@ -94,6 +96,7 @@ public class TProjectRecordController extends BaseController
     public AjaxResult add(@RequestBody TProjectRecord tProjectRecord,List<MultipartFile> files)
     {
         tProjectRecord.setId(IdUtils.fastSimpleUUID());
+        tProjectRecord.setCreateBy(getNickName());
         try
         {
             // 上传文件路径
@@ -110,6 +113,7 @@ public class TProjectRecordController extends BaseController
                 tUnifyFile.setUploadFormat(file.getOriginalFilename());
                 tUnifyFile.setFileBusinessId(tProjectRecord.getId());//跟进记录ID
                 tUnifyFile.setUploadType(String.valueOf(FileType.RECORD.ordinal()));//文件类型:跟进记录
+                tUnifyFile.setCreateBy(getNickName());
                 tUnifyFileService.insertTUnifyFile(tUnifyFile);
             }
         }
@@ -141,4 +145,14 @@ public class TProjectRecordController extends BaseController
     {
         return toAjax(tProjectRecordService.updateTProjectRecordByIds(ids));
     }
+
+    /**
+     * 根据项目ID获取跟进记录
+     */
+    @PreAuthorize("@ss.hasPermi('invest:meeting:query')")
+    @GetMapping(value = "/listPorjectId")
+    public AjaxResult listPorjectId(String porjectId)
+    {
+        return success(tProjectRecordService.listPorjectId(porjectId));
+    }
 }

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

@@ -2,6 +2,8 @@ package com.ruoyi.web.controller.invest;
 
 import java.util.List;
 import javax.servlet.http.HttpServletResponse;
+
+import io.swagger.annotations.Api;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -27,6 +29,7 @@ import com.ruoyi.common.core.page.TableDataInfo;
  * @author ruoyi
  * @date 2024-02-23
  */
+@Api("打分表接口")
 @RestController
 @RequestMapping("/invest/scoring")
 public class TProjectScoringController extends BaseController
@@ -77,6 +80,7 @@ public class TProjectScoringController extends BaseController
     @PostMapping
     public AjaxResult add(@RequestBody TProjectScoring tProjectScoring)
     {
+        tProjectScoring.setCreateBy(getNickName());
         return toAjax(tProjectScoringService.insertTProjectScoring(tProjectScoring));
     }
 

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

@@ -11,6 +11,7 @@ import com.ruoyi.common.utils.uuid.IdUtils;
 import com.ruoyi.framework.config.ServerConfig;
 import com.ruoyi.tool.domain.TUnifyFile;
 import com.ruoyi.tool.service.ITUnifyFileService;
+import io.swagger.annotations.Api;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -37,6 +38,7 @@ import org.springframework.web.multipart.MultipartFile;
  * @author ruoyi
  * @date 2024-02-26
  */
+@Api("研究资料管理")
 @RestController
 @RequestMapping("/study/gen")
 public class TStudyInformationController extends BaseController
@@ -94,6 +96,7 @@ public class TStudyInformationController extends BaseController
     public AjaxResult add(@RequestBody TStudyInformation tStudyInformation,List<MultipartFile> files)
     {
         tStudyInformation.setId(IdUtils.fastSimpleUUID());
+        tStudyInformation.setCreateBy(getNickName());
         try
         {
             // 上传文件路径
@@ -110,6 +113,7 @@ public class TStudyInformationController extends BaseController
                 tUnifyFile.setUploadFormat(file.getOriginalFilename());
                 tUnifyFile.setFileBusinessId(tStudyInformation.getId());//研究资料ID
                 tUnifyFile.setUploadType(String.valueOf(FileType.GEN.ordinal()));//文件类型:研究资料
+                tUnifyFile.setCreateBy(getNickName());
                 tUnifyFileService.insertTUnifyFile(tUnifyFile);
             }
         }

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

@@ -12,6 +12,7 @@ import com.ruoyi.common.utils.file.FileUploadUtils;
 import com.ruoyi.common.utils.file.FileUtils;
 import com.ruoyi.framework.config.ServerConfig;
 import com.ruoyi.web.controller.common.CommonController;
+import io.swagger.annotations.Api;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.http.MediaType;
@@ -41,6 +42,7 @@ import org.springframework.web.multipart.MultipartFile;
  * @author ruoyi
  * @date 2024-02-23
  */
+@Api("附件管理")
 @RestController
 @RequestMapping("/system/file")
 public class TUnifyFileController extends BaseController
@@ -96,6 +98,7 @@ public class TUnifyFileController extends BaseController
     @PostMapping
     public AjaxResult add(@RequestBody TUnifyFile tUnifyFile)
     {
+        tUnifyFile.setCreateBy(getNickName());
         return toAjax(tUnifyFileService.insertTUnifyFile(tUnifyFile));
     }
 
@@ -144,6 +147,7 @@ public class TUnifyFileController extends BaseController
                 tUnifyFile.setNewUploadName(FileUtils.getName(fileName));
                 tUnifyFile.setUploadFormat(file.getOriginalFilename());
                 tUnifyFile.setUploadType(String.valueOf(FileType.OTHER.ordinal()));//其他
+                tUnifyFile.setCreateBy(getNickName());
                 tUnifyFileService.insertTUnifyFile(tUnifyFile);
             }
             return  AjaxResult.success();

ruoyi-admin/src/main/resources/application-druid.yml

@@ -6,7 +6,7 @@ spring:
         druid:
             # 主库数据源
             master:
-                url: jdbc:mysql://10.32.2.215:3306/tony-flowable?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&nullCatalogMeansCurrent=true
+                url: jdbc:mysql://10.32.2.215:3306/tony-invest?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&nullCatalogMeansCurrent=true
                 username: oneportal
                 password: Shanghai_1
             # 从库数据源

ruoyi-common/src/main/java/com/ruoyi/common/core/controller/BaseController.java

@@ -199,4 +199,13 @@ public class BaseController
     {
         return getLoginUser().getUsername();
     }
+
+    /**
+     * 获取登录用户名
+     */
+    public String getNickName()
+    {
+        return getLoginUser().getUser().getNickName();
+    }
+
 }

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

@@ -67,4 +67,11 @@ public interface TProjectMeetingMapper
      * @return 结果
      */
     public int updateTProjectMeetingByIds(String[] ids);
+
+    /**
+     * 根据项目ID获取会议记录
+     * @param projectPoolId
+     * @return
+     */
+    List<TProjectMeeting> listProjectPoolId(String projectPoolId);
 }

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

@@ -67,4 +67,11 @@ public interface TProjectRecordMapper
      * @return 结果
      */
     public int updateTProjectRecordByIds(String[] ids);
+
+    /**
+     * 根据项目ID获取跟进记录
+     * @param porjectId
+     * @return
+     */
+    List<TProjectRecord> listPorjectId(String porjectId);
 }

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

@@ -67,4 +67,11 @@ public interface ITProjectMeetingService
      * @return 结果
      */
     public int updateTProjectMeetingByIds(String[] ids);
+
+    /**
+     * 根据项目ID获取会议记录
+     * @param projectPoolId
+     * @return
+     */
+    public List<TProjectMeeting> listProjectPoolId(String projectPoolId);
 }

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

@@ -68,4 +68,11 @@ public interface ITProjectRecordService
      * @return 结果
      */
     public int updateTProjectRecordByIds(String[] ids);
+
+    /**
+     * 根据项目ID获取跟进记录
+     * @param porjectId
+     * @return
+     */
+    public List<TProjectRecord> listPorjectId(String porjectId);
 }

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

@@ -95,8 +95,23 @@ public class TProjectMeetingServiceImpl implements ITProjectMeetingService
         return tProjectMeetingMapper.deleteTProjectMeetingById(id);
     }
 
+    /**
+     *
+     * @param ids 需要删除的会议记录主键集合
+     * @return
+     */
     @Override
     public int updateTProjectMeetingByIds(String[] ids) {
         return tProjectMeetingMapper.updateTProjectMeetingByIds(ids);
     }
+
+    /**
+     * 根据项目ID获取会议记录
+     * @param projectPoolId
+     * @return
+     */
+    @Override
+    public List<TProjectMeeting> listProjectPoolId(String projectPoolId) {
+        return tProjectMeetingMapper.listProjectPoolId(projectPoolId);
+    }
 }

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

@@ -106,4 +106,14 @@ public class TProjectRecordServiceImpl implements ITProjectRecordService
     public int updateTProjectRecordByIds(String[] ids) {
         return tProjectRecordMapper.updateTProjectRecordByIds(ids);
     }
+
+    /**
+     * 根据项目ID获取跟进记录
+     * @param porjectId
+     * @return
+     */
+    @Override
+    public List<TProjectRecord> listPorjectId(String porjectId) {
+        return tProjectRecordMapper.listPorjectId(porjectId);
+    }
 }

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

@@ -122,4 +122,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         </foreach>
     </update>
 
+    <select id="listProjectPoolId" parameterType="String" resultMap="TProjectMeetingResult">
+        <include refid="selectTProjectMeetingVo"/>
+        where project_pool_id = #{projectPoolId} and del_flag = 0
+    </select>
+
+
 </mapper>

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

@@ -113,4 +113,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             #{id}
         </foreach>
     </update>
+
+    <select id="listPorjectId" parameterType="String" resultMap="TProjectRecordResult">
+        <include refid="selectTProjectRecordVo"/>
+        where porject_id = #{porjectId} and del_flag = 0
+    </select>
+
+
 </mapper>