feats

pom.xml

@@ -10,7 +10,7 @@
 	</parent>
 	<groupId>com.huiju</groupId>
 	<artifactId>xiangsong</artifactId>
-	<version>1.0.48</version>
+	<version>1.0.50</version>
 	<name>xiangsong</name>
 	<description>香颂</description>
 

src/main/java/com/huiju/estateagents/common/DateUtils.java

@@ -60,6 +60,15 @@ public class DateUtils {
         return false;
     }
 
+    public static String format(LocalDateTime dt, String formatStr) {
+        if (null == dt) {
+            return null;
+        }
+
+        DateTimeFormatter formatter = DateTimeFormatter.ofPattern(formatStr);
+        return dt.format(formatter);
+    }
+
     /**
      * 当前时间是否早于指定时间
      *

src/main/java/com/huiju/estateagents/controller/TaPointsExchangeController.java

@@ -6,8 +6,11 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.huiju.estateagents.base.BaseController;
 import com.huiju.estateagents.base.ResponseBean;
 import com.huiju.estateagents.common.CommConstant;
+import com.huiju.estateagents.common.DateUtils;
+import com.huiju.estateagents.common.ExcelUtils;
 import com.huiju.estateagents.entity.TaGoods;
 import com.huiju.estateagents.entity.TaPointsExchange;
+import com.huiju.estateagents.excel.TaPointsExchangeExport;
 import com.huiju.estateagents.service.ITaGoodsService;
 import com.huiju.estateagents.service.ITaPointsExchangeService;
 import io.swagger.annotations.Api;
@@ -26,7 +29,9 @@ import org.springframework.web.bind.annotation.ResponseBody;
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
 import java.time.LocalDateTime;
+import java.util.ArrayList;
 import java.util.List;
 
 /**
@@ -94,6 +99,69 @@ public class TaPointsExchangeController extends BaseController {
         }
         return responseBean;
     }
+
+
+    /**
+     * 分页查询列表
+     * @param pageNum
+     * @param pageSize
+     * @return
+     */
+    @RequestMapping(value="/admin/taPointsExchange/export",method= RequestMethod.GET)
+    public ResponseBean taPointsExchangeExport(@RequestParam(value ="personName",required = false) String personName,
+                                               @RequestParam(value ="phone",required = false) String phone,
+                                               @RequestParam(value ="personType",required = false) String personType,
+                                               @RequestParam(value ="targetName",required = false) String targetName,
+                                               @RequestParam(value ="startCreateDate",required = false) String startCreateDate,
+                                               @RequestParam(value ="endCreateDate",required = false) String endCreateDate,
+                                               @RequestParam(value ="startVerifyDate",required = false) String startVerifyDate,
+                                               @RequestParam(value ="endVerifyDate",required = false) String endVerifyDate,
+                                               @RequestParam(value ="status",required = false) Integer status,
+                                               @RequestParam(value ="tel",required = false) String tel,
+                                               HttpServletRequest request,
+                                               HttpServletResponse response){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            //使用分页插件
+            TaPointsExchange taPointsExchange = new TaPointsExchange();
+            taPointsExchange.setPersonName(personName);
+            taPointsExchange.setPhone(phone);
+            taPointsExchange.setPersonType(personType);
+            taPointsExchange.setTargetName(targetName);
+            taPointsExchange.setStartCreateDate(startCreateDate);
+            taPointsExchange.setEndCreateDate(endCreateDate);
+            taPointsExchange.setStartVerifyDate(startVerifyDate);
+            taPointsExchange.setEndVerifyDate(endVerifyDate);
+            taPointsExchange.setStatus(status);
+            taPointsExchange.setTel(tel);
+            taPointsExchange.setOrgId(getOrgId(request));
+
+            responseBean = iTaPointsExchangeService.selectList(1, 9999,taPointsExchange,getTaPersonBuildingListByUserId(request));
+            List<TaPointsExchange> records = ((Page<TaPointsExchange>) responseBean.getData()).getRecords();
+
+            List<TaPointsExchangeExport> list = new ArrayList<>();
+            if (null != records) {
+                for (TaPointsExchange item: records) {
+                    TaPointsExchangeExport row = new TaPointsExchangeExport();
+                    row.setPersonName(item.getPersonName());
+                    row.setPhone(item.getPhone());
+                    row.setPersonType("prop".equals(item.getPersonType()) ? "物业相关" : ("life-consultant".equals(item.getPersonType()) ? "生活管家" : null));
+                    row.setTargetName(item.getTargetName());
+                    row.setStatus(1 == item.getStatus() ? "已领取" : "未领取");
+                    row.setCreateDate(DateUtils.format(item.getCreateDate(), "yyyy-MM-dd HH:mm"));
+                    row.setVerifyDate(DateUtils.format(item.getVerifyDate(), "yyyy-MM-dd HH:mm"));
+                    list.add(row);
+                }
+            }
+
+            ExcelUtils.flush(response, TaPointsExchangeExport.class, list, "积分兑换记录" + DateUtils.today());
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("taPointsExchangeList -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
     
     /**
      * 修改对象
@@ -231,7 +299,13 @@ public class TaPointsExchangeController extends BaseController {
     public ResponseBean wxPointsExchangeList(@RequestParam(value ="pageNumber",defaultValue = "1") Integer pageNumber,
                                              @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize,
                                              @RequestParam(value = "buildingId", required = false) String buildingId,
-                                             @RequestParam(value = "personId", required = false) String personId){
+                                             @RequestParam(value = "personId", required = false) String personId,
+                                             HttpServletRequest request){
+
+        if (null == personId) {
+            personId = getPersonId(request);
+        }
+
         ResponseBean responseBean = new ResponseBean();
         try {
             //使用分页插件

src/main/java/com/huiju/estateagents/entity/TaPointsExchange.java

@@ -108,7 +108,7 @@ public class TaPointsExchange implements Serializable {
     
     @TableField(exist = false)
     private String personType;
-    
+
     @TableField(exist = false)
     private String startCreateDate;
     

src/main/java/com/huiju/estateagents/excel/TaPointsExchangeExport.java

@@ -0,0 +1,57 @@
+package com.huiju.estateagents.excel;
+
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import lombok.Data;
+
+@Data
+public class TaPointsExchangeExport {
+
+    /**
+     * 兑换人姓名
+     */
+    @ColumnWidth(15)
+    @ExcelProperty(value = "用户姓名", index = 0)
+    private String personName;
+
+    /**
+     * 兑换人手机
+     */
+    @ColumnWidth(20)
+    @ExcelProperty(value = "手机号", index = 2)
+    private String phone;
+
+    /**
+     * 物品名称
+     */
+    @ColumnWidth(30)
+    @ExcelProperty(value = "商品名称", index = 3)
+    private String targetName;
+
+
+    /**
+     * 状态
+     */
+    @ColumnWidth(15)
+    @ExcelProperty(value = "状态", index = 6)
+    private String status;
+
+    /**
+     * 创建时间
+     */
+    @ColumnWidth(30)
+    @ExcelProperty(value = "兑换时间", index = 4)
+    private String createDate;
+
+    /**
+     * 领取时间
+     */
+    @ColumnWidth(30)
+    @ExcelProperty(value = "领取时间", index = 5)
+    private String verifyDate;
+
+    @ColumnWidth(15)
+    @ExcelProperty(value = "用户类型", index = 1)
+    private String personType;
+
+}