feat:临时人员门禁列表
parent
3b79c52000
commit
e42df97073
|
|
@ -68,6 +68,7 @@ public class ClosedTmpApplyController {
|
|||
xgf.setAuditUserName(cmd.getAuditPersonUserName());
|
||||
xgf.setReasonVisit(cmd.getApplyReason());
|
||||
xgf.setMkmjId(cmd.getLevelOneMkmjId());
|
||||
xgf.setMkmjName(cmd.getLevelOneMkmjName());
|
||||
XgfPersonApplyAddCmd.PersonApplyAddCmdExt personApplyAddCmdExt = new XgfPersonApplyAddCmd.PersonApplyAddCmdExt();
|
||||
personApplyAddCmdExt.setEmployeePersonUserName(cmd.getApplyPersonUserName());
|
||||
personApplyAddCmdExt.setUserFaceUrl(cmd.getUserFaceUrl());
|
||||
|
|
|
|||
|
|
@ -59,7 +59,9 @@ public class PersonApplyAddExe {
|
|||
// 先进行相关方申请的保存
|
||||
XgfApplyPersonE build = XgfApplyPersonE.builder().personBelongType(cmd.getPersonBelongType())
|
||||
.gateLevelAuthArea(cmd.getGateLevelAuthArea())
|
||||
.mkmjId(cmd.getMkmjId()).auditFlag((cmd.getPersonBelongType() == 1 || cmd.getPersonBelongType() == 2) ? 2 : 1)
|
||||
.mkmjId(cmd.getMkmjId())
|
||||
.mkmjName(cmd.getMkmjName())
|
||||
.auditFlag((cmd.getPersonBelongType() == 1 || cmd.getPersonBelongType() == 2) ? 2 : 1)
|
||||
.auditCorpId(cmd.getAuditCorpId()).auditCorpName(cmd.getAuditCorpName())
|
||||
.auditDeptId(cmd.getAuditDeptId()).auditDeptName(cmd.getAuditDeptName())
|
||||
.auditUserId(cmd.getAuditUserId()).auditUserName(cmd.getAuditUserName())
|
||||
|
|
|
|||
|
|
@ -39,6 +39,8 @@ public class XgfPersonApplyAddCmd extends Command {
|
|||
private String informSignId;
|
||||
@ApiModelProperty(value = "口门id,临时申请用。", name = "mkmjId")
|
||||
private Long mkmjId;
|
||||
@ApiModelProperty(value = "口门名称。", name = "mkmjName")
|
||||
private String mkmjName;
|
||||
@ApiModelProperty(value = "项目id", name = "projectId")
|
||||
private Long projectId;
|
||||
@ApiModelProperty(value = "项目名称", name = "projectName")
|
||||
|
|
|
|||
|
|
@ -20,6 +20,7 @@ import lombok.NoArgsConstructor;
|
|||
public class XgfApplyPersonE extends BaseE {
|
||||
private Integer personBelongType;
|
||||
private Long mkmjId;
|
||||
private String mkmjName;
|
||||
//授权范围港区与区域
|
||||
private String gateLevelAuthArea;
|
||||
//审核状态(1:审核中;2审核通过; 3:审核驳回,4无需审批(长期人员))
|
||||
|
|
|
|||
|
|
@ -35,8 +35,7 @@ public class XgfApplyPersonDO extends BaseDO {
|
|||
private String informSignId;
|
||||
@ApiModelProperty(value = "门口门禁id")
|
||||
private Long mkmjId;
|
||||
@TableField(exist = false)
|
||||
private Long mkmjName;
|
||||
private String mkmjName;
|
||||
//项目id
|
||||
@ApiModelProperty(value = "项目id")
|
||||
private Long projectId;
|
||||
|
|
|
|||
|
|
@ -9,6 +9,7 @@
|
|||
xap.person_belong_type,
|
||||
xap.gate_level_auth_area,
|
||||
xap.mkmj_id,
|
||||
xap.mkmj_name,
|
||||
xap.audit_flag,
|
||||
xap.reasons_refusal,
|
||||
xap.reason_visit,
|
||||
|
|
@ -66,6 +67,9 @@
|
|||
<if test="params.visitEndTime != null and params.visitEndTime != ''">
|
||||
AND xap.visit_end_time LIKE CONCAT('%', #{params.visitEndTime}, '%')
|
||||
</if>
|
||||
<if test="params.personBelongType != null and params.personBelongType != ''">
|
||||
AND xap.person_belong_type = #{params.personBelongType}
|
||||
</if>
|
||||
<if test="params.vehicleBelongType != null and params.vehicleBelongType != ''">
|
||||
AND xap.person_belong_type = #{params.vehicleBelongType}
|
||||
</if>
|
||||
|
|
|
|||
Loading…
Reference in New Issue