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

@@ -85,7 +85,7 @@ public class TProjectContractController extends BaseController
         List<TProjectContract> list = tProjectContractService.selectTProjectContractList(tProjectContract)
                 .stream().map(n -> {
                     n.setProjectPoolId(n.gettProjectPool().getProjectName());
-//                    n.setContractType(dictDataService.selectDictLabel("file_type",n.getFileType()));
+                    n.setContractType(dictDataService.selectDictLabel("contract_type",n.getContractType()));
                     n.setProjectStage(dictDataService.selectDictLabel("project_stage",n.getProjectStage()));
                     return n;
                 })

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

@@ -6,7 +6,9 @@ import javax.servlet.http.HttpServletResponse;
 import com.ruoyi.common.enums.FileType;
 import com.ruoyi.common.utils.StringUtils;
 import com.ruoyi.common.utils.uuid.IdUtils;
+import com.ruoyi.invest.domain.TProjectCirculation;
 import com.ruoyi.invest.domain.TProjectScoring;
+import com.ruoyi.invest.service.ITProjectCirculationService;
 import com.ruoyi.tool.domain.TUnifyFile;
 import com.ruoyi.tool.service.ITUnifyFileService;
 import io.swagger.annotations.Api;
@@ -44,6 +46,9 @@ public class TProjectInvestigateController extends BaseController
     @Autowired
     private ITProjectInvestigateService tProjectInvestigateService;
 
+    @Autowired
+    private ITProjectCirculationService tProjectCirculationService;
+
     @Autowired
     private ITUnifyFileService tUnifyFileService;
 
@@ -103,6 +108,14 @@ public class TProjectInvestigateController extends BaseController
                 tUnifyFileService.insertTUnifyFile(tUnifyFile);
             }
         }
+
+        // todo 增加尽调创建记录
+        TProjectCirculation tProjectCirculation = new TProjectCirculation();
+        tProjectCirculation.setProjectPoolId(tProjectInvestigate.getProjectPoolId());
+        tProjectCirculation.setStageName(tProjectInvestigate.getInvestigateName()+"(尽职背调)");
+        tProjectCirculation.setCreateBy(getNickName());
+        tProjectCirculationService.insertTProjectCirculation(tProjectCirculation);
+
         return toAjax(tProjectInvestigateService.insertTProjectInvestigate(tProjectInvestigate));
     }
 

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

@@ -6,6 +6,8 @@ import javax.servlet.http.HttpServletResponse;
 import com.ruoyi.common.enums.FileType;
 import com.ruoyi.common.utils.StringUtils;
 import com.ruoyi.common.utils.uuid.IdUtils;
+import com.ruoyi.invest.domain.TProjectCirculation;
+import com.ruoyi.invest.service.ITProjectCirculationService;
 import com.ruoyi.tool.domain.TUnifyFile;
 import com.ruoyi.tool.service.ITUnifyFileService;
 import io.swagger.annotations.Api;
@@ -43,6 +45,9 @@ public class TProjectInvestigatePersonController extends BaseController
     @Autowired
     private ITProjectInvestigatePersonService tProjectInvestigatePersonService;
 
+    @Autowired
+    private ITProjectCirculationService tProjectCirculationService;
+
     @Autowired
     private ITUnifyFileService tUnifyFileService;
 
@@ -109,6 +114,13 @@ public class TProjectInvestigatePersonController extends BaseController
                 }
             }
         }
+        // todo 增加项目创建记录
+        TProjectCirculation tProjectCirculation = new TProjectCirculation();
+        tProjectCirculation.setProjectPoolId(tProjectInvestigatePerson.getProjectPoolId());
+        tProjectCirculation.setStageName("上传尽调报告");
+        tProjectCirculation.setCreateBy(getNickName());
+        tProjectCirculationService.insertTProjectCirculation(tProjectCirculation);
+
         return toAjax(tProjectInvestigatePersonService.insertTProjectInvestigatePerson(tProjectInvestigatePerson));
     }
 

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

@@ -231,7 +231,7 @@ public class TProjectPoolController extends BaseController
         // todo 增加项目创建记录
         TProjectCirculation tProjectCirculation = new TProjectCirculation();
         tProjectCirculation.setProjectPoolId(tProjectPool.getId());
-        tProjectCirculation.setStageName(tProjectPool.getStageName());
+        tProjectCirculation.setStageName(tProjectPool.getStageName() + "-" + tProjectPool.getStateName());
         tProjectCirculation.setCreateBy(getNickName());
         tProjectCirculationService.insertTProjectCirculation(tProjectCirculation);
 

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

