From 0a306f0e572cbcc9b751b880b18b500441ed8c10 Mon Sep 17 00:00:00 2001 From: zhangyue Date: Fri, 7 Nov 2025 09:24:27 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E7=94=A8=E6=88=B7=E5=AD=97=E6=AE=B5?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=20=E5=A2=9E=E5=8A=A0=E7=94=A8=E6=88=B7?= =?UTF-8?q?=E5=B1=A5=E8=81=8C=E6=97=A5=E5=BF=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../info/web/UserEmploymentLogController.java | 83 ++++++++++++++ .../zcloud/basic/info/command/UserAddExe.java | 8 ++ .../info/command/UserEmploymentLogAddExe.java | 40 +++++++ .../command/UserEmploymentLogRemoveExe.java | 39 +++++++ .../command/UserEmploymentLogUpdateExe.java | 34 ++++++ .../UserEmploymentLogCoConvertor.java | 24 +++++ .../query/UserEmploymentLogQueryExe.java | 59 ++++++++++ .../service/UserEmploymentLogServiceImpl.java | 66 ++++++++++++ .../info/api/UserEmploymentLogServiceI.java | 31 ++++++ .../com/zcloud/basic/info/dto/UserAddCmd.java | 8 +- .../info/dto/UserEmploymentLogAddCmd.java | 57 ++++++++++ .../info/dto/UserEmploymentLogPageQry.java | 28 +++++ .../info/dto/UserEmploymentLogQryCmd.java | 18 ++++ .../info/dto/UserEmploymentLogUpdateCmd.java | 55 ++++++++++ .../zcloud/basic/info/dto/UserUpdateCmd.java | 8 +- .../zcloud/basic/info/dto/UserXgfAddCmd.java | 8 +- .../basic/info/dto/clientobject/UserCO.java | 4 +- .../dto/clientobject/UserEmploymentLogCO.java | 83 ++++++++++++++ .../gateway/UserEmploymentLogGateway.java | 31 ++++++ .../zcloud/basic/info/domain/model/UserE.java | 5 +- .../info/domain/model/UserEmploymentLogE.java | 66 ++++++++++++ .../UserEmploymentLogGatewayImpl.java | 50 +++++++++ .../info/persistence/dataobject/UserDO.java | 4 +- .../dataobject/UserEmploymentLogDO.java | 54 ++++++++++ .../mapper/UserEmploymentLogMapper.java | 17 +++ .../UserEmploymentLogRepository.java | 21 ++++ .../impl/UserEmploymentLogRepositoryImpl.java | 50 +++++++++ .../repository/impl/UserRepositoryImpl.java | 2 + .../src/main/resources/mapper/UserMapper.xml | 101 +++++++++++++----- 29 files changed, 1009 insertions(+), 45 deletions(-) create mode 100644 web-adapter/src/main/java/com/zcloud/basic/info/web/UserEmploymentLogController.java create mode 100644 web-app/src/main/java/com/zcloud/basic/info/command/UserEmploymentLogAddExe.java create mode 100644 web-app/src/main/java/com/zcloud/basic/info/command/UserEmploymentLogRemoveExe.java create mode 100644 web-app/src/main/java/com/zcloud/basic/info/command/UserEmploymentLogUpdateExe.java create mode 100644 web-app/src/main/java/com/zcloud/basic/info/command/convertor/UserEmploymentLogCoConvertor.java create mode 100644 web-app/src/main/java/com/zcloud/basic/info/command/query/UserEmploymentLogQueryExe.java create mode 100644 web-app/src/main/java/com/zcloud/basic/info/service/UserEmploymentLogServiceImpl.java create mode 100644 web-client/src/main/java/com/zcloud/basic/info/api/UserEmploymentLogServiceI.java create mode 100644 web-client/src/main/java/com/zcloud/basic/info/dto/UserEmploymentLogAddCmd.java create mode 100644 web-client/src/main/java/com/zcloud/basic/info/dto/UserEmploymentLogPageQry.java create mode 100644 web-client/src/main/java/com/zcloud/basic/info/dto/UserEmploymentLogQryCmd.java create mode 100644 web-client/src/main/java/com/zcloud/basic/info/dto/UserEmploymentLogUpdateCmd.java create mode 100644 web-client/src/main/java/com/zcloud/basic/info/dto/clientobject/UserEmploymentLogCO.java create mode 100644 web-domain/src/main/java/com/zcloud/basic/info/domain/gateway/UserEmploymentLogGateway.java create mode 100644 web-domain/src/main/java/com/zcloud/basic/info/domain/model/UserEmploymentLogE.java create mode 100644 web-infrastructure/src/main/java/com/zcloud/basic/info/gatewayimpl/UserEmploymentLogGatewayImpl.java create mode 100644 web-infrastructure/src/main/java/com/zcloud/basic/info/persistence/dataobject/UserEmploymentLogDO.java create mode 100644 web-infrastructure/src/main/java/com/zcloud/basic/info/persistence/mapper/UserEmploymentLogMapper.java create mode 100644 web-infrastructure/src/main/java/com/zcloud/basic/info/persistence/repository/UserEmploymentLogRepository.java create mode 100644 web-infrastructure/src/main/java/com/zcloud/basic/info/persistence/repository/impl/UserEmploymentLogRepositoryImpl.java diff --git a/web-adapter/src/main/java/com/zcloud/basic/info/web/UserEmploymentLogController.java b/web-adapter/src/main/java/com/zcloud/basic/info/web/UserEmploymentLogController.java new file mode 100644 index 0000000..32d9455 --- /dev/null +++ b/web-adapter/src/main/java/com/zcloud/basic/info/web/UserEmploymentLogController.java @@ -0,0 +1,83 @@ +package com.zcloud.basic.info.web; + + +import com.alibaba.cola.dto.MultiResponse; +import com.alibaba.cola.dto.PageResponse; +import com.alibaba.cola.dto.Response; +import com.alibaba.cola.dto.SingleResponse; +import com.jjb.saas.framework.auth.model.SSOUser; +import com.jjb.saas.framework.auth.utils.AuthContext; +import com.zcloud.basic.info.api.UserEmploymentLogServiceI; +import com.zcloud.basic.info.dto.UserEmploymentLogAddCmd; +import com.zcloud.basic.info.dto.UserEmploymentLogPageQry; +import com.zcloud.basic.info.dto.UserEmploymentLogQryCmd; +import com.zcloud.basic.info.dto.UserEmploymentLogUpdateCmd; +import com.zcloud.basic.info.dto.clientobject.UserEmploymentLogCO; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import lombok.AllArgsConstructor; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.*; + +import java.util.ArrayList; + +/** + * web-adapter + * + * @Author zhangyue + * @Date 2025-11-06 19:15:37 + */ +@Api(tags = "用户资质信息") +@RequestMapping("/${application.gateway}/userEmploymentLog") +@RestController +@AllArgsConstructor +public class UserEmploymentLogController { + private final UserEmploymentLogServiceI userEmploymentLogService; + + @ApiOperation("新增") + @PostMapping("/save") + public SingleResponse add(@Validated @RequestBody UserEmploymentLogAddCmd cmd) { + SSOUser ssoUser = AuthContext.getCurrentUser(); + return userEmploymentLogService.add(cmd); + } + + @ApiOperation("分页") + @PostMapping("/list") + public PageResponse page(@RequestBody UserEmploymentLogPageQry qry) { + return userEmploymentLogService.listPage(qry); + } + + @ApiOperation("所有数据") + @GetMapping("/listAll") + public MultiResponse listAll(UserEmploymentLogQryCmd qry) { + return userEmploymentLogService.listAll(qry); + } + + @ApiOperation("详情") + @GetMapping("/{id}") + public SingleResponse getInfoById(@PathVariable("id") Long id) { + return SingleResponse.of(new UserEmploymentLogCO()); + } + + @ApiOperation("删除") + @DeleteMapping("/{id}") + public Response remove(@PathVariable("id") Long id) { + userEmploymentLogService.remove(id); + return SingleResponse.buildSuccess(); + } + + @ApiOperation("删除多个") + @DeleteMapping("/ids") + public Response removeBatch(@RequestParam Long[] ids) { + userEmploymentLogService.removeBatch(ids); + return SingleResponse.buildSuccess(); + } + + @ApiOperation("修改") + @PutMapping("/edit") + public SingleResponse edit(@Validated @RequestBody UserEmploymentLogUpdateCmd userEmploymentLogUpdateCmd) { + userEmploymentLogService.edit(userEmploymentLogUpdateCmd); + return SingleResponse.buildSuccess(); + } +} + diff --git a/web-app/src/main/java/com/zcloud/basic/info/command/UserAddExe.java b/web-app/src/main/java/com/zcloud/basic/info/command/UserAddExe.java index ce4043b..a3248b9 100644 --- a/web-app/src/main/java/com/zcloud/basic/info/command/UserAddExe.java +++ b/web-app/src/main/java/com/zcloud/basic/info/command/UserAddExe.java @@ -7,10 +7,13 @@ import com.jjb.saas.system.client.role.facade.RoleFacade; import com.jjb.saas.system.client.user.facade.UserFacade; import com.jjb.saas.system.client.user.request.FacadeUserAddCmd; import com.zcloud.basic.info.command.convertor.UserCoConvertor; +import com.zcloud.basic.info.domain.gateway.UserEmploymentLogGateway; import com.zcloud.basic.info.domain.gateway.UserGateway; import com.zcloud.basic.info.domain.model.UserE; +import com.zcloud.basic.info.domain.model.UserEmploymentLogE; import com.zcloud.basic.info.dto.UserAddCmd; import com.zcloud.basic.info.dto.UserXgfAddCmd; +import com.zcloud.basic.info.persistence.dataobject.UserEmploymentLogDO; import com.zcloud.gbscommon.utils.Tools; import lombok.AllArgsConstructor; import org.apache.dubbo.config.annotation.DubboReference; @@ -33,6 +36,7 @@ import org.springframework.transaction.annotation.Transactional; public class UserAddExe { private final UserGateway userGateway; private UserCoConvertor userCoConvertor; + private final UserEmploymentLogGateway userEmploymentLogGateway; // @Autowired // private RedisTemplate redisTemplate; @DubboReference(check = false) @@ -47,9 +51,13 @@ public class UserAddExe { UserE userE = new UserE(); BeanUtils.copyProperties(cmd, userE); userE.initAdd(tenantId, userE); + UserEmploymentLogE userEmploymentLogE = new UserEmploymentLogE(); + BeanUtils.copyProperties(userE, userEmploymentLogE); + userEmploymentLogE.initAdd(userEmploymentLogE); boolean res = false; try { res = userGateway.add(userE); + userEmploymentLogGateway.add(userEmploymentLogE); // FacadeUserAddCmd facadeUserAddCmd = new FacadeUserAddCmd(); // facadeUserAddCmd.setAccount(userE.getUsername()); // FacadeUserAddCmd facadeUserAddCmd = userCoConvertor.converEToFacadeUserAddCmd(userE); diff --git a/web-app/src/main/java/com/zcloud/basic/info/command/UserEmploymentLogAddExe.java b/web-app/src/main/java/com/zcloud/basic/info/command/UserEmploymentLogAddExe.java new file mode 100644 index 0000000..9361d15 --- /dev/null +++ b/web-app/src/main/java/com/zcloud/basic/info/command/UserEmploymentLogAddExe.java @@ -0,0 +1,40 @@ +package com.zcloud.basic.info.command; + +import com.alibaba.cola.exception.BizException; +import com.zcloud.basic.info.domain.gateway.UserEmploymentLogGateway; +import com.zcloud.basic.info.domain.model.UserEmploymentLogE; +import com.zcloud.basic.info.dto.UserEmploymentLogAddCmd; +import lombok.AllArgsConstructor; +import org.springframework.beans.BeanUtils; +import org.springframework.stereotype.Component; +import org.springframework.transaction.annotation.Transactional; + + +/** + * web-app + * + * @Author zhangyue + * @Date 2025-11-06 19:15:36 + */ +@Component +@AllArgsConstructor +public class UserEmploymentLogAddExe { + private final UserEmploymentLogGateway userEmploymentLogGateway; + + @Transactional(rollbackFor = Exception.class) + public boolean execute(UserEmploymentLogAddCmd cmd) { + UserEmploymentLogE userEmploymentLogE = new UserEmploymentLogE(); + BeanUtils.copyProperties(cmd, userEmploymentLogE); + boolean res = false; + try { + res = userEmploymentLogGateway.add(userEmploymentLogE); + } catch (Exception e) { + throw new RuntimeException(e); + } + if (!res) { + throw new BizException("保存失败"); + } + return true; + } +} + diff --git a/web-app/src/main/java/com/zcloud/basic/info/command/UserEmploymentLogRemoveExe.java b/web-app/src/main/java/com/zcloud/basic/info/command/UserEmploymentLogRemoveExe.java new file mode 100644 index 0000000..8a1de9f --- /dev/null +++ b/web-app/src/main/java/com/zcloud/basic/info/command/UserEmploymentLogRemoveExe.java @@ -0,0 +1,39 @@ +package com.zcloud.basic.info.command; + +import com.alibaba.cola.exception.BizException; +import com.zcloud.basic.info.domain.gateway.UserEmploymentLogGateway; +import lombok.AllArgsConstructor; +import org.springframework.stereotype.Component; +import org.springframework.transaction.annotation.Transactional; + + +/** + * web-app + * + * @Author zhangyue + * @Date 2025-11-06 19:15:37 + */ +@Component +@AllArgsConstructor +public class UserEmploymentLogRemoveExe { + private final UserEmploymentLogGateway userEmploymentLogGateway; + + @Transactional(rollbackFor = Exception.class) + public boolean execute(Long id) { + boolean res = userEmploymentLogGateway.deletedUserEmploymentLogById(id); + if (!res) { + throw new BizException("删除失败"); + } + return true; + } + + @Transactional(rollbackFor = Exception.class) + public boolean execute(Long[] ids) { + boolean res = userEmploymentLogGateway.deletedUserEmploymentLogByIds(ids); + if (!res) { + throw new BizException("删除失败"); + } + return true; + } +} + diff --git a/web-app/src/main/java/com/zcloud/basic/info/command/UserEmploymentLogUpdateExe.java b/web-app/src/main/java/com/zcloud/basic/info/command/UserEmploymentLogUpdateExe.java new file mode 100644 index 0000000..5776779 --- /dev/null +++ b/web-app/src/main/java/com/zcloud/basic/info/command/UserEmploymentLogUpdateExe.java @@ -0,0 +1,34 @@ +package com.zcloud.basic.info.command; + +import com.alibaba.cola.exception.BizException; +import com.zcloud.basic.info.domain.gateway.UserEmploymentLogGateway; +import com.zcloud.basic.info.domain.model.UserEmploymentLogE; +import com.zcloud.basic.info.dto.UserEmploymentLogUpdateCmd; +import lombok.AllArgsConstructor; +import org.springframework.beans.BeanUtils; +import org.springframework.stereotype.Component; +import org.springframework.transaction.annotation.Transactional; + + +/** + * web-app + * + * @Author zhangyue + * @Date 2025-11-06 19:15:38 + */ +@Component +@AllArgsConstructor +public class UserEmploymentLogUpdateExe { + private final UserEmploymentLogGateway userEmploymentLogGateway; + + @Transactional(rollbackFor = Exception.class) + public void execute(UserEmploymentLogUpdateCmd userEmploymentLogUpdateCmd) { + UserEmploymentLogE userEmploymentLogE = new UserEmploymentLogE(); + BeanUtils.copyProperties(userEmploymentLogUpdateCmd, userEmploymentLogE); + boolean res = userEmploymentLogGateway.update(userEmploymentLogE); + if (!res) { + throw new BizException("修改失败"); + } + } +} + diff --git a/web-app/src/main/java/com/zcloud/basic/info/command/convertor/UserEmploymentLogCoConvertor.java b/web-app/src/main/java/com/zcloud/basic/info/command/convertor/UserEmploymentLogCoConvertor.java new file mode 100644 index 0000000..e2f95fb --- /dev/null +++ b/web-app/src/main/java/com/zcloud/basic/info/command/convertor/UserEmploymentLogCoConvertor.java @@ -0,0 +1,24 @@ +package com.zcloud.basic.info.command.convertor; + +import com.zcloud.basic.info.dto.clientobject.UserEmploymentLogCO; +import com.zcloud.basic.info.persistence.dataobject.UserEmploymentLogDO; +import org.mapstruct.Mapper; + +import java.util.List; + + +/** + * web-app + * + * @Author zhangyue + * @Date 2025-11-06 19:15:37 + */ +@Mapper(componentModel = "spring") +public interface UserEmploymentLogCoConvertor { + /** + * @param userEmploymentLogDOs + * @return + */ + List converDOsToCOs(List userEmploymentLogDOs); +} + diff --git a/web-app/src/main/java/com/zcloud/basic/info/command/query/UserEmploymentLogQueryExe.java b/web-app/src/main/java/com/zcloud/basic/info/command/query/UserEmploymentLogQueryExe.java new file mode 100644 index 0000000..b4dfb76 --- /dev/null +++ b/web-app/src/main/java/com/zcloud/basic/info/command/query/UserEmploymentLogQueryExe.java @@ -0,0 +1,59 @@ +package com.zcloud.basic.info.command.query; + +import com.alibaba.cola.dto.MultiResponse; +import com.alibaba.cola.dto.PageResponse; +import com.zcloud.basic.info.command.convertor.UserEmploymentLogCoConvertor; +import com.zcloud.basic.info.dto.UserEmploymentLogPageQry; +import com.zcloud.basic.info.dto.UserEmploymentLogQryCmd; +import com.zcloud.basic.info.dto.clientobject.UserEmploymentLogCO; +import com.zcloud.basic.info.persistence.dataobject.UserEmploymentLogDO; +import com.zcloud.basic.info.persistence.repository.UserEmploymentLogRepository; +import com.zcloud.gbscommon.utils.PageQueryHelper; +import lombok.AllArgsConstructor; +import org.springframework.stereotype.Component; + +import java.util.List; +import java.util.Map; + + +/** + * web-app + * + * @Author zhangyue + * @Date 2025-11-06 19:15:37 + */ +@Component +@AllArgsConstructor +public class UserEmploymentLogQueryExe { + private final UserEmploymentLogRepository userEmploymentLogRepository; + private final UserEmploymentLogCoConvertor userEmploymentLogCoConvertor; + + /** + * 分页 + * + * @param userEmploymentLogPageQry + * @return + */ + public PageResponse execute(UserEmploymentLogPageQry userEmploymentLogPageQry) { + Map params = PageQueryHelper.toHashMap(userEmploymentLogPageQry); + PageResponse pageResponse = userEmploymentLogRepository.listPage(params); + List examCenterCOS = userEmploymentLogCoConvertor.converDOsToCOs(pageResponse.getData()); + return PageResponse.of(examCenterCOS, pageResponse.getTotalCount(), pageResponse.getPageSize(), pageResponse.getPageIndex()); + } + /** + * 列表 + * + * @param userEmploymentLogQryCmd + * @return + */ + public MultiResponse executeListAll(UserEmploymentLogQryCmd userEmploymentLogQryCmd) { + Map params = PageQueryHelper.toHashMap(userEmploymentLogQryCmd); + List userEmploymentLogDOList = userEmploymentLogRepository.listAll(params); + List userEmploymentLogCOList = userEmploymentLogCoConvertor.converDOsToCOs(userEmploymentLogDOList); + return MultiResponse.of(userEmploymentLogCOList); + } + + + +} + diff --git a/web-app/src/main/java/com/zcloud/basic/info/service/UserEmploymentLogServiceImpl.java b/web-app/src/main/java/com/zcloud/basic/info/service/UserEmploymentLogServiceImpl.java new file mode 100644 index 0000000..2f34386 --- /dev/null +++ b/web-app/src/main/java/com/zcloud/basic/info/service/UserEmploymentLogServiceImpl.java @@ -0,0 +1,66 @@ +package com.zcloud.basic.info.service; + +import com.alibaba.cola.dto.MultiResponse; +import com.alibaba.cola.dto.PageResponse; +import com.alibaba.cola.dto.SingleResponse; +import com.zcloud.basic.info.api.UserEmploymentLogServiceI; +import com.zcloud.basic.info.command.UserEmploymentLogAddExe; +import com.zcloud.basic.info.command.UserEmploymentLogRemoveExe; +import com.zcloud.basic.info.command.UserEmploymentLogUpdateExe; +import com.zcloud.basic.info.command.query.UserEmploymentLogQueryExe; +import com.zcloud.basic.info.dto.UserEmploymentLogAddCmd; +import com.zcloud.basic.info.dto.UserEmploymentLogPageQry; +import com.zcloud.basic.info.dto.UserEmploymentLogQryCmd; +import com.zcloud.basic.info.dto.UserEmploymentLogUpdateCmd; +import com.zcloud.basic.info.dto.clientobject.UserEmploymentLogCO; +import lombok.AllArgsConstructor; +import org.springframework.stereotype.Service; + +/** + * web-app + * + * @Author zhangyue + * @Date 2025-11-06 19:15:37 + */ +@Service +@AllArgsConstructor +public class UserEmploymentLogServiceImpl implements UserEmploymentLogServiceI { + private final UserEmploymentLogAddExe userEmploymentLogAddExe; + private final UserEmploymentLogUpdateExe userEmploymentLogUpdateExe; + private final UserEmploymentLogRemoveExe userEmploymentLogRemoveExe; + private final UserEmploymentLogQueryExe userEmploymentLogQueryExe; + + @Override + public PageResponse listPage(UserEmploymentLogPageQry qry) { + + return userEmploymentLogQueryExe.execute(qry); + } + + @Override + public SingleResponse add(UserEmploymentLogAddCmd cmd) { + + userEmploymentLogAddExe.execute(cmd); + return SingleResponse.buildSuccess(); + } + + @Override + public void edit(UserEmploymentLogUpdateCmd userEmploymentLogUpdateCmd) { + userEmploymentLogUpdateExe.execute(userEmploymentLogUpdateCmd); + } + + @Override + public void remove(Long id) { + userEmploymentLogRemoveExe.execute(id); + } + + @Override + public void removeBatch(Long[] ids) { + userEmploymentLogRemoveExe.execute(ids); + } + + @Override + public MultiResponse listAll(UserEmploymentLogQryCmd qry) { + return userEmploymentLogQueryExe.executeListAll(qry); + } +} + diff --git a/web-client/src/main/java/com/zcloud/basic/info/api/UserEmploymentLogServiceI.java b/web-client/src/main/java/com/zcloud/basic/info/api/UserEmploymentLogServiceI.java new file mode 100644 index 0000000..db842f3 --- /dev/null +++ b/web-client/src/main/java/com/zcloud/basic/info/api/UserEmploymentLogServiceI.java @@ -0,0 +1,31 @@ +package com.zcloud.basic.info.api; + +import com.alibaba.cola.dto.MultiResponse; +import com.alibaba.cola.dto.PageResponse; +import com.alibaba.cola.dto.SingleResponse; +import com.zcloud.basic.info.dto.UserEmploymentLogAddCmd; +import com.zcloud.basic.info.dto.UserEmploymentLogPageQry; +import com.zcloud.basic.info.dto.UserEmploymentLogQryCmd; +import com.zcloud.basic.info.dto.UserEmploymentLogUpdateCmd; +import com.zcloud.basic.info.dto.clientobject.UserEmploymentLogCO; + +/** + * web-client + * + * @Author zhangyue + * @Date 2025-11-06 19:15:37 + */ +public interface UserEmploymentLogServiceI { + PageResponse listPage(UserEmploymentLogPageQry qry); + + SingleResponse add(UserEmploymentLogAddCmd cmd); + + void edit(UserEmploymentLogUpdateCmd cmd); + + void remove(Long id); + + void removeBatch(Long[] ids); + + MultiResponse listAll(UserEmploymentLogQryCmd qry); +} + diff --git a/web-client/src/main/java/com/zcloud/basic/info/dto/UserAddCmd.java b/web-client/src/main/java/com/zcloud/basic/info/dto/UserAddCmd.java index 7a53266..ca76698 100644 --- a/web-client/src/main/java/com/zcloud/basic/info/dto/UserAddCmd.java +++ b/web-client/src/main/java/com/zcloud/basic/info/dto/UserAddCmd.java @@ -85,10 +85,10 @@ public class UserAddCmd extends Command { @ApiModelProperty(value = "户口所在地", name = "locationAddress") private String locationAddress; - @ApiModelProperty(value = "职级", name = "rank") - private String rank; - @ApiModelProperty(value = "职级名称", name = "rank_name") - private String rank_name; + @ApiModelProperty(value = "职级", name = "rank_level") + private String rank_level; + @ApiModelProperty(value = "职级名称", name = "rank_level_name") + private String rank_level_name; // TODO 待确认企业端和监管端是否必填 @ApiModelProperty(value = "人员在部门中的排序", name = "sort") diff --git a/web-client/src/main/java/com/zcloud/basic/info/dto/UserEmploymentLogAddCmd.java b/web-client/src/main/java/com/zcloud/basic/info/dto/UserEmploymentLogAddCmd.java new file mode 100644 index 0000000..0f2d9ff --- /dev/null +++ b/web-client/src/main/java/com/zcloud/basic/info/dto/UserEmploymentLogAddCmd.java @@ -0,0 +1,57 @@ +package com.zcloud.basic.info.dto; + +import com.alibaba.cola.dto.Command; +import io.swagger.annotations.ApiModelProperty; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.NoArgsConstructor; + +import javax.validation.constraints.NotEmpty; +import javax.validation.constraints.NotNull; + +/** + * web-client + * + * @Author zhangyue + * @Date 2025-11-06 19:15:36 + */ +@EqualsAndHashCode(callSuper = true) +@Data +@NoArgsConstructor +@AllArgsConstructor +public class UserEmploymentLogAddCmd extends Command { + @ApiModelProperty(value = "用户id", name = "userId", required = true) + @NotNull(message = "用户id不能为空") + private Long userId; + + @ApiModelProperty(value = "企业id", name = "corpinfoId", required = true) + @NotNull(message = "企业id不能为空") + private Long corpinfoId; + + @ApiModelProperty(value = "企业名称", name = "corpinfoName", required = true) + @NotEmpty(message = "企业名称不能为空") + private String corpinfoName; + + @ApiModelProperty(value = "部门id", name = "departmentId", required = true) + @NotNull(message = "部门id不能为空") + private Long departmentId; + + @ApiModelProperty(value = "部门名称", name = "departmentName", required = true) + @NotEmpty(message = "部门名称不能为空") + private String departmentName; + + @ApiModelProperty(value = "岗位id", name = "postId", required = true) + @NotNull(message = "岗位id不能为空") + private Long postId; + + @ApiModelProperty(value = "岗位名称", name = "postName", required = true) + @NotEmpty(message = "岗位名称不能为空") + private String postName; + + @ApiModelProperty(value = "入职状态，1-入职 0-离职", name = "employmentFlag", required = true) + @NotNull(message = "入职状态，1-入职 0-离职不能为空") + private Integer employmentFlag; + +} + diff --git a/web-client/src/main/java/com/zcloud/basic/info/dto/UserEmploymentLogPageQry.java b/web-client/src/main/java/com/zcloud/basic/info/dto/UserEmploymentLogPageQry.java new file mode 100644 index 0000000..9b14b6f --- /dev/null +++ b/web-client/src/main/java/com/zcloud/basic/info/dto/UserEmploymentLogPageQry.java @@ -0,0 +1,28 @@ +package com.zcloud.basic.info.dto; + +import com.alibaba.cola.dto.PageQuery; +import lombok.Data; + + +/** + * web-client + * + * @Author zhangyue + * @Date 2025-11-06 19:15:37 + */ +@Data +public class UserEmploymentLogPageQry extends PageQuery { + + /** + * 查询条件操作前缀,支持以下几种数据库查询操作： + * - `like`: 模糊匹配查询，对应SQL的LIKE操作符 + * - `eq`: 等值查询，对应SQL的=操作符 + * - `gt`: 大于比较查询 + * - `lt`: 小于比较查询 + * - `ge`: 大于等于比较查询 + * - `le`: 小于等于比较查询 + * - `ne`: 不等比较查询，对应SQL的!=操作符 + */ + private String likeUserEmploymentLogId; +} + diff --git a/web-client/src/main/java/com/zcloud/basic/info/dto/UserEmploymentLogQryCmd.java b/web-client/src/main/java/com/zcloud/basic/info/dto/UserEmploymentLogQryCmd.java new file mode 100644 index 0000000..96328b8 --- /dev/null +++ b/web-client/src/main/java/com/zcloud/basic/info/dto/UserEmploymentLogQryCmd.java @@ -0,0 +1,18 @@ +package com.zcloud.basic.info.dto; + +import com.alibaba.cola.dto.PageQuery; +import lombok.Data; + + +/** + * web-client + * + * @Author zhangyue + * @Date 2025-11-06 19:15:37 + */ +@Data +public class UserEmploymentLogQryCmd{ + + private String likeUserEmploymentLogId; +} + diff --git a/web-client/src/main/java/com/zcloud/basic/info/dto/UserEmploymentLogUpdateCmd.java b/web-client/src/main/java/com/zcloud/basic/info/dto/UserEmploymentLogUpdateCmd.java new file mode 100644 index 0000000..a2be6d4 --- /dev/null +++ b/web-client/src/main/java/com/zcloud/basic/info/dto/UserEmploymentLogUpdateCmd.java @@ -0,0 +1,55 @@ +package com.zcloud.basic.info.dto; + +import com.alibaba.cola.dto.Command; +import io.swagger.annotations.ApiModelProperty; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.NoArgsConstructor; + +import javax.validation.constraints.NotEmpty; +import javax.validation.constraints.NotNull; + +/** + * web-client + * + * @Author zhangyue + * @Date 2025-11-06 19:15:37 + */ +@EqualsAndHashCode(callSuper = true) +@Data +@NoArgsConstructor +@AllArgsConstructor +public class UserEmploymentLogUpdateCmd extends Command { + @ApiModelProperty(value = "主键", name = "id", required = true) + @NotNull(message = "主键不能为空") + private Long id; + @ApiModelProperty(value = "业务主键id", name = "userEmploymentLogId", required = true) + @NotEmpty(message = "业务主键id不能为空") + private String userEmploymentLogId; + @ApiModelProperty(value = "用户id", name = "userId", required = true) + @NotNull(message = "用户id不能为空") + private Long userId; + @ApiModelProperty(value = "企业id", name = "corpinfoId", required = true) + @NotNull(message = "企业id不能为空") + private Long corpinfoId; + @ApiModelProperty(value = "企业名称", name = "corpinfoName", required = true) + @NotEmpty(message = "企业名称不能为空") + private String corpinfoName; + @ApiModelProperty(value = "部门id", name = "departmentId", required = true) + @NotNull(message = "部门id不能为空") + private Long departmentId; + @ApiModelProperty(value = "部门名称", name = "departmentName", required = true) + @NotEmpty(message = "部门名称不能为空") + private String departmentName; + @ApiModelProperty(value = "岗位id", name = "postId", required = true) + @NotNull(message = "岗位id不能为空") + private Long postId; + @ApiModelProperty(value = "岗位名称", name = "postName", required = true) + @NotEmpty(message = "岗位名称不能为空") + private String postName; + @ApiModelProperty(value = "入职状态，1-入职 0-离职", name = "employmentFlag", required = true) + @NotNull(message = "入职状态，1-入职 0-离职不能为空") + private Integer employmentFlag; +} + diff --git a/web-client/src/main/java/com/zcloud/basic/info/dto/UserUpdateCmd.java b/web-client/src/main/java/com/zcloud/basic/info/dto/UserUpdateCmd.java index 567a0db..ae8878f 100644 --- a/web-client/src/main/java/com/zcloud/basic/info/dto/UserUpdateCmd.java +++ b/web-client/src/main/java/com/zcloud/basic/info/dto/UserUpdateCmd.java @@ -63,10 +63,10 @@ public class UserUpdateCmd extends Command { private String locationAddress; @ApiModelProperty(value = "手机号", name = "phone") private String phone; - @ApiModelProperty(value = "职级", name = "rank") - private String rank; - @ApiModelProperty(value = "职级名称", name = "rank_name") - private String rank_name; + @ApiModelProperty(value = "职级", name = "rank_level") + private String rank_level; + @ApiModelProperty(value = "职级名称", name = "rank_level_name") + private String rank_level_name; @ApiModelProperty(value = "人员在部门中的排序", name = "sort") private Integer sort; @ApiModelProperty(value = "描述", name = "remarks") diff --git a/web-client/src/main/java/com/zcloud/basic/info/dto/UserXgfAddCmd.java b/web-client/src/main/java/com/zcloud/basic/info/dto/UserXgfAddCmd.java index ddfd0b4..80ae8d7 100644 --- a/web-client/src/main/java/com/zcloud/basic/info/dto/UserXgfAddCmd.java +++ b/web-client/src/main/java/com/zcloud/basic/info/dto/UserXgfAddCmd.java @@ -88,10 +88,10 @@ public class UserXgfAddCmd extends Command { @ApiModelProperty(value = "户口所在地", name = "locationAddress", required = true) @NotEmpty(message = "户口所在地不能为空") private String locationAddress; - @ApiModelProperty(value = "职级", name = "rank") - private String rank; - @ApiModelProperty(value = "职级名称", name = "rank_name") - private String rank_name; + @ApiModelProperty(value = "职级", name = "rank_level") + private String rank_level; + @ApiModelProperty(value = "职级名称", name = "rank_level_name") + private String rank_level_name; @ApiModelProperty(value = "人员在部门中的排序", name = "sort") private Integer sort; diff --git a/web-client/src/main/java/com/zcloud/basic/info/dto/clientobject/UserCO.java b/web-client/src/main/java/com/zcloud/basic/info/dto/clientobject/UserCO.java index e254a6e..3757d20 100644 --- a/web-client/src/main/java/com/zcloud/basic/info/dto/clientobject/UserCO.java +++ b/web-client/src/main/java/com/zcloud/basic/info/dto/clientobject/UserCO.java @@ -94,9 +94,9 @@ public class UserCO extends ClientObject { private String locationAddress; @ApiModelProperty(value = "职级") - private String rank; + private String rank_level; @ApiModelProperty(value = "职级名称") - private String rank_name; + private String rank_level_name; @ApiModelProperty(value = "手机号") private String phone; //人员在部门中的排序 diff --git a/web-client/src/main/java/com/zcloud/basic/info/dto/clientobject/UserEmploymentLogCO.java b/web-client/src/main/java/com/zcloud/basic/info/dto/clientobject/UserEmploymentLogCO.java new file mode 100644 index 0000000..750dc11 --- /dev/null +++ b/web-client/src/main/java/com/zcloud/basic/info/dto/clientobject/UserEmploymentLogCO.java @@ -0,0 +1,83 @@ +package com.zcloud.basic.info.dto.clientobject; + +import com.alibaba.cola.dto.ClientObject; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + + +/** + * web-client + * + * @Author zhangyue + * @Date 2025-11-06 19:15:37 + */ +@Data +public class UserEmploymentLogCO extends ClientObject { + //主键 + @ApiModelProperty(value = "主键") + private Long id; + //业务主键id + @ApiModelProperty(value = "业务主键id") + private String userEmploymentLogId; + //用户id + @ApiModelProperty(value = "用户id") + private Long userId; + //企业id + @ApiModelProperty(value = "企业id") + private Long corpinfoId; + //企业名称 + @ApiModelProperty(value = "企业名称") + private String corpinfoName; + //部门id + @ApiModelProperty(value = "部门id") + private Long departmentId; + //部门名称 + @ApiModelProperty(value = "部门名称") + private String departmentName; + //岗位id + @ApiModelProperty(value = "岗位id") + private Long postId; + //岗位名称 + @ApiModelProperty(value = "岗位名称") + private String postName; + //入职状态，1-入职 0-离职 + @ApiModelProperty(value = "入职状态，1-入职 0-离职") + private Integer employmentFlag; + //是否删除 + @ApiModelProperty(value = "是否删除") + private String deleteEnum; + //租户id + @ApiModelProperty(value = "租户id") + private Long tenantId; + //组织id + @ApiModelProperty(value = "组织id") + private Long orgId; + //版本号 + @ApiModelProperty(value = "版本号") + private Integer version; + //创建时间 + @ApiModelProperty(value = "创建时间") + private String createTime; + //修改时间 + @ApiModelProperty(value = "修改时间") + private String updateTime; + //创建人id + @ApiModelProperty(value = "创建人id") + private Long createId; + //修改人id + @ApiModelProperty(value = "修改人id") + private Long updateId; + //创建人 + @ApiModelProperty(value = "创建人") + private String createName; + //修改人 + @ApiModelProperty(value = "修改人") + private String updateName; + //备注 + @ApiModelProperty(value = "备注") + private String remarks; + //环境 + @ApiModelProperty(value = "环境") + private String env; +} + diff --git a/web-domain/src/main/java/com/zcloud/basic/info/domain/gateway/UserEmploymentLogGateway.java b/web-domain/src/main/java/com/zcloud/basic/info/domain/gateway/UserEmploymentLogGateway.java new file mode 100644 index 0000000..74d4b65 --- /dev/null +++ b/web-domain/src/main/java/com/zcloud/basic/info/domain/gateway/UserEmploymentLogGateway.java @@ -0,0 +1,31 @@ +package com.zcloud.basic.info.domain.gateway; + + +import com.zcloud.basic.info.domain.model.UserEmploymentLogE; + +/** + * web-domain + * + * @Author zhangyue + * @Date 2025-11-06 19:15:37 + */ +public interface UserEmploymentLogGateway { + + /** + * 新增 + */ + Boolean add(UserEmploymentLogE userEmploymentLogE); + + /** + * 修改 + */ + Boolean update(UserEmploymentLogE userEmploymentLogE); + + /** + * 删除 + */ + Boolean deletedUserEmploymentLogById(Long id); + + Boolean deletedUserEmploymentLogByIds(Long[] id); +} + diff --git a/web-domain/src/main/java/com/zcloud/basic/info/domain/model/UserE.java b/web-domain/src/main/java/com/zcloud/basic/info/domain/model/UserE.java index 6990887..2bef68a 100644 --- a/web-domain/src/main/java/com/zcloud/basic/info/domain/model/UserE.java +++ b/web-domain/src/main/java/com/zcloud/basic/info/domain/model/UserE.java @@ -59,10 +59,10 @@ public class UserE extends BaseE { //户口所在地 private String locationAddress; - private String rank; + private String rank_level; private String phone; - private String rank_name; + private String rank_level_name; //人员在部门中的排序 private Integer sort; //乐观锁 @@ -115,6 +115,7 @@ public class UserE extends BaseE { userE.setUserId(Tools.get32UUID()); userE.setTenantId(!ObjectUtils.isEmpty(userE.getTenantId())? userE.getTenantId() : tenantId); userE.setCorpinfoId(!ObjectUtils.isEmpty(userE.getCorpinfoId())? userE.getCorpinfoId() : tenantId); + userE.setEmploymentFlag(1); } public Response verifyUser(Long userCount) { if (userCount > 0) { diff --git a/web-domain/src/main/java/com/zcloud/basic/info/domain/model/UserEmploymentLogE.java b/web-domain/src/main/java/com/zcloud/basic/info/domain/model/UserEmploymentLogE.java new file mode 100644 index 0000000..538464c --- /dev/null +++ b/web-domain/src/main/java/com/zcloud/basic/info/domain/model/UserEmploymentLogE.java @@ -0,0 +1,66 @@ +package com.zcloud.basic.info.domain.model; + +import com.jjb.saas.framework.domain.model.BaseE; +import com.zcloud.gbscommon.utils.Tools; +import lombok.Data; + +import java.time.LocalDateTime; + +/** + * web-domain + * + * @Author zhangyue + * @Date 2025-11-06 19:15:37 + */ +@Data +public class UserEmploymentLogE extends BaseE { + //主键 + private Long id; + //业务主键id + private String userEmploymentLogId; + //用户id + private Long userId; + //企业id + private Long corpinfoId; + //企业名称 + private String corpinfoName; + //部门id + private Long departmentId; + //部门名称 + private String departmentName; + //岗位id + private Long postId; + //岗位名称 + private String postName; + //入职状态，1-入职 0-离职 + private Integer employmentFlag; + //是否删除 + private String deleteEnum; + //租户id + private Long tenantId; + //组织id + private Long orgId; + //版本号 + private Integer version; + //创建时间 + private LocalDateTime createTime; + //修改时间 + private LocalDateTime updateTime; + //创建人id + private Long createId; + //修改人id + private Long updateId; + //创建人 + private String createName; + //修改人 + private String updateName; + //备注 + private String remarks; + //环境 + private String env; + + public void initAdd(UserEmploymentLogE userEmploymentLogE) { + userEmploymentLogE.setUserEmploymentLogId(Tools.get32UUID()); + } +} + diff --git a/web-infrastructure/src/main/java/com/zcloud/basic/info/gatewayimpl/UserEmploymentLogGatewayImpl.java b/web-infrastructure/src/main/java/com/zcloud/basic/info/gatewayimpl/UserEmploymentLogGatewayImpl.java new file mode 100644 index 0000000..d882d21 --- /dev/null +++ b/web-infrastructure/src/main/java/com/zcloud/basic/info/gatewayimpl/UserEmploymentLogGatewayImpl.java @@ -0,0 +1,50 @@ +package com.zcloud.basic.info.gatewayimpl; + +import com.zcloud.basic.info.domain.gateway.UserEmploymentLogGateway; +import com.zcloud.basic.info.domain.model.UserEmploymentLogE; +import com.zcloud.basic.info.persistence.dataobject.UserEmploymentLogDO; +import com.zcloud.basic.info.persistence.repository.UserEmploymentLogRepository; +import lombok.AllArgsConstructor; +import org.springframework.beans.BeanUtils; +import org.springframework.stereotype.Service; + +import java.util.Collections; + +/** + * web-infrastructure + * + * @Author zhangyue + * @Date 2025-11-06 19:15:37 + */ +@Service +@AllArgsConstructor +public class UserEmploymentLogGatewayImpl implements UserEmploymentLogGateway { + private final UserEmploymentLogRepository userEmploymentLogRepository; + + @Override + public Boolean add(UserEmploymentLogE userEmploymentLogE) { + UserEmploymentLogDO d = new UserEmploymentLogDO(); + BeanUtils.copyProperties(userEmploymentLogE, d); + userEmploymentLogRepository.save(d); + return true; + } + + @Override + public Boolean update(UserEmploymentLogE userEmploymentLogE) { + UserEmploymentLogDO d = new UserEmploymentLogDO(); + BeanUtils.copyProperties(userEmploymentLogE, d); + userEmploymentLogRepository.updateById(d); + return true; + } + + @Override + public Boolean deletedUserEmploymentLogById(Long id) { + return userEmploymentLogRepository.removeById(id); + } + + @Override + public Boolean deletedUserEmploymentLogByIds(Long[] ids) { + return userEmploymentLogRepository.removeByIds(Collections.singletonList(ids)); + } +} + diff --git a/web-infrastructure/src/main/java/com/zcloud/basic/info/persistence/dataobject/UserDO.java b/web-infrastructure/src/main/java/com/zcloud/basic/info/persistence/dataobject/UserDO.java index 52f1754..1bd497a 100644 --- a/web-infrastructure/src/main/java/com/zcloud/basic/info/persistence/dataobject/UserDO.java +++ b/web-infrastructure/src/main/java/com/zcloud/basic/info/persistence/dataobject/UserDO.java @@ -89,9 +89,9 @@ public class UserDO extends BaseDO { @ApiModelProperty(value = "户口所在地") private String locationAddress; @ApiModelProperty(value = "职级") - private String rank; + private String rank_level; @ApiModelProperty(value = "职级名称") - private String rank_name; + private String rank_level_name; @ApiModelProperty(value = "手机号") private String phone; //人员在部门中的排序 diff --git a/web-infrastructure/src/main/java/com/zcloud/basic/info/persistence/dataobject/UserEmploymentLogDO.java b/web-infrastructure/src/main/java/com/zcloud/basic/info/persistence/dataobject/UserEmploymentLogDO.java new file mode 100644 index 0000000..ae5c16e --- /dev/null +++ b/web-infrastructure/src/main/java/com/zcloud/basic/info/persistence/dataobject/UserEmploymentLogDO.java @@ -0,0 +1,54 @@ +package com.zcloud.basic.info.persistence.dataobject; + +import com.baomidou.mybatisplus.annotation.TableName; +import com.jjb.saas.framework.repository.basedo.BaseDO; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.NoArgsConstructor; + +/** + * web-infrastructure + * + * @Author zhangyue + * @Date 2025-11-06 19:15:37 + */ +@Data +@TableName("user_employment_log") +@NoArgsConstructor +@EqualsAndHashCode(callSuper = true) +public class UserEmploymentLogDO extends BaseDO { + //业务主键id + @ApiModelProperty(value = "业务主键id") + private String userEmploymentLogId; + //用户id + @ApiModelProperty(value = "用户id") + private Long userId; + //企业id + @ApiModelProperty(value = "企业id") + private Long corpinfoId; + //企业名称 + @ApiModelProperty(value = "企业名称") + private String corpinfoName; + //部门id + @ApiModelProperty(value = "部门id") + private Long departmentId; + //部门名称 + @ApiModelProperty(value = "部门名称") + private String departmentName; + //岗位id + @ApiModelProperty(value = "岗位id") + private Long postId; + //岗位名称 + @ApiModelProperty(value = "岗位名称") + private String postName; + //入职状态，1-入职 0-离职 + @ApiModelProperty(value = "入职状态，1-入职 0-离职") + private Integer employmentFlag; + + public UserEmploymentLogDO(String userEmploymentLogId) { + this.userEmploymentLogId = userEmploymentLogId; + } + +} + diff --git a/web-infrastructure/src/main/java/com/zcloud/basic/info/persistence/mapper/UserEmploymentLogMapper.java b/web-infrastructure/src/main/java/com/zcloud/basic/info/persistence/mapper/UserEmploymentLogMapper.java new file mode 100644 index 0000000..ffa0467 --- /dev/null +++ b/web-infrastructure/src/main/java/com/zcloud/basic/info/persistence/mapper/UserEmploymentLogMapper.java @@ -0,0 +1,17 @@ +package com.zcloud.basic.info.persistence.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.zcloud.basic.info.persistence.dataobject.UserEmploymentLogDO; +import org.apache.ibatis.annotations.Mapper; + +/** + * web-infrastructure + * + * @Author zhangyue + * @Date 2025-11-06 19:15:37 + */ +@Mapper +public interface UserEmploymentLogMapper extends BaseMapper { + +} + diff --git a/web-infrastructure/src/main/java/com/zcloud/basic/info/persistence/repository/UserEmploymentLogRepository.java b/web-infrastructure/src/main/java/com/zcloud/basic/info/persistence/repository/UserEmploymentLogRepository.java new file mode 100644 index 0000000..7038f6a --- /dev/null +++ b/web-infrastructure/src/main/java/com/zcloud/basic/info/persistence/repository/UserEmploymentLogRepository.java @@ -0,0 +1,21 @@ +package com.zcloud.basic.info.persistence.repository; + +import com.alibaba.cola.dto.MultiResponse; +import com.alibaba.cola.dto.PageResponse; +import com.jjb.saas.framework.repository.repo.BaseRepository; +import com.zcloud.basic.info.persistence.dataobject.UserEmploymentLogDO; + +import java.util.List; +import java.util.Map; + +/** + * web-infrastructure + * + * @Author zhangyue + * @Date 2025-11-06 19:15:37 + */ +public interface UserEmploymentLogRepository extends BaseRepository { + PageResponse listPage(Map params); + List listAll(Map params); +} + diff --git a/web-infrastructure/src/main/java/com/zcloud/basic/info/persistence/repository/impl/UserEmploymentLogRepositoryImpl.java b/web-infrastructure/src/main/java/com/zcloud/basic/info/persistence/repository/impl/UserEmploymentLogRepositoryImpl.java new file mode 100644 index 0000000..fce9b6e --- /dev/null +++ b/web-infrastructure/src/main/java/com/zcloud/basic/info/persistence/repository/impl/UserEmploymentLogRepositoryImpl.java @@ -0,0 +1,50 @@ +package com.zcloud.basic.info.persistence.repository.impl; + +import com.alibaba.cola.dto.MultiResponse; +import com.alibaba.cola.dto.PageResponse; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.jjb.saas.framework.repository.common.PageHelper; +import com.jjb.saas.framework.repository.repo.impl.BaseRepositoryImpl; +import com.zcloud.basic.info.persistence.dataobject.UserEmploymentLogDO; +import com.zcloud.basic.info.persistence.mapper.UserEmploymentLogMapper; +import com.zcloud.basic.info.persistence.repository.UserEmploymentLogRepository; +import com.zcloud.gbscommon.utils.PageQueryHelper; +import com.zcloud.gbscommon.utils.Query; +import lombok.RequiredArgsConstructor; +import org.springframework.stereotype.Service; + +import java.util.List; +import java.util.Map; + +/** + * web-infrastructure + * + * @Author zhangyue + * @Date 2025-11-06 19:15:37 + */ +@Service +@RequiredArgsConstructor +public class UserEmploymentLogRepositoryImpl extends BaseRepositoryImpl implements UserEmploymentLogRepository { + private final UserEmploymentLogMapper userEmploymentLogMapper; + + @Override + public PageResponse listPage(Map params) { + IPage iPage = new Query().getPage(params); + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper = PageQueryHelper.createPageQueryWrapper(queryWrapper, params); + queryWrapper.orderByDesc("create_time"); + IPage result = userEmploymentLogMapper.selectPage(iPage, queryWrapper); + return PageHelper.pageToResponse(result, result.getRecords()); + } + + @Override + public List listAll(Map params) { + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper = PageQueryHelper.createPageQueryWrapper(queryWrapper, params); + queryWrapper.orderByDesc("create_time"); + queryWrapper.eq("delete_enum","FALSE"); + return userEmploymentLogMapper.selectList(queryWrapper); + } +} + diff --git a/web-infrastructure/src/main/java/com/zcloud/basic/info/persistence/repository/impl/UserRepositoryImpl.java b/web-infrastructure/src/main/java/com/zcloud/basic/info/persistence/repository/impl/UserRepositoryImpl.java index 0977eed..a2dc713 100644 --- a/web-infrastructure/src/main/java/com/zcloud/basic/info/persistence/repository/impl/UserRepositoryImpl.java +++ b/web-infrastructure/src/main/java/com/zcloud/basic/info/persistence/repository/impl/UserRepositoryImpl.java @@ -77,6 +77,8 @@ public class UserRepositoryImpl extends BaseRepositoryImpl i @Override public UserDO getInfoById(Long id) { + UserDO d = userMapper.getInfoById(id); + System.out.println("getInfoById"); return userMapper.getInfoById(id); } diff --git a/web-infrastructure/src/main/resources/mapper/UserMapper.xml b/web-infrastructure/src/main/resources/mapper/UserMapper.xml index 3a67111..9ec061c 100644 --- a/web-infrastructure/src/main/resources/mapper/UserMapper.xml +++ b/web-infrastructure/src/main/resources/mapper/UserMapper.xml @@ -5,17 +5,17 @@ select - u.id, - u.user_id, - u.username, - u.name, - u.corpinfo_id, - c.corp_name, - u.user_type, - u.department_id, - d.name as department_name, - u.post_id, - p.post_name, - u.role_id, - u.email, - u.phone, - u.personnel_type, - u.personnel_type_name, - u.nation, - u.nation_name, - u.user_id_card, - u.create_id, - u.create_name, - u.create_time, - u.tenant_id, - u.org_id, + d.name as department_name, + p.post_name, + u.id, + u.user_id, + u.username, + u.name, + u.corpinfo_id, + u.main_corp_flag, + u.user_type, + u.department_id, + u.post_id, + u.role_id, + u.email, + u.phone, + u.personnel_type, + u.personnel_type_name, + u.nation, + u.nation_name, + u.user_id_card, + u.user_avatar_url, + u.current_address, + u.location_address, + u.rank_level, + u.rank_level_name, + u.sort, + u.version, + u.create_id, + u.create_name, + u.create_time, + u.update_id, + u.update_name, + u.update_time, + u.remarks, + u.delete_enum, + u.tenant_id, + u.org_id, + u.env, + u.department_leader_flag, + u.deputy_leader_flag, + u.cultural_level, + u.cultural_level_name, + u.marital_status, + u.marital_status_name, + u.political_affiliation, + u.political_affiliation_name, + u.employment_flag, CASE WHEN MOD(SUBSTRING( u.user_id_card, 17, 1), 2) = 1 THEN '男' ELSE '女' @@ -114,6 +158,8 @@ u.user_avatar_url, u.current_address, u.location_address, + u.rank_level, + u.rank_level_name, u.sort, u.version, u.create_id, @@ -135,6 +181,7 @@ u.marital_status_name, u.political_affiliation, u.political_affiliation_name, + u.employment_flag, CASE WHEN MOD(SUBSTRING( u.user_id_card, 17, 1), 2) = 1 THEN '男' ELSE '女' From 0a4cf022df96f40a271132c9c973250c271f5fea Mon Sep 17 00:00:00 2001 From: zhangyue Date: Fri, 7 Nov 2025 09:28:09 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=94=99=E8=AF=AF?= =?UTF-8?q?=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/zcloud/basic/info/dto/UserAddCmd.java | 8 ++++---- .../java/com/zcloud/basic/info/dto/UserUpdateCmd.java | 8 ++++---- .../java/com/zcloud/basic/info/dto/UserXgfAddCmd.java | 8 ++++---- .../com/zcloud/basic/info/dto/clientobject/UserCO.java | 4 ++-- .../java/com/zcloud/basic/info/domain/model/UserE.java | 4 ++-- .../zcloud/basic/info/persistence/dataobject/UserDO.java | 4 ++-- 6 files changed, 18 insertions(+), 18 deletions(-) diff --git a/web-client/src/main/java/com/zcloud/basic/info/dto/UserAddCmd.java b/web-client/src/main/java/com/zcloud/basic/info/dto/UserAddCmd.java index ca76698..ba6ef0c 100644 --- a/web-client/src/main/java/com/zcloud/basic/info/dto/UserAddCmd.java +++ b/web-client/src/main/java/com/zcloud/basic/info/dto/UserAddCmd.java @@ -85,10 +85,10 @@ public class UserAddCmd extends Command { @ApiModelProperty(value = "户口所在地", name = "locationAddress") private String locationAddress; - @ApiModelProperty(value = "职级", name = "rank_level") - private String rank_level; - @ApiModelProperty(value = "职级名称", name = "rank_level_name") - private String rank_level_name; + @ApiModelProperty(value = "职级", name = "rankLevel") + private String rankLevel; + @ApiModelProperty(value = "职级名称", name = "rankLevelName") + private String rankLevelName; // TODO 待确认企业端和监管端是否必填 @ApiModelProperty(value = "人员在部门中的排序", name = "sort") diff --git a/web-client/src/main/java/com/zcloud/basic/info/dto/UserUpdateCmd.java b/web-client/src/main/java/com/zcloud/basic/info/dto/UserUpdateCmd.java index ae8878f..167a9bf 100644 --- a/web-client/src/main/java/com/zcloud/basic/info/dto/UserUpdateCmd.java +++ b/web-client/src/main/java/com/zcloud/basic/info/dto/UserUpdateCmd.java @@ -63,10 +63,10 @@ public class UserUpdateCmd extends Command { private String locationAddress; @ApiModelProperty(value = "手机号", name = "phone") private String phone; - @ApiModelProperty(value = "职级", name = "rank_level") - private String rank_level; - @ApiModelProperty(value = "职级名称", name = "rank_level_name") - private String rank_level_name; + @ApiModelProperty(value = "职级", name = "rankLevel") + private String rankLevel; + @ApiModelProperty(value = "职级名称", name = "rankLevelName") + private String rankLevelName; @ApiModelProperty(value = "人员在部门中的排序", name = "sort") private Integer sort; @ApiModelProperty(value = "描述", name = "remarks") diff --git a/web-client/src/main/java/com/zcloud/basic/info/dto/UserXgfAddCmd.java b/web-client/src/main/java/com/zcloud/basic/info/dto/UserXgfAddCmd.java index 80ae8d7..0694240 100644 --- a/web-client/src/main/java/com/zcloud/basic/info/dto/UserXgfAddCmd.java +++ b/web-client/src/main/java/com/zcloud/basic/info/dto/UserXgfAddCmd.java @@ -88,10 +88,10 @@ public class UserXgfAddCmd extends Command { @ApiModelProperty(value = "户口所在地", name = "locationAddress", required = true) @NotEmpty(message = "户口所在地不能为空") private String locationAddress; - @ApiModelProperty(value = "职级", name = "rank_level") - private String rank_level; - @ApiModelProperty(value = "职级名称", name = "rank_level_name") - private String rank_level_name; + @ApiModelProperty(value = "职级", name = "rankLevel") + private String rankLevel; + @ApiModelProperty(value = "职级名称", name = "rankLevelName") + private String rankLevelName; @ApiModelProperty(value = "人员在部门中的排序", name = "sort") private Integer sort; diff --git a/web-client/src/main/java/com/zcloud/basic/info/dto/clientobject/UserCO.java b/web-client/src/main/java/com/zcloud/basic/info/dto/clientobject/UserCO.java index 3757d20..755a210 100644 --- a/web-client/src/main/java/com/zcloud/basic/info/dto/clientobject/UserCO.java +++ b/web-client/src/main/java/com/zcloud/basic/info/dto/clientobject/UserCO.java @@ -94,9 +94,9 @@ public class UserCO extends ClientObject { private String locationAddress; @ApiModelProperty(value = "职级") - private String rank_level; + private String rankLevel; @ApiModelProperty(value = "职级名称") - private String rank_level_name; + private String rankLevelName; @ApiModelProperty(value = "手机号") private String phone; //人员在部门中的排序 diff --git a/web-domain/src/main/java/com/zcloud/basic/info/domain/model/UserE.java b/web-domain/src/main/java/com/zcloud/basic/info/domain/model/UserE.java index 2bef68a..24e3e3e 100644 --- a/web-domain/src/main/java/com/zcloud/basic/info/domain/model/UserE.java +++ b/web-domain/src/main/java/com/zcloud/basic/info/domain/model/UserE.java @@ -59,10 +59,10 @@ public class UserE extends BaseE { //户口所在地 private String locationAddress; - private String rank_level; + private String rankLevel; private String phone; - private String rank_level_name; + private String rankLevelName; //人员在部门中的排序 private Integer sort; //乐观锁 diff --git a/web-infrastructure/src/main/java/com/zcloud/basic/info/persistence/dataobject/UserDO.java b/web-infrastructure/src/main/java/com/zcloud/basic/info/persistence/dataobject/UserDO.java index 1bd497a..c3c90d3 100644 --- a/web-infrastructure/src/main/java/com/zcloud/basic/info/persistence/dataobject/UserDO.java +++ b/web-infrastructure/src/main/java/com/zcloud/basic/info/persistence/dataobject/UserDO.java @@ -89,9 +89,9 @@ public class UserDO extends BaseDO { @ApiModelProperty(value = "户口所在地") private String locationAddress; @ApiModelProperty(value = "职级") - private String rank_level; + private String rankLevel; @ApiModelProperty(value = "职级名称") - private String rank_level_name; + private String rankLevelName; @ApiModelProperty(value = "手机号") private String phone; //人员在部门中的排序 From 16b5bff83f78d822e6404a6a79e658c3526bd9e3 Mon Sep 17 00:00:00 2001 From: huangyuxuan Date: Fri, 7 Nov 2025 11:03:46 +0800 Subject: [PATCH 3/4] =?UTF-8?q?[=E6=96=B0=E5=A2=9E=E5=8A=9F=E8=83=BD](main?= =?UTF-8?q?)=20=20-=20=E5=8E=BB=E6=8E=89shiro?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pom.xml | 5 ----- .../zcloud/basic/info/service/CorpInfoServiceImpl.java | 9 --------- .../basic/info/service/CorpInfoXgfServiceImpl.java | 6 ------ 3 files changed, 20 deletions(-) diff --git a/pom.xml b/pom.xml index 6a24f63..63e2270 100644 --- a/pom.xml +++ b/pom.xml @@ -20,11 +20,6 @@ zcloud_gbscommon 1.0.0-SNAPSHOT - - org.apache.shiro - shiro-core - 1.9.0 - diff --git a/web-app/src/main/java/com/zcloud/basic/info/service/CorpInfoServiceImpl.java b/web-app/src/main/java/com/zcloud/basic/info/service/CorpInfoServiceImpl.java index 422d759..f797bf6 100644 --- a/web-app/src/main/java/com/zcloud/basic/info/service/CorpInfoServiceImpl.java +++ b/web-app/src/main/java/com/zcloud/basic/info/service/CorpInfoServiceImpl.java @@ -44,15 +44,6 @@ public class CorpInfoServiceImpl implements CorpInfoServiceI { // Long userId = AuthContext.getUserId(); cmd.setCorpinfoId(Tools.get32UUID()); Long id = corpInfoAddExe.execute(cmd); - - //新增企业成功后新增企业主账号用户(企业主账号的gbsId与企业的gbsId一致) 2025-10-31 huangyuxuan -// SysUserAddCmd user = new SysUserAddCmd(); -// to do 完善 -// user.setId(userId).setUserId(Tools.get32UUID()).setUsername(cmd.getCorpName()).setName(cmd.getCorpName()) -// .setPassword(new SimpleHash("SHA-1",user.getUsername(),"Aa@123456789").toHex()) -// .setCorpinfoId(id).setUserType(UserTypeEnum.getUserType(cmd.getType())).setStatus("0") -// .setDepartmentId(id); -// sysUserAddExe.execute(user); return SingleResponse.buildSuccess(); } diff --git a/web-app/src/main/java/com/zcloud/basic/info/service/CorpInfoXgfServiceImpl.java b/web-app/src/main/java/com/zcloud/basic/info/service/CorpInfoXgfServiceImpl.java index 3bb4d14..24be476 100644 --- a/web-app/src/main/java/com/zcloud/basic/info/service/CorpInfoXgfServiceImpl.java +++ b/web-app/src/main/java/com/zcloud/basic/info/service/CorpInfoXgfServiceImpl.java @@ -41,13 +41,7 @@ public class CorpInfoXgfServiceImpl implements CorpInfoXgfServiceI { Long userId = AuthContext.getUserId(); Long id = corpInfoXgfAddExe.execute(cmd); //新增企业成功后新增企业主账号用户(企业主账号的gbsId与企业的gbsId一致) 2025-10-31 huangyuxuan -// SysUserAddCmd user = new SysUserAddCmd(); // todo 再完善 -// user.setId(userId).setUserId(Tools.get32UUID()).setUsername(cmd.getCorpName()).setName(cmd.getCorpName()) -// .setPassword(new SimpleHash("SHA-1",user.getUsername(),"Aa@123456789").toHex()) -// .setCorpinfoId(id).setUserType(UserTypeEnum.getUserType(cmd.getType())).setStatus("0") -// .setDepartmentId(id); -// sysUserAddExe.execute(user); return SingleResponse.buildSuccess(); } From ec219b62223220378fabfa1d6f41156cb9a3c4f3 Mon Sep 17 00:00:00 2001 From: dearLin <1261008090@qq.com> Date: Fri, 7 Nov 2025 11:04:36 +0800 Subject: [PATCH 4/4] =?UTF-8?q?feat:=E5=BA=95=E5=BA=A7=E6=8E=A5=E5=8F=A3?= =?UTF-8?q?=E4=BD=BF=E7=94=A81.7.0=E9=AB=98=E7=89=88=E6=9C=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pom.xml | 6 ++++++ .../com/zcloud/basic/info/facade/ZcloudUserFacadeImpl.java | 3 +-- .../main/java/com/zcloud/basic/info/web/UserController.java | 3 +-- .../basic/info/command/convertor/UserCoConvertor.java | 2 ++ .../com/zcloud/basic/info/command/query/UserQueryExe.java | 4 +--- 5 files changed, 11 insertions(+), 7 deletions(-) diff --git a/pom.xml b/pom.xml index 63e2270..a6cfa85 100644 --- a/pom.xml +++ b/pom.xml @@ -13,6 +13,7 @@ UTF-8 UTF-8 + 1.7.0-SNAPSHOT @@ -49,6 +50,11 @@ web-infrastructure ${project.version} + + com.jjb.saas + jjb-saas-system-client + ${jjb.saas.system.client.version} + diff --git a/web-adapter/src/main/java/com/zcloud/basic/info/facade/ZcloudUserFacadeImpl.java b/web-adapter/src/main/java/com/zcloud/basic/info/facade/ZcloudUserFacadeImpl.java index bf6bdaf..4f2118f 100644 --- a/web-adapter/src/main/java/com/zcloud/basic/info/facade/ZcloudUserFacadeImpl.java +++ b/web-adapter/src/main/java/com/zcloud/basic/info/facade/ZcloudUserFacadeImpl.java @@ -40,8 +40,7 @@ public class ZcloudUserFacadeImpl implements ZcloudUserFacade { @Override public SingleResponse getInfoByUserId(Long aLong) { UserCO user = userServiceI.getInfoByUserId(aLong); - ZcloudUserCo zcloudUserCo = new ZcloudUserCo(); - BeanUtils.copyProperties(user, zcloudUserCo); + ZcloudUserCo zcloudUserCo = userCoConvertor.converCOToDubboCO(user); return SingleResponse.of(zcloudUserCo); } diff --git a/web-adapter/src/main/java/com/zcloud/basic/info/web/UserController.java b/web-adapter/src/main/java/com/zcloud/basic/info/web/UserController.java index e77d93b..3e29f93 100644 --- a/web-adapter/src/main/java/com/zcloud/basic/info/web/UserController.java +++ b/web-adapter/src/main/java/com/zcloud/basic/info/web/UserController.java @@ -43,8 +43,7 @@ public class UserController { SSOUser ssoUser = AuthContext.getCurrentUser(); List userCOS = translateField.translateZcloudCommonInformation(Arrays.asList(cmd), UserCO.class); ZcloudDepartmentInfoCo zcloudDpetInfoById = translateField.getZcloudDpetInfoById(1985993429287899137L); - ZcloudUserCo zcloudUserInfoById = translateField.getZcloudUserInfoById(1985906883444662274L); - + ZcloudUserCo zcloudUserInfoById = translateField.getZcloudUserInfoById(1985972624130953218L); return SingleResponse.of(cmd); } diff --git a/web-app/src/main/java/com/zcloud/basic/info/command/convertor/UserCoConvertor.java b/web-app/src/main/java/com/zcloud/basic/info/command/convertor/UserCoConvertor.java index 27daa1e..1ddca72 100644 --- a/web-app/src/main/java/com/zcloud/basic/info/command/convertor/UserCoConvertor.java +++ b/web-app/src/main/java/com/zcloud/basic/info/command/convertor/UserCoConvertor.java @@ -23,8 +23,10 @@ public interface UserCoConvertor { * @return */ List converDOsToCOs(List userDOs); + UserCO converDOToCO(UserDO userDO); FacadeUserAddCmd converEToFacadeUserAddCmd(UserE userE); List converCOsToDubboCOs(List userCOList); + ZcloudUserCo converCOToDubboCO(UserCO userCO); } diff --git a/web-app/src/main/java/com/zcloud/basic/info/command/query/UserQueryExe.java b/web-app/src/main/java/com/zcloud/basic/info/command/query/UserQueryExe.java index b5b3fca..941fbef 100644 --- a/web-app/src/main/java/com/zcloud/basic/info/command/query/UserQueryExe.java +++ b/web-app/src/main/java/com/zcloud/basic/info/command/query/UserQueryExe.java @@ -112,9 +112,7 @@ public class UserQueryExe { public UserCO getInfoByUserId(Long aLong) { UserDO byId = userRepository.getById(aLong); - UserCO userCO = new UserCO(); - BeanUtils.copyProperties(byId,userCO); - return userCO; + return userCoConvertor.converDOToCO(byId); } }