离职模块、项目管理模块优化

jeeplus-module/jeeplus-test/src/main/java/com/jeeplus/test/changes/dimission/controller/ChangesDimissionController.java

@@ -73,19 +73,15 @@ public class ChangesDimissionController {
         QueryWrapper<ChangesDimission> queryWrapper = QueryWrapperGenerator.buildQueryCondition ( changesDimission, ChangesDimission.class );
         if(ObjectUtil.isNotEmpty(changesDimissionDTO)){
             if(ObjectUtil.isNotEmpty(changesDimissionDTO.getRosterBaseDTO())){
-                if(StringUtils.isNotBlank(changesDimissionDTO.getRosterBaseDTO().getName())
+                if(StringUtils.isNotBlank(changesDimissionDTO.getRosterId())
                         ||StringUtils.isNotBlank(changesDimissionDTO.getRosterBaseDTO().getOfficeId())
                         ||StringUtils.isNotBlank(changesDimissionDTO.getRosterBaseDTO().getMobile())){
                     List<String> rosterIdsName = new ArrayList<>();
                     List<String> rosterIdsOfficeId = new ArrayList<>();
                     List<String> rosterIdsMobile = new ArrayList<>();
-                    if(StringUtils.isNotBlank(changesDimissionDTO.getRosterBaseDTO().getName())){
-                        List<String> collect = rosterBaseService.list(new QueryWrapper<RosterBase>().lambda().like(RosterBase::getName, changesDimissionDTO.getRosterBaseDTO().getName()))
-                                .stream().map(RosterBase::getId).collect(Collectors.toList());
-                        if(CollectionUtil.isNotEmpty(collect)) {
-                            rosterIdsName.addAll(collect);
-                        }else{
-                            return ResponseEntity.ok(null);
+                    if(StringUtils.isNotBlank(changesDimissionDTO.getRosterId())){
+                        if(StringUtils.isNotBlank(changesDimissionDTO.getRosterId())) {
+                            rosterIdsName.add(changesDimissionDTO.getRosterId());
                         }
                     }
                     if(StringUtils.isNotBlank(changesDimissionDTO.getRosterBaseDTO().getOfficeId())){

jeeplus-module/jeeplus-test/src/main/java/com/jeeplus/test/changes/dimission/service/ChangesDimissionService.java

@@ -3,6 +3,7 @@ package com.jeeplus.test.changes.dimission.service;
 import cn.hutool.core.collection.CollectionUtil;
 import cn.hutool.core.util.ObjectUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -21,6 +22,7 @@ import com.jeeplus.test.changes.dimission.service.mapstruct.ChangesDimissionFile
 import com.jeeplus.test.changes.dimission.service.mapstruct.ChangesDimissionWrapper;
 import com.jeeplus.test.roster.domain.RosterBase;
 import com.jeeplus.test.roster.service.dto.RosterBaseDTO;
+import org.apache.commons.lang3.ObjectUtils;
 import org.springframework.http.ResponseEntity;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -88,7 +90,19 @@ public class ChangesDimissionService extends ServiceImpl<ChangesDimissionMapper,
             }
         }
         ChangesDimission changesDimission = ChangesDimissionWrapper.INSTANCE.toEntity(changesDimissionDTO);
-        this.saveOrUpdate(changesDimission);
+        if(ObjectUtil.isNotEmpty(changesDimission)){
+            if(StringUtils.isNotBlank(changesDimission.getId())){
+                this.update(changesDimission,new LambdaUpdateWrapper<ChangesDimission>()
+                        .eq(ChangesDimission::getId,changesDimission.getId())
+                        .set(ObjectUtils.isEmpty(changesDimission.getDimissionDate()),ChangesDimission::getDimissionDate,null)
+                        .set(ObjectUtils.isEmpty(changesDimission.getLastWorkDate()),ChangesDimission::getLastWorkDate,null)
+                        .set(ObjectUtils.isEmpty(changesDimission.getPayrollSettlementDate()),ChangesDimission::getPayrollSettlementDate,null)
+                );
+            }else{
+                this.save(changesDimission);
+            }
+        }
+
 
         if(ObjectUtil.isNotEmpty(changesDimissionDTO)){
             ChangesDimissionAudit audit = new ChangesDimissionAudit();

jeeplus-module/jeeplus-test/src/main/java/com/jeeplus/test/projectRecords/domain/Project.java

@@ -223,6 +223,7 @@ public class Project extends BaseEntity {
     /**
      * 文件上传状态（0未完成1已完成）
      */
+    @Query
     private String fileUploadType;
 
     private static final long serialVersionUID = 1L;