|
|
@@ -151,26 +151,7 @@ public class CognizanceApiController extends BaseApiController {
|
|
|
orgActivity.setUid(TokenManager.getUserId());
|
|
|
orgActivityService.insert(orgActivity);
|
|
|
} else {
|
|
|
- orgActivityService.updateByPrimaryKeySelective(orgActivity);
|
|
|
- Boolean flag = false;
|
|
|
- OrgActivityCost cost = orgActivityCostService.selectOrgActivityCostByAid(orgActivity.getId());
|
|
|
- if (null != cost) {
|
|
|
- if (!StringUtils.isBlank(orgActivity.getActivityNumber())) {
|
|
|
- cost.setActivityNumber(orgActivity.getActivityNumber());
|
|
|
- flag = true;
|
|
|
- }
|
|
|
- if (null == orgActivity.getStartDate()) {
|
|
|
- cost.setStartDate(orgActivity.getStartDate());
|
|
|
- flag = true;
|
|
|
- }
|
|
|
- if (null == orgActivity.getEndDate()) {
|
|
|
- cost.setEndDate(orgActivity.getEndDate());
|
|
|
- flag = true;
|
|
|
- }
|
|
|
- }
|
|
|
- if (flag) {
|
|
|
- orgActivityCostService.updateByPrimaryKeySelective(cost);
|
|
|
- }
|
|
|
+ orgActivityService.updateOrgActivity(orgActivity);
|
|
|
}
|
|
|
res.setData(orgActivity);
|
|
|
return res;
|
|
|
@@ -232,7 +213,13 @@ public class CognizanceApiController extends BaseApiController {
|
|
|
if (!StringUtils.isBlank(signDateFormattedDate)) {
|
|
|
orgActivityCost.setSignDate(DateUtils.parseDate(signDateFormattedDate, "yyyy-MM-dd"));
|
|
|
}
|
|
|
- if (null == orgActivityCost.getId()) {
|
|
|
+ if (StringUtils.isBlank(orgActivityCost.getId())) {
|
|
|
+ if (null != orgActivityCostService.selectOrgActivityCostByUidAndAid(orgActivityCost.getAid(),
|
|
|
+ TokenManager.getUserId())){
|
|
|
+ res.getError().add(buildError(ErrorConstants.DUPLICATE_DATA_ERROR, "该研究项目费用详情已录入!"));
|
|
|
+ return res;
|
|
|
+ }
|
|
|
+
|
|
|
OrgActivity ac = orgActivityService.selectOrgActivityByPrimaryKey(orgActivityCost.getAid());
|
|
|
orgActivityCost.setStartDate(ac.getStartDate());
|
|
|
orgActivityCost.setEndDate(ac.getEndDate());
|
|
|
@@ -343,7 +330,7 @@ public class CognizanceApiController extends BaseApiController {
|
|
|
orgIntellectualProperty
|
|
|
.setAuthorizationDate(DateUtils.parseDate(authorizationDateFormattedDate, "yyyy-MM-dd"));
|
|
|
}
|
|
|
- if (null == orgIntellectualProperty.getId()) {
|
|
|
+ if (StringUtils.isBlank(orgIntellectualProperty.getId())) {
|
|
|
orgIntellectualProperty.setId(UUID.randomUUID().toString());
|
|
|
orgIntellectualProperty.setUid(TokenManager.getUserId());
|
|
|
orgIntellectualProperty.setEvaluationCategory(
|
|
|
@@ -496,7 +483,7 @@ public class CognizanceApiController extends BaseApiController {
|
|
|
@RequestMapping(value = "/disposeRatepay", method = RequestMethod.POST)
|
|
|
public Result disposeRatepay(OrgRatepay orgRatepay) {
|
|
|
Result res = new Result();
|
|
|
- if (null == orgRatepay.getId()) {
|
|
|
+ if (StringUtils.isBlank(orgRatepay.getId())) {
|
|
|
if (null == orgRatepayService.selectRatepayByUidAndYear(TokenManager.getUserId(), orgRatepay.getYear())) {
|
|
|
orgRatepay.setId(UUID.randomUUID().toString());
|
|
|
orgRatepay.setUid(TokenManager.getUserId());
|
|
|
@@ -561,7 +548,7 @@ public class CognizanceApiController extends BaseApiController {
|
|
|
@RequestMapping(value = "/disposeFinance", method = RequestMethod.POST)
|
|
|
public Result disposeFinance(OrgFinance orgFinance) {
|
|
|
Result res = new Result();
|
|
|
- if (null == orgFinance.getId()) {
|
|
|
+ if (StringUtils.isBlank(orgFinance.getId())) {
|
|
|
if (null == orgFinanceService.selectFinanceByUidAndYear(TokenManager.getUserId(), orgFinance.getYear())) {
|
|
|
orgFinance.setId(UUID.randomUUID().toString());
|
|
|
orgFinance.setUid(TokenManager.getUserId());
|
|
|
@@ -658,7 +645,7 @@ public class CognizanceApiController extends BaseApiController {
|
|
|
@RequestMapping(value = "/disposeAchievement", method = RequestMethod.POST)
|
|
|
public Result disposeAchievement(OrgTechAchievement achievement) throws ParseException {
|
|
|
Result res = new Result();
|
|
|
- if (null == achievement.getId()) {
|
|
|
+ if (StringUtils.isBlank(achievement.getId())) {
|
|
|
achievement.setId(UUID.randomUUID().toString());
|
|
|
achievement.setUid(TokenManager.getUserId());
|
|
|
achievement.setDeletedSign(0);
|
|
|
@@ -722,7 +709,7 @@ public class CognizanceApiController extends BaseApiController {
|
|
|
if (!StringUtils.isBlank(issuingTimeFormattedDate)) {
|
|
|
honor.setIssuingTime(DateUtils.parseDate(issuingTimeFormattedDate, "yyyy-MM-dd"));
|
|
|
}
|
|
|
- if (null == honor.getId()) {
|
|
|
+ if (StringUtils.isBlank(honor.getId())) {
|
|
|
honor.setId(UUID.randomUUID().toString());
|
|
|
honor.setUid(TokenManager.getUserId());
|
|
|
honor.setDeletedSign(0);
|
|
|
@@ -777,7 +764,7 @@ public class CognizanceApiController extends BaseApiController {
|
|
|
if (!StringUtils.isBlank(foundingTimeFormattedDate)) {
|
|
|
orgTechCenter.setFoundingTime(DateUtils.parseDate(foundingTimeFormattedDate, "yyyy-MM-dd"));
|
|
|
}
|
|
|
- if (null == orgTechCenter.getId()) {
|
|
|
+ if (StringUtils.isBlank(orgTechCenter.getId())) {
|
|
|
orgTechCenter.setId(UUID.randomUUID().toString());
|
|
|
orgTechCenter.setUid(TokenManager.getUserId());
|
|
|
orgTechCenter.setDeletedSign(0);
|
|
|
@@ -829,7 +816,7 @@ public class CognizanceApiController extends BaseApiController {
|
|
|
if (!StringUtils.isBlank(termTimeFormattedDate)) {
|
|
|
orgTechCenterDetail.setTermTime(DateUtils.parseDate(termTimeFormattedDate, "yyyy-MM-dd"));
|
|
|
}
|
|
|
- if (null == orgTechCenterDetail.getId()) {
|
|
|
+ if (StringUtils.isBlank(orgTechCenterDetail.getId())) {
|
|
|
orgTechCenterDetail.setId(UUID.randomUUID().toString());
|
|
|
orgTechCenterDetail.setDeletedSign(0);
|
|
|
orgTechCenterDetailService.inset(orgTechCenterDetail);
|
|
|
@@ -902,29 +889,10 @@ public class CognizanceApiController extends BaseApiController {
|
|
|
if (null != orgCognizanceService.selectCognizanceByUidAndYear(year, TokenManager.getUserId())){
|
|
|
res.getError().add(buildError(ErrorConstants.DUPLICATE_DATA_ERROR, "当年度高企认定已申请!"));
|
|
|
}
|
|
|
+ String aid = TokenManager.getToken().getAid();
|
|
|
+ orgCognizanceService.insertCognizance(contacts, comment, year, state, aid, TokenManager.getUserId());
|
|
|
|
|
|
- OrgCognizance c = new OrgCognizance();
|
|
|
- c.setId(UUID.randomUUID().toString());
|
|
|
- c.setUid(TokenManager.getUserId());
|
|
|
- c.setContacts(contacts);
|
|
|
- c.setComment(comment);
|
|
|
- c.setDeletedSign(0);
|
|
|
- c.setYear(year);
|
|
|
- c.setState(state);
|
|
|
- Calendar now = Calendar.getInstance();
|
|
|
- now.set(Calendar.MILLISECOND, 0);
|
|
|
- c.setRecordTime(now.getTime());
|
|
|
- orgCognizanceService.insert(c);
|
|
|
-
|
|
|
- OrgCognizanceLog log = new OrgCognizanceLog();
|
|
|
- log.setId(UUID.randomUUID().toString());
|
|
|
- log.setCid(c.getId());
|
|
|
|
|
|
- log.setRecordTime(c.getCreateTime());
|
|
|
- log.setState(state);
|
|
|
- log.setComment(comment);
|
|
|
- log.setPrincipal(userService.selectByPrimaryKey(TokenManager.getUserId()).getAid());
|
|
|
- orgCognizanceLogService.insert(log);
|
|
|
return res;
|
|
|
}
|
|
|
|
|
|
@@ -1012,12 +980,12 @@ public class CognizanceApiController extends BaseApiController {
|
|
|
@RequestMapping(value = "/disposeAnnualReport", method = RequestMethod.POST)
|
|
|
public Result disposeAnnualReport(OrgAnnualReport orgAnnualReport) {
|
|
|
Result res = new Result();
|
|
|
- if (null == orgAnnualReport.getId()) {
|
|
|
+ if (StringUtils.isBlank(orgAnnualReport.getId())) {
|
|
|
if (null != orgAnnualReportService.selectAnnualReportByYearAndUid(orgAnnualReport.getYear(),
|
|
|
TokenManager.getUserId())) {
|
|
|
res.getError().add(buildError(ErrorConstants.DUPLICATE_DATA_ERROR, "当年企业年报已录入!"));
|
|
|
return res;
|
|
|
- } else {
|
|
|
+ }
|
|
|
orgAnnualReport.setId(UUID.randomUUID().toString());
|
|
|
orgAnnualReport.setUid(TokenManager.getUserId());
|
|
|
Calendar now = Calendar.getInstance();
|
|
|
@@ -1026,7 +994,7 @@ public class CognizanceApiController extends BaseApiController {
|
|
|
orgAnnualReport.setLastUpdateTime(orgAnnualReport.getCreateTime());
|
|
|
orgAnnualReport.setDeletedSign(0);
|
|
|
orgAnnualReportService.insert(orgAnnualReport);
|
|
|
- }
|
|
|
+
|
|
|
} else {
|
|
|
Calendar now = Calendar.getInstance();
|
|
|
now.set(Calendar.MILLISECOND, 0);
|