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

1、车辆申请分页列表增加非驳回条件 

2、部门车辆录入字段补充
3、移除黑名单补充名称&违规状态补充
4、车牌号唯一性校验增加非驳回条件
5、审批&申请记录按时间倒排
koumen
lishiwei 2026-04-29 18:16:05 +08:00
parent b7d7e65f28
commit 056678d640
6 changed files with 16 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -48,6 +48,7 @@ public class VehicleViolationsAddExe {
}
VehicleViolationsE examTypeE = new VehicleViolationsE();
examTypeE.setViolationProcessingStatus(2);
BeanUtils.copyProperties(cmd, examTypeE);
boolean res = false;
try {

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

@ -82,6 +82,7 @@ public class VehicleApplyServiceImpl implements VehicleApplyServiceI {
queryWrapper.eq("licence_no", licenceNo);
queryWrapper.in("vehicle_belong_type", 1,2,3,4,8,9);
queryWrapper.eq("delete_enum", "false");
queryWrapper.ne("audit_flag", 3);
if (id != null) {
queryWrapper.ne("id", id);
}

9
web-client/src/main/java/com/zcloud/primeport/dto/VehicleApplyInspectAddCmd.java
View File

@ -23,8 +23,11 @@ import java.util.List;
@AllArgsConstructor
public class VehicleApplyInspectAddCmd extends Command {
@ApiModelProperty(value = "名称", name = "remarks")
@NotEmpty(message = "名称")
// @NotEmpty(message = "名称")
private String remarks;
@ApiModelProperty(value = "检查部门名称", name = "checkDepartmentName")
@NotEmpty(message = "检查部门名称")
private String checkDepartmentName;
@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;
@ -45,6 +48,10 @@ public class VehicleApplyInspectAddCmd extends Command {
private String vehicleTypeName;
@ApiModelProperty(value = "车牌号", name = "licenceNo", required = true)
private String licenceNo;
@ApiModelProperty(value = "访问开始时间", name = "visitStartTime", required = true)
private String visitStartTime;
@ApiModelProperty(value = "访问结束时间", name = "visitEndTime", required = true)
private String visitEndTime;
}
}

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

@ -48,6 +48,7 @@
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'
AND f.audit_flag != 3
<if test="params.remarks != null and params.remarks != ''">
AND f.remarks like CONCAT('%', #{params.remarks}, '%')
</if>

2
web-infrastructure/src/main/resources/mapper/VehicleBlackDO.xml
View File

@ -6,7 +6,7 @@
<select id="getInfoById" resultType="com.zcloud.primeport.persistence.dataobject.VehicleBlackDO">
SELECT
b.id
b.id,
b.licence_no
FROM
vehicle_black b

5
web-infrastructure/src/main/resources/mapper/XgfApplyPersonDO.xml
View File

@ -108,6 +108,8 @@
<if test="params.applyCorpName != null and params.applyCorpName != ''">
AND p.apply_corp_name like CONCAT('%', #{params.applyCorpName}, '%')
</if>
ORDER BY
p.create_time DESC
</select>
<select id="personnelVehicleManagementList"
resultType="com.zcloud.primeport.persistence.dataobject.PersonCountDto">
@ -128,7 +130,7 @@
pa.id apply_person_id,
pa.xgf_apply_person_id,
IFNULL( tmp.vehicle_count, 0 ) vehicle_count,
IFNULL( pa.mkmj_permission, 2 ) mkmj_permission,
IFNULL( pa.mkmj_permission, 1 ) mkmj_permission,
u.user_avatar_url user_face_url
FROM
USER u
@ -145,6 +147,7 @@
vehicle_apply va
WHERE
va.delete_enum = 'FALSE'
AND va.audit_flag = 2
AND va.employee_vehicle_user_id != ''
AND va.employee_vehicle_user_id IS NOT NULL
GROUP BY