fix 推广数据查询数据返回;账号导出

netflix-dao/src/main/java/com/cyksj/model/excel/ExcelManageAccountData.java

@@ -8,6 +8,8 @@ import com.ejlchina.searcher.bean.SearchBean;
 import lombok.Getter;
 import lombok.Setter;
 
+import java.util.Date;
+
 /*
  *项目名: netflix
  *文件名: ExcelManageAccountData
@@ -45,9 +47,13 @@ public class ExcelManageAccountData {
 	@DbField("a.bank_card")
 	private String bankCard;
 
+	@DbField("a.expiry_time")
+	@ExcelIgnore
+	private Date expiryTime;
+
 	@ExcelProperty("到期时间")
 	@DbField("date_format(a.expiry_time,'%Y/%c/%e')")
-	private String expiryTime;
+	private String expiryTimeExcel;
 
 	@ExcelProperty("激活码")
 	@DbIgnore

netflix-dao/src/main/java/com/cyksj/model/views/ChannelPopularizeDetailView.java

@@ -33,6 +33,9 @@ public class ChannelPopularizeDetailView {
     @DbField("g.id")
     private Long goodsId;
 
+    @DbField("g.type")
+    private Integer goodsDonType;
+
     /**
      * 订单数
      */

netflix-dao/src/main/java/com/cyksj/model/views/ChannelPopularizeView.java

@@ -72,7 +72,7 @@ public class ChannelPopularizeView {
     /**
      * 浏览数
      */
-    @DbField("select count(v.id) from channel_popularize_visit v where v.popularize_id = cp.id ")
+    @DbField("select count(v.id) from channel_popularize_visit v where v.popularize_id = cp.id :visitTime:")
     private Integer visit;
 
     /**

netflix-web/src/main/java/com/cyksj/web/controller/manage/account/CmsAccountController.java

@@ -115,7 +115,7 @@ public class CmsAccountController {
     public void exportAccount(Long userId, String nickName, String submitAccount, String expiryStartTime, String expiryEndTime, HttpServletResponse response) {
         MapBuilder mapBuilder = MapUtils.flatBuilder(request.getParameterMap());
         if (StrUtil.isNotEmpty(expiryStartTime) || StrUtil.isNotEmpty(expiryEndTime)) {
-            mapBuilder.field(AccountView::getExpiryTime, expiryStartTime, expiryEndTime)
+            mapBuilder.field(ExcelManageAccountData::getExpiryTime, expiryStartTime, expiryEndTime)
                     .op(Operator.Between);
         }
 
@@ -125,7 +125,7 @@ public class CmsAccountController {
                 throw BusinessRuntimeException.getInstance("暂无数据！");
             }
 
-            mapBuilder.field(AccountView::getId, accountIds).op(Operator.InList);
+            mapBuilder.field(ExcelManageAccountData::getId, accountIds).op(Operator.InList);
         }
         List<ExcelManageAccountData> list = beanSearcher.searchAll(ExcelManageAccountData.class, mapBuilder.build());
 

netflix-web/src/main/java/com/cyksj/web/controller/manage/channel/CmsChannelPopularizeController.java

@@ -48,15 +48,19 @@ public class CmsChannelPopularizeController {
     @SaCheckPermission("promotion:view")
     public Result<SearchResult<ChannelPopularizeView>> get(String startTime, String endTime){
         String timeSql = StringUtils.EMPTY;
-        if(StringUtils.isNotBlank(startTime)){
-            timeSql += String.format(" and o.created_time >= '%s'",startTime);
+        String visitTimeSql = StringUtils.EMPTY;
+        if (StringUtils.isNotBlank(startTime)) {
+            timeSql += String.format(" and o.created_time >= '%s'", startTime);
+            visitTimeSql += String.format(" and v.created_time >= '%s'", startTime);
         }
-        if(StringUtils.isNotBlank(endTime)){
-            timeSql += String.format(" and o.created_time <= '%s'" , endTime);
+        if (StringUtils.isNotBlank(endTime)) {
+            timeSql += String.format(" and o.created_time <= '%s'", endTime);
+            visitTimeSql += String.format(" and v.created_time <= '%s'", endTime);
         }
         SearchResult<ChannelPopularizeView> searchResult = beanSearcher.search(ChannelPopularizeView.class,
                 MapUtils.flatBuilder(request.getParameterMap())
-                        .put("time",timeSql)
+                        .put("time", timeSql)
+                        .put("visitTime", visitTimeSql)
                         .build());
         searchResult.getDataList().forEach(data -> {
             Integer emailCount = userMapper.selectCount(Wrappers.lambdaQuery(User.class)