admin/wisdomisite-java
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

修复bug

Browse Source
This commit is contained in:
guo 2023-11-08 16:16:49 +08:00
parent 7e75fb3649
commit e01d259602
3 changed files with 19 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/main/java/com/zhgd/xmgl/modules/taskprogress/controller/TaskProgressController.java
View File

@ -67,16 +67,13 @@ public class TaskProgressController {
/** /**
* 列表查询 * 列表查询
* *
* @param taskProgress
* @param req
* @return * @return
*/ */
@ApiOperation(value = "列表查询任务进度甘特图信息", notes = "列表查询任务进度甘特图信息", httpMethod = "GET") @ApiOperation(value = "列表查询任务进度甘特图信息", notes = "列表查询任务进度甘特图信息", httpMethod = "GET")
@ApiImplicitParam(name = "type", value = "1.本月2.下月", paramType = "query", required = false, dataType = "Integer")
@GetMapping(value = "/list") @GetMapping(value = "/list")
public Result<List<TaskProgress>> queryList(TaskProgress taskProgress, public Result<List<TaskProgress>> queryList(@ApiIgnore @RequestParam HashMap<String, Object> paramMap) {
HttpServletRequest req) { return Result.success(taskProgressService.queryList(paramMap));
QueryWrapper<TaskProgress> queryWrapper = QueryGenerator.initQueryWrapper(taskProgress, req.getParameterMap());
return Result.success(taskProgressService.list(queryWrapper));
} }
/** /**

1
src/main/java/com/zhgd/xmgl/modules/taskprogress/service/ITaskProgressService.java
View File

@ -42,4 +42,5 @@ public interface ITaskProgressService extends IService<TaskProgress> {
SectorVo countMppStatus(HashMap<String, Object> paramMap); SectorVo countMppStatus(HashMap<String, Object> paramMap);
List<TaskProgress> queryList(HashMap<String, Object> paramMap);
} }

19
src/main/java/com/zhgd/xmgl/modules/taskprogress/service/impl/TaskProgressServiceImpl.java
View File

@ -421,6 +421,14 @@ public class TaskProgressServiceImpl extends ServiceImpl<TaskProgressMapper, Tas
@Override @Override
public IPage<TaskProgress> queryPageList(HashMap<String, Object> paramMap) { public IPage<TaskProgress> queryPageList(HashMap<String, Object> paramMap) {
QueryWrapper<TaskProgress> queryWrapper = QueryGenerator.initPageQueryWrapper(TaskProgress.class, 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"); Integer type = MapUtils.getInteger(paramMap, "type");
if (Objects.equals(type, 1)) { 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)))) 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))))); .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 @Override
@ -454,4 +458,11 @@ public class TaskProgressServiceImpl extends ServiceImpl<TaskProgressMapper, Tas
return SectorVo.getSectorVoByEnum(baseMapper.countMppStatus(paramMap), ParamEnum.TaskProgressMppStatusEnum.values()); 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);
}
} }