From 28aaf2ffa1dbb860a292ba330a7e9362e60e7832 Mon Sep 17 00:00:00 2001
From: kongzy <kongzy>
Date: Fri, 12 Jul 2024 16:41:03 +0800
Subject: [PATCH] update

---
 assess-system/src/main/resources/mapper/AssProjectMapper.xml |   16 +++++++++-------
 1 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/assess-system/src/main/resources/mapper/AssProjectMapper.xml b/assess-system/src/main/resources/mapper/AssProjectMapper.xml
index 6171261..4dc1a92 100644
--- a/assess-system/src/main/resources/mapper/AssProjectMapper.xml
+++ b/assess-system/src/main/resources/mapper/AssProjectMapper.xml
@@ -71,7 +71,7 @@
     <select id="projectList"  resultMap="projectResult">
         <include refid="selectProjectVo"/>
         <if test="params.personId != null and params.personId != ''">
-            left join ass_plan_person a on a.project_id=p.id
+            left join ass_plan_person pp on pp.project_id=p.id
         </if>
         <if test="params.lostMaterial != null">
             left join ass_project_material m on m.project_id=p.id
@@ -112,7 +112,7 @@
                 and date_format(p.create_time,'%y%m%d') &lt;= date_format(#{params.endTime},'%y%m%d')
             </if>
             <if test="params.personId != null and params.personId != ''">
-                and a.person_id=#{params.personId} and a.del_flag=0
+                and pp.person_id=#{params.personId} and pp.del_flag=0
             </if>
             <if test="params.lostMaterial != null and params.lostMaterial==1">
                 and (m.file_id is null)
@@ -131,7 +131,7 @@
 
     <select id="getProjectByName" resultType="com.gkhy.assess.system.domain.AssProject">
         select id,name from ass_project
-        where name=#{name}
+        where name=#{name} and agency_id=#{agencyId} and del_flag=0 limit 1
     </select>
 
     <select id="getReportProgress" resultType="java.lang.Integer">
@@ -140,7 +140,7 @@
     </select>
 
     <select id="getMemberProjectByUserId" resultMap="projectResult">
-        select p.id,p.name,p.report_progress,p.code,p.client,p.province,p.city,p.district,p.business,p.create_time,a.id as plan_person_id,
+        select distinct p.id,p.name,p.report_progress,p.code,p.client,p.province,p.city,p.district,p.business,p.create_time,a.id as plan_person_id,
         e.leader_id,u.name as leader_name
         from ass_project p
         left join ass_plan_person a on a.project_id=p.id
@@ -162,7 +162,7 @@
     </select>
 
     <select id="getLeaderProjectByUserId" resultMap="projectResult">
-        select p.id,p.name,p.report_progress,p.code,p.client,p.province,p.city,p.district,p.business,p.create_time,a.id as plan_person_id,
+        select distinct p.id,p.name,p.report_progress,p.code,p.client,p.province,p.city,p.district,p.business,p.create_time,a.id as plan_person_id,
         e.leader_id,u.name as leader_name
         from ass_project p
         left join ass_plan_person a on a.project_id=p.id
@@ -225,13 +225,15 @@
     </select>
 
     <select id="getProjectByPersonIds" resultType="com.gkhy.assess.system.domain.vo.PersonProjectVO">
-        select a.person_id,count(*) as project_count,max(p.create_time) as last_estimate_time from ass_project p
+        select d.person_id,count(*) as project_count,max(d.create_time) as last_estimate_time from
+        (select a.person_id,a.project_id,max(p.create_time) as create_time from ass_project p
         left join ass_plan_person a on a.project_id=p.id
         where  a.del_flag=0 and p.del_flag=0 and a.person_id in
         <foreach collection="personIds" item="personId" open="(" separator="," close=")">
             #{personId}
         </foreach>
-        group by a.person_id
+        group by a.person_id,a.project_id) d
+        group by d.person_id
     </select>
 
 </mapper>

--
Gitblit v1.9.2