Antiloveg 8 years ago
parent
commit
94f2c42b01

+ 17 - 20
src/main/java/com/goafanti/cognizance/controller/CognizanceApiController.java

@@ -147,23 +147,24 @@ public class CognizanceApiController extends CertifyApiController {
 	private PatentInfoService				patentInfoService;
 	@Resource
 	private CopyrightInfoService			copyrightInfoService;
-	
+
 	/**
 	 * 研发活动详情
+	 * 
 	 * @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;
-		
+
 	}
 
 	/**
@@ -856,7 +857,7 @@ public class CognizanceApiController extends CertifyApiController {
 		}
 		return res;
 	}
-    
+
 	/**
 	 * 实名认证--企业上年度纳税申报表上传
 	 * 
@@ -871,8 +872,8 @@ public class CognizanceApiController extends CertifyApiController {
 
 		AttachmentType attachmentType = AttachmentType.getField(sign);
 		if (attachmentType == AttachmentType.RATEPAY) {
-			Calendar now = Calendar.getInstance(); 
-			sign = sign + "_" + (now.get(Calendar.YEAR)-1);
+			Calendar now = Calendar.getInstance();
+			sign = sign + "_" + (now.get(Calendar.YEAR) - 1);
 			res.setData(handleFiles(res, "/cognizance/", true, req, sign, TokenManager.getUserId()));
 		} else {
 			res.getError().add(buildError(ErrorConstants.PARAM_ERROR, "", "附件标示"));
@@ -880,7 +881,7 @@ public class CognizanceApiController extends CertifyApiController {
 
 		return res;
 	}
-	
+
 	/**
 	 * 企业纳税申报表上传
 	 * 
@@ -1661,7 +1662,8 @@ public class CognizanceApiController extends CertifyApiController {
 		if (StringUtils.isNumeric(pageNo)) {
 			pNo = Integer.parseInt(pageNo);
 		}
-		res.setData(orgIntellectualPropertyService.listIntellectual(pNo, pSize, TokenManager.getUserId(), startDate, endDate));
+		res.setData(orgIntellectualPropertyService.listIntellectual(pNo, pSize, TokenManager.getUserId(), startDate,
+				endDate));
 		return res;
 	}
 
@@ -2097,10 +2099,6 @@ public class CognizanceApiController extends CertifyApiController {
 			return res;
 		}
 
-		if (!checkUserLogin(res)) {
-			return res;
-		}
-
 		User curUser = TokenManager.getUserToken();
 		if (!checkCertify(res, curUser)) {
 			return res;
@@ -2108,8 +2106,7 @@ public class CognizanceApiController extends CertifyApiController {
 
 		if (!StringUtils.isBlank(foundingTimeFormattedDate)) {
 			try {
-				orgTechCenter
-						.setFoundingTime(DateUtils.parseDate(foundingTimeFormattedDate, AFTConstants.YYYYMMDDHHMMSS));
+				orgTechCenter.setFoundingTime(DateUtils.parseDate(foundingTimeFormattedDate, AFTConstants.YYYYMMDD));
 			} catch (ParseException e) {
 			}
 		}
@@ -2178,12 +2175,11 @@ public class CognizanceApiController extends CertifyApiController {
 			return res;
 		}
 
-
 		User curUser = TokenManager.getUserToken();
 		if (!checkCertify(res, curUser)) {
 			return res;
 		}
-		
+
 		if (StringUtils.isBlank(orgTechCenterDetail.getCid())) {
 			res.getError().add(buildError(ErrorConstants.STATUS_ERROR, "研发部门相关信息未保存,无法保存!"));
 			return res;
@@ -2262,7 +2258,8 @@ public class CognizanceApiController extends CertifyApiController {
 		if (StringUtils.isNumeric(pageNo)) {
 			pNo = Integer.parseInt(pageNo);
 		}
-		res.setData(orgCognizanceService.listCognizance(contractId, TokenManager.getUserId(), null, locationProvince, pNo, pSize));
+		res.setData(orgCognizanceService.listCognizance(contractId, TokenManager.getUserId(), null, locationProvince,
+				pNo, pSize));
 
 		return res;
 	}