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 070da81..e6781f1 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 @@ -13,10 +13,7 @@ import com.zcloud.primeport.api.VehicleApplyServiceI; import com.zcloud.primeport.domain.enums.TmpApplyEnum; import com.zcloud.primeport.domain.model.VehicleApplyE; import com.zcloud.primeport.dto.*; -import com.zcloud.primeport.dto.clientobject.ClosedAreaCarApplyCO; -import com.zcloud.primeport.dto.clientobject.ClosedAreaPersonApplyCO; -import com.zcloud.primeport.dto.clientobject.TmpApplyCO; -import com.zcloud.primeport.dto.clientobject.VehicleApplyCO; +import com.zcloud.primeport.dto.clientobject.*; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.AllArgsConstructor; @@ -127,26 +124,36 @@ public class ClosedTmpApplyController { TmpApplyCO tmpApplyCO = new TmpApplyCO(); if (TmpApplyEnum.PERSON_APPLY.getCode().equals(tmpApplyType)) { if (TmpApplyEnum.ONE_LEVEL_PERSON_APPLY.getCode().equals(tmpMkmjType)) { -// personApplyServiceI.getTmpInfoById(id); + XgfPersonApplyCO xgfPersonApplyCO = personApplyServiceI.xgfPersonApplyInfoById(id); + tmpApplyCO.setApplyReason(xgfPersonApplyCO.getReasonVisit()); + tmpApplyCO.setAuditFlag(xgfPersonApplyCO.getAuditFlag()); + tmpApplyCO.setRefusalReason(xgfPersonApplyCO.getReasonsRefusal()); + tmpApplyCO.setAuditPersonUserId(xgfPersonApplyCO.getAuditUserId()); + tmpApplyCO.setAuditPersonUserName(xgfPersonApplyCO.getAuditUserName()); + tmpApplyCO.setVisitStartTime(xgfPersonApplyCO.getVisitStartTime()); + tmpApplyCO.setVisitEndTime(xgfPersonApplyCO.getVisitEndTime()); + tmpApplyCO.setLevelOneMkmjId(xgfPersonApplyCO.getMkmjId()); + tmpApplyCO.setLevelOneMkmjName(xgfPersonApplyCO.getMkmjName()); + tmpApplyCO.setUserPhone(xgfPersonApplyCO.getPersonApplyList().get(0).getUserPhone()); + tmpApplyCO.setApplyPersonUserName(xgfPersonApplyCO.getPersonApplyList().get(0).getEmployeePersonUserName()); } if (TmpApplyEnum.TWO_LEVEL_PERSON_APPLY.getCode().equals(tmpMkmjType)) { ClosedAreaPersonApplyCO closedAreaPersonApplyCO = closedAreaPersonApplyServiceI.queryById(id); - tmpApplyCO.setApplyReason(closedAreaPersonApplyCO.getApplyReason()); - tmpApplyCO.setAuditFlag(closedAreaPersonApplyCO.getAuditFlag()); - tmpApplyCO.setRefusalReason(closedAreaPersonApplyCO.getRefusalReason()); - tmpApplyCO.setAuditPersonUserId(closedAreaPersonApplyCO.getAuditPersonUserId()); - tmpApplyCO.setAuditPersonUserName(closedAreaPersonApplyCO.getApplyPersonUserName()); - tmpApplyCO.setVisitStartTime(closedAreaPersonApplyCO.getVisitStartTime()); - tmpApplyCO.setVisitEndTime(closedAreaPersonApplyCO.getVisitEndTime()); -// tmpApplyCO.set + BeanUtils.copyProperties(closedAreaPersonApplyCO, tmpApplyCO); } } if (TmpApplyEnum.CAR_APPLY.getCode().equals(tmpMkmjType)) { if (TmpApplyEnum.ONE_LEVEL_CAR_APPLY.getCode().equals(tmpMkmjType)) { -// personApplyServiceI.getTmpInfoById(id); + VehicleApplyCO infoById = vehicleApplyServiceI.getInfoById(id); + BeanUtils.copyProperties(infoById, tmpApplyCO); + tmpApplyCO.setLevelOneMkmjName(infoById.getMkmjName()); + tmpApplyCO.setLevelOneMkmjId(infoById.getMkmjId()); + tmpApplyCO.setUserPhone(infoById.getLsUserPhone()); + tmpApplyCO.setApplyPersonUserName(infoById.getEmployeeVehicleUserName()); } if (TmpApplyEnum.TWO_LEVEL_CAR_APPLY.getCode().equals(tmpMkmjType)) { ClosedAreaCarApplyCO closedAreaCarApplyCO = closedAreaCarApplyService.queryById(id); + BeanUtils.copyProperties(closedAreaCarApplyCO, tmpApplyCO); } } tmpApplyCO.setId(id); diff --git a/web-client/src/main/java/com/zcloud/primeport/dto/ClosedAreaCarApplyAddCmd.java b/web-client/src/main/java/com/zcloud/primeport/dto/ClosedAreaCarApplyAddCmd.java index ba70f00..c8f62df 100644 --- a/web-client/src/main/java/com/zcloud/primeport/dto/ClosedAreaCarApplyAddCmd.java +++ b/web-client/src/main/java/com/zcloud/primeport/dto/ClosedAreaCarApplyAddCmd.java @@ -47,7 +47,8 @@ public class ClosedAreaCarApplyAddCmd extends Command { @ApiModelProperty(value = "二级口门id(封闭区域口门)", name = "levelTwoMkmjId", required = true) private Long levelTwoMkmjId; - + private String levelOneMkmjName; + private String levelTwoMkmjName; @ApiModelProperty(value = "封闭区域id", name = "closedAreaId", required = true) @NotNull(message = "封闭区域id不能为空") private Long closedAreaId; diff --git a/web-client/src/main/java/com/zcloud/primeport/dto/ClosedAreaCarApplyUpdateCmd.java b/web-client/src/main/java/com/zcloud/primeport/dto/ClosedAreaCarApplyUpdateCmd.java index 63eff68..c5723ac 100644 --- a/web-client/src/main/java/com/zcloud/primeport/dto/ClosedAreaCarApplyUpdateCmd.java +++ b/web-client/src/main/java/com/zcloud/primeport/dto/ClosedAreaCarApplyUpdateCmd.java @@ -95,7 +95,7 @@ public class ClosedAreaCarApplyUpdateCmd extends Command { @ApiModelProperty(value = "告知签字", name = "informSignId", required = true) @NotNull(message = "告知签字不能为空") - private Long informSignId; + private String informSignId; @ApiModelProperty(value = "行驶证照片", name = "drivingLicenseId", required = true) @NotEmpty(message = "行驶证照片不能为空") diff --git a/web-client/src/main/java/com/zcloud/primeport/dto/ClosedAreaPersonApplyAddCmd.java b/web-client/src/main/java/com/zcloud/primeport/dto/ClosedAreaPersonApplyAddCmd.java index b96f3ca..546ad22 100644 --- a/web-client/src/main/java/com/zcloud/primeport/dto/ClosedAreaPersonApplyAddCmd.java +++ b/web-client/src/main/java/com/zcloud/primeport/dto/ClosedAreaPersonApplyAddCmd.java @@ -21,7 +21,8 @@ public class ClosedAreaPersonApplyAddCmd extends Command { @ApiModelProperty(value = "申请归属1股份2分公司3相关方4临时人员", name = "personBelongType", required = true) @NotNull(message = "申请归属1股份2分公司3相关方4临时人员不能为空") private Integer personBelongType; - + private String levelOneMkmjName; + private String levelTwoMkmjName; @ApiModelProperty(value = "一级口门id", name = "levelOneMkmjId", required = true) private Long levelOneMkmjId; @@ -53,11 +54,11 @@ public class ClosedAreaPersonApplyAddCmd extends Command { private String jurisdictionalCorpName; @ApiModelProperty(value = "项目id", name = "projectId", required = true) - @NotNull(message = "项目id不能为空") +// @NotNull(message = "项目id不能为空") private Long projectId; @ApiModelProperty(value = "项目名称", name = "projectName", required = true) - @NotEmpty(message = "项目名称不能为空") +// @NotEmpty(message = "项目名称不能为空") private String projectName; @ApiModelProperty(value = "申请理由", name = "applyReason", required = true) diff --git a/web-client/src/main/java/com/zcloud/primeport/dto/ClosedTmpApplyAddCmd.java b/web-client/src/main/java/com/zcloud/primeport/dto/ClosedTmpApplyAddCmd.java index 390678d..0af626a 100644 --- a/web-client/src/main/java/com/zcloud/primeport/dto/ClosedTmpApplyAddCmd.java +++ b/web-client/src/main/java/com/zcloud/primeport/dto/ClosedTmpApplyAddCmd.java @@ -94,7 +94,7 @@ public class ClosedTmpApplyAddCmd extends Command { @ApiModelProperty(value = "告知签字", name = "informSignId", required = true) @NotNull(message = "告知签字不能为空") - private Long informSignId; + private String informSignId; // 临时人申请 @ApiModelProperty(value = "区域管辖单位名id", name = "jurisdictionalCorpId", required = true) private Long jurisdictionalCorpId; 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 cd558b8..bef588d 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 @@ -109,7 +109,7 @@ public class ClosedAreaCarApplyCO extends ClientObject { private String entourage; //告知签字 @ApiModelProperty(value = "告知签字") - private Long informSignId; + private String informSignId; //行驶证照片 @ApiModelProperty(value = "行驶证照片") private String drivingLicenseId; @@ -146,5 +146,7 @@ public class ClosedAreaCarApplyCO extends ClientObject { @ApiModelProperty(value = "人员进出记录", name = "personInOutRecord") private List personInOutRecord; + private String levelOneMkmjName; + private String levelTwoMkmjName; } 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 e1d4e12..2c62b77 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 @@ -92,7 +92,7 @@ public class ClosedAreaPersonApplyCO extends ClientObject { private String entourage; //告知签字 @ApiModelProperty(value = "告知签字") - private Long informSignId; + private String informSignId; //审批人员所属企业ID @ApiModelProperty(value = "审批人员所属企业ID") private Long auditPersonCorpId; @@ -124,5 +124,7 @@ public class ClosedAreaPersonApplyCO extends ClientObject { @ApiModelProperty(value = "人员进出记录", name = "personInOutRecord") private List personInOutRecord; + private String levelOneMkmjName; + private String levelTwoMkmjName; } diff --git a/web-client/src/main/java/com/zcloud/primeport/dto/clientobject/TmpApplyCO.java b/web-client/src/main/java/com/zcloud/primeport/dto/clientobject/TmpApplyCO.java index 6b5eca5..7618485 100644 --- a/web-client/src/main/java/com/zcloud/primeport/dto/clientobject/TmpApplyCO.java +++ b/web-client/src/main/java/com/zcloud/primeport/dto/clientobject/TmpApplyCO.java @@ -109,6 +109,5 @@ public class TmpApplyCO extends ClientObject { //驳回原因 @ApiModelProperty(value = "驳回原因") private String refusalReason; - } diff --git a/web-domain/src/main/java/com/zcloud/primeport/domain/model/ClosedAreaCarApplyE.java b/web-domain/src/main/java/com/zcloud/primeport/domain/model/ClosedAreaCarApplyE.java index 8c36590..e0638ba 100644 --- a/web-domain/src/main/java/com/zcloud/primeport/domain/model/ClosedAreaCarApplyE.java +++ b/web-domain/src/main/java/com/zcloud/primeport/domain/model/ClosedAreaCarApplyE.java @@ -27,6 +27,8 @@ public class ClosedAreaCarApplyE extends BaseE { private String vehicleTypeName; //一级口门id private Long levelOneMkmjId; + private String levelOneMkmjName; + private String levelTwoMkmjName; //审核状态(1:审核中;2审核通过; 3:审核驳回) private Integer auditFlag; //二级口门id(封闭区域口门) diff --git a/web-domain/src/main/java/com/zcloud/primeport/domain/model/ClosedAreaPersonApplyE.java b/web-domain/src/main/java/com/zcloud/primeport/domain/model/ClosedAreaPersonApplyE.java index 1c5ad85..f3f3e0d 100644 --- a/web-domain/src/main/java/com/zcloud/primeport/domain/model/ClosedAreaPersonApplyE.java +++ b/web-domain/src/main/java/com/zcloud/primeport/domain/model/ClosedAreaPersonApplyE.java @@ -18,6 +18,8 @@ public class ClosedAreaPersonApplyE extends BaseE { private Integer auditFlag; //二级口门id(封闭区域口门) private Long levelTwoMkmjId; + private String levelOneMkmjName; + private String levelTwoMkmjName; //封闭区域id private Long closedAreaId; //封闭区域名称 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 474e305..36e6688 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 @@ -39,6 +39,8 @@ public class ClosedAreaCarApplyDO extends BaseDO { //一级口门id @ApiModelProperty(value = "一级口门id") private Long levelOneMkmjId; + private String levelOneMkmjName; + private String levelTwoMkmjName; //审核状态(1:审核中;2审核通过; 3:审核驳回) @ApiModelProperty(value = "审核状态(1:审核中;2审核通过; 3:审核驳回)") private Integer auditFlag; 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 1d4899b..4285e3e 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 @@ -87,7 +87,8 @@ public class ClosedAreaPersonApplyDO extends BaseDO { //随行人员 @ApiModelProperty(value = "随行人员") private String entourage; - + private String levelOneMkmjName; + private String levelTwoMkmjName; //告知签字 @ApiModelProperty(value = "告知签字") private String informSignId;