+ 与会企业行程

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

@@ -1,13 +1,13 @@
 package com.ruoyi.system.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;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
 
 /**
  * cps_meeting_enterprise 与会企业对象 cps_meeting_enterprise
- * 
+ *
  * @author ruoyi
  * @date 2024-08-14
  */
@@ -22,6 +22,9 @@ public class CpsMeetingEnterprise extends BaseEntity
     @Excel(name = "企业名称")
     private String enterpriseName;
 
+    @Excel(name = "行程名称")
+    private String tripName;
+
     /** 联系方式 */
     @Excel(name = "联系方式")
     private String tel;
@@ -33,52 +36,65 @@ public class CpsMeetingEnterprise extends BaseEntity
     /** 企业行程 */
     private Long tripId;
 
-    public void setId(Long id) 
+
+    public void setId(Long id)
     {
         this.id = id;
     }
 
-    public Long getId() 
+    public Long getId()
     {
         return id;
     }
-    public void setEnterpriseName(String enterpriseName) 
+
+    public void setEnterpriseName(String enterpriseName)
     {
         this.enterpriseName = enterpriseName;
     }
 
-    public String getEnterpriseName() 
+    public String getEnterpriseName()
     {
         return enterpriseName;
     }
-    public void setTel(String tel) 
+
+    public void setTel(String tel)
     {
         this.tel = tel;
     }
 
-    public String getTel() 
+    public String getTel()
     {
         return tel;
     }
-    public void setInCharge(String inCharge) 
+
+    public void setInCharge(String inCharge)
     {
         this.inCharge = inCharge;
     }
 
-    public String getInCharge() 
+    public String getInCharge()
     {
         return inCharge;
     }
-    public void setTripId(Long tripId) 
+
+    public void setTripId(Long tripId)
     {
         this.tripId = tripId;
     }
 
-    public Long getTripId() 
+    public Long getTripId()
     {
         return tripId;
     }
 
+    public String getTripName() {
+        return tripName;
+    }
+
+    public void setTripName(String tripName) {
+        this.tripName = tripName;
+    }
+
     @Override
     public String toString() {
         return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)

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

@@ -1,39 +1,54 @@
 <?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">
+        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.ruoyi.system.mapper.CpsMeetingEnterpriseMapper">
 
     <resultMap type="com.ruoyi.system.domain.CpsMeetingEnterprise" id="CpsMeetingEnterpriseResult">
-        <result property="id"    column="id"    />
-        <result property="enterpriseName"    column="enterprise_name"    />
-        <result property="tel"    column="tel"    />
-        <result property="inCharge"    column="in_charge"    />
-        <result property="tripId"    column="trip_id"    />
-        <result property="updateTime"    column="update_time"    />
-        <result property="createTime"    column="create_time"    />
-        <result property="createBy"    column="create_by"    />
-        <result property="updateBy"    column="update_by"    />
+        <result property="id" column="id"/>
+        <result property="enterpriseName" column="enterprise_name"/>
+        <result property="tel" column="tel"/>
+        <result property="inCharge" column="in_charge"/>
+        <result property="tripId" column="trip_id"/>
+        <result property="updateTime" column="update_time"/>
+        <result property="createTime" column="create_time"/>
+        <result property="createBy" column="create_by"/>
+        <result property="updateBy" column="update_by"/>
     </resultMap>
 
     <sql id="selectCpsMeetingEnterpriseVo">
-        select id, enterprise_name, tel, in_charge, trip_id, update_time, create_time, create_by, update_by from cps_meeting_enterprise
+        select enterprise.id as id,
+               enterprise.enterprise_name,
+               enterprise.tel,
+               enterprise.in_charge,
+               enterprise.trip_id,
+               trip.trip_name,
+               enterprise.update_time,
+               enterprise.create_time,
+               enterprise.create_by,
+               enterprise.update_by
+        from cps_meeting_enterprise enterprise
+                 left join cps_meeting_enterprise_trip_info trip on enterprise.trip_id = trip.id
     </sql>
 
-    <select id="selectCpsMeetingEnterpriseList" parameterType="com.ruoyi.system.domain.CpsMeetingEnterprise" resultMap="CpsMeetingEnterpriseResult">
+    <select id="selectCpsMeetingEnterpriseList" parameterType="com.ruoyi.system.domain.CpsMeetingEnterprise"
+            resultMap="CpsMeetingEnterpriseResult">
         <include refid="selectCpsMeetingEnterpriseVo"/>
         <where>
