From 688dcd06942e51fbe72e6f98174c26b89d046ef5 Mon Sep 17 00:00:00 2001
From: Jackwang <wt373747285@163.com>
Date: Mon, 7 Dec 2020 19:21:22 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=90=E7=BD=91=E6=A0=BC=E5=AE=9E=E4=BD=93?=
 =?UTF-8?q?=E5=8C=96=E8=BF=90=E4=BD=9C=E3=80=91-=E3=80=90=E9=98=B5?=
 =?UTF-8?q?=E5=9C=B0=E5=BB=BA=E8=AE=BE=E5=88=97=E8=A1=A8=E3=80=91-?=
 =?UTF-8?q?=EF=BC=88=E7=8E=8B=E7=AB=A5=EF=BC=89-2020/12/7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../epdc/dto/SubPositionCheckInfoDTO.java     |  5 ++++
 .../epdc/dao/SubPositionCheckInfoDao.java     | 14 ++++++++++-
 .../impl/SubPositionCheckInfoServiceImpl.java |  8 +++----
 .../mapper/SubPositionCheckInfoDao.xml        | 23 +++++++++++++++++++
 4 files changed, 44 insertions(+), 6 deletions(-)

diff --git a/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-client/src/main/java/com/elink/esua/epdc/dto/SubPositionCheckInfoDTO.java b/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-client/src/main/java/com/elink/esua/epdc/dto/SubPositionCheckInfoDTO.java
index 6e67c465e..80ffc9d61 100644
--- a/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-client/src/main/java/com/elink/esua/epdc/dto/SubPositionCheckInfoDTO.java
+++ b/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-client/src/main/java/com/elink/esua/epdc/dto/SubPositionCheckInfoDTO.java
@@ -69,6 +69,11 @@ public class SubPositionCheckInfoDTO implements Serializable {
      */
 	private String status;
 
+    /**
+     * 审批状态（1：提交；2：初审；3：验收；4：驳回）
+     */
+    private String statusName;
+
     /**
      * 审批部门ID
      */
diff --git a/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/dao/SubPositionCheckInfoDao.java b/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/dao/SubPositionCheckInfoDao.java
index b3d60487f..bc733e54a 100644
--- a/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/dao/SubPositionCheckInfoDao.java
+++ b/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/dao/SubPositionCheckInfoDao.java
@@ -18,9 +18,13 @@
 package com.elink.esua.epdc.dao;
 
 import com.elink.esua.epdc.commons.mybatis.dao.BaseDao;
+import com.elink.esua.epdc.dto.SubPositionCheckInfoDTO;
 import com.elink.esua.epdc.entity.SubPositionCheckInfoEntity;
 import org.apache.ibatis.annotations.Mapper;
 
+import java.util.List;
+import java.util.Map;
+
 /**
  * 阵地建设考核内容提报信息表 
  *
@@ -29,5 +33,13 @@ import org.apache.ibatis.annotations.Mapper;
  */
 @Mapper
 public interface SubPositionCheckInfoDao extends BaseDao<SubPositionCheckInfoEntity> {
-	
+
+    /**
+    * @describe: 网格实体化运作列表
+    * @author wangtong
+    * @date 2020/12/7 18:21
+    * @params [params]
+    * @return java.util.List<com.elink.esua.epdc.dto.SubPositionCheckInfoDTO>
+    */
+    List<SubPositionCheckInfoDTO> getSubPositionList(Map<String, Object> params);
 }
\ No newline at end of file
diff --git a/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/service/impl/SubPositionCheckInfoServiceImpl.java b/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/service/impl/SubPositionCheckInfoServiceImpl.java
index 64fd3419a..f03122dad 100644
--- a/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/service/impl/SubPositionCheckInfoServiceImpl.java
+++ b/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/service/impl/SubPositionCheckInfoServiceImpl.java
@@ -51,11 +51,9 @@ public class SubPositionCheckInfoServiceImpl extends BaseServiceImpl<SubPosition
 
     @Override
     public PageData<SubPositionCheckInfoDTO> page(Map<String, Object> params) {
-        IPage<SubPositionCheckInfoEntity> page = baseDao.selectPage(
-                getPage(params, FieldConstant.CREATED_TIME, false),
-                getWrapper(params)
-        );
-        return getPageData(page, SubPositionCheckInfoDTO.class);
+        IPage<SubPositionCheckInfoDTO> page = getPage(params);
+        List<SubPositionCheckInfoDTO> list = baseDao.getSubPositionList(params);
+        return new PageData<>(list, page.getTotal());
     }
 
     @Override
diff --git a/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/resources/mapper/SubPositionCheckInfoDao.xml b/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/resources/mapper/SubPositionCheckInfoDao.xml
index db9a925ae..714d7643d 100644
--- a/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/resources/mapper/SubPositionCheckInfoDao.xml
+++ b/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/resources/mapper/SubPositionCheckInfoDao.xml
@@ -21,6 +21,29 @@
         <result property="updatedBy" column="UPDATED_BY"/>
         <result property="updatedTime" column="UPDATED_TIME"/>
     </resultMap>
+    <select id="getSubPositionList" resultType="com.elink.esua.epdc.dto.SubPositionCheckInfoDTO">
+        select COMMUNITY_NAME,
+			 GRID_NAMES,
+			 SUBMIT_TIME,
+			 STATUS,
+		    CASE STATUS
+				WHEN '1' THEN '提交'
+				WHEN '2' THEN '初审'
+				WHEN '3' THEN '验收'
+				WHEN '4' THEN '驳回'
+				END
+				as statusName,
+			 APPROVAL_DEPT_NAME,
+			 APPROVAL_TIME
+        from epdc_sub_position_check_info
+        where DEL_FLAG=0
+              <if test="status != null and status != ''">
+                  and STATUS = #{status}
+              </if>
+              <if test="startTime != null and startTime != '' and endTime != null and endTime != ''">
+                  and date_format(SUBMIT_TIME,'%Y-%m-%d') BETWEEN #{startTime} AND #{endTime}
+              </if>
+    </select>
 
 
 </mapper>
\ No newline at end of file