From 8fbb40cf73cbcf9beaa6faa22281523a01fd7c96 Mon Sep 17 00:00:00 2001
From: wanggongfeng <1305282856@qq.com>
Date: Mon, 27 Sep 2021 10:39:28 +0800
Subject: [PATCH] =?UTF-8?q?=E7=A7=AF=E5=88=86=E5=95=86=E5=9F=8E=E5=90=8E?=
 =?UTF-8?q?=E5=8F=B0=E7=AE=A1=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../epdc/dto/AcitveProductExchangeDTO.java    |  5 +--
 .../esua/epdc/dto/ActivePointLogDTO.java      |  5 +--
 .../AcitveProductExchangeController.java      |  9 ++---
 .../controller/ActivePointLogController.java  |  9 ++---
 .../epdc/dao/AcitveProductExchangeDao.java    | 17 ++++++++--
 .../esua/epdc/dao/ActivePointLogDao.java      | 19 +++++++++--
 .../service/AcitveProductExchangeService.java | 11 +++++--
 .../epdc/service/ActivePointLogService.java   | 11 +++++--
 .../AcitveProductExchangeServiceImpl.java     | 16 +++++++--
 .../impl/ActivePointLogServiceImpl.java       | 16 +++++++--
 .../mapper/AcitveProductExchangeDao.xml       | 33 ++++++++++++++++++-
 .../resources/mapper/ActivePointLogDao.xml    | 27 ++++++++++++++-
 12 files changed, 150 insertions(+), 28 deletions(-)

diff --git a/esua-epdc/epdc-module/epdc-points/epdc-points-client/src/main/java/com/elink/esua/epdc/dto/AcitveProductExchangeDTO.java b/esua-epdc/epdc-module/epdc-points/epdc-points-client/src/main/java/com/elink/esua/epdc/dto/AcitveProductExchangeDTO.java
index 1daa48879..1958c51e7 100644
--- a/esua-epdc/epdc-module/epdc-points/epdc-points-client/src/main/java/com/elink/esua/epdc/dto/AcitveProductExchangeDTO.java
+++ b/esua-epdc/epdc-module/epdc-points/epdc-points-client/src/main/java/com/elink/esua/epdc/dto/AcitveProductExchangeDTO.java
@@ -23,7 +23,7 @@ import lombok.Data;
 
 
 /**
- * 商品兑换表 
+ * 商品兑换表
  *
  * @author elink elink@elink-cn.com
  * @since v1.0.0 2021-09-23
@@ -67,6 +67,7 @@ public class AcitveProductExchangeDTO implements Serializable {
      * 兑换状态0：未核销，1：已核销
      */
 	private String exchangeState;
+    private String exchangeStateName;
 
     /**
      * 核销人(工作人员)
@@ -118,4 +119,4 @@ public class AcitveProductExchangeDTO implements Serializable {
      */
 	private Date updatedTime;
 
-}
\ No newline at end of file
+}
diff --git a/esua-epdc/epdc-module/epdc-points/epdc-points-client/src/main/java/com/elink/esua/epdc/dto/ActivePointLogDTO.java b/esua-epdc/epdc-module/epdc-points/epdc-points-client/src/main/java/com/elink/esua/epdc/dto/ActivePointLogDTO.java
index d4adf5c8b..facd55998 100644
--- a/esua-epdc/epdc-module/epdc-points/epdc-points-client/src/main/java/com/elink/esua/epdc/dto/ActivePointLogDTO.java
+++ b/esua-epdc/epdc-module/epdc-points/epdc-points-client/src/main/java/com/elink/esua/epdc/dto/ActivePointLogDTO.java
@@ -23,7 +23,7 @@ import lombok.Data;
 
 
 /**
- * 积分记录表 
+ * 积分记录表
  *
  * @author elink elink@elink-cn.com
  * @since v1.0.0 2021-09-23
@@ -47,6 +47,7 @@ public class ActivePointLogDTO implements Serializable {
      * 积分操作类型（0-减积分，1-加积分）
      */
 	private String operationType;
+    private String operationTypeName;
 
     /**
      * 积分
@@ -103,4 +104,4 @@ public class ActivePointLogDTO implements Serializable {
      */
 	private Date updatedTime;
 
-}
\ No newline at end of file
+}
diff --git a/esua-epdc/epdc-module/epdc-points/epdc-points-server/src/main/java/com/elink/esua/epdc/controller/AcitveProductExchangeController.java b/esua-epdc/epdc-module/epdc-points/epdc-points-server/src/main/java/com/elink/esua/epdc/controller/AcitveProductExchangeController.java
index 9a1bafe86..e1b20eeba 100644
--- a/esua-epdc/epdc-module/epdc-points/epdc-points-server/src/main/java/com/elink/esua/epdc/controller/AcitveProductExchangeController.java
+++ b/esua-epdc/epdc-module/epdc-points/epdc-points-server/src/main/java/com/elink/esua/epdc/controller/AcitveProductExchangeController.java
@@ -37,7 +37,7 @@ import java.util.Map;
 
 
 /**
- * 商品兑换表 
+ * 商品兑换表
  *
  * @author elink elink@elink-cn.com
  * @since v1.0.0 2021-09-23
@@ -45,13 +45,14 @@ import java.util.Map;
 @RestController
 @RequestMapping("acitveproductexchange")
 public class AcitveProductExchangeController {
-    
+
     @Autowired
     private AcitveProductExchangeService acitveProductExchangeService;
 
     @GetMapping("page")
     public Result<PageData<AcitveProductExchangeDTO>> page(@RequestParam Map<String, Object> params){
-        PageData<AcitveProductExchangeDTO> page = acitveProductExchangeService.page(params);
+//        PageData<AcitveProductExchangeDTO> page = acitveProductExchangeService.page(params);
+        PageData<AcitveProductExchangeDTO> page = acitveProductExchangeService.getPhrasePage(params);
         return new Result<PageData<AcitveProductExchangeDTO>>().ok(page);
     }
 
@@ -91,4 +92,4 @@ public class AcitveProductExchangeController {
         ExcelUtils.exportExcelToTarget(response, null, list, AcitveProductExchangeExcel.class);
     }
 
-}
\ No newline at end of file
+}
diff --git a/esua-epdc/epdc-module/epdc-points/epdc-points-server/src/main/java/com/elink/esua/epdc/controller/ActivePointLogController.java b/esua-epdc/epdc-module/epdc-points/epdc-points-server/src/main/java/com/elink/esua/epdc/controller/ActivePointLogController.java
index 9e107ab26..7c91fce55 100644
--- a/esua-epdc/epdc-module/epdc-points/epdc-points-server/src/main/java/com/elink/esua/epdc/controller/ActivePointLogController.java
+++ b/esua-epdc/epdc-module/epdc-points/epdc-points-server/src/main/java/com/elink/esua/epdc/controller/ActivePointLogController.java
@@ -37,7 +37,7 @@ import java.util.Map;
 
 
 /**
- * 积分记录表 
+ * 积分记录表
  *
  * @author elink elink@elink-cn.com
  * @since v1.0.0 2021-09-23
@@ -45,13 +45,14 @@ import java.util.Map;
 @RestController
 @RequestMapping("activepointlog")
 public class ActivePointLogController {
-    
+
     @Autowired
     private ActivePointLogService activePointLogService;
 
     @GetMapping("page")
     public Result<PageData<ActivePointLogDTO>> page(@RequestParam Map<String, Object> params){
-        PageData<ActivePointLogDTO> page = activePointLogService.page(params);
+//        PageData<ActivePointLogDTO> page = activePointLogService.page(params);
+        PageData<ActivePointLogDTO> page = activePointLogService.getPhrasePage(params);
         return new Result<PageData<ActivePointLogDTO>>().ok(page);
     }
 
@@ -91,4 +92,4 @@ public class ActivePointLogController {
         ExcelUtils.exportExcelToTarget(response, null, list, ActivePointLogExcel.class);
     }
 
-}
\ No newline at end of file
+}
diff --git a/esua-epdc/epdc-module/epdc-points/epdc-points-server/src/main/java/com/elink/esua/epdc/dao/AcitveProductExchangeDao.java b/esua-epdc/epdc-module/epdc-points/epdc-points-server/src/main/java/com/elink/esua/epdc/dao/AcitveProductExchangeDao.java
index 116507752..29f07bb85 100644
--- a/esua-epdc/epdc-module/epdc-points/epdc-points-server/src/main/java/com/elink/esua/epdc/dao/AcitveProductExchangeDao.java
+++ b/esua-epdc/epdc-module/epdc-points/epdc-points-server/src/main/java/com/elink/esua/epdc/dao/AcitveProductExchangeDao.java
@@ -18,16 +18,27 @@
 package com.elink.esua.epdc.dao;
 
 import com.elink.esua.epdc.commons.mybatis.dao.BaseDao;
+import com.elink.esua.epdc.dto.AcitveProductExchangeDTO;
 import com.elink.esua.epdc.entity.AcitveProductExchangeEntity;
 import org.apache.ibatis.annotations.Mapper;
 
+import java.util.List;
+import java.util.Map;
+
 /**
- * 商品兑换表 
+ * 商品兑换表
  *
  * @author elink elink@elink-cn.com
  * @since v1.0.0 2021-09-23
  */
 @Mapper
 public interface AcitveProductExchangeDao extends BaseDao<AcitveProductExchangeEntity> {
-	
-}
\ No newline at end of file
+
+    /**
+     * 条件查询
+     * @param params
+     * @return
+     */
+    List<AcitveProductExchangeDTO> getPhrasePage(Map<String, Object> params);
+
+}
diff --git a/esua-epdc/epdc-module/epdc-points/epdc-points-server/src/main/java/com/elink/esua/epdc/dao/ActivePointLogDao.java b/esua-epdc/epdc-module/epdc-points/epdc-points-server/src/main/java/com/elink/esua/epdc/dao/ActivePointLogDao.java
index f980fc8a0..b1e4304ed 100644
--- a/esua-epdc/epdc-module/epdc-points/epdc-points-server/src/main/java/com/elink/esua/epdc/dao/ActivePointLogDao.java
+++ b/esua-epdc/epdc-module/epdc-points/epdc-points-server/src/main/java/com/elink/esua/epdc/dao/ActivePointLogDao.java
@@ -18,16 +18,29 @@
 package com.elink.esua.epdc.dao;
 
 import com.elink.esua.epdc.commons.mybatis.dao.BaseDao;
