Merge remote-tracking branch 'origin/dev_point_task' into develop

4 years ago · 6f8b8f76c7
1 changed files with 2 additions and 2 deletions
--- 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
@ -538,7 +538,7 @@ public class UserPointActionLogServiceImpl extends BaseServiceImpl<UserPointActi
                dto.setFinishFlag("去完成");
            }else{
                dto.setFinishTotalDesc("完成".concat(String.valueOf(dto.getFinishedCount())).concat("/").concat(String.valueOf(dto.getUpLimitCount())));
-                if(dto.getUpLimitCount().equals(dto.getFinishedCount())){
+                if (dto.getUpLimitCount().equals(dto.getFinishedCount()) || dto.getFinishedCount() > dto.getUpLimitCount()) {
                    dto.setFinishFlag("已完成");
                } else {
                    dto.setFinishFlag("去完成");