dev:修改字段

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
  *

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;

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;

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;

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;

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;

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;

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-离职待审核
+    //入职状态，1-待审批, 2-通过
-    @ApiModelProperty(value = "入职状态，1-在职 0-离职, 2-入职待审核, 3-离职待审核")
+    @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;
 }

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
  *

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

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;

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-离职待审核
+    //入职状态，1-待审批, 2-通过
-    @ApiModelProperty(value = "入职状态，1-在职 0-离职, 2-入职待审核, 3-离职待审核")
+    @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;

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;
 

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;

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;