Browse Source

保存变更会员修改勾选状态

anderx 10 months ago
parent
commit
6c8b2e4538

+ 4 - 26
src/main/java/com/goafanti/customer/service/impl/UserArchivesServiceImpl.java

@@ -7,7 +7,6 @@ import com.goafanti.core.mybatis.BaseMybatisDao;
 import com.goafanti.core.mybatis.page.Pagination;
 import com.goafanti.core.shiro.token.TokenManager;
 import com.goafanti.customer.bo.InputSelectUserArchives;
-import com.goafanti.customer.bo.MyUserDetailsBo;
 import com.goafanti.customer.bo.OutSelectUserArchives;
 import com.goafanti.customer.bo.UserArchivesDetails;
 import com.goafanti.customer.service.CustomerService;
@@ -17,9 +16,7 @@ import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
-import java.math.BigDecimal;
 import java.util.*;
-import java.util.function.Function;
 import java.util.stream.Collectors;
 
 /**
@@ -44,8 +41,7 @@ public class UserArchivesServiceImpl extends BaseMybatisDao< UserArchivesMapper>
     private AdminMapper adminMapper;
     @Resource
     private UserDataLogMapper userDataLogMapper;
-    @Resource
-    private PublicReleaseMapper publicReleaseMapper;
+
 
 
     @Value(value = "${upload.path}")
@@ -102,10 +98,7 @@ public class UserArchivesServiceImpl extends BaseMybatisDao< UserArchivesMapper>
         }
         UserLimitCheck userLimitCheck = userLimitCheckMapper.selectByUid(id);
         //如果没有和大于时间则不能查看
-        if (userLimitCheck==null||System.currentTimeMillis()>userLimitCheck.getCheckTime().getTime()) {
-            return true;
-        }
-        return false;
+        return userLimitCheck == null || System.currentTimeMillis() > userLimitCheck.getCheckTime().getTime();
     }
 
 
@@ -251,10 +244,9 @@ public class UserArchivesServiceImpl extends BaseMybatisDao< UserArchivesMapper>
     @Override
     public Object selectUserArchives(InputSelectUserArchives in) {
         Map<String, Object> params = getParams(in);
-        Pagination<OutSelectUserArchives> page = (Pagination<OutSelectUserArchives>) findPage("selectUserArchivesList",
-                "selectUserArchivesCount", params, in.getPageNo(), in.getPageSize());
 
-        return page;
+        return findPage("selectUserArchivesList",
+                "selectUserArchivesCount", params, in.getPageNo(), in.getPageSize());
     }
 
     private Map<String, Object> getParams(InputSelectUserArchives in) {
@@ -300,20 +292,6 @@ public class UserArchivesServiceImpl extends BaseMybatisDao< UserArchivesMapper>
         return 1;
     }
 
-    private Object pushPage(Pagination<?> page) {
-        List<OutSelectUserArchives> list = (List<OutSelectUserArchives>) page.getList();
-        list.forEach(e ->{
-            List<MyUserDetailsBo> myUserDetailsBos = publicReleaseMapper.selectCountByUid(e.getId());
-            List<MyUserDetailsBo> collect = new ArrayList<>(myUserDetailsBos.stream()
-                    .collect(Collectors.toMap(MyUserDetailsBo::getAid, Function.identity(), (e1, e2) -> e1))
-                    .values());
-            List<BigDecimal> collect1 = myUserDetailsBos.stream().map(item -> BigDecimal.valueOf(item.getDuration())).collect(Collectors.toList());
-            BigDecimal reduce = collect1.stream().reduce(BigDecimal.ZERO, BigDecimal::add);
-            e.setPublicContent("人次"+collect.size()+",公出次数"+myUserDetailsBos.size()+",工时"+reduce+"小时");
-        });
-        return page;
-    }
-
     @Override
     public Object selectUserArchivesExport(InputSelectUserArchives in) {
         Map<String, Object> params = getParams(in);