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 +12
1 changed files with 12 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit f500082ea6 - Show all commits

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

@ -3,9 +3,11 @@ package com.dite.znpt.service.impl;
import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.bean.BeanUtil;
import cn.hutool.core.collection.CollUtil; import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.util.StrUtil; import cn.hutool.core.util.StrUtil;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.dite.znpt.constant.Message; import com.dite.znpt.constant.Message;
import com.dite.znpt.converts.Converts; import com.dite.znpt.converts.Converts;
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;
@ -16,12 +18,14 @@ import com.dite.znpt.domain.vo.ProjectReq;
import com.dite.znpt.domain.vo.ProjectResp; 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.ProjectMapper; import com.dite.znpt.mapper.ProjectMapper;
import com.dite.znpt.service.ProjectService; import com.dite.znpt.service.ProjectService;
import com.dite.znpt.service.UserService; import com.dite.znpt.service.UserService;
import com.dite.znpt.service.ProjectTaskService; import com.dite.znpt.service.ProjectTaskService;
import com.dite.znpt.util.PageUtil; import com.dite.znpt.util.PageUtil;
import lombok.RequiredArgsConstructor; import lombok.RequiredArgsConstructor;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional; import org.springframework.transaction.annotation.Transactional;
@ -47,6 +51,9 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectMapper, ProjectEntity
@Resource @Resource
private ProjectTaskService projectTaskService; private ProjectTaskService projectTaskService;
@Autowired
private ContractMapper contractMapper;
/** /**
* 功能描述：查询项目信息列表 * 功能描述：查询项目信息列表
* *
@ -135,6 +142,11 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectMapper, ProjectEntity
public void save(ProjectReq req) { public void save(ProjectReq req) {
ProjectEntity entity = Converts.INSTANCE.toProjectEntity(req); ProjectEntity entity = Converts.INSTANCE.toProjectEntity(req);
this.save(entity); this.save(entity);
QueryWrapper<ContractEntity> queryWrapper = new QueryWrapper<>();
queryWrapper.eq("contract_code", req.getProjectOrigin());
ContractEntity contractEntity = contractMapper.selectOne(queryWrapper);
contractEntity.setProjectId(entity.getProjectId());
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);
if (taskEntity.getScales() == null) { if (taskEntity.getScales() == null) {