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

feat：车辆申请与审批

koumen
dearLin 2026-03-10 15:55:35 +08:00
parent 8ab65b0da3
commit 2a64522502
61 changed files with 788 additions and 201 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
pom.xml
View File

@ -15,6 +15,11 @@
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
</properties>
<dependencies>
<dependency>
<groupId>com.alibaba.cloud</groupId>
<artifactId>spring-cloud-starter-stream-rocketmq</artifactId>
<version>${spring-cloud-alibaba.version}</version>
</dependency>
<dependency>
<groupId>com.zcloud.gbscommon</groupId>
<artifactId>zcloud_gbscommon</artifactId>

16
web-adapter/src/main/java/com/zcloud/primeport/web/MkmjApprovalUserController.java
View File

@ -36,26 +36,26 @@ public class MkmjApprovalUserController {
@ApiOperation("新增")
@PostMapping("/save")
public SingleResponse<MkmjApprovalUserCO> add(@Validated @RequestBody MkmjApprovalUserAddCmd cmd) {
SSOUser ssoUser = AuthContext.getCurrentUser();
return mkmjApprovalUserService.add(cmd);
}
@ApiOperation("分页")
@PostMapping("/list")
public PageResponse<MkmjApprovalUserCO> page(@RequestBody MkmjApprovalUserPageQry qry) {
qry.setCorpId(AuthContext.getTenantId());
return mkmjApprovalUserService.listPage(qry);
}
@ApiOperation("所有数据")
@GetMapping("/listAll")
public MultiResponse<MkmjApprovalUserCO> listAll() {
return MultiResponse.of(new ArrayList<MkmjApprovalUserCO>());
public MultiResponse<MkmjApprovalUserCO> listAll(MkmjApprovalUserPageQry qry) {
return MultiResponse.of(mkmjApprovalUserService.listAll(qry));
}
@ApiOperation("详情")
@GetMapping("/{id}")
public SingleResponse<MkmjApprovalUserCO> getInfoById(@PathVariable("id") Long id) {
return SingleResponse.of(new MkmjApprovalUserCO());
return SingleResponse.of(mkmjApprovalUserService.getInfoById(id));
}
@ApiOperation("删除")
@ -64,14 +64,6 @@ public class MkmjApprovalUserController {
mkmjApprovalUserService.remove(id);
return SingleResponse.buildSuccess();
}
@ApiOperation("删除多个")
@DeleteMapping("/ids")
public Response removeBatch(@RequestParam Long[] ids) {
mkmjApprovalUserService.removeBatch(ids);
return SingleResponse.buildSuccess();
}
@ApiOperation("修改")
@PutMapping("/edit")
public SingleResponse edit(@Validated @RequestBody MkmjApprovalUserUpdateCmd mkmjApprovalUserUpdateCmd) {

27
web-adapter/src/main/java/com/zcloud/primeport/web/VehicleApplyController.java
View File

@ -13,11 +13,14 @@ import com.zcloud.primeport.dto.VehicleApplyPageQry;
import com.zcloud.primeport.dto.VehicleApplyUpdateCmd;
import com.zcloud.primeport.dto.clientobject.VehicleApplyCO;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiModelProperty;
import io.swagger.annotations.ApiOperation;
import lombok.AllArgsConstructor;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
import javax.validation.constraints.NotEmpty;
import javax.validation.constraints.NotNull;
import java.util.ArrayList;
/**
@ -33,29 +36,28 @@ import java.util.ArrayList;
public class VehicleApplyController {
private final VehicleApplyServiceI vehicleApplyService;
@ApiOperation("新增")
@ApiOperation("新增-长期")
@PostMapping("/save")
public SingleResponse<VehicleApplyCO> add(@Validated @RequestBody VehicleApplyAddCmd cmd) {
SSOUser ssoUser = AuthContext.getCurrentUser();
return vehicleApplyService.add(cmd);
}
@ApiOperation("新增-临时访客")
@PostMapping("/saveTemporaryVisitors")
public SingleResponse<VehicleApplyCO> saveTemporaryVisitors(@Validated @RequestBody VehicleApplyAddCmd cmd) {
return null;
}
@ApiOperation("分页")
@PostMapping("/list")
public PageResponse<VehicleApplyCO> page(@RequestBody VehicleApplyPageQry qry) {
return vehicleApplyService.listPage(qry);
}
@ApiOperation("所有数据")
@GetMapping("/listAll")
public MultiResponse<VehicleApplyCO> listAll() {
return MultiResponse.of(new ArrayList<VehicleApplyCO>());
}
@ApiOperation("详情")
@GetMapping("/{id}")
public SingleResponse<VehicleApplyCO> getInfoById(@PathVariable("id") Long id) {
return SingleResponse.of(new VehicleApplyCO());
return SingleResponse.of(vehicleApplyService.getInfoById(id));
}
@ApiOperation("删除")
@ -65,13 +67,6 @@ public class VehicleApplyController {
return SingleResponse.buildSuccess();
}
@ApiOperation("删除多个")
@DeleteMapping("/ids")
public Response removeBatch(@RequestParam Long[] ids) {
vehicleApplyService.removeBatch(ids);
return SingleResponse.buildSuccess();
}
@ApiOperation("修改")
@PutMapping("/edit")
public SingleResponse edit(@Validated @RequestBody VehicleApplyUpdateCmd vehicleApplyUpdateCmd) {

53
web-adapter/src/main/java/com/zcloud/primeport/web/VehicleAuditController.java
View File

@ -33,50 +33,37 @@ import java.util.ArrayList;
public class VehicleAuditController {
private final VehicleAuditServiceI vehicleAuditService;
@ApiOperation("新增")
@PostMapping("/save")
public SingleResponse<VehicleAuditCO> add(@Validated @RequestBody VehicleAuditAddCmd cmd) {
SSOUser ssoUser = AuthContext.getCurrentUser();
return vehicleAuditService.add(cmd);
}
// @ApiOperation("新增")
// @PostMapping("/save")
// public SingleResponse<VehicleAuditCO> add(@Validated @RequestBody VehicleAuditAddCmd cmd) {
// SSOUser ssoUser = AuthContext.getCurrentUser();
// return vehicleAuditService.add(cmd);
// }
@ApiOperation("分页")
@PostMapping("/list")
@ApiOperation("待审批数据分页")
@PostMapping("/pendingApprovalList")
public PageResponse<VehicleAuditCO> page(@RequestBody VehicleAuditPageQry qry) {
return vehicleAuditService.listPage(qry);
}
@ApiOperation("所有数据")
@GetMapping("/listAll")
public MultiResponse<VehicleAuditCO> listAll() {
return MultiResponse.of(new ArrayList<VehicleAuditCO>());
@ApiOperation("车辆审批记录")
@PostMapping("/carApprovalLogByvehicleApplyIdList")
public PageResponse<VehicleAuditCO> carApprovalLogByvehicleApplyIdList(@RequestBody VehicleAuditPageQry qry) {
return vehicleAuditService.carApprovalLogByvehicleApplyIdList(qry);
}
@ApiOperation("审批人审批")
@PostMapping("/audit")
public Response audit(@RequestBody VehicleAuditUpdateCmd cmd) {
vehicleAuditService.audit(cmd);
return Response.buildSuccess();
}
@ApiOperation("详情")
@GetMapping("/{id}")
public SingleResponse<VehicleAuditCO> getInfoById(@PathVariable("id") Long id) {
return SingleResponse.of(new VehicleAuditCO());
return SingleResponse.of(vehicleAuditService.getInfoById(id));
}
@ApiOperation("删除")
@DeleteMapping("/{id}")
public Response remove(@PathVariable("id") Long id) {
vehicleAuditService.remove(id);
return SingleResponse.buildSuccess();
}
@ApiOperation("删除多个")
@DeleteMapping("/ids")
public Response removeBatch(@RequestParam Long[] ids) {
vehicleAuditService.removeBatch(ids);
return SingleResponse.buildSuccess();
}
@ApiOperation("修改")
@PutMapping("/edit")
public SingleResponse edit(@Validated @RequestBody VehicleAuditUpdateCmd vehicleAuditUpdateCmd) {
vehicleAuditService.edit(vehicleAuditUpdateCmd);
return SingleResponse.buildSuccess();
}
}

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

@ -1,8 +1,19 @@
package com.zcloud.primeport.command;
import com.alibaba.cola.exception.BizException;
import com.alibaba.fastjson.JSON;
import com.jjb.saas.framework.auth.model.SSOUser;
import com.jjb.saas.framework.auth.utils.AuthContext;
import com.zcloud.gbscommon.todolistmq.TodoListEventPusherUtil;
import com.zcloud.gbscommon.todolistmq.event.TodoListAddEvent;
import com.zcloud.primeport.domain.enums.AuditEnum;
import com.zcloud.primeport.domain.enums.VehicleBelongTypeEnum;
import com.zcloud.primeport.domain.gateway.VehicleApplyGateway;
import com.zcloud.primeport.domain.gateway.VehicleAuditGateway;
import com.zcloud.primeport.domain.gateway.VehicleMessageGateway;
import com.zcloud.primeport.domain.model.VehicleApplyE;
import com.zcloud.primeport.domain.model.VehicleAuditE;
import com.zcloud.primeport.domain.model.VehicleMessageE;
import com.zcloud.primeport.dto.VehicleApplyAddCmd;
import lombok.AllArgsConstructor;
import org.springframework.beans.BeanUtils;
@ -20,20 +31,59 @@ import org.springframework.transaction.annotation.Transactional;
@AllArgsConstructor
public class VehicleApplyAddExe {
private final VehicleApplyGateway vehicleApplyGateway;
private final VehicleAuditGateway vehicleAuditGateway;
private final VehicleMessageGateway vehicleMessageGateway;
private final TodoListEventPusherUtil todoListEventPusherUtil;
@Transactional(rollbackFor = Exception.class)
public boolean execute(VehicleApplyAddCmd cmd) {
VehicleApplyE examTypeE = new VehicleApplyE();
BeanUtils.copyProperties(cmd, examTypeE);
boolean res = false;
try {
res = vehicleApplyGateway.add(examTypeE);
} catch (Exception e) {
throw new RuntimeException(e);
examTypeE.setStatusFlag(2);
examTypeE.setBlockedFlag(2);
examTypeE.setAuditFlag(AuditEnum.WAITING.getCode());
SSOUser user = AuthContext.getCurrentUser();
if (user != null) {
examTypeE.setVehicleCorpId(user.getTenantId());
examTypeE.setVehicleCorpName(user.getTenantName());
examTypeE.setVehicleDepartmentId(user.getOrgId());
examTypeE.setVehicleDepartmentName(user.getOrgName());
examTypeE.setEmployeeVehicleUserId(user.getUserId());
examTypeE.setEmployeeVehicleUserName(user.getName());
}
if (!res) {
throw new BizException("保存失败");
// 检查部门无需审批
if (examTypeE.getVehicleType().equals(VehicleBelongTypeEnum.CHECK_VEHICLES)) {
examTypeE.setAuditFlag(AuditEnum.NO_APPROVAL_REQUIRED.getCode());
vehicleApplyGateway.add(examTypeE);
VehicleMessageE build = VehicleMessageE.builder().vehicleApplyId(examTypeE.getId())
.licenceType(examTypeE.getLicenceType()).licenceTypeName(examTypeE.getLicenceTypeName())
.licenceNo(examTypeE.getLicenceNo())
.vehicleType(examTypeE.getVehicleType()).vehicleTypeName(examTypeE.getVehicleTypeName())
.vehicleBelongType(examTypeE.getVehicleBelongType()).gateLevelAuthArea(examTypeE.getGateLevelAuthArea())
.visitStartTime(examTypeE.getVisitStartTime()).visitEndTime(examTypeE.getVisitEndTime()).syncStatus(2).build();
// 进行与门禁系统的对接
vehicleMessageGateway.add(build);
}else {
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();
// 添加审批信息
vehicleAuditGateway.add(build);
// 发送待审核消息
todoListEventPusherUtil.sendMessageAddEvent(build.getSendEventObj());
}
return true;
}
}

15
web-app/src/main/java/com/zcloud/primeport/command/VehicleApplyUpdateExe.java
View File

@ -1,8 +1,13 @@
package com.zcloud.primeport.command;
import com.alibaba.cola.exception.BizException;
import com.alibaba.fastjson.JSON;
import com.zcloud.gbscommon.todolistmq.TodoListEventPusherUtil;
import com.zcloud.primeport.domain.enums.AuditEnum;
import com.zcloud.primeport.domain.gateway.VehicleApplyGateway;
import com.zcloud.primeport.domain.gateway.VehicleAuditGateway;
import com.zcloud.primeport.domain.model.VehicleApplyE;
import com.zcloud.primeport.domain.model.VehicleAuditE;
import com.zcloud.primeport.dto.VehicleApplyUpdateCmd;
import lombok.AllArgsConstructor;
import org.springframework.beans.BeanUtils;
@ -20,12 +25,22 @@ import org.springframework.transaction.annotation.Transactional;
@AllArgsConstructor
public class VehicleApplyUpdateExe {
private final VehicleApplyGateway vehicleApplyGateway;
private final VehicleAuditGateway vehicleAuditGateway;
private final TodoListEventPusherUtil todoListEventPusherUtil;
@Transactional(rollbackFor = Exception.class)
public void execute(VehicleApplyUpdateCmd vehicleApplyUpdateCmd) {
VehicleApplyE vehicleApplyE = new VehicleApplyE();
VehicleApplyE oldV = vehicleApplyGateway.getById(vehicleApplyE.getId());
BeanUtils.copyProperties(vehicleApplyUpdateCmd, vehicleApplyE);
vehicleApplyE.setAuditFlag(AuditEnum.WAITING.getCode());
boolean res = vehicleApplyGateway.update(vehicleApplyE);
VehicleAuditE build = VehicleAuditE.builder().vehicleApplyId(vehicleApplyE.getId()).batchState(1).batchType(2).auditUserId(vehicleApplyE.getAuditUserId()).auditUserName(vehicleApplyE.getAuditUserName()).auditDeptId(vehicleApplyE.getAuditDeptId()).auditDeptName(vehicleApplyE.getAuditDeptName()).auditCorpId(vehicleApplyE.getAuditCorpId()).auditCorpName(vehicleApplyE.getAuditCorpName()).auditStatus(AuditEnum.WAITING.getCode()).changeAfter(JSON.toJSONString(oldV)).changeBefore(JSON.toJSONString(vehicleApplyE)).build();
// 添加审批信息
vehicleAuditGateway.add(build);
// 发送待审核待办
todoListEventPusherUtil.sendMessageAddEvent(build.getSendEventObj());
if (!res) {
throw new BizException("修改失败");
}

16
web-app/src/main/java/com/zcloud/primeport/command/VehicleAuditUpdateExe.java
View File

@ -1,7 +1,9 @@
package com.zcloud.primeport.command;
import com.alibaba.cola.exception.BizException;
import com.zcloud.primeport.domain.gateway.VehicleApplyGateway;
import com.zcloud.primeport.domain.gateway.VehicleAuditGateway;
import com.zcloud.primeport.domain.model.VehicleApplyE;
import com.zcloud.primeport.domain.model.VehicleAuditE;
import com.zcloud.primeport.dto.VehicleAuditUpdateCmd;
import lombok.AllArgsConstructor;
@ -20,6 +22,7 @@ import org.springframework.transaction.annotation.Transactional;
@AllArgsConstructor
public class VehicleAuditUpdateExe {
private final VehicleAuditGateway vehicleAuditGateway;
private final VehicleApplyGateway vehicleApplyGateway;
@Transactional(rollbackFor = Exception.class)
public void execute(VehicleAuditUpdateCmd vehicleAuditUpdateCmd) {
@ -30,5 +33,18 @@ public class VehicleAuditUpdateExe {
throw new BizException("修改失败");
}
}
public void audit(VehicleAuditUpdateCmd cmd) {
if (!(cmd.getAuditStatus().equals(2) || cmd.getAuditStatus().equals(3))) {
throw new BizException("审批状态必须是通过或不通过");
}
VehicleAuditE vehicleAuditE = new VehicleAuditE();
BeanUtils.copyProperties(cmd, vehicleAuditE);
VehicleApplyE vehicleApplyE = new VehicleApplyE();
vehicleApplyE.setId(cmd.getVehicleApplyId());
vehicleApplyE.setAuditFlag(cmd.getAuditStatus());
vehicleApplyGateway.update(vehicleApplyE);
vehicleAuditGateway.update(vehicleAuditE);
}
}

2
web-app/src/main/java/com/zcloud/primeport/command/convertor/MkmjApprovalUserCoConvertor.java
View File

@ -20,5 +20,7 @@ public interface MkmjApprovalUserCoConvertor {
* @return
*/
List<MkmjApprovalUserCO> converDOsToCOs(List<MkmjApprovalUserDO> mkmjApprovalUserDOs);
MkmjApprovalUserCO converDOToCO(MkmjApprovalUserDO mkmjApprovalUserDOs);
}

1
web-app/src/main/java/com/zcloud/primeport/command/convertor/VehicleApplyCoConvertor.java
View File

@ -20,5 +20,6 @@ public interface VehicleApplyCoConvertor {
* @return
*/
List<VehicleApplyCO> converDOsToCOs(List<VehicleApplyDO> vehicleApplyDOs);
VehicleApplyCO converDOToCO(VehicleApplyDO vehicleApplyDO);
}

1
web-app/src/main/java/com/zcloud/primeport/command/convertor/VehicleAuditCoConvertor.java
View File

@ -20,5 +20,6 @@ public interface VehicleAuditCoConvertor {
* @return
*/
List<VehicleAuditCO> converDOsToCOs(List<VehicleAuditDO> vehicleAuditDOs);
VehicleAuditCO converDOToCO(VehicleAuditDO vehicleAuditDO);
}

25
web-app/src/main/java/com/zcloud/primeport/command/query/MkmjApprovalUserQueryExe.java
View File

@ -1,7 +1,9 @@
package com.zcloud.primeport.command.query;
import com.alibaba.cola.dto.PageResponse;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.zcloud.gbscommon.utils.PageQueryHelper;
import com.zcloud.gbscommon.utils.Tools;
import com.zcloud.primeport.command.convertor.MkmjApprovalUserCoConvertor;
import com.zcloud.primeport.dto.MkmjApprovalUserPageQry;
import com.zcloud.primeport.dto.clientobject.MkmjApprovalUserCO;
@ -38,5 +40,28 @@ public class MkmjApprovalUserQueryExe {
List<MkmjApprovalUserCO> examCenterCOS = mkmjApprovalUserCoConvertor.converDOsToCOs(pageResponse.getData());
return PageResponse.of(examCenterCOS, pageResponse.getTotalCount(), pageResponse.getPageSize(), pageResponse.getPageIndex());
}
public List<MkmjApprovalUserCO> listAll(MkmjApprovalUserPageQry qry) {
QueryWrapper<MkmjApprovalUserDO> mkmjApprovalUserCOQueryWrapper = new QueryWrapper<>();
mkmjApprovalUserCOQueryWrapper.eq("corp_id", qry.getCorpId());
mkmjApprovalUserCOQueryWrapper.eq("dept_id", qry.getDeptId());
if (qry.getPersonnelPermissionFlag() != null) {
mkmjApprovalUserCOQueryWrapper.eq("personnel_permission_flag", qry.getPersonnelPermissionFlag());
}
if (qry.getVehiclePermissionFlag() != null) {
mkmjApprovalUserCOQueryWrapper.eq("vehicle_permission_flag", qry.getVehiclePermissionFlag());
}
if (qry.getTemporaryPermissionFlag() != null) {
mkmjApprovalUserCOQueryWrapper.eq("temporary_permission_flag", qry.getTemporaryPermissionFlag());
}
List<MkmjApprovalUserDO> dataList = mkmjApprovalUserRepository.list(mkmjApprovalUserCOQueryWrapper);
return mkmjApprovalUserCoConvertor.converDOsToCOs(dataList);
}
public MkmjApprovalUserCO getInfoById(Long id) {
MkmjApprovalUserDO byId = mkmjApprovalUserRepository.getById(id);
return mkmjApprovalUserCoConvertor.converDOToCO(byId);
}
}

4
web-app/src/main/java/com/zcloud/primeport/command/query/VehicleApplyQueryExe.java
View File

@ -38,5 +38,9 @@ public class VehicleApplyQueryExe {
List<VehicleApplyCO> examCenterCOS = vehicleApplyCoConvertor.converDOsToCOs(pageResponse.getData());
return PageResponse.of(examCenterCOS, pageResponse.getTotalCount(), pageResponse.getPageSize(), pageResponse.getPageIndex());
}
public VehicleApplyCO getInfoById(Long id) {
return vehicleApplyCoConvertor.converDOToCO(vehicleApplyRepository.getById(id));
}
}

