feat: 员工负责项目和面试评价创建、查询、获取详情、编辑、移除

bound-link-api/blink-backend/src/main/java/com/wx/blink/backend/controller/BlinkChargeProjectController.java

@@ -1,52 +0,0 @@
-package com.wx.blink.backend.controller;
-
-import com.wx.blink.backend.domain.dto.BlinkChargeProjectDTO;
-import com.wx.blink.backend.domain.qry.BlinkChargeProjectQry;
-import com.wx.blink.backend.service.IBlinkChargeProjectService;
-import com.wx.blink.base.common.domain.PageResult;
-import com.wx.blink.base.common.domain.ResponseDTO;
-import io.swagger.v3.oas.annotations.Operation;
-import io.swagger.v3.oas.annotations.tags.Tag;
-import org.springframework.web.bind.annotation.*;
-
-import javax.annotation.Resource;
-import javax.validation.Valid;
-
-@RestController
-@Tag(name = "员工管理")
-public class BlinkChargeProjectController {
-
-    @Resource
-    private IBlinkChargeProjectService chargeProjectService;
-
-    @Operation(summary = "新增负责项目")
-    @PostMapping("/supports/charge/project/create")
-    public ResponseDTO<String> supportsChargeProjectCreate(@RequestBody @Valid BlinkChargeProjectDTO dto) {
-        return chargeProjectService.supportsChargeProjectCreate(dto);
-    }
-
-    @Operation(summary = "分页查询负责项目列表")
-    @PostMapping("/supports/charge/project/queryPage")
-    public ResponseDTO<PageResult<BlinkChargeProjectDTO>> supportsChargeProjectQueryPage(@RequestBody @Valid BlinkChargeProjectQry qry) {
-        return chargeProjectService.supportsChargeProjectQueryPage(qry);
-    }
-
-    @Operation(summary = "获取负责项目信息")
-    @GetMapping("/supports/charge/project/{id}")
-    public ResponseDTO<BlinkChargeProjectDTO> supportsChargeProjectQuery(@PathVariable("id") Long id) {
-        return chargeProjectService.supportsChargeProjectQuery(id);
-    }
-
-    @Operation(summary = "编辑更新负责项目")
-    @PostMapping("/supports/charge/project/update")
-    public ResponseDTO<String> supportsChargeProjectUpdate(@RequestBody @Valid BlinkChargeProjectDTO dto) {
-        return chargeProjectService.supportsChargeProjectUpdate(dto);
-    }
-
-    @Operation(summary = "删除负责项目")
-    @GetMapping("/supports/charge/project/delete/{id}")
-    public ResponseDTO<String> supportsChargeProjectDeleteById(@PathVariable("id") Long id) {
-        return chargeProjectService.supportsChargeProjectDeleteById(id);
-    }
-
-}

bound-link-api/blink-backend/src/main/java/com/wx/blink/backend/controller/BlinkEmployeeOnboardingController.java

