From 34981c30a78e8bbd7791131059a9210f9928b62c Mon Sep 17 00:00:00 2001
From: 刘光辉 <347230014@qq.com>
Date: 星期四, 17 九月 2026 09:24:09 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master' into master
---
jnpf-lims/jnpf-lims-controller/src/main/java/jnpf/controller/WorkLogController.java | 163 ++++++++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 163 insertions(+), 0 deletions(-)
diff --git a/jnpf-lims/jnpf-lims-controller/src/main/java/jnpf/controller/WorkLogController.java b/jnpf-lims/jnpf-lims-controller/src/main/java/jnpf/controller/WorkLogController.java
new file mode 100644
index 0000000..c978117
--- /dev/null
+++ b/jnpf-lims/jnpf-lims-controller/src/main/java/jnpf/controller/WorkLogController.java
@@ -0,0 +1,163 @@
+package jnpf.controller;
+
+import cn.dev33.satoken.annotation.SaCheckPermission;
+import io.swagger.v3.oas.annotations.Parameter;
+import jnpf.base.controller.SuperController;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import io.swagger.v3.oas.annotations.Operation;
+import jnpf.base.vo.PageListVO;
+import jnpf.constant.MsgCode;
+import jnpf.exception.DataException;
+import jnpf.permission.entity.UserEntity;
+import jnpf.service.WorkLogService;
+import jnpf.entity.WorkLogEntity;
+import jnpf.model.worklog.WorkLogCrForm;
+import jnpf.model.worklog.WorkLogInfoVO;
+import jnpf.model.worklog.WorkLogListVO;
+import jnpf.model.worklog.WorkLogUpForm;
+import jnpf.util.JsonUtil;
+import jnpf.base.ActionResult;
+import jnpf.base.Pagination;
+import jnpf.base.vo.PaginationVO;
+import jnpf.permission.UserApi;
+import jnpf.util.JsonUtilEx;
+import lombok.RequiredArgsConstructor;
+import org.springframework.web.bind.annotation.*;
+
+import jakarta.validation.Valid;
+import java.util.Arrays;
+import java.util.List;
+import java.util.StringJoiner;
+
+/**
+ * 宸ヤ綔鏃ュ織
+ *
+ * @author JNPF寮�鍙戝钩鍙扮粍
+ * @version V3.1.0
+ * @copyright 寮曡繄淇℃伅鎶�鏈湁闄愬叕鍙革紙https://www.jnpfsoft.com锛�
+ * @date 2019骞�9鏈�26鏃� 涓婂崍9:18
+ */
+@Tag(name = "app宸ヤ綔鏃ュ織", description = "WorkLog")
+@RestController
+@RequestMapping("/WorkLog")
+@RequiredArgsConstructor
+public class WorkLogController extends SuperController<WorkLogService, WorkLogEntity> {
+
+
+ private final WorkLogService workLogService;
+
+ private final UserApi usersApi;
+
+ /**
+ * 鍒楄〃(鎴戝彂鍑虹殑)
+ *
+ * @param pageModel 鍒嗛〉妯″瀷
+ * @return
+ */
+ @Operation(summary = "鍒楄〃")
+ @GetMapping("/Send")
+ @SaCheckPermission("reportinglog")
+ public ActionResult<PageListVO<WorkLogListVO>> getSendList(Pagination pageModel) {
+ List<WorkLogEntity> data = workLogService.getSendList(pageModel);
+ List<WorkLogListVO> list = JsonUtil.getJsonToList(data, WorkLogListVO.class);
+ PaginationVO paginationVO = JsonUtil.getJsonToBean(pageModel, PaginationVO.class);
+ return ActionResult.page(list, paginationVO);
+ }
+
+ /**
+ * 鍒楄〃(鎴戞敹鍒扮殑)
+ *
+ * @param pageModel 鍒嗛〉妯″瀷
+ * @return
+ */
+ @GetMapping("/Receive")
+ @SaCheckPermission("reportinglog")
+ public ActionResult<PageListVO<WorkLogListVO>> getReceiveList(Pagination pageModel) {
+ List<WorkLogEntity> data = workLogService.getReceiveList(pageModel);
+ List<WorkLogListVO> list = JsonUtil.getJsonToList(data, WorkLogListVO.class);
+ PaginationVO paginationVO = JsonUtil.getJsonToBean(pageModel, PaginationVO.class);
+ return ActionResult.page(list, paginationVO);
+ }
+
+ /**
+ * 淇℃伅
+ *
+ * @param id 涓婚敭
+ * @return
+ */
+ @GetMapping("/{id}")
+ @Parameter(name = "id", description = "涓婚敭", required = true)
+ @SaCheckPermission("reportinglog")
+ public ActionResult<WorkLogInfoVO> info(@PathVariable("id") String id) throws DataException {
+ WorkLogEntity entity = workLogService.getInfo(id);
+ StringJoiner userName = new StringJoiner(",");
+ StringJoiner userIds = new StringJoiner(",");
+ List<String> userId = Arrays.asList(entity.getToUserId().split(","));
+ List<UserEntity> userList = usersApi.getUserName(userId);
+ for (UserEntity user : userList) {
+ userIds.add(user.getId());
+ userName.add(user.getRealName() + "/" + user.getAccount());
+ }
+ entity.setToUserId(userName.toString());
+ WorkLogInfoVO vo = JsonUtilEx.getJsonToBeanEx(entity, WorkLogInfoVO.class);
+ vo.setUserIds(userIds.toString());
+ return ActionResult.success(vo);
+ }
+
+ /**
+ * 鏂板缓
+ *
+ * @param workLogCrForm 鏃ュ織妯″瀷
+ * @return
+ */
+ @Operation(summary = "鏂板缓")
+ @PostMapping
+ @Parameter(name = "workLogCrForm", description = "鏃ュ織妯″瀷",required = true)
+ @SaCheckPermission("reportinglog")
+ public ActionResult<Object> create(@RequestBody @Valid WorkLogCrForm workLogCrForm) {
+ WorkLogEntity entity = JsonUtil.getJsonToBean(workLogCrForm, WorkLogEntity.class);
+ workLogService.create(entity);
+ return ActionResult.success(MsgCode.SU001.get());
+ }
+
+ /**
+ * 鏇存柊
+ *
+ * @param id 涓婚敭
+ * @param workLogUpForm 鏃ュ織妯″瀷
+ * @return
+ */
+ @Operation(summary = "鏇存柊")
+ @PutMapping("/{id}")
+ @Parameter(name = "workLogUpForm", description = "鏃ュ織妯″瀷",required = true)
+ @Parameter(name = "id", description = "涓婚敭", required = true)
+ @SaCheckPermission("reportinglog")
+ public ActionResult<Object> update(@PathVariable("id") String id, @RequestBody @Valid WorkLogUpForm workLogUpForm) {
+ WorkLogEntity entity = JsonUtil.getJsonToBean(workLogUpForm, WorkLogEntity.class);
+ boolean flag = workLogService.update(id, entity);
+ if (!flag) {
+ return ActionResult.fail(MsgCode.FA002.get());
+ }
+ return ActionResult.success(MsgCode.SU004.get());
+ }
+
+ /**
+ * 鍒犻櫎
+ *
+ * @param id 涓婚敭
+ * @return
+ */
+ @Operation(summary = "鍒犻櫎")
+ @DeleteMapping("/{id}")
+ @Parameter(name = "id", description = "涓婚敭", required = true)
+ @SaCheckPermission("reportinglog")
+ public ActionResult<Object> delete(@PathVariable("id") String id) {
+ WorkLogEntity entity = workLogService.getInfo(id);
+ if (entity != null) {
+ workLogService.delete(entity);
+ return ActionResult.success(MsgCode.SU003.get());
+ }
+ return ActionResult.fail(MsgCode.FA003.get());
+ }
+}
+
--
Gitblit v1.8.0