21
web-app/src/main/java/com/zcloud/primeport/command/query/VehicleAuditQueryExe.java
View File

@ -1,6 +1,8 @@
package com.zcloud.primeport.command.query;
import com.alibaba.cola.dto.PageResponse;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.jjb.saas.framework.auth.utils.AuthContext;
import com.zcloud.gbscommon.utils.PageQueryHelper;
import com.zcloud.primeport.command.convertor.VehicleAuditCoConvertor;
import com.zcloud.primeport.dto.VehicleAuditPageQry;
@ -36,7 +38,26 @@ public class VehicleAuditQueryExe {
Map<String, Object> parmas = PageQueryHelper.toHashMap(vehicleAuditPageQry);
PageResponse<VehicleAuditDO> pageResponse = vehicleAuditRepository.listPage(parmas);
List<VehicleAuditCO> examCenterCOS = vehicleAuditCoConvertor.converDOsToCOs(pageResponse.getData());
Long userId = AuthContext.getUserId();
examCenterCOS.forEach(item -> {
item.setCurrentUserCanAudit(2);
if (item.getAuditUserId().equals(userId)) {
item.setCurrentUserCanAudit(1);
}
});
return PageResponse.of(examCenterCOS, pageResponse.getTotalCount(), pageResponse.getPageSize(), pageResponse.getPageIndex());
}
public PageResponse<VehicleAuditCO> carApprovalLogByvehicleApplyIdList(VehicleAuditPageQry qry) {
Map<String, Object> parmas = PageQueryHelper.toHashMap(qry);
PageResponse<VehicleAuditDO> vehicleAuditDOPageResponse = vehicleAuditRepository.carApprovalLogByvehicleApplyIdList(parmas);
List<VehicleAuditCO> vehicleAuditCOS = vehicleAuditCoConvertor.converDOsToCOs(vehicleAuditDOPageResponse.getData());
return PageResponse.of(vehicleAuditCOS, vehicleAuditDOPageResponse.getTotalCount(),
vehicleAuditDOPageResponse.getPageSize(), vehicleAuditDOPageResponse.getPageIndex());
}
public VehicleAuditCO getInfoById(Long id) {
return vehicleAuditCoConvertor.converDOToCO(vehicleAuditRepository.getById(id));
}
}

