Procházet zdrojové kódy

科技需求页面

Antiloveg před 8 roky
rodič
revize
cd51a3afb9

+ 10 - 0
src/main/java/com/goafanti/admin/controller/AdminDemandApiController.java

@@ -0,0 +1,10 @@
+package com.goafanti.admin.controller;
+
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+@RestController
+@RequestMapping(value = "/api/admin/demand")
+public class AdminDemandApiController {
+
+}

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

@@ -80,6 +80,11 @@ public class WebpageController extends BaseController {
 		return "/admin/login";
 	}
 	
+	@RequestMapping(value = "/admin/demand", method = RequestMethod.GET)
+	public String adminDemand(HttpServletRequest request, ModelAndView modelview) {
+		return "/admin/demand";
+	}
+	
 	@RequestMapping(value = "/admin/set", method = RequestMethod.GET)
 	public String adminSet(HttpServletRequest request, ModelAndView modelview) {
 		return "/admin/set";

+ 48 - 0
src/main/java/com/goafanti/contract/controller/ContractApiController.java

@@ -1,20 +1,58 @@
 package com.goafanti.contract.controller;
 
 import javax.annotation.Resource;
+import javax.validation.Valid;
 
+import org.springframework.beans.BeanUtils;
+import org.springframework.validation.BindingResult;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RestController;
 
+import com.goafanti.cognizance.service.OrgCognizanceService;
 import com.goafanti.common.bo.Result;
+import com.goafanti.common.constant.ErrorConstants;
 import com.goafanti.common.controller.CertifyApiController;
+import com.goafanti.common.enums.ContractFields;
+import com.goafanti.common.model.Contract;
+import com.goafanti.common.model.User;
 import com.goafanti.common.utils.StringUtils;
+import com.goafanti.contract.bo.InputSaveContract;
 import com.goafanti.contract.service.ContractService;
+import com.goafanti.core.shiro.token.TokenManager;
 @RestController
 @RequestMapping(value = "/api/user/contract")
 public class ContractApiController extends CertifyApiController{
 	@Resource
 	private ContractService contractService;
+	@Resource
+	private OrgCognizanceService orgCognizanceService;
+	
+	/**
+	 * 提交申请新合同
+	 */
+	@RequestMapping(value = "/apply", method = RequestMethod.POST)
+	public Result apply(@Valid InputSaveContract contract, BindingResult bindingResult){
+		Result res = new Result();
+		if (bindingResult.hasErrors()) {
+			res.getError().add(buildErrorByMsg(bindingResult.getFieldError().getDefaultMessage(),
+					ContractFields.getFieldDesc(bindingResult.getFieldError().getField())));
+			return res;
+		}
+		User curUser = TokenManager.getUserToken();
+		if (!checkCertify(res, curUser)) {
+			return res;
+		}
+		if (null != contract.getCognizanceYear() && !contract.getCognizanceYear().equals(0)) {
+			if (!disposeCog(contract.getCognizanceYear(), contract.getUid(), res).getError().isEmpty()) {
+				return res;
+			}
+		}
+		
+		Contract c = new Contract();
+		BeanUtils.copyProperties(contract, c);
+		return res;
+	}
 	
 	/**
 	 * 合同列表
@@ -35,4 +73,14 @@ public class ContractApiController extends CertifyApiController{
 				endDateFormattedDate, pNo, pSize));
 		return res;
 	}
+	
+	private Result disposeCog(Integer year, String uid, Result res) {
+		Integer latelyYear = orgCognizanceService.selectLatelyRecordYear(uid);
+		if (null != latelyYear && year - latelyYear < 4) {
+			res.getError()
+					.add(buildError(ErrorConstants.STATUS_ERROR, "高企认定申请中或认定未到期!无法提交新申请!", "高企认定申请中或认定未到期!无法提交新申请!"));
+			return res;
+		}
+		return res;
+	}
 }

+ 0 - 3
src/main/java/com/goafanti/techproject/controller/TechProjectApiController.java

@@ -91,9 +91,6 @@ public class TechProjectApiController extends CertifyApiController {
 					CopyrightFields.getFieldDesc(bindingResult.getFieldError().getField())));
 			return res;
 		}
-		if (!checkUserLogin(res)) {
-			return res;
-		}
 		User curUser = TokenManager.getUserToken();
 		if (!checkCertify(res, curUser)) {
 			return res;

+ 11 - 0
src/main/webapp/WEB-INF/views/admin/demand.jsp

@@ -0,0 +1,11 @@
+<%@ page contentType="text/html;charset=UTF-8" language="java"%>
+<%@ taglib prefix="c" uri="http://java.sun.com/jstl/core_rt"%>
+<%@ include file="../header.jsp"%>
+<title>科技需求页面</title>
+<link href="${staticHost}/admin/demand.css" rel="stylesheet">
+</head>
+<body>
+	<div id="root"></div>
+	<script type="text/javascript" src="${staticHost}/admin/demand.js"></script>
+</body>
+</html>