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

8-13 项目详细信息展示所有子任务

This commit is contained in:
郝彬 2025-08-13 17:46:28 +08:00
parent 2dec48a83f
commit 1083efd2bd
4 changed files with 16 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
core/src/main/java/com/dite/znpt/domain/vo/ProjectReq.java
View File

@ -78,9 +78,8 @@ public class ProjectReq implements Serializable {
@ApiModelProperty("检查单位联系电话") @ApiModelProperty("检查单位联系电话")
private String inspectionPhone; private String inspectionPhone;
@Size(groups = {ValidationGroup.Insert.class, ValidationGroup.Update.class}, max = 20, message = "项目规模长度不能超过20字符")
@ApiModelProperty("项目规模") @ApiModelProperty("项目规模")
private String scale; private Integer scale;
@ApiModelProperty("总工期，单位天") @ApiModelProperty("总工期，单位天")
private Integer duration; private Integer duration;

4
core/src/main/java/com/dite/znpt/domain/vo/ProjectResp.java
View File

@ -6,6 +6,7 @@ import lombok.Data;
import java.io.Serial; import java.io.Serial;
import java.io.Serializable; import java.io.Serializable;
import java.util.List;
/** /**
* @author huise23 * @author huise23
@ -45,5 +46,8 @@ public class ProjectResp extends ProjectReq implements Serializable {
@ApiModelProperty("状态：0待施工，1施工中，2已完工，3已审核，4已验收") @ApiModelProperty("状态：0待施工，1施工中，2已完工，3已审核，4已验收")
private String statusLabel; private String statusLabel;
@ApiModelProperty("任务列表")
private List<ProjectTaskResp> taskList;
} }

17
core/src/main/java/com/dite/znpt/service/impl/ProjectServiceImpl.java
View File

@ -11,11 +11,7 @@ import com.dite.znpt.domain.entity.ContractEntity;
import com.dite.znpt.domain.entity.ProjectEntity; import com.dite.znpt.domain.entity.ProjectEntity;
import com.dite.znpt.domain.entity.ProjectTaskEntity; import com.dite.znpt.domain.entity.ProjectTaskEntity;
import com.dite.znpt.domain.entity.UserEntity; import com.dite.znpt.domain.entity.UserEntity;
import com.dite.znpt.domain.vo.ProjectInitTaskReq; import com.dite.znpt.domain.vo.*;
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.enums.ProjectStatusEnum; import com.dite.znpt.enums.ProjectStatusEnum;
import com.dite.znpt.exception.ServiceException; import com.dite.znpt.exception.ServiceException;
import com.dite.znpt.mapper.ContractMapper; import com.dite.znpt.mapper.ContractMapper;
@ -127,6 +123,13 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectMapper, ProjectEntity
resp.setConstructorName(constructorName.toString()); resp.setConstructorName(constructorName.toString());
} }
} }
List<ProjectTaskEntity> tmp = projectTaskService.list(new QueryWrapper<ProjectTaskEntity>().eq("project_id", projectId));
List<ProjectTaskResp> list1 = new ArrayList<>();
for (ProjectTaskEntity item : tmp) {
ProjectTaskResp taskResp = BeanUtil.copyProperties(item, ProjectTaskResp.class);
list1.add(taskResp);
}
resp.setTaskList(list1);
return resp; return resp;
} }
@ -143,9 +146,9 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectMapper, ProjectEntity
ProjectEntity entity = Converts.INSTANCE.toProjectEntity(req); ProjectEntity entity = Converts.INSTANCE.toProjectEntity(req);
this.save(entity); this.save(entity);
QueryWrapper<ContractEntity> queryWrapper = new QueryWrapper<>(); QueryWrapper<ContractEntity> queryWrapper = new QueryWrapper<>();
queryWrapper.eq("contract_code", req.getProjectOrigin()); queryWrapper.eq("code", req.getProjectOrigin());
ContractEntity contractEntity = contractMapper.selectOne(queryWrapper); ContractEntity contractEntity = contractMapper.selectOne(queryWrapper);
contractEntity.setProjectId(entity.getProjectId()); contractEntity.setContractStatus("施工中");
contractMapper.updateById(contractEntity); contractMapper.updateById(contractEntity);
for (ProjectInitTaskReq taskReq : req.getTasks()) { for (ProjectInitTaskReq taskReq : req.getTasks()) {
ProjectTaskEntity taskEntity = BeanUtil.copyProperties(taskReq, ProjectTaskEntity.class); ProjectTaskEntity taskEntity = BeanUtil.copyProperties(taskReq, ProjectTaskEntity.class);

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

@ -122,7 +122,7 @@ public class ProjectController {
@GetMapping("/contracts") @GetMapping("/contracts")
public Result<List<ContractEntity>> contracts() { public Result<List<ContractEntity>> contracts() {
QueryWrapper<ContractEntity> queryWrapper = new QueryWrapper<>(); QueryWrapper<ContractEntity> queryWrapper = new QueryWrapper<>();
queryWrapper.isNull("project_id"); queryWrapper.eq("contract_status", "未立项");
return Result.ok(contractService.list(queryWrapper)); return Result.ok(contractService.list(queryWrapper));
} }