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

feat：完善单位车辆的发起人与发起时间

koumen
dearLin 2026-03-26 11:24:17 +08:00
parent 0fc4c88c1b
commit faab3a5c5d
6 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
web-app/src/main/java/com/zcloud/primeport/command/query/PersonApplyQueryExe.java
View File

@ -71,7 +71,7 @@ public class PersonApplyQueryExe {
if (!examCenterCOS.isEmpty()) {
examCenterCOS.forEach(item -> {
item.setCurrentUserCanAudit(2);
if (item.getAuditUserId().equals(userId)) {
if (userId.equals(item.getAuditUserId())) {
item.setCurrentUserCanAudit(1);
}
});

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

@ -57,8 +57,7 @@ public class VehicleAuditQueryExe {
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());
return PageResponse.of(vehicleAuditCOS, vehicleAuditDOPageResponse.getTotalCount(), vehicleAuditDOPageResponse.getPageSize(), vehicleAuditDOPageResponse.getPageIndex());
}
public VehicleAuditCO getInfoById(Long id) {

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

@ -292,7 +292,9 @@ public enum MenuEnum {
/**
* 车辆封闭区域申请记录
*/
XGS_CHE_LIANG_FENG_BI_QU_YU_SHEN_QING_JI_LU("/primeport/container/stakeholder/enclosedArea/apply/vehicleRecords/list", "xgs-che-liang-feng-bi-qu-yu-shen-qing-ji-lu");
XGS_CHE_LIANG_FENG_BI_QU_YU_SHEN_QING_JI_LU("/primeport/container/stakeholder/enclosedArea/apply/vehicleRecords/list", "xgs-che-liang-feng-bi-qu-yu-shen-qing-ji-lu"),
ZGDW_LSRYGL_RECORD("/primeport/container/stakeholder/firstLevelDoor/portEntryApproval/temporaryVisitor/temporaryPersonnelRecords/list", "zgdw-lsrygljl"),
ZGDW_LSCLGL_RECORD("/primeport/container/stakeholder/firstLevelDoor/portEntryApproval/temporaryVisitor/temporaryVehicleRecords/list", "zgdw-lsclgljl");
private final String path;
private final String menuKey;

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

@ -63,9 +63,10 @@ public class VehicleApplyRepositoryImpl extends BaseRepositoryImpl<VehicleApplyM
queryWrapper.eq("vehicle_belong_type", params.get("vehicleBelongType"));
queryWrapper.eq("audit_flag", AuditEnum.APPROVED.getCode());
queryWrapper.eq("mkmj_permission", 1);
queryWrapper.like(Tools.notEmpty(params.get("licenceNo").toString()),"licence_no", params.get("licenceNo"));
queryWrapper.like(!Tools.isEmpty(params.get("licenceNo")),"licence_no", params.get("licenceNo"));
String vehicleBelongType = params.get("vehicleBelongType").toString();
if (VehicleBelongTypeEnum.JGD_PRI_VEHICLES.getCode().equals(vehicleBelongType) ||VehicleBelongTypeEnum.FGS_PRI_VEHICLES.getCode().equals(vehicleBelongType)) {
if (VehicleBelongTypeEnum.JGD_PRI_VEHICLES.getCode().equals(vehicleBelongType)
||VehicleBelongTypeEnum.FGS_PRI_VEHICLES.getCode().equals(vehicleBelongType)) {
// 分公司、股份个人车，查询当前登录用户车辆
queryWrapper.eq("employee_vehicle_user_id", AuthContext.getUserId());
}

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

@ -75,6 +75,7 @@
<if test="params.employeeVehicleUserId != null">
AND f.employee_vehicle_user_id = #{params.employeeVehicleUserId}
</if>
order by f.id desc
</select>
<select id="fgsCount" resultType="com.zcloud.primeport.persistence.dataobject.FgsVehicleCountDto">
SELECT

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

@ -130,7 +130,9 @@
vap.vehicle_department_id,
vap.vehicle_department_name,
vap.employee_vehicle_user_id,
vap.employee_vehicle_user_name
vap.employee_vehicle_user_name,
vap.create_name apply_user_name,
vap.create_time apply_time
FROM
vehicle_audit AS va
LEFT JOIN vehicle_apply vap on va.vehicle_apply_id = vap.id