From 7d5f4223e29d5b36440d8aecef8fb8b53f4a3ffe Mon Sep 17 00:00:00 2001 From: zhangyue Date: Tue, 17 Mar 2026 09:43:25 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=8C=81=E8=AF=81=E4=BA=BA?= =?UTF-8?q?=E5=91=98=E5=88=86=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/UserCertificateController.java | 19 +- .../convertor/UserCertificateCoConvertor.java | 6 +- .../query/UserCertificateQueryExe.java | 26 ++- .../service/UserCertificateServiceImpl.java | 14 +- .../api/UserCertificateServiceI.java | 10 +- .../certificate/dto/UserByCerQryCmd.java | 49 +++++ .../dto/clientobject/UserCerCO.java | 180 ++++++++++++++++++ .../persistence/dataobject/UserCerDO.java | 163 ++++++++++++++++ .../mapper/UserCertificateMapper.java | 5 + .../repository/UserCertificateRepository.java | 3 + .../impl/UserCertificateRepositoryImpl.java | 11 ++ .../mapper/UserCertificateMapper.xml | 111 +++++++++++ 12 files changed, 578 insertions(+), 19 deletions(-) create mode 100644 web-client/src/main/java/com/zcloud/certificate/dto/UserByCerQryCmd.java create mode 100644 web-client/src/main/java/com/zcloud/certificate/dto/clientobject/UserCerCO.java create mode 100644 web-infrastructure/src/main/java/com/zcloud/certificate/persistence/dataobject/UserCerDO.java diff --git a/web-adapter/src/main/java/com/zcloud/certificate/web/UserCertificateController.java b/web-adapter/src/main/java/com/zcloud/certificate/web/UserCertificateController.java index 9704105..42aebc0 100644 --- a/web-adapter/src/main/java/com/zcloud/certificate/web/UserCertificateController.java +++ b/web-adapter/src/main/java/com/zcloud/certificate/web/UserCertificateController.java @@ -2,10 +2,9 @@ package com.zcloud.certificate.web; import com.zcloud.certificate.api.UserCertificateServiceI; -import com.zcloud.certificate.dto.CorpCertificateStatPageQry; -import com.zcloud.certificate.dto.UserCertificateAddCmd; -import com.zcloud.certificate.dto.UserCertificatePageQry; -import com.zcloud.certificate.dto.UserCertificateUpdateCmd; +import com.zcloud.certificate.dto.*; +import com.zcloud.certificate.dto.clientobject.UserCO; +import com.zcloud.certificate.dto.clientobject.UserCerCO; import com.zcloud.certificate.dto.clientobject.UserCertificateCO; import com.alibaba.cola.dto.MultiResponse; import com.alibaba.cola.dto.PageResponse; @@ -55,6 +54,18 @@ public class UserCertificateController { } + /** + * 八项作业使用 + * @param qry + * @return + */ + @ApiOperation("持证人员分页") + @PostMapping("/certifiedPersonnelList") + public PageResponse certifiedPersonnelListPage(@RequestBody UserByCerQryCmd qry) { + return userCertificateService.certifiedPersonnelListPage(qry); + } + + @ApiOperation("所有数据") @PostMapping("/listAll") public MultiResponse listAll(@RequestBody UserCertificatePageQry qry) { diff --git a/web-app/src/main/java/com/zcloud/certificate/command/convertor/UserCertificateCoConvertor.java b/web-app/src/main/java/com/zcloud/certificate/command/convertor/UserCertificateCoConvertor.java index 516eac0..b411e3b 100644 --- a/web-app/src/main/java/com/zcloud/certificate/command/convertor/UserCertificateCoConvertor.java +++ b/web-app/src/main/java/com/zcloud/certificate/command/convertor/UserCertificateCoConvertor.java @@ -1,8 +1,10 @@ package com.zcloud.certificate.command.convertor; import com.zcloud.certificate.domain.model.UserCertificateE; +import com.zcloud.certificate.dto.clientobject.UserCerCO; import com.zcloud.certificate.dto.clientobject.UserCertificateCO; import com.zcloud.certificate.dto.clientobject.UserCertificateStatCO; +import com.zcloud.certificate.persistence.dataobject.UserCerDO; import com.zcloud.certificate.persistence.dataobject.UserCertificateDO; import com.zcloud.certificate.persistence.dataobject.UserCertificateStatDO; import org.mapstruct.Mapper; @@ -23,7 +25,7 @@ public interface UserCertificateCoConvertor { * @return */ List converDOsToCOs(List userCertificateDOs); - + UserCertificateCO converDOToCO(UserCertificateDO userCertificateDO); List converStatDOsToStatCOs(List userCertificateStatDOs); @@ -33,5 +35,7 @@ public interface UserCertificateCoConvertor { List converDOsToEs(List userCertificateDOs); List converEsToCOs(List userCertificateEs); + + List converUserDOsToCOs(List userCerDOs); } diff --git a/web-app/src/main/java/com/zcloud/certificate/command/query/UserCertificateQueryExe.java b/web-app/src/main/java/com/zcloud/certificate/command/query/UserCertificateQueryExe.java index da8461a..3626c64 100644 --- a/web-app/src/main/java/com/zcloud/certificate/command/query/UserCertificateQueryExe.java +++ b/web-app/src/main/java/com/zcloud/certificate/command/query/UserCertificateQueryExe.java @@ -8,11 +8,16 @@ import com.zcloud.certificate.command.convertor.UserCertificateCoConvertor; import com.zcloud.certificate.domain.model.UserBasicInfo; import com.zcloud.certificate.domain.model.UserCertificateE; import com.zcloud.certificate.dto.CorpCertificateStatPageQry; +import com.zcloud.certificate.dto.UserByCerQryCmd; import com.zcloud.certificate.dto.UserCertificatePageQry; +import com.zcloud.certificate.dto.clientobject.UserCO; +import com.zcloud.certificate.dto.clientobject.UserCerCO; import com.zcloud.certificate.dto.clientobject.UserCertificateCO; import com.zcloud.certificate.dto.clientobject.UserCertificateStatCO; +import com.zcloud.certificate.persistence.dataobject.UserCerDO; import com.zcloud.certificate.persistence.dataobject.UserCertificateDO; import com.zcloud.certificate.persistence.dataobject.UserCertificateStatDO; +import com.zcloud.certificate.persistence.dataobject.UserDO; import com.zcloud.certificate.persistence.repository.UserCertificateRepository; import com.zcloud.gbscommon.utils.PageQueryHelper; import com.alibaba.cola.dto.PageResponse; @@ -55,10 +60,10 @@ public class UserCertificateQueryExe { } /** - * 分页 - * - * @return - */ + * 分页 + * + * @return + */ public PageResponse execute(UserCertificatePageQry qry, boolean withPermission) { if (withPermission) { SSOUser ssoUser = AuthContext.getCurrentUser(); @@ -86,6 +91,19 @@ public class UserCertificateQueryExe { return PageResponse.of(cos, iPage.getTotalCount(), iPage.getPageSize(), iPage.getPageIndex()); } + /** + * 分页 + * + * @return + */ + public PageResponse certifiedPersonnelListPageExecute(UserByCerQryCmd qry) { + Map params = PageQueryHelper.toHashMap(qry); + PageResponse pageResponse = userCertificateRepository.certifiedPersonnelListPage(params); + List examCenterCOS = userCertificateCoConvertor.converUserDOsToCOs(pageResponse.getData()); + + return PageResponse.of(examCenterCOS, pageResponse.getTotalCount(), pageResponse.getPageSize(), pageResponse.getPageIndex()); + } + /** * 根据企业/相关方类型查询各企业/相关方各类人员证书数量分页 */ diff --git a/web-app/src/main/java/com/zcloud/certificate/service/UserCertificateServiceImpl.java b/web-app/src/main/java/com/zcloud/certificate/service/UserCertificateServiceImpl.java index a4396f8..c1cd0ea 100644 --- a/web-app/src/main/java/com/zcloud/certificate/service/UserCertificateServiceImpl.java +++ b/web-app/src/main/java/com/zcloud/certificate/service/UserCertificateServiceImpl.java @@ -5,10 +5,9 @@ import com.zcloud.certificate.command.UserCertificateAddExe; import com.zcloud.certificate.command.UserCertificateRemoveExe; import com.zcloud.certificate.command.UserCertificateUpdateExe; import com.zcloud.certificate.command.query.UserCertificateQueryExe; -import com.zcloud.certificate.dto.CorpCertificateStatPageQry; -import com.zcloud.certificate.dto.UserCertificateAddCmd; -import com.zcloud.certificate.dto.UserCertificatePageQry; -import com.zcloud.certificate.dto.UserCertificateUpdateCmd; +import com.zcloud.certificate.dto.*; +import com.zcloud.certificate.dto.clientobject.UserCO; +import com.zcloud.certificate.dto.clientobject.UserCerCO; import com.zcloud.certificate.dto.clientobject.UserCertificateCO; import com.alibaba.cola.dto.PageResponse; @@ -37,12 +36,17 @@ public class UserCertificateServiceImpl implements UserCertificateServiceI { public UserCertificateCO queryById(Long id){ return userCertificateQueryExe.queryById(id); } - + @Override public PageResponse listPage(UserCertificatePageQry qry, boolean withPermission){ return userCertificateQueryExe.execute(qry, withPermission); } + @Override + public PageResponse certifiedPersonnelListPage(UserByCerQryCmd qry){ + + return userCertificateQueryExe.certifiedPersonnelListPageExecute(qry); + } @Override public SingleResponse add(UserCertificateAddCmd cmd) { diff --git a/web-client/src/main/java/com/zcloud/certificate/api/UserCertificateServiceI.java b/web-client/src/main/java/com/zcloud/certificate/api/UserCertificateServiceI.java index 241868b..ae37257 100644 --- a/web-client/src/main/java/com/zcloud/certificate/api/UserCertificateServiceI.java +++ b/web-client/src/main/java/com/zcloud/certificate/api/UserCertificateServiceI.java @@ -1,9 +1,8 @@ package com.zcloud.certificate.api; -import com.zcloud.certificate.dto.CorpCertificateStatPageQry; -import com.zcloud.certificate.dto.UserCertificateAddCmd; -import com.zcloud.certificate.dto.UserCertificatePageQry; -import com.zcloud.certificate.dto.UserCertificateUpdateCmd; +import com.zcloud.certificate.dto.*; +import com.zcloud.certificate.dto.clientobject.UserCO; +import com.zcloud.certificate.dto.clientobject.UserCerCO; import com.zcloud.certificate.dto.clientobject.UserCertificateCO; import com.alibaba.cola.dto.PageResponse; @@ -19,8 +18,9 @@ import java.util.List; */ public interface UserCertificateServiceI { UserCertificateCO queryById(Long id); - + PageResponse listPage(UserCertificatePageQry qry, boolean withPermission); + PageResponse certifiedPersonnelListPage(UserByCerQryCmd qry); SingleResponse add(UserCertificateAddCmd cmd); diff --git a/web-client/src/main/java/com/zcloud/certificate/dto/UserByCerQryCmd.java b/web-client/src/main/java/com/zcloud/certificate/dto/UserByCerQryCmd.java new file mode 100644 index 0000000..424d8dc --- /dev/null +++ b/web-client/src/main/java/com/zcloud/certificate/dto/UserByCerQryCmd.java @@ -0,0 +1,49 @@ +package com.zcloud.certificate.dto; + +import com.alibaba.cola.dto.PageQuery; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.List; + +@Data +public class UserByCerQryCmd extends PageQuery { + + @ApiModelProperty(value = "企业ID") + private String eqCorpinfoId; + + @ApiModelProperty(value = "部门ID") + private String eqDepartmentId; + + @ApiModelProperty(value = "岗位ID") + private String eqPostId; + + @ApiModelProperty(value = "在职状态") + private String eqEmploymentFlag; + + @ApiModelProperty(value = "企业ID") + private Long corpinfoId; + @ApiModelProperty(value = "企业UUID") + private String corpinfoUuid; + + @ApiModelProperty(value = "部门ID") + private Long departmentId; + + @ApiModelProperty(value = "岗位ID") + private Long postId; + + @ApiModelProperty(value = "用户名") + private String username; + + @ApiModelProperty(value = "用户名") + private String name; + + @ApiModelProperty(value = "是否排除主账号") + private Integer noMain; + + @ApiModelProperty(value = "证书类型") + private List certificateType; + + @ApiModelProperty(value = "菜单路径") + private String menuPath; +} diff --git a/web-client/src/main/java/com/zcloud/certificate/dto/clientobject/UserCerCO.java b/web-client/src/main/java/com/zcloud/certificate/dto/clientobject/UserCerCO.java new file mode 100644 index 0000000..35f8245 --- /dev/null +++ b/web-client/src/main/java/com/zcloud/certificate/dto/clientobject/UserCerCO.java @@ -0,0 +1,180 @@ +package com.zcloud.certificate.dto.clientobject; + +import com.alibaba.cola.dto.ClientObject; +import com.fasterxml.jackson.annotation.JsonFormat; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.Date; + +@Data +public class UserCerCO extends ClientObject { + //GBS用户id + @ApiModelProperty(value = "GBS用户id") + private Long id; + //业务主键id老系统id + @ApiModelProperty(value = "业务主键id老系统id") + private String userId; + //登录账号 + @ApiModelProperty(value = "登录账号") + private String username; + //姓名 + @ApiModelProperty(value = "姓名") + private String name; + //企业id + @ApiModelProperty(value = "企业id") + private Long corpinfoId; + @ApiModelProperty(value = "企业名称") + private String corpinfoName; + //是否主账号1是0否 + @ApiModelProperty(value = "是否主账号1是0否") + private Integer mainCorpFlag; + //用户类型,1监管2企业3相关方 + @ApiModelProperty(value = "用户类型,1监管2企业3相关方") + private Integer userType; + //部门id + @ApiModelProperty(value = "部门id") + private Long departmentId; + //部门id + @ApiModelProperty(value = "部门名称") + private String departmentName; + //岗位id + @ApiModelProperty(value = "岗位id") + private Long postId; + //岗位id + @ApiModelProperty(value = "岗位名称") + private String postName; + //角色id + @ApiModelProperty(value = "角色id") + private Long roleId; + //邮箱 + @ApiModelProperty(value = "邮箱") + private String email; + //人员类型编码（主要负责人等） + @ApiModelProperty(value = "人员类型编码（主要负责人等）") + private String personnelType; + //人员类型翻译 + @ApiModelProperty(value = "人员类型翻译") + private String personnelTypeName; + //民族编码问一下有没有组件 + @ApiModelProperty(value = "民族编码问一下有没有组件") + private String nation; + //民族名称 + @ApiModelProperty(value = "民族名称") + private String nationName; + //身份证号 + @ApiModelProperty(value = "身份证号") + private String userIdCard; + //人脸头像url + @ApiModelProperty(value = "人脸头像url") + private String userAvatarUrl; + //现住址 + @ApiModelProperty(value = "现住址") + private String currentAddress; + //户口所在地 + @ApiModelProperty(value = "户口所在地") + private String locationAddress; + + @ApiModelProperty(value = "职级") + private String rankLevel; + @ApiModelProperty(value = "职级名称") + private String rankLevelName; + @ApiModelProperty(value = "手机号") + private String phone; + //人员在部门中的排序 + @ApiModelProperty(value = "人员在部门中的排序") + private Integer sort; + @ApiModelProperty(value = "是否存在人资系统, 1-是, 0-否") + private Integer rzFlag; + + //乐观锁 + @ApiModelProperty(value = "乐观锁") + private Integer version; + //创建人 + @ApiModelProperty(value = "创建人") + private Long createId; + //创建人姓名 + @ApiModelProperty(value = "创建人姓名") + private String createName; + //创建时间 + @ApiModelProperty(value = "创建时间") + @JsonFormat(pattern = "yyyy-MM-dd") + private Date createTime; + //更新人 + @ApiModelProperty(value = "更新人") + private Long updateId; + //修改人名称 + @ApiModelProperty(value = "修改人名称") + private String updateName; + //更新时间 + @ApiModelProperty(value = "更新时间") + @JsonFormat(pattern = "yyyy-MM-dd") + private Date updateTime; + //描述 + @ApiModelProperty(value = "描述") + private String remarks; + //是否删除 + @ApiModelProperty(value = "是否删除") + private String deleteEnum; + //租户ID + @ApiModelProperty(value = "租户ID") + private Long tenantId; + //机构ID + @ApiModelProperty(value = "机构ID") + private Long orgId; + //环境 + @ApiModelProperty(value = "环境") + private String env; + //是否部门领导0否1是 + @ApiModelProperty(value = "是否部门领导0否1是") + private Integer departmentLeaderFlag; + //是否分管领导0否1是 + @ApiModelProperty(value = "是否分管领导0否1是") + private Integer deputyLeaderFlag; + //文化程度 数据字典 + @ApiModelProperty(value = "文化程度 数据字典") + private String culturalLevel; + //文化程度名称 + @ApiModelProperty(value = "文化程度名称") + private String culturalLevelName; + //婚姻状态 + @ApiModelProperty(value = "婚姻状态") + private String maritalStatus; + //婚姻状态名称 + @ApiModelProperty(value = "婚姻状态名称") + private String maritalStatusName; + //政治面貌 + @ApiModelProperty(value = "政治面貌") + private String politicalAffiliation; + //政治面貌名称 + @ApiModelProperty(value = "政治面貌名称") + private String politicalAffiliationName; + private String mappingName; + private String mappingUserName; + private String mappingPostName; + private String mappingDeptName; + // 入职状态 + @ApiModelProperty(value = "入职状态 入职状态，0-离职, 1-在职, 2-信息变更中, 3-未入职, 4-实习生, 5-实习结束, 6-退休, 7-劳务派遣, 8-劳务派遣结束, 11-入职待审核, 10-离职待审核") + private Integer employmentFlag; + // 入职状态 + @ApiModelProperty(value = "是否流动人员，1-流动，0-固定人员") + private Integer flowFlag; + + // 年龄 + @ApiModelProperty(value = "年龄") + private Integer age; + + //生日 + @ApiModelProperty(value = "生日") + private String birthday; + //生日 + @ApiModelProperty(value = "证书类型") + private String certificateTypeName; + + // 性别 + @ApiModelProperty(value = "性别") + private String sex; + // 微信openid + @ApiModelProperty(value = "微信openid") + private String openId; +} diff --git a/web-infrastructure/src/main/java/com/zcloud/certificate/persistence/dataobject/UserCerDO.java b/web-infrastructure/src/main/java/com/zcloud/certificate/persistence/dataobject/UserCerDO.java new file mode 100644 index 0000000..c2338fc --- /dev/null +++ b/web-infrastructure/src/main/java/com/zcloud/certificate/persistence/dataobject/UserCerDO.java @@ -0,0 +1,163 @@ +package com.zcloud.certificate.persistence.dataobject; + +import com.baomidou.mybatisplus.annotation.TableField; +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; + +@Data +@TableName("user") +@NoArgsConstructor +@EqualsAndHashCode(callSuper = true) +public class UserCerDO extends BaseDO { + + //业务主键id老系统id + @ApiModelProperty(value = "业务主键id老系统id") + private String userId; + //登录账号 + @ApiModelProperty(value = "登录账号") + private String username; + //姓名 + @ApiModelProperty(value = "姓名") + private String name; + //企业id + @ApiModelProperty(value = "企业id") + private Long corpinfoId; + //企业id + @ApiModelProperty(value = "企业名称") + @TableField(exist = false) + private String corpinfoName; + + //是否主账号1是0否 + @ApiModelProperty(value = "是否主账号1是0否") + private Integer mainCorpFlag; + //用户类型,1监管2企业3相关方 + @ApiModelProperty(value = "用户类型,1监管2企业3相关方") + private Integer userType; + //部门id + @ApiModelProperty(value = "部门id") + private Long departmentId; + //部门id + @ApiModelProperty(value = "部门名称") + @TableField(exist = false) + private String departmentName; + //岗位id + @ApiModelProperty(value = "岗位id") + private Long postId; + //岗位id + @ApiModelProperty(value = "岗位名称") + private String postName; + //角色id + @ApiModelProperty(value = "角色id") + private Long roleId; + //邮箱 + @ApiModelProperty(value = "邮箱") + private String email; + //人员类型编码（主要负责人等） + @ApiModelProperty(value = "人员类型编码（主要负责人等）") + private String personnelType; + //人员类型翻译 + @ApiModelProperty(value = "人员类型翻译") + private String personnelTypeName; + //民族编码问一下有没有组件 + @ApiModelProperty(value = "民族编码问一下有没有组件") + private String nation; + //民族名称 + @ApiModelProperty(value = "民族名称") + private String nationName; + //身份证号 + @ApiModelProperty(value = "身份证号") + private String userIdCard; + //人脸头像url + @ApiModelProperty(value = "人脸头像url") + private String userAvatarUrl; + //现住址 + @ApiModelProperty(value = "现住址") + private String currentAddress; + @ApiModelProperty(value = "描述") + private String remarks; + //户口所在地 + @ApiModelProperty(value = "户口所在地") + private String locationAddress; + @ApiModelProperty(value = "职级") + private String rankLevel; + @ApiModelProperty(value = "职级名称") + private String rankLevelName; + @ApiModelProperty(value = "手机号") + private String phone; + //人员在部门中的排序 + @ApiModelProperty(value = "人员在部门中的排序") + private Integer sort; + //是否部门领导0否1是 + @ApiModelProperty(value = "是否部门领导0否1是") + private Integer departmentLeaderFlag; + //是否分管领导0否1是 + @ApiModelProperty(value = "是否分管领导0否1是") + private Integer deputyLeaderFlag; + //文化程度 数据字典 + @ApiModelProperty(value = "文化程度 数据字典") + private String culturalLevel; + //文化程度名称 + @ApiModelProperty(value = "文化程度名称") + private String culturalLevelName; + //婚姻状态 + @ApiModelProperty(value = "婚姻状态") + private String maritalStatus; + //婚姻状态名称 + @ApiModelProperty(value = "婚姻状态名称") + private String maritalStatusName; + //政治面貌 + @ApiModelProperty(value = "政治面貌") + private String politicalAffiliation; + //政治面貌名称 + @ApiModelProperty(value = "政治面貌名称") + private String politicalAffiliationName; + // 入职状态 + @ApiModelProperty(value = "入职状态") + private Integer employmentFlag; + // 入职状态 + @ApiModelProperty(value = "是否流动人员，1-流动，0-固定人员") + private Integer flowFlag; + @ApiModelProperty(value = "是否存在人资系统, 1-存在, 0-不存在") + private Integer rzFlag; + //用户所属企业id + @TableField(exist = false) + private String userCorpId; + + + //密码 + @ApiModelProperty(value = "密码") + private String password; + //密码 + @ApiModelProperty(value = "新密码") + @TableField(exist = false) + private String newPassword; + + // 年龄 + @ApiModelProperty(value = "年龄") + @TableField(exist = false) + private Integer age; + + //生日 + @ApiModelProperty(value = "生日") + @TableField(exist = false) + private String birthday; + + // 性别 + @ApiModelProperty(value = "性别") + @TableField(exist = false) + private String sex; + // 证书类别 + @ApiModelProperty(value = "证书类别") + @TableField(exist = false) + private String certificateTypeName; + + // 微信openid + @ApiModelProperty(value = "微信openid") + private String openId; + + +} diff --git a/web-infrastructure/src/main/java/com/zcloud/certificate/persistence/mapper/UserCertificateMapper.java b/web-infrastructure/src/main/java/com/zcloud/certificate/persistence/mapper/UserCertificateMapper.java index 5b753e9..db59d71 100644 --- a/web-infrastructure/src/main/java/com/zcloud/certificate/persistence/mapper/UserCertificateMapper.java +++ b/web-infrastructure/src/main/java/com/zcloud/certificate/persistence/mapper/UserCertificateMapper.java @@ -1,11 +1,14 @@ package com.zcloud.certificate.persistence.mapper; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.jjb.saas.framework.datascope.annotation.DataScope; import com.jjb.saas.framework.datascope.annotation.DataScopes; +import com.zcloud.certificate.persistence.dataobject.UserCerDO; import com.zcloud.certificate.persistence.dataobject.UserCertificateDO; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.zcloud.certificate.persistence.dataobject.UserCertificateStatDO; +import com.zcloud.certificate.persistence.dataobject.UserDO; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; @@ -43,6 +46,8 @@ public interface UserCertificateMapper extends BaseMapper { */ IPage selectCorpCertificateStatPage(IPage page, @Param("params") Map params); + IPage certifiedPersonnelListPage(IPage page, @Param("params") Map params); + } diff --git a/web-infrastructure/src/main/java/com/zcloud/certificate/persistence/repository/UserCertificateRepository.java b/web-infrastructure/src/main/java/com/zcloud/certificate/persistence/repository/UserCertificateRepository.java index ba6fde6..866d1c0 100644 --- a/web-infrastructure/src/main/java/com/zcloud/certificate/persistence/repository/UserCertificateRepository.java +++ b/web-infrastructure/src/main/java/com/zcloud/certificate/persistence/repository/UserCertificateRepository.java @@ -1,9 +1,11 @@ package com.zcloud.certificate.persistence.repository; +import com.zcloud.certificate.persistence.dataobject.UserCerDO; import com.zcloud.certificate.persistence.dataobject.UserCertificateDO; import com.alibaba.cola.dto.PageResponse; import com.jjb.saas.framework.repository.repo.BaseRepository; import com.zcloud.certificate.persistence.dataobject.UserCertificateStatDO; +import com.zcloud.certificate.persistence.dataobject.UserDO; import org.apache.ibatis.annotations.Param; import java.util.List; @@ -16,6 +18,7 @@ import java.util.Map; */ public interface UserCertificateRepository extends BaseRepository { PageResponse listPage(Map params); + PageResponse certifiedPersonnelListPage(Map params); /** * 根据批量userId查询用户名称 diff --git a/web-infrastructure/src/main/java/com/zcloud/certificate/persistence/repository/impl/UserCertificateRepositoryImpl.java b/web-infrastructure/src/main/java/com/zcloud/certificate/persistence/repository/impl/UserCertificateRepositoryImpl.java index d35207f..7d89ea1 100644 --- a/web-infrastructure/src/main/java/com/zcloud/certificate/persistence/repository/impl/UserCertificateRepositoryImpl.java +++ b/web-infrastructure/src/main/java/com/zcloud/certificate/persistence/repository/impl/UserCertificateRepositoryImpl.java @@ -1,8 +1,10 @@ package com.zcloud.certificate.persistence.repository.impl; import com.zcloud.certificate.domain.enums.MenuEnum; +import com.zcloud.certificate.persistence.dataobject.UserCerDO; import com.zcloud.certificate.persistence.dataobject.UserCertificateDO; import com.zcloud.certificate.persistence.dataobject.UserCertificateStatDO; +import com.zcloud.certificate.persistence.dataobject.UserDO; import com.zcloud.certificate.persistence.mapper.UserCertificateMapper; import com.zcloud.certificate.persistence.repository.UserCertificateRepository; import com.alibaba.cola.dto.PageResponse; @@ -14,6 +16,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import com.jjb.saas.framework.repository.repo.impl.BaseRepositoryImpl; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; +import org.springframework.util.ObjectUtils; import java.util.Collections; import java.util.List; @@ -39,6 +42,14 @@ public class UserCertificateRepositoryImpl extends BaseRepositoryImpl certifiedPersonnelListPage(Map params) { + + IPage iPage = new Query().getPage(params); + IPage result = userCertificateMapper.certifiedPersonnelListPage(iPage, params); + return PageHelper.pageToResponse(result, result.getRecords()); + } + @Override public List getUserNamesByUserIds(List userIds) { return userCertificateMapper.selectUserNamesByUserIds(userIds); diff --git a/web-infrastructure/src/main/resources/mapper/UserCertificateMapper.xml b/web-infrastructure/src/main/resources/mapper/UserCertificateMapper.xml index 4a2f5b2..d0bbd28 100644 --- a/web-infrastructure/src/main/resources/mapper/UserCertificateMapper.xml +++ b/web-infrastructure/src/main/resources/mapper/UserCertificateMapper.xml @@ -205,5 +205,116 @@ GROUP BY ci.id, ci.corp_name ORDER BY ci.corp_order ASC + + + +