难点堵点列表

epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/MemoDifficultyFormDTO.java

@@ -0,0 +1,47 @@
+package com.epmet.dto.form;
+
+import com.epmet.commons.tools.dto.form.PageFormDTO;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.io.Serializable;
+
+/**
+ * @Description 难点堵点列表
+ * @Author sun
+ */
+@NoArgsConstructor
+@Data
+public class MemoDifficultyFormDTO extends PageFormDTO implements Serializable {
+    private static final long serialVersionUID = 3101320969471756516L;
+
+    /**
+     * 内容摘要
+     */
+    private String content;
+    /**
+     * 起始预计处理时间
+     */
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private String scheduledStartTime;
+    /**
+     * 终止预计处理时间
+     */
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private String scheduledEndTime;
+    /**
+     * 起始创建时间
+     */
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private String startTime;
+    /**
+     * 终止创建时间
+     */
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private String endTime;
+
+    //token中用户Id
+    private String userId;
+
+}

epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/MemoDifficultyController.java

@@ -19,6 +19,7 @@ import com.epmet.dto.MemoDifficultyDTO;
 import com.epmet.dto.MemoWorkDiaryDTO;
 import com.epmet.dto.form.AddMemoDifficultyFromDTO;
 import com.epmet.dto.form.MemoDifficultyDetailFromDTO;