-            <if test="enterpriseName != null  and enterpriseName != ''"> and enterprise_name like concat('%', #{enterpriseName}, '%')</if>
-            <if test="inCharge != null  and inCharge != ''"> and in_charge = #{inCharge}</if>
+            <if test="enterpriseName != null  and enterpriseName != ''">and enterprise_name like concat('%',
+                #{enterpriseName}, '%')
+            </if>
+            <if test="inCharge != null  and inCharge != ''">and in_charge = #{inCharge}</if>
         </where>
     </select>
 
     <select id="selectCpsMeetingEnterpriseById" parameterType="Long" resultMap="CpsMeetingEnterpriseResult">
         <include refid="selectCpsMeetingEnterpriseVo"/>
-        where id = #{id}
+        where enterprise.id = #{id}
     </select>
 
-    <insert id="insertCpsMeetingEnterprise" parameterType="com.ruoyi.system.domain.CpsMeetingEnterprise" useGeneratedKeys="true" keyProperty="id">
+    <insert id="insertCpsMeetingEnterprise" parameterType="com.ruoyi.system.domain.CpsMeetingEnterprise"
+            useGeneratedKeys="true" keyProperty="id">
         insert into cps_meeting_enterprise
         <trim prefix="(" suffix=")" suffixOverrides=",">
             <if test="enterpriseName != null and enterpriseName != ''">enterprise_name,</if>
@@ -44,7 +59,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="createTime != null">create_time,</if>
             <if test="createBy != null">create_by,</if>
             <if test="updateBy != null">update_by,</if>
-         </trim>
+        </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="enterpriseName != null and enterpriseName != ''">#{enterpriseName},</if>
             <if test="tel != null">#{tel},</if>
@@ -54,7 +69,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="createTime != null">#{createTime},</if>
             <if test="createBy != null">#{createBy},</if>
             <if test="updateBy != null">#{updateBy},</if>
-         </trim>
+        </trim>
     </insert>
 
     <update id="updateCpsMeetingEnterprise" parameterType="com.ruoyi.system.domain.CpsMeetingEnterprise">
@@ -73,7 +88,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </update>
 
     <delete id="deleteCpsMeetingEnterpriseById" parameterType="Long">
-        delete from cps_meeting_enterprise where id = #{id}
+        delete
+        from cps_meeting_enterprise
+        where id = #{id}
     </delete>
 
     <delete id="deleteCpsMeetingEnterpriseByIds" parameterType="String">

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

@@ -73,6 +73,7 @@
       <el-table-column type="selection" width="55" align="center" />
       <el-table-column label="主键" align="center" prop="id" />
       <el-table-column label="企业名称" align="center" prop="enterpriseName" />
+      <el-table-column label="行程名称" align="center" prop="tripName" />
       <el-table-column label="联系方式" align="center" prop="tel" />
       <el-table-column label="联系人" align="center" prop="inCharge" />
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
@@ -116,12 +117,12 @@
           <el-input v-model="form.inCharge" placeholder="请输入联系人" />
         </el-form-item>
         <el-form-item label="企业行程" prop="tripId">
-          <el-select v-model="form.contentType" placeholder="请选企业行程">
+          <el-select v-model="form.tripId" placeholder="请选企业行程">
             <el-option
                 v-for="dict in tripList"
-                :key="dict.value"
-                :label="dict.label"
-                :value="parseInt(dict.value)"
+                :key="dict.id"
+                :label="dict.tripName"
+                :value="parseInt(dict.id)"
             ></el-option>
           </el-select>
         </el-form-item>
@@ -135,7 +136,8 @@
 </template>
 
 <script>
-import { listEnterprise, getEnterprise, delEnterprise, addEnterprise, updateEnterprise } from "@/api/cp/enterprise";
+import { addEnterprise, delEnterprise, getEnterprise, listEnterprise, updateEnterprise } from '@/api/cp/enterprise';
+import { listEnterpriseTripInfo } from '@/api/cp/enterpriseTripInfo';
 
 export default {
   name: "Enterprise",
@@ -176,11 +178,13 @@ export default {
         tripId: [
           { required: true, message: "企业行程不能为空", trigger: "change" }
         ],
-      }
+      },
+      tripList: [],
     };
   },
   created() {
     this.getList();
+    this.getTrip();
   },
   methods: {
     /** 查询cps_meeting_enterprise 与会企业列表 */
@@ -279,6 +283,14 @@ export default {
       this.download('cp/enterprise/export', {
         ...this.queryParams
       }, `enterprise_${new Date().getTime()}.xlsx`)
+    },
+    getTrip() {
+      listEnterpriseTripInfo({
+        pageNum: 1,
+        pageSize: 1000,
+      }).then(response => {
+        this.tripList = response.rows;
+      });
     }
   }
 };