Browse Source

Merge branch 'master' of https://git.coding.net/aft/AFT.git

Conflicts:
	src/main/java/com/goafanti/common/controller/WebpageController.java
albertshaw 8 years ago
parent
commit
c5ba065dbd

+ 9 - 4
src/main/java/com/goafanti/admin/controller/AdminApiController.java

@@ -1528,12 +1528,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;
-		}
+		OrgActivityCost ccc = orgActivityCostService.selectOrgActivityCostByAidAndYear(oac.getAid(), oac.getYear());
 
 		if (StringUtils.isBlank(oac.getId())) {
+			if (null != ccc) {
+				res.getError().add(buildError(ErrorConstants.DUPLICATE_DATA_ERROR, "该研究项目当前年份费用详情已录入!"));
+				return res;
+			}
 			OrgActivity ac = orgActivityService.selectOrgActivityByPrimaryKey(oac.getAid());
 			if (null != ac) {
 				Calendar c = Calendar.getInstance();
@@ -1556,6 +1557,10 @@ public class AdminApiController extends CertifyApiController {
 				return res;
 			}
 		} else {
+			if (null != ccc && !ccc.getId().equals(oac.getId())) {
+				res.getError().add(buildError(ErrorConstants.DUPLICATE_DATA_ERROR, "该研究项目当前年份费用详情已录入!"));
+				return res;
+			}
 			orgActivityCostService.updateByPrimaryKeySelective(oac);
 		}
 		return res;

+ 7 - 3
src/main/java/com/goafanti/cognizance/controller/CognizanceApiController.java

@@ -1427,10 +1427,10 @@ public class CognizanceApiController extends CertifyApiController {
 
 		OrgActivityCost oac = new OrgActivityCost();
 		BeanUtils.copyProperties(orgActivityCost, oac);
-
+		OrgActivityCost ccc = orgActivityCostService.selectOrgActivityCostByUidAndAid(oac.getAid(),
+				TokenManager.getUserId());
 		if (StringUtils.isBlank(oac.getId())) {
-			if (null != orgActivityCostService.selectOrgActivityCostByUidAndAid(oac.getAid(),
-					TokenManager.getUserId())) {
+			if (null != ccc) {
 				res.getError().add(buildError(ErrorConstants.DUPLICATE_DATA_ERROR, "该研究项目费用详情已录入!"));
 				return res;
 			}
@@ -1443,6 +1443,10 @@ public class CognizanceApiController extends CertifyApiController {
 			oac.setDeletedSign(DeleteStatus.UNDELETE.getCode());
 			orgActivityCostService.insert(oac);
 		} else {
+			if (null != ccc && !ccc.getId().equals(oac.getId())){
+				res.getError().add(buildError(ErrorConstants.DUPLICATE_DATA_ERROR, "该研究项目费用详情已录入!"));
+				return res;
+			}
 			orgActivityCostService.updateByPrimaryKeySelective(oac);
 		}
 		return res;

+ 38 - 0
src/main/java/com/goafanti/common/controller/WebpageController.java

@@ -389,6 +389,44 @@ public class WebpageController extends BaseController {
 		return modelview;
 	}
 	
+	/**
+	 * 策源地
+	 * @param request
+	 * @param modelview
+	 * @return
+	 */
+	@RequestMapping(value = "/portal/news/newsIndex", method = RequestMethod.GET)
+	public ModelAndView portalNewsNewsIndex(HttpServletRequest request, ModelAndView modelview) {
+		modelview.setViewName("/portal/news/newsIndex");
+		return modelview;
+	}
+	
+	/**
+	 * 服务汇
+	 */
+	@RequestMapping(value = "/portal/service/serviceIndex", method = RequestMethod.GET)
+	public ModelAndView portalServiceServiceIndex(HttpServletRequest request, ModelAndView modelview) {
+		modelview.setViewName("/portal/service/serviceIndex");
+		return modelview;
+	}
+	
+	/**
+	 * 新闻详情
+	 */
+	@RequestMapping(value = "/portal/news/newsDetails", method = RequestMethod.GET)
+	public ModelAndView portalNewsNewsDetails(HttpServletRequest request, ModelAndView modelview) {
+		modelview.setViewName("/portal/news/newsDetails");
+		return modelview;
+	}
+	
+	/**
+	 * 技术交易 
+	 */
+	@RequestMapping(value = "/portal/technologyTrading/index", method = RequestMethod.GET)
+	public ModelAndView portalTechnologyTradingIndex(HttpServletRequest request, ModelAndView modelview) {
+		modelview.setViewName("/portal/technologyTrading/index");
+		return modelview;
+	}
 
 	private ModelAndView userLogin(HttpServletRequest request, ModelAndView modelview, String next) {
 		String key = TokenManager.getUserId();

File diff suppressed because it is too large
+ 1 - 0
src/main/webapp/WEB-INF/views/portal/news/newsDetails.html


File diff suppressed because it is too large
+ 356 - 1
src/main/webapp/WEB-INF/views/portal/news/newsIndex.html


File diff suppressed because it is too large
+ 1 - 0
src/main/webapp/WEB-INF/views/portal/service/serviceIndex.html


File diff suppressed because it is too large
+ 1 - 0
src/main/webapp/WEB-INF/views/portal/technologyTrading/index.html