+import com.elink.esua.epdc.dto.ActivePointLogDTO;
 import com.elink.esua.epdc.entity.ActivePointLogEntity;
 import org.apache.ibatis.annotations.Mapper;
 
+import java.util.List;
+import java.util.Map;
+
 /**
- * 积分记录表 
+ * 积分记录表
  *
  * @author elink elink@elink-cn.com
  * @since v1.0.0 2021-09-23
  */
 @Mapper
 public interface ActivePointLogDao extends BaseDao<ActivePointLogEntity> {
-	
-}
\ No newline at end of file
+
+
+    /**
+     * 条件查询
+     * @param params
+     * @return
+     */
+    List<ActivePointLogDTO> getPhrasePage(Map<String, Object> params);
+
+
+}
diff --git a/esua-epdc/epdc-module/epdc-points/epdc-points-server/src/main/java/com/elink/esua/epdc/service/AcitveProductExchangeService.java b/esua-epdc/epdc-module/epdc-points/epdc-points-server/src/main/java/com/elink/esua/epdc/service/AcitveProductExchangeService.java
index 5fcf44736..64ff6f15b 100644
--- a/esua-epdc/epdc-module/epdc-points/epdc-points-server/src/main/java/com/elink/esua/epdc/service/AcitveProductExchangeService.java
+++ b/esua-epdc/epdc-module/epdc-points/epdc-points-server/src/main/java/com/elink/esua/epdc/service/AcitveProductExchangeService.java
@@ -26,7 +26,7 @@ import java.util.List;
 import java.util.Map;
 
 /**
- * 商品兑换表 
+ * 商品兑换表
  *
  * @author elink elink@elink-cn.com
  * @since v1.0.0 2021-09-23
@@ -43,6 +43,13 @@ public interface AcitveProductExchangeService extends BaseService<AcitveProductE
      */
     PageData<AcitveProductExchangeDTO> page(Map<String, Object> params);
 
+    /**
+     * 分页条件查询
+     * @param params
+     * @return
+     */
+    PageData<AcitveProductExchangeDTO> getPhrasePage(Map<String, Object> params);
+
     /**
      * 默认查询
      *
@@ -92,4 +99,4 @@ public interface AcitveProductExchangeService extends BaseService<AcitveProductE
      * @date 2021-09-23
      */
     void delete(String[] ids);
