From 1083efd2bd44b4f0c61ee3f3489a7b84c648d83e 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: Wed, 13 Aug 2025 17:46:28 +0800 Subject: [PATCH] =?UTF-8?q?8-13=20=E9=A1=B9=E7=9B=AE=E8=AF=A6=E7=BB=86?= =?UTF-8?q?=E4=BF=A1=E6=81=AF=E5=B1=95=E7=A4=BA=E6=89=80=E6=9C=89=E5=AD=90?= =?UTF-8?q?=E4=BB=BB=E5=8A=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/dite/znpt/domain/vo/ProjectReq.java | 3 +-- .../com/dite/znpt/domain/vo/ProjectResp.java | 4 ++++ .../znpt/service/impl/ProjectServiceImpl.java | 17 ++++++++++------- .../znpt/web/controller/ProjectController.java | 2 +- 4 files changed, 16 insertions(+), 10 deletions(-) diff --git a/core/src/main/java/com/dite/znpt/domain/vo/ProjectReq.java b/core/src/main/java/com/dite/znpt/domain/vo/ProjectReq.java index 881ecb6..b590940 100644 --- a/core/src/main/java/com/dite/znpt/domain/vo/ProjectReq.java +++ b/core/src/main/java/com/dite/znpt/domain/vo/ProjectReq.java @@ -78,9 +78,8 @@ public class ProjectReq implements Serializable { @ApiModelProperty("检查单位联系电话") private String inspectionPhone; - @Size(groups = {ValidationGroup.Insert.class, ValidationGroup.Update.class}, max = 20, message = "项目规模长度不能超过20字符") @ApiModelProperty("项目规模") - private String scale; + private Integer scale; @ApiModelProperty("总工期，单位天") private Integer duration; diff --git a/core/src/main/java/com/dite/znpt/domain/vo/ProjectResp.java b/core/src/main/java/com/dite/znpt/domain/vo/ProjectResp.java index 16eb289..47c02b8 100644 --- a/core/src/main/java/com/dite/znpt/domain/vo/ProjectResp.java +++ b/core/src/main/java/com/dite/znpt/domain/vo/ProjectResp.java @@ -6,6 +6,7 @@ import lombok.Data; import java.io.Serial; import java.io.Serializable; +import java.util.List; /** * @author huise23 @@ -45,5 +46,8 @@ public class ProjectResp extends ProjectReq implements Serializable { @ApiModelProperty("状态：0待施工，1施工中，2已完工，3已审核，4已验收") private String statusLabel; + + @ApiModelProperty("任务列表") + private List taskList; } 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 198ec2e..b76759a 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 @@ -11,11 +11,7 @@ import com.dite.znpt.domain.entity.ContractEntity; import com.dite.znpt.domain.entity.ProjectEntity; import com.dite.znpt.domain.entity.ProjectTaskEntity; import com.dite.znpt.domain.entity.UserEntity; -import com.dite.znpt.domain.vo.ProjectInitTaskReq; -import com.dite.znpt.domain.vo.ProjectListReq; -import com.dite.znpt.domain.vo.ProjectListResp; -import com.dite.znpt.domain.vo.ProjectReq; -import com.dite.znpt.domain.vo.ProjectResp; +import com.dite.znpt.domain.vo.*; import com.dite.znpt.enums.ProjectStatusEnum; import com.dite.znpt.exception.ServiceException; import com.dite.znpt.mapper.ContractMapper; @@ -127,6 +123,13 @@ public class ProjectServiceImpl extends ServiceImpl tmp = projectTaskService.list(new QueryWrapper().eq("project_id", projectId)); + List list1 = new ArrayList<>(); + for (ProjectTaskEntity item : tmp) { + ProjectTaskResp taskResp = BeanUtil.copyProperties(item, ProjectTaskResp.class); + list1.add(taskResp); + } + resp.setTaskList(list1); return resp; } @@ -143,9 +146,9 @@ public class ProjectServiceImpl extends ServiceImpl queryWrapper = new QueryWrapper<>(); - queryWrapper.eq("contract_code", req.getProjectOrigin()); + queryWrapper.eq("code", req.getProjectOrigin()); ContractEntity contractEntity = contractMapper.selectOne(queryWrapper); - contractEntity.setProjectId(entity.getProjectId()); + contractEntity.setContractStatus("施工中"); contractMapper.updateById(contractEntity); for (ProjectInitTaskReq taskReq : req.getTasks()) { ProjectTaskEntity taskEntity = BeanUtil.copyProperties(taskReq, ProjectTaskEntity.class); 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 c7e1806..fd95eb1 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 @@ -122,7 +122,7 @@ public class ProjectController { @GetMapping("/contracts") public Result> contracts() { QueryWrapper queryWrapper = new QueryWrapper<>(); - queryWrapper.isNull("project_id"); + queryWrapper.eq("contract_status", "未立项"); return Result.ok(contractService.list(queryWrapper)); }