From 2e15919054167b110e396c20a36bf5d339995277 Mon Sep 17 00:00:00 2001 From: dearLin <1261008090@qq.com> Date: Mon, 23 Mar 2026 11:21:11 +0800 Subject: [PATCH] =?UTF-8?q?feat=EF=BC=9A=E4=BA=8C=E7=BA=A7=E5=B0=81?= =?UTF-8?q?=E9=97=AD=E5=8C=BA=E5=9F=9F=E7=94=B3=E8=AF=B7=EF=BC=8C=E4=B8=80?= =?UTF-8?q?=E7=BA=A7=E4=B8=B4=E6=97=B6=E8=BD=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../primeport/web/VehicleApplyController.java | 3 +- .../web/close/ClosedTmpApplyController.java | 40 +++++- .../primeport/command/PersonApplyAddExe.java | 1 + .../primeport/api/VehicleApplyServiceI.java | 3 +- .../dto/ClosedAreaCarApplyAddCmd.java | 4 +- .../dto/ClosedAreaPersonApplyAddCmd.java | 4 +- .../dto/ClosedAreaPersonApplyUpdateCmd.java | 4 +- .../dto/clientobject/TmpApplyCO.java | 114 ++++++++++++++++++ .../domain/model/ClosedAreaCarApplyE.java | 2 +- .../domain/model/ClosedAreaPersonApplyE.java | 2 +- .../dataobject/ClosedAreaCarApplyDO.java | 2 +- .../dataobject/ClosedAreaPersonApplyDO.java | 2 +- .../mapper/ClosedAreaPersonApplyMapper.xml | 4 +- 13 files changed, 166 insertions(+), 19 deletions(-) create mode 100644 web-client/src/main/java/com/zcloud/primeport/dto/clientobject/TmpApplyCO.java diff --git a/web-adapter/src/main/java/com/zcloud/primeport/web/VehicleApplyController.java b/web-adapter/src/main/java/com/zcloud/primeport/web/VehicleApplyController.java index ed46408..e47ef0f 100644 --- a/web-adapter/src/main/java/com/zcloud/primeport/web/VehicleApplyController.java +++ b/web-adapter/src/main/java/com/zcloud/primeport/web/VehicleApplyController.java @@ -8,6 +8,7 @@ import com.alibaba.cola.dto.SingleResponse; import com.jjb.saas.framework.auth.model.SSOUser; import com.jjb.saas.framework.auth.utils.AuthContext; import com.zcloud.primeport.api.VehicleApplyServiceI; +import com.zcloud.primeport.domain.model.VehicleApplyE; import com.zcloud.primeport.dto.*; import com.zcloud.primeport.dto.clientobject.FgsVehicleCountCo; import com.zcloud.primeport.dto.clientobject.VehicleApplyCO; @@ -41,7 +42,7 @@ public class VehicleApplyController { @ApiOperation("新增-长期车辆录入") @PostMapping("/save") - public SingleResponse add(@Validated @RequestBody VehicleApplyAddCmd cmd) { + public SingleResponse add(@Validated @RequestBody VehicleApplyAddCmd cmd) { return vehicleApplyService.add(cmd); } @ApiOperation("新增-检查部门车辆录入") 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 a44308a..070da81 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 @@ -11,8 +11,11 @@ import com.zcloud.primeport.api.ClosedAreaPersonApplyServiceI; import com.zcloud.primeport.api.PersonApplyServiceI; 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 io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; @@ -67,6 +70,7 @@ public class ClosedTmpApplyController { xgf.setAuditUserId(cmd.getAuditPersonUserId()); xgf.setAuditUserName(cmd.getAuditPersonUserName()); xgf.setReasonVisit(cmd.getApplyReason()); + xgf.setMkmjId(cmd.getLevelOneMkmjId()); XgfPersonApplyAddCmd.PersonApplyAddCmdExt personApplyAddCmdExt = new XgfPersonApplyAddCmd.PersonApplyAddCmdExt(); personApplyAddCmdExt.setEmployeePersonUserName(cmd.getApplyPersonUserName()); personApplyAddCmdExt.setUserFaceUrl(cmd.getUserFaceUrl()); @@ -102,7 +106,7 @@ public class ClosedTmpApplyController { vehicleApplyAddCmd.setLsUserPhone(cmd.getUserPhone()); vehicleApplyAddCmd.setEmployeeVehicleUserName(cmd.getApplyPersonUserName()); vehicleApplyAddCmd.setRemarks(cmd.getApplyReason()); - SingleResponse add = vehicleApplyServiceI.add(vehicleApplyAddCmd); + SingleResponse add = vehicleApplyServiceI.add(vehicleApplyAddCmd); id = add.getData().getId(); } if (cmd.getTmpMkmjType().equals(TmpApplyEnum.TWO_LEVEL_CAR_APPLY.getCode())) { @@ -118,10 +122,36 @@ public class ClosedTmpApplyController { @ApiOperation("详情") @GetMapping("/getInfoById") - public SingleResponse getInfoById(@RequestParam("id") Long id - , @RequestParam("tmpApplyType") String tmpApplyType - , @RequestParam("tmpMkmjType") String tmpMkmjType) { - return SingleResponse.of(closedAreaCarApplyService.queryById(id)); + public SingleResponse getInfoById(@RequestParam("id") Long id, + @RequestParam("tmpApplyType") String tmpApplyType, @RequestParam("tmpMkmjType") String tmpMkmjType) { + TmpApplyCO tmpApplyCO = new TmpApplyCO(); + if (TmpApplyEnum.PERSON_APPLY.getCode().equals(tmpApplyType)) { + if (TmpApplyEnum.ONE_LEVEL_PERSON_APPLY.getCode().equals(tmpMkmjType)) { +// personApplyServiceI.getTmpInfoById(id); + } + 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 + } + } + if (TmpApplyEnum.CAR_APPLY.getCode().equals(tmpMkmjType)) { + if (TmpApplyEnum.ONE_LEVEL_CAR_APPLY.getCode().equals(tmpMkmjType)) { +// personApplyServiceI.getTmpInfoById(id); + } + if (TmpApplyEnum.TWO_LEVEL_CAR_APPLY.getCode().equals(tmpMkmjType)) { + ClosedAreaCarApplyCO closedAreaCarApplyCO = closedAreaCarApplyService.queryById(id); + } + } + tmpApplyCO.setId(id); + tmpApplyCO.setTmpApplyType(tmpApplyType); + return SingleResponse.of(tmpApplyCO); } } 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 9080df6..aea669d 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 @@ -60,6 +60,7 @@ public class PersonApplyAddExe { .auditCorpId(cmd.getAuditCorpId()).auditCorpName(cmd.getAuditCorpName()) .auditDeptId(cmd.getAuditDeptId()).auditDeptName(cmd.getAuditDeptName()) .auditUserId(cmd.getAuditUserId()).auditUserName(cmd.getAuditUserName()) + .reasonVisit(cmd.getReasonVisit()) .visitStartTime(cmd.getVisitStartTime()) .visitEndTime(cmd.getVisitEndTime()) .applyCorpId(cmd.getPersonBelongType() != 4 ? AuthContext.getTenantId() : null) diff --git a/web-client/src/main/java/com/zcloud/primeport/api/VehicleApplyServiceI.java b/web-client/src/main/java/com/zcloud/primeport/api/VehicleApplyServiceI.java index 42622d7..6e68b9d 100644 --- a/web-client/src/main/java/com/zcloud/primeport/api/VehicleApplyServiceI.java +++ b/web-client/src/main/java/com/zcloud/primeport/api/VehicleApplyServiceI.java @@ -2,6 +2,7 @@ package com.zcloud.primeport.api; import com.alibaba.cola.dto.PageResponse; import com.alibaba.cola.dto.SingleResponse; +import com.zcloud.primeport.domain.model.VehicleApplyE; import com.zcloud.primeport.dto.*; import com.zcloud.primeport.dto.clientobject.FgsVehicleCountCo; import com.zcloud.primeport.dto.clientobject.VehicleApplyCO; @@ -18,7 +19,7 @@ import java.util.HashMap; public interface VehicleApplyServiceI { PageResponse listPage(VehicleApplyPageQry qry); - SingleResponse add(VehicleApplyAddCmd cmd); + SingleResponse add(VehicleApplyAddCmd cmd); void edit(VehicleApplyUpdateCmd cmd); 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 0bc9450..ba70f00 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 @@ -83,8 +83,8 @@ public class ClosedAreaCarApplyAddCmd extends Command { private String entourage; @ApiModelProperty(value = "告知签字", name = "informSignId", required = true) - @NotNull(message = "告知签字不能为空") - private Long informSignId; + @NotEmpty(message = "告知签字不能为空") + 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 3f15fd1..b96f3ca 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 @@ -68,8 +68,8 @@ public class ClosedAreaPersonApplyAddCmd extends Command { private String entourage; @ApiModelProperty(value = "告知签字", name = "informSignId", required = true) - @NotNull(message = "告知签字不能为空") - private Long informSignId; + @NotEmpty(message = "告知签字不能为空") + private String informSignId; @ApiModelProperty(value = "审批人员所属企业ID", name = "auditPersonCorpId", required = true) @NotNull(message = "审批人员所属企业ID不能为空") diff --git a/web-client/src/main/java/com/zcloud/primeport/dto/ClosedAreaPersonApplyUpdateCmd.java b/web-client/src/main/java/com/zcloud/primeport/dto/ClosedAreaPersonApplyUpdateCmd.java index a3c09d7..046dc15 100644 --- a/web-client/src/main/java/com/zcloud/primeport/dto/ClosedAreaPersonApplyUpdateCmd.java +++ b/web-client/src/main/java/com/zcloud/primeport/dto/ClosedAreaPersonApplyUpdateCmd.java @@ -91,8 +91,8 @@ public class ClosedAreaPersonApplyUpdateCmd extends Command { @NotEmpty(message = "随行人员不能为空") private String entourage; @ApiModelProperty(value = "告知签字", name = "informSignId", required = true) - @NotNull(message = "告知签字不能为空") - private Long informSignId; + @NotEmpty(message = "告知签字不能为空") + private String informSignId; @ApiModelProperty(value = "审批人员所属企业ID", name = "auditPersonCorpId", required = true) @NotNull(message = "审批人员所属企业ID不能为空") private Long auditPersonCorpId; 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 new file mode 100644 index 0000000..6b5eca5 --- /dev/null +++ b/web-client/src/main/java/com/zcloud/primeport/dto/clientobject/TmpApplyCO.java @@ -0,0 +1,114 @@ +package com.zcloud.primeport.dto.clientobject; + +import com.alibaba.cola.dto.ClientObject; +import com.fasterxml.jackson.annotation.JsonFormat; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.HashMap; +import java.util.List; + + +/** + * 临时申请详情 + * + * @Author dearLin + * @Date 2026-03-20 10:07:13 + */ +@Data +public class TmpApplyCO extends ClientObject { + //主键 + @ApiModelProperty(value = "主键") + private Long id; + private String TmpApplyType; + //车牌类型数据字典 + @ApiModelProperty(value = "车牌类型数据字典") + private String licenceType; + //车牌类型名称0-白牌 1- 蓝牌 2-黄牌 3-绿牌 4-黑牌 + @ApiModelProperty(value = "车牌类型名称0-白牌 1- 蓝牌 2-黄牌 3-绿牌 4-黑牌") + private String licenceTypeName; + //车牌号 + @ApiModelProperty(value = "车牌号") + private String licenceNo; + //车辆类型 + @ApiModelProperty(value = "车辆类型") + private String vehicleType; + //车辆类型-名字 + @ApiModelProperty(value = "车辆类型-名字") + private String vehicleTypeName; + //一级口门id + @ApiModelProperty(value = "一级口门id") + private Long levelOneMkmjId; + private String levelOneMkmjName; + //审核状态(1:审核中;2审核通过; 3：审核驳回) + @ApiModelProperty(value = "审核状态(1:审核中;2审核通过; 3：审核驳回)") + private Integer auditFlag; + //二级口门id(封闭区域口门) + @ApiModelProperty(value = "二级口门id(封闭区域口门)") + private Long levelTwoMkmjId; + @ApiModelProperty(value = "二级口门名称") + private String levelTwoMkmjName; + //封闭区域id + @ApiModelProperty(value = "封闭区域id") + private Long closedAreaId; + //封闭区域名称 + @ApiModelProperty(value = "封闭区域名称") + private String closedAreaName; + //访问起始时间 + @ApiModelProperty(value = "访问起始时间") + @JsonFormat(pattern = "yyyy-MM-dd") + private String visitStartTime; + //访问结束时间 + @ApiModelProperty(value = "访问结束时间") + @JsonFormat(pattern = "yyyy-MM-dd") + private String visitEndTime; + //区域管辖单位名id + @ApiModelProperty(value = "区域管辖单位名id") + private Long jurisdictionalCorpId; + //区域管辖单位名称 + @ApiModelProperty(value = "区域管辖单位名称") + private String jurisdictionalCorpName; + + //申请人员姓名 + @ApiModelProperty(value = "申请人员姓名") + private String applyPersonUserName; + //申请理由 + @ApiModelProperty(value = "申请理由") + private String applyReason; + //申请人手机号 + @ApiModelProperty(value = "申请人手机号") + private String userPhone; + + //行驶证照片 + @ApiModelProperty(value = "行驶证照片") + private String drivingLicenseId; + //车辆照片 + @ApiModelProperty(value = "车辆照片") + private String attachmentId; + //审批人员所属企业ID + @ApiModelProperty(value = "审批人员所属企业ID") + private Long auditPersonCorpId; + //审批人员所属企业名称 + @ApiModelProperty(value = "审批人员所属企业名称") + private String auditPersonCorpName; + //审批人员所属部门id + @ApiModelProperty(value = "审批人员所属部门id") + private Long auditPersonDepartmentId; + //审批人员部门名称 + @ApiModelProperty(value = "审批人员部门名称") + private String auditPersonDepartmentName; + //审批人员id + @ApiModelProperty(value = "审批人员id") + private Long auditPersonUserId; + //审批人员姓名 + @ApiModelProperty(value = "审批人员姓名") + private String auditPersonUserName; + //审批时间 + @ApiModelProperty(value = "审批时间") + private String auditTime; + //驳回原因 + @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 470a988..8c36590 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 @@ -70,7 +70,7 @@ public class ClosedAreaCarApplyE extends BaseE { private String projectName; private String entourage; //告知签字 - private Long informSignId; + private String informSignId; //行驶证照片 private String drivingLicenseId; //车辆照片 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 b056342..1c5ad85 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 @@ -57,7 +57,7 @@ public class ClosedAreaPersonApplyE extends BaseE { //随行人员 private String entourage; //告知签字 - private Long informSignId; + private String informSignId; //审批人员所属企业ID private Long auditPersonCorpId; //审批人员所属企业名称 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 baf2d4a..474e305 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 @@ -105,7 +105,7 @@ public class ClosedAreaCarApplyDO extends BaseDO { //告知签字 @ApiModelProperty(value = "告知签字") - private Long informSignId; + private String informSignId; //行驶证照片 @ApiModelProperty(value = "行驶证照片") private String drivingLicenseId; 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 2cc496b..1d4899b 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 @@ -90,7 +90,7 @@ public class ClosedAreaPersonApplyDO extends BaseDO { //告知签字 @ApiModelProperty(value = "告知签字") - private Long informSignId; + private String informSignId; //审批人员所属企业ID @ApiModelProperty(value = "审批人员所属企业ID") private Long auditPersonCorpId; diff --git a/web-infrastructure/src/main/resources/mapper/ClosedAreaPersonApplyMapper.xml b/web-infrastructure/src/main/resources/mapper/ClosedAreaPersonApplyMapper.xml index f74aec5..8914859 100644 --- a/web-infrastructure/src/main/resources/mapper/ClosedAreaPersonApplyMapper.xml +++ b/web-infrastructure/src/main/resources/mapper/ClosedAreaPersonApplyMapper.xml @@ -11,10 +11,10 @@ u.`name`, u.corpinfo_id corpId, c.corp_name, - d.department_id dept_Id, + d.id dept_Id, d.`name` dept_Name, u.phone, - u.user_avatar_url user_Face_Url, + u.user_avatar_url user_face_url, u.rz_flag, u.employment_flag, u.user_id_card,