From f0afb2b17f2f6e13925ffe1b6fd8c8ae724aec0e Mon Sep 17 00:00:00 2001
From: chenrui <1187576398@qq.com>
Date: 星期四, 13 三月 2025 10:46:24 +0800
Subject: [PATCH] 分支合并冲突解决
---
cnas-personnel/src/main/java/com/ruoyi/personnel/controller/PersonTrainingController.java | 12 +++++-------
1 files changed, 5 insertions(+), 7 deletions(-)
diff --git a/cnas-personnel/src/main/java/com/ruoyi/personnel/controller/PersonTrainingController.java b/cnas-personnel/src/main/java/com/ruoyi/personnel/controller/PersonTrainingController.java
index f485096..77c1e1e 100644
--- a/cnas-personnel/src/main/java/com/ruoyi/personnel/controller/PersonTrainingController.java
+++ b/cnas-personnel/src/main/java/com/ruoyi/personnel/controller/PersonTrainingController.java
@@ -25,10 +25,7 @@
import javax.servlet.http.HttpServletResponse;
import java.text.SimpleDateFormat;
import java.time.LocalDateTime;
-import java.util.Date;
-import java.util.List;
-import java.util.Locale;
-import java.util.Objects;
+import java.util.*;
/**
* <p>
@@ -145,7 +142,7 @@
Integer departId,
Integer state) {
Integer planId = 0;
- if(id.equals("null") || StringUtils.isEmpty(id)) {
+ if(ObjectUtils.isNull(id) || StringUtils.isEmpty(id)) {
planId = null;
} else {
planId = Integer.parseInt(id);
@@ -185,8 +182,9 @@
@ApiOperation(value = "鍩硅涓庤�冩牳璁板綍 璁ら")
@PostMapping("claimOfTrainingAndAssessmentRecords")
- public Result<?> claimOfTrainingAndAssessmentRecords(@RequestParam("claimAndClaim") Boolean claimAndClaim,
- @RequestParam("courseId") Integer courseId) {
+ public Result<?> claimOfTrainingAndAssessmentRecords(@RequestBody Map<String,Object> map) {
+ Boolean claimAndClaim = (Boolean)map.get("claimAndClaim");
+ Integer courseId = (Integer)map.get("courseId");
personTrainingRecordService.claimOfTrainingAndAssessmentRecords(claimAndClaim, courseId);
return Result.success();
}
--
Gitblit v1.9.3