diff --git a/web-client/src/main/java/com/zcloud/primeport/dto/clientobject/ClosedAreaCarApplyCO.java b/web-client/src/main/java/com/zcloud/primeport/dto/clientobject/ClosedAreaCarApplyCO.java index bef588d..a4da5f8 100644 --- a/web-client/src/main/java/com/zcloud/primeport/dto/clientobject/ClosedAreaCarApplyCO.java +++ b/web-client/src/main/java/com/zcloud/primeport/dto/clientobject/ClosedAreaCarApplyCO.java @@ -92,6 +92,7 @@ public class ClosedAreaCarApplyCO extends ClientObject { //申请人员姓名 @ApiModelProperty(value = "申请人员姓名") private String applyPersonUserName; + private String applyUserName; //申请理由 @ApiModelProperty(value = "申请理由") private String applyReason; diff --git a/web-client/src/main/java/com/zcloud/primeport/dto/clientobject/ClosedAreaPersonApplyCO.java b/web-client/src/main/java/com/zcloud/primeport/dto/clientobject/ClosedAreaPersonApplyCO.java index c68afeb..5a5f565 100644 --- a/web-client/src/main/java/com/zcloud/primeport/dto/clientobject/ClosedAreaPersonApplyCO.java +++ b/web-client/src/main/java/com/zcloud/primeport/dto/clientobject/ClosedAreaPersonApplyCO.java @@ -118,6 +118,7 @@ public class ClosedAreaPersonApplyCO extends ClientObject { //驳回原因 @ApiModelProperty(value = "驳回原因") private String refusalReason; + private String applyUserName; @ApiModelProperty(value = "当前用户是否能审核。1,能审核2不能审核", name = "currentUserCanAudit") 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 684235d..be93f02 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 @@ -50,6 +50,7 @@ public class XgfPersonApplyCO extends ClientObject { private String applyCorpName; @ApiModelProperty(name = "申请时间", value = "applyTime") private String applyTime; + private String applyUserName; @ApiModelProperty(value = "当前用户是否能审核。1,能审核2不能审核", name = "currentUserCanAudit") private Integer currentUserCanAudit; diff --git a/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/dataobject/ClosedAreaCarApplyDO.java b/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/dataobject/ClosedAreaCarApplyDO.java index 20dede7..922c9c0 100644 --- a/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/dataobject/ClosedAreaCarApplyDO.java +++ b/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/dataobject/ClosedAreaCarApplyDO.java @@ -1,5 +1,6 @@ package com.zcloud.primeport.persistence.dataobject; +import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; import com.jjb.saas.framework.repository.basedo.BaseDO; import io.swagger.annotations.ApiModelProperty; @@ -142,5 +143,7 @@ public class ClosedAreaCarApplyDO extends BaseDO { private String drivingUserId; @ApiModelProperty(value = "驾驶人名称") private String drivingUserName; + @TableField(exist = false) + private String applyUserName; } diff --git a/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/dataobject/ClosedAreaPersonApplyDO.java b/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/dataobject/ClosedAreaPersonApplyDO.java index 4285e3e..b0f7fdc 100644 --- a/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/dataobject/ClosedAreaPersonApplyDO.java +++ b/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/dataobject/ClosedAreaPersonApplyDO.java @@ -1,5 +1,6 @@ package com.zcloud.primeport.persistence.dataobject; +import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; import com.jjb.saas.framework.repository.basedo.BaseDO; import io.swagger.annotations.ApiModelProperty; @@ -116,6 +117,7 @@ public class ClosedAreaPersonApplyDO extends BaseDO { //驳回原因 @ApiModelProperty(value = "驳回原因") private String refusalReason; - + @TableField(exist = false) + private String applyUserName; } 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 88f41c3..3bf64fb 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 @@ -59,5 +59,7 @@ public class XgfApplyPersonDO extends BaseDO { private Integer personApplyCount; @TableField(exist = false) private String applyTime; + @TableField(exist = false) + private String applyUserName; } diff --git a/web-infrastructure/src/main/resources/mapper/ClosedAreaCarApplyMapper.xml b/web-infrastructure/src/main/resources/mapper/ClosedAreaCarApplyMapper.xml index 37cd4ac..c292b6f 100644 --- a/web-infrastructure/src/main/resources/mapper/ClosedAreaCarApplyMapper.xml +++ b/web-infrastructure/src/main/resources/mapper/ClosedAreaCarApplyMapper.xml @@ -5,7 +5,7 @@ diff --git a/web-infrastructure/src/main/resources/mapper/ClosedAreaPersonApplyMapper.xml b/web-infrastructure/src/main/resources/mapper/ClosedAreaPersonApplyMapper.xml index 7fbc53b..441a249 100644 --- a/web-infrastructure/src/main/resources/mapper/ClosedAreaPersonApplyMapper.xml +++ b/web-infrastructure/src/main/resources/mapper/ClosedAreaPersonApplyMapper.xml @@ -52,7 +52,7 @@ u.department_id diff --git a/web-infrastructure/src/main/resources/mapper/XgfApplyPersonDO.xml b/web-infrastructure/src/main/resources/mapper/XgfApplyPersonDO.xml index d9d15b1..340ebf9 100644 --- a/web-infrastructure/src/main/resources/mapper/XgfApplyPersonDO.xml +++ b/web-infrastructure/src/main/resources/mapper/XgfApplyPersonDO.xml @@ -26,6 +26,7 @@ xap.audit_corp_id, xap.audit_corp_name, xap.audit_time, + xap.create_name apply_user_name, pa.person_corp_id, pa.person_corp_name, pa.person_department_id, @@ -76,6 +77,7 @@ SELECT p.*, p.create_time apply_time, + p.create_name apply_user_name, tmp.person_apply_count FROM xgf_apply_person p