From e01d259602cfb6356feb8bc431116b2ec8a327ba Mon Sep 17 00:00:00 2001
From: guo <guo@guo>
Date: Wed, 8 Nov 2023 16:16:49 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8Dbug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/TaskProgressController.java    |  9 +++------
 .../service/ITaskProgressService.java         |  1 +
 .../service/impl/TaskProgressServiceImpl.java | 19 +++++++++++++++----
 3 files changed, 19 insertions(+), 10 deletions(-)

diff --git a/src/main/java/com/zhgd/xmgl/modules/taskprogress/controller/TaskProgressController.java b/src/main/java/com/zhgd/xmgl/modules/taskprogress/controller/TaskProgressController.java
index ec89ae323..0b6f05f2e 100644
--- a/src/main/java/com/zhgd/xmgl/modules/taskprogress/controller/TaskProgressController.java
+++ b/src/main/java/com/zhgd/xmgl/modules/taskprogress/controller/TaskProgressController.java
@@ -67,16 +67,13 @@ public class TaskProgressController {
     /**
      * 列表查询
      *
-     * @param taskProgress
-     * @param req
      * @return
      */
     @ApiOperation(value = "列表查询任务进度甘特图信息", notes = "列表查询任务进度甘特图信息", httpMethod = "GET")
+    @ApiImplicitParam(name = "type", value = "1.本月2.下月", paramType = "query", required = false, dataType = "Integer")
     @GetMapping(value = "/list")
-    public Result<List<TaskProgress>> queryList(TaskProgress taskProgress,
-                                                HttpServletRequest req) {
-        QueryWrapper<TaskProgress> queryWrapper = QueryGenerator.initQueryWrapper(taskProgress, req.getParameterMap());
-        return Result.success(taskProgressService.list(queryWrapper));
+    public Result<List<TaskProgress>> queryList(@ApiIgnore @RequestParam HashMap<String, Object> paramMap) {
+        return Result.success(taskProgressService.queryList(paramMap));
     }
 
     /**
diff --git a/src/main/java/com/zhgd/xmgl/modules/taskprogress/service/ITaskProgressService.java b/src/main/java/com/zhgd/xmgl/modules/taskprogress/service/ITaskProgressService.java
index 3240811a7..2b162982f 100644
--- a/src/main/java/com/zhgd/xmgl/modules/taskprogress/service/ITaskProgressService.java
+++ b/src/main/java/com/zhgd/xmgl/modules/taskprogress/service/ITaskProgressService.java
@@ -42,4 +42,5 @@ public interface ITaskProgressService extends IService<TaskProgress> {
 
     SectorVo countMppStatus(HashMap<String, Object> paramMap);
 
+    List<TaskProgress> queryList(HashMap<String, Object> paramMap);
 }
diff --git a/src/main/java/com/zhgd/xmgl/modules/taskprogress/service/impl/TaskProgressServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/taskprogress/service/impl/TaskProgressServiceImpl.java
index aa990f659..f3793a253 100644
--- a/src/main/java/com/zhgd/xmgl/modules/taskprogress/service/impl/TaskProgressServiceImpl.java
+++ b/src/main/java/com/zhgd/xmgl/modules/taskprogress/service/impl/TaskProgressServiceImpl.java
@@ -421,6 +421,14 @@ public class TaskProgressServiceImpl extends ServiceImpl<TaskProgressMapper, Tas
     @Override
     public IPage<TaskProgress> queryPageList(HashMap<String, Object> paramMap) {
         QueryWrapper<TaskProgress> queryWrapper = QueryGenerator.initPageQueryWrapper(TaskProgress.class, paramMap);
+        addQueryType(paramMap, queryWrapper);
+        Page page = PageUtil.getPage(paramMap);
+        Page p = page(page, queryWrapper);
+        setMppStatus(p.getRecords());
+        return p;
+    }
+
+    private void addQueryType(HashMap<String, Object> paramMap, QueryWrapper<TaskProgress> queryWrapper) {
         Integer type = MapUtils.getInteger(paramMap, "type");
         if (Objects.equals(type, 1)) {
             //本月
@@ -431,10 +439,6 @@ public class TaskProgressServiceImpl extends ServiceImpl<TaskProgressMapper, Tas
             queryWrapper.lambda().and(w -> w.ge(TaskProgress::getStartDate, DateUtil.formatDate(DateUtil.beginOfMonth(DateUtil.offsetMonth(new Date(), 1))))
                     .or().ge(TaskProgress::getFinishDate, DateUtil.formatDate(DateUtil.endOfMonth(DateUtil.offsetMonth(new Date(), 1)))));
         }
-        Page page = PageUtil.getPage(paramMap);
-        Page p = page(page, queryWrapper);
-        setMppStatus(p.getRecords());
-        return p;
     }
 
     @Override
@@ -454,4 +458,11 @@ public class TaskProgressServiceImpl extends ServiceImpl<TaskProgressMapper, Tas
         return SectorVo.getSectorVoByEnum(baseMapper.countMppStatus(paramMap), ParamEnum.TaskProgressMppStatusEnum.values());
     }
 
+    @Override
+    public List<TaskProgress> queryList(HashMap<String, Object> paramMap) {
+        QueryWrapper<TaskProgress> queryWrapper = QueryGenerator.initPageQueryWrapper(TaskProgress.class, paramMap);
+        addQueryType(paramMap, queryWrapper);
+        return list(queryWrapper);
+    }
+
 }