From 6552eeac91539d2ef02ef81fa1d56abc7a8abe97 Mon Sep 17 00:00:00 2001
From: wanggongfeng <1305282856@qq.com>
Date: Sun, 26 Sep 2021 15:22:56 +0800
Subject: [PATCH] =?UTF-8?q?=E7=A7=AF=E5=88=86=E5=95=86=E5=93=81-=E7=8E=8B?=
 =?UTF-8?q?=E5=85=AC=E5=B3=B0-2020-09-26?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../esua/epdc/dto/AcitveProductInfoDTO.java   | 13 +++++-
 .../AcitveProductInfoController.java          |  9 +++--
 .../esua/epdc/dao/AcitveProductInfoDao.java   | 16 ++++++--
 .../service/AcitveProductInfoService.java     | 11 ++++-
 .../impl/AcitveProductInfoServiceImpl.java    | 32 +++++++++++++--
 .../resources/mapper/AcitveProductInfoDao.xml | 40 ++++++++++++++++++-
 6 files changed, 106 insertions(+), 15 deletions(-)

diff --git a/esua-epdc/epdc-module/epdc-points/epdc-points-client/src/main/java/com/elink/esua/epdc/dto/AcitveProductInfoDTO.java b/esua-epdc/epdc-module/epdc-points/epdc-points-client/src/main/java/com/elink/esua/epdc/dto/AcitveProductInfoDTO.java
index 9587d3031..76e389c00 100644
--- a/esua-epdc/epdc-module/epdc-points/epdc-points-client/src/main/java/com/elink/esua/epdc/dto/AcitveProductInfoDTO.java
+++ b/esua-epdc/epdc-module/epdc-points/epdc-points-client/src/main/java/com/elink/esua/epdc/dto/AcitveProductInfoDTO.java
@@ -19,11 +19,13 @@ package com.elink.esua.epdc.dto;
 
 import java.io.Serializable;
 import java.util.Date;
+import java.util.List;
+
 import lombok.Data;
 
 
 /**
- * 积分商品表 
+ * 积分商品表
  *
  * @author elink elink@elink-cn.com
  * @since v1.0.0 2021-09-23
@@ -72,6 +74,7 @@ public class AcitveProductInfoDTO implements Serializable {
      * 上架状态1:上架，0：下架
      */
 	private String state;
+    private String stateName;
 
     /**
      * 库存数量
@@ -138,4 +141,10 @@ public class AcitveProductInfoDTO implements Serializable {
      */
 	private Date updatedTime;
 
