cuizhibin
/
znpt-backend
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

development #3

Merged
cuizhibin merged 41 commits from development into master 2025-08-14 20:04:45 +08:00
Conversation 0 Commits 41 Files Changed 64 +14
1 changed files with 14 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 86ce3a6a2f - Show all commits

14
web/src/main/java/com/dite/znpt/web/controller/ProjectController.java
View File

@ -4,9 +4,11 @@ package com.dite.znpt.web.controller;
import cn.dev33.satoken.stp.StpUtil; import cn.dev33.satoken.stp.StpUtil;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.dite.znpt.constant.Constants; 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.entity.EquipmentEntity;
import com.dite.znpt.domain.vo.*; import com.dite.znpt.domain.vo.*;
import com.dite.znpt.domain.entity.ProjectEntity; import com.dite.znpt.domain.entity.ProjectEntity;
import com.dite.znpt.service.ContractService;
import com.dite.znpt.service.EquipmentService; import com.dite.znpt.service.EquipmentService;
import com.dite.znpt.service.ProjectService; import com.dite.znpt.service.ProjectService;
import com.dite.znpt.domain.Result; import com.dite.znpt.domain.Result;
@ -38,6 +40,9 @@ public class ProjectController {
@Resource @Resource
private EquipmentService equipmentService; private EquipmentService equipmentService;
@Resource
private ContractService contractService;
@ApiOperation(value = "分页查询项目信息列表", httpMethod = "GET") @ApiOperation(value = "分页查询项目信息列表", httpMethod = "GET")
@GetMapping("/page") @GetMapping("/page")
public PageResult<ProjectListResp> page(ProjectListReq req) { public PageResult<ProjectListResp> page(ProjectListReq req) {
@ -112,4 +117,13 @@ public class ProjectController {
queryWrapper.eq("project_id", projectId); queryWrapper.eq("project_id", projectId);
return Result.ok(equipmentService.list(queryWrapper)); return Result.ok(equipmentService.list(queryWrapper));
} }
@ApiOperation(value = "查询未立项的合同列表", httpMethod = "GET")
@GetMapping("/contracts")
public Result<List<ContractEntity>> contracts() {
QueryWrapper<ContractEntity> queryWrapper = new QueryWrapper<>();
queryWrapper.isNull("project_id");
return Result.ok(contractService.list(queryWrapper));
}
} }