-}
\ No newline at end of file
+}
diff --git a/esua-epdc/epdc-module/epdc-points/epdc-points-server/src/main/java/com/elink/esua/epdc/service/ActivePointLogService.java b/esua-epdc/epdc-module/epdc-points/epdc-points-server/src/main/java/com/elink/esua/epdc/service/ActivePointLogService.java
index b1c333ad6..6859d4a14 100644
--- a/esua-epdc/epdc-module/epdc-points/epdc-points-server/src/main/java/com/elink/esua/epdc/service/ActivePointLogService.java
+++ b/esua-epdc/epdc-module/epdc-points/epdc-points-server/src/main/java/com/elink/esua/epdc/service/ActivePointLogService.java
@@ -27,7 +27,7 @@ import java.util.List;
 import java.util.Map;
 
 /**
- * 积分记录表 
+ * 积分记录表
  *
  * @author elink elink@elink-cn.com
  * @since v1.0.0 2021-09-23
@@ -44,6 +44,13 @@ public interface ActivePointLogService extends BaseService<ActivePointLogEntity>
      */
     PageData<ActivePointLogDTO> page(Map<String, Object> params);
 
+    /**
+     * 分页条件查询
+     * @param params
+     * @return
+     */
+    PageData<ActivePointLogDTO> getPhrasePage(Map<String, Object> params);
+
     /**
      * 默认查询
      *
@@ -102,4 +109,4 @@ public interface ActivePointLogService extends BaseService<ActivePointLogEntity>
      * @date 2021/9/24 17:19
      */
     void updataPoint(PointLogFormDTO formDTO);
-}
\ No newline at end of file
+}
diff --git a/esua-epdc/epdc-module/epdc-points/epdc-points-server/src/main/java/com/elink/esua/epdc/service/impl/AcitveProductExchangeServiceImpl.java b/esua-epdc/epdc-module/epdc-points/epdc-points-server/src/main/java/com/elink/esua/epdc/service/impl/AcitveProductExchangeServiceImpl.java
index 7fd9858f4..3d42d6617 100644
--- a/esua-epdc/epdc-module/epdc-points/epdc-points-server/src/main/java/com/elink/esua/epdc/service/impl/AcitveProductExchangeServiceImpl.java
+++ b/esua-epdc/epdc-module/epdc-points/epdc-points-server/src/main/java/com/elink/esua/epdc/service/impl/AcitveProductExchangeServiceImpl.java
@@ -38,7 +38,7 @@ import java.util.List;
 import java.util.Map;
 
 /**
- * 商品兑换表 
+ * 商品兑换表
  *
  * @author elink elink@elink-cn.com
  * @since v1.0.0 2021-09-23
@@ -58,6 +58,18 @@ public class AcitveProductExchangeServiceImpl extends BaseServiceImpl<AcitveProd
         return getPageData(page, AcitveProductExchangeDTO.class);
     }
 
+    /**
+     * 条件查询
+     * @param params
+     * @return
+     */
+    @Override
+    public PageData<AcitveProductExchangeDTO> getPhrasePage(Map<String, Object> params) {
+        IPage<AcitveProductExchangeDTO> page = getPage(params);
+        List<AcitveProductExchangeDTO> list = baseDao.getPhrasePage(params);
+        return new PageData<>(list, page.getTotal());
+    }
+
     @Override
     public List<AcitveProductExchangeDTO> list(Map<String, Object> params) {
         List<AcitveProductExchangeEntity> entityList = baseDao.selectList(getWrapper(params));
@@ -101,4 +113,4 @@ public class AcitveProductExchangeServiceImpl extends BaseServiceImpl<AcitveProd
         baseDao.deleteBatchIds(Arrays.asList(ids));
     }
 
-}
\ No newline at end of file
+}
diff --git a/esua-epdc/epdc-module/epdc-points/epdc-points-server/src/main/java/com/elink/esua/epdc/service/impl/ActivePointLogServiceImpl.java b/esua-epdc/epdc-module/epdc-points/epdc-points-server/src/main/java/com/elink/esua/epdc/service/impl/ActivePointLogServiceImpl.java
index bb51f9cb1..fce740299 100644
--- a/esua-epdc/epdc-module/epdc-points/epdc-points-server/src/main/java/com/elink/esua/epdc/service/impl/ActivePointLogServiceImpl.java
+++ b/esua-epdc/epdc-module/epdc-points/epdc-points-server/src/main/java/com/elink/esua/epdc/service/impl/ActivePointLogServiceImpl.java
@@ -66,6 +66,18 @@ public class ActivePointLogServiceImpl extends BaseServiceImpl<ActivePointLogDao
         return getPageData(page, ActivePointLogDTO.class);
     }
 
