parent
71d194f82a
commit
fa24b15983
|
|
@ -16,6 +16,7 @@ import com.jjb.saas.framework.auth.utils.AuthContext;
|
|||
import io.swagger.annotations.Api;
|
||||
import io.swagger.annotations.ApiOperation;
|
||||
import lombok.AllArgsConstructor;
|
||||
import org.springframework.security.access.prepost.PreAuthorize;
|
||||
import org.springframework.validation.annotation.Validated;
|
||||
import org.springframework.web.bind.annotation.*;
|
||||
|
||||
|
|
@ -41,6 +42,7 @@ public class UserCertificateController {
|
|||
|
||||
@ApiOperation("分页")
|
||||
@PostMapping("/list")
|
||||
@PreAuthorize("@pms.hasAnyPermission('gfd-tzzyrugl', 'gfd-tzsbczrygl', 'gfd-qyzyfzrgl','gfd-qyaqscglrygl', 'qyd-tzzyrugl', 'qyd-tzsbczrygl', 'qyd-zyfzrgl','qyd-aqscglrygl', 'xgfd-zyfzrgl', 'xgfd-tzzzsbczrygl', 'xgfd-aqscglrygl','xgfd-tzzyrugl')")
|
||||
public PageResponse<UserCertificateCO> page(@RequestBody UserCertificatePageQry qry) {
|
||||
return userCertificateService.listPage(qry);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -34,7 +34,11 @@ public class UserCertificateAddCmd extends Command {
|
|||
|
||||
@ApiModelProperty(value = "1-特种作业,2-特种设备,3-主要负责人,4-安全生产管理人员", name = "type", required = true)
|
||||
@NotNull(message = "1-特种作业,2-特种设备,3-主要负责人,4-安全生产管理人员不能为空")
|
||||
private Integer type;
|
||||
private String type;
|
||||
|
||||
@ApiModelProperty(value = "人员类型名称", name = "typeName", required = true)
|
||||
@NotEmpty(message = "人员类型名称不能为空")
|
||||
private String typeName;
|
||||
|
||||
@ApiModelProperty(value = "证书名称", name = "certificateName", required = true)
|
||||
@NotEmpty(message = "证书名称不能为空")
|
||||
|
|
|
|||
|
|
@ -35,7 +35,10 @@ public class UserCertificateUpdateCmd extends Command {
|
|||
private Long userId;
|
||||
@ApiModelProperty(value = "1-特种作业,2-特种设备,3-主要负责人,4-安全生产管理人员", name = "type", required = true)
|
||||
@NotNull(message = "1-特种作业,2-特种设备,3-主要负责人,4-安全生产管理人员不能为空")
|
||||
private Integer type;
|
||||
private String type;
|
||||
@ApiModelProperty(value = "人员类型名称", name = "typeName", required = true)
|
||||
@NotEmpty(message = "人员类型名称不能为空")
|
||||
private String typeName;
|
||||
@ApiModelProperty(value = "证书名称", name = "certificateName", required = true)
|
||||
@NotEmpty(message = "证书名称不能为空")
|
||||
private String certificateName;
|
||||
|
|
|
|||
|
|
@ -35,7 +35,10 @@ public class UserCertificateCO extends ClientObject {
|
|||
private Integer employmentStatus;
|
||||
//1-特种作业,2-特种设备,3-主要负责人,4-安全生产管理人员
|
||||
@ApiModelProperty(value = "1-特种作业,2-特种设备,3-主要负责人,4-安全生产管理人员")
|
||||
private Integer type;
|
||||
private String type;
|
||||
//人员类型名称
|
||||
@ApiModelProperty(value = "人员类型名称")
|
||||
private String typeName;
|
||||
//证书名称
|
||||
@ApiModelProperty(value = "证书名称")
|
||||
private String certificateName;
|
||||
|
|
|
|||
|
|
@ -33,7 +33,9 @@ public class UserCertificateDO extends BaseDO {
|
|||
private Long userId;
|
||||
//1-特种作业,2-特种设备,3-主要负责人,4-安全生产管理人员
|
||||
@ApiModelProperty(value = "1-特种作业,2-特种设备,3-主要负责人,4-安全生产管理人员")
|
||||
private Integer type;
|
||||
private String type;
|
||||
@ApiModelProperty(value = "人员类型名称")
|
||||
private String typeName;
|
||||
//证书名称
|
||||
@ApiModelProperty(value = "证书名称")
|
||||
private String certificateName;
|
||||
|
|
|
|||
|
|
@ -1,6 +1,8 @@
|
|||
package com.zcloud.certificate.persistence.mapper;
|
||||
|
||||
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.UserCertificateDO;
|
||||
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
|
||||
import com.zcloud.certificate.persistence.dataobject.UserCertificateStatDO;
|
||||
|
|
@ -16,6 +18,9 @@ import java.util.Map;
|
|||
* @Date 2026-01-06 08:47:20
|
||||
*/
|
||||
@Mapper
|
||||
@DataScopes({
|
||||
@DataScope(method = "selectPageWithUser", menuPerms = "zhgl2")
|
||||
})
|
||||
public interface UserCertificateMapper extends BaseMapper<UserCertificateDO> {
|
||||
|
||||
/**
|
||||
|
|
|
|||
Loading…
Reference in New Issue