14
web-app/src/main/java/com/zcloud/primeport/service/MkmjApprovalUserServiceImpl.java
View File

@ -14,6 +14,10 @@ import com.zcloud.primeport.dto.clientobject.MkmjApprovalUserCO;
import lombok.AllArgsConstructor;
import org.springframework.stereotype.Service;
import java.util.Collection;
import java.util.Collections;
import java.util.List;
/**
* web-app
*
@ -55,5 +59,15 @@ public class MkmjApprovalUserServiceImpl implements MkmjApprovalUserServiceI {
public void removeBatch(Long[] ids) {
mkmjApprovalUserRemoveExe.execute(ids);
}
@Override
public List<MkmjApprovalUserCO> listAll(MkmjApprovalUserPageQry qry) {
return mkmjApprovalUserQueryExe.listAll(qry);
}
@Override
public MkmjApprovalUserCO getInfoById(Long id) {
return mkmjApprovalUserQueryExe.getInfoById(id);
}
}

5
web-app/src/main/java/com/zcloud/primeport/service/VehicleApplyServiceImpl.java
View File

@ -55,5 +55,10 @@ public class VehicleApplyServiceImpl implements VehicleApplyServiceI {
public void removeBatch(Long[] ids) {
vehicleApplyRemoveExe.execute(ids);
}
@Override
public VehicleApplyCO getInfoById(Long id) {
return vehicleApplyQueryExe.getInfoById(id);
}
}

15
web-app/src/main/java/com/zcloud/primeport/service/VehicleAuditServiceImpl.java
View File

@ -55,5 +55,20 @@ public class VehicleAuditServiceImpl implements VehicleAuditServiceI {
public void removeBatch(Long[] ids) {
vehicleAuditRemoveExe.execute(ids);
}
@Override
public PageResponse<VehicleAuditCO> carApprovalLogByvehicleApplyIdList(VehicleAuditPageQry qry) {
return vehicleAuditQueryExe.carApprovalLogByvehicleApplyIdList(qry);
}
@Override
public void audit(VehicleAuditUpdateCmd cmd) {
vehicleAuditUpdateExe.audit(cmd);
}
@Override
public VehicleAuditCO getInfoById(Long id) {
return vehicleAuditQueryExe.getInfoById(id);
}
}

7
web-client/src/main/java/com/zcloud/primeport/api/MkmjApprovalUserServiceI.java
View File

@ -7,6 +7,9 @@ import com.zcloud.primeport.dto.MkmjApprovalUserPageQry;
import com.zcloud.primeport.dto.MkmjApprovalUserUpdateCmd;
import com.zcloud.primeport.dto.clientobject.MkmjApprovalUserCO;
import java.util.Collection;
import java.util.List;
/**
* web-client
*
@ -23,5 +26,9 @@ public interface MkmjApprovalUserServiceI {
void remove(Long id);
void removeBatch(Long[] ids);
List<MkmjApprovalUserCO> listAll(MkmjApprovalUserPageQry qry);
MkmjApprovalUserCO getInfoById(Long id);
}

2
web-client/src/main/java/com/zcloud/primeport/api/VehicleApplyServiceI.java
View File

@ -23,5 +23,7 @@ public interface VehicleApplyServiceI {
void remove(Long id);
void removeBatch(Long[] ids);
VehicleApplyCO getInfoById(Long id);
}

6
web-client/src/main/java/com/zcloud/primeport/api/VehicleAuditServiceI.java
View File

@ -23,5 +23,11 @@ public interface VehicleAuditServiceI {
void remove(Long id);
void removeBatch(Long[] ids);
PageResponse<VehicleAuditCO> carApprovalLogByvehicleApplyIdList(VehicleAuditPageQry qry);
void audit(VehicleAuditUpdateCmd cmd);
VehicleAuditCO getInfoById(Long id);
}

2
web-client/src/main/java/com/zcloud/primeport/dto/MkmjAddCmd.java
View File

@ -54,5 +54,7 @@ public class MkmjAddCmd extends Command {
private String longitude;
@ApiModelProperty(value = "纬度", name = "latitude", required = true)
private String latitude;
@ApiModelProperty(value = "口门位置", name = "remarks")
private String remarks;
}

14
web-client/src/main/java/com/zcloud/primeport/dto/MkmjApprovalUserAddCmd.java
View File

@ -21,9 +21,6 @@ import javax.validation.constraints.NotNull;
@NoArgsConstructor
@AllArgsConstructor
public class MkmjApprovalUserAddCmd extends Command {
@ApiModelProperty(value = "主键ID", name = "id", required = true)
@NotNull(message = "主键ID不能为空")
private Long id;
@ApiModelProperty(value = "审批人企业id", name = "corpId", required = true)
@NotNull(message = "审批人企业id不能为空")
private Long corpId;
@ -36,6 +33,13 @@ public class MkmjApprovalUserAddCmd extends Command {
@ApiModelProperty(value = "审批人部门名称", name = "deptName", required = true)
@NotEmpty(message = "审批人部门名称不能为空")
private String deptName;
@ApiModelProperty(value = "审批人岗位Id")
@NotNull(message = "审批人岗位Id不能为空")
private Long postId;
//审批人岗位名称
@ApiModelProperty(value = "审批人岗位名称")
@NotEmpty(message = "审批人岗位名称不能为空")
private String postName;
@ApiModelProperty(value = "审批人id", name = "userId", required = true)
@NotNull(message = "审批人id不能为空")
private Long userId;
@ -51,9 +55,5 @@ public class MkmjApprovalUserAddCmd extends Command {
@ApiModelProperty(value = "临时审核权限(1-无权限,2-有权限)", name = "temporaryPermissionFlag", required = true)
@NotNull(message = "临时审核权限(1-无权限,2-有权限)不能为空")
private Integer temporaryPermissionFlag;
@ApiModelProperty(value = "备注", name = "remarks", required = true)
@NotEmpty(message = "备注不能为空")
private String remarks;
}

18
web-client/src/main/java/com/zcloud/primeport/dto/MkmjApprovalUserPageQry.java
View File

@ -1,6 +1,7 @@
package com.zcloud.primeport.dto;
import com.alibaba.cola.dto.PageQuery;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@ -23,6 +24,21 @@ public class MkmjApprovalUserPageQry extends PageQuery {
* - `le`: 小于等于比较查询
* - `ne`: 不等比较查询，对应SQL的!=操作符
*/
private Long likeCorpId;
@ApiModelProperty(value = "审批人企业id必传", name = "corpId", required = true)
private Long corpId;
@ApiModelProperty(value = "审批人部门id必传", name = "deptId")
private Long deptId;
@ApiModelProperty(value = "审批人姓名", name = "userName")
private String userName;
@ApiModelProperty(value = "人员审核权限(1-无权限,2-有权限)")
private Integer personnelPermissionFlag;
//车辆审核权限(1-无权限,2-有权限)
@ApiModelProperty(value = "车辆审核权限(1-无权限,2-有权限)")
private Integer vehiclePermissionFlag;
//临时审核权限(1-无权限,2-有权限)
@ApiModelProperty(value = "临时审核权限(1-无权限,2-有权限)")
private Integer temporaryPermissionFlag;
}

