+ 交通强国详情面板的功能迭代

ruoyi-system/src/main/java/com/ruoyi/system/domain/CpsUsrApply.java

@@ -54,7 +54,7 @@ public class CpsUsrApply extends BaseEntity {
     /**
      * 参会人角色
      */
-    @Excel(name = "参会人角色", dictType = "met_usr_type")
+    @Excel(name = "参会人类型", dictType = "met_usr_type")
     private String usrType;
 
     /**
@@ -80,7 +80,6 @@ public class CpsUsrApply extends BaseEntity {
     @Excel(name = "审核状态", dictType = "review_state")
     private String reviewState;
 
-    @Excel(name = "主题调研" , dictType = "conference_flag")
     String themeFlag;
 
     Long themeId;
@@ -88,7 +87,6 @@ public class CpsUsrApply extends BaseEntity {
     @Excel(name = "随行人员" , handler = FollowsJsonHandle.class)
     String followsJson;
 
-    @Excel(name = "与会主题")
     String themeTitle;
 
     /**
@@ -106,7 +104,7 @@ public class CpsUsrApply extends BaseEntity {
      * 与会内容
      */
     private Long contentId;
-    @Excel(name = "与会内容")
+
     private String contentTitle;
 
     private String deptId;

ruoyi-system/src/main/resources/mapper/cp/CpsUsrApplyMapper.xml

@@ -109,6 +109,13 @@
             <if test="wayBack != null  and wayBack != ''">and way_back = #{wayBack}</if>
             ${params.dataScope}
         </where>
+        order by
+        CASE
+        WHEN review_state = '2' THEN 0
+        WHEN review_state = '0' THEN 1
+        WHEN review_state = '1' THEN 2
+        ELSE 0
+        END asc
     </select>
 
     <select id="selectCpsUsrApplyById" parameterType="Long" resultMap="CpsUsrApplyResult">

ruoyi-ui/.env.development

@@ -7,6 +7,6 @@ ENV = 'development'
 # 若依管理系统/开发环境
 VUE_APP_BASE_API = '/dev-api'
 
-VUE_APP_BASE_URL = 'https://www.lj-info.com:8090/prod-api'
+VUE_APP_BASE_URL = 'http://127.0.0.1:18080/tfc'
 # 路由懒加载
 VUE_CLI_BABEL_TRANSPILE_MODULES = true

ruoyi-ui/src/views/cp/usrApply/index.vue

@@ -33,7 +33,7 @@
             @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="参会人角色" prop="usrType">
+      <el-form-item label="参会人类型" prop="usrType">
         <el-select v-model="queryParams.usrType" placeholder="请选择参会人角色" clearable>
           <el-option
               v-for="dict in dict.type.met_usr_type"
@@ -149,7 +149,7 @@
       <el-table-column label="参会人单位" align="center" prop="orgUnitName" width="150" fixed show-overflow-tooltip />
       <el-table-column label="参会人职务" align="center" prop="uniLevel" width="150" fixed />
       <el-table-column label="邮箱信息" align="center" prop="email" width="100" />
-      <el-table-column label="参会人角色" align="center" prop="usrType" width="100">
+      <el-table-column label="参会人类型" align="center" prop="usrType" width="100">
         <template slot-scope="scope">
           <dict-tag :options="dict.type.met_usr_type" :value="scope.row.usrType" />
         </template>
@@ -191,9 +191,7 @@
           <dict-tag :options="dict.type.apply_type" :value="scope.row.applyType" />
         </template>
       </el-table-column>
-
       <el-table-column label="审核信息" align="center" prop="reviewMsg" width="150" show-overflow-tooltip />
-      <el-table-column label="会场信息" align="center" prop="contentTitle" width="150" />
       <el-table-column label="来程方式" align="center" prop="wayComing" width="100">
         <template slot-scope="scope">
           <dict-tag :options="dict.type.tfc_type" :value="scope.row.wayComing" />
@@ -276,7 +274,7 @@
         <el-form-item label="邮箱信息" prop="email">
           <el-input v-model="form.email" placeholder="请输入邮箱信息" />
         </el-form-item>
-        <el-form-item label="参会人角色" prop="usrType">
+        <el-form-item label="参会人类型" prop="usrType">
           <el-radio-group v-model="form.usrType">
             <el-radio
                 v-for="dict in dict.type.met_usr_type"