From 362b0c4782e2cd81425d123b68a3f16cad25c3a3 Mon Sep 17 00:00:00 2001 From: Administrator <1923636941@qq.com> Date: Tue, 21 Mar 2023 10:23:13 +0800 Subject: [PATCH] =?UTF-8?q?=E8=BF=9B=E5=BA=A6=E5=88=97=E8=A1=A8=E6=9F=A5?= =?UTF-8?q?=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../MaterialApproachRecordController.java | 1 + .../controller/ProgressTaskController.java | 9 ++++++++- .../project/service/ProgressTaskService.java | 7 +++++++ .../service/impl/ProgressTaskServiceImpl.java | 20 +++++++++++++++++++ 4 files changed, 36 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/zhgd/xmgl/modules/material/controller/MaterialApproachRecordController.java b/src/main/java/com/zhgd/xmgl/modules/material/controller/MaterialApproachRecordController.java index fbeb79422..4cc3ef53d 100644 --- a/src/main/java/com/zhgd/xmgl/modules/material/controller/MaterialApproachRecordController.java +++ b/src/main/java/com/zhgd/xmgl/modules/material/controller/MaterialApproachRecordController.java @@ -89,6 +89,7 @@ public class MaterialApproachRecordController { HttpServletRequest req) { QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(materialApproachRecord, req.getParameterMap()); + queryWrapper.lambda().orderByDesc(MaterialApproachRecord::getEntryTime); return Result.success(materialApproachRecordService.list(queryWrapper)); } diff --git a/src/main/java/com/zhgd/xmgl/modules/project/controller/ProgressTaskController.java b/src/main/java/com/zhgd/xmgl/modules/project/controller/ProgressTaskController.java index f60dfde5b..cd8073487 100644 --- a/src/main/java/com/zhgd/xmgl/modules/project/controller/ProgressTaskController.java +++ b/src/main/java/com/zhgd/xmgl/modules/project/controller/ProgressTaskController.java @@ -13,6 +13,7 @@ import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParams; import io.swagger.annotations.ApiOperation; import org.apache.poi.util.IOUtils; +import org.simpleframework.xml.core.Validate; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.core.io.ClassPathResource; import org.springframework.web.bind.annotation.*; @@ -43,6 +44,12 @@ public class ProgressTaskController { @Autowired private ProgressTaskService progressTaskService; + @GetMapping(value = "/list/condition") + @ApiOperation(value = "查询进度甘特图列表-按条件") + public Result> selectListByCondition(ProgressTask progressTask) { + return progressTaskService.selectListByCondition(progressTask); + } + /** * 分页查询进度甘特图 * @@ -57,7 +64,7 @@ public class ProgressTaskController { @ApiImplicitParam(name = "size", value = "分页参数：每页数量", dataType = "long", dataTypeClass = Long.class, defaultValue = "10", paramType = "query") }) public Result> selectPage(@ApiIgnore Page page, ProgressTask progressTask) { - return Result.success(progressTaskService.page(page, null)); + return progressTaskService.selectPage(page,progressTask); } /** diff --git a/src/main/java/com/zhgd/xmgl/modules/project/service/ProgressTaskService.java b/src/main/java/com/zhgd/xmgl/modules/project/service/ProgressTaskService.java index 7584ef53a..29c973efd 100644 --- a/src/main/java/com/zhgd/xmgl/modules/project/service/ProgressTaskService.java +++ b/src/main/java/com/zhgd/xmgl/modules/project/service/ProgressTaskService.java @@ -1,6 +1,9 @@ package com.zhgd.xmgl.modules.project.service; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.IService; +import com.zhgd.jeecg.common.api.vo.Result; import com.zhgd.xmgl.modules.project.entity.ProgressTask; import com.zhgd.xmgl.modules.project.entity.vo.ActualProgressVO; import org.springframework.web.multipart.MultipartFile; @@ -74,5 +77,9 @@ public interface ProgressTaskService extends IService { List actualProgress(String projectSn); void autoTaskUpdateForBim(); + + Result selectListByCondition(ProgressTask progressTask); + + Result selectPage(Page page, ProgressTask progressTask); } diff --git a/src/main/java/com/zhgd/xmgl/modules/project/service/impl/ProgressTaskServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/project/service/impl/ProgressTaskServiceImpl.java index 48e7460d9..5e571f30b 100644 --- a/src/main/java/com/zhgd/xmgl/modules/project/service/impl/ProgressTaskServiceImpl.java +++ b/src/main/java/com/zhgd/xmgl/modules/project/service/impl/ProgressTaskServiceImpl.java @@ -8,8 +8,10 @@ import cn.hutool.core.util.IdUtil; import cn.hutool.crypto.SecureUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.gexin.fastjson.JSON; +import com.zhgd.jeecg.common.api.vo.Result; import com.zhgd.jeecg.common.execption.ExistException; import com.zhgd.xmgl.modules.basicdata.entity.SystemUser; import com.zhgd.xmgl.modules.basicdata.mapper.SystemUserMapper; @@ -650,5 +652,23 @@ public class ProgressTaskServiceImpl extends ServiceImpl progressTasks = progressTaskMapper.selectList(new LambdaQueryWrapper().eq(ProgressTask::getProjectSn, progressTask.getProjectSn()) + .eq(progressTask.getStatus() != null, ProgressTask::getStatus, progressTask.getStatus())); + return Result.success(progressTasks); + } + + @Override + public Result selectPage(Page page, ProgressTask progressTask) { + Page p = new Page<>(); + Page progressTaskPage = progressTaskMapper.selectPage(p, new LambdaQueryWrapper().eq(ProgressTask::getProjectSn, progressTask.getProjectSn()) + .eq(progressTask.getStatus() != null, ProgressTask::getStatus, progressTask.getStatus())); + return Result.success(progressTaskPage); + } + }