|
|
@@ -217,8 +217,8 @@ public class AdminApiController extends CertifyApiController {
|
|
|
res.getError().add(buildError(ErrorConstants.PARAM_ERROR, "", "资料完成状态"));
|
|
|
return res;
|
|
|
}
|
|
|
-
|
|
|
- if (null == id){
|
|
|
+
|
|
|
+ if (null == id) {
|
|
|
OrgCognizanceProportion cp = new OrgCognizanceProportion();
|
|
|
cp.setId(UUID.randomUUID().toString());
|
|
|
cp.setUid(uid);
|
|
|
@@ -231,7 +231,8 @@ public class AdminApiController extends CertifyApiController {
|
|
|
res.getError().add(buildError(ErrorConstants.PARAM_ERROR, "", "比重ID"));
|
|
|
return res;
|
|
|
}
|
|
|
- res.setData(orgCognizanceProportionService.updateByPrimaryKeySelective(disposeProportionStatus(sign, status, ocp)));
|
|
|
+ res.setData(
|
|
|
+ orgCognizanceProportionService.updateByPrimaryKeySelective(disposeProportionStatus(sign, status, ocp)));
|
|
|
return res;
|
|
|
}
|
|
|
|
|
|
@@ -1574,23 +1575,24 @@ public class AdminApiController extends CertifyApiController {
|
|
|
endDateFormattedDate, pNo, pSize, uid));
|
|
|
return res;
|
|
|
}
|
|
|
-
|
|
|
+
|
|
|
/**
|
|
|
* 研发活动详情
|
|
|
+ *
|
|
|
* @param id
|
|
|
* @return
|
|
|
*/
|
|
|
@RequestMapping(value = "/activityDetail", method = RequestMethod.GET)
|
|
|
- public Result activityDetail(String id){
|
|
|
+ public Result activityDetail(String id) {
|
|
|
Result res = new Result();
|
|
|
- if (StringUtils.isBlank(id)){
|
|
|
+ if (StringUtils.isBlank(id)) {
|
|
|
res.getError().add(buildError(ErrorConstants.PARAM_ERROR, "", "研发活动id"));
|
|
|
return res;
|
|
|
}
|
|
|
- Calendar a =Calendar.getInstance();
|
|
|
- res.setData(orgActivityService.selectDetailByIdAndYear(id, a.get(Calendar.YEAR)-1));
|
|
|
+ Calendar a = Calendar.getInstance();
|
|
|
+ res.setData(orgActivityService.selectDetailByIdAndYear(id, a.get(Calendar.YEAR) - 1));
|
|
|
return res;
|
|
|
-
|
|
|
+
|
|
|
}
|
|
|
|
|
|
/**
|
|
|
@@ -3000,8 +3002,12 @@ public class AdminApiController extends CertifyApiController {
|
|
|
|
|
|
LatelyCogRecord lcr = orgCognizanceService.selectLatelyRecord(cog.getUid());
|
|
|
|
|
|
+ if (null != lcr && null != lcr.getState() && OrgCognizanceStatus.FOSTER.getCode() == lcr.getState()) {
|
|
|
+ res.getError().add(buildError(ErrorConstants.STATUS_ERROR, "", "高企培育中!无法提交新申请!"));
|
|
|
+ return res;
|
|
|
+ }
|
|
|
+
|
|
|
if (null != lcr && null != lcr.getState() && OrgCognizanceStatus.SETTLEMENT.getCode() != lcr.getState()
|
|
|
- && OrgCognizanceStatus.FOSTER.getCode() != lcr.getState()
|
|
|
&& OrgCognizanceStatus.CALLBACK.getCode() != lcr.getState()) {
|
|
|
res.getError().add(buildError(ErrorConstants.STATUS_ERROR, "", "高企申请中!无法提交新申请!"));
|
|
|
return res;
|
|
|
@@ -3009,7 +3015,7 @@ public class AdminApiController extends CertifyApiController {
|
|
|
|
|
|
if (null != lcr && null != lcr.getState() && OrgCognizanceStatus.SETTLEMENT.getCode() == lcr.getState()) {
|
|
|
if (null == lcr.getIssuingDate()) {
|
|
|
- res.getError().add(buildError(ErrorConstants.STATUS_ERROR, "", "高企申请中!无法提交新申请!"));
|
|
|
+ res.getError().add(buildError(ErrorConstants.STATUS_ERROR, "", "高企认定未过期!无法提交新申请!"));
|
|
|
return res;
|
|
|
}
|
|
|
try {
|
|
|
@@ -3057,6 +3063,17 @@ public class AdminApiController extends CertifyApiController {
|
|
|
if (!checkCertify(res, uid).getError().isEmpty()) {
|
|
|
return res;
|
|
|
}
|
|
|
+ OrgCognizance oc = orgCognizanceService.selectByPrimaryKey(cid);
|
|
|
+ if (null == oc){
|
|
|
+ res.getError().add(buildError(ErrorConstants.PARAM_ERROR, "", "高企ID"));
|
|
|
+ return res;
|
|
|
+ }
|
|
|
+
|
|
|
+ if (year != oc.getYear()){
|
|
|
+ res.getError().add(buildError(ErrorConstants.PARAM_ERROR, "", "高企ID及年份"));
|
|
|
+ return res;
|
|
|
+ }
|
|
|
+
|
|
|
res.setData(handleCognizanceDetail(uid, cid, year));
|
|
|
return res;
|
|
|
}
|