zcloud_gbs
/
zcloud-gbs-primeport
15
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

feat：二级封闭区域申请，一级临时车

koumen
dearLin 2026-03-23 10:00:18 +08:00
parent 4b7207820e
commit 4b130ccbc0
2 changed files with 34 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
web-adapter/src/main/java/com/zcloud/primeport/web/close/ClosedTmpApplyController.java
View File

@ -9,9 +9,11 @@ import com.alibaba.fastjson.JSON;
import com.zcloud.primeport.api.ClosedAreaCarApplyServiceI; import com.zcloud.primeport.api.ClosedAreaCarApplyServiceI;
import com.zcloud.primeport.api.ClosedAreaPersonApplyServiceI; import com.zcloud.primeport.api.ClosedAreaPersonApplyServiceI;
import com.zcloud.primeport.api.PersonApplyServiceI; import com.zcloud.primeport.api.PersonApplyServiceI;
import com.zcloud.primeport.api.VehicleApplyServiceI;
import com.zcloud.primeport.domain.enums.TmpApplyEnum; import com.zcloud.primeport.domain.enums.TmpApplyEnum;
import com.zcloud.primeport.dto.*; import com.zcloud.primeport.dto.*;
import com.zcloud.primeport.dto.clientobject.ClosedAreaCarApplyCO; import com.zcloud.primeport.dto.clientobject.ClosedAreaCarApplyCO;
import com.zcloud.primeport.dto.clientobject.VehicleApplyCO;
import io.swagger.annotations.Api; import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiOperation;
import lombok.AllArgsConstructor; import lombok.AllArgsConstructor;
@ -36,6 +38,7 @@ public class ClosedTmpApplyController {
private final ClosedAreaCarApplyServiceI closedAreaCarApplyService; private final ClosedAreaCarApplyServiceI closedAreaCarApplyService;
private final ClosedAreaPersonApplyServiceI closedAreaPersonApplyServiceI; private final ClosedAreaPersonApplyServiceI closedAreaPersonApplyServiceI;
private final PersonApplyServiceI personApplyServiceI; private final PersonApplyServiceI personApplyServiceI;
private final VehicleApplyServiceI vehicleApplyServiceI;
@ApiOperation("新增") @ApiOperation("新增")
@PostMapping("/save") @PostMapping("/save")
@ -77,6 +80,30 @@ public class ClosedTmpApplyController {
} }
if (cmd.getTmpApplyType().equals(TmpApplyEnum.CAR_APPLY.getCode())) { if (cmd.getTmpApplyType().equals(TmpApplyEnum.CAR_APPLY.getCode())) {
if (cmd.getTmpMkmjType().equals(TmpApplyEnum.ONE_LEVEL_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<String, Object> stringObjectHashMap = new HashMap<>();
ArrayList<HashMap<String, Object>> hashMaps = new ArrayList<>();
stringObjectHashMap.put("bianma", cmd.getHgAuthArea());
stringObjectHashMap.put("value", cmd.getHgAuthAreaName());
hashMaps.add(stringObjectHashMap);
HashMap<String, Object> 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<VehicleApplyCO> add = vehicleApplyServiceI.add(vehicleApplyAddCmd);
id = add.getData().getId();
} }
if (cmd.getTmpMkmjType().equals(TmpApplyEnum.TWO_LEVEL_CAR_APPLY.getCode())) { if (cmd.getTmpMkmjType().equals(TmpApplyEnum.TWO_LEVEL_CAR_APPLY.getCode())) {
id = closedAreaCarApplyService.saveTmpCarApply(cmd); id = closedAreaCarApplyService.saveTmpCarApply(cmd);
@ -91,7 +118,9 @@ public class ClosedTmpApplyController {
@ApiOperation("详情") @ApiOperation("详情")
@GetMapping("/getInfoById") @GetMapping("/getInfoById")
public SingleResponse<ClosedAreaCarApplyCO> getInfoById(@RequestParam("id") Long id, @RequestParam("tmpApplyType") String tmpApplyType, @RequestParam("tmpMkmjType") String tmpMkmjType) { public SingleResponse<ClosedAreaCarApplyCO> getInfoById(@RequestParam("id") Long id
, @RequestParam("tmpApplyType") String tmpApplyType
, @RequestParam("tmpMkmjType") String tmpMkmjType) {
return SingleResponse.of(closedAreaCarApplyService.queryById(id)); return SingleResponse.of(closedAreaCarApplyService.queryById(id));
} }

5
web-app/src/main/java/com/zcloud/primeport/command/VehicleApplyAddExe.java
View File

@ -63,7 +63,10 @@ public class VehicleApplyAddExe {
} }
} }
VehicleApplyE add = vehicleApplyGateway.add(examTypeE); 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); vehicleAuditGateway.add(build);
// 发送待审核消息 // 发送待审核消息