From 1700d1f08b40d0c832b117a4ca2d3f0df25abb54 Mon Sep 17 00:00:00 2001
From: yinzuomei <576302893@qq.com>
Date: Tue, 22 Jun 2021 12:30:13 +0800
Subject: [PATCH] =?UTF-8?q?bug=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/UserPointActionLogServiceImpl.java      |  2 +-
 .../src/main/resources/logback-spring.xml        |  2 +-
 .../resources/mapper/UserPointActionLogDao.xml   | 16 +++++++++++++---
 3 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/impl/UserPointActionLogServiceImpl.java b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/impl/UserPointActionLogServiceImpl.java
index 8abbdaf26e..16be869b5a 100644
--- a/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/impl/UserPointActionLogServiceImpl.java
+++ b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/impl/UserPointActionLogServiceImpl.java
@@ -535,7 +535,7 @@ public class UserPointActionLogServiceImpl extends BaseServiceImpl<UserPointActi
                 if(dto.getUpLimitCount().equals(dto.getFinishedCount())){
                     dto.setFinishFlag("已完成");
                 }else{
-                    dto.setFinishFlag("未完成");
+                    dto.setFinishFlag("去完成");
                 }
             }
             //一次性任务，已完成。
diff --git a/epmet-module/epmet-point/epmet-point-server/src/main/resources/logback-spring.xml b/epmet-module/epmet-point/epmet-point-server/src/main/resources/logback-spring.xml
index 916c58edbb..319395e4f4 100644
--- a/epmet-module/epmet-point/epmet-point-server/src/main/resources/logback-spring.xml
+++ b/epmet-module/epmet-point/epmet-point-server/src/main/resources/logback-spring.xml
@@ -138,7 +138,7 @@
     </appender>
 
     <!-- 开发、测试环境 -->
-    <springProfile name="dev,test">
+    <springProfile name="dev,test,local">
         <logger name="org.springframework.web" level="INFO"/>
         <logger name="org.springboot.sample" level="INFO"/>
         <logger name="com.epmet.dao" level="INFO"/>
diff --git a/epmet-module/epmet-point/epmet-point-server/src/main/resources/mapper/UserPointActionLogDao.xml b/epmet-module/epmet-point/epmet-point-server/src/main/resources/mapper/UserPointActionLogDao.xml
index 4110a34989..d2a4f0f212 100644
--- a/epmet-module/epmet-point/epmet-point-server/src/main/resources/mapper/UserPointActionLogDao.xml
+++ b/epmet-module/epmet-point/epmet-point-server/src/main/resources/mapper/UserPointActionLogDao.xml
@@ -74,6 +74,9 @@
           AND DATE_FORMAT(CREATED_TIME, '%Y-%m-%d') = DATE_FORMAT(NOW(), '%Y-%m-%d')
     </select>
 
+
+    <!-- 未完成：无上限的、一次性任务未完成的、非一次性任务完成数量< 积分上限次数的   -->
+    <!-- 已完成：有上线并且完成的、一次性任务完成的   -->
     <select id="queryMyPointTaskList" parameterType="map" resultType="com.epmet.dto.result.MyPointTaskResultDTO">
         select
             temp.*
@@ -124,12 +127,19 @@
         )temp
         where 1=1
         <if test='null != type and "unfinished" == type'>
-            and temp.finishedCount=0
+            AND (
+            temp.upLimit='0'
+            or ( temp.upLimit !='0' and temp.DISPOSABLE = '0' AND temp.finishedCount &lt; upLimitCount )
+            OR ( temp.upLimit !='0' and temp.DISPOSABLE = '1' AND temp.finishedCount = 0 )
+            )
         </if>
         <if test='null != type and "finished" == type'>
-            and temp.upLimit !=0
-            and temp.finishedCount=temp.upLimitCount
+            and (
+                ( temp.upLimit !='0' and temp.DISPOSABLE='0' and temp.finishedCount=temp.upLimitCount and temp.finishedCount !=0)
+                or(temp.DISPOSABLE='1'and temp.finishedCount=1)
+            )
         </if>
         ORDER BY temp.sort ASC
     </select>
+
 </mapper>
\ No newline at end of file