调整传输参数

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-system/src/main/java/com/ruoyi/invest/domain/TProjectPool.java

@@ -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/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>