diff --git a/web-app/src/main/java/com/zcloud/primeport/command/PersonApplyUpdateExe.java b/web-app/src/main/java/com/zcloud/primeport/command/PersonApplyUpdateExe.java index 323c83e..ca992d5 100644 --- a/web-app/src/main/java/com/zcloud/primeport/command/PersonApplyUpdateExe.java +++ b/web-app/src/main/java/com/zcloud/primeport/command/PersonApplyUpdateExe.java @@ -1,6 +1,7 @@ package com.zcloud.primeport.command; import com.alibaba.cola.exception.BizException; +import com.zcloud.gbscommon.utils.DateUtil; import com.zcloud.primeport.domain.gateway.MkmjGateGateway; import com.zcloud.primeport.domain.gateway.PersonApplyGateway; import com.zcloud.primeport.domain.gateway.XgfApplyPersonGateway; @@ -15,6 +16,7 @@ import org.springframework.stereotype.Component; import org.springframework.transaction.annotation.Transactional; import javax.validation.constraints.NotNull; +import java.util.Date; /** @@ -44,6 +46,7 @@ public class PersonApplyUpdateExe { public void xgfPersonAudit(XgfPersonApplyAuditCmd cmd) { XgfApplyPersonE build = XgfApplyPersonE.builder() .auditFlag(cmd.getAuditFlag()) + .auditTime(DateUtil.date2Str(new Date())) .reasonsRefusal(cmd.getReasonsRefusal()).build(); build.setId(cmd.getId()); personApplyGateway.xgfPersonAudit(build); diff --git a/web-client/src/main/java/com/zcloud/primeport/dto/clientobject/XgfPersonApplyCO.java b/web-client/src/main/java/com/zcloud/primeport/dto/clientobject/XgfPersonApplyCO.java index be93f02..991de4d 100644 --- a/web-client/src/main/java/com/zcloud/primeport/dto/clientobject/XgfPersonApplyCO.java +++ b/web-client/src/main/java/com/zcloud/primeport/dto/clientobject/XgfPersonApplyCO.java @@ -19,6 +19,8 @@ public class XgfPersonApplyCO extends ClientObject { //id @ApiModelProperty(value = "id") private Long id; + @ApiModelProperty(value = "personApplyId") + private Long personApplyId; //1股份2分公司3相关方4临时人员 @ApiModelProperty(value = "授权范围港区与区域",name = "gateLevelAuthArea") private String gateLevelAuthArea; @@ -39,7 +41,7 @@ public class XgfPersonApplyCO extends ClientObject { private Long projectId; @ApiModelProperty(value = "访问口门id",name = "mkmjId") private Long mkmjId; - @ApiModelProperty(value = "访问口门名称",name = "mkmjId") + @ApiModelProperty(value = "访问口门名称",name = "mkmjName") private String mkmjName; //项目名称 @ApiModelProperty(value = "项目名称",name = "projectName") @@ -73,6 +75,8 @@ public class XgfPersonApplyCO extends ClientObject { //审批人企业名称 @ApiModelProperty(value = "审批人企业名称", name = "auditCorpName") private String auditCorpName; + @ApiModelProperty(value = "审批时间", name = "auditTime") + private String auditTime; @ApiModelProperty(value = "驳回原因", name = "reasonsRefusal") private String reasonsRefusal; @ApiModelProperty(value = "来访事由", name = "reasonVisit") @@ -82,5 +86,16 @@ public class XgfPersonApplyCO extends ClientObject { @ApiModelProperty(value = "申请人员列表", name = "personApplyList") private List personApplyList; + + + @ApiModelProperty(value = "访问人姓名", name = "employeePersonUserName") + private String employeePersonUserName; + @ApiModelProperty(value = "头像", name = "userFaceUrl") + private String userFaceUrl; + @ApiModelProperty(value = "手机号", name = "userPhone") + private String userPhone; + @ApiModelProperty(value = "身份证号",name = "userCard") + private String userCard; + } 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 5fab84d..5e7edcc 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 @@ -46,6 +46,7 @@ public class XgfApplyPersonE extends BaseE { private String auditDeptName; private Long auditUserId; private String auditUserName; + private String auditTime; private String reasonsRefusal; private String reasonVisit; private String applyTime; 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 77bcff8..93950f4 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 @@ -54,11 +54,22 @@ public class XgfApplyPersonDO extends BaseDO { private String auditUserName; private String reasonsRefusal; private String reasonVisit; + private String auditTime; @TableField(exist = false) private Integer personApplyCount; @TableField(exist = false) private String applyTime; @TableField(exist = false) private String applyUserName; + @TableField(exist = false) + private Long personApplyId; + @TableField(exist = false) + private String employeePersonUserName; + @TableField(exist = false) + private String userFaceUrl; + @TableField(exist = false) + private String userPhone; + @TableField(exist = false) + private String userCard; } diff --git a/web-infrastructure/src/main/resources/mapper/XgfApplyPersonDO.xml b/web-infrastructure/src/main/resources/mapper/XgfApplyPersonDO.xml index cf3807c..a849b92 100644 --- a/web-infrastructure/src/main/resources/mapper/XgfApplyPersonDO.xml +++ b/web-infrastructure/src/main/resources/mapper/XgfApplyPersonDO.xml @@ -28,6 +28,7 @@ xap.audit_corp_name, xap.audit_time, xap.create_name apply_user_name, + pa.id person_apply_id, pa.person_corp_id, pa.person_corp_name, pa.person_department_id,