Skip to content

D
dsk-operate-sys-cscec
Commit 2943eb41 authored by tianhongyang's avatar tianhongyang
Browse files
Options

Merge branch 'V20231129-中建一局二公司' of http://192.168.60.201/root/dsk-operate-sys... 

Merge branch 'V20231129-中建一局二公司' of http://192.168.60.201/root/dsk-operate-sys into V20231129-中建一局二公司
parents b90ddcc4 fdb53d59
Show whitespace changes
Inline Side-by-side
Showing with 24 additions and 11 deletions
dsk-module/dsk-biz-api/src/main/java/com/dsk/cscec/service/impl/CbProjectFileServiceImpl.java
View file @ 2943eb41
......@@ -140,9 +140,8 @@ public class CbProjectFileServiceImpl extends ServiceImpl<CbProjectFileMapper, C
Assert.isFalse(fileParseStatus.equals(CbProjectConstants.PROJECT_FILE_STATUS_PARSING),
"文件正在解析中,不允许删除");
//解析成功、解析失败的文件需要删除对应的导入数据和每月成本数据
if (fileParseStatus.equals(CbProjectConstants.PROJECT_FILE_STATUS_PARSE_SUCCESS) ||
fileParseStatus.equals(CbProjectConstants.PROJECT_FILE_STATUS_PARSE_FAIL)) {
//解析成功的文件需要删除对应的导入数据和每月成本数据
if (fileParseStatus.equals(CbProjectConstants.PROJECT_FILE_STATUS_PARSE_SUCCESS)) {
switch (deleteBo.getCbType()) {
case CbProjectConstants.CB_TYPE_DIRECT_EXPENSE:
//直接费没有每月成本,所以直接删除导入数据即可
......
dsk-module/dsk-biz-api/src/main/java/com/dsk/cscec/service/impl/CbProjectRecordServiceImpl.java
View file @ 2943eb41
......@@ -164,6 +164,15 @@ public class CbProjectRecordServiceImpl extends ServiceImpl<CbProjectRecordMappe
* @param cbTypeName 成本类型名称
*/
private List<CbProjectFile> checkCbTypeExistFile(Long projectId, Integer cbType, String cbTypeName) {
//如果当前成本类型下已存在解析成功的文件,则跳过校验
if (!projectFileMapper.selectList(new LambdaQueryWrapper<CbProjectFile>()
.eq(CbProjectFile::getProjectId, projectId)
.eq(CbProjectFile::getCbType, cbType)
//项目文件状态:准备中or解析失败
.eq(CbProjectFile::getFileParseStatus, CbProjectConstants.PROJECT_FILE_STATUS_PARSE_SUCCESS)).isEmpty()) {
return new ArrayList<>();
}
List<CbProjectFile> projectFileList = projectFileMapper.selectList(new LambdaQueryWrapper<CbProjectFile>()
.eq(CbProjectFile::getProjectId, projectId)
.eq(CbProjectFile::getCbType, cbType)
......
dsk-module/dsk-biz-api/src/main/java/com/dsk/cscec/service/impl/IDProjectServiceImpl.java
View file @ 2943eb41
......@@ -272,8 +272,10 @@ public class IDProjectServiceImpl extends ServiceImpl<DProjectMapper, DProject>
return baseMapper.exists(new LambdaQueryWrapper<DProject>()
.eq(DProject::getProjectCode, projectCode));
} else {
//修改项目信息or新增新阶段项目时
CbProjectRecord projectRecord = projectRecordMapper.selectById(projectId);
//未做任何改动时
Assert.isFalse(projectCode.equals(projectRecord.getIpmProjectNo()), "新编码与旧编码相同");
//修改项目信息or新增新阶段项目时
if (projectCode.equals(projectRecord.getIpmProjectNo())
&& projectRecord.getIsGetProjectDetail()) {
return true;
......
dsk-operate-ui/src/views/projectCostLedger/upload/index.vue
View file @ 2943eb41
......@@ -62,7 +62,7 @@
</template>
<div class="cz" v-if="item.fileParseStatus != 1">
<div><a :href="item.fileOssUrl">下载</a></div>
<div v-if="item.fileParseStatus == 3 && prodetail == false">重新上传</div>
<div @click="deletefille(item.id,0,true)" v-if="item.fileParseStatus == 3 && prodetail == false">重新上传</div>
<div class="i" @click="deletefille(item.id,0)" v-if="prodetail == false">删除</div>
</div>
</div>
......@@ -90,7 +90,7 @@
</template>
<div class="cz" v-if="item.fileParseStatus != 1">
<div><a :href="item.fileOssUrl">下载</a></div>
<div v-if="item.fileParseStatus == 3 && prodetail == false">重新上传</div>
<div @click="deletefille(item.id,1,true)" v-if="item.fileParseStatus == 3 && prodetail == false">重新上传</div>
<div class="i" @click="deletefille(item.id,1)" v-if="prodetail == false">删除</div>
</div>
</div>
......@@ -118,7 +118,7 @@
</template>
<div class="cz" v-if="item.fileParseStatus != 1">
<div><a :href="item.fileOssUrl">下载</a></div>
<div v-if="item.fileParseStatus == 3 && prodetail == false">重新上传</div>
<div @click="deletefille(item.id,2,true)" v-if="item.fileParseStatus == 3 && prodetail == false">重新上传</div>
<div class="i" @click="deletefille(item.id,2)" v-if="prodetail == false">删除</div>
</div>
</div>
......@@ -146,7 +146,7 @@
</template>
<div class="cz" v-if="item.fileParseStatus != 1">
<div><a :href="item.fileOssUrl">下载</a></div>
<div v-if="item.fileParseStatus == 3 && prodetail == false">重新上传</div>
<div @click="deletefille(item.id,3,true)" v-if="item.fileParseStatus == 3 && prodetail == false">重新上传</div>
<div class="i" @click="deletefille(item.id,3)" v-if="prodetail == false">删除</div>
</div>
</div>
......@@ -174,7 +174,7 @@
</template>
<div class="cz" v-if="item.fileParseStatus != 1">
<div><a :href="item.fileOssUrl">下载</a></div>
<div v-if="item.fileParseStatus == 3 && prodetail == false">重新上传</div>
<div @click="deletefille(item.id,4,true)" v-if="item.fileParseStatus == 3 && prodetail == false">重新上传</div>
<div class="i" @click="deletefille(item.id,4)" v-if="prodetail == false">删除</div>
</div>
</div>
......@@ -202,7 +202,7 @@
</template>
<div class="cz" v-if="item.fileParseStatus != 1">
<div><a :href="item.fileOssUrl">下载</a></div>
<div v-if="item.fileParseStatus == 3 && prodetail == false">重新上传</div>
<div @click="deletefille(item.id,5,true)" v-if="item.fileParseStatus == 3 && prodetail == false">重新上传</div>
<div class="i" @click="deletefille(item.id,5)" v-if="prodetail == false">删除</div>
</div>
</div>
......@@ -357,7 +357,7 @@
this.$refs.uploadpro.$el.querySelector('input').click()
}
},
deletefille(id,type){
deletefille(id,type,isupload){
this.$confirm('此操作将永久删除该文件, 是否继续?', '提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
......@@ -374,6 +374,9 @@
message: '删除成功!'
});
this.getDetail()
if(isupload){
this.uplpro(type)
}
}
})
}).catch(() => {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment