From 181cbfec8041fedec3b1507863b78ef486aee91f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=83=9D=E5=BD=AC?= <14779346+xswl_123@user.noreply.gitee.com> Date: Tue, 12 Aug 2025 11:33:58 +0800 Subject: [PATCH 1/3] =?UTF-8?q?8-12=20=E6=96=BD=E5=B7=A5=E8=A7=84=E6=A8=A1?= =?UTF-8?q?(=E9=A3=8E=E6=9C=BA=E6=95=B0=E9=87=8F)=E4=B8=8B=E6=94=BE?= =?UTF-8?q?=E8=87=B3=E4=BB=BB=E5=8A=A1=E4=B8=AD=E7=AE=A1=E7=90=86=EF=BC=8C?= =?UTF-8?q?=E5=8F=AF=E4=BB=A5=E8=AE=A1=E7=AE=97=E4=BB=BB=E5=8A=A1=E8=BF=9B?= =?UTF-8?q?=E5=BA=A6=EF=BC=8C=E9=A1=B9=E7=9B=AE=E6=80=BB=E8=BF=9B=E5=BA=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/dite/znpt/domain/entity/ProjectEntity.java | 2 +- .../com/dite/znpt/domain/entity/ProjectTaskEntity.java | 8 ++++++++ .../java/com/dite/znpt/domain/vo/ProjectInitTaskReq.java | 3 +++ .../com/dite/znpt/service/impl/ProjectServiceImpl.java | 4 ++++ .../dite/znpt/web/controller/ProjectTaskController.java | 8 ++++++-- 5 files changed, 22 insertions(+), 3 deletions(-) diff --git a/core/src/main/java/com/dite/znpt/domain/entity/ProjectEntity.java b/core/src/main/java/com/dite/znpt/domain/entity/ProjectEntity.java index 943620b..875b6c3 100644 --- a/core/src/main/java/com/dite/znpt/domain/entity/ProjectEntity.java +++ b/core/src/main/java/com/dite/znpt/domain/entity/ProjectEntity.java @@ -89,7 +89,7 @@ public class ProjectEntity extends AuditableEntity implements Serializable { @ExcelProperty("项目规模") @ApiModelProperty("项目规模") @TableField("scale") - private String scale; + private Integer scale; @ExcelProperty("总工期，单位天") @ApiModelProperty("总工期，单位天") diff --git a/core/src/main/java/com/dite/znpt/domain/entity/ProjectTaskEntity.java b/core/src/main/java/com/dite/znpt/domain/entity/ProjectTaskEntity.java index e2a25e8..2776261 100644 --- a/core/src/main/java/com/dite/znpt/domain/entity/ProjectTaskEntity.java +++ b/core/src/main/java/com/dite/znpt/domain/entity/ProjectTaskEntity.java @@ -85,5 +85,13 @@ public class ProjectTaskEntity extends AuditableEntity implements Serializable { @ApiModelProperty("项目id") @TableField("project_id") private String projectId; + + @ApiModelProperty("任务规模") + @TableField("scales") + private Integer scales; + + @ApiModelProperty("已完成数") + @TableField("finished") + private Integer finished; } diff --git a/core/src/main/java/com/dite/znpt/domain/vo/ProjectInitTaskReq.java b/core/src/main/java/com/dite/znpt/domain/vo/ProjectInitTaskReq.java index e1ef86f..7ec32f1 100644 --- a/core/src/main/java/com/dite/znpt/domain/vo/ProjectInitTaskReq.java +++ b/core/src/main/java/com/dite/znpt/domain/vo/ProjectInitTaskReq.java @@ -38,4 +38,7 @@ public class ProjectInitTaskReq { @Size(groups = {ValidationGroup.Insert.class, ValidationGroup.Update.class}, max = 100, message = "任务负责人id长度不能超过100字符") @ApiModelProperty("任务负责人id") private String mainUserId; + + @ApiModelProperty("任务规模") + private Integer scales; } diff --git a/core/src/main/java/com/dite/znpt/service/impl/ProjectServiceImpl.java b/core/src/main/java/com/dite/znpt/service/impl/ProjectServiceImpl.java index de2a7e4..38d8b40 100644 --- a/core/src/main/java/com/dite/znpt/service/impl/ProjectServiceImpl.java +++ b/core/src/main/java/com/dite/znpt/service/impl/ProjectServiceImpl.java @@ -137,7 +137,11 @@ public class ProjectServiceImpl extends ServiceImpl getTaskByProjectId(@PathVariable String projectId) { ProjectTasksDetailResp resp = new ProjectTasksDetailResp(); + resp.setTotal(0); + resp.setFinished(0); resp.setProjectName(projectService.getById(projectId).getProjectName()); resp.setList(projectTaskService.getTaskByProjectId(projectId)); - resp.setTotal(resp.getList().size()); - resp.setFinished((int) resp.getList().stream().filter(projectTaskResp -> projectTaskResp.getStatus() == 2).count()); + for (ProjectTaskResp projectTaskResp : resp.getList()) { + resp.setTotal(resp.getTotal() + projectTaskResp.getScales()); + resp.setFinished(resp.getFinished() + projectTaskResp.getFinished()); + } return Result.ok(resp); } } \ No newline at end of file From 53aa75d37bdcab8fb706f8abe8337cba44a947a1 Mon Sep 17 00:00:00 2001 From: "Mr.j" <2221464500@qq.com> Date: Tue, 12 Aug 2025 17:43:12 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E8=AE=BE=E5=A4=87?= =?UTF-8?q?=E7=AE=A1=E7=90=86=E7=9B=B8=E5=85=B3=E5=8A=9F=E8=83=BD=E5=88=86?= =?UTF-8?q?=E9=A1=B5=E6=9F=A5=E8=AF=A2=E6=97=A0=E6=B3=95=E5=88=86=E9=A1=B5?= =?UTF-8?q?=E5=92=8C=E6=AD=A3=E7=A1=AE=E8=8E=B7=E5=8F=96=E6=80=BB=E9=A1=B5?= =?UTF-8?q?=E6=95=B0=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/EquipmentApprovalServiceImpl.java | 52 +++- .../service/impl/EquipmentServiceImpl.java | 225 +++++------------- .../impl/EquipmentUseRecordServiceImpl.java | 7 +- 3 files changed, 108 insertions(+), 176 deletions(-) diff --git a/core/src/main/java/com/dite/znpt/service/impl/EquipmentApprovalServiceImpl.java b/core/src/main/java/com/dite/znpt/service/impl/EquipmentApprovalServiceImpl.java index 480734d..3ef83e0 100644 --- a/core/src/main/java/com/dite/znpt/service/impl/EquipmentApprovalServiceImpl.java +++ b/core/src/main/java/com/dite/znpt/service/impl/EquipmentApprovalServiceImpl.java @@ -11,7 +11,9 @@ import com.dite.znpt.domain.vo.EquipmentApprovalResp; import com.dite.znpt.domain.vo.EquipmentProcurementApplyReq; import com.dite.znpt.service.EquipmentApprovalService; import com.dite.znpt.service.EquipmentStatusUpdateService; +import com.dite.znpt.util.PageUtil; import com.dite.znpt.websocket.SimpleWebSocketHandler; +import com.github.pagehelper.PageInfo; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.BeanUtils; import org.springframework.stereotype.Service; @@ -41,10 +43,10 @@ public class EquipmentApprovalServiceImpl implements EquipmentApprovalService { @Override public IPage getPendingApprovals(EquipmentApprovalListReq req) { - // 创建分页对象，处理null值 - Integer pageNum = req.getPage() != null ? req.getPage() : 1; - Integer pageSize = req.getPageSize() != null ? req.getPageSize() : 10; - Page page = new Page<>(pageNum, pageSize); + log.info("开始执行待审批设备分页查询，请求参数: {}", req); + + // 使用分页插件 + PageUtil.startPage(); LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); wrapper.eq(EquipmentApprovalEntity::getApprovalStatus, "PENDING"); @@ -52,17 +54,30 @@ public class EquipmentApprovalServiceImpl implements EquipmentApprovalService { // 添加查询条件 addQueryConditions(wrapper, req); - IPage result = equipmentApprovalMapper.selectPage(page, wrapper); + // 执行查询 + List approvalList = equipmentApprovalMapper.selectList(wrapper); - return convertToRespPage(result); + // 转换为响应对象 + List respList = approvalList.stream() + .map(this::convertToResp) + .collect(Collectors.toList()); + + // 获取分页信息 + PageInfo pageInfo = new PageInfo<>(respList); + + // 创建响应分页对象 + Page result = new Page<>(pageInfo.getPageNum(), pageInfo.getPageSize(), pageInfo.getTotal()); + result.setRecords(respList); + + return result; } @Override public IPage getApprovedApprovals(EquipmentApprovalListReq req) { - // 创建分页对象，处理null值 - Integer pageNum = req.getPage() != null ? req.getPage() : 1; - Integer pageSize = req.getPageSize() != null ? req.getPageSize() : 10; - Page page = new Page<>(pageNum, pageSize); + log.info("开始执行已审批设备分页查询，请求参数: {}", req); + + // 使用分页插件 + PageUtil.startPage(); LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); wrapper.in(EquipmentApprovalEntity::getApprovalStatus, "APPROVED", "REJECTED"); @@ -70,9 +85,22 @@ public class EquipmentApprovalServiceImpl implements EquipmentApprovalService { // 添加查询条件 addQueryConditions(wrapper, req); - IPage result = equipmentApprovalMapper.selectPage(page, wrapper); + // 执行查询 + List approvalList = equipmentApprovalMapper.selectList(wrapper); - return convertToRespPage(result); + // 转换为响应对象 + List respList = approvalList.stream() + .map(this::convertToResp) + .collect(Collectors.toList()); + + // 获取分页信息 + PageInfo pageInfo = new PageInfo<>(respList); + + // 创建响应分页对象 + Page result = new Page<>(pageInfo.getPageNum(), pageInfo.getPageSize(), pageInfo.getTotal()); + result.setRecords(respList); + + return result; } @Override diff --git a/core/src/main/java/com/dite/znpt/service/impl/EquipmentServiceImpl.java b/core/src/main/java/com/dite/znpt/service/impl/EquipmentServiceImpl.java index ebaac5c..b30a5d4 100644 --- a/core/src/main/java/com/dite/znpt/service/impl/EquipmentServiceImpl.java +++ b/core/src/main/java/com/dite/znpt/service/impl/EquipmentServiceImpl.java @@ -16,6 +16,8 @@ import com.dite.znpt.enums.LocationStatusEnum; import com.dite.znpt.exception.ServiceException; import com.dite.znpt.mapper.EquipmentMapper; import com.dite.znpt.service.EquipmentService; +import com.dite.znpt.util.PageUtil; +import com.github.pagehelper.PageInfo; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -38,10 +40,8 @@ public class EquipmentServiceImpl extends ServiceImpl page(EquipmentListReq req) { log.info("开始执行设备分页查询，请求参数: {}", req); - // 创建分页对象，处理null值 - Integer pageNum = req.getPage() != null ? req.getPage() : (req.getPageNum() != null ? req.getPageNum() : 1); - Integer pageSize = req.getPageSize() != null ? req.getPageSize() : 10; - Page page = new Page<>(pageNum, pageSize); + // 使用分页插件 + PageUtil.startPage(); // 构建查询条件 LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); @@ -117,9 +117,14 @@ public class EquipmentServiceImpl extends ServiceImpl equipmentPage = this.page(page, queryWrapper); + // 执行查询 + List equipmentList = this.list(queryWrapper); - log.info("查询完成，总记录数: {}, 当前页记录数: {}", equipmentPage.getTotal(), equipmentPage.getRecords().size()); + log.info("查询完成，当前页记录数: {}", equipmentList.size()); // 转换为响应对象 - List equipmentRespList = equipmentPage.getRecords().stream() + List equipmentRespList = equipmentList.stream() .map(this::convertToResp) .collect(Collectors.toList()); + // 获取分页信息 + PageInfo pageInfo = new PageInfo<>(equipmentRespList); + // 创建响应分页对象 - Page respPage = new Page<>(equipmentPage.getCurrent(), equipmentPage.getSize(), equipmentPage.getTotal()); + Page respPage = new Page<>(pageInfo.getPageNum(), pageInfo.getPageSize(), pageInfo.getTotal()); respPage.setRecords(equipmentRespList); return respPage; @@ -597,10 +498,8 @@ public class EquipmentServiceImpl extends ServiceImpl procurementPage(EquipmentListReq req) { log.info("开始执行设备采购记录分页查询，请求参数: {}", req); - // 创建分页对象，处理null值 - Integer pageNum = req.getPage() != null ? req.getPage() : (req.getPageNum() != null ? req.getPageNum() : 1); - Integer pageSize = req.getPageSize() != null ? req.getPageSize() : 10; - Page page = new Page<>(pageNum, pageSize); + // 使用分页插件 + PageUtil.startPage(); // 构建查询条件，参考设备分页查询的逻辑 LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); @@ -624,14 +523,9 @@ public class EquipmentServiceImpl extends ServiceImpl result = this.page(page, queryWrapper); + List equipmentList = this.list(queryWrapper); // 转换为响应对象 - List records = result.getRecords().stream() + List records = equipmentList.stream() .map(this::convertToResp) .collect(Collectors.toList()); - // 创建新的分页结果 - Page respPage = new Page<>(result.getCurrent(), result.getSize(), result.getTotal()); - respPage.setRecords(records); + // 获取分页信息 + PageInfo pageInfo = new PageInfo<>(records); - log.info("设备采购记录分页查询完成，总记录数: {}", result.getTotal()); - return respPage; + // 创建响应分页对象 + Page result = new Page<>(pageInfo.getPageNum(), pageInfo.getPageSize(), pageInfo.getTotal()); + result.setRecords(records); + + return result; } @Transactional(rollbackFor = Exception.class) diff --git a/core/src/main/java/com/dite/znpt/service/impl/EquipmentUseRecordServiceImpl.java b/core/src/main/java/com/dite/znpt/service/impl/EquipmentUseRecordServiceImpl.java index 33e7555..4df621a 100644 --- a/core/src/main/java/com/dite/znpt/service/impl/EquipmentUseRecordServiceImpl.java +++ b/core/src/main/java/com/dite/znpt/service/impl/EquipmentUseRecordServiceImpl.java @@ -50,8 +50,13 @@ public class EquipmentUseRecordServiceImpl extends ServiceImpl page(EquipmentUseRecordListReq req) { + // 使用分页插件 PageUtil.startPage(); - return this.list(req); + + // 执行查询 + List result = this.list(req); + + return result; } @Override From 86ce3a6a2f89d66e8449bdcab828ed85382ef921 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=83=9D=E5=BD=AC?= <14779346+xswl_123@user.noreply.gitee.com> Date: Tue, 12 Aug 2025 17:57:54 +0800 Subject: [PATCH 3/3] =?UTF-8?q?8-12=20=E6=9F=A5=E8=AF=A2=E6=89=80=E6=9C=89?= =?UTF-8?q?=E6=9C=AA=E7=AB=8B=E9=A1=B9=E5=90=88=E5=90=8C=EF=BC=8C=E6=96=B0?= =?UTF-8?q?=E5=A2=9E=E9=A1=B9=E7=9B=AE=E6=97=B6=E5=8F=AF=E7=9B=B4=E6=8E=A5?= =?UTF-8?q?=E9=80=89=E6=8B=A9=E5=AF=B9=E5=BA=94=E5=90=88=E5=90=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../znpt/web/controller/ProjectController.java | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/web/src/main/java/com/dite/znpt/web/controller/ProjectController.java b/web/src/main/java/com/dite/znpt/web/controller/ProjectController.java index 4136c4b..c7e1806 100644 --- a/web/src/main/java/com/dite/znpt/web/controller/ProjectController.java +++ b/web/src/main/java/com/dite/znpt/web/controller/ProjectController.java @@ -4,9 +4,11 @@ package com.dite.znpt.web.controller; import cn.dev33.satoken.stp.StpUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.dite.znpt.constant.Constants; +import com.dite.znpt.domain.entity.ContractEntity; import com.dite.znpt.domain.entity.EquipmentEntity; import com.dite.znpt.domain.vo.*; import com.dite.znpt.domain.entity.ProjectEntity; +import com.dite.znpt.service.ContractService; import com.dite.znpt.service.EquipmentService; import com.dite.znpt.service.ProjectService; import com.dite.znpt.domain.Result; @@ -38,6 +40,9 @@ public class ProjectController { @Resource private EquipmentService equipmentService; + @Resource + private ContractService contractService; + @ApiOperation(value = "分页查询项目信息列表", httpMethod = "GET") @GetMapping("/page") public PageResult page(ProjectListReq req) { @@ -112,4 +117,13 @@ public class ProjectController { queryWrapper.eq("project_id", projectId); return Result.ok(equipmentService.list(queryWrapper)); } + + @ApiOperation(value = "查询未立项的合同列表", httpMethod = "GET") + @GetMapping("/contracts") + public Result> contracts() { + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.isNull("project_id"); + return Result.ok(contractService.list(queryWrapper)); + } + } \ No newline at end of file