7
web-client/src/main/java/com/zcloud/primeport/dto/MkmjGateAddCmd.java
View File

@ -55,14 +55,13 @@ public class MkmjGateAddCmd extends Command {
@NotEmpty(message = "闸机位置不能为空")
private String gatePosition;
@ApiModelProperty(value = "经度", name = "longitude", required = true)
@NotEmpty(message = "经度不能为空")
// @NotEmpty(message = "经度不能为空")
private String longitude;
@ApiModelProperty(value = "纬度", name = "latitude", required = true)
@NotEmpty(message = "纬度不能为空")
// @NotEmpty(message = "纬度不能为空")
private String latitude;
@ApiModelProperty(value = "备注", name = "remarks", required = true)
@NotEmpty(message = "备注不能为空")
// @NotEmpty(message = "备注不能为空")
private String remarks;
}

4
web-client/src/main/java/com/zcloud/primeport/dto/MkmjGatePageQry.java
View File

@ -15,8 +15,10 @@ public class MkmjGatePageQry extends PageQuery {
@ApiModelProperty(value = "闸机名称模糊查询")
private String gateName;
@ApiModelProperty(value = "闸机类型")
@ApiModelProperty(value = "闸机类型 数据字典")
private String gateType;
@ApiModelProperty(value = "闸机类别 数据字典")
private String gateCategory;
@ApiModelProperty(value = "闸机状态")
private Integer gateStatus;

4
web-client/src/main/java/com/zcloud/primeport/dto/MkmjPassageAddCmd.java
View File

@ -36,10 +36,10 @@ public class MkmjPassageAddCmd extends Command {
@NotNull(message = "口门区域id不能为空")
private Long mkmjId;
@ApiModelProperty(value = "经度", name = "longitude", required = true)
@NotEmpty(message = "经度不能为空")
// @NotEmpty(message = "经度不能为空")
private String longitude;
@ApiModelProperty(value = "纬度", name = "latitude", required = true)
@NotEmpty(message = "纬度不能为空")
// @NotEmpty(message = "纬度不能为空")
private String latitude;
}

50
web-client/src/main/java/com/zcloud/primeport/dto/VehicleApplyAddCmd.java
View File

@ -23,7 +23,6 @@ import java.util.Date;
@AllArgsConstructor
public class VehicleApplyAddCmd extends Command {
@ApiModelProperty(value = "车辆状态(1未启用,2启用)", name = "statusFlag", required = true)
@NotNull(message = "车辆状态(1未启用,2启用)不能为空")
private Integer statusFlag;
@ApiModelProperty(value = "车牌类型数据字典", name = "licenceType", required = true)
@NotEmpty(message = "车牌类型数据字典不能为空")
@ -47,7 +46,7 @@ public class VehicleApplyAddCmd extends Command {
@NotEmpty(message = "授权范围港区与区域不能为空")
private String gateLevelAuthArea;
@ApiModelProperty(value = "审核状态(1:审核中;2审核通过; 3：审核驳回，4无需审批（检查部门车辆）)", name = "auditFlag", required = true)
@NotNull(message = "审核状态(1:审核中;2审核通过; 3：审核驳回，4无需审批（检查部门车辆）)不能为空")
// @NotNull(message = "审核状态(1:审核中;2审核通过; 3：审核驳回，4无需审批（检查部门车辆）)不能为空")
private Integer auditFlag;
@ApiModelProperty(value = "进出港权限(1:有 2：无)", name = "mkmjPermission", required = true)
@NotNull(message = "进出港权限(1:有 2：无)不能为空")
@ -58,29 +57,9 @@ public class VehicleApplyAddCmd extends Command {
@ApiModelProperty(value = "访问结束时间", name = "visitEndTime", required = true)
@NotEmpty(message = "访问结束时间不能为空")
private Date visitEndTime;
@ApiModelProperty(value = "车辆所属企业ID", name = "vehicleCorpId", required = true)
@NotNull(message = "车辆所属企业ID不能为空")
private Long vehicleCorpId;
@ApiModelProperty(value = "车辆所属企业名称", name = "vehicleCorpName", required = true)
@NotEmpty(message = "车辆所属企业名称不能为空")
private String vehicleCorpName;
@ApiModelProperty(value = "车辆所属部门id", name = "vehicleDepartmentId", required = true)
@NotNull(message = "车辆所属部门id不能为空")
private Long vehicleDepartmentId;
@ApiModelProperty(value = "车辆所属部门名称", name = "vehicleDepartmentName", required = true)
@NotEmpty(message = "车辆所属部门名称不能为空")
private String vehicleDepartmentName;
@ApiModelProperty(value = "车辆所属人id(员工车辆/驾驶人id)", name = "employeeVehicleUserId", required = true)
@NotNull(message = "车辆所属人id(员工车辆/驾驶人id)不能为空")
private Long employeeVehicleUserId;
@ApiModelProperty(value = "车辆所属人姓名(员工车辆/驾驶人名称)", name = "employeeVehicleUserName", required = true)
@NotEmpty(message = "车辆所属人姓名(员工车辆/驾驶人名称)不能为空")
private String employeeVehicleUserName;
@ApiModelProperty(value = "排放标准名称", name = "emissionStandards", required = true)
@NotEmpty(message = "排放标准名称不能为空")
private String emissionStandards;
@ApiModelProperty(value = "排放标准", name = "emissionStandardsName", required = true)
@NotEmpty(message = "排放标准不能为空")
private String emissionStandardsName;
@ApiModelProperty(value = "行驶证照片", name = "drivingLicenseId", required = true)
@NotNull(message = "行驶证照片不能为空")
@ -89,16 +68,35 @@ public class VehicleApplyAddCmd extends Command {
@NotNull(message = "车辆照片不能为空")
private Long attachmentId;
@ApiModelProperty(value = "告知签字", name = "informSignId", required = true)
@NotNull(message = "告知签字不能为空")
private Long informSignId;
@ApiModelProperty(value = "项目id", name = "projectId", required = true)
@NotNull(message = "项目id不能为空")
private Long projectId;
@ApiModelProperty(value = "项目名称", name = "projectName", required = true)
@NotEmpty(message = "项目名称不能为空")
private String projectName;
@ApiModelProperty(value = "1被拉黑2未拉黑", name = "blockedFlag", required = true)
@NotNull(message = "1被拉黑2未拉黑不能为空")
private Integer blockedFlag;
@ApiModelProperty(value = "mkmjId", name = "口门id")
private Long mkmjId;
@ApiModelProperty(value = "lsUserPhone", name = "临时申请驾驶人手机号")
private String lsUserPhone;
@ApiModelProperty(value = "lsUserIdcard", name = "临时申请驾驶人身份证")
private String lsUserIdcard;
// 审批
@ApiModelProperty(value = "审核企业", name = "auditCorpId", required = true)
private Long auditCorpId;
@ApiModelProperty(value = "审核企业名称", name = "auditCorpName", required = true)
private String auditCorpName;
@ApiModelProperty(value = "审核部门", name = "auditDeptId", required = true)
private Long auditDeptId;
@ApiModelProperty(value = "审核部门名称", name = "auditDeptName", required = true)
private String auditDeptName;
@ApiModelProperty(value = "审核用户", name = "auditUserId", required = true)
private Long auditUserId;
@ApiModelProperty(value = "审核用户名称", name = "auditUserName", required = true)
private String auditUserName;
}

15
web-client/src/main/java/com/zcloud/primeport/dto/VehicleApplyPageQry.java
View File

@ -1,8 +1,12 @@
package com.zcloud.primeport.dto;
import com.alibaba.cola.dto.PageQuery;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import javax.validation.constraints.NotEmpty;
import java.util.Date;
/**
* web-client
@ -23,6 +27,15 @@ public class VehicleApplyPageQry extends PageQuery {
* - `le`: 小于等于比较查询
* - `ne`: 不等比较查询，对应SQL的!=操作符
*/
private Integer likeStatusFlag;
@ApiModelProperty(value = "licenceNo", name = "车牌号")
private String licenceNo;
@ApiModelProperty(value = "auditFlag", name = "审核状态")
private Integer auditFlag;
@ApiModelProperty(value = "visitStartTime ", name = "访问起始时间")
private Date visitStartTime;
@ApiModelProperty(value = "visitEndTime", name = "访问结束时间")
private Date visitEndTime;
@ApiModelProperty(value = "gateLevelAuthAreaId", name = "授权范围港区与区域")
private String gateLevelAuthAreaId;
}

34
web-client/src/main/java/com/zcloud/primeport/dto/VehicleApplyUpdateCmd.java
View File

@ -34,27 +34,15 @@ public class VehicleApplyUpdateCmd extends Command {
@ApiModelProperty(value = "车牌类型名称0-白牌 1- 蓝牌 2-黄牌 3-绿牌 4-黑牌", name = "licenceTypeName", required = true)
@NotEmpty(message = "车牌类型名称0-白牌 1- 蓝牌 2-黄牌 3-绿牌 4-黑牌不能为空")
private String licenceTypeName;
@ApiModelProperty(value = "车牌号", name = "licenceNo", required = true)
@NotEmpty(message = "车牌号不能为空")
private String licenceNo;
@ApiModelProperty(value = "车辆类型", name = "vehicleType", required = true)
@NotEmpty(message = "车辆类型不能为空")
private String vehicleType;
@ApiModelProperty(value = "车辆类型-名字", name = "vehicleTypeName", required = true)
@NotEmpty(message = "车辆类型-名字不能为空")
private String vehicleTypeName;
@ApiModelProperty(value = "车辆所属类型 1-股份员工车辆，2-股份单位车辆，3-分公司员工车辆，4-分公司单位车辆 ，5-相关方车辆， 6:临时车辆，7检查部门车辆", name = "vehicleBelongType", required = true)
@NotEmpty(message = "车辆所属类型 1-股份员工车辆，2-股份单位车辆，3-分公司员工车辆，4-分公司单位车辆 ，5-相关方车辆， 6:临时车辆，7检查部门车辆不能为空")
private String vehicleBelongType;
@ApiModelProperty(value = "授权范围港区与区域", name = "gateLevelAuthArea", required = true)
@NotEmpty(message = "授权范围港区与区域不能为空")
private Object gateLevelAuthArea;
@ApiModelProperty(value = "审核状态(1:审核中;2审核通过; 3：审核驳回，4无需审批（检查部门车辆）)", name = "auditFlag", required = true)
@NotNull(message = "审核状态(1:审核中;2审核通过; 3：审核驳回，4无需审批（检查部门车辆）)不能为空")
private Integer auditFlag;
@ApiModelProperty(value = "进出港权限(1:有 2：无)", name = "mkmjPermission", required = true)
@NotNull(message = "进出港权限(1:有 2：无)不能为空")
private Integer mkmjPermission;
@ApiModelProperty(value = "访问起始时间", name = "visitStartTime", required = true)
@NotNull(message = "访问起始时间不能为空")
private Date visitStartTime;
@ -80,10 +68,8 @@ public class VehicleApplyUpdateCmd extends Command {
@NotEmpty(message = "车辆所属人姓名(员工车辆/驾驶人名称)不能为空")
private String employeeVehicleUserName;
@ApiModelProperty(value = "排放标准名称", name = "emissionStandards", required = true)
@NotEmpty(message = "排放标准名称不能为空")
private String emissionStandards;
@ApiModelProperty(value = "排放标准", name = "emissionStandardsName", required = true)
@NotEmpty(message = "排放标准不能为空")
private String emissionStandardsName;
@ApiModelProperty(value = "行驶证照片", name = "drivingLicenseId", required = true)
@NotNull(message = "行驶证照片不能为空")
@ -95,13 +81,23 @@ public class VehicleApplyUpdateCmd extends Command {
@NotNull(message = "告知签字不能为空")
private Long informSignId;
@ApiModelProperty(value = "项目id", name = "projectId", required = true)
@NotNull(message = "项目id不能为空")
private Long projectId;
@ApiModelProperty(value = "项目名称", name = "projectName", required = true)
@NotEmpty(message = "项目名称不能为空")
private String projectName;
@ApiModelProperty(value = "1被拉黑2未拉黑", name = "blockedFlag", required = true)
@NotNull(message = "1被拉黑2未拉黑不能为空")
private Integer blockedFlag;
// 审批
@ApiModelProperty(value = "审核企业", name = "auditCorpId", required = true)
private Long auditCorpId;
@ApiModelProperty(value = "审核企业名称", name = "auditCorpName", required = true)
private String auditCorpName;
@ApiModelProperty(value = "审核部门", name = "auditDeptId", required = true)
private Long auditDeptId;
@ApiModelProperty(value = "审核部门名称", name = "auditDeptName", required = true)
private String auditDeptName;
@ApiModelProperty(value = "审核用户", name = "auditUserId", required = true)
private Long auditUserId;
@ApiModelProperty(value = "审核用户名称", name = "auditUserName", required = true)
private String auditUserName;
}

3
web-client/src/main/java/com/zcloud/primeport/dto/VehicleAuditPageQry.java
View File

@ -23,6 +23,7 @@ public class VehicleAuditPageQry extends PageQuery {
* - `le`: 小于等于比较查询
* - `ne`: 不等比较查询，对应SQL的!=操作符
*/
private String likeVehicleApplyId;
private Long vehicleApplyId;
}

42
web-client/src/main/java/com/zcloud/primeport/dto/VehicleAuditUpdateCmd.java
View File

@ -26,45 +26,11 @@ public class VehicleAuditUpdateCmd extends Command {
private Long id;
@ApiModelProperty(value = "车辆申请id", name = "vehicleApplyId", required = true)
@NotEmpty(message = "车辆申请id不能为空")
private String vehicleApplyId;
@ApiModelProperty(value = "审批批次(1.普通车辆.2危险化学品车辆)", name = "batchType", required = true)
@NotNull(message = "审批批次(1.普通车辆.2危险化学品车辆)不能为空")
private Integer batchType;
@ApiModelProperty(value = "审批状态(1,申请;2.更新)", name = "batchState", required = true)
@NotNull(message = "审批状态(1,申请;2.更新)不能为空")
private Integer batchState;
@ApiModelProperty(value = "审批人id", name = "auditUserId", required = true)
@NotNull(message = "审批人id不能为空")
private Long auditUserId;
@ApiModelProperty(value = "审批人姓名", name = "auditUserName", required = true)
@NotEmpty(message = "审批人姓名不能为空")
private String auditUserName;
@ApiModelProperty(value = "审批部门id", name = "auditDeptId", required = true)
@NotNull(message = "审批部门id不能为空")
private Long auditDeptId;
@ApiModelProperty(value = "审批部门名称", name = "auditDeptName", required = true)
@NotEmpty(message = "审批部门名称不能为空")
private String auditDeptName;
@ApiModelProperty(value = "审批人企业id", name = "auditCorpId", required = true)
@NotNull(message = "审批人企业id不能为空")
private Long auditCorpId;
@ApiModelProperty(value = "审批人企业名称", name = "auditCorpName", required = true)
@NotEmpty(message = "审批人企业名称不能为空")
private String auditCorpName;
@ApiModelProperty(value = "审批状态(1,未开始,2通过,3不通过)", name = "auditStatus", required = true)
@NotNull(message = "审批状态(1,未开始,2通过,3不通过)不能为空")
private Long vehicleApplyId;
@ApiModelProperty(value = "审批状态(2通过,3不通过)", name = "auditStatus", required = true)
@NotNull(message = "审批状态不能为空")
private Integer auditStatus;
@ApiModelProperty(value = "待审核信息", name = "changeAfter", required = true)
@NotEmpty(message = "待审核信息不能为空")
private String changeAfter;
@ApiModelProperty(value = "变更前信息", name = "changeBefore", required = true)
@NotEmpty(message = "变更前信息不能为空")
private String changeBefore;
@ApiModelProperty(value = "删除标识", name = "deleteEnum", required = true)
@NotEmpty(message = "删除标识不能为空")
private String deleteEnum;
@ApiModelProperty(value = "备注", name = "remarks", required = true)
@NotEmpty(message = "备注不能为空")
@ApiModelProperty(value = "驳回原因", name = "remarks", required = true)
private String remarks;
}

4
web-client/src/main/java/com/zcloud/primeport/dto/VideoAddCmd.java
View File

@ -37,10 +37,10 @@ public class VideoAddCmd extends Command {
@NotNull(message = "摄像头类型（1-移动 2-平台）不能为空")
private Integer videoType;
@ApiModelProperty(value = "经度", name = "longitude", required = true)
@NotEmpty(message = "经度不能为空")
// @NotEmpty(message = "经度不能为空")
private String longitude;
@ApiModelProperty(value = "纬度", name = "latitude", required = true)
@NotEmpty(message = "纬度不能为空")
// @NotEmpty(message = "纬度不能为空")
private String latitude;
}

5
web-client/src/main/java/com/zcloud/primeport/dto/VideoPageQry.java
View File

@ -23,6 +23,9 @@ public class VideoPageQry extends PageQuery {
* - `le`: 小于等于比较查询
* - `ne`: 不等比较查询，对应SQL的!=操作符
*/
private Long likeForeignId;
// 口门/闸机id 外键id
private Long eqForeignId;
// 设备类型（1-口门 2-闸机）
private Integer eqDeviceType;
}

5
web-client/src/main/java/com/zcloud/primeport/dto/clientobject/MkmjApprovalUserCO.java
View File

@ -22,6 +22,11 @@ public class MkmjApprovalUserCO extends ClientObject {
//审批人企业名称
@ApiModelProperty(value = "审批人企业名称")
private String corpName;
@ApiModelProperty(value = "审批人岗位Id")
private Long postId;
//审批人企业名称
@ApiModelProperty(value = "审批人岗位名称")
private String postName;
//审批人部门id
@ApiModelProperty(value = "审批人部门id")
private Long deptId;

2
web-client/src/main/java/com/zcloud/primeport/dto/clientobject/MkmjCO.java
View File

@ -46,6 +46,8 @@ public class MkmjCO extends ClientObject {
//经度
@ApiModelProperty(value = "经度")
private String longitude;
@ApiModelProperty(value = "口门位置")
private String remarks;
@ApiModelProperty(value = "纬度")
private String latitude;
@ApiModelProperty(value = "摄像头数量")

6
web-client/src/main/java/com/zcloud/primeport/dto/clientobject/VehicleApplyCO.java
View File

@ -96,5 +96,11 @@ public class VehicleApplyCO extends ClientObject {
//1被拉黑2未拉黑
@ApiModelProperty(value = "1被拉黑2未拉黑")
private Integer blockedFlag;
@ApiModelProperty(value = "auditUserId", name = "审核用户")
private Long auditUserId;
@ApiModelProperty(value = "currentUserId", name = "当前用户")
private Long currentUserId;
}

61
web-client/src/main/java/com/zcloud/primeport/dto/clientobject/VehicleAuditCO.java
View File

@ -4,6 +4,8 @@ import com.alibaba.cola.dto.ClientObject;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.util.Date;
/**
* web-client
@ -46,11 +48,58 @@ public class VehicleAuditCO extends ClientObject {
//审批状态(1,未开始,2通过,3不通过)
@ApiModelProperty(value = "审批状态(1,未开始,2通过,3不通过)")
private Integer auditStatus;
//待审核信息
@ApiModelProperty(value = "待审核信息")
private String changeAfter;
//变更前信息
@ApiModelProperty(value = "变更前信息")
private String changeBefore;
//审批意见
@ApiModelProperty(value = "审批意见")
private String remarks;
//访问起始时间
@ApiModelProperty(value = "访问起始时间")
private Date visitStartTime;
//访问结束时间
@ApiModelProperty(value = "访问结束时间")
private Date visitEndTime;
//车辆所属企业ID
@ApiModelProperty(value = "车辆所属企业ID")
private Long vehicleCorpId;
//车辆所属企业名称
@ApiModelProperty(value = "车辆所属企业名称")
private String vehicleCorpName;
//车辆所属部门id
@ApiModelProperty(value = "车辆所属部门id")
private Long vehicleDepartmentId;
//车辆所属部门名称
@ApiModelProperty(value = "车辆所属部门名称")
private String vehicleDepartmentName;
//车辆所属人id(员工车辆/驾驶人id)
@ApiModelProperty(value = "车辆所属人id(员工车辆/驾驶人id)")
private Long employeeVehicleUserId;
//车辆所属人姓名(员工车辆/驾驶人名称)
@ApiModelProperty(value = "车辆所属人姓名(员工车辆/驾驶人名称)")
private String employeeVehicleUserName;
//车牌类型数据字典
@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;
//车辆所属类型 1-股份员工车辆，2-股份单位车辆，3-分公司员工车辆，4-分公司单位车辆 ，5-相关方车辆， 6:临时车辆，7检查部门车辆
@ApiModelProperty(value = "车辆所属类型 1-股份员工车辆，2-股份单位车辆，3-分公司员工车辆，4-分公司单位车辆 ，5-相关方车辆， 6:临时车辆，7检查部门车辆")
private String vehicleBelongType;
//授权范围港区与区域
@ApiModelProperty(value = "授权范围港区与区域")
private String gateLevelAuthArea;
@ApiModelProperty(value = "currentUserCanAudit", name = "当前用户是否能审核")
private Integer currentUserCanAudit;
}

25
web-domain/src/main/java/com/zcloud/primeport/domain/enums/AuditEnum.java Normal file
View File

@ -0,0 +1,25 @@
package com.zcloud.primeport.domain.enums;
public enum AuditEnum {
// 1:审核中;2审核通过; 3：审核驳回，4无需审批（检查部门车辆）
WAITING(1, "Waiting"),
APPROVED(2, "Approved"),
NO_APPROVAL_REQUIRED(4, "NO_APPROVAL_REQUIRED"),
REJECTED(3, "Rejected");
private final int code;
private final String description;
AuditEnum(int code, String description) {
this.code = code;
this.description = description;
}
public int getCode() {
return code;
}
public String getDescription() {
return description;
}
}

12
web-domain/src/main/java/com/zcloud/primeport/domain/enums/MenuEnum.java
View File

@ -13,17 +13,17 @@ import java.util.stream.Collectors;
*/
@Getter
public enum MenuEnum {
MKMJ_JGD("/mkmj/jgd", "mkmj_jgd"),
PASSAGE_JGD("/mkmj/jgd", "mkmj_passage_jgd"),
GATE_JGD("/mkmj/jgd", "mkmj_gate_jgd"),
VIDEO_JGD("/mkmj/jgd", "mkmj_video_jgd")
MKMJ_JGD("/mkmj/jgd1", "mkmj_jgd"),
PASSAGE_JGD("/mkmj/jgd2", "mkmj_passage_jgd"),
GATE_JGD("/mkmj/jgd3", "mkmj_gate_jgd"),
MJSPR_JGD("/mkmj/jgd4", "mkmj_mjspr_jgd")
;
private final String path;
private final String menuKey;
private static final Map<String, MenuEnum> PATH_MAP = Arrays.stream(values()).collect(Collectors.toMap(MenuEnum::getPath, Function.identity()));
private static final Map<String, MenuEnum> PATH_MAP =
Arrays.stream(values()).collect(Collectors.toMap(MenuEnum::getPath, Function.identity()));
MenuEnum(String path, String menuKey) {
this.path = path;

26
web-domain/src/main/java/com/zcloud/primeport/domain/enums/VehicleBelongTypeEnum.java Normal file
View File

@ -0,0 +1,26 @@
package com.zcloud.primeport.domain.enums;
public enum VehicleBelongTypeEnum {
JGD_PRI_VEHICLES("1", "股份员工车辆"),
JGD_PUB_VEHICLES("2", "股份单位车辆"),
FGS_PRI_VEHICLES("3", "分公司员工车辆"),
FGS_PUB_VEHICLES("4", "分公司单位车辆"),
XGF_VEHICLES("5", "相关方车辆"),
TEMP_VEHICLES("6", "临时车辆"),
CHECK_VEHICLES("7", "检查部门车辆");
private String code;
private String desc;
VehicleBelongTypeEnum(String code, String desc) {
this.code = code;
this.desc = desc;
}
public String getCode() {
return code;
}
public String getDesc() {
return desc;
}
}

1
web-domain/src/main/java/com/zcloud/primeport/domain/gateway/VehicleApplyGateway.java
View File

@ -26,5 +26,6 @@ public interface VehicleApplyGateway {
Boolean deletedVehicleApplyById(Long id);
Boolean deletedVehicleApplyByIds(Long[] id);
VehicleApplyE getById(Long id);
}

2
web-domain/src/main/java/com/zcloud/primeport/domain/model/MkmjApprovalUserE.java
View File

@ -25,6 +25,8 @@ public class MkmjApprovalUserE extends BaseE {
private Long deptId;
//审批人部门名称
private String deptName;
private Long postId;
private String postName;
//审批人id
private Long userId;
//审批人名称

15
web-domain/src/main/java/com/zcloud/primeport/domain/model/VehicleApplyE.java
View File

@ -1,6 +1,7 @@
package com.zcloud.primeport.domain.model;
import com.jjb.saas.framework.domain.model.BaseE;
import io.swagger.annotations.ApiModelProperty;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;
@ -34,7 +35,7 @@ public class VehicleApplyE extends BaseE {
//车辆所属类型 1-股份员工车辆，2-股份单位车辆，3-分公司员工车辆，4-分公司单位车辆 ，5-相关方车辆， 6:临时车辆，7检查部门车辆
private String vehicleBelongType;
//授权范围港区与区域
private Object gateLevelAuthArea;
private String gateLevelAuthArea;
//审核状态(1:审核中;2审核通过; 3：审核驳回，4无需审批（检查部门车辆）)
private Integer auditFlag;
//进出港权限(1:有 2：无)
@ -70,5 +71,17 @@ public class VehicleApplyE extends BaseE {
private String projectName;
//1被拉黑2未拉黑
private Integer blockedFlag;
private Long mkmjId;
private String lsUserPhone;
private String lsUserIdcard;
private Long auditCorpId;
private String auditCorpName;
private Long auditDeptId;
private String auditDeptName;
private Long auditUserId;
private String auditUserName;
}

20
web-domain/src/main/java/com/zcloud/primeport/domain/model/VehicleAuditE.java
View File

@ -1,6 +1,9 @@
package com.zcloud.primeport.domain.model;
import com.alibaba.fastjson.JSONObject;
import com.jjb.saas.framework.domain.model.BaseE;
import com.zcloud.gbscommon.todolistmq.TodoListEventPusherUtil;
import com.zcloud.gbscommon.todolistmq.event.TodoListAddEvent;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;
@ -18,7 +21,7 @@ import lombok.NoArgsConstructor;
@Builder
public class VehicleAuditE extends BaseE {
//车辆申请id
private String vehicleApplyId;
private Long vehicleApplyId;
//审批批次(1.普通车辆.2危险化学品车辆)
private Integer batchType;
//审批状态(1,申请;2.更新)
@ -41,5 +44,20 @@ public class VehicleAuditE extends BaseE {
private String changeAfter;
//变更前信息
private String changeBefore;
public TodoListAddEvent getSendEventObj() {
// 发送待办
TodoListAddEvent event = new TodoListAddEvent();
event.setTitle("测试消息");
event.setContent("测试消息内容");
event.setForeignKey(this.id); // 业务表ID
event.setForeignSubsidiaryKey(this.id); // 业务附表ID 没有附表时为foreignKey的值
event.setReceiveUser(getAuditUserId());// user表ID
event.setPcFlag(1); // 是否PC端待办 1是 0否
event.setAppFlag(1); // 是否APP端待办 1是 0否
event.setOtherParams(new JSONObject());
return event;
}
}

2
web-domain/src/main/java/com/zcloud/primeport/domain/model/VehicleMessageE.java
View File

@ -33,7 +33,7 @@ public class VehicleMessageE extends BaseE {
//车辆所属类型 1-股份员工车辆，2-股份单位车辆，3-分公司员工车辆，4-分公司单位车辆 ，5-相关方车辆， 6:临时车辆，7检查部门车辆
private String vehicleBelongType;
//授权范围港区与区域
private Object gateLevelAuthArea;
private String gateLevelAuthArea;
//授权访问起始时间
private Date visitStartTime;
//授权访问结束时间

1
web-infrastructure/src/main/java/com/zcloud/primeport/gatewayimpl/MkmjGatewayImpl.java
View File

@ -62,7 +62,6 @@ public class MkmjGatewayImpl implements MkmjGateway {
result.put("passageCount", mkmjPassageRepository.countByMkmjId(mkmjId));
result.put("gateCount", mkmjGateRepository.countByMkmjId(mkmjId));
result.put("videoCount", videoRepository.countByForeignIdAndDeviceType(mkmjId, 1));
result.put("approvalUserCount", mkmjApprovalUserRepository.countByMkmjId(mkmjId));
return result;
}
}

11
web-infrastructure/src/main/java/com/zcloud/primeport/gatewayimpl/VehicleApplyGatewayImpl.java
View File

@ -46,5 +46,16 @@ public class VehicleApplyGatewayImpl implements VehicleApplyGateway {
public Boolean deletedVehicleApplyByIds(Long[] ids) {
return vehicleApplyRepository.removeByIds(Collections.singletonList(ids));
}
@Override
public VehicleApplyE getById(Long id) {
VehicleApplyDO vehicleApplyDO = vehicleApplyRepository.getById(id);
if (vehicleApplyDO != null) {
VehicleApplyE vehicleApplyE = new VehicleApplyE();
BeanUtils.copyProperties(vehicleApplyDO, vehicleApplyE);
return vehicleApplyE;
}
return null;
}
}

5
web-infrastructure/src/main/java/com/zcloud/primeport/persistence/dataobject/MkmjApprovalUserDO.java
View File

@ -31,6 +31,10 @@ public class MkmjApprovalUserDO extends BaseDO {
//审批人部门名称
@ApiModelProperty(value = "审批人部门名称")
private String deptName;
@ApiModelProperty(value = "审批人岗位id")
private Long postId;
@ApiModelProperty(value = "审批人岗位名称")
private String postName;
//审批人id
@ApiModelProperty(value = "审批人id")
private Long userId;
@ -47,6 +51,5 @@ public class MkmjApprovalUserDO extends BaseDO {
@ApiModelProperty(value = "临时审核权限(1-无权限,2-有权限)")
private Integer temporaryPermissionFlag;
}

2
web-infrastructure/src/main/java/com/zcloud/primeport/persistence/dataobject/MkmjPassageDO.java
View File

@ -20,7 +20,7 @@ public class MkmjPassageDO extends BaseDO {
@ApiModelProperty(value = "通道状态 1-停用 2-正常")
private Integer passageStatus;
@ApiModelProperty(value = "口门区域id")
private String mkmjId;
private Long mkmjId;
@ApiModelProperty(value = "经度")
private String longitude;
@ApiModelProperty(value = "纬度")

27
web-infrastructure/src/main/java/com/zcloud/primeport/persistence/dataobject/VehicleApplyDO.java
View File

@ -1,6 +1,7 @@
package com.zcloud.primeport.persistence.dataobject;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.jjb.saas.framework.repository.basedo.BaseDO;
@ -98,5 +99,31 @@ public class VehicleApplyDO extends BaseDO {
//1被拉黑2未拉黑
@ApiModelProperty(value = "1被拉黑2未拉黑")
private Integer blockedFlag;
@ApiModelProperty(value = "审核企业")
@TableField(exist = false)
private Long auditCorpId;
@ApiModelProperty(value = "审核企业名称")
@TableField(exist = false)
private String auditCorpName;
@ApiModelProperty(value = "审核部门")
@TableField(exist = false)
private Long auditDeptId;
@ApiModelProperty(value = "审核部门名称")
@TableField(exist = false)
private String auditDeptName;
@ApiModelProperty(value = "审核用户")
@TableField(exist = false)
private Long auditUserId;
@ApiModelProperty(value = "审核用户名称")
@TableField(exist = false)
private String auditUserName;
}

64
web-infrastructure/src/main/java/com/zcloud/primeport/persistence/dataobject/VehicleAuditDO.java
View File

@ -1,6 +1,7 @@
package com.zcloud.primeport.persistence.dataobject;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.jjb.saas.framework.repository.basedo.BaseDO;
@ -8,6 +9,8 @@ import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;
import java.util.Date;
/**
* web-infrastructure
*
@ -56,5 +59,66 @@ public class VehicleAuditDO extends BaseDO {
@ApiModelProperty(value = "变更前信息")
private String changeBefore;
//访问起始时间
@ApiModelProperty(value = "访问起始时间")
@TableField(exist = false)
private Date visitStartTime;
//访问结束时间
@ApiModelProperty(value = "访问结束时间")
@TableField(exist = false)
private Date visitEndTime;
//车辆所属企业ID
@ApiModelProperty(value = "车辆所属企业ID")
@TableField(exist = false)
private Long vehicleCorpId;
//车辆所属企业名称
@ApiModelProperty(value = "车辆所属企业名称")
@TableField(exist = false)
private String vehicleCorpName;
//车辆所属部门id
@ApiModelProperty(value = "车辆所属部门id")
@TableField(exist = false)
private Long vehicleDepartmentId;
//车辆所属部门名称
@ApiModelProperty(value = "车辆所属部门名称")
@TableField(exist = false)
private String vehicleDepartmentName;
//车辆所属人id(员工车辆/驾驶人id)
@ApiModelProperty(value = "车辆所属人id(员工车辆/驾驶人id)")
@TableField(exist = false)
private Long employeeVehicleUserId;
//车辆所属人姓名(员工车辆/驾驶人名称)
@ApiModelProperty(value = "车辆所属人姓名(员工车辆/驾驶人名称)")
@TableField(exist = false)
private String employeeVehicleUserName;
//车牌类型数据字典
@ApiModelProperty(value = "车牌类型数据字典")
@TableField(exist = false)
private String licenceType;
//车牌类型名称0-白牌 1- 蓝牌 2-黄牌 3-绿牌 4-黑牌
@ApiModelProperty(value = "车牌类型名称0-白牌 1- 蓝牌 2-黄牌 3-绿牌 4-黑牌")
@TableField(exist = false)
private String licenceTypeName;
//车牌号
@ApiModelProperty(value = "车牌号")
@TableField(exist = false)
private String licenceNo;
//车辆类型
@ApiModelProperty(value = "车辆类型")
@TableField(exist = false)
private String vehicleType;
//车辆类型-名字
@ApiModelProperty(value = "车辆类型-名字")
@TableField(exist = false)
private String vehicleTypeName;
//车辆所属类型 1-股份员工车辆，2-股份单位车辆，3-分公司员工车辆，4-分公司单位车辆 ，5-相关方车辆， 6:临时车辆，7检查部门车辆
@ApiModelProperty(value = "车辆所属类型 1-股份员工车辆，2-股份单位车辆，3-分公司员工车辆，4-分公司单位车辆 ，5-相关方车辆， 6:临时车辆，7检查部门车辆")
@TableField(exist = false)
private String vehicleBelongType;
//授权范围港区与区域
@ApiModelProperty(value = "授权范围港区与区域")
@TableField(exist = false)
private String gateLevelAuthArea;
}

10
web-infrastructure/src/main/java/com/zcloud/primeport/persistence/mapper/MkmjApprovalUserMapper.java
View File

@ -1,9 +1,15 @@
package com.zcloud.primeport.persistence.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.jjb.saas.framework.datascope.annotation.DataScope;
import com.jjb.saas.framework.datascope.annotation.DataScopes;
import com.zcloud.primeport.persistence.dataobject.MkmjApprovalUserDO;
import org.apache.ibatis.annotations.Mapper;
import java.util.Map;
/**
* web-infrastructure
*
@ -11,7 +17,11 @@ import org.apache.ibatis.annotations.Mapper;
* @Date 2026-03-05 11:33:17
*/
@Mapper
@DataScopes(
@DataScope(method = "listPage", menuPerms = "")
)
public interface MkmjApprovalUserMapper extends BaseMapper<MkmjApprovalUserDO> {
IPage<MkmjApprovalUserDO> listPage(Page<Map<String, Object>> page, Map<String, Object> parmas, String menuPerms);
}

5
web-infrastructure/src/main/java/com/zcloud/primeport/persistence/mapper/VehicleApplyMapper.java
View File

@ -1,9 +1,13 @@
package com.zcloud.primeport.persistence.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.zcloud.primeport.persistence.dataobject.VehicleApplyDO;
import org.apache.ibatis.annotations.Mapper;
import java.util.Map;
/**
* web-infrastructure
*
@ -13,5 +17,6 @@ import org.apache.ibatis.annotations.Mapper;
@Mapper
public interface VehicleApplyMapper extends BaseMapper<VehicleApplyDO> {
IPage<VehicleApplyDO> listPage(Page<Map<String, Object>> page, Map<String, Object> parmas, String menuPerms);
}

10
web-infrastructure/src/main/java/com/zcloud/primeport/persistence/mapper/VehicleAuditMapper.java
View File

@ -1,9 +1,15 @@
package com.zcloud.primeport.persistence.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.jjb.saas.framework.datascope.annotation.DataScope;
import com.jjb.saas.framework.datascope.annotation.DataScopes;
import com.zcloud.primeport.persistence.dataobject.VehicleAuditDO;
import org.apache.ibatis.annotations.Mapper;
import java.util.Map;
/**
* web-infrastructure
*
@ -11,7 +17,11 @@ import org.apache.ibatis.annotations.Mapper;
* @Date 2026-03-05 11:33:25
*/
@Mapper
@DataScopes(
@DataScope(method = "listPage", menuPerms = "")
)
public interface VehicleAuditMapper extends BaseMapper<VehicleAuditDO> {
IPage<VehicleAuditDO> listPage(Page<Map<String, Object>> page, Map<String, Object> parmas, String menuPerms);
}

3
web-infrastructure/src/main/java/com/zcloud/primeport/persistence/repository/VehicleAuditRepository.java
View File

@ -13,5 +13,8 @@ import java.util.Map;
*/
public interface VehicleAuditRepository extends BaseRepository<VehicleAuditDO> {
PageResponse<VehicleAuditDO> listPage(Map<String, Object> parmas);
PageResponse<VehicleAuditDO> carApprovalLogByvehicleApplyIdList( Map<String, Object> parmas);
}

16
web-infrastructure/src/main/java/com/zcloud/primeport/persistence/repository/impl/MkmjApprovalUserRepositoryImpl.java
View File

@ -3,9 +3,12 @@ package com.zcloud.primeport.persistence.repository.impl;
import com.alibaba.cola.dto.PageResponse;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.jjb.saas.framework.repository.repo.impl.BaseRepositoryImpl;
import com.zcloud.gbscommon.utils.PageQueryHelper;
import com.zcloud.primeport.domain.enums.MenuEnum;
import com.zcloud.primeport.persistence.dataobject.MkmjApprovalUserDO;
import com.zcloud.primeport.persistence.dataobject.MkmjGateDO;
import com.zcloud.primeport.persistence.mapper.MkmjApprovalUserMapper;
import com.zcloud.primeport.persistence.repository.MkmjApprovalUserRepository;
import lombok.RequiredArgsConstructor;
@ -22,11 +25,14 @@ public class MkmjApprovalUserRepositoryImpl extends BaseRepositoryImpl<MkmjAppro
@Override
public PageResponse<MkmjApprovalUserDO> listPage(Map<String, Object> parmas) {
IPage<MkmjApprovalUserDO> iPage = new Query<MkmjApprovalUserDO>().getPage(parmas);
QueryWrapper<MkmjApprovalUserDO> queryWrapper = new QueryWrapper<>();
queryWrapper = PageQueryHelper.createPageQueryWrapper(queryWrapper, parmas);
queryWrapper.orderByDesc("create_time");
IPage<MkmjApprovalUserDO> result = mkmjApprovalUserMapper.selectPage(iPage, queryWrapper);
Page<Map<String, Object>> page = new Page<>(Integer.parseInt(parmas.get("pageIndex").toString()),
Integer.parseInt(parmas.get("pageSize").toString()));
String menuPerms = "";
if (!org.springframework.util.ObjectUtils.isEmpty(parmas.get("menuPath"))) {
menuPerms = MenuEnum.getMenuKeyByPath(parmas.get("menuPath").toString());
}
IPage<MkmjApprovalUserDO> result = mkmjApprovalUserMapper.listPage(page, parmas,menuPerms);
return PageHelper.pageToResponse(result, result.getRecords());
}

14
web-infrastructure/src/main/java/com/zcloud/primeport/persistence/repository/impl/VehicleApplyRepositoryImpl.java
View File

@ -3,10 +3,12 @@ package com.zcloud.primeport.persistence.repository.impl;
import com.alibaba.cola.dto.PageResponse;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.jjb.saas.framework.repository.common.PageHelper;
import com.jjb.saas.framework.repository.repo.impl.BaseRepositoryImpl;
import com.zcloud.gbscommon.utils.PageQueryHelper;
import com.zcloud.gbscommon.utils.Query;
import com.zcloud.primeport.domain.enums.MenuEnum;
import com.zcloud.primeport.persistence.dataobject.VehicleApplyDO;
import com.zcloud.primeport.persistence.mapper.VehicleApplyMapper;
import com.zcloud.primeport.persistence.repository.VehicleApplyRepository;
@ -28,11 +30,13 @@ public class VehicleApplyRepositoryImpl extends BaseRepositoryImpl<VehicleApplyM
@Override
public PageResponse<VehicleApplyDO> listPage(Map<String, Object> parmas) {
IPage<VehicleApplyDO> iPage = new Query<VehicleApplyDO>().getPage(parmas);
QueryWrapper<VehicleApplyDO> queryWrapper = new QueryWrapper<>();
queryWrapper = PageQueryHelper.createPageQueryWrapper(queryWrapper, parmas);
queryWrapper.orderByDesc("create_time");
IPage<VehicleApplyDO> result = vehicleApplyMapper.selectPage(iPage, queryWrapper);
Page<Map<String, Object>> page = new Page<>(Integer.parseInt(parmas.get("pageIndex").toString()),
Integer.parseInt(parmas.get("pageSize").toString()));
String menuPerms = "";
if (!org.springframework.util.ObjectUtils.isEmpty(parmas.get("menuPath"))) {
menuPerms = MenuEnum.getMenuKeyByPath(parmas.get("menuPath").toString());
}
IPage<VehicleApplyDO> result = vehicleApplyMapper.listPage(page, parmas,menuPerms);
return PageHelper.pageToResponse(result, result.getRecords());
}
}

17
web-infrastructure/src/main/java/com/zcloud/primeport/persistence/repository/impl/VehicleAuditRepositoryImpl.java
View File

@ -3,8 +3,11 @@ package com.zcloud.primeport.persistence.repository.impl;
import com.alibaba.cola.dto.PageResponse;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.jjb.saas.framework.repository.repo.impl.BaseRepositoryImpl;
import com.zcloud.gbscommon.utils.PageQueryHelper;
import com.zcloud.primeport.domain.enums.MenuEnum;
import com.zcloud.primeport.persistence.dataobject.PersonMessageDO;
import com.zcloud.primeport.persistence.dataobject.VehicleAuditDO;
import com.zcloud.primeport.persistence.mapper.VehicleAuditMapper;
import com.zcloud.primeport.persistence.repository.VehicleAuditRepository;
@ -29,12 +32,24 @@ public class VehicleAuditRepositoryImpl extends BaseRepositoryImpl<VehicleAuditM
@Override
public PageResponse<VehicleAuditDO> listPage(Map<String, Object> parmas) {
Page<Map<String, Object>> page = new Page<>(Integer.parseInt(parmas.get("pageIndex").toString()), Integer.parseInt(parmas.get("pageSize").toString()));
String menuPerms = "";
if (!org.springframework.util.ObjectUtils.isEmpty(parmas.get("menuPath"))) {
menuPerms = MenuEnum.getMenuKeyByPath(parmas.get("menuPath").toString());
}
IPage<VehicleAuditDO> result = vehicleAuditMapper.listPage(page, parmas, menuPerms);
return PageHelper.pageToResponse(result, result.getRecords());
}
@Override
public PageResponse<VehicleAuditDO> carApprovalLogByvehicleApplyIdList(Map<String, Object> parmas) {
IPage<VehicleAuditDO> iPage = new Query<VehicleAuditDO>().getPage(parmas);
QueryWrapper<VehicleAuditDO> queryWrapper = new QueryWrapper<>();
queryWrapper = PageQueryHelper.createPageQueryWrapper(queryWrapper, parmas);
queryWrapper.eq("vehicle_apply_id", parmas.get("vehicleApplyId"));
queryWrapper.orderByDesc("create_time");
IPage<VehicleAuditDO> result = vehicleAuditMapper.selectPage(iPage, queryWrapper);
return PageHelper.pageToResponse(result, result.getRecords());
}
}

12
web-infrastructure/src/main/resources/mapper/MkmjApprovalUserDO.xml
View File

@ -4,5 +4,17 @@
<mapper namespace="com.zcloud.primeport.persistence.mapper.MkmjApprovalUserMapper">
<select id="listPage" resultType="com.zcloud.primeport.persistence.dataobject.MkmjApprovalUserDO">
select * from mkmj_approval_user g
where g.delete_enum = 'FALSE'
and g.corp_id = #{parmas.corpId}
<if test="parmas.dept_id != null">
AND g.dept_id = #{parmas.deptId}
</if>
<if test="parmas.userName != null and parmas.userName != ''">
AND g.user_name LIKE CONCAT('%', #{parmas.userName}, '%')
</if>
order by g.dept_id, g.create_time desc
</select>
</mapper>

4
web-infrastructure/src/main/resources/mapper/MkmjGateDO.xml
View File

@ -43,6 +43,10 @@
<if test="parmas.gateType != null and parmas.gateType != ''">
AND g.gate_type = #{parmas.gateType}
</if>
<if test="parmas.gateCategory != null and parmas.gateCategory != ''">
AND g.gate_category = #{parmas.gateCategory}
</if>
<if test="parmas.gateStatus != null">
AND g.gate_status = #{parmas.gateStatus}
</if>

58
web-infrastructure/src/main/resources/mapper/VehicleApplyDO.xml
View File

@ -4,5 +4,63 @@
<mapper namespace="com.zcloud.primeport.persistence.mapper.VehicleApplyMapper">
<select id="listPage" resultType="com.zcloud.primeport.persistence.dataobject.VehicleApplyDO">
SELECT
f.id,
f.status_flag,
f.licence_type,
f.licence_type_name,
f.licence_no,
f.vehicle_type,
f.vehicle_type_name,
f.vehicle_belong_type,
f.gate_level_auth_area,
f.audit_flag,
f.mkmj_permission,
f.visit_start_time,
f.visit_end_time,
f.vehicle_corp_id,
f.vehicle_corp_name,
f.vehicle_department_name,
f.vehicle_department_id,
f.employee_vehicle_user_name,
f.employee_vehicle_user_id,
f.emission_standards_name,
f.emission_standards,
f.attachment_id,
f.driving_license_id,
f.inform_sign_id,
f.project_id,
f.project_name,
f.blocked_flag,
a.audit_user_id,
a.audit_user_name,
a.audit_dept_id,
a.audit_dept_name,
a.audit_corp_name,
a.audit_corp_id
FROM
vehicle_apply AS f
LEFT JOIN vehicle_audit AS a ON f.id = a.vehicle_apply_id
AND a.delete_enum = 'FALSE'
AND a.audit_status = 1
WHERE
f.delete_enum = 'FALSE'
<if test="parmas.licenceNo != null and parmas.licenceNo != ''">
AND f.licence_no like CONCAT('%', #{parmas.licenceNo}, '%')
</if>
<if test="parmas.auditFlag != null">
AND f.audit_flag = #{parmas.auditFlag}
</if>
<if test="parmas.visitStartTime != null">
AND f.visit_start_time LIKE CONCAT('%', #{parmas.gateName}, '%')
</if>
<if test="parmas.visitEndTime != null">
AND f.visit_end_time LIKE CONCAT('%', #{parmas.gateName}, '%')
</if>
<if test="parmas.gateCategory != null and parmas.gateCategory != ''">
AND g.gate_category = #{parmas.gateCategory}
</if>
</select>
</mapper>

50
web-infrastructure/src/main/resources/mapper/VehicleAuditDO.xml
View File

@ -4,5 +4,55 @@
<mapper namespace="com.zcloud.primeport.persistence.mapper.VehicleAuditMapper">
<select id="listPage" resultType="com.zcloud.primeport.persistence.dataobject.VehicleAuditDO">
SELECT
a.id,
a.vehicle_apply_id,
a.batch_type,
a.batch_state,
a.audit_user_id,
a.audit_user_name,
a.audit_dept_id,
a.audit_dept_name,
a.audit_corp_id,
a.audit_corp_name,
a.audit_status,
a.change_after,
a.change_before,
a.remarks,
va.licence_type,
va.licence_type_name,
va.licence_no,
va.vehicle_type,
va.vehicle_type_name,
va.gate_level_auth_area,
va.vehicle_belong_type,
va.mkmj_permission,
va.visit_start_time,
va.visit_end_time,
va.vehicle_corp_id,
va.vehicle_corp_name,
va.vehicle_department_id,
va.vehicle_department_name,
va.employee_vehicle_user_id,
va.employee_vehicle_user_name,
va.emission_standards,
va.driving_license_id,
va.attachment_id,
va.inform_sign_id,
va.project_id,
va.project_name,
va.ls_user_phone,
va.ls_user_idcard,
va.mkmj_id,
va.blocked_flag
FROM
vehicle_audit AS a
LEFT JOIN vehicle_apply AS va ON a.vehicle_apply_id = va.id
WHERE
a.delete_enum = 'FALSE'
AND va.delete_enum = 'FALSE'
AND a.audit_status = 1
</select>
</mapper>