Merge remote-tracking branch 'origin/binlog' into binlog

linwe

2024-09-03 764d883b5ea3bdc06abbec548b6df0511e567978

 src/main/java/org/springblade/modules/task/controller/TaskSchoolEvenController.java

@@ -23,10 +23,15 @@
import lombok.AllArgsConstructor;
import javax.validation.Valid;

import org.springblade.core.log.annotation.ApiLog;
import org.springblade.core.log.logger.BladeLogger;
import org.springblade.core.mp.support.Condition;
import org.springblade.core.mp.support.Query;
import org.springblade.core.secure.utils.AuthUtil;
import org.springblade.core.tool.api.R;
import org.springblade.core.tool.jackson.JsonUtil;
import org.springblade.core.tool.utils.Func;
import org.springblade.modules.task.entity.TaskResidencePermitApplyEntity;
import org.springblade.modules.task.service.ITaskSchoolEvenService;
import org.springblade.modules.task.vo.TaskSchoolEvenVO;
import org.springblade.modules.task.wrapper.TaskSchoolEvenWrapper;
@@ -47,6 +52,7 @@
@Api(value = "校园事件", tags = "校园事件接口")
public class TaskSchoolEvenController extends BladeController {

   private final BladeLogger bladeLogger;
   private final ITaskSchoolEvenService taskSchoolEvenService;

   /**
@@ -55,9 +61,9 @@
   @GetMapping("/detail")
   @ApiOperationSupport(order = 1)
   @ApiOperation(value = "详情", notes = "传入taskSchoolEven")
   public R<TaskSchoolEvenVO> detail(TaskSchoolEvenEntity taskSchoolEven) {
      TaskSchoolEvenEntity detail = taskSchoolEvenService.getOne(Condition.getQueryWrapper(taskSchoolEven));
      return R.data(TaskSchoolEvenWrapper.build().entityVO(detail));
   public R<TaskSchoolEvenVO> detail(TaskSchoolEvenVO taskSchoolEven) {
      TaskSchoolEvenVO detail = taskSchoolEvenService.selectTaskSchoolEvenDetail(taskSchoolEven);
      return R.data(detail);
   }
   /**
    * 校园事件 分页
@@ -88,6 +94,7 @@
   @ApiOperationSupport(order = 4)
   @ApiOperation(value = "新增", notes = "传入taskSchoolEven")
   public R save(@Valid @RequestBody TaskSchoolEvenEntity taskSchoolEven) {
      taskSchoolEven.setCreateUser(AuthUtil.getUserId());
      return R.status(taskSchoolEvenService.save(taskSchoolEven));
   }

@@ -121,5 +128,17 @@
      return R.status(taskSchoolEvenService.removeBatchByIds(Func.toLongList(ids)));
   }

   /**
    * 校园事件 审核
    */
   @PostMapping("/auditing")
   @ApiOperationSupport(order = 5)
   @ApiLog("校园事件 审核")
   @ApiOperation(value = "审核", notes = "传入taskResidencePermitApply")
   public R updateSchoolEven(@Valid @RequestBody TaskSchoolEvenVO taskSchoolEvenVO) {
      bladeLogger.info("校园事件 审核", JsonUtil.toJson(taskSchoolEvenVO));
      return R.status(taskSchoolEvenService.updateSchoolEven(taskSchoolEvenVO));
   }


}