From e42df970735936833628f2cf573974c88f5e351b Mon Sep 17 00:00:00 2001 From: dearLin <1261008090@qq.com> Date: Sat, 28 Mar 2026 13:47:16 +0800 Subject: [PATCH] =?UTF-8?q?feat=EF=BC=9A=E4=B8=B4=E6=97=B6=E4=BA=BA?= =?UTF-8?q?=E5=91=98=E9=97=A8=E7=A6=81=E5=88=97=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../zcloud/primeport/web/close/ClosedTmpApplyController.java | 1 + .../java/com/zcloud/primeport/command/PersonApplyAddExe.java | 4 +++- .../java/com/zcloud/primeport/dto/XgfPersonApplyAddCmd.java | 2 ++ .../com/zcloud/primeport/domain/model/XgfApplyPersonE.java | 1 + .../primeport/persistence/dataobject/XgfApplyPersonDO.java | 3 +-- .../src/main/resources/mapper/XgfApplyPersonDO.xml | 4 ++++ 6 files changed, 12 insertions(+), 3 deletions(-) diff --git a/web-adapter/src/main/java/com/zcloud/primeport/web/close/ClosedTmpApplyController.java b/web-adapter/src/main/java/com/zcloud/primeport/web/close/ClosedTmpApplyController.java index b32d014..9d14c00 100644 --- a/web-adapter/src/main/java/com/zcloud/primeport/web/close/ClosedTmpApplyController.java +++ b/web-adapter/src/main/java/com/zcloud/primeport/web/close/ClosedTmpApplyController.java @@ -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()); diff --git a/web-app/src/main/java/com/zcloud/primeport/command/PersonApplyAddExe.java b/web-app/src/main/java/com/zcloud/primeport/command/PersonApplyAddExe.java index 50c8bde..a02cfc3 100644 --- a/web-app/src/main/java/com/zcloud/primeport/command/PersonApplyAddExe.java +++ b/web-app/src/main/java/com/zcloud/primeport/command/PersonApplyAddExe.java @@ -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()) diff --git a/web-client/src/main/java/com/zcloud/primeport/dto/XgfPersonApplyAddCmd.java b/web-client/src/main/java/com/zcloud/primeport/dto/XgfPersonApplyAddCmd.java index 4d0017a..49386c0 100644 --- a/web-client/src/main/java/com/zcloud/primeport/dto/XgfPersonApplyAddCmd.java +++ b/web-client/src/main/java/com/zcloud/primeport/dto/XgfPersonApplyAddCmd.java @@ -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") diff --git a/web-domain/src/main/java/com/zcloud/primeport/domain/model/XgfApplyPersonE.java b/web-domain/src/main/java/com/zcloud/primeport/domain/model/XgfApplyPersonE.java index 75abf21..5fab84d 100644 --- a/web-domain/src/main/java/com/zcloud/primeport/domain/model/XgfApplyPersonE.java +++ b/web-domain/src/main/java/com/zcloud/primeport/domain/model/XgfApplyPersonE.java @@ -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无需审批（长期人员）) diff --git a/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/dataobject/XgfApplyPersonDO.java b/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/dataobject/XgfApplyPersonDO.java index 3bf64fb..77bcff8 100644 --- a/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/dataobject/XgfApplyPersonDO.java +++ b/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/dataobject/XgfApplyPersonDO.java @@ -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; diff --git a/web-infrastructure/src/main/resources/mapper/XgfApplyPersonDO.xml b/web-infrastructure/src/main/resources/mapper/XgfApplyPersonDO.xml index 5fdda77..cf3807c 100644 --- a/web-infrastructure/src/main/resources/mapper/XgfApplyPersonDO.xml +++ b/web-infrastructure/src/main/resources/mapper/XgfApplyPersonDO.xml @@ -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 @@ AND xap.visit_end_time LIKE CONCAT('%', #{params.visitEndTime}, '%') + + AND xap.person_belong_type = #{params.personBelongType} + AND xap.person_belong_type = #{params.vehicleBelongType}