|
|
@@ -121,11 +121,11 @@ public class EnterpriseProjectServiceImpl extends ServiceImpl<EnterpriseProjectM
|
|
|
Page<EnterpriseProject> page = baseMapper.selectPage(PageUtils.initPage(), queryWrapper);
|
|
|
for (EnterpriseProject record : page.getRecords()) {
|
|
|
// 财务进度
|
|
|
- int finTotal = 3;
|
|
|
+ int finTotal = 4;
|
|
|
int finSize = attachService.lambdaQuery()
|
|
|
.eq(Attach::getAttachType, AttachTypeEnum.FINACIAL)
|
|
|
.eq(Attach::getDataId, record.getId())
|
|
|
- .in(Attach::getFileType, "file4", "file5", "file8")
|
|
|
+ .in(Attach::getFileType, "file8", "file9", "file10", "file11")
|
|
|
.list().size();
|
|
|
record.setFinRate(finSize == 0 ? "0%" : NumberUtil.div(finSize * 100, finTotal, 2) + "%");
|
|
|
// 技术进度:加计年度企业基本信息 + 企业研发项目情况表 + 技术人员上传1-7项相关文件
|
|
|
@@ -141,9 +141,9 @@ public class EnterpriseProjectServiceImpl extends ServiceImpl<EnterpriseProjectM
|
|
|
int techSize = attachService.lambdaQuery()
|
|
|
.eq(Attach::getAttachType, AttachTypeEnum.FINACIAL)
|
|
|
.eq(Attach::getDataId, record.getId())
|
|
|
- .in(Attach::getFileType, "file1", "file2",
|
|
|
- record.getContractFlag() ? "file3" : "过滤file3数据", "file6",
|
|
|
- record.getAppraisalFlag() ? "file7" : "过滤file7数据", "file9", "file10")
|
|
|
+ .in(Attach::getFileType, "file1", "file2", "file3", "file4",
|
|
|
+ record.getContractFlag() ? "file5" : "过滤file5数据", "file6",
|
|
|
+ record.getAppraisalFlag() ? "file7" : "过滤file7数据")
|
|
|
.list().size();
|
|
|
EnterpriseYearInfo one = enterpriseYearInfoService.getOne(new LambdaUpdateWrapper<EnterpriseYearInfo>()
|
|
|
.eq(EnterpriseYearInfo::getEntId, record.getEntId())
|