From 12de722de0bd812d071f10e2ffd2a17fab3bb192 Mon Sep 17 00:00:00 2001
From: "xiaodong.hu" <1075471126@qq.com>
Date: Wed, 26 Jul 2023 10:09:11 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=94=B9=E7=A8=BD=E6=A0=B8=E6=9F=A5?=
 =?UTF-8?q?=E8=AF=A2=E4=B8=BA=E6=A8=A1=E7=B3=8A=E6=9F=A5=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/resources/mapper/HyInspectionMapper.xml | 16 ++++++++--------
 .../mapper/HyInterviewInspectionLogMapper.xml    |  2 +-
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/coolstore-partner-dao/src/main/resources/mapper/HyInspectionMapper.xml b/coolstore-partner-dao/src/main/resources/mapper/HyInspectionMapper.xml
index b27e9690e..88a951189 100644
--- a/coolstore-partner-dao/src/main/resources/mapper/HyInspectionMapper.xml
+++ b/coolstore-partner-dao/src/main/resources/mapper/HyInspectionMapper.xml
@@ -73,19 +73,19 @@
       AND hoai.deleted = 0
       <where>
         <if test="userId !=null and userId !=''">
-         and (his.inspection_user_id = #{userId} OR hi.operator_user_id = #{userId})
+         and ((his.inspection_user_id = #{userId} and  hi.`status`=0 ) OR hi.operator_user_id = #{userId})
         </if>
         <if test="interviewerName !=null and interviewerName !=''">
          and eu.`name` like  concat('%',#{interviewerName},'%')
         </if>
         <if test="interviewerMobile !=null and interviewerMobile !=''">
-         and eu.mobile=#{interviewerMobile}
+         and eu.mobile like  concat('%',#{interviewerMobile},'%')
         </if>
         <if test="intervieweeName !=null and intervieweeName !=''">
          and hpui.username like  concat('%',#{intervieweeName},'%')
         </if>
         <if test="intervieweeMobile !=null and intervieweeMobile !=''">
-         and hpui.mobile=#{intervieweeMobile}
+         and hpui.mobile like  concat('%',#{intervieweeMobile},'%')
         </if>
         <if test="status !=null">
          and hi.`status`=#{status}
@@ -140,7 +140,7 @@
           and hpui.username like  concat('%',#{intervieweeName},'%')
         </if>
         <if test="intervieweeMobile !=null and intervieweeMobile !=''">
-          and hpui.mobile=#{intervieweeMobile}
+          and hpui.mobile like  concat('%',#{intervieweeMobile},'%')
         </if>
         <if test="status !=null">
           and hi.`status`=#{status}
@@ -196,19 +196,19 @@
         and mdd.id is not null
       </if>
       <if test="userId !=null and userId !=''">
-        and (his.inspection_user_id = #{userId} OR hi.operator_user_id = #{userId})
+        and ((his.inspection_user_id = #{userId} and  hi.`status`=0 ) OR hi.operator_user_id = #{userId})
       </if>
       <if test="interviewerName !=null and interviewerName !=''">
         and eu.`name` like  concat('%',#{interviewerName},'%')
       </if>
       <if test="interviewerMobile !=null and interviewerMobile !=''">
-        and eu.mobile=#{interviewerMobile}
+        and eu.mobile like  concat('%',#{interviewerMobile},'%')
       </if>
       <if test="intervieweeName !=null and intervieweeName !=''">
         and hpui.username like  concat('%',#{intervieweeName},'%')
       </if>
       <if test="intervieweeMobile !=null and intervieweeMobile !=''">
-        and hpui.mobile=#{intervieweeMobile}
+        and hpui.mobile like  concat('%',{intervieweeMobile},'%')
       </if>
       <if test="status !=null">
         and hi.`status`=#{status}
@@ -260,7 +260,7 @@
         and hpui.username like  concat('%',#{intervieweeName},'%')
       </if>
       <if test="intervieweeMobile !=null and intervieweeMobile !=''">
-        and hpui.mobile=#{intervieweeMobile}
+        and hpui.mobile like  concat('%',#{intervieweeMobile},'%')
       </if>
       <if test="status !=null">
         and hi.`status`=#{status}
diff --git a/coolstore-partner-dao/src/main/resources/mapper/HyInterviewInspectionLogMapper.xml b/coolstore-partner-dao/src/main/resources/mapper/HyInterviewInspectionLogMapper.xml
index e247a8a21..a92ce1949 100644
--- a/coolstore-partner-dao/src/main/resources/mapper/HyInterviewInspectionLogMapper.xml
+++ b/coolstore-partner-dao/src/main/resources/mapper/HyInterviewInspectionLogMapper.xml
@@ -27,7 +27,7 @@
   </select>
     <select id="interviewInspectionGetHistoryDetail"  resultType="com.cool.store.vo.interview.InterviewInspectionHistoryInfo">
       SELECT a.id,  b.`name` as  operatorUserName, b.mobile  as  operatorUserMobile,operation_time as  inspectionTime, operation_type as operationType ,description,files as filesStr
-      FROM hy_interview_inspection_log  a left  join    enterprise_user  b on a.operator_user_id=b.user_id and b.deleted=0  WHERE inspection_id=#{inspectionId}   ORDER BY  a.id
+      FROM hy_interview_inspection_log  a left  join    enterprise_user  b on a.operator_user_id=b.user_id and b.deleted=0  WHERE inspection_id=#{inspectionId}   ORDER BY  operation_time  desc
     </select>
     <delete id="deleteByPrimaryKey" parameterType="java.lang.Long">
     delete from hy_interview_inspection_log