From b2db6454fe6ae57db9b159c0a1ac6bc34005c8f9 Mon Sep 17 00:00:00 2001
From: "rong.liu" <maureen_liur@163.com>
Date: Fri, 5 Mar 2021 15:14:57 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=AE=9E=E9=AA=8C=E6=8A=A5?=
 =?UTF-8?q?=E5=91=8A=E6=95=B0=E9=87=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../AchievementManagementServiceImpl.java     | 18 +++++++++++++
 .../mapper/tms/AchievementManagementDao.xml   | 27 ++++++++++++++++---
 2 files changed, 42 insertions(+), 3 deletions(-)

diff --git a/src/main/java/com/msdw/tms/service/impl/AchievementManagementServiceImpl.java b/src/main/java/com/msdw/tms/service/impl/AchievementManagementServiceImpl.java
index 7eae17b..2de76c0 100644
--- a/src/main/java/com/msdw/tms/service/impl/AchievementManagementServiceImpl.java
+++ b/src/main/java/com/msdw/tms/service/impl/AchievementManagementServiceImpl.java
@@ -78,9 +78,26 @@ public class AchievementManagementServiceImpl extends ServiceImpl<AchievementMan
         return R.ok().put("name", name);
     }
 
+    /**
+     * 虚拟仿真列表
+     *
+     * @param vo
+     * @param page
+     * @param size
+     * @return
+     */
     @Override
     public List<ResultsEntity> list(ResultsVo vo, Integer page, Integer size) {
+
+
         List<ResultsEntity> list = achievementManagementDao.list(vo);
+
+        for (ResultsEntity entity : list) {
+            Integer number = achievementManagementDao.getImitationAchievement(entity.getProjectId()).size();
+            entity.setNumber(number);
+        }
+
+
         return list;
     }
 
@@ -295,6 +312,7 @@ public class AchievementManagementServiceImpl extends ServiceImpl<AchievementMan
     public List<AchievementManagementVO> getImitationAchievement(Integer projectId) {
         List<AchievementManagementVO> list = achievementManagementDao.getImitationAchievement(projectId);
 
+
         return list;
     }
 
diff --git a/src/main/resources/mapper/tms/AchievementManagementDao.xml b/src/main/resources/mapper/tms/AchievementManagementDao.xml
index 8151688..ea8babc 100644
--- a/src/main/resources/mapper/tms/AchievementManagementDao.xml
+++ b/src/main/resources/mapper/tms/AchievementManagementDao.xml
@@ -391,10 +391,31 @@
         GROUP BY hec.codeId
     </select>
 
+    <!--SELECT hpm.creationTime,hpm.projectId,hpm.projectName,hpm.projectPermissions,hpm.systemId,(SELECT count(*) FROM
+    tms_project_record her where hpm.projectId = her.projectId and her.isdel = 0 ) as number
+    FROM hr_project_management hpm
+    WHERE systemId = #{systemId}
+    AND hpm.isdel = 0
+    AND hpm.projectPermissions = #{projectPermissions}
+
+    <if test="searchContant!=null and searchContant!=''">and hpm.projectName like concat('%',#{searchContant},'%')
+    </if>
+    <if test="startTime!=null and startTime!='' and endTime!=null and endTime != ''">and hpm.creationTime between
+        #{endTime} and #{startTime}
+    </if>
+    <if test="month!=null and month != ''">and DATE_SUB(CURDATE(), INTERVAL #{month} month ) &lt;=
+        date(hpm.creationTime)
+    </if>
+    ORDER BY hpm.creationTime DESC-->
     <select id="list" resultType="com.msdw.tms.entity.ResultsEntity">
-        SELECT hpm.creationTime,hpm.projectId,hpm.projectName,hpm.projectPermissions,hpm.systemId,(SELECT count(*) FROM
-        tms_project_record her where hpm.projectId = her.projectId and her.isdel = 0 ) as number
-        FROM hr_project_management hpm
+        SELECT
+        hpm.projectId,
+        hpm.projectName,
+        hpm.projectPermissions,
+        hpm.systemId,
+        hpm.creationTime
+        FROM
+        hr_project_management hpm
         WHERE systemId = #{systemId}
         AND hpm.isdel = 0
         AND hpm.projectPermissions = #{projectPermissions}