feat: 求职人员服务跟进记录查询SQL调整

src/main/java/com/hz/employmentsite/vo/jobUserManager/JobUserServiceVo.java

@@ -31,4 +31,6 @@ public class JobUserServiceVo {
     private String jobUserName;
 
     private String serviceUserName;
+
+    private Integer ServiceType;
 }

src/main/resources/mapping/cquery/JobUserServiceCQuery.xml

@@ -4,12 +4,65 @@
     <select id="getList" resultType="com.hz.employmentsite.vo.jobUserManager.JobUserServiceVo">
         SELECT
             service.*,
-            jobUser.`Name` AS jobUserName,
+            jobUserTemp.`Name` AS jobUserName,
             sysUser.`Name` AS serviceUserName
         FROM
-            `pc_jobuser_service` service
-                LEFT JOIN pc_jobuser jobUser ON service.JobUserID = jobUser.JobuserID
-                LEFT JOIN sys_user sysUser ON service.ServiceUserID = sysUser.UserID
+            (
+                SELECT
+                    ServiceID,
+                    JobUserID,
+                    ServiceContent,
+                    ServiceTime,
+                    ServiceUserID,
+                    1 AS serviceType
+                FROM
+                    pc_jobuser_service UNION
+                SELECT
+                    '' AS ServiceID,
+                    JobUserID,
+                    '登记求职者个人求职信息' AS ServiceContent,
+                    CreateTime AS ServiceTime,
+                    CreateUserID AS ServiceUserID,
+                    2 AS serviceType
+                FROM
+                    pc_jobuser UNION
+                (
+                    SELECT
+                        '' AS ServiceID,
+                        jobUser.JobUserID,
+                        CONCAT( '已入职', company.CompanyName, '的', prof.ProfessionName, '岗位' ) AS ServiceContent,
+                        mgt.ModifyTime AS ServiceTime,
+                        mgt.ModifyUserID AS ServiceUserID,
+                        2 AS ServiceType
+                    FROM
+                        pc_recommend_mgt mgt
+                        LEFT JOIN pc_post post ON mgt.PostID = post.PostID
+                        LEFT JOIN pc_profession prof ON post.ProfessionID = prof.ProfessionID
+                        LEFT JOIN pc_company company ON post.CompanyID = company.CompanyID
+                        LEFT JOIN pc_jobhunt jobHunt ON mgt.JobHuntID = jobHunt.JobHuntID
+                        LEFT JOIN pc_jobuser jobUser ON jobHunt.JobUserID = jobUser.JobuserID
+                    WHERE
+                        mgt.ModifyTime IS NOT NULL
+                ) UNION
+                (
+                    SELECT
+                        '' AS ServiceID,
+                        jobUser.JobUserID,
+                        CONCAT( '已推荐', company.CompanyName, '的', prof.ProfessionName, '岗位' ) AS ServiceContent,
+                        mgt.CreateTime AS ServiceTime,
+                        mgt.CreateUserID AS ServiceUserID,
+                        2 AS ServiceType
+                    FROM
+                        pc_recommend_mgt mgt
+                        LEFT JOIN pc_post post ON mgt.PostID = post.PostID
+                        LEFT JOIN pc_profession prof ON post.ProfessionID = prof.ProfessionID
+                        LEFT JOIN pc_company company ON post.CompanyID = company.CompanyID
+                        LEFT JOIN pc_jobhunt jobHunt ON mgt.JobHuntID = jobHunt.JobHuntID
+                        LEFT JOIN pc_jobuser jobUser ON jobHunt.JobUserID = jobUser.JobuserID
+                )
+        ) AS service
+            LEFT JOIN pc_jobuser jobUserTemp ON service.JobUserID = jobUserTemp.JobuserID
+            LEFT JOIN sys_user sysUser ON service.ServiceUserID = sysUser.UserID
         WHERE
             1=1
         <if test="jobUserID != '' and jobUserID != null">

vue/src/views/jobUserManager/jobuser/ServiceTableCom.vue

@@ -24,7 +24,7 @@
             </div>
           </template>
           <template v-if="column.key === 'operation'">
-            <div class="table-operation" v-if="userInfo.userID == record.serviceUserID">
+            <div class="table-operation" v-if="userInfo.userID == record.serviceUserID && record.serviceType == 1">
               <a-button type="link" size="small" @click="onEdit(record)">编辑</a-button>
               <a-button type="link" size="small" @click="onDel(record)">删除</a-button>
             </div>