From f1ddba3960e6b66105c204c4a9ff7851dbca0f4b Mon Sep 17 00:00:00 2001 From: SondonYong Date: Tue, 2 Dec 2025 17:56:40 +0800 Subject: [PATCH] =?UTF-8?q?dev:=E4=BF=AE=E6=94=B9=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../basic/info/web/UserChangeRecordController.java | 3 --- .../basic/info/command/UserChangeRecordAddExe.java | 1 - .../info/command/UserChangeRecordUpdateExe.java | 1 - .../convertor/UserChangeRecordCoConvertor.java | 2 -- .../info/command/query/UserChangeRecordQueryExe.java | 2 -- .../info/service/UserChangeRecordServiceImpl.java | 1 - .../basic/info/api/UserChangeRecordServiceI.java | 1 - .../info/dto/clientobject/UserChangeRecordCO.java | 12 +++++++++--- .../info/domain/gateway/UserChangeRecordGateway.java | 2 -- .../basic/info/domain/model/UserChangeRecordE.java | 8 ++++++-- .../gatewayimpl/UserChangeRecordGatewayImpl.java | 2 -- .../persistence/dataobject/UserChangeRecordDO.java | 12 +++++++++--- .../persistence/mapper/UserChangeRecordMapper.java | 1 - .../repository/UserChangeRecordRepository.java | 1 - .../impl/UserChangeRecordRepositoryImpl.java | 1 - 15 files changed, 24 insertions(+), 26 deletions(-) diff --git a/web-adapter/src/main/java/com/zcloud/basic/info/web/UserChangeRecordController.java b/web-adapter/src/main/java/com/zcloud/basic/info/web/UserChangeRecordController.java index ab778e2..cd8fd03 100644 --- a/web-adapter/src/main/java/com/zcloud/basic/info/web/UserChangeRecordController.java +++ b/web-adapter/src/main/java/com/zcloud/basic/info/web/UserChangeRecordController.java @@ -7,7 +7,6 @@ import com.zcloud.basic.info.dto.UserChangeRecordPageQry; import com.zcloud.basic.info.dto.UserChangeRecordListQry; import com.zcloud.basic.info.dto.UserChangeRecordUpdateCmd; import com.zcloud.basic.info.dto.UserChangeRecordRemoveCmd; -import com.zcloud.basic.info.dto.clientobject.UserChangeRecordCO; import com.alibaba.cola.dto.MultiResponse; import com.alibaba.cola.dto.PageResponse; import com.alibaba.cola.dto.Response; @@ -20,8 +19,6 @@ import lombok.AllArgsConstructor; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; -import java.util.ArrayList; - /** * web-adapter * diff --git a/web-app/src/main/java/com/zcloud/basic/info/command/UserChangeRecordAddExe.java b/web-app/src/main/java/com/zcloud/basic/info/command/UserChangeRecordAddExe.java index 4f1b933..621e761 100644 --- a/web-app/src/main/java/com/zcloud/basic/info/command/UserChangeRecordAddExe.java +++ b/web-app/src/main/java/com/zcloud/basic/info/command/UserChangeRecordAddExe.java @@ -1,7 +1,6 @@ package com.zcloud.basic.info.command; import com.zcloud.basic.info.domain.gateway.UserChangeRecordGateway; -import com.zcloud.basic.info.domain.model.UserChangeRecordE; import com.zcloud.basic.info.dto.UserChangeRecordAddCmd; import com.alibaba.cola.exception.BizException; import lombok.AllArgsConstructor; diff --git a/web-app/src/main/java/com/zcloud/basic/info/command/UserChangeRecordUpdateExe.java b/web-app/src/main/java/com/zcloud/basic/info/command/UserChangeRecordUpdateExe.java index 9ed4a82..2dda6d2 100644 --- a/web-app/src/main/java/com/zcloud/basic/info/command/UserChangeRecordUpdateExe.java +++ b/web-app/src/main/java/com/zcloud/basic/info/command/UserChangeRecordUpdateExe.java @@ -2,7 +2,6 @@ package com.zcloud.basic.info.command; import com.alibaba.cola.exception.BizException; import com.zcloud.basic.info.domain.gateway.UserChangeRecordGateway; -import com.zcloud.basic.info.domain.model.UserChangeRecordE; import com.zcloud.basic.info.dto.UserChangeRecordUpdateCmd; import lombok.AllArgsConstructor; import org.springframework.beans.BeanUtils; diff --git a/web-app/src/main/java/com/zcloud/basic/info/command/convertor/UserChangeRecordCoConvertor.java b/web-app/src/main/java/com/zcloud/basic/info/command/convertor/UserChangeRecordCoConvertor.java index 8359461..c17a91f 100644 --- a/web-app/src/main/java/com/zcloud/basic/info/command/convertor/UserChangeRecordCoConvertor.java +++ b/web-app/src/main/java/com/zcloud/basic/info/command/convertor/UserChangeRecordCoConvertor.java @@ -1,7 +1,5 @@ package com.zcloud.basic.info.command.convertor; -import com.zcloud.basic.info.dto.clientobject.UserChangeRecordCO; -import com.zcloud.basic.info.persistence.dataobject.UserChangeRecordDO; import org.mapstruct.Mapper; import java.util.List; diff --git a/web-app/src/main/java/com/zcloud/basic/info/command/query/UserChangeRecordQueryExe.java b/web-app/src/main/java/com/zcloud/basic/info/command/query/UserChangeRecordQueryExe.java index 0e980cb..32a1f31 100644 --- a/web-app/src/main/java/com/zcloud/basic/info/command/query/UserChangeRecordQueryExe.java +++ b/web-app/src/main/java/com/zcloud/basic/info/command/query/UserChangeRecordQueryExe.java @@ -4,8 +4,6 @@ import com.alibaba.cola.dto.MultiResponse; import com.zcloud.basic.info.command.convertor.UserChangeRecordCoConvertor; import com.zcloud.basic.info.dto.UserChangeRecordPageQry; import com.zcloud.basic.info.dto.UserChangeRecordListQry; -import com.zcloud.basic.info.dto.clientobject.UserChangeRecordCO; -import com.zcloud.basic.info.persistence.dataobject.UserChangeRecordDO; import com.zcloud.basic.info.persistence.repository.UserChangeRecordRepository; import com.zcloud.gbscommon.utils.PageQueryHelper; import com.alibaba.cola.dto.PageResponse; diff --git a/web-app/src/main/java/com/zcloud/basic/info/service/UserChangeRecordServiceImpl.java b/web-app/src/main/java/com/zcloud/basic/info/service/UserChangeRecordServiceImpl.java index 5d035bf..e3c9503 100644 --- a/web-app/src/main/java/com/zcloud/basic/info/service/UserChangeRecordServiceImpl.java +++ b/web-app/src/main/java/com/zcloud/basic/info/service/UserChangeRecordServiceImpl.java @@ -10,7 +10,6 @@ import com.zcloud.basic.info.dto.UserChangeRecordAddCmd; import com.zcloud.basic.info.dto.UserChangeRecordPageQry; import com.zcloud.basic.info.dto.UserChangeRecordListQry; import com.zcloud.basic.info.dto.UserChangeRecordUpdateCmd; -import com.zcloud.basic.info.dto.clientobject.UserChangeRecordCO; import com.alibaba.cola.dto.PageResponse; import com.alibaba.cola.dto.SingleResponse; diff --git a/web-client/src/main/java/com/zcloud/basic/info/api/UserChangeRecordServiceI.java b/web-client/src/main/java/com/zcloud/basic/info/api/UserChangeRecordServiceI.java index ac0f25a..a04d7c8 100644 --- a/web-client/src/main/java/com/zcloud/basic/info/api/UserChangeRecordServiceI.java +++ b/web-client/src/main/java/com/zcloud/basic/info/api/UserChangeRecordServiceI.java @@ -5,7 +5,6 @@ import com.zcloud.basic.info.dto.UserChangeRecordAddCmd; import com.zcloud.basic.info.dto.UserChangeRecordPageQry; import com.zcloud.basic.info.dto.UserChangeRecordListQry; import com.zcloud.basic.info.dto.UserChangeRecordUpdateCmd; -import com.zcloud.basic.info.dto.clientobject.UserChangeRecordCO; import com.alibaba.cola.dto.PageResponse; import com.alibaba.cola.dto.SingleResponse; diff --git a/web-client/src/main/java/com/zcloud/basic/info/dto/clientobject/UserChangeRecordCO.java b/web-client/src/main/java/com/zcloud/basic/info/dto/clientobject/UserChangeRecordCO.java index d753905..8ec78eb 100644 --- a/web-client/src/main/java/com/zcloud/basic/info/dto/clientobject/UserChangeRecordCO.java +++ b/web-client/src/main/java/com/zcloud/basic/info/dto/clientobject/UserChangeRecordCO.java @@ -12,7 +12,7 @@ import java.time.LocalDate; * web-client * * @Author SondonYong - * @Date 2025-12-02 14:08:18 + * @Date 2025-12-02 17:54:06 */ @Data public class UserChangeRecordCO extends ClientObject { @@ -29,8 +29,8 @@ public class UserChangeRecordCO extends ClientObject { @ApiModelProperty(value = "变更时间") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") private LocalDateTime changeTime; - //入职状态，1-在职 0-离职, 2-入职待审核, 3-离职待审核 - @ApiModelProperty(value = "入职状态，1-在职 0-离职, 2-入职待审核, 3-离职待审核") + //入职状态，1-待审批, 2-通过 + @ApiModelProperty(value = "入职状态，1-待审批, 2-通过") private Integer status; //变更前企业id @ApiModelProperty(value = "变更前企业id") @@ -50,6 +50,9 @@ public class UserChangeRecordCO extends ClientObject { //变更前负责岗位名称 @ApiModelProperty(value = "变更前负责岗位名称") private String postNameBefore; + //变更前状态 + @ApiModelProperty(value = "变更前状态") + private Integer userStatusBefore; //变更后企业id @ApiModelProperty(value = "变更后企业id") private Long corpinfoIdAfter; @@ -68,4 +71,7 @@ public class UserChangeRecordCO extends ClientObject { //变更后负责岗位名称 @ApiModelProperty(value = "变更后负责岗位名称") private String postNameAfter; + //变更后状态 + @ApiModelProperty(value = "变更后状态") + private Integer userStatusAfter; } diff --git a/web-domain/src/main/java/com/zcloud/basic/info/domain/gateway/UserChangeRecordGateway.java b/web-domain/src/main/java/com/zcloud/basic/info/domain/gateway/UserChangeRecordGateway.java index cf314ca..eb7a32b 100644 --- a/web-domain/src/main/java/com/zcloud/basic/info/domain/gateway/UserChangeRecordGateway.java +++ b/web-domain/src/main/java/com/zcloud/basic/info/domain/gateway/UserChangeRecordGateway.java @@ -1,7 +1,5 @@ package com.zcloud.basic.info.domain.gateway; -import com.zcloud.basic.info.domain.model.UserChangeRecordE; - /** * web-domain * diff --git a/web-domain/src/main/java/com/zcloud/basic/info/domain/model/UserChangeRecordE.java b/web-domain/src/main/java/com/zcloud/basic/info/domain/model/UserChangeRecordE.java index ab71839..41e8e9a 100644 --- a/web-domain/src/main/java/com/zcloud/basic/info/domain/model/UserChangeRecordE.java +++ b/web-domain/src/main/java/com/zcloud/basic/info/domain/model/UserChangeRecordE.java @@ -9,7 +9,7 @@ import java.util.Date; * web-domain * * @Author SondonYong - * @Date 2025-12-02 14:08:18 + * @Date 2025-12-02 17:54:06 */ @Data public class UserChangeRecordE extends BaseE { @@ -21,7 +21,7 @@ public class UserChangeRecordE extends BaseE { private Long userId; //变更时间 private Date changeTime; - //入职状态，1-在职 0-离职, 2-入职待审核, 3-离职待审核 + //入职状态，1-待审批, 2-通过 private Integer status; //变更前企业id private Long corpinfoIdBefore; @@ -35,6 +35,8 @@ public class UserChangeRecordE extends BaseE { private Long postIdBefore; //变更前负责岗位名称 private String postNameBefore; + //变更前状态 + private Integer userStatusBefore; //变更后企业id private Long corpinfoIdAfter; //变更后企业名称 @@ -47,5 +49,7 @@ public class UserChangeRecordE extends BaseE { private Long postIdAfter; //变更后负责岗位名称 private String postNameAfter; + //变更后状态 + private Integer userStatusAfter; } diff --git a/web-infrastructure/src/main/java/com/zcloud/basic/info/gatewayimpl/UserChangeRecordGatewayImpl.java b/web-infrastructure/src/main/java/com/zcloud/basic/info/gatewayimpl/UserChangeRecordGatewayImpl.java index 22ce1fa..e0e13ae 100644 --- a/web-infrastructure/src/main/java/com/zcloud/basic/info/gatewayimpl/UserChangeRecordGatewayImpl.java +++ b/web-infrastructure/src/main/java/com/zcloud/basic/info/gatewayimpl/UserChangeRecordGatewayImpl.java @@ -1,8 +1,6 @@ package com.zcloud.basic.info.gatewayimpl; import com.zcloud.basic.info.domain.gateway.UserChangeRecordGateway; -import com.zcloud.basic.info.domain.model.UserChangeRecordE; -import com.zcloud.basic.info.persistence.dataobject.UserChangeRecordDO; import com.zcloud.basic.info.persistence.repository.UserChangeRecordRepository; import lombok.AllArgsConstructor; import org.springframework.beans.BeanUtils; diff --git a/web-infrastructure/src/main/java/com/zcloud/basic/info/persistence/dataobject/UserChangeRecordDO.java b/web-infrastructure/src/main/java/com/zcloud/basic/info/persistence/dataobject/UserChangeRecordDO.java index de8c2dd..795012b 100644 --- a/web-infrastructure/src/main/java/com/zcloud/basic/info/persistence/dataobject/UserChangeRecordDO.java +++ b/web-infrastructure/src/main/java/com/zcloud/basic/info/persistence/dataobject/UserChangeRecordDO.java @@ -13,7 +13,7 @@ import java.util.Date; * web-infrastructure * * @Author SondonYong - * @Date 2025-12-02 14:08:19 + * @Date 2025-12-02 17:54:06 */ @Data @TableName("user_change_record") @@ -29,8 +29,8 @@ public class UserChangeRecordDO extends BaseDO { //变更时间 @ApiModelProperty(value = "变更时间") private Date changeTime; - //入职状态，1-在职 0-离职, 2-入职待审核, 3-离职待审核 - @ApiModelProperty(value = "入职状态，1-在职 0-离职, 2-入职待审核, 3-离职待审核") + //入职状态，1-待审批, 2-通过 + @ApiModelProperty(value = "入职状态，1-待审批, 2-通过") private Integer status; //变更前企业id @ApiModelProperty(value = "变更前企业id") @@ -50,6 +50,9 @@ public class UserChangeRecordDO extends BaseDO { //变更前负责岗位名称 @ApiModelProperty(value = "变更前负责岗位名称") private String postNameBefore; + //变更前状态 + @ApiModelProperty(value = "变更前状态") + private Integer userStatusBefore; //变更后企业id @ApiModelProperty(value = "变更后企业id") private Long corpinfoIdAfter; @@ -68,6 +71,9 @@ public class UserChangeRecordDO extends BaseDO { //变更后负责岗位名称 @ApiModelProperty(value = "变更后负责岗位名称") private String postNameAfter; + //变更后状态 + @ApiModelProperty(value = "变更后状态") + private Integer userStatusAfter; public UserChangeRecordDO(String userChangeRecordId) { this.userChangeRecordId = userChangeRecordId; diff --git a/web-infrastructure/src/main/java/com/zcloud/basic/info/persistence/mapper/UserChangeRecordMapper.java b/web-infrastructure/src/main/java/com/zcloud/basic/info/persistence/mapper/UserChangeRecordMapper.java index dbd50a4..6fdf66f 100644 --- a/web-infrastructure/src/main/java/com/zcloud/basic/info/persistence/mapper/UserChangeRecordMapper.java +++ b/web-infrastructure/src/main/java/com/zcloud/basic/info/persistence/mapper/UserChangeRecordMapper.java @@ -1,6 +1,5 @@ package com.zcloud.basic.info.persistence.mapper; -import com.zcloud.basic.info.persistence.dataobject.UserChangeRecordDO; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.apache.ibatis.annotations.Mapper; diff --git a/web-infrastructure/src/main/java/com/zcloud/basic/info/persistence/repository/UserChangeRecordRepository.java b/web-infrastructure/src/main/java/com/zcloud/basic/info/persistence/repository/UserChangeRecordRepository.java index f418b10..cc8f6c0 100644 --- a/web-infrastructure/src/main/java/com/zcloud/basic/info/persistence/repository/UserChangeRecordRepository.java +++ b/web-infrastructure/src/main/java/com/zcloud/basic/info/persistence/repository/UserChangeRecordRepository.java @@ -1,6 +1,5 @@ package com.zcloud.basic.info.persistence.repository; -import com.zcloud.basic.info.persistence.dataobject.UserChangeRecordDO; import com.alibaba.cola.dto.SingleResponse; import com.alibaba.cola.dto.PageResponse; import com.jjb.saas.framework.repository.repo.BaseRepository; diff --git a/web-infrastructure/src/main/java/com/zcloud/basic/info/persistence/repository/impl/UserChangeRecordRepositoryImpl.java b/web-infrastructure/src/main/java/com/zcloud/basic/info/persistence/repository/impl/UserChangeRecordRepositoryImpl.java index 78b7bb8..a1bc1b7 100644 --- a/web-infrastructure/src/main/java/com/zcloud/basic/info/persistence/repository/impl/UserChangeRecordRepositoryImpl.java +++ b/web-infrastructure/src/main/java/com/zcloud/basic/info/persistence/repository/impl/UserChangeRecordRepositoryImpl.java @@ -1,7 +1,6 @@ package com.zcloud.basic.info.persistence.repository.impl; import com.jjb.saas.framework.repository.common.PageHelper; -import com.zcloud.basic.info.persistence.dataobject.UserChangeRecordDO; import com.zcloud.basic.info.persistence.mapper.UserChangeRecordMapper; import com.zcloud.basic.info.persistence.repository.UserChangeRecordRepository; import com.alibaba.cola.dto.SingleResponse;