|
|
@@ -1412,7 +1412,13 @@ public class CognizanceApiController extends CertifyApiController {
|
|
|
return res;
|
|
|
}
|
|
|
|
|
|
- if (!checkUserLogin(res)) {
|
|
|
+ if (StringUtils.isBlank(orgActivityCost.getAid())) {
|
|
|
+ res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR, "", "项目ID"));
|
|
|
+ return res;
|
|
|
+ }
|
|
|
+
|
|
|
+ if (null == orgActivityCost.getYear()) {
|
|
|
+ res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR, "", "费用年份"));
|
|
|
return res;
|
|
|
}
|
|
|
|
|
|
@@ -1427,15 +1433,20 @@ public class CognizanceApiController extends CertifyApiController {
|
|
|
|
|
|
OrgActivityCost oac = new OrgActivityCost();
|
|
|
BeanUtils.copyProperties(orgActivityCost, oac);
|
|
|
- OrgActivityCost ccc = orgActivityCostService.selectOrgActivityCostByUidAndAid(oac.getAid(),
|
|
|
- TokenManager.getUserId());
|
|
|
+ OrgActivityCost ccc = orgActivityCostService.selectOrgActivityCostByUidAndAidAndYear(oac.getAid(),
|
|
|
+ TokenManager.getUserId(), orgActivityCost.getYear());
|
|
|
+ OrgActivity ac = orgActivityService.selectOrgActivityByPrimaryKey(oac.getAid());
|
|
|
if (StringUtils.isBlank(oac.getId())) {
|
|
|
if (null != ccc) {
|
|
|
res.getError().add(buildError(ErrorConstants.DUPLICATE_DATA_ERROR, "该研究项目费用详情已录入!"));
|
|
|
return res;
|
|
|
}
|
|
|
-
|
|
|
- OrgActivity ac = orgActivityService.selectOrgActivityByPrimaryKey(orgActivityCost.getAid());
|
|
|
+
|
|
|
+ res = disposeActivityYear(res, ac, oac);
|
|
|
+ if (!res.getError().isEmpty()) {
|
|
|
+ return res;
|
|
|
+ }
|
|
|
+
|
|
|
oac.setStartDate(ac.getStartDate());
|
|
|
oac.setEndDate(ac.getEndDate());
|
|
|
oac.setId(UUID.randomUUID().toString());
|
|
|
@@ -1443,10 +1454,14 @@ public class CognizanceApiController extends CertifyApiController {
|
|
|
oac.setDeletedSign(DeleteStatus.UNDELETE.getCode());
|
|
|
orgActivityCostService.insert(oac);
|
|
|
} else {
|
|
|
- if (null != ccc && !ccc.getId().equals(oac.getId())){
|
|
|
+ if (null != ccc && !ccc.getId().equals(oac.getId())) {
|
|
|
res.getError().add(buildError(ErrorConstants.DUPLICATE_DATA_ERROR, "该研究项目费用详情已录入!"));
|
|
|
return res;
|
|
|
}
|
|
|
+ res = disposeActivityYear(res, ac, oac);
|
|
|
+ if (!res.getError().isEmpty()) {
|
|
|
+ return res;
|
|
|
+ }
|
|
|
orgActivityCostService.updateByPrimaryKeySelective(oac);
|
|
|
}
|
|
|
return res;
|
|
|
@@ -1610,14 +1625,15 @@ public class CognizanceApiController extends CertifyApiController {
|
|
|
if (!checkCertify(res, curUser)) {
|
|
|
return res;
|
|
|
}
|
|
|
-
|
|
|
- if (StringUtils.isBlank(orgIntellectualProperty.getIntellectualPropertyNumber())){
|
|
|
+
|
|
|
+ if (StringUtils.isBlank(orgIntellectualProperty.getIntellectualPropertyNumber())) {
|
|
|
res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR, "知识产权编号", "知识产权编号"));
|
|
|
return res;
|
|
|
}
|
|
|
-
|
|
|
- OrgIntellectualProperty p = orgIntellectualPropertyService.findByUidAndIntellectualPropertyNumber(TokenManager.getUserId(), orgIntellectualProperty.getIntellectualPropertyNumber());
|
|
|
-
|
|
|
+
|
|
|
+ OrgIntellectualProperty p = orgIntellectualPropertyService.findByUidAndIntellectualPropertyNumber(
|
|
|
+ TokenManager.getUserId(), orgIntellectualProperty.getIntellectualPropertyNumber());
|
|
|
+
|
|
|
if (!StringUtils.isBlank(authorizationDateFormattedDate)) {
|
|
|
try {
|
|
|
orgIntellectualProperty.setAuthorizationDate(
|
|
|
@@ -1629,7 +1645,7 @@ public class CognizanceApiController extends CertifyApiController {
|
|
|
BeanUtils.copyProperties(orgIntellectualProperty, oip);
|
|
|
|
|
|
if (StringUtils.isBlank(oip.getId())) {
|
|
|
- if (null != p){
|
|
|
+ if (null != p) {
|
|
|
res.getError().add(buildError("", "当前知识产权编号已录入,无法重复提交!"));
|
|
|
return res;
|
|
|
}
|
|
|
@@ -1640,7 +1656,7 @@ public class CognizanceApiController extends CertifyApiController {
|
|
|
oip.setType(IntellectualPropertyType.COMMON.getCode());
|
|
|
res.setData(orgIntellectualPropertyService.insert(oip));
|
|
|
} else {
|
|
|
- if (null != p && !p.getId().equals(oip.getId())){
|
|
|
+ if (null != p && !p.getId().equals(oip.getId())) {
|
|
|
res.getError().add(buildError("", "当前知识产权编号已录入,无法重复提交!"));
|
|
|
return res;
|
|
|
}
|
|
|
@@ -2575,14 +2591,6 @@ public class CognizanceApiController extends CertifyApiController {
|
|
|
return fileName;
|
|
|
}
|
|
|
|
|
|
- // 判断用户是否通过认证
|
|
|
- /*
|
|
|
- * private Result checkCertify(Result res) { OrganizationIdentity o =
|
|
|
- * organizationIdentityService.selectOrgIdentityByUserId(TokenManager.
|
|
|
- * getUserId()); if (null == o || 5 != o.getAuditStatus()) {
|
|
|
- * res.getError().add(buildError(ErrorConstants.NON_CERTIFIED,
|
|
|
- * "未通过实名认证,无法操作!")); } return res; }
|
|
|
- */
|
|
|
|
|
|
// 高企认定
|
|
|
private CognizanceDetailBo handleCognizanceDetail(String uid, String cid, Integer year) {
|
|
|
@@ -2593,5 +2601,18 @@ public class CognizanceApiController extends CertifyApiController {
|
|
|
private AnnualReportBo handleAnnualReport(String uid, Integer year) {
|
|
|
return orgAnnualReportService.selectAnnualReportBo(uid, year);
|
|
|
}
|
|
|
+
|
|
|
+ private Result disposeActivityYear(Result res, OrgActivity ac, OrgActivityCost oac) {
|
|
|
+ Calendar c = Calendar.getInstance();
|
|
|
+ c.setTime(ac.getStartDate());
|
|
|
+ Integer s = c.get(Calendar.YEAR);
|
|
|
+ c.setTime(ac.getEndDate());
|
|
|
+ Integer e = c.get(Calendar.YEAR);
|
|
|
+ if (oac.getYear() < s || oac.getYear() > e) {
|
|
|
+ res.getError().add(buildError(ErrorConstants.PARAM_ERROR, "", "年份"));
|
|
|
+ return res;
|
|
|
+ }
|
|
|
+ return res;
|
|
|
+ }
|
|
|
|
|
|
}
|