diff --git a/share-api/src/main/java/com/xjy/ai/api/controller/glcc/ApplyController.java b/share-api/src/main/java/com/xjy/ai/api/controller/glcc/ApplyController.java index 86f6a65..d647fbc 100644 --- a/share-api/src/main/java/com/xjy/ai/api/controller/glcc/ApplyController.java +++ b/share-api/src/main/java/com/xjy/ai/api/controller/glcc/ApplyController.java @@ -81,7 +81,22 @@ public class ApplyController { boolean success = applyService.update(updateVo); return success ? DataPacketUtil.ok("success") : DataPacketUtil.badRequest(); } + @ApiOperation("修改项目信息") + @PostMapping("/updateProject") + public ResponseEntity updateProject(HttpServletRequest request, @Validated @RequestBody GlccRegistrationInformation updateVo, BindingResult bindingResult) { + String errors = ValidatorUtils.buildValidationdErrorMessage(bindingResult); + if (errors.length() > 1) { + return DataPacketUtil.badRequest(errors); + } +// UserVo user = userService.getCurrentUser(request); +// GlccRegistrationInformation model = applyService.getById(updateVo.getId()); +// if (user.getUser_id() != null && model.getUserId() != null && !user.getUser_id().equals(model.getUserId().toString())) { +// return DataPacketUtil.forbidden("没有权限修改该记录"); +// } + boolean success = applyService.updateProject(updateVo); + return success ? DataPacketUtil.ok("success") : DataPacketUtil.badRequest(); + } @ApiOperation("更新报名排序") @PostMapping("/updateSort") @RequiresRoles(value = {Constants.SUPER_USER_ROLE}, logical = Logical.OR) @@ -148,7 +163,7 @@ public class ApplyController { @GuestAccess public ResponseEntity projectList(int curPage, int pageSize, String keyword,String taskName, @RequestParam(defaultValue = "1",required = false) Integer round) { - Page page = applyService.pageList(curPage, pageSize, keyword, round, taskName); + Page page = applyService.pageProjectList(curPage, pageSize, keyword, round); List voList = Optional.ofNullable(page.getRecords()).orElse(Collections.emptyList()).stream().map((item) -> { RegistrationInformationListVo vo = BeanCopyUtils.beanPropertiesCopy(item, RegistrationInformationListVo.class); //vo.setRegistrationTaskList(applyTaskService.getRegistrationTaskList(item.getId(), round)); diff --git a/share-model/src/main/java/com/xjy/ai/model/service/glcc/ApplyService.java b/share-model/src/main/java/com/xjy/ai/model/service/glcc/ApplyService.java index e7029c5..df3e2c1 100644 --- a/share-model/src/main/java/com/xjy/ai/model/service/glcc/ApplyService.java +++ b/share-model/src/main/java/com/xjy/ai/model/service/glcc/ApplyService.java @@ -14,6 +14,8 @@ public interface ApplyService extends IService { boolean update(RegistrationInformationUpdateVo updateVo); + boolean updateProject(GlccRegistrationInformation updateVo); + boolean updateSort(UpdateSortVo updateVo); boolean deleteById(Integer id); @@ -22,7 +24,7 @@ public interface ApplyService extends IService { Page pageList(int curPage, int pageSize, String keyword, Integer round, String taskName); -// Page pageProjectList(int curPage, int pageSize, String keyword, Integer round, String taskName); + Page pageProjectList(int curPage, int pageSize, String keyword, Integer round); boolean currentUserOwnGlccProjects(Integer userId, List ids); diff --git a/share-model/src/main/java/com/xjy/ai/model/service/glcc/Impl/ApplyServiceImpl.java b/share-model/src/main/java/com/xjy/ai/model/service/glcc/Impl/ApplyServiceImpl.java index d47e5a7..200a932 100644 --- a/share-model/src/main/java/com/xjy/ai/model/service/glcc/Impl/ApplyServiceImpl.java +++ b/share-model/src/main/java/com/xjy/ai/model/service/glcc/Impl/ApplyServiceImpl.java @@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.xjy.ai.common.utils.BeanCopyUtils; +import com.xjy.ai.common.utils.CommonUtils; import com.xjy.ai.model.dao.glcc.entity.GlccRegistrationInformation; import com.xjy.ai.model.dao.glcc.entity.GlccRegistrationTask; import com.xjy.ai.model.dao.glcc.mapper.GlccRegistrationInformationMapper; @@ -67,6 +68,14 @@ public class ApplyServiceImpl extends ServiceImpl 0; } + @Override + public boolean updateProject(GlccRegistrationInformation updateVo) { + GlccRegistrationInformation glccRegistrationInformation = BeanCopyUtils.beanPropertiesCopy(updateVo, GlccRegistrationInformation.class); + int flag = baseMapper.updateById(glccRegistrationInformation); + return flag > 0; + } + + @Override public boolean updateSort(UpdateSortVo updateVo) { UpdateWrapper updateWrapper = new UpdateWrapper<>(); @@ -109,27 +118,32 @@ public class ApplyServiceImpl extends ServiceImpl pageProjectList(int curPage, int pageSize, String keyword, Integer round, String taskName) { -// -// Page page = new Page<>(curPage,pageSize); -// QueryWrapper wrapper = new QueryWrapper<>(); -// if (keyword != null) { -// wrapper.lambda().eq(GlccRegistrationInformation::getRound, round).like(GlccRegistrationInformation::getProjectName, keyword).orderByDesc(GlccRegistrationInformation::getSortNo, GlccRegistrationInformation::getCreatedOn); -// } else { -// wrapper.lambda().eq(GlccRegistrationInformation::getRound, round).orderByDesc(GlccRegistrationInformation::getSortNo, GlccRegistrationInformation::getCreatedOn); -// } -// if (StringUtils.isNotBlank(taskName)) { -// List taskList = applyTaskService.getTaskListByName(taskName, round); -// if (CollectionUtils.isEmpty(taskList)) { -// return new Page<>(); -// } -// List regIds = taskList.stream().map(GlccRegistrationTask::getRegId).collect(Collectors.toList()); -// wrapper.lambda().in(GlccRegistrationInformation::getId, regIds); -// } -// Page result = page(page, wrapper); -// return result; -// } + @Override + public Page pageProjectList(int curPage, int pageSize, String keyword, Integer round) { + + Page page = new Page<>(curPage,pageSize); + QueryWrapper wrapper = new QueryWrapper<>(); + wrapper.lambda().eq(GlccRegistrationInformation::getRound, round); + + if (null != keyword && !"".equals(keyword)) { + List keywordList = CommonUtils.splitToList(keyword); + if (!keywordList.isEmpty()) { + wrapper.lambda().and(queryWrapper -> { + for (String item : keywordList) { + queryWrapper.or() + .like(GlccRegistrationInformation::getProjectName, item); + } + }); + } + } + + wrapper.lambda().orderByDesc(GlccRegistrationInformation::getSortNo, GlccRegistrationInformation::getCreatedOn); + + + + Page result = page(page, wrapper); + return result; + } @Override public boolean currentUserOwnGlccProjects(Integer userId, List ids) {