瀏覽代碼

科技成果必填项增加后台限制,用户个人后台,用户创建的个人需求的审核状态未显示BUG修复

anderx 8 年之前
父節點
當前提交
736094ae6d

+ 30 - 0
src/main/java/com/goafanti/achievement/controller/AdminAchievementApiController.java

@@ -525,6 +525,36 @@ public class AdminAchievementApiController extends CertifyApiController {
             res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR, "找不到合作方式", "合作方式"));
             return res;
         }
+        if (null == ia.getMaturity()) {
+            res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR, "找不到成熟度", "成熟度"));
+            return res;
+        }
+        if (null == ia.getInnovation()) {
+            res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR, "找不到创新度", "创新度"));
+            return res;
+        }
+        if (null == ia.getBargainingMode()) {
+            res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR, "找不到议价方式", "议价方式"));
+            return res;
+        }
+        if (null == ia.getOwnerName()) {
+            res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR, "找不到成果所有人", "成果所有人"));
+            return res;
+        }
+        if (null == ia.getBreakthrough()) {
+            res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR, "找不到技术突破", "技术突破"));
+            return res;
+        }
+        if (null == ia.getPatentCase()) {
+            res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR, "找不到专利情况", "专利情况"));
+            return res;
+        }if (null == ia.getParameter()) {
+            res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR, "找不到技术参数", "技术参数"));
+            return res;
+        }if (null == ia.getTechnicalPictureUrl()) {
+            res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR, "找不到上传图片", "上传图片"));
+            return res;
+        }
         for (int i = 0; i < keywords.length; i++) {
             if (AFTConstants.KEYWORDLENTH < keywords[i].length()) {
                 res.getError().add(buildError(ErrorConstants.PARAM_ERROR, "", "关键词长度"));

+ 1 - 0
src/main/java/com/goafanti/achievement/service/impl/AchievementInterestServiceImpl.java

@@ -95,6 +95,7 @@ public class AchievementInterestServiceImpl extends BaseMybatisDao<AchievementIn
 	@Override
 	public String saveInterest(String uid,Integer type,String objectId,String interest) {
 		int i=0; 
+		
 		if (type==InterestType.POLICY.getCode()) {
 			NewsInterest n=new NewsInterest();
 			n.setId(UUID.randomUUID().toString());

+ 0 - 1
src/main/java/com/goafanti/app/controller/OpenAppServiceController.java

@@ -61,7 +61,6 @@ public class OpenAppServiceController extends BaseApiController {
 			return res;
 		}
 		res.setData(businessProjectService.getBusinessProject(id,pNo, pSize));
-		//res.setData(new Pagination<ProjectBo>());
 		return res;
 	}
 	/**

+ 3 - 1
src/main/java/com/goafanti/business/service/impl/BusinessProjectServiceImpl.java

@@ -151,7 +151,9 @@ public class BusinessProjectServiceImpl extends BaseMybatisDao<BusinessProjectMa
 	@Override
 	public ProjectDetailBo orgProject(String id) {
 		ProjectDetailBo pd=businessProjectMapper.selectAppProjectDetail(id);
-		if (TokenManager.isLogin()&&projectInterestMapper.checkUidAndDid(id,TokenManager.getUserId())>0) {
+		int i=projectInterestMapper.checkUidAndDid(id,TokenManager.getUserId());
+		
+		if (TokenManager.isLogin()&&i>0) {
 			pd.setInterest("1");
 		}else {
 			pd.setInterest("0");