分支合并冲突解决

chenrui

2025-03-13 f0afb2b17f2f6e13925ffe1b6fd8c8ae724aec0e

 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();
    }