【网格实体化运作】-【阵地建设列表】-（王童）-2020/12/7

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
      */

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);
 }

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

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>