-}
\ No newline at end of file
+
+    /**
+     * 用于展示所选部门
+     */
+    private String[] deptIdsArr;
+
+}
diff --git a/esua-epdc/epdc-module/epdc-points/epdc-points-server/src/main/java/com/elink/esua/epdc/controller/AcitveProductInfoController.java b/esua-epdc/epdc-module/epdc-points/epdc-points-server/src/main/java/com/elink/esua/epdc/controller/AcitveProductInfoController.java
index b8b525984..407f1d1e3 100644
--- a/esua-epdc/epdc-module/epdc-points/epdc-points-server/src/main/java/com/elink/esua/epdc/controller/AcitveProductInfoController.java
+++ b/esua-epdc/epdc-module/epdc-points/epdc-points-server/src/main/java/com/elink/esua/epdc/controller/AcitveProductInfoController.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("acitveproductinfo")
 public class AcitveProductInfoController {
-    
+
     @Autowired
     private AcitveProductInfoService acitveProductInfoService;
 
     @GetMapping("page")
     public Result<PageData<AcitveProductInfoDTO>> page(@RequestParam Map<String, Object> params){
-        PageData<AcitveProductInfoDTO> page = acitveProductInfoService.page(params);
+//        PageData<AcitveProductInfoDTO> page = acitveProductInfoService.page(params);
+        PageData<AcitveProductInfoDTO> page = acitveProductInfoService.getPhrasePage(params);
         return new Result<PageData<AcitveProductInfoDTO>>().ok(page);
     }
 
@@ -91,4 +92,4 @@ public class AcitveProductInfoController {
         ExcelUtils.exportExcelToTarget(response, null, list, AcitveProductInfoExcel.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/AcitveProductInfoDao.java b/esua-epdc/epdc-module/epdc-points/epdc-points-server/src/main/java/com/elink/esua/epdc/dao/AcitveProductInfoDao.java
index 1b3a520cb..b124acb6e 100644
--- a/esua-epdc/epdc-module/epdc-points/epdc-points-server/src/main/java/com/elink/esua/epdc/dao/AcitveProductInfoDao.java
+++ b/esua-epdc/epdc-module/epdc-points/epdc-points-server/src/main/java/com/elink/esua/epdc/dao/AcitveProductInfoDao.java
@@ -18,16 +18,26 @@
 package com.elink.esua.epdc.dao;
 
 import com.elink.esua.epdc.commons.mybatis.dao.BaseDao;
+import com.elink.esua.epdc.dto.AcitveProductInfoDTO;
 import com.elink.esua.epdc.entity.AcitveProductInfoEntity;
 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 AcitveProductInfoDao extends BaseDao<AcitveProductInfoEntity> {
-	
-}
\ No newline at end of file
+
+    /**
+     * 条件查询
+     * @param params
+     * @return
+     */
+    List<AcitveProductInfoDTO> 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/AcitveProductInfoService.java b/esua-epdc/epdc-module/epdc-points/epdc-points-server/src/main/java/com/elink/esua/epdc/service/AcitveProductInfoService.java
index b5d432d1d..92fab3b54 100644
--- a/esua-epdc/epdc-module/epdc-points/epdc-points-server/src/main/java/com/elink/esua/epdc/service/AcitveProductInfoService.java
+++ b/esua-epdc/epdc-module/epdc-points/epdc-points-server/src/main/java/com/elink/esua/epdc/service/AcitveProductInfoService.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 AcitveProductInfoService extends BaseService<AcitveProductInfoE
      */
     PageData<AcitveProductInfoDTO> page(Map<String, Object> params);
 
+    /**
+     * 分页条件查询
+     * @param params
+     * @return
+     */
+    PageData<AcitveProductInfoDTO> getPhrasePage(Map<String, Object> params);
+
     /**
      * 默认查询
      *
@@ -92,4 +99,4 @@ public interface AcitveProductInfoService extends BaseService<AcitveProductInfoE
      * @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/impl/AcitveProductInfoServiceImpl.java b/esua-epdc/epdc-module/epdc-points/epdc-points-server/src/main/java/com/elink/esua/epdc/service/impl/AcitveProductInfoServiceImpl.java
index 9040678f7..85681b821 100644
--- a/esua-epdc/epdc-module/epdc-points/epdc-points-server/src/main/java/com/elink/esua/epdc/service/impl/AcitveProductInfoServiceImpl.java
+++ b/esua-epdc/epdc-module/epdc-points/epdc-points-server/src/main/java/com/elink/esua/epdc/service/impl/AcitveProductInfoServiceImpl.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 AcitveProductInfoServiceImpl extends BaseServiceImpl<AcitveProductI
         return getPageData(page, AcitveProductInfoDTO.class);
     }
 
+    /**
+     * 条件查询
+     * @param params
+     * @return
+     */
+    @Override
+    public PageData<AcitveProductInfoDTO> getPhrasePage(Map<String, Object> params) {
+        IPage<AcitveProductInfoDTO> page = getPage(params);
+        List<AcitveProductInfoDTO> list = baseDao.getPhrasePage(params);
+        return new PageData<>(list, page.getTotal());
+    }
+
     @Override
     public List<AcitveProductInfoDTO> list(Map<String, Object> params) {
         List<AcitveProductInfoEntity> entityList = baseDao.selectList(getWrapper(params));
@@ -77,7 +89,11 @@ public class AcitveProductInfoServiceImpl extends BaseServiceImpl<AcitveProductI
     @Override
     public AcitveProductInfoDTO get(String id) {
         AcitveProductInfoEntity entity = baseDao.selectById(id);
-        return ConvertUtils.sourceToTarget(entity, AcitveProductInfoDTO.class);
+        AcitveProductInfoDTO resultDto = ConvertUtils.sourceToTarget(entity, AcitveProductInfoDTO.class);
+        String allDeptIds = resultDto.getAllDeptIds();
+        allDeptIds = allDeptIds.replace("0,","");
+        resultDto.setDeptIdsArr(allDeptIds.split(","));
+        return resultDto;
     }
 
     @Override
@@ -85,6 +101,11 @@ public class AcitveProductInfoServiceImpl extends BaseServiceImpl<AcitveProductI
     public void save(AcitveProductInfoDTO dto) {
         AcitveProductInfoEntity entity = ConvertUtils.sourceToTarget(dto, AcitveProductInfoEntity.class);
         insert(entity);
+        // 添加权限表数据
+
+
+
+
     }
 
     @Override
@@ -92,6 +113,11 @@ public class AcitveProductInfoServiceImpl extends BaseServiceImpl<AcitveProductI
     public void update(AcitveProductInfoDTO dto) {
         AcitveProductInfoEntity entity = ConvertUtils.sourceToTarget(dto, AcitveProductInfoEntity.class);
         updateById(entity);
+        // 添加权限表数据
+
+
+
+
     }
 
     @Override
@@ -101,4 +127,4 @@ public class AcitveProductInfoServiceImpl extends BaseServiceImpl<AcitveProductI
         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/resources/mapper/AcitveProductInfoDao.xml b/esua-epdc/epdc-module/epdc-points/epdc-points-server/src/main/resources/mapper/AcitveProductInfoDao.xml
index 90c03fb4f..d499b5277 100644
--- a/esua-epdc/epdc-module/epdc-points/epdc-points-server/src/main/resources/mapper/AcitveProductInfoDao.xml
+++ b/esua-epdc/epdc-module/epdc-points/epdc-points-server/src/main/resources/mapper/AcitveProductInfoDao.xml
@@ -27,5 +27,43 @@
         <result property="updatedTime" column="UPDATED_TIME"/>
     </resultMap>
 
+    <select id="getPhrasePage" resultType="com.elink.esua.epdc.dto.AcitveProductInfoDTO">
+        select
+        eapi.ID,
+        eapi.NAME,
+        eapi.CONTENT,
+        eapi.POINTS,
+        eapi.HEAD_PIC,
+        eapi.START_TIME,
+        eapi.END_TIME,
+        eapi.STATE,
+        (case eapi.STATE when '1' then '上架' when '0' then '下架' else '' end) stateName,
+        eapi.AMOUNT,
+        eapi.DEPT_NAME,
+        eapi.DEPT_ID,
+        eapi.PARENT_DEPT_IDS,
+        eapi.PARENT_DEPT_NAMES,
+        eapi.ALL_DEPT_IDS,
+        eapi.ALL_DEPT_NAMES,
+        eapi.DEL_FLAG,
+        eapi.REVISION,
+        eapi.CREATED_BY,
+        eapi.CREATED_TIME,
+        eapi.UPDATED_BY,
+        eapi.UPDATED_TIME
+        from epdc_acitve_product_info eapi
+        where DEL_FLAG = '0'
+        <if test="name != null and name != ''">
+            and eapi.NAME like '%' #{name} '%'
+        </if>
+        <if test="state != null and state != ''">
+            and eapi.STATE = #{state}
+        </if>
+        <if test="startTime != null and startTime != '' and endTime != null and endTime != ''">
+            AND DATE_FORMAT( eapi.START_TIME, '%Y-%m-%d' ) BETWEEN #{startTime} AND #{endTime}
+        </if>
+        order by eapi.UPDATED_TIME desc
+    </select>
 
-</mapper>
\ No newline at end of file
+
+</mapper>