lcj/xinnengyuan
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

建管项目修改

Browse Source
This commit is contained in:
zzz
2025-12-18 20:07:35 +08:00
parent 08b905e074
commit 2ce43be23e
8 changed files with 47 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/progress/service/impl/PgsProgressCategoryTemplateServiceImpl.java
View File

@ -203,9 +203,9 @@ public class PgsProgressCategoryTemplateServiceImpl extends ServiceImpl<PgsProgr
if (project == null) {
throw new ServiceException("对应项目不存在", HttpStatus.NOT_FOUND);
}
if (entity.getConstructionType() == null) {
entity.setConstructionType(project.getProjectType());
}
// if (entity.getConstructionType() == null) {
// entity.setConstructionType(project.getProjectType());
// }
}
if (parentId != 0) {
if (this.getById(parentId) == null) {

2
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/BusProject.java
View File

@ -73,7 +73,7 @@ public class BusProject extends BaseEntity {
/**
* 项目类型
*/
private String projectType;
private Long projectType;
/**
* 项目阶段

2
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/dto/project/BusProjectCreateReq.java
View File

@ -49,7 +49,7 @@ public class BusProjectCreateReq implements Serializable {
/**
* 项目类型
*/
private String projectType;
private Long projectType;
/**
* 项目阶段

2
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/dto/project/BusProjectQueryReq.java
View File

@ -43,7 +43,7 @@ public class BusProjectQueryReq implements Serializable {
/**
* 项目类型
*/
private String projectType;
private Long projectType;
/**
* 项目阶段

2
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/dto/project/BusProjectUpdateReq.java
View File

@ -65,7 +65,7 @@ public class BusProjectUpdateReq implements Serializable {
/**
* 项目类型
*/
private String projectType;
private Long projectType;
/**
* 项目阶段

4
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/vo/project/BusProjectVo.java
View File

@ -92,12 +92,12 @@ public class BusProjectVo implements Serializable {
*/
@ExcelProperty(value = "项目类型", converter = ExcelDictConvert.class)
@ExcelDictFormat(dictType = "project_type")
private String projectType;
private Long projectType;
/**
* 项目类型名称
*/
@Translation(type = TransConstant.DICT_TYPE_TO_LABEL, mapper = "projectType", other = "project_type")
// @Translation(type = TransConstant.DICT_TYPE_TO_LABEL, mapper = "projectType", other = "project_type")
private String projectTypeName;
/**

18
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/service/impl/BusProjectServiceImpl.java
View File

@ -63,8 +63,11 @@ import org.dromara.system.domain.vo.SysDictDataVo;
import org.dromara.system.service.ISysDeptService;
import org.dromara.system.service.ISysDictDataService;
import org.dromara.workflow.service.IFlwDefinitionService;
import org.dromara.xzd.domain.vo.XzdProjectTypeVo;
import org.dromara.xzd.service.impl.XzdProjectTypeServiceImpl;
import org.dromara.xzd.utilS.IdWorker;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.cache.annotation.Cacheable;
import org.springframework.context.annotation.Lazy;
import org.springframework.data.redis.core.StringRedisTemplate;
@ -102,6 +105,9 @@ public class BusProjectServiceImpl extends ServiceImpl<BusProjectMapper, BusProj
@Resource
private ISubContractorService contractorService;
@Autowired
private XzdProjectTypeServiceImpl xzdProjectTypeService;
@Lazy
@Resource
private IBusProjectFileService projectFileService;
@ -197,6 +203,14 @@ public class BusProjectServiceImpl extends ServiceImpl<BusProjectMapper, BusProj
List<Punchrange> punchranges = BeanUtil.copyToList(punchrangeList, Punchrange.class);
vo.setPunchrangeList(punchranges);
}
//项目类型
if (vo.getProjectType() != null) {
XzdProjectTypeVo xzdProjectTypeVo = xzdProjectTypeService.queryById(vo.getProjectType());
if (xzdProjectTypeVo != null) {
vo.setProjectTypeName(xzdProjectTypeVo.getTypeName());
}
}
return vo;
}
@ -744,7 +758,7 @@ public class BusProjectServiceImpl extends ServiceImpl<BusProjectMapper, BusProj
String shortName = req.getShortName();
Long pId = req.getPId();
String status = req.getStatus();
String projectType = req.getProjectType();
Long projectType = req.getProjectType();
String projectCategory = req.getProjectStage();
String projectSite = req.getProjectSite();
String principal = req.getPrincipal();
@ -1657,7 +1671,7 @@ public class BusProjectServiceImpl extends ServiceImpl<BusProjectMapper, BusProj
vo.setProjectName(name);
vo.setLat(String.valueOf(lat));
vo.setLng(String.valueOf(lng));
vo.setProjectType(projectType.toString());
vo.setProjectType(Long.valueOf(projectType));
vo.setPlan(plan);
return vo;
}

41
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/service/impl/XzdProjectServiceImpl.java
View File

@ -744,25 +744,28 @@ public class XzdProjectServiceImpl extends ServiceImpl<XzdProjectMapper, XzdProj
}
String status = processEvent.getStatus();
if (BusinessStatusEnum.FINISH.getStatus().equals(status)) {
// try {
// // 创建系统项目
// BusProjectCreateReq project = new BusProjectCreateReq();
// project.setXzdProjectId(byId.getId());
// project.setProjectName(byId.getProjectName());
// project.setShortName(byId.getProjectAbbreviation());
// project.setOnStreamTime(String.valueOf(byId.getActualStartDate()));
// // 获取项目概括
// XzdProjectProfile projectProfile = xzdProjectProfileService.lambdaQuery()
// .eq(XzdProjectProfile::getXzdProjectId, byId.getId())
// .last("limit 1")
// .one();
// project.setProjectGeneralize(projectProfile.getProjectProfile());
// project.setProvince(projectProfile.getProvince());
// Long sysProjectId = projectService.insertByBo(project);
// byId.setSysProjectId(sysProjectId);
// } catch (Exception e) {
// log.error("自动创建系统项目失败：{} - {}", byId.getId(), byId.getProjectName(), e);
// }
try {
// 创建系统项目
if (byId.getSysProjectId() == null){
BusProjectCreateReq project = new BusProjectCreateReq();
project.setXzdProjectId(byId.getId());
project.setProjectName(byId.getProjectName());
project.setShortName(byId.getProjectAbbreviation());
project.setOnStreamTime(String.valueOf(byId.getActualStartDate()));
// 获取项目概括
XzdProjectProfile projectProfile = xzdProjectProfileService.lambdaQuery()
.eq(XzdProjectProfile::getXzdProjectId, byId.getId())
.last("limit 1")
.one();
project.setProjectGeneralize(projectProfile.getProjectProfile());
project.setProvince(projectProfile.getProvince());
Long sysProjectId = projectService.insertByBo(project);
byId.setSysProjectId(sysProjectId);
}
} catch (Exception e) {
log.error("自动创建系统项目失败：{} - {}", byId.getId(), byId.getProjectName(), e);
}
}
byId.setShzt(status);
boolean b = this.updateById(byId);