|
@@ -7,8 +7,10 @@ import com.goafanti.admin.bo.OutFinanceCount;
|
|
|
import com.goafanti.admin.service.AdminStatisticsService;
|
|
import com.goafanti.admin.service.AdminStatisticsService;
|
|
|
import com.goafanti.common.constant.AFTConstants;
|
|
import com.goafanti.common.constant.AFTConstants;
|
|
|
import com.goafanti.common.dao.AdminMapper;
|
|
import com.goafanti.common.dao.AdminMapper;
|
|
|
|
|
+import com.goafanti.common.dao.FinanceCountMapper;
|
|
|
import com.goafanti.common.dao.PublicReleaseMapper;
|
|
import com.goafanti.common.dao.PublicReleaseMapper;
|
|
|
import com.goafanti.common.model.AdminUserCount;
|
|
import com.goafanti.common.model.AdminUserCount;
|
|
|
|
|
+import com.goafanti.common.model.FinanceCount;
|
|
|
import com.goafanti.common.utils.DateUtils;
|
|
import com.goafanti.common.utils.DateUtils;
|
|
|
import com.goafanti.core.shiro.token.TokenManager;
|
|
import com.goafanti.core.shiro.token.TokenManager;
|
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
@@ -26,6 +28,8 @@ public class AdminStatisticsServiceImpl implements AdminStatisticsService {
|
|
|
private AdminMapper adminMapper;
|
|
private AdminMapper adminMapper;
|
|
|
@Autowired
|
|
@Autowired
|
|
|
private PublicReleaseMapper publicReleaseMapper;
|
|
private PublicReleaseMapper publicReleaseMapper;
|
|
|
|
|
+ @Autowired
|
|
|
|
|
+ private FinanceCountMapper financeCountMapper;
|
|
|
|
|
|
|
|
|
|
|
|
|
@Override
|
|
@Override
|
|
@@ -211,6 +215,18 @@ public class AdminStatisticsServiceImpl implements AdminStatisticsService {
|
|
|
return financeCount;
|
|
return financeCount;
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
|
|
+ @Override
|
|
|
|
|
+ public Object financeLists(String aid) {
|
|
|
|
|
+ //获取当月的列表
|
|
|
|
|
+ Map<String,Object> map=new LinkedHashMap<>();
|
|
|
|
|
+ Days days = new Days();
|
|
|
|
|
+ List<String> thisMonth = getThisMonth(days);
|
|
|
|
|
+ List<FinanceCount> financeCounts = financeCountMapper.financeLists(aid, days.firstDay, days.endDay+"23:59:59");
|
|
|
|
|
+ publicReleaseMapper.selectByaidAndDate(aid, days.firstDay, days.endDay+"23:59:59");
|
|
|
|
|
+ map.put("dates",thisMonth);
|
|
|
|
|
+ return map;
|
|
|
|
|
+ }
|
|
|
|
|
+
|
|
|
|
|
|
|
|
public List<String> getThisMonth(Days days) {
|
|
public List<String> getThisMonth(Days days) {
|
|
|
//获取三十天前的日期
|
|
//获取三十天前的日期
|