|
|
@@ -1803,12 +1803,13 @@ public class AdminApiController extends CertifyApiController {
|
|
|
|
|
|
OrgActivityCost oac = new OrgActivityCost();
|
|
|
BeanUtils.copyProperties(orgActivityCost, oac);
|
|
|
-
|
|
|
+
|
|
|
+ if (null != orgActivityCostService.selectOrgActivityCostByAidAndYear(oac.getAid(), oac.getYear())) {
|
|
|
+ res.getError().add(buildError(ErrorConstants.DUPLICATE_DATA_ERROR, "该研究项目当前年份费用详情已录入!"));
|
|
|
+ return res;
|
|
|
+ }
|
|
|
+
|
|
|
if (StringUtils.isBlank(oac.getId())) {
|
|
|
- if (null != orgActivityCostService.selectOrgActivityCostByAidAndYear(oac.getAid(), oac.getYear())) {
|
|
|
- res.getError().add(buildError(ErrorConstants.DUPLICATE_DATA_ERROR, "该研究项目当前年份费用详情已录入!"));
|
|
|
- return res;
|
|
|
- }
|
|
|
OrgActivity ac = orgActivityService.selectOrgActivityByPrimaryKey(oac.getAid());
|
|
|
if (null != ac) {
|
|
|
Calendar c = Calendar.getInstance();
|