From 8c8be02883e58d28727d3b510e5260474fc955ae Mon Sep 17 00:00:00 2001
From: zhuo <2089219845@qq.com>
Date: 星期一, 24 二月 2025 10:55:13 +0800
Subject: [PATCH] 人员沟通记录移植
---
cnas-personnel/src/main/java/com/ruoyi/personnel/controller/PersonPersonnelCapacityController.java | 186 +++++++++++++++++++++++-----------------------
1 files changed, 92 insertions(+), 94 deletions(-)
diff --git a/cnas-personnel/src/main/java/com/ruoyi/personnel/controller/PersonPersonnelCapacityController.java b/cnas-personnel/src/main/java/com/ruoyi/personnel/controller/PersonPersonnelCapacityController.java
index b98f1de..a066615 100644
--- a/cnas-personnel/src/main/java/com/ruoyi/personnel/controller/PersonPersonnelCapacityController.java
+++ b/cnas-personnel/src/main/java/com/ruoyi/personnel/controller/PersonPersonnelCapacityController.java
@@ -1,94 +1,92 @@
-//package com.ruoyi.personnel.controller;
-//
-//import com.baomidou.mybatisplus.core.metadata.IPage;
-//import com.baomidou.mybatisplus.core.toolkit.Wrappers;
-//import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-//import com.yuanchu.mom.annotation.ValueAuth;
-//import com.yuanchu.mom.common.GetLook;
-//import com.yuanchu.mom.dto.PersonPersonnelCapacityDto;
-//import com.yuanchu.mom.pojo.PersonPersonnelCapacity;
-//import com.yuanchu.mom.service.PersonPersonnelCapacityService;
-//import com.yuanchu.mom.vo.Result;
-//import io.swagger.annotations.Api;
-//import io.swagger.annotations.ApiOperation;
-//import org.springframework.beans.factory.annotation.Autowired;
-//import org.springframework.web.bind.annotation.*;
-//
-//import javax.servlet.http.HttpServletResponse;
-//import java.time.LocalDateTime;
-//
-///**
-// * <p>
-// * 浜哄憳鑳藉姏 鍓嶇鎺у埗鍣�
-// * </p>
-// *
-// * @author 鑺杞欢锛堟睙鑻忥級鏈夐檺鍏徃
-// * @since 2024-10-10 11:26:18
-// */
-//@Api(tags = "浜哄憳 - 浜哄憳鑳藉姏")
-//@RestController
-//@RequestMapping("/personPersonnelCapacity")
-//public class PersonPersonnelCapacityController {
-//
-// @Autowired
-// private PersonPersonnelCapacityService personPersonnelCapacityService;
-//
-//
-// @ApiOperation(value = "鏂板/鏇存柊 浜哄憳鑳藉姏")
-// @PostMapping("addOrUpdatePersonPersonnelCapacity")
-// public Result<?> addOrUpdatePersonPersonnelCapacity(@RequestBody PersonPersonnelCapacity personPersonnelCapacity) {
-// personPersonnelCapacityService.saveOrUpdate(personPersonnelCapacity);
-// return Result.success();
-// }
-//
-// @ApiOperation(value = "鍒犻櫎 浜哄憳鑳藉姏")
-// @DeleteMapping("deletePersonPersonnelCapacity")
-// public Result<?> deletePersonPersonnelCapacity(@RequestParam("id") Integer id) {
-// // 鍒犻櫎鏁版嵁
-// personPersonnelCapacityService.removeById(id);
-// return Result.success();
-// }
-//
-// @ApiOperation(value = "鏌ヨ 浜哄憳鑳藉姏")
-// @GetMapping("personPersonnelCapacityPage")
-// public Result<IPage<PersonPersonnelCapacityDto>> personPersonnelCapacityPage(Page page,
-// Integer departmentId,
-// Integer userId,
-// String userName) {
-// return Result.success(personPersonnelCapacityService.personPersonnelCapacityPage(page, departmentId, userId, userName));
-// }
-//
-// @ApiOperation(value = "纭 浜哄憳鑳藉姏")
-// @GetMapping("confirmPersonnelCapability")
-// public Result<?> confirmPersonnelCapability(@RequestParam("id") Integer id) {
-// Integer userId = getLook.selectPowerByMethodAndUserId(null).get("userId");
-// personPersonnelCapacityService.update(Wrappers.<PersonPersonnelCapacity>lambdaUpdate()
-// .eq(PersonPersonnelCapacity::getId, id)
-// .set(PersonPersonnelCapacity::getConfirmOperatingPersonnelId, userId)
-// .set(PersonPersonnelCapacity::getConfirmDate, LocalDateTime.now()));
-// return Result.success();
-// }
-//
-// /**
-// * 瀵煎嚭浜哄憳鑳藉姏
-// * @return
-// */
-// @ValueAuth
-// @ApiOperation(value = "瀵煎嚭浜哄憳鑳藉姏")
-// @GetMapping("/exportPersonnelCapacity")
-// public void exportPersonnelCapacity(Integer id, HttpServletResponse response){
-// personPersonnelCapacityService.exportPersonnelCapacity(id, response);
-// }
-//
-// /**
-// * 鎻愪氦纭浜哄憳鑳藉姏
-// * @param personPersonnelCapacity
-// * @return
-// */
-// @ApiOperation(value = "鎻愪氦")
-// @PostMapping("submitConfirmPersonnelCapability")
-// public Result<?> submitConfirmPersonnelCapability(@RequestBody PersonPersonnelCapacity personPersonnelCapacity) {
-// personPersonnelCapacityService.submitConfirmPersonnelCapability(personPersonnelCapacity);
-// return Result.success();
-// }
-//}
+package com.ruoyi.personnel.controller;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.ruoyi.common.core.domain.Result;
+import com.ruoyi.common.utils.SecurityUtils;
+import com.ruoyi.personnel.dto.PersonPersonnelCapacityDto;
+import com.ruoyi.personnel.pojo.PersonPersonnelCapacity;
+import com.ruoyi.personnel.service.PersonPersonnelCapacityService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletResponse;
+import java.time.LocalDateTime;
+
+/**
+ * <p>
+ * 浜哄憳鑳藉姏 鍓嶇鎺у埗鍣�
+ * </p>
+ *
+ * @author 鑺杞欢锛堟睙鑻忥級鏈夐檺鍏徃
+ * @since 2024-10-10 11:26:18
+ */
+@Api(tags = "浜哄憳 - 浜哄憳鑳藉姏")
+@RestController
+@RequestMapping("/personPersonnelCapacity")
+public class PersonPersonnelCapacityController {
+
+ @Autowired
+ private PersonPersonnelCapacityService personPersonnelCapacityService;
+
+
+ @ApiOperation(value = "鏂板/鏇存柊 浜哄憳鑳藉姏")
+ @PostMapping("addOrUpdatePersonPersonnelCapacity")
+ public Result<?> addOrUpdatePersonPersonnelCapacity(@RequestBody PersonPersonnelCapacity personPersonnelCapacity) {
+ personPersonnelCapacityService.saveOrUpdate(personPersonnelCapacity);
+ return Result.success();
+ }
+
+ @ApiOperation(value = "鍒犻櫎 浜哄憳鑳藉姏")
+ @DeleteMapping("deletePersonPersonnelCapacity")
+ public Result<?> deletePersonPersonnelCapacity(@RequestParam("id") Integer id) {
+ // 鍒犻櫎鏁版嵁
+ personPersonnelCapacityService.removeById(id);
+ return Result.success();
+ }
+
+ @ApiOperation(value = "鏌ヨ 浜哄憳鑳藉姏")
+ @GetMapping("personPersonnelCapacityPage")
+ public Result<IPage<PersonPersonnelCapacityDto>> personPersonnelCapacityPage(Page page,
+ Integer departmentId,
+ Integer userId,
+ String userName) {
+ return Result.success(personPersonnelCapacityService.personPersonnelCapacityPage(page, departmentId, userId, userName));
+ }
+
+ @ApiOperation(value = "纭 浜哄憳鑳藉姏")
+ @GetMapping("confirmPersonnelCapability")
+ public Result<?> confirmPersonnelCapability(@RequestParam("id") Integer id) {
+ Integer userId = SecurityUtils.getUserId().intValue();
+ personPersonnelCapacityService.update(Wrappers.<PersonPersonnelCapacity>lambdaUpdate()
+ .eq(PersonPersonnelCapacity::getId, id)
+ .set(PersonPersonnelCapacity::getConfirmOperatingPersonnelId, userId)
+ .set(PersonPersonnelCapacity::getConfirmDate, LocalDateTime.now()));
+ return Result.success();
+ }
+
+ /**
+ * 瀵煎嚭浜哄憳鑳藉姏
+ * @return
+ */
+ @ApiOperation(value = "瀵煎嚭浜哄憳鑳藉姏")
+ @GetMapping("/exportPersonnelCapacity")
+ public void exportPersonnelCapacity(Integer id, HttpServletResponse response){
+ personPersonnelCapacityService.exportPersonnelCapacity(id, response);
+ }
+
+ /**
+ * 鎻愪氦纭浜哄憳鑳藉姏
+ * @param personPersonnelCapacity
+ * @return
+ */
+ @ApiOperation(value = "鎻愪氦")
+ @PostMapping("submitConfirmPersonnelCapability")
+ public Result<?> submitConfirmPersonnelCapability(@RequestBody PersonPersonnelCapacity personPersonnelCapacity) {
+ personPersonnelCapacityService.submitConfirmPersonnelCapability(personPersonnelCapacity);
+ return Result.success();
+ }
+}
--
Gitblit v1.9.3