admin/wisdomisitezw_java
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

验收修改

Browse Source
This commit is contained in:
pengjie 2024-06-24 10:45:38 +08:00
parent 19f25b3a03
commit 15d77d1e9b
4 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/main/java/com/zhgd/xmgl/modules/basicdata/controller/government/GovEngineeringStageController.java
View File

@ -139,7 +139,8 @@ public class GovEngineeringStageController {
public Result<EngineeringStage> edit(@RequestBody EngineeringStageVo engineeringStage) { public Result<EngineeringStage> edit(@RequestBody EngineeringStageVo engineeringStage) {
Result<EngineeringStage> result = new Result<EngineeringStage>(); Result<EngineeringStage> result = new Result<EngineeringStage>();
Engineering engineering = engineeringService.getOne(Wrappers.<Engineering>lambdaQuery() Engineering engineering = engineeringService.getOne(Wrappers.<Engineering>lambdaQuery()
.eq(Engineering::getEngineeringName, engineeringStage.getEngineeringName())); .eq(Engineering::getEngineeringName, engineeringStage.getEngineeringName())
.ne(Engineering::getStageId, engineeringStage.getId()));
EngineeringStage engineeringStageEntity = engineeringStageService.getOne(Wrappers.<EngineeringStage>lambdaQuery() EngineeringStage engineeringStageEntity = engineeringStageService.getOne(Wrappers.<EngineeringStage>lambdaQuery()
.eq(EngineeringStage::getEngineeringName, engineeringStage.getEngineeringName()) .eq(EngineeringStage::getEngineeringName, engineeringStage.getEngineeringName())
.ne(EngineeringStage::getId, engineeringStage.getId())); .ne(EngineeringStage::getId, engineeringStage.getId()));

2
src/main/java/com/zhgd/xmgl/modules/basicdata/entity/EngineeringStage.java
View File

@ -249,7 +249,7 @@ public class EngineeringStage implements Serializable {
*/ */
@Excel(name = "项目状态（下拉框选择：未开始、进行中、已完结）", width = 15) @Excel(name = "项目状态（下拉框选择：未开始、进行中、已完结）", width = 15)
@ApiModelProperty(value = "项目状态（下拉框选择：未开始、进行中、已完结）") @ApiModelProperty(value = "项目状态（下拉框选择：未开始、进行中、已完结）")
private Integer threeState; private String threeState;
/** /**
* 填报人（下拉框选择：曹晓童、黄浩正、黄培峰、李燕、周韵、牟红洁、杨润韬） * 填报人（下拉框选择：曹晓童、黄浩正、黄培峰、李燕、周韵、牟红洁、杨润韬）
*/ */

2
src/main/java/com/zhgd/xmgl/modules/basicdata/service/impl/EngineeringServiceImpl.java
View File

@ -113,7 +113,7 @@ public class EngineeringServiceImpl extends ServiceImpl<EngineeringMapper, Engin
if (engineeringVo.getDraftId() != null) { if (engineeringVo.getDraftId() != null) {
engineeringDraftService.removeById(engineeringVo.getDraftId()); engineeringDraftService.removeById(engineeringVo.getDraftId());
} }
engineeringStageService.removeById(engineeringVo.getStageId()); // engineeringStageService.removeById(engineeringVo.getStageId());
// engineeringVo.setState(1); // engineeringVo.setState(1);
engineeringVo.setCreateTime(new Date()); engineeringVo.setCreateTime(new Date());
engineeringVo.setProjectSn(projectService.list().get(0).getProjectSn()); engineeringVo.setProjectSn(projectService.list().get(0).getProjectSn());

6
src/main/java/com/zhgd/xmgl/modules/basicdata/service/impl/EngineeringStageServiceImpl.java
View File

@ -59,6 +59,12 @@ public class EngineeringStageServiceImpl extends ServiceImpl<EngineeringStageMap
annexFile.setRelevanceId(engineeringStageVo.getId().toString()); annexFile.setRelevanceId(engineeringStageVo.getId().toString());
} }
annexFileService.saveBatch(engineeringStageVo.getAnnexFiles()); annexFileService.saveBatch(engineeringStageVo.getAnnexFiles());
Engineering engineering = engineeringService.getOne(Wrappers.<Engineering>lambdaQuery()
.eq(Engineering::getStageId, engineeringStageVo.getId()));
if (engineering != null) {
engineering.setEngineeringName(engineeringStageVo.getEngineeringName());
engineeringService.updateById(engineering);
}
return this.updateById(engineeringStageVo); return this.updateById(engineeringStageVo);
} }