|
|
@@ -52,6 +52,165 @@ public class AdminAchievementApiController extends CertifyApiController {
|
|
|
private AftFileService aftFileService;
|
|
|
|
|
|
/**
|
|
|
+ * 个人成果列表
|
|
|
+ */
|
|
|
+ @RequestMapping(value = "/userList", method = RequestMethod.GET)
|
|
|
+ private Result userList(String ownerId, Integer auditStatus, Integer serialNumber, String name, String keyword,
|
|
|
+ Integer category, Integer status, String releaseDateStartDate, String releaseDateEndDate,
|
|
|
+ Integer releaseStatus, String pageNo, String pageSize) {
|
|
|
+ Result res = new Result();
|
|
|
+ Integer pNo = 1;
|
|
|
+ Integer pSize = 10;
|
|
|
+ if (StringUtils.isNumeric(pageSize)) {
|
|
|
+ pSize = Integer.parseInt(pageSize);
|
|
|
+ }
|
|
|
+ if (StringUtils.isNumeric(pageNo)) {
|
|
|
+ pNo = Integer.parseInt(pageNo);
|
|
|
+ }
|
|
|
+ res.setData(achievementService.listUserOwnerAchievement(ownerId, auditStatus, serialNumber, name, keyword,
|
|
|
+ category, status, releaseDateStartDate, releaseDateEndDate, releaseStatus, pNo, pSize));
|
|
|
+ return res;
|
|
|
+ }
|
|
|
+
|
|
|
+ /**
|
|
|
+ * 组织用户成果列表
|
|
|
+ */
|
|
|
+ @RequestMapping(value = "/orgList", method = RequestMethod.GET)
|
|
|
+ private Result orgList(String ownerId, Integer auditStatus, Integer serialNumber, String name, String keyword,
|
|
|
+ Integer category, Integer status, String releaseDateStartDate, String releaseDateEndDate,
|
|
|
+ Integer releaseStatus, String pageNo, String pageSize) {
|
|
|
+ Result res = new Result();
|
|
|
+ Integer pNo = 1;
|
|
|
+ Integer pSize = 10;
|
|
|
+ if (StringUtils.isNumeric(pageSize)) {
|
|
|
+ pSize = Integer.parseInt(pageSize);
|
|
|
+ }
|
|
|
+
|
|
|
+ if (StringUtils.isNumeric(pageNo)) {
|
|
|
+ pNo = Integer.parseInt(pageNo);
|
|
|
+ }
|
|
|
+ res.setData(achievementService.listOrgOwnerAchievement(ownerId, auditStatus, serialNumber, name, keyword,
|
|
|
+ category, status, releaseDateStartDate, releaseDateEndDate, releaseStatus, pNo, pSize));
|
|
|
+ return res;
|
|
|
+ }
|
|
|
+
|
|
|
+ /**
|
|
|
+ * 个人成果所有人列表
|
|
|
+ */
|
|
|
+ @RequestMapping(value = "/userOwner", method = RequestMethod.GET)
|
|
|
+ public Result getAchievementUserOwner(String name) {
|
|
|
+ Result res = new Result();
|
|
|
+ if (StringUtils.isBlank(name)) {
|
|
|
+ return res;
|
|
|
+ }
|
|
|
+ res.setData(userService.selectAchievementUserOwner(name));
|
|
|
+ return res;
|
|
|
+ }
|
|
|
+
|
|
|
+ /**
|
|
|
+ * 组织成果所有人列表
|
|
|
+ */
|
|
|
+ @RequestMapping(value = "/orgOwner", method = RequestMethod.GET)
|
|
|
+ public Result getAchievementOrgOwner(String name) {
|
|
|
+ Result res = new Result();
|
|
|
+ if (StringUtils.isBlank(name)) {
|
|
|
+ return res;
|
|
|
+ }
|
|
|
+ res.setData(userService.selectAchievementOrgOwner(name));
|
|
|
+ return res;
|
|
|
+ }
|
|
|
+
|
|
|
+ /**
|
|
|
+ * 个人成果详情详情
|
|
|
+ */
|
|
|
+ @RequestMapping(value = "/userDetail", method = RequestMethod.GET)
|
|
|
+ private Result userDetail(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.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;
|
|
|
+ }
|
|
|
+
|
|
|
+
|
|
|
+ /**
|
|
|
+ * 新增成果
|
|
|
+ */
|
|
|
+ @RequestMapping(value = "/apply", method = RequestMethod.POST)
|
|
|
+ private Result apply(@Valid InputAchievement ia, BindingResult bindingResult,
|
|
|
+ @RequestParam(name = "keywords[]", required = false) String[] keywords) {
|
|
|
+ Result res = new Result();
|
|
|
+
|
|
|
+ if (bindingResult.hasErrors()) {
|
|
|
+ res.getError().add(buildErrorByMsg(bindingResult.getFieldError().getDefaultMessage(),
|
|
|
+ AchievementFields.getFieldDesc(bindingResult.getFieldError().getField())));
|
|
|
+ return res;
|
|
|
+ }
|
|
|
+
|
|
|
+ res = disposeInputAchievement(res, ia, keywords);
|
|
|
+ if (!res.getError().isEmpty()) {
|
|
|
+ return res;
|
|
|
+ }
|
|
|
+
|
|
|
+ Achievement a = new Achievement();
|
|
|
+ BeanUtils.copyProperties(ia, a);
|
|
|
+ achievementService.saveAchievement(a, keywords);
|
|
|
+ return res;
|
|
|
+ }
|
|
|
+
|
|
|
+ /**
|
|
|
+ * 修改成果
|
|
|
+ */
|
|
|
+ @RequestMapping(value = "/update", method = RequestMethod.POST)
|
|
|
+ public Result update(@Valid InputAchievement ia, BindingResult bindingResult,
|
|
|
+ @RequestParam(name = "keywords[]", required = false) String[] keywords) {
|
|
|
+ Result res = new Result();
|
|
|
+ if (bindingResult.hasErrors()) {
|
|
|
+ res.getError().add(buildErrorByMsg(bindingResult.getFieldError().getDefaultMessage(),
|
|
|
+ AchievementFields.getFieldDesc(bindingResult.getFieldError().getField())));
|
|
|
+ return res;
|
|
|
+ }
|
|
|
+
|
|
|
+ if (StringUtils.isBlank(ia.getId())) {
|
|
|
+ res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR, "找不到成果ID", "成果ID"));
|
|
|
+ return res;
|
|
|
+ }
|
|
|
+
|
|
|
+ if (!AchievementAuditStatus.CREATE.getCode().equals(ia.getAuditStatus())
|
|
|
+ && !AchievementAuditStatus.SUBMIT.getCode().equals(ia.getAuditStatus())
|
|
|
+ && !AchievementAuditStatus.UNAUDITED.getCode().equals(ia.getAuditStatus())) {
|
|
|
+ res.getError().add(buildError(ErrorConstants.PARAM_ERROR, "", "当前状态无法提交审核!"));
|
|
|
+ return res;
|
|
|
+ }
|
|
|
+
|
|
|
+ res = disposeInputAchievement(res, ia, keywords);
|
|
|
+ if (!res.getError().isEmpty()) {
|
|
|
+ return res;
|
|
|
+ }
|
|
|
+
|
|
|
+ Achievement a = new Achievement();
|
|
|
+ BeanUtils.copyProperties(ia, a);
|
|
|
+ achievementService.updateAchievement(a, keywords);
|
|
|
+ return res;
|
|
|
+ }
|
|
|
+
|
|
|
+ /**
|
|
|
* 科技成果匹配科技需求
|
|
|
*/
|
|
|
@RequestMapping(value = "/matchDemand", method = RequestMethod.POST)
|
|
|
@@ -111,7 +270,7 @@ public class AdminAchievementApiController extends CertifyApiController {
|
|
|
}
|
|
|
|
|
|
/**
|
|
|
- * 上传技术需求批量导入Excel模板
|
|
|
+ * 上传技术成果批量导入Excel模板
|
|
|
*
|
|
|
* @param req
|
|
|
* @return
|
|
|
@@ -149,7 +308,7 @@ public class AdminAchievementApiController extends CertifyApiController {
|
|
|
}
|
|
|
|
|
|
/**
|
|
|
- * 下载技术需求批量导入Excel模板
|
|
|
+ * 下载技术成果批量导入Excel模板
|
|
|
*
|
|
|
* @param response
|
|
|
* @return
|
|
|
@@ -175,31 +334,7 @@ public class AdminAchievementApiController extends CertifyApiController {
|
|
|
return res;
|
|
|
}
|
|
|
|
|
|
- /**
|
|
|
- * 个人成果所有人列表
|
|
|
- */
|
|
|
- @RequestMapping(value = "/userOwner", method = RequestMethod.GET)
|
|
|
- public Result getAchievementUserOwner(String name) {
|
|
|
- Result res = new Result();
|
|
|
- if (StringUtils.isBlank(name)) {
|
|
|
- return res;
|
|
|
- }
|
|
|
- res.setData(userService.selectAchievementUserOwner(name));
|
|
|
- return res;
|
|
|
- }
|
|
|
-
|
|
|
- /**
|
|
|
- * 组织成果所有人列表
|
|
|
- */
|
|
|
- @RequestMapping(value = "/orgOwner", method = RequestMethod.GET)
|
|
|
- public Result getAchievementOrgOwner(String name) {
|
|
|
- Result res = new Result();
|
|
|
- if (StringUtils.isBlank(name)) {
|
|
|
- return res;
|
|
|
- }
|
|
|
- res.setData(userService.selectAchievementOrgOwner(name));
|
|
|
- return res;
|
|
|
- }
|
|
|
+
|
|
|
|
|
|
/**
|
|
|
* 成果撤消发布(下架)
|
|
|
@@ -306,138 +441,7 @@ public class AdminAchievementApiController extends CertifyApiController {
|
|
|
return res;
|
|
|
}
|
|
|
|
|
|
- /**
|
|
|
- * 个人成果详情详情
|
|
|
- */
|
|
|
- @RequestMapping(value = "/userDetail", method = RequestMethod.GET)
|
|
|
- private Result userDetail(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.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;
|
|
|
- }
|
|
|
-
|
|
|
- /**
|
|
|
- * 个人成果列表
|
|
|
- */
|
|
|
- @RequestMapping(value = "/userList", method = RequestMethod.GET)
|
|
|
- private Result userList(String ownerId, Integer auditStatus, Integer serialNumber, String name, String keyword,
|
|
|
- Integer category, Integer status, String releaseDateStartDate, String releaseDateEndDate,
|
|
|
- Integer releaseStatus, String pageNo, String pageSize) {
|
|
|
- Result res = new Result();
|
|
|
- Integer pNo = 1;
|
|
|
- Integer pSize = 10;
|
|
|
- if (StringUtils.isNumeric(pageSize)) {
|
|
|
- pSize = Integer.parseInt(pageSize);
|
|
|
- }
|
|
|
- if (StringUtils.isNumeric(pageNo)) {
|
|
|
- pNo = Integer.parseInt(pageNo);
|
|
|
- }
|
|
|
- res.setData(achievementService.listUserOwnerAchievement(ownerId, auditStatus, serialNumber, name, keyword,
|
|
|
- category, status, releaseDateStartDate, releaseDateEndDate, releaseStatus, pNo, pSize));
|
|
|
- return res;
|
|
|
- }
|
|
|
-
|
|
|
- /**
|
|
|
- * 组织用户成果列表
|
|
|
- */
|
|
|
- @RequestMapping(value = "/orgList", method = RequestMethod.GET)
|
|
|
- private Result orgList(String ownerId, Integer auditStatus, Integer serialNumber, String name, String keyword,
|
|
|
- Integer category, Integer status, String releaseDateStartDate, String releaseDateEndDate,
|
|
|
- Integer releaseStatus, String pageNo, String pageSize) {
|
|
|
- Result res = new Result();
|
|
|
- Integer pNo = 1;
|
|
|
- Integer pSize = 10;
|
|
|
- if (StringUtils.isNumeric(pageSize)) {
|
|
|
- pSize = Integer.parseInt(pageSize);
|
|
|
- }
|
|
|
-
|
|
|
- if (StringUtils.isNumeric(pageNo)) {
|
|
|
- pNo = Integer.parseInt(pageNo);
|
|
|
- }
|
|
|
- res.setData(achievementService.listOrgOwnerAchievement(ownerId, auditStatus, serialNumber, name, keyword,
|
|
|
- category, status, releaseDateStartDate, releaseDateEndDate, releaseStatus, pNo, pSize));
|
|
|
- return res;
|
|
|
- }
|
|
|
-
|
|
|
- /**
|
|
|
- * 新增成果
|
|
|
- */
|
|
|
- @RequestMapping(value = "/apply", method = RequestMethod.POST)
|
|
|
- private Result apply(@Valid InputAchievement ia, BindingResult bindingResult,
|
|
|
- @RequestParam(name = "keywords[]", required = false) String[] keywords) {
|
|
|
- Result res = new Result();
|
|
|
-
|
|
|
- if (bindingResult.hasErrors()) {
|
|
|
- res.getError().add(buildErrorByMsg(bindingResult.getFieldError().getDefaultMessage(),
|
|
|
- AchievementFields.getFieldDesc(bindingResult.getFieldError().getField())));
|
|
|
- return res;
|
|
|
- }
|
|
|
-
|
|
|
- res = disposeInputAchievement(res, ia, keywords);
|
|
|
- if (!res.getError().isEmpty()) {
|
|
|
- return res;
|
|
|
- }
|
|
|
-
|
|
|
- Achievement a = new Achievement();
|
|
|
- BeanUtils.copyProperties(ia, a);
|
|
|
- achievementService.saveAchievement(a, keywords);
|
|
|
- return res;
|
|
|
- }
|
|
|
-
|
|
|
- /**
|
|
|
- * 修改成果
|
|
|
- */
|
|
|
- @RequestMapping(value = "/update", method = RequestMethod.POST)
|
|
|
- public Result update(@Valid InputAchievement ia, BindingResult bindingResult,
|
|
|
- @RequestParam(name = "keywords[]", required = false) String[] keywords) {
|
|
|
- Result res = new Result();
|
|
|
- if (bindingResult.hasErrors()) {
|
|
|
- res.getError().add(buildErrorByMsg(bindingResult.getFieldError().getDefaultMessage(),
|
|
|
- AchievementFields.getFieldDesc(bindingResult.getFieldError().getField())));
|
|
|
- return res;
|
|
|
- }
|
|
|
-
|
|
|
- if (StringUtils.isBlank(ia.getId())) {
|
|
|
- res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR, "找不到成果ID", "成果ID"));
|
|
|
- return res;
|
|
|
- }
|
|
|
-
|
|
|
- if (!AchievementAuditStatus.CREATE.getCode().equals(ia.getAuditStatus())
|
|
|
- && !AchievementAuditStatus.SUBMIT.getCode().equals(ia.getAuditStatus())
|
|
|
- && !AchievementAuditStatus.UNAUDITED.getCode().equals(ia.getAuditStatus())) {
|
|
|
- res.getError().add(buildError(ErrorConstants.PARAM_ERROR, "", "当前状态无法提交审核!"));
|
|
|
- return res;
|
|
|
- }
|
|
|
-
|
|
|
- res = disposeInputAchievement(res, ia, keywords);
|
|
|
- if (!res.getError().isEmpty()) {
|
|
|
- return res;
|
|
|
- }
|
|
|
-
|
|
|
- Achievement a = new Achievement();
|
|
|
- BeanUtils.copyProperties(ia, a);
|
|
|
- achievementService.updateAchievement(a, keywords);
|
|
|
- return res;
|
|
|
- }
|
|
|
-
|
|
|
+
|
|
|
private Result disposeInputAchievement(Result res, InputAchievement ia, String[] keywords) {
|
|
|
if (StringUtils.isBlank(ia.getName())) {
|
|
|
res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR, "找不到成果名称", "成果名称"));
|