|
|
@@ -52,6 +52,7 @@ public class EnterpriseInfoServiceImpl extends BaseServiceImpl<EnterpriseInfoMap
|
|
|
private final CgJsbzMapper jsbzMapper;
|
|
|
private final CgRjzzqMapper rjzzqMapper;
|
|
|
private final CgQtMapper qtMapper;
|
|
|
+ private final ArchiveAttachMapper attachMapper;
|
|
|
|
|
|
@Override
|
|
|
@Transactional
|
|
|
@@ -165,6 +166,7 @@ public class EnterpriseInfoServiceImpl extends BaseServiceImpl<EnterpriseInfoMap
|
|
|
vo.setD48(db.getD48());
|
|
|
vo.setD49(db.getD49());
|
|
|
vo.setD50(db.getD50());
|
|
|
+ vo.setAttachment(db.getAttachment());
|
|
|
}
|
|
|
|
|
|
//一、研究开发人员情况
|
|
|
@@ -300,7 +302,22 @@ public class EnterpriseInfoServiceImpl extends BaseServiceImpl<EnterpriseInfoMap
|
|
|
throw new ServiceException("参数year为年份,如2025");
|
|
|
}
|
|
|
A107012VO vo = new A107012VO();
|
|
|
+ A107012 one = a107012Mapper.selectOne(Wrappers.<A107012>lambdaQuery().eq(A107012::getYearAndMonth, year));
|
|
|
|
|
|
+ BigDecimal d43=new BigDecimal("0.00"),d44=new BigDecimal("0.00"),d46=new BigDecimal("0.00"),d48=new BigDecimal("0.00"),d49=new BigDecimal("0.00");
|
|
|
+ if(Func.notNull(one)){
|
|
|
+ d43 = one.getD43();
|
|
|
+ d44 = one.getD44();
|
|
|
+ d46 = one.getD46();
|
|
|
+ d48 = one.getD48();
|
|
|
+ d49 = one.getD49();
|
|
|
+
|
|
|
+ }
|
|
|
+ vo.setD43(d43);
|
|
|
+ vo.setD44(d44);
|
|
|
+ vo.setD46(d46);
|
|
|
+ vo.setD48(d48);
|
|
|
+ vo.setD49(d49);
|
|
|
|
|
|
return vo;
|
|
|
}
|
|
|
@@ -320,7 +337,36 @@ public class EnterpriseInfoServiceImpl extends BaseServiceImpl<EnterpriseInfoMap
|
|
|
|
|
|
@Override
|
|
|
public A107041VO gxjsqyyhqkjmxb(String year) {
|
|
|
- return new A107041VO();
|
|
|
+ if(Func.isNull(year)){
|
|
|
+ throw new ServiceException("参数year不能为空");
|
|
|
+ }
|
|
|
+ if(year.length() != 4){
|
|
|
+ throw new ServiceException("参数year为年份,如2025");
|
|
|
+ }
|
|
|
+
|
|
|
+ A107041VO vo = new A107041VO();
|
|
|
+
|
|
|
+ A107041 one = a107041Mapper.selectOne(Wrappers.<A107041>lambdaQuery().eq(A107041::getYearAndMonth, year));
|
|
|
+
|
|
|
+ BigDecimal d5 = new BigDecimal("0.00"),d6 = new BigDecimal("0.00"),d8 = new BigDecimal("0.00"),d9 = new BigDecimal("0.00");
|
|
|
+ int d12=0;
|
|
|
+ BigDecimal d29_1 = new BigDecimal("0.00"),d29_2 = new BigDecimal("0.00"),d29_3 = new BigDecimal("0.00"),d31 = new BigDecimal("0.00"),d32 = new BigDecimal("0.00");
|
|
|
+
|
|
|
+ if(Func.notNull(one)){
|
|
|
+ d5 = one.getD5();
|
|
|
+ d6=one.getD6();d8=one.getD8();
|
|
|
+ d9=one.getD9();
|
|
|
+ d12 = one.getD12();
|
|
|
+ d29_1 = one.getD29_1();
|
|
|
+ d29_2=one.getD29_2();
|
|
|
+ d29_3=one.getD29_3();
|
|
|
+ d31=one.getD31();
|
|
|
+ d32=one.getD32();
|
|
|
+ }
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
+ return vo;
|
|
|
}
|
|
|
|
|
|
@Override
|
|
|
@@ -338,7 +384,6 @@ public class EnterpriseInfoServiceImpl extends BaseServiceImpl<EnterpriseInfoMap
|
|
|
|
|
|
@Override
|
|
|
public HighTechYBVO gqnb(String year) {
|
|
|
-
|
|
|
if(Func.isNull(year)){
|
|
|
throw new ServiceException("参数year不能为空");
|
|
|
}
|
|
|
@@ -418,4 +463,41 @@ public class EnterpriseInfoServiceImpl extends BaseServiceImpl<EnterpriseInfoMap
|
|
|
return highTechYbMapper.updateById(highTechYB) == 1;
|
|
|
}
|
|
|
}
|
|
|
+
|
|
|
+ @Override
|
|
|
+ public ArchiveAttachEntity fjbczl(String year) {
|
|
|
+ if(Func.isNull(year)){
|
|
|
+ throw new ServiceException("参数year不能为空");
|
|
|
+ }
|
|
|
+ if(year.length() != 4){
|
|
|
+ throw new ServiceException("参数year为年份,如2025");
|
|
|
+ }
|
|
|
+
|
|
|
+ ArchiveAttachEntity attach = attachMapper.selectOne(Wrappers.<ArchiveAttachEntity>lambdaQuery().eq(ArchiveAttachEntity::getYearAndMonth, year));
|
|
|
+ if(Func.isNull(attach)){
|
|
|
+ attach = new ArchiveAttachEntity();
|
|
|
+ }
|
|
|
+
|
|
|
+ return attach;
|
|
|
+ }
|
|
|
+
|
|
|
+ @Override
|
|
|
+ public boolean fjbczlUpdate(ArchiveAttachEntity attach) {
|
|
|
+ if(Func.isNull(attach.getYearAndMonth())){
|
|
|
+ throw new ServiceException("参数yearAndMonth不能为空");
|
|
|
+ }
|
|
|
+ if(attach.getYearAndMonth().length() != 4){
|
|
|
+ throw new ServiceException("参数yearAndMonth为年份,如2025");
|
|
|
+ }
|
|
|
+ LambdaQueryWrapper<ArchiveAttachEntity> eq = Wrappers.<ArchiveAttachEntity>lambdaQuery().eq(ArchiveAttachEntity::getYearAndMonth, attach.getYearAndMonth());
|
|
|
+ ArchiveAttachEntity one = attachMapper.selectOne(eq);
|
|
|
+ if (Func.isNull(one)) {
|
|
|
+ attach.setTenantId(SecureUtil.getTenantId());
|
|
|
+ return attachMapper.insert(attach) == 1;
|
|
|
+ } else {
|
|
|
+ attach.setId(one.getId());
|
|
|
+ return attachMapper.updateById(attach) == 1;
|
|
|
+ }
|
|
|
+ }
|
|
|
+
|
|
|
}
|