+import com.epmet.dto.form.MemoDifficultyFormDTO;
 import com.epmet.service.MemoDifficultyService;
 import org.apache.poi.xwpf.usermodel.XWPFDocument;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -45,8 +46,9 @@ public class MemoDifficultyController {
     private MemoDifficultyService memoDifficultyService;
 
     @RequestMapping("page")
-    public Result<PageData<MemoDifficultyDTO>> page(@RequestParam Map<String, Object> params){
-        PageData<MemoDifficultyDTO> page = memoDifficultyService.page(params);
+    public Result<PageData<MemoDifficultyDTO>> page(@LoginUser TokenDto tokenDto, @RequestBody MemoDifficultyFormDTO formDTO){
+        formDTO.setUserId(tokenDto.getUserId());
+        PageData<MemoDifficultyDTO> page = memoDifficultyService.page(formDTO);
         return new Result<PageData<MemoDifficultyDTO>>().ok(page);
     }
 

epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/dao/MemoDifficultyDao.java

@@ -1,9 +1,14 @@
 package com.epmet.dao;
 
 import com.epmet.commons.mybatis.dao.BaseDao;
+import com.epmet.dto.MemoDifficultyDTO;
+import com.epmet.dto.MemoWorkDiaryDTO;
+import com.epmet.dto.form.MemoDifficultyFormDTO;
 import com.epmet.entity.MemoDifficultyEntity;
 import org.apache.ibatis.annotations.Mapper;
 
+import java.util.List;
+
 /**
  * 备忘录-难点读点
  *
@@ -13,4 +18,9 @@ import org.apache.ibatis.annotations.Mapper;
 @Mapper
 public interface MemoDifficultyDao extends BaseDao<MemoDifficultyEntity> {
 
+    /**
+     * 难点堵点查询列表
+     * @Author sun
+     */
+    List<MemoDifficultyDTO> getPage(MemoDifficultyFormDTO formDTO);
 }

epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/MemoDifficultyService.java

@@ -4,6 +4,7 @@ import com.epmet.commons.mybatis.service.BaseService;
 import com.epmet.commons.tools.page.PageData;
 import com.epmet.dto.MemoDifficultyDTO;
 import com.epmet.dto.form.AddMemoDifficultyFromDTO;
+import com.epmet.dto.form.MemoDifficultyFormDTO;
 import com.epmet.dto.form.MemoDifficultyDetailFromDTO;
 import com.epmet.entity.MemoDifficultyEntity;
 
@@ -26,7 +27,7 @@ public interface MemoDifficultyService extends BaseService<MemoDifficultyEntity>
      * @author generator
      * @date 2022-03-15
      */
-    PageData<MemoDifficultyDTO> page(Map<String, Object> params);
+    PageData<MemoDifficultyDTO> page(MemoDifficultyFormDTO formDTO);
 
     /**
      * 默认查询

epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/MemoDifficultyServiceImpl.java

@@ -1,7 +1,6 @@
 package com.epmet.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
 import com.epmet.commons.tools.constant.FieldConstant;
 import com.epmet.commons.tools.page.PageData;
@@ -11,6 +10,7 @@ import com.epmet.dto.MemoAttachmentDTO;
 import com.epmet.dto.MemoAttrDTO;
 import com.epmet.dto.MemoDifficultyDTO;
 import com.epmet.dto.form.AddMemoDifficultyFromDTO;
+import com.epmet.dto.form.MemoDifficultyFormDTO;
 import com.epmet.dto.form.MemoDifficultyDetailFromDTO;
 import com.epmet.entity.MemoAttachmentEntity;
 import com.epmet.entity.MemoAttrEntity;
@@ -18,6 +18,8 @@ import com.epmet.entity.MemoDifficultyEntity;
 import com.epmet.service.MemoAttachmentService;
 import com.epmet.service.MemoAttrService;
 import com.epmet.service.MemoDifficultyService;
+import com.github.pagehelper.PageHelper;
+import com.github.pagehelper.PageInfo;
 import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -43,12 +45,11 @@ public class MemoDifficultyServiceImpl extends BaseServiceImpl<MemoDifficultyDao
 
 
     @Override
-    public PageData<MemoDifficultyDTO> page(Map<String, Object> params) {
-        IPage<MemoDifficultyEntity> page = baseDao.selectPage(
-                getPage(params, FieldConstant.CREATED_TIME, false),
-                getWrapper(params)
-        );
-        return getPageData(page, MemoDifficultyDTO.class);
+    public PageData<MemoDifficultyDTO> page(MemoDifficultyFormDTO formDTO) {
+        PageHelper.startPage(formDTO.getPageNo(), formDTO.getPageSize());
+        List<MemoDifficultyDTO> list =  baseDao.getPage(formDTO);
+        PageInfo<MemoDifficultyDTO> pageInfo = new PageInfo<>(list);
+        return new PageData<>(list, pageInfo.getTotal());
     }
 
     @Override

epmet-module/gov-project/gov-project-server/src/main/resources/mapper/MemoDifficultyDao.xml

@@ -3,6 +3,38 @@
 
 <mapper namespace="com.epmet.dao.MemoDifficultyDao">
 
-
+    <select id="getPage" resultType="com.epmet.dto.MemoDifficultyDTO">
+        SELECT
+            md.id,
+            md.customer_id,
+            md.content,
+            md.resolve_way,
+            md.remark,
+            md.scheduled_time,
+            md.created_time,
+            ma.remind_time
+        FROM
+            memo_difficulty md
+        INNER JOIN memo_attr ma ON md.id = ma.id and ma.del_flag = '0'
+        WHERE
+            md.del_flag = '0'
+        AND md.created_by = #{userId}
+        <if test='null != content and "" != content'>
+            AND md.content LIKE concat('%', #{content}, '%')
+        </if>
+        <if test='null != scheduledStartTime and "" != scheduledStartTime'>
+            AND DATE_FORMAT(md.scheduled_time, "%Y-%m-%d") &gt;= #{scheduledStartTime}
+        </if>
+        <if test='null != scheduledEndTime and "" != scheduledEndTime'>
+            AND DATE_FORMAT(md.scheduled_time, "%Y-%m-%d") &lt;= #{scheduledEndTime}
+        </if>
+        <if test='null != startTime and "" != startTime'>
+            AND DATE_FORMAT(md.created_time, "%Y-%m-%d") &gt;= #{startTime}
+        </if>
+        <if test='null != endTime and "" != endTime'>
+            AND DATE_FORMAT(md.created_time, "%Y-%m-%d") &lt;= #{endTime}
+        </if>
+        ORDER BY md.created_time DESC
+    </select>
 
 </mapper>