From 0e8138b9b57892f213659ebe9099af6fad3d37c7 Mon Sep 17 00:00:00 2001 From: zhangyue Date: Mon, 30 Mar 2026 17:07:13 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E7=9B=B8=E5=85=B3=E6=96=B9?= =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E5=9F=B9=E8=AE=AD=E7=94=A8=E6=88=B7=E5=88=86?= =?UTF-8?q?=E9=A1=B5=E6=9F=A5=E8=AF=A2=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../web/training/TrainingUserController.java | 23 ++- .../query/training/TrainingUserQueryExe.java | 44 ++++- .../edu/service/TrainingUserServiceImpl.java | 15 +- .../api/training/TrainingUserServiceI.java | 7 +- .../clientobject/training/TrainingUserCO.java | 28 +++ .../training/TrainingUserPageProjectQry.java | 37 ++++ .../dataobject/TrainingUserDO.java | 28 +++ .../mapper/TrainingUserMapper.java | 4 + .../impl/TrainingUserRepositoryImpl.java | 14 +- .../training/TrainingUserRepository.java | 4 + .../resources/mapper/TrainingUserMapper.xml | 168 +++++++++++++++++- 11 files changed, 353 insertions(+), 19 deletions(-) create mode 100644 web-client/src/main/java/com/zcloud/edu/dto/training/TrainingUserPageProjectQry.java diff --git a/web-adapter/src/main/java/com/zcloud/edu/web/training/TrainingUserController.java b/web-adapter/src/main/java/com/zcloud/edu/web/training/TrainingUserController.java index f190ec3..2851c2a 100644 --- a/web-adapter/src/main/java/com/zcloud/edu/web/training/TrainingUserController.java +++ b/web-adapter/src/main/java/com/zcloud/edu/web/training/TrainingUserController.java @@ -2,10 +2,7 @@ package com.zcloud.edu.web.training; import com.zcloud.edu.api.training.TrainingUserServiceI; -import com.zcloud.edu.dto.training.TrainingUserAddCmd; -import com.zcloud.edu.dto.training.TrainingUserEntranceQry; -import com.zcloud.edu.dto.training.TrainingUserPageQry; -import com.zcloud.edu.dto.training.TrainingUserUpdateCmd; +import com.zcloud.edu.dto.training.*; import com.zcloud.edu.dto.clientobject.training.TrainingUserCO; import com.alibaba.cola.dto.MultiResponse; import com.alibaba.cola.dto.PageResponse; @@ -65,6 +62,24 @@ public class TrainingUserController { return MultiResponse.of(trainingUserService.listAllByPhones(qry)); } + /** + * 相关方项目使用（分页） + * @return + */ + @ApiOperation("相关方项目使用（分页）") + @PostMapping("/listEduUserPage") + public PageResponse listEduUserPage(@RequestBody TrainingUserPageProjectQry qry) { + return trainingUserService.listEduUserPage(qry); + } /** + * 相关方项目使用（分页） + * @return + */ + @ApiOperation("相关方项目使用") + @PostMapping("/listEduUser") + public MultiResponse listEduUser(@RequestBody TrainingUserPageProjectQry qry) { + return trainingUserService.listEduUser(qry); + } + @ApiOperation("详情") @GetMapping("/{id}") public SingleResponse getInfoById(@PathVariable("id") Long id) { diff --git a/web-app/src/main/java/com/zcloud/edu/command/query/training/TrainingUserQueryExe.java b/web-app/src/main/java/com/zcloud/edu/command/query/training/TrainingUserQueryExe.java index f10014a..1c34ad3 100644 --- a/web-app/src/main/java/com/zcloud/edu/command/query/training/TrainingUserQueryExe.java +++ b/web-app/src/main/java/com/zcloud/edu/command/query/training/TrainingUserQueryExe.java @@ -1,8 +1,10 @@ package com.zcloud.edu.command.query.training; import com.alibaba.cola.dto.MultiResponse; +import com.jjb.saas.framework.auth.utils.AuthContext; import com.zcloud.edu.command.convertor.training.TrainingUserCoConvertor; import com.zcloud.edu.dto.training.TrainingUserEntranceQry; +import com.zcloud.edu.dto.training.TrainingUserPageProjectQry; import com.zcloud.edu.dto.training.TrainingUserPageQry; import com.zcloud.edu.dto.clientobject.training.TrainingUserCO; import com.zcloud.edu.persistence.dataobject.TrainingUserDO; @@ -35,11 +37,11 @@ public class TrainingUserQueryExe { private final TrainingUserCoConvertor trainingUserCoConvertor; /** - * 分页 - * - * @param trainingUserPageQry - * @return - */ + * 分页 + * + * @param trainingUserPageQry + * @return + */ public PageResponse execute(TrainingUserPageQry trainingUserPageQry) { Map params = PageQueryHelper.toHashMap(trainingUserPageQry); PageResponse pageResponse = trainingUserRepository.listPage(params); @@ -47,6 +49,38 @@ public class TrainingUserQueryExe { return PageResponse.of(examCenterCOS, pageResponse.getTotalCount(), pageResponse.getPageSize(), pageResponse.getPageIndex()); } + + /** + * 分页 + * + * @param qry + * @return + */ + public PageResponse listEduUserPageExecute(TrainingUserPageProjectQry qry) { + Map params = PageQueryHelper.toHashMap(qry); + if (ObjectUtils.isEmpty(params.get("corpinfoId"))){ + params.put("corpinfoId", AuthContext.getTenantId()); + } + PageResponse pageResponse = trainingUserRepository.listEduUserPage(params); + List examCenterCOS = trainingUserCoConvertor.converDOsToCOs(pageResponse.getData()); + return PageResponse.of(examCenterCOS, pageResponse.getTotalCount(), pageResponse.getPageSize(), pageResponse.getPageIndex()); + } + /** + * + * + * @param qry + * @return + */ + public MultiResponse listEduUserExecute(TrainingUserPageProjectQry qry) { + Map params = PageQueryHelper.toHashMap(qry); + if (ObjectUtils.isEmpty(params.get("corpinfoId"))){ + params.put("corpinfoId", AuthContext.getTenantId()); + } + List trainingUserDOS = trainingUserRepository.listEduUser(params); + List examCenterCOS = trainingUserCoConvertor.converDOsToCOs(trainingUserDOS); + return MultiResponse.of(examCenterCOS); + } + public List listAllByPhonesExecute(List qry) { List phones = qry.stream().map(EduProjectUserDO::getPhone).collect(Collectors.toList()); Map params = new HashMap(); diff --git a/web-app/src/main/java/com/zcloud/edu/service/TrainingUserServiceImpl.java b/web-app/src/main/java/com/zcloud/edu/service/TrainingUserServiceImpl.java index ae9ab8f..2dd1d01 100644 --- a/web-app/src/main/java/com/zcloud/edu/service/TrainingUserServiceImpl.java +++ b/web-app/src/main/java/com/zcloud/edu/service/TrainingUserServiceImpl.java @@ -6,10 +6,7 @@ import com.zcloud.edu.command.training.TrainingUserAddExe; import com.zcloud.edu.command.training.TrainingUserRemoveExe; import com.zcloud.edu.command.training.TrainingUserUpdateExe; import com.zcloud.edu.command.query.training.TrainingUserQueryExe; -import com.zcloud.edu.dto.training.TrainingUserAddCmd; -import com.zcloud.edu.dto.training.TrainingUserEntranceQry; -import com.zcloud.edu.dto.training.TrainingUserPageQry; -import com.zcloud.edu.dto.training.TrainingUserUpdateCmd; +import com.zcloud.edu.dto.training.*; import com.zcloud.edu.dto.clientobject.training.TrainingUserCO; import com.alibaba.cola.dto.PageResponse; @@ -39,6 +36,16 @@ public class TrainingUserServiceImpl implements TrainingUserServiceI { return trainingUserQueryExe.execute(qry); } + @Override + public PageResponse listEduUserPage(TrainingUserPageProjectQry qry) { + return trainingUserQueryExe.listEduUserPageExecute(qry); + } + + @Override + public MultiResponse listEduUser(TrainingUserPageProjectQry qry) { + return trainingUserQueryExe.listEduUserExecute(qry); + } + @Override public SingleResponse add(TrainingUserAddCmd cmd) { diff --git a/web-client/src/main/java/com/zcloud/edu/api/training/TrainingUserServiceI.java b/web-client/src/main/java/com/zcloud/edu/api/training/TrainingUserServiceI.java index 885fa3b..0269c77 100644 --- a/web-client/src/main/java/com/zcloud/edu/api/training/TrainingUserServiceI.java +++ b/web-client/src/main/java/com/zcloud/edu/api/training/TrainingUserServiceI.java @@ -1,10 +1,7 @@ package com.zcloud.edu.api.training; import com.alibaba.cola.dto.MultiResponse; -import com.zcloud.edu.dto.training.TrainingUserAddCmd; -import com.zcloud.edu.dto.training.TrainingUserEntranceQry; -import com.zcloud.edu.dto.training.TrainingUserPageQry; -import com.zcloud.edu.dto.training.TrainingUserUpdateCmd; +import com.zcloud.edu.dto.training.*; import com.zcloud.edu.dto.clientobject.training.TrainingUserCO; import com.alibaba.cola.dto.PageResponse; @@ -20,6 +17,8 @@ import java.util.List; */ public interface TrainingUserServiceI { PageResponse listPage(TrainingUserPageQry qry); + PageResponse listEduUserPage(TrainingUserPageProjectQry qry); + MultiResponse listEduUser(TrainingUserPageProjectQry qry); SingleResponse add(TrainingUserAddCmd cmd); diff --git a/web-client/src/main/java/com/zcloud/edu/dto/clientobject/training/TrainingUserCO.java b/web-client/src/main/java/com/zcloud/edu/dto/clientobject/training/TrainingUserCO.java index 6d66470..a21190c 100644 --- a/web-client/src/main/java/com/zcloud/edu/dto/clientobject/training/TrainingUserCO.java +++ b/web-client/src/main/java/com/zcloud/edu/dto/clientobject/training/TrainingUserCO.java @@ -1,6 +1,7 @@ package com.zcloud.edu.dto.clientobject.training; import com.alibaba.cola.dto.ClientObject; +import com.baomidou.mybatisplus.annotation.TableField; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -35,6 +36,33 @@ public class TrainingUserCO extends ClientObject { //考试状态:1.待考试2:考试通过,3:考试不通过 @ApiModelProperty(value = "考试状态:1.待考试2:考试通过,3:考试不通过") private Long examineStatus; + + //姓名 + @ApiModelProperty(value = "姓名") + private String name; + + //所属部门 + @ApiModelProperty(value = "所属部门") + private String departmentName; + + //所属部门id + @ApiModelProperty(value = "所属部门id") + private Long departmentId; + + //所属岗位 + @ApiModelProperty(value = "所属岗位") + private String postName; + + //所属岗位id + @ApiModelProperty(value = "所属岗位id") + private Long postId; + + //当前培训证书有效状态 0-无效 1-有效 + @ApiModelProperty(value = "当前培训证书有效状态 0-无效 1-有效") + private Integer stateFlag; + + + //乐观锁 @ApiModelProperty(value = "乐观锁") private Integer version; diff --git a/web-client/src/main/java/com/zcloud/edu/dto/training/TrainingUserPageProjectQry.java b/web-client/src/main/java/com/zcloud/edu/dto/training/TrainingUserPageProjectQry.java new file mode 100644 index 0000000..2b36bb2 --- /dev/null +++ b/web-client/src/main/java/com/zcloud/edu/dto/training/TrainingUserPageProjectQry.java @@ -0,0 +1,37 @@ +package com.zcloud.edu.dto.training; + +import com.alibaba.cola.dto.PageQuery; +import io.swagger.models.auth.In; +import lombok.Data; + +import java.util.List; + + +/** +* web-client +* @Author makejava +* @Date 2026-01-12 15:41:04 +*/ +@Data +public class TrainingUserPageProjectQry extends PageQuery { + +/** +* 查询条件操作前缀,支持以下几种数据库查询操作： +* - `like`: 模糊匹配查询，对应SQL的LIKE操作符 +* - `eq`: 等值查询，对应SQL的=操作符 +* - `gt`: 大于比较查询 +* - `lt`: 小于比较查询 +* - `ge`: 大于等于比较查询 +* - `le`: 小于等于比较查询 +* - `ne`: 不等比较查询，对应SQL的!=操作符 +*/ + private String likeTrainingUserId; + private Integer flowFlag; + private Integer noMain; + private Integer eqEmploymentFlag; + private List departmentList; + private String name; + private Integer corpinfoId; + +} + diff --git a/web-infrastructure/src/main/java/com/zcloud/edu/persistence/dataobject/TrainingUserDO.java b/web-infrastructure/src/main/java/com/zcloud/edu/persistence/dataobject/TrainingUserDO.java index 3a57fe6..3a00c3b 100644 --- a/web-infrastructure/src/main/java/com/zcloud/edu/persistence/dataobject/TrainingUserDO.java +++ b/web-infrastructure/src/main/java/com/zcloud/edu/persistence/dataobject/TrainingUserDO.java @@ -42,6 +42,34 @@ public class TrainingUserDO extends BaseDO { @TableField(exist = false) private Integer stateFlag; + + //姓名 + @ApiModelProperty(value = "姓名") + @TableField(exist = false) + private String name; + + //所属部门 + @ApiModelProperty(value = "所属部门") + @TableField(exist = false) + private String departmentName; + + //所属部门id + @ApiModelProperty(value = "所属部门id") + @TableField(exist = false) + private Long departmentId; + + //所属岗位 + @ApiModelProperty(value = "所属岗位") + @TableField(exist = false) + private String postName; + + //所属岗位id + @ApiModelProperty(value = "所属岗位id") + @TableField(exist = false) + private Long postId; + + + public TrainingUserDO(String trainingUserId) { this.trainingUserId = trainingUserId; } diff --git a/web-infrastructure/src/main/java/com/zcloud/edu/persistence/mapper/TrainingUserMapper.java b/web-infrastructure/src/main/java/com/zcloud/edu/persistence/mapper/TrainingUserMapper.java index fc468ca..50db4a2 100644 --- a/web-infrastructure/src/main/java/com/zcloud/edu/persistence/mapper/TrainingUserMapper.java +++ b/web-infrastructure/src/main/java/com/zcloud/edu/persistence/mapper/TrainingUserMapper.java @@ -1,5 +1,6 @@ package com.zcloud.edu.persistence.mapper; +import com.baomidou.mybatisplus.core.metadata.IPage; import com.zcloud.edu.persistence.dataobject.TrainingUserDO; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.apache.ibatis.annotations.Mapper; @@ -19,5 +20,8 @@ public interface TrainingUserMapper extends BaseMapper { List listAllByPhones(@Param("params") Map params); + IPage listEduUserPage(IPage page, @Param("params") Map params); + List listEduUser(@Param("params") Map params); + } diff --git a/web-infrastructure/src/main/java/com/zcloud/edu/persistence/repository/impl/TrainingUserRepositoryImpl.java b/web-infrastructure/src/main/java/com/zcloud/edu/persistence/repository/impl/TrainingUserRepositoryImpl.java index aacf39a..bebdf3e 100644 --- a/web-infrastructure/src/main/java/com/zcloud/edu/persistence/repository/impl/TrainingUserRepositoryImpl.java +++ b/web-infrastructure/src/main/java/com/zcloud/edu/persistence/repository/impl/TrainingUserRepositoryImpl.java @@ -30,7 +30,7 @@ public class TrainingUserRepositoryImpl extends BaseRepositoryImpl listPage(Map params) { - IPage iPage = new Query().getPage(params); + IPage iPage = new Query().getPage(params); QueryWrapper queryWrapper = new QueryWrapper<>(); queryWrapper = PageQueryHelper.createPageQueryWrapper(queryWrapper, params); queryWrapper.orderByDesc("create_time"); @@ -38,6 +38,18 @@ public class TrainingUserRepositoryImpl extends BaseRepositoryImpl listEduUserPage(Map params) { + IPage iPage = new Query().getPage(params); + IPage result = trainingUserMapper.listEduUserPage(iPage, params); + return PageHelper.pageToResponse(result, result.getRecords()); + } + + @Override + public List listEduUser(Map params) { + return trainingUserMapper.listEduUser(params); + } + @Override public void updateTime(TrainingUserE trainingUserE) { Map params = PageQueryHelper.toHashMap(trainingUserE); diff --git a/web-infrastructure/src/main/java/com/zcloud/edu/persistence/repository/training/TrainingUserRepository.java b/web-infrastructure/src/main/java/com/zcloud/edu/persistence/repository/training/TrainingUserRepository.java index aad17d1..aaed2e9 100644 --- a/web-infrastructure/src/main/java/com/zcloud/edu/persistence/repository/training/TrainingUserRepository.java +++ b/web-infrastructure/src/main/java/com/zcloud/edu/persistence/repository/training/TrainingUserRepository.java @@ -16,6 +16,10 @@ import java.util.Map; public interface TrainingUserRepository extends BaseRepository { PageResponse listPage(Map params); + PageResponse listEduUserPage(Map params); + + List listEduUser(Map params); + void updateTime(TrainingUserE trainingUserE); diff --git a/web-infrastructure/src/main/resources/mapper/TrainingUserMapper.xml b/web-infrastructure/src/main/resources/mapper/TrainingUserMapper.xml index 8c45e20..46b1e1a 100644 --- a/web-infrastructure/src/main/resources/mapper/TrainingUserMapper.xml +++ b/web-infrastructure/src/main/resources/mapper/TrainingUserMapper.xml @@ -34,9 +34,175 @@ #{phone} - + + + + +