@@ -20,8 +20,15 @@ public class BlinkEmployeeOnboardingController {
     @Resource
     private IBlinkEmployeeOnboardingService employeeOnboardingService;
 
-    @Operation(summary = "新增员工")
+    @Operation(summary = "新增员工-web端")
+    @PostMapping("/supports/employee/onboarding/createWeb")
+    public ResponseDTO<String> supportsEmployeeOnboardingCreateWeb(@RequestBody @Valid BlinkEmployeeOnboardingDTO dto) {
+        return employeeOnboardingService.supportsEmployeeOnboardingCreateWeb(dto);
+    }
+
+    @Operation(summary = "新增员工-移动端")
     @PostMapping("/supports/employee/onboarding/create")
+    @NoNeedLogin
     public ResponseDTO<String> supportsEmployeeOnboardingCreate(@RequestBody @Valid BlinkEmployeeOnboardingDTO dto) {
         return employeeOnboardingService.supportsEmployeeOnboardingCreate(dto);
     }
@@ -34,6 +41,7 @@ public class BlinkEmployeeOnboardingController {
 
     @Operation(summary = "获取入职员工信息")
     @GetMapping("/supports/employee/onboarding/query/{id}")
+    @NoNeedLogin
     public ResponseDTO<BlinkEmployeeOnboardingDTO> supportsEmployeeOnboardingQuery(@PathVariable("id") Long id) {
         return employeeOnboardingService.supportsEmployeeOnboardingQuery(id);
     }

bound-link-api/blink-backend/src/main/java/com/wx/blink/backend/controller/BlinkInterviewEvaluationController.java

@@ -1,48 +0,0 @@
-package com.wx.blink.backend.controller;
-
-import com.wx.blink.backend.domain.dto.BlinkEmployeeOnboardingDTO;
-import com.wx.blink.backend.domain.dto.BlinkInterviewEvaluationDTO;
-import com.wx.blink.backend.domain.qry.BlinkInterviewEvaluationQry;
-import com.wx.blink.backend.service.IBlinkInterviewEvaluationService;
-import com.wx.blink.base.common.annoation.NoNeedLogin;
-import com.wx.blink.base.common.domain.PageResult;
-import com.wx.blink.base.common.domain.ResponseDTO;
-import io.swagger.v3.oas.annotations.Operation;
-import io.swagger.v3.oas.annotations.tags.Tag;
-import org.springframework.web.bind.annotation.*;
-
-import javax.annotation.Resource;
-import javax.validation.Valid;
-
-@RestController
-@Tag(name = "员工管理")
-public class BlinkInterviewEvaluationController {
-
-    @Resource
-    private IBlinkInterviewEvaluationService evaluationService;
-
-    @Operation(summary = "新增面试评价")
-    @PostMapping("/supports/interview/evaluation/create")
-    public ResponseDTO<String> supportsInterviewEvaluationCreate(@RequestBody @Valid BlinkInterviewEvaluationDTO dto) {
-        return evaluationService.supportsInterviewEvaluationCreate(dto);
-    }
-
-    @Operation(summary = "分页查询面试评价列表")
-    @PostMapping("/supports/interview/evaluation/queryPage")
-    public ResponseDTO<PageResult<BlinkInterviewEvaluationDTO>> supportsInterviewEvaluationQueryPage(@RequestBody @Valid BlinkInterviewEvaluationQry qry) {
-        return evaluationService.supportsInterviewEvaluationQueryPage(qry);
-    }
-
-    @Operation(summary = "获取面试评价信息")
-    @GetMapping("/supports/interview/evaluation/query/{id}")
-    public ResponseDTO<BlinkInterviewEvaluationDTO> supportsInterviewEvaluationQuery(@PathVariable("id") Long id) {
-        return evaluationService.supportsInterviewEvaluationQuery(id);
-    }
-
-    @Operation(summary = "删除活动附件")
-    @GetMapping("/supports/interview/evaluation/delete/{id}")
-    public ResponseDTO<String> supportsInterviewEvaluationDeleteById(@PathVariable("id") Long id) {
-        return evaluationService.supportsInterviewEvaluationDeleteById(id);
-    }
-
-}

bound-link-api/blink-backend/src/main/java/com/wx/blink/backend/controller/EmployeeFileController.java

@@ -0,0 +1,34 @@
+package com.wx.blink.backend.controller;
+
+import com.wx.blink.base.common.annoation.NoNeedLogin;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import io.swagger.v3.oas.annotations.Operation;
+import com.wx.blink.base.common.controller.SupportBaseController;
+import com.wx.blink.base.common.domain.RequestUser;
+import com.wx.blink.base.common.domain.ResponseDTO;
+import com.wx.blink.base.common.util.BlinkRequestUtil;
+import com.wx.blink.base.constant.SwaggerTagConst;
+import com.wx.blink.base.module.support.file.domain.vo.FileUploadVO;
+import com.wx.blink.base.module.support.file.service.FileService;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
+
+import javax.annotation.Resource;
+
+@RestController
+@Tag(name = SwaggerTagConst.Support.FILE)
+public class EmployeeFileController extends SupportBaseController {
+
+    @Resource
+    private FileService fileService;
+
+
+    @Operation(summary = "文件上传 @author admin")
+    @PostMapping("/employee/file/upload")
+    @NoNeedLogin
+    public ResponseDTO<FileUploadVO> upload(@RequestParam MultipartFile file, @RequestParam Integer folder) {
+        RequestUser requestUser = BlinkRequestUtil.getRequestUser();
+        return fileService.fileUpload(file, folder, requestUser);
+    }
+
+}

bound-link-api/blink-backend/src/main/java/com/wx/blink/backend/domain/dataobject/BlinkChargeProjectDO.java

@@ -41,4 +41,9 @@ public class BlinkChargeProjectDO extends BaseEntity {
      */
     private String projectEndTime;
 
+    /**
+     * 创建时间
+     */
+    private String projectCreateTime;
+
 }

bound-link-api/blink-backend/src/main/java/com/wx/blink/backend/domain/dto/BlinkChargeProjectDTO.java

@@ -1,11 +1,10 @@
 package com.wx.blink.backend.domain.dto;
 
-import com.wx.blink.base.common.domain.BaseEntity;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 
 @Data
-public class BlinkChargeProjectDTO extends BaseEntity {
+public class BlinkChargeProjectDTO{
 
     /**
      * id
@@ -41,4 +40,10 @@ public class BlinkChargeProjectDTO extends BaseEntity {
     @Schema(description = "项目结束时间")
     private String projectEndTime;
 
+    /**
+     * 创建时间
+     */
+    @Schema(description = "创建时间")
+    private String projectCreateTime;
+
 }

bound-link-api/blink-backend/src/main/java/com/wx/blink/backend/domain/dto/BlinkEmployeeOnboardingDTO.java

@@ -3,7 +3,6 @@ package com.wx.blink.backend.domain.dto;
 import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.wx.blink.base.common.annoation.DataAdaptorMapping;
-import com.wx.blink.base.common.domain.BaseEntity;
 import com.wx.blink.base.common.json.deserializer.DictValueVoDeserializer;
 import com.wx.blink.base.common.json.deserializer.FileKeyVoDeserializer;
 import com.wx.blink.base.common.json.serializer.FileKeyVoSerializer;
@@ -14,7 +13,7 @@ import java.util.ArrayList;
 import java.util.List;
 
 @Data
-public class BlinkEmployeeOnboardingDTO extends BaseEntity {
+public class BlinkEmployeeOnboardingDTO{
 
     /**
      * id

bound-link-api/blink-backend/src/main/java/com/wx/blink/backend/domain/dto/BlinkInterviewEvaluationDTO.java

@@ -1,13 +1,10 @@
 package com.wx.blink.backend.domain.dto;
 
-import com.wx.blink.base.common.domain.BaseEntity;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 
-import java.math.BigDecimal;
-
 @Data
-public class BlinkInterviewEvaluationDTO extends BaseEntity {
+public class BlinkInterviewEvaluationDTO{
 
     /**
      * id
@@ -47,7 +44,6 @@ public class BlinkInterviewEvaluationDTO extends BaseEntity {
      * 薪资
      */
     @Schema(description = "薪资")
-    private BigDecimal salaries;
     private String salary;
 
     /**

bound-link-api/blink-backend/src/main/java/com/wx/blink/backend/manager/BlinkChargeProjectServiceImpl.java

@@ -1,21 +1,15 @@
 package com.wx.blink.backend.manager;
 
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.wx.blink.backend.domain.dataobject.BlinkChargeProjectDO;
 import com.wx.blink.backend.domain.dto.BlinkChargeProjectDTO;
-import com.wx.blink.backend.domain.qry.BlinkChargeProjectQry;
 import com.wx.blink.backend.objectmapper.BlinkChargeProjectMapper;
 import com.wx.blink.backend.repository.BlinkChargeProjectRepository;
 import com.wx.blink.backend.service.IBlinkChargeProjectService;
-import com.wx.blink.base.common.domain.PageResult;
 import com.wx.blink.base.common.domain.ResponseDTO;
 import com.wx.blink.base.common.util.BlinkEntityUtil;
-import com.wx.blink.base.common.util.BlinkPageUtil;
 import org.springframework.stereotype.Service;
-
 import javax.annotation.Resource;
-import java.util.List;
 import java.util.Objects;
 
 @Service
@@ -35,7 +29,7 @@ public class BlinkChargeProjectServiceImpl extends ServiceImpl<BlinkChargeProjec
     @Override
     public ResponseDTO<String> supportsChargeProjectCreate(BlinkChargeProjectDTO dto) {
         // 验证负责项目是否重复
-        BlinkChargeProjectDO chargeProjectDO = repository.queryByProjectName(dto.getProjectName(), null, Boolean.FALSE);
+        BlinkChargeProjectDO chargeProjectDO = repository.queryByProjectName(dto.getProjectName(), dto.getEmployeeCode(), null, Boolean.FALSE);
         if (Objects.nonNull(chargeProjectDO)) {
             return ResponseDTO.dataErrorParam("项目名称重复!请检查");
         }
@@ -49,39 +43,6 @@ public class BlinkChargeProjectServiceImpl extends ServiceImpl<BlinkChargeProjec
         return ResponseDTO.ok();
     }
 
-    /**
-     * 分页查询负责项目列表
-     *
-     * @param qry
-     * @return
-     */
-    @Override
-    public ResponseDTO<PageResult<BlinkChargeProjectDTO>> supportsChargeProjectQueryPage(BlinkChargeProjectQry qry) {
-        Page<?> page = BlinkPageUtil.convert2PageQuery(qry);
-        List<BlinkChargeProjectDTO> chargeProjectDTOS = repository.supportsChargeProjectQueryPage(page, qry);
-        PageResult<BlinkChargeProjectDTO> pageResult = BlinkPageUtil.convert2PageResult(page, chargeProjectDTOS);
-        return ResponseDTO.ok(pageResult);
-    }
-
-    /**
-     * 获取活动附件信息
-     *
-     * @param id
-     * @return
-     */
-    @Override
-    public ResponseDTO<BlinkChargeProjectDTO> supportsChargeProjectQuery(Long id) {
-        // 验证负责项目是否重复
-        BlinkChargeProjectDO chargeProjectDO = repository.queryByProjectName(null, id, Boolean.FALSE);
-        if (!Objects.nonNull(chargeProjectDO)) {
-            return ResponseDTO.dataErrorParam("项目不存在!请检查");
-        }
-        // 生成DO
-        BlinkChargeProjectDTO dto = new BlinkChargeProjectDTO();
-        mapper.toBlinkChargeProjectDTO(chargeProjectDO, dto);
-        return ResponseDTO.ok(dto);
-    }
-
     /**
      * 编辑更新负责项目
      *
@@ -91,7 +52,7 @@ public class BlinkChargeProjectServiceImpl extends ServiceImpl<BlinkChargeProjec
     @Override
     public ResponseDTO<String> supportsChargeProjectUpdate(BlinkChargeProjectDTO dto) {
         // 验证负责项目是否重复
-        BlinkChargeProjectDO chargeProjectDO = repository.queryByProjectName(null, dto.getId(), Boolean.FALSE);
+        BlinkChargeProjectDO chargeProjectDO = repository.queryByProjectName(null, null, dto.getId(), Boolean.FALSE);
         if (!Objects.nonNull(chargeProjectDO)) {
             return ResponseDTO.dataErrorParam("项目不存在!请检查");
         }

bound-link-api/blink-backend/src/main/java/com/wx/blink/backend/manager/BlinkEmployeeOnboardingServiceImpl.java

@@ -8,7 +8,9 @@ import com.wx.blink.backend.domain.dto.BlinkEmployeeOnboardingDTO;
 import com.wx.blink.backend.domain.dto.BlinkInterviewEvaluationDTO;
 import com.wx.blink.backend.domain.qry.BlinkEmployeeOnboardingQry;
 import com.wx.blink.backend.objectmapper.BlinkEmployeeOnboardingMapper;
+import com.wx.blink.backend.repository.BlinkChargeProjectRepository;
 import com.wx.blink.backend.repository.BlinkEmployeeOnboardingRepository;
+import com.wx.blink.backend.repository.BlinkInterviewEvaluationRepository;
 import com.wx.blink.backend.service.IBlinkChargeProjectService;
 import com.wx.blink.backend.service.IBlinkEmployeeOnboardingService;
 import com.wx.blink.backend.service.IBlinkInterviewEvaluationService;
@@ -39,16 +41,20 @@ public class BlinkEmployeeOnboardingServiceImpl extends ServiceImpl<BlinkEmploye
     private IBlinkInterviewEvaluationService evaluationService;
     @Resource
     private IBlinkChargeProjectService chargeProjectService;
+    @Resource
+    private BlinkInterviewEvaluationRepository evaluationRepository;
+    @Resource
+    private BlinkChargeProjectRepository projectRepository;
 
     /**
-     * 新增员工
+     * 新增员工-web端
      *
      * @param dto
      * @return
      */
     @Override
     @Transactional
-    public ResponseDTO<String> supportsEmployeeOnboardingCreate(BlinkEmployeeOnboardingDTO dto) {
+    public ResponseDTO<String> supportsEmployeeOnboardingCreateWeb(BlinkEmployeeOnboardingDTO dto) {
         // 验证入职员工是否重复
         BlinkEmployeeOnboardingDO onboardingDO = repository.queryByName(dto.getName(), null, Boolean.FALSE);
         if (Objects.nonNull(onboardingDO)) {
@@ -80,6 +86,32 @@ public class BlinkEmployeeOnboardingServiceImpl extends ServiceImpl<BlinkEmploye
         return ResponseDTO.ok();
     }
 
+    /**
+     * 新增员工-移动端
+     *
+     * @param dto
+     * @return
+     */
+    @Override
+    @Transactional
+    public ResponseDTO<String> supportsEmployeeOnboardingCreate(BlinkEmployeeOnboardingDTO dto) {
+        // 验证入职员工是否重复
+        BlinkEmployeeOnboardingDO onboardingDO = repository.queryByName(dto.getName(), null, Boolean.FALSE);
+        if (Objects.nonNull(onboardingDO)) {
+            return ResponseDTO.dataErrorParam("员工名称重复!请检查");
+        }
+        // 生成DO
+        BlinkEmployeeOnboardingDO onboarding = new BlinkEmployeeOnboardingDO();
+        mapper.toBlinkEmployeeOnboardingDO(dto, onboarding);
+        //生成员工编码
+        SerialNumberIdEnum serialNumberIdEnum = BlinkEnumUtil.getEnumByValue(4, SerialNumberIdEnum.class);
+        String employeeCode = serialNumberService.generate(serialNumberIdEnum);
+        onboarding.setEmployeeCode(employeeCode);
+        // 执行新增
+        this.save(onboarding);
+        return ResponseDTO.ok();
+    }
+
     /**
      * 分页查询入职员工列表
      *
@@ -107,8 +139,16 @@ public class BlinkEmployeeOnboardingServiceImpl extends ServiceImpl<BlinkEmploye
         if (!Objects.nonNull(onboardingDO)) {
             return ResponseDTO.userErrorParam("活动不存在!请检查");
         }
+        // 查询面试评价
+        List<BlinkInterviewEvaluationDTO> evaluationDTOS = evaluationRepository.supportsInterviewEvaluationQueryList(onboardingDO.getEmployeeCode());
+        // 查询负责项目
+        List<BlinkChargeProjectDTO> chargeProjectDTOS = projectRepository.supportsChargeProjectQueryList(onboardingDO.getEmployeeCode());
+        // 生成dto
         BlinkEmployeeOnboardingDTO dto = new BlinkEmployeeOnboardingDTO();
         mapper.toBlinkEmployeeOnboardingDTO(onboardingDO, dto);
+        // 设置面试评价和负责项目
+        dto.setEvaluationDTOList(evaluationDTOS);
+        dto.setChargeProjectDTOList(chargeProjectDTOS);
         return ResponseDTO.ok(dto);
     }
 
@@ -128,7 +168,63 @@ public class BlinkEmployeeOnboardingServiceImpl extends ServiceImpl<BlinkEmploye
         // 生成DO
         BlinkEmployeeOnboardingDO onboarding = new BlinkEmployeeOnboardingDO();
         mapper.toBlinkEmployeeOnboardingDO(dto, onboarding);
-        // 创建人赋值
+        // 获取面试评价集合
+        List<BlinkInterviewEvaluationDTO> evaluationDTOList = dto.getEvaluationDTOList();
+        // 根据employeeCode查询数据库面试评价集合
+        List<BlinkInterviewEvaluationDTO> evaluationDTOS = evaluationRepository.supportsInterviewEvaluationQueryList(onboardingDO.getEmployeeCode());
+        for (BlinkInterviewEvaluationDTO evaluationDTO : evaluationDTOList) {
+            if (evaluationDTO.getId() == null){
+                // 如果id为 null ，执行新增操作
+                evaluationDTO.setEmployeeCode(dto.getEmployeeCode());
+                evaluationService.supportsInterviewEvaluationCreate(evaluationDTO);
+            }else {
+                // 如果id不为 null ，则将最新数据和数据库数据对比，执行修改或删除操作
+                for (BlinkInterviewEvaluationDTO interviewEvaluationDTO : evaluationDTOS) {
+                    if (evaluationDTO.getId().equals(interviewEvaluationDTO.getId())){
+                        // 最新数据id和数据库数据id一致，则执行修改操作
+                        evaluationService.supportsInterviewEvaluationUpdate(evaluationDTO);
+                    }else {
+                        // 反之则执行删除操作
+                        evaluationService.supportsInterviewEvaluationDeleteById(interviewEvaluationDTO.getId());
+                    }
+                }
+            }
+        }
+        // 校验面试评价数据是否删除（使用数据库数据 - 最新数据 不为空则有数据删除，为空则没有数据删除）
+        evaluationDTOS.removeAll(evaluationDTOList);
+        if (!evaluationDTOS.isEmpty()){
+            for (BlinkInterviewEvaluationDTO evaluationDTO : evaluationDTOS) {
+                evaluationService.supportsInterviewEvaluationDeleteById(evaluationDTO.getId());
+            }
+        }
+
+        // 获取负责项目集合
+        List<BlinkChargeProjectDTO> chargeProjectDTOList = dto.getChargeProjectDTOList();
+        // 根据employeeCode查询数据库负责项目
+        List<BlinkChargeProjectDTO> chargeProjectDTOS = projectRepository.supportsChargeProjectQueryList(onboardingDO.getEmployeeCode());
+        for (BlinkChargeProjectDTO projectDTO : chargeProjectDTOList) {
+            if (projectDTO.getId() == null){
+                // 如果id为 null ，执行新增操作
+                projectDTO.setEmployeeCode(dto.getEmployeeCode());
+                chargeProjectService.supportsChargeProjectCreate(projectDTO);
+            }else {
+                // 如果id不为 null ，则将最新数据和数据库数据对比，执行修改或删除操作
+                for (BlinkChargeProjectDTO chargeProjectDTO : chargeProjectDTOS) {
+                    if (projectDTO.getId().equals(chargeProjectDTO.getId())){
+                        // 最新数据id和数据库数据id一致，则执行修改操作
+                        chargeProjectService.supportsChargeProjectUpdate(projectDTO);
+                    }
+                }
+            }
+        }
+        // 校验负责项目数据是否删除（使用数据库数据 - 最新数据 不为空则有数据删除，为空则没有数据删除）
+        chargeProjectDTOS.removeAll(chargeProjectDTOList);
+        if (!chargeProjectDTOS.isEmpty()){
+            for (BlinkChargeProjectDTO chargeProjectDTO : chargeProjectDTOS) {
+                chargeProjectService.supportsChargeProjectDeleteById(chargeProjectDTO.getId());
+            }
+        }
+        // 修改人赋值
         BlinkEntityUtil.setUpdatedInfo(onboarding);
         // 执行新增
         this.updateById(onboarding);

bound-link-api/blink-backend/src/main/java/com/wx/blink/backend/manager/BlinkInterviewEvaluationServiceImpl.java

@@ -1,22 +1,15 @@
 package com.wx.blink.backend.manager;
 
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.wx.blink.backend.domain.dataobject.BlinkInterviewEvaluationDO;
 import com.wx.blink.backend.domain.dto.BlinkInterviewEvaluationDTO;
-import com.wx.blink.backend.domain.qry.BlinkInterviewEvaluationQry;
 import com.wx.blink.backend.objectmapper.BlinkInterviewEvaluationMapper;
 import com.wx.blink.backend.repository.BlinkInterviewEvaluationRepository;
 import com.wx.blink.backend.service.IBlinkInterviewEvaluationService;
-import com.wx.blink.base.common.domain.PageResult;
 import com.wx.blink.base.common.domain.ResponseDTO;
 import com.wx.blink.base.common.util.BlinkEntityUtil;
-import com.wx.blink.base.common.util.BlinkPageUtil;
 import org.springframework.stereotype.Service;
-
 import javax.annotation.Resource;
-import java.text.DecimalFormat;
-import java.util.List;
 import java.util.Objects;
 
 @Service
@@ -38,9 +31,6 @@ public class BlinkInterviewEvaluationServiceImpl extends ServiceImpl<BlinkInterv
         // 生成DO
         BlinkInterviewEvaluationDO evaluationDO = new BlinkInterviewEvaluationDO();
         mapper.toBlinkInterviewEvaluationDO(dto, evaluationDO);
-        // 设置薪资
-        DecimalFormat df = new DecimalFormat("#,##0.00");
-        evaluationDO.setSalary(df.format(dto.getSalaries()));
         // 创建人赋值
         BlinkEntityUtil.setCreateInfo(evaluationDO);
         // 执行新增
@@ -49,31 +39,21 @@ public class BlinkInterviewEvaluationServiceImpl extends ServiceImpl<BlinkInterv
     }
 
     /**
-     * 分页查询面试评价列表
-     *
-     * @param qry
-     * @return
-     */
-    @Override
-    public ResponseDTO<PageResult<BlinkInterviewEvaluationDTO>> supportsInterviewEvaluationQueryPage(BlinkInterviewEvaluationQry qry) {
-        Page<?> page = BlinkPageUtil.convert2PageQuery(qry);
-        List<BlinkInterviewEvaluationDTO> evaluationDTOS = repository.supportsInterviewEvaluationQueryPage(page, qry);
-        PageResult<BlinkInterviewEvaluationDTO> pageResult = BlinkPageUtil.convert2PageResult(page, evaluationDTOS);
-        return ResponseDTO.ok(pageResult);
-    }
-
-    /**
-     * 获取面试评价信息
+     * 修改面试评价
      *
-     * @param id
+     * @param dto
      * @return
      */
     @Override
-    public ResponseDTO<BlinkInterviewEvaluationDTO> supportsInterviewEvaluationQuery(Long id) {
-        BlinkInterviewEvaluationDO evaluationDO = this.getById(id);
-        BlinkInterviewEvaluationDTO dto = new BlinkInterviewEvaluationDTO();
-        mapper.toBlinkInterviewEvaluationDTO(evaluationDO, dto);
-        return ResponseDTO.ok(dto);
+    public ResponseDTO<String> supportsInterviewEvaluationUpdate(BlinkInterviewEvaluationDTO dto) {
+        // 生成DO
+        BlinkInterviewEvaluationDO evaluationDO = new BlinkInterviewEvaluationDO();
+        mapper.toBlinkInterviewEvaluationDO(dto, evaluationDO);
+        // 创建人赋值
+        BlinkEntityUtil.setUpdatedInfo(evaluationDO);
+        // 执行新增
+        this.updateById(evaluationDO);
+        return ResponseDTO.ok();
     }
 
     /**

bound-link-api/blink-backend/src/main/java/com/wx/blink/backend/repository/BlinkChargeProjectRepository.java

@@ -18,18 +18,18 @@ public interface BlinkChargeProjectRepository extends BaseMapper<BlinkChargeProj
      *
      * @param projectName
      * @param id
+     * @param employeeCode
      * @param deletedFlag
      * @return
      */
-    BlinkChargeProjectDO queryByProjectName(@Param("projectName") String projectName, @Param("id") Long id, @Param("deletedFlag") Boolean deletedFlag);
+    BlinkChargeProjectDO queryByProjectName(@Param("projectName") String projectName, @Param("employeeCode") String employeeCode, @Param("id") Long id, @Param("deletedFlag") Boolean deletedFlag);
 
     /**
-     * 分页查询竞争对手列表
+     * 查询负责项目列表
      *
-     * @param page
-     * @param qry
+     * @param employeeCode
      * @return
      */
-    List<BlinkChargeProjectDTO> supportsChargeProjectQueryPage(Page<?> page,@Param("query") BlinkChargeProjectQry qry);
+    List<BlinkChargeProjectDTO> supportsChargeProjectQueryList(@Param("employeeCode") String employeeCode);
 
 }

bound-link-api/blink-backend/src/main/java/com/wx/blink/backend/repository/BlinkInterviewEvaluationRepository.java

@@ -1,11 +1,10 @@
 package com.wx.blink.backend.repository;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.wx.blink.backend.domain.dataobject.BlinkInterviewEvaluationDO;
 import com.wx.blink.backend.domain.dto.BlinkInterviewEvaluationDTO;
-import com.wx.blink.backend.domain.qry.BlinkInterviewEvaluationQry;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
 
@@ -13,11 +12,10 @@ import java.util.List;
 public interface BlinkInterviewEvaluationRepository extends BaseMapper<BlinkInterviewEvaluationDO> {
 
     /**
-     * 分页查询竞争对手列表
+     * 查询面试评价列表
      *
-     * @param page
-     * @param qry
+     * @param employeeCode
      * @return
      */
-    List<BlinkInterviewEvaluationDTO> supportsInterviewEvaluationQueryPage(Page<?> page, BlinkInterviewEvaluationQry qry);
+    List<BlinkInterviewEvaluationDTO> supportsInterviewEvaluationQueryList(@Param("employeeCode") String employeeCode);
 }

bound-link-api/blink-backend/src/main/java/com/wx/blink/backend/service/IBlinkChargeProjectService.java

@@ -1,8 +1,6 @@
 package com.wx.blink.backend.service;
 
 import com.wx.blink.backend.domain.dto.BlinkChargeProjectDTO;
-import com.wx.blink.backend.domain.qry.BlinkChargeProjectQry;
-import com.wx.blink.base.common.domain.PageResult;
 import com.wx.blink.base.common.domain.ResponseDTO;
 
 public interface IBlinkChargeProjectService {
@@ -15,22 +13,6 @@ public interface IBlinkChargeProjectService {
      */
     ResponseDTO<String> supportsChargeProjectCreate(BlinkChargeProjectDTO dto);
 
-    /**
-     * 分页查询负责项目列表
-     *
-     * @param qry
-     * @return
-     */
-    ResponseDTO<PageResult<BlinkChargeProjectDTO>> supportsChargeProjectQueryPage(BlinkChargeProjectQry qry);
-
-    /**
-     * 获取负责项目
-     *
-     * @param id
-     * @return
-     */
-    ResponseDTO<BlinkChargeProjectDTO> supportsChargeProjectQuery(Long id);
-
     /**
      * 编辑更新负责项目
      *

bound-link-api/blink-backend/src/main/java/com/wx/blink/backend/service/IBlinkEmployeeOnboardingService.java

@@ -8,7 +8,15 @@ import com.wx.blink.base.common.domain.ResponseDTO;
 public interface IBlinkEmployeeOnboardingService {
 
     /**
-     * 新增员工
+     * 新增员工-web端
+     *
+     * @param dto
+     * @return
+     */
+    ResponseDTO<String> supportsEmployeeOnboardingCreateWeb(BlinkEmployeeOnboardingDTO dto);
+
+    /**
+     * 新增员工-移动端
      *
      * @param dto
      * @return
@@ -40,4 +48,5 @@ public interface IBlinkEmployeeOnboardingService {
     ResponseDTO<String> supportsEmployeeOnboardingUpdate(BlinkEmployeeOnboardingDTO dto);
 
 
+
 }

bound-link-api/blink-backend/src/main/java/com/wx/blink/backend/service/IBlinkInterviewEvaluationService.java

@@ -1,8 +1,6 @@
 package com.wx.blink.backend.service;
 
 import com.wx.blink.backend.domain.dto.BlinkInterviewEvaluationDTO;
-import com.wx.blink.backend.domain.qry.BlinkInterviewEvaluationQry;
-import com.wx.blink.base.common.domain.PageResult;
 import com.wx.blink.base.common.domain.ResponseDTO;
 
 public interface IBlinkInterviewEvaluationService {
@@ -16,20 +14,12 @@ public interface IBlinkInterviewEvaluationService {
     ResponseDTO<String> supportsInterviewEvaluationCreate(BlinkInterviewEvaluationDTO dto);
 
     /**
-     * 分页查询面试评价列表
+     * 编辑更新面试评价
      *
-     * @param qry
-     * @return
-     */
-    ResponseDTO<PageResult<BlinkInterviewEvaluationDTO>> supportsInterviewEvaluationQueryPage(BlinkInterviewEvaluationQry qry);
-
-    /**
-     * 获取面试评价信息
-     *
-     * @param id
+     * @param dto
      * @return
      */
-    ResponseDTO<BlinkInterviewEvaluationDTO> supportsInterviewEvaluationQuery(Long id);
+    ResponseDTO<String> supportsInterviewEvaluationUpdate(BlinkInterviewEvaluationDTO dto);
 
     /**
      * 移除面试评价

bound-link-api/blink-backend/src/main/resources/mapper/BlinkChargeProjectRepositoryMapper.xml

@@ -12,15 +12,18 @@
         <if test="id != null">
             AND id = #{id}
         </if>
+        <if test="employeeCode != null and employeeCode != ''">
+            AND employee_code = #{employeeCode}
+        </if>
     </select>
 
-    <!--    分页查询入职员工列表-->
-    <select id="supportsChargeProjectQueryPage" resultType="com.wx.blink.backend.domain.dto.BlinkChargeProjectDTO">
+    <!--    查询入职员工列表-->
+    <select id="supportsChargeProjectQueryList" resultType="com.wx.blink.backend.domain.dto.BlinkChargeProjectDTO">
         select *
         from blink_employee_charge_project
         where deleted_flag = '0'
-        <if test="query.employeeCode != null and query.employeeCode != ''">
-            AND employee_code = #{query.employeeCode}
+        <if test="employeeCode != null and employeeCode != ''">
+            AND employee_code = #{employeeCode}
         </if>
         order by create_time desc
     </select>

bound-link-api/blink-backend/src/main/resources/mapper/BlinkInterviewEvaluationRepositoryMapper.xml

@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.wx.blink.backend.repository.BlinkInterviewEvaluationRepository">
-    <!--    分页查询面试评价列表-->
-    <select id="supportsInterviewEvaluationQueryPage" resultType="com.wx.blink.backend.domain.dto.BlinkInterviewEvaluationDTO">
+    <!--    查询面试评价列表-->
+    <select id="supportsInterviewEvaluationQueryList" resultType="com.wx.blink.backend.domain.dto.BlinkInterviewEvaluationDTO">
         select *
         from blink_employee_interview_evaluation
         where deleted_flag = '0'
-        <if test="query.employeeCode != null and query.employeeCode != ''">
-            AND employee_code = #{query.employeeCode}
+        <if test="employeeCode != null and employeeCode != ''">
+            AND employee_code = #{employeeCode}
         </if>
         order by create_time desc
     </select>