Browse Source

客户端--个人及组织科技成果详情

Antiloveg 8 years ago
parent
commit
2d4ca64072

+ 18 - 4
src/main/java/com/goafanti/achievement/controller/AchievementApiController.java

@@ -132,16 +132,30 @@ public class AchievementApiController extends CertifyApiController {
 	}
 	}
 
 
 	/**
 	/**
-	 * 详情
+	 * 个人成果详情详情
 	 */
 	 */
-	@RequestMapping(value = "/detail", method = RequestMethod.GET)
-	private Result detail(String id) {
+	@RequestMapping(value = "/userDetail", method = RequestMethod.GET)
+	private Result userDetail(String id) {
 		Result res = new Result();
 		Result res = new Result();
 		if (StringUtils.isBlank(id)) {
 		if (StringUtils.isBlank(id)) {
 			res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR, "找不到成果ID", "成果ID"));
 			res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR, "找不到成果ID", "成果ID"));
 			return res;
 			return res;
 		}
 		}
-		res.setData(achievementService.selectByPrimaryKey(id));
+		res.setData(achievementService.selectUserOwnerDetail(id));
+		return res;
+	}
+	
+	/**
+	 * 组织用户成果详情详情
+	 */
+	@RequestMapping(value = "/orgDetail", method = RequestMethod.GET)
+	private Result orgDetail(String id) {
+		Result res = new Result();
+		if (StringUtils.isBlank(id)) {
+			res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR, "找不到成果ID", "成果ID"));
+			return res;
+		}
+		res.setData(achievementService.selectOrgOwnerDetail(id));
 		return res;
 		return res;
 	}
 	}
 
 

+ 3 - 3
src/main/java/com/goafanti/achievement/service/impl/AchievementServiceImpl.java

@@ -144,8 +144,6 @@ public class AchievementServiceImpl extends BaseMybatisDao<AchievementMapper> im
 	public Pagination<AchievementListBo> listUserAchievement(Integer auditStatus, Integer serialNumber, String name,
 	public Pagination<AchievementListBo> listUserAchievement(Integer auditStatus, Integer serialNumber, String name,
 			String keyword, Integer category, Integer ownerType, Integer status, String releaseDateStartDate,
 			String keyword, Integer category, Integer ownerType, Integer status, String releaseDateStartDate,
 			String releaseDateEndDate, Integer releaseStatus, Integer pNo, Integer pSize) {
 			String releaseDateEndDate, Integer releaseStatus, Integer pNo, Integer pSize) {
-		Map<String, Object> params = disposeParams(TokenManager.getUserId(), auditStatus, serialNumber, name, keyword,
-				category, status, releaseDateStartDate, releaseDateEndDate, releaseStatus);
 		if (pNo == null || pNo < 0) {
 		if (pNo == null || pNo < 0) {
 			pNo = 1;
 			pNo = 1;
 		}
 		}
@@ -153,7 +151,9 @@ public class AchievementServiceImpl extends BaseMybatisDao<AchievementMapper> im
 		if (pSize == null || pSize < 0) {
 		if (pSize == null || pSize < 0) {
 			pSize = 10;
 			pSize = 10;
 		}
 		}
-		return (Pagination<AchievementListBo>) findPage("findAchievementListByPage", "findAchievementCount", params,
+		return (Pagination<AchievementListBo>) findPage("findAchievementListByPage",
+				"findAchievementCount", disposeParams(TokenManager.getUserId(), auditStatus, serialNumber, name,
+						keyword, category, status, releaseDateStartDate, releaseDateEndDate, releaseStatus),
 				pNo, pSize);
 				pNo, pSize);
 	}
 	}