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

进度列表查询

Browse Source
This commit is contained in:
Administrator 2023-03-21 10:23:13 +08:00
parent f9616330f5
commit 362b0c4782
4 changed files with 36 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/main/java/com/zhgd/xmgl/modules/material/controller/MaterialApproachRecordController.java
View File

@ -89,6 +89,7 @@ public class MaterialApproachRecordController {
HttpServletRequest req) {
QueryWrapper<MaterialApproachRecord> queryWrapper = QueryGenerator.initQueryWrapper(materialApproachRecord, req.getParameterMap());
queryWrapper.lambda().orderByDesc(MaterialApproachRecord::getEntryTime);
return Result.success(materialApproachRecordService.list(queryWrapper));
}

9
src/main/java/com/zhgd/xmgl/modules/project/controller/ProgressTaskController.java
View File

@ -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<List<ProgressTask>> 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<IPage<ProgressTask>> selectPage(@ApiIgnore Page<ProgressTask> page, ProgressTask progressTask) {
return Result.success(progressTaskService.page(page, null));
return progressTaskService.selectPage(page,progressTask);
}
/**

7
src/main/java/com/zhgd/xmgl/modules/project/service/ProgressTaskService.java
View File

@ -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<ProgressTask> {
List<ActualProgressVO> actualProgress(String projectSn);
void autoTaskUpdateForBim();
Result selectListByCondition(ProgressTask progressTask);
Result selectPage(Page<ProgressTask> page, ProgressTask progressTask);
}

20
src/main/java/com/zhgd/xmgl/modules/project/service/impl/ProgressTaskServiceImpl.java
View File

@ -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<ProgressTaskMapper, Pro
}
}
@Override
public Result selectListByCondition(ProgressTask progressTask) {
if (StringUtils.isBlank(progressTask.getProjectSn())) {
return Result.error("projectSn不能为空");
}
List<ProgressTask> progressTasks = progressTaskMapper.selectList(new LambdaQueryWrapper<ProgressTask>().eq(ProgressTask::getProjectSn, progressTask.getProjectSn())
.eq(progressTask.getStatus() != null, ProgressTask::getStatus, progressTask.getStatus()));
return Result.success(progressTasks);
}
@Override
public Result selectPage(Page<ProgressTask> page, ProgressTask progressTask) {
Page<ProgressTask> p = new Page<>();
Page<ProgressTask> progressTaskPage = progressTaskMapper.selectPage(p, new LambdaQueryWrapper<ProgressTask>().eq(ProgressTask::getProjectSn, progressTask.getProjectSn())
.eq(progressTask.getStatus() != null, ProgressTask::getStatus, progressTask.getStatus()));
return Result.success(progressTaskPage);
}
}