+    /**
+     * 条件查询
+     * @param params
+     * @return
+     */
+    @Override
+    public PageData<ActivePointLogDTO> getPhrasePage(Map<String, Object> params) {
+        IPage<ActivePointLogDTO> page = getPage(params);
+        List<ActivePointLogDTO> list = baseDao.getPhrasePage(params);
+        return new PageData<>(list, page.getTotal());
+    }
+
     @Override
     public List<ActivePointLogDTO> list(Map<String, Object> params) {
         List<ActivePointLogEntity> entityList = baseDao.selectList(getWrapper(params));
@@ -129,8 +141,8 @@ public class ActivePointLogServiceImpl extends BaseServiceImpl<ActivePointLogDao
                 priod = dictList.get(i).getDictValue();
             }
         }
-        
+
 
     }
 
-}
\ No newline at end of file
+}
diff --git a/esua-epdc/epdc-module/epdc-points/epdc-points-server/src/main/resources/mapper/AcitveProductExchangeDao.xml b/esua-epdc/epdc-module/epdc-points/epdc-points-server/src/main/resources/mapper/AcitveProductExchangeDao.xml
index e236ce510..95ff63d88 100644
--- a/esua-epdc/epdc-module/epdc-points/epdc-points-server/src/main/resources/mapper/AcitveProductExchangeDao.xml
+++ b/esua-epdc/epdc-module/epdc-points/epdc-points-server/src/main/resources/mapper/AcitveProductExchangeDao.xml
@@ -23,5 +23,36 @@
         <result property="updatedTime" column="UPDATED_TIME"/>
     </resultMap>
 
+    <select id="getPhrasePage" resultType="com.elink.esua.epdc.dto.AcitveProductExchangeDTO">
+        select
+        ID,
+        USER_ID,
+        USER_NAME,
+        PRODUCT_ID,
+        PRODUCT_NAME,
+        EXCHANGE_TIME,
+        EXCHANGE_STATE,
+        (case EXCHANGE_STATE when '0' then '未核销' when '1' then '已核销' else '' end ) exchangeStateName,
+        CHECK_SYS_USER_ID,
+        QR_CODE_URL,
+        CHECK_SYS_USER_NAME,
+        CHECK_TIME,
+        DEL_FLAG,
+        REVISION,
+        CREATED_BY,
+        CREATED_TIME,
+        UPDATED_BY,
+        UPDATED_TIME
+        from epdc_acitve_product_exchange
+        where DEL_FLAG = '0'
+        <if test="userName != null and userName != ''">
+            and USER_NAME like '%' #{userName} '%'
+        </if>
+        <if test="productName != null and productName != ''">
+            and PRODUCT_NAME like '%' #{productName} '%'
+        </if>
+        order by UPDATED_TIME desc
+    </select>
 
-</mapper>
\ No newline at end of file
+
+</mapper>
diff --git a/esua-epdc/epdc-module/epdc-points/epdc-points-server/src/main/resources/mapper/ActivePointLogDao.xml b/esua-epdc/epdc-module/epdc-points/epdc-points-server/src/main/resources/mapper/ActivePointLogDao.xml
index 31130de29..596b1d940 100644
--- a/esua-epdc/epdc-module/epdc-points/epdc-points-server/src/main/resources/mapper/ActivePointLogDao.xml
+++ b/esua-epdc/epdc-module/epdc-points/epdc-points-server/src/main/resources/mapper/ActivePointLogDao.xml
@@ -20,5 +20,30 @@
         <result property="updatedTime" column="UPDATED_TIME"/>
     </resultMap>
 
+    <select id="getPhrasePage" resultType="com.elink.esua.epdc.dto.ActivePointLogDTO">
+        select
+        ID,
+        USER_ID,
+        OPERATION_TYPE,
+        (case OPERATION_TYPE when '0' then '减积分' when '1' then '加积分' else '' end) operationTypeName,
+        POINTS,
+        OPERATION_CODE,
+        OPERATION_DESC,
+        OPERATION_TIME,
+        LAVE_POINTS,
+        DEL_FLAG,
+        REVISION,
+        CREATED_BY,
+        CREATED_TIME,
+        UPDATED_BY,
+        UPDATED_TIME
+        from epdc_active_point_log
+        where DEL_FLAG = '0'
+        <if test="operationType != null and operationType != ''">
+            and OPERATION_TYPE = #{operationType}
+        </if>
+        order by UPDATED_TIME desc
+    </select>
 
-</mapper>
\ No newline at end of file
+
+</mapper>