From 4b130ccbc01cc706f5c28dcbe7c8ab57c02be815 Mon Sep 17 00:00:00 2001 From: dearLin <1261008090@qq.com> Date: Mon, 23 Mar 2026 10:00:18 +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 --- .../web/close/ClosedTmpApplyController.java | 31 ++++++++++++++++++- .../primeport/command/VehicleApplyAddExe.java | 5 ++- 2 files changed, 34 insertions(+), 2 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 03085ce..a44308a 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 @@ -9,9 +9,11 @@ import com.alibaba.fastjson.JSON; import com.zcloud.primeport.api.ClosedAreaCarApplyServiceI; 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.dto.*; import com.zcloud.primeport.dto.clientobject.ClosedAreaCarApplyCO; +import com.zcloud.primeport.dto.clientobject.VehicleApplyCO; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.AllArgsConstructor; @@ -36,6 +38,7 @@ public class ClosedTmpApplyController { private final ClosedAreaCarApplyServiceI closedAreaCarApplyService; private final ClosedAreaPersonApplyServiceI closedAreaPersonApplyServiceI; private final PersonApplyServiceI personApplyServiceI; + private final VehicleApplyServiceI vehicleApplyServiceI; @ApiOperation("新增") @PostMapping("/save") @@ -77,6 +80,30 @@ public class ClosedTmpApplyController { } if (cmd.getTmpApplyType().equals(TmpApplyEnum.CAR_APPLY.getCode())) { if (cmd.getTmpMkmjType().equals(TmpApplyEnum.ONE_LEVEL_CAR_APPLY.getCode())) { + VehicleApplyAddCmd vehicleApplyAddCmd = new VehicleApplyAddCmd(); + BeanUtils.copyProperties(cmd, vehicleApplyAddCmd); + vehicleApplyAddCmd.setVehicleBelongType("6"); + HashMap stringObjectHashMap = new HashMap<>(); + ArrayList> hashMaps = new ArrayList<>(); + stringObjectHashMap.put("bianma", cmd.getHgAuthArea()); + stringObjectHashMap.put("value", cmd.getHgAuthAreaName()); + hashMaps.add(stringObjectHashMap); + HashMap stringObjectHashMap2 = new HashMap<>(); + stringObjectHashMap2.put("area", stringObjectHashMap); + vehicleApplyAddCmd.setGateLevelAuthArea(JSON.toJSONString(stringObjectHashMap2)); + vehicleApplyAddCmd.setAuditCorpId(cmd.getAuditPersonCorpId()); + vehicleApplyAddCmd.setAuditCorpName(cmd.getAuditPersonCorpName()); + vehicleApplyAddCmd.setAuditDeptId(cmd.getAuditPersonDepartmentId()); + vehicleApplyAddCmd.setAuditDeptName(cmd.getAuditPersonDepartmentName()); + vehicleApplyAddCmd.setAuditUserId(cmd.getAuditPersonUserId()); + vehicleApplyAddCmd.setAuditUserName(cmd.getAuditPersonUserName()); + vehicleApplyAddCmd.setMkmjId(cmd.getLevelOneMkmjId()); + vehicleApplyAddCmd.setLsUserIdcard(cmd.getUserCard()); + vehicleApplyAddCmd.setLsUserPhone(cmd.getUserPhone()); + vehicleApplyAddCmd.setEmployeeVehicleUserName(cmd.getApplyPersonUserName()); + vehicleApplyAddCmd.setRemarks(cmd.getApplyReason()); + SingleResponse add = vehicleApplyServiceI.add(vehicleApplyAddCmd); + id = add.getData().getId(); } if (cmd.getTmpMkmjType().equals(TmpApplyEnum.TWO_LEVEL_CAR_APPLY.getCode())) { id = closedAreaCarApplyService.saveTmpCarApply(cmd); @@ -91,7 +118,9 @@ public class ClosedTmpApplyController { @ApiOperation("详情") @GetMapping("/getInfoById") - public SingleResponse getInfoById(@RequestParam("id") Long id, @RequestParam("tmpApplyType") String tmpApplyType, @RequestParam("tmpMkmjType") String tmpMkmjType) { + public SingleResponse getInfoById(@RequestParam("id") Long id + , @RequestParam("tmpApplyType") String tmpApplyType + , @RequestParam("tmpMkmjType") String tmpMkmjType) { return SingleResponse.of(closedAreaCarApplyService.queryById(id)); } diff --git a/web-app/src/main/java/com/zcloud/primeport/command/VehicleApplyAddExe.java b/web-app/src/main/java/com/zcloud/primeport/command/VehicleApplyAddExe.java index d7d7f64..ae28ec9 100644 --- a/web-app/src/main/java/com/zcloud/primeport/command/VehicleApplyAddExe.java +++ b/web-app/src/main/java/com/zcloud/primeport/command/VehicleApplyAddExe.java @@ -63,7 +63,10 @@ public class VehicleApplyAddExe { } } VehicleApplyE add = vehicleApplyGateway.add(examTypeE); - VehicleAuditE build = VehicleAuditE.builder().vehicleApplyId(examTypeE.getId()).batchState(1).batchType(1).auditUserId(examTypeE.getAuditUserId()).auditUserName(examTypeE.getAuditUserName()).auditDeptId(examTypeE.getAuditDeptId()).auditDeptName(examTypeE.getAuditDeptName()).auditCorpId(examTypeE.getAuditCorpId()).auditCorpName(examTypeE.getAuditCorpName()).auditStatus(AuditEnum.WAITING.getCode()).changeAfter(JSON.toJSONString(examTypeE)).build(); + VehicleAuditE build = VehicleAuditE.builder().vehicleApplyId(examTypeE.getId()).batchState(1).batchType(1) + .auditUserId(examTypeE.getAuditUserId()) + .auditUserName(examTypeE.getAuditUserName()) + .auditDeptId(examTypeE.getAuditDeptId()).auditDeptName(examTypeE.getAuditDeptName()).auditCorpId(examTypeE.getAuditCorpId()).auditCorpName(examTypeE.getAuditCorpName()).auditStatus(AuditEnum.WAITING.getCode()).changeAfter(JSON.toJSONString(examTypeE)).build(); // 添加审批信息 vehicleAuditGateway.add(build); // 发送待审核消息