1.口门门禁审批人管理
parent
c2b52adacc
commit
80755ced13
|
|
@ -23,9 +23,6 @@ import java.util.Date;
|
|||
@AllArgsConstructor
|
||||
public class MkmjApprovalUserAddCmd extends Command {
|
||||
|
||||
@ApiModelProperty(value = "审批人类型", name = "userType", required = true)
|
||||
@NotNull(message = "审批人类型")
|
||||
private Integer userType;
|
||||
|
||||
@ApiModelProperty(value = "审批人部门ID", name = "deptName", required = true)
|
||||
@NotEmpty(message = "审批人部门ID不能为空")
|
||||
|
|
@ -51,5 +48,16 @@ public class MkmjApprovalUserAddCmd extends Command {
|
|||
@ApiModelProperty(value = "企业id", name = "corpId", required = true)
|
||||
@NotNull(message = "企业id不能为空")
|
||||
private Long corpId;
|
||||
@ApiModelProperty( name = "isPersonnelPermission")
|
||||
@NotEmpty(message = "人员审核权限")
|
||||
Integer isPersonnelPermission;
|
||||
@ApiModelProperty( name = "isVehiclePermission")
|
||||
@NotEmpty(message = "车辆审核权限")
|
||||
Integer isVehiclePermission;
|
||||
@ApiModelProperty( name = "isTemporaryPermission")
|
||||
@NotEmpty(message = "临时审核权限")
|
||||
Integer isTemporaryPermission;
|
||||
|
||||
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -25,11 +25,7 @@ public class MkmjApprovalUserPageQry extends PageQuery {
|
|||
* - `ne`: 不等比较查询,对应SQL的!=操作符
|
||||
*/
|
||||
private String likeDeptName;
|
||||
/**
|
||||
* 查询类型 (口门门禁车辆审核人1; 临时访客审核人2)
|
||||
*/
|
||||
private String eqUserType;
|
||||
|
||||
|
||||
public String likeUserName;
|
||||
|
||||
public String likeName;
|
||||
|
|
@ -37,5 +33,4 @@ public class MkmjApprovalUserPageQry extends PageQuery {
|
|||
public String eqDeptId;
|
||||
|
||||
public String eqCorpId;
|
||||
}
|
||||
|
||||
}
|
||||
|
|
@ -23,9 +23,6 @@ public class MkmjApprovalUserUpdateCmd extends Command {
|
|||
@ApiModelProperty(value = "主键ID", name = "id", required = true)
|
||||
@NotEmpty(message = "主键ID不能为空")
|
||||
private Long id;
|
||||
@ApiModelProperty(value = "审批人类型", name = "userType", required = true)
|
||||
@NotEmpty(message = "审批人类型")
|
||||
private Integer userType;
|
||||
@ApiModelProperty(value = "审批人部门ID", name = "deptName", required = true)
|
||||
@NotEmpty(message = "审批人部门ID不能为空")
|
||||
private String deptName;
|
||||
|
|
@ -53,6 +50,11 @@ public class MkmjApprovalUserUpdateCmd extends Command {
|
|||
@ApiModelProperty(value = "删除标识", name = "deleteEnum", required = true)
|
||||
@NotEmpty(message = "删除标识不能为空")
|
||||
private String deleteEnum;
|
||||
@ApiModelProperty(name = "isPersonnelPermission")
|
||||
private Integer isPersonnelPermission;
|
||||
@ApiModelProperty(name = "isVehiclePermission")
|
||||
private Integer isVehiclePermission;
|
||||
@ApiModelProperty(name = "isTemporaryPermission")
|
||||
private Integer isTemporaryPermission;
|
||||
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -17,9 +17,6 @@ public class MkmjApprovalUserCO extends ClientObject {
|
|||
//主键ID
|
||||
@ApiModelProperty(value = "主键ID")
|
||||
private Long id;
|
||||
//审批类型(口门门禁车辆审核人1;临时访客审核人2)
|
||||
@ApiModelProperty(value = "审批类型(口门门禁车辆审核人1;临时访客审核人2)")
|
||||
private Integer userType;
|
||||
//审批人部门ID
|
||||
@ApiModelProperty(value = "审批人部门ID")
|
||||
private String deptName;
|
||||
|
|
@ -47,6 +44,14 @@ public class MkmjApprovalUserCO extends ClientObject {
|
|||
//删除标识
|
||||
@ApiModelProperty(value = "删除标识")
|
||||
private String deleteEnum;
|
||||
//人员审核权限(0-无权限,1-有权限)
|
||||
@ApiModelProperty(value = "人员审核权限(0-无权限,1-有权限)")
|
||||
private Integer isPersonnelPermission;
|
||||
//车辆审核权限(0-无权限,1-有权限)
|
||||
@ApiModelProperty(value = "车辆审核权限(0-无权限,1-有权限)")
|
||||
private Integer isVehiclePermission;
|
||||
//临时审核权限(0-无权限,1-有权限)
|
||||
@ApiModelProperty(value = "临时审核权限(0-无权限,1-有权限)")
|
||||
private Integer isTemporaryPermission;
|
||||
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -31,9 +31,12 @@ public class MkmjApprovalUserE extends BaseE {
|
|||
private Long corpId;
|
||||
//删除标识
|
||||
private String deleteEnum;
|
||||
//审批人类型
|
||||
private Integer userType;
|
||||
//人员审核权限(0-无权限,1-有权限)
|
||||
private Integer isPersonnelPermission;
|
||||
//车辆审核权限(0-无权限,1-有权限)
|
||||
private Integer isVehiclePermission;
|
||||
//临时审核权限(0-无权限,1-有权限)
|
||||
private Integer isTemporaryPermission;
|
||||
|
||||
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -41,7 +41,7 @@ public class MkmjApprovalUserGatewayImpl implements MkmjApprovalUserGateway {
|
|||
public Boolean deletedMkmjApprovalUserById(Long id) {
|
||||
MkmjApprovalUserDO d = new MkmjApprovalUserDO();
|
||||
d.setDeleteEnum("TRUE");
|
||||
d.setId( id);
|
||||
d.setId(id);
|
||||
return mkmjApprovalUserRepository.updateById(d);
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -25,9 +25,6 @@ public class MkmjApprovalUserDO extends BaseDO {
|
|||
@ApiModelProperty(value = "主键ID")
|
||||
@TableId(type = IdType.ASSIGN_ID)
|
||||
private Long id;
|
||||
//审批人类型
|
||||
@ApiModelProperty(value = "审批人类型")
|
||||
private Integer userType;
|
||||
//审批人部门ID
|
||||
@ApiModelProperty(value = "审批人部门ID")
|
||||
private String deptName;
|
||||
|
|
@ -52,6 +49,15 @@ public class MkmjApprovalUserDO extends BaseDO {
|
|||
//企业id
|
||||
@ApiModelProperty(value = "企业id")
|
||||
private Long corpId;
|
||||
//人员审核权限(0-无权限,1-有权限)
|
||||
@ApiModelProperty(value = "人员审核权限(0-无权限,1-有权限)")
|
||||
private Integer isPersonnelPermission;
|
||||
//车辆审核权限(0-无权限,1-有权限)
|
||||
@ApiModelProperty(value = "车辆审核权限(0-无权限,1-有权限)")
|
||||
private Integer isVehiclePermission;
|
||||
//临时审核权限(0-无权限,1-有权限)
|
||||
@ApiModelProperty(value = "临时审核权限(0-无权限,1-有权限)")
|
||||
private Integer isTemporaryPermission;
|
||||
//删除标识
|
||||
@ApiModelProperty(value = "删除标识")
|
||||
private String deleteEnum;
|
||||
|
|
@ -59,4 +65,3 @@ public class MkmjApprovalUserDO extends BaseDO {
|
|||
|
||||
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -31,6 +31,7 @@ public class MkmjApprovalUserRepositoryImpl extends BaseRepositoryImpl<MkmjAppro
|
|||
IPage<MkmjApprovalUserDO> iPage = new Query<MkmjApprovalUserDO>().getPage(parmas);
|
||||
QueryWrapper<MkmjApprovalUserDO> queryWrapper = new QueryWrapper<>();
|
||||
queryWrapper = PageQueryHelper.createPageQueryWrapper(queryWrapper, parmas);
|
||||
queryWrapper.orderByDesc("dept_id");
|
||||
queryWrapper.orderByDesc("create_time");
|
||||
IPage<MkmjApprovalUserDO> result = mkmjApprovalUserMapper.selectPage(iPage, queryWrapper);
|
||||
return PageHelper.pageToResponse(result, result.getRecords());
|
||||
|
|
|
|||
Loading…
Reference in New Issue