@@ -5,6 +5,8 @@ import java.util.stream.Collectors;
 import javax.servlet.http.HttpServletResponse;
 
 import com.ruoyi.common.utils.StringUtils;
+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;
@@ -40,6 +42,9 @@ public class TProjectScoringController extends BaseController
     @Autowired
     private ITProjectScoringService tProjectScoringService;
 
+    @Autowired
+    private ITProjectCirculationService tProjectCirculationService;
+
     /**
      * 查询打分列表
      */
@@ -85,6 +90,14 @@ public class TProjectScoringController extends BaseController
     public AjaxResult add(@RequestBody TProjectScoring tProjectScoring)
     {
         tProjectScoring.setCreateBy(getNickName());
+
+        // todo 增加项目创建记录
+        TProjectCirculation tProjectCirculation = new TProjectCirculation();
+        tProjectCirculation.setProjectPoolId(tProjectScoring.getProjectPoolId());
+        tProjectCirculation.setStageName("上传打分表");
+        tProjectCirculation.setCreateBy(getNickName());
+        tProjectCirculationService.insertTProjectCirculation(tProjectCirculation);
+
         return toAjax(tProjectScoringService.insertTProjectScoring(tProjectScoring));
     }
 

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

@@ -1,6 +1,7 @@
 package com.ruoyi.web.controller.invest;
 
 import java.util.List;
+import java.util.stream.Collectors;
 import javax.servlet.http.HttpServletResponse;
 
 import com.ruoyi.common.config.RuoYiConfig;
@@ -9,6 +10,7 @@ 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.system.service.ISysDictDataService;
 import com.ruoyi.tool.domain.TUnifyFile;
 import com.ruoyi.tool.service.ITUnifyFileService;
 import io.swagger.annotations.Api;
@@ -51,7 +53,7 @@ public class TStudyInformationController extends BaseController
     private ITUnifyFileService tUnifyFileService;
 
     @Autowired
-    private ServerConfig serverConfig;
+    private ISysDictDataService dictDataService;
 
     /**
      * 查询研究资料管理列表
@@ -75,7 +77,12 @@ public class TStudyInformationController extends BaseController
     @PostMapping("/export")
     public void export(HttpServletResponse response, TStudyInformation tStudyInformation)
     {
-        List<TStudyInformation> list = tStudyInformationService.selectTStudyInformationList(tStudyInformation);
+        List<TStudyInformation> list = tStudyInformationService.selectTStudyInformationList(tStudyInformation)
+                .stream().map(n -> {
+                    n.setContractType(dictDataService.selectDictLabel("CONTRACT_TYPE",n.getContractType()));
+                    return n;
+                })
+                .collect(Collectors.toList());
         ExcelUtil<TStudyInformation> util = new ExcelUtil<TStudyInformation>(TStudyInformation.class);
         util.exportExcel(response, list, "研究资料管理数据");
     }

ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java

@@ -242,10 +242,23 @@ public class SysUserController extends BaseController
     /**
      * 获取部门树列表
      */
-    @PreAuthorize("@ss.hasPermi('system:user:list')")
     @GetMapping("/deptTree")
     public AjaxResult deptTree(SysDept dept)
     {
         return success(deptService.selectDeptTreeList(dept));
     }
+
+
+    /**
+     * 无权限控制
+     * 获取用户列表
+     */
+    @GetMapping("/listUser")
+    public TableDataInfo listUser(SysUser user)
+    {
+        startPage();
+        List<SysUser> list = userService.selectUserList(user);
+        return getDataTable(list);
+    }
+
 }

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

@@ -18,10 +18,10 @@ ruoyi:
 # 开发环境配置
 server:
   # 服务器的HTTP端口，默认为8080
-  port: 8080
+  port: 8091
   servlet:
     # 应用的访问路径
-    context-path: /
+    context-path:
   tomcat:
     # tomcat的URI编码
     uri-encoding: UTF-8
@@ -72,7 +72,7 @@ spring:
     # 地址
     host: localhost
     # 端口，默认为6379
-    port: 6379
+    port: 6380
     # 数据库索引
     database: 0
     # 密码

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

@@ -70,6 +70,11 @@ public class TProjectChannel extends BaseEntity
      */
     private List<TUnifyFile> listFile;
 
+    /**
+     * 不等于状态
+     */
+    private String notStatus;
+
     public void setId(String id) 
     {
         this.id = id;
@@ -195,6 +200,14 @@ public class TProjectChannel extends BaseEntity
         this.channelGroup = channelGroup;
     }
 
+    public String getNotStatus() {
+        return notStatus;
+    }
+
+    public void setNotStatus(String notStatus) {
+        this.notStatus = notStatus;
+    }
+
     @Override
     public String toString() {
         return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)

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

@@ -40,13 +40,13 @@ public class TProjectMeeting extends BaseEntity
     private String projectPoolId;
 
     /** 会议开始时间 */
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    @Excel(name = "会议开始时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm")
+    @Excel(name = "会议开始时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm")
     private Date startTime;
 
     /** 会议结束时间 */
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    @Excel(name = "会议结束时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm")
+    @Excel(name = "会议结束时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm")
     private Date endTime;
 
     /** 会议地点 */

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

@@ -90,23 +90,23 @@ public class TProjectPool extends BaseEntity
     private String financingCondition;
 
     /** 预期融资金额（万元） */
-    @Excel(name = "预期融资金额", readConverterExp = "万=元")
+    @Excel(name = "预期融资金额")
     private String financingMoney;
 
     /** 预期融资时间 */
     @JsonFormat(pattern = "yyyy-MM-dd")
-    @Excel(name = "预期融资时间", width = 30, dateFormat = "yyyy-MM-dd")
+//    @Excel(name = "预期融资时间", width = 30, dateFormat = "yyyy-MM-dd")
     private Date financingDate;
 
     /** 投资亮点 */
     private String investSparkle;
 
     /** 投前估值（万元） */
-    @Excel(name = "投前估值", readConverterExp = "万=元")
+    @Excel(name = "投前估值")
     private String investValuation;
 
     /** 预计投资金额（万元） */
-    @Excel(name = "预计投资金额", readConverterExp = "万=元")
+    @Excel(name = "预计投资金额")
     private String investMoney;
 
     /** 投资类型 */
@@ -157,6 +157,11 @@ public class TProjectPool extends BaseEntity
      */
     private String stageName;
 
+    /**
+     * 状态名称
+     */
+    private String stateName;
+
 
     public void setId(String id) 
     {
@@ -469,6 +474,14 @@ public class TProjectPool extends BaseEntity
         this.tProjectChannel = tProjectChannel;
     }
 
+    public String getStateName() {
+        return stateName;
+    }
+
+    public void setStateName(String stateName) {
+        this.stateName = stateName;
+    }
+
     @Override
     public String toString() {
         return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)

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

@@ -33,7 +33,6 @@ public class TStudyInformation extends BaseEntity
     private String delFlag;
 
     /** 附件业务ID */
-    @Excel(name = "附件业务ID")
     private String fileBusinessId;
 
     /**

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

@@ -55,7 +55,6 @@ public class TProjectContractServiceImpl implements ITProjectContractService
     public int insertTProjectContract(TProjectContract tProjectContract)
     {
         tProjectContract.setCreateTime(DateUtils.getNowDate());
-        tProjectContract.setId(IdUtils.fastSimpleUUID());
         return tProjectContractMapper.insertTProjectContract(tProjectContract);
     }
 

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

@@ -55,7 +55,6 @@ public class TStudyInformationServiceImpl implements ITStudyInformationService
     public int insertTStudyInformation(TStudyInformation tStudyInformation)
     {
         tStudyInformation.setCreateTime(DateUtils.getNowDate());
-        tStudyInformation.setId(IdUtils.fastSimpleUUID());
         return tStudyInformationMapper.insertTStudyInformation(tStudyInformation);
     }
 

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

@@ -33,13 +33,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <where>
             del_flag = 0
             <if test="channelName != null  and channelName != ''"> and channel_name like concat('%', #{channelName}, '%')</if>
-            <if test="channelCode != null  and channelCode != ''"> and channel_code = #{channelCode}</if>
+            <if test="channelCode != null  and channelCode != ''"> and channel_code like concat('%', #{channelCode}, '%')</if>
             <if test="channelGroup != null  and channelGroup != ''"> and channel_group = #{channelGroup}</if>
             <if test="channelType != null  and channelType != ''"> and channel_type = #{channelType}</if>
-            <if test="contacts != null  and contacts != ''"> and contacts = #{contacts}</if>
-            <if test="telephone != null  and telephone != ''"> and telephone = #{telephone}</if>
-            <if test="channelHead != null  and channelHead != ''"> and channel_head = #{channelHead}</if>
+            <if test="contacts != null  and contacts != ''"> and contacts like concat('%', #{contacts}, '%')</if>
+            <if test="telephone != null  and telephone != ''"> and telephone like concat('%', #{telephone}, '%')</if>
+            <if test="channelHead != null  and channelHead != ''"> and channel_head like concat('%', #{channelHead}, '%')</if>
             <if test="status != null  and status != ''"> and status = #{status}</if>
+            <if test="notStatus != null  and notStatus != ''"> and status != #{notStatus}</if>
         </where>
     </select>
     

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

@@ -49,11 +49,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <where>
             a.del_flag = 0
             <if test="projectPoolId != null  and projectPoolId != ''"> and a.project_pool_id = #{projectPoolId}</if>
-            <if test="meetingTheme != null  and meetingTheme != ''"> and a.meeting_theme = #{meetingTheme}</if>
-            <if test="meetingCode != null  and meetingCode != ''"> and a.meeting_code = #{meetingCode}</if>
+            <if test="meetingTheme != null  and meetingTheme != ''"> and a.meeting_theme like concat('%', #{meetingTheme}, '%')</if>
+            <if test="meetingCode != null  and meetingCode != ''"> and a.meeting_code like concat('%', #{meetingCode}, '%')</if>
             <if test="meetingType != null  and meetingType != ''"> and a.meeting_type = #{meetingType}</if>
-            <if test="startTime != null "> and a.start_time = #{startTime}</if>
-            <if test="endTime != null "> and a.end_time = #{endTime}</if>
+            <if test="startTime != null "> and a.start_time &gt;= #{startTime}</if>
+            <if test="endTime != null "> and a.end_time &lt;= #{endTime}</if>
         </where>
     </select>
     

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

@@ -103,9 +103,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="projectDate != null "> and a.project_date = #{projectDate}</if>
             <if test="decisionDate != null "> and a.decision_date = #{decisionDate}</if>
             <if test="industry != null  and industry != ''"> and a.industry = #{industry}</if>
-            <if test="company != null  and company != ''"> and a.company = #{company}</if>
-            <if test="projectContacts != null  and projectContacts != ''"> and a.project_contacts = #{projectContacts}</if>
-            <if test="investHead != null  and investHead != ''"> and a.invest_head = #{investHead}</if>
+            <if test="company != null  and company != ''"> and b.company_name like concat('%', #{company}, '%')</if>
+            <if test="projectContacts != null  and projectContacts != ''"> and c.name like concat('%', #{projectContacts}, '%')</if>
+            <if test="investHead != null  and investHead != ''"> and a.invest_head like concat('%', #{investHead}, '%')</if>
             <if test="previousFinancing != null  and previousFinancing != ''"> and a.previous_financing = #{previousFinancing}</if>
             <if test="financingStage != null  and financingStage != ''"> and a.financing_stage = #{financingStage}</if>
             <if test="financingMoney != null  and financingMoney != ''"> and a.financing_money = #{financingMoney}</if>

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

@@ -42,9 +42,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             a.del_flag = 0
             <if test="projectName != null and projectName != ''"> and b.project_name like concat('%', #{projectName}, '%')</if>
             <if test="projectId != null  and projectId != ''"> and a.project_id = #{projectId}</if>
-            <if test="contacts != null  and contacts != ''"> and a.contacts = #{contacts}</if>
+            <if test="contacts != null  and contacts != ''"> and a.contacts like concat('%', #{contacts}, '%')</if>
             <if test="realityUpDate != null "> and a.reality_up_date = #{realityUpDate}</if>
-            <if test="upPerson != null  and upPerson != ''"> and a.up_person = #{upPerson}</if>
+            <if test="upPerson != null  and upPerson != ''"> and a.up_person like concat('%', #{upPerson}, '%')</if>
             <if test="upWay != null  and upWay != ''"> and a.up_way = #{upWay}</if>
         </where>
     </select>

ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml

@@ -67,6 +67,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 		<if test="userName != null and userName != ''">
 			AND u.user_name like concat('%', #{userName}, '%')
 		</if>
+		<if test="nickName != null and nickName != ''">
+			AND u.nick_name like concat('%', #{nickName}, '%')
+		</if>
 		<if test="status != null and status != ''">
 			AND u.status = #{status}
 		</if>