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

0710 - bug修复

koumen
tianxinlei 2026-07-10 17:59:23 +08:00
parent 608c51aa0a
commit c88b59b805
11 changed files with 50 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
start/src/main/resources/templates/primeport.html
View File

@ -1,4 +1,4 @@
<!doctype html><html lang="zh"><head data-built-info="@cqsjjb/scripts@2.0.0-rspack.1 Frontend_Env[production] Build_Date[2026/7/9 15:41:33] App_Identifier[primeport]"><meta charset="UTF-8"/><meta name="renderer" content="webkit"/><meta http-equiv="X-UA-Compatible" content="IE=edge,Chrome=1"/><meta name="viewport" content="width=device-width,minimum-scale=1,maximum-scale=1,user-scalable=no,viewport-fit=cover"><meta charset="UTF-8" name="referrer" content="strict-origin-when-cross-origin"/><title>临时访客申请</title><script>(function () { <!doctype html><html lang="zh"><head data-built-info="@cqsjjb/scripts@2.0.0-rspack.1 Frontend_Env[production] Build_Date[2026/7/10 17:57:39] App_Identifier[primeport]"><meta charset="UTF-8"/><meta name="renderer" content="webkit"/><meta http-equiv="X-UA-Compatible" content="IE=edge,Chrome=1"/><meta name="viewport" content="width=device-width,minimum-scale=1,maximum-scale=1,user-scalable=no,viewport-fit=cover"><meta charset="UTF-8" name="referrer" content="strict-origin-when-cross-origin"/><title>临时访客申请</title><script>(function () {
const APP_ENV = { const APP_ENV = {
antd: { antd: {
'ant-prefix': 'micro-temp', 'ant-prefix': 'micro-temp',
@ -20,4 +20,4 @@
redirect: '', redirect: '',
FRAMEWORK: APP_ENV.antd FRAMEWORK: APP_ENV.antd
}; };
})();</script><script defer="defer" src="/primeport/static/js/942.000313a5011c30f5.js"></script><script defer="defer" src="/primeport/static/js/98.90d75146a9ca149f.js"></script><script defer="defer" src="/primeport/static/js/main.b94bc8525bf7a9d7.js"></script><link href="/primeport/static/css/main.de5125c7f5780dd6.css" rel="stylesheet"></head><body><noscript>此网页需要开启JavaScript功能。</noscript><div id="root" style="width: 100%; height: 100%; position: relative;overflow-y: auto;"></div><script type="text/javascript">/* @cqsjjb/script 输出当前应用基本信息 */console.log("%c@cqsjjb/scripts@2.0.0-rspack.1 Frontend_Env[production] Build_Date[2026/7/9 15:41:33] App_Identifier[primeport] Frontend_Branch[master] Backend_Branch[<branch-name>]", "color: #1890ff; border-radius: 2px; padding: 0 4px; border: 1px solid #1890ff; background: #f9fcff")</script></body></html> })();</script><script defer="defer" src="/primeport/static/js/942.000313a5011c30f5.js"></script><script defer="defer" src="/primeport/static/js/98.90d75146a9ca149f.js"></script><script defer="defer" src="/primeport/static/js/main.6ee2b103c3dac010.js"></script><link href="/primeport/static/css/main.de5125c7f5780dd6.css" rel="stylesheet"></head><body><noscript>此网页需要开启JavaScript功能。</noscript><div id="root" style="width: 100%; height: 100%; position: relative;overflow-y: auto;"></div><script type="text/javascript">/* @cqsjjb/script 输出当前应用基本信息 */console.log("%c@cqsjjb/scripts@2.0.0-rspack.1 Frontend_Env[production] Build_Date[2026/7/10 17:57:39] App_Identifier[primeport] Frontend_Branch[master] Backend_Branch[<branch-name>]", "color: #1890ff; border-radius: 2px; padding: 0 4px; border: 1px solid #1890ff; background: #f9fcff")</script></body></html>

1
start/src/main/resources/templates/primeport/static/js/main.6b5caefb022f59c7.js Normal file
View File

File diff suppressed because one or more lines are too long

1
start/src/main/resources/templates/primeport/static/js/main.6ee2b103c3dac010.js Normal file
View File

File diff suppressed because one or more lines are too long

1
start/src/main/resources/templates/primeport/static/js/main.bb3b3e548b621778.js Normal file
View File

File diff suppressed because one or more lines are too long

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

@ -131,10 +131,8 @@ public class PersonApplyQueryExe {
} }
public PersonApplyCO getInfoByUserId(Long userId) { public PersonApplyCO getInfoByUserId(Long userId) {
QueryWrapper<PersonApplyDO> objectQueryWrapper = new QueryWrapper<>(); PersonApplyDO personApplyDO = personApplyRepository.getInfoByUserId(userId);
objectQueryWrapper.eq("employee_person_user_id", userId); return personApplyCoConvertor.converDOToCO(personApplyDO);
return personApplyCoConvertor.converDOToCO(personApplyRepository.getInfoByUserId(userId));
} }
} }

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

@ -35,8 +35,8 @@ public class VehicleApplyPageQry extends PageQuery {
private String visitStartTime; private String visitStartTime;
@ApiModelProperty(value = "访问结束时间", name = "visitEndTime") @ApiModelProperty(value = "访问结束时间", name = "visitEndTime")
private String visitEndTime; private String visitEndTime;
@ApiModelProperty(value = "授权范围港区与区域", name = "gateLevelAuthAreaId") @ApiModelProperty(value = "授权范围港区与区域", name = "gateLevelAuthArea")
private String gateLevelAuthAreaId; private String gateLevelAuthArea;
@ApiModelProperty(value = "车辆归属的企业的部门vehicleCorpId", name = "vehicleCorpId") @ApiModelProperty(value = "车辆归属的企业的部门vehicleCorpId", name = "vehicleCorpId")
private Long vehicleCorpId; private Long vehicleCorpId;
@ApiModelProperty(value = "车辆归属的部门的部门depetid", name = "vehicleDepartmentId") @ApiModelProperty(value = "车辆归属的部门的部门depetid", name = "vehicleDepartmentId")
@ -51,6 +51,8 @@ public class VehicleApplyPageQry extends PageQuery {
@ApiModelProperty(value = "企业名称", name = "corpName") @ApiModelProperty(value = "企业名称", name = "corpName")
private String corpName; private String corpName;
@ApiModelProperty(value = "公司ID", name = "corpId")
private Long corpId;
private String menuPath; private String menuPath;
} }

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

@ -47,6 +47,8 @@ public class PersonCountCO extends ClientObject {
private Integer vehicleCount; private Integer vehicleCount;
@ApiModelProperty(value = "是否允许访问") @ApiModelProperty(value = "是否允许访问")
private Integer mkmjPermission; private Integer mkmjPermission;
@ApiModelProperty(value = "访问港区")
private String gateLevelAuthArea;
@ApiModelProperty(value = "用户头像URL") @ApiModelProperty(value = "用户头像URL")
private String userFaceUrl; private String userFaceUrl;
} }

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

@ -47,6 +47,8 @@ public class PersonCountDto{
private Integer vehicleCount; private Integer vehicleCount;
@ApiModelProperty(value = "是否允许访问") @ApiModelProperty(value = "是否允许访问")
private Integer mkmjPermission; private Integer mkmjPermission;
@ApiModelProperty(value = "访问港区")
private String gateLevelAuthArea;
@ApiModelProperty(value = "用户头像URL") @ApiModelProperty(value = "用户头像URL")
private String userFaceUrl; private String userFaceUrl;
@ApiModelProperty(value = "身份证号") @ApiModelProperty(value = "身份证号")

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

@ -42,10 +42,20 @@
a.audit_dept_name, a.audit_dept_name,
a.audit_corp_name, a.audit_corp_name,
a.audit_corp_id, a.audit_corp_id,
f.remarks check_department_name f.remarks check_department_name,
f.ls_user_phone
FROM FROM
vehicle_apply AS f 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 LEFT JOIN (
SELECT vehicle_apply_id, MAX(create_time) max_time
FROM vehicle_audit
WHERE delete_enum = 'FALSE' AND audit_status = 1
GROUP BY vehicle_apply_id
) lastAudit ON f.id = lastAudit.vehicle_apply_id
LEFT JOIN vehicle_audit AS a
ON a.vehicle_apply_id = lastAudit.vehicle_apply_id
AND a.create_time = lastAudit.max_time
AND a.delete_enum = 'FALSE' AND a.audit_status = 1
WHERE WHERE
f.delete_enum = 'FALSE' f.delete_enum = 'FALSE'
<if test="params.remarks != null and params.remarks != ''"> <if test="params.remarks != null and params.remarks != ''">
@ -66,7 +76,7 @@
<if test="params.vehicleBelongType != null and params.vehicleBelongType != ''"> <if test="params.vehicleBelongType != null and params.vehicleBelongType != ''">
AND f.vehicle_belong_type = #{params.vehicleBelongType} AND f.vehicle_belong_type = #{params.vehicleBelongType}
</if> </if>
<if test="params.vehicleDepartmentId != null"> <if test="params.vehicleDepartmentId != null and params.vehicleDepartmentId != ''">
AND f.vehicle_department_id = #{params.vehicleDepartmentId} AND f.vehicle_department_id = #{params.vehicleDepartmentId}
</if> </if>
<if test="params.vehicleCorpId != null"> <if test="params.vehicleCorpId != null">
@ -75,8 +85,11 @@
<if test="params.employeeVehicleUserId != null"> <if test="params.employeeVehicleUserId != null">
AND f.employee_vehicle_user_id = #{params.employeeVehicleUserId} AND f.employee_vehicle_user_id = #{params.employeeVehicleUserId}
</if> </if>
<if test="params.gateLevelAuthAreaId != null and params.gateLevelAuthAreaId != ''"> <if test="params.gateLevelAuthArea != null and params.gateLevelAuthArea != ''">
AND JSON_CONTAINS(f.gate_level_auth_area, JSON_OBJECT('bianma', #{params.gateLevelAuthAreaId}), '$.area') AND JSON_SEARCH(f.gate_level_auth_area, 'one', #{params.gateLevelAuthArea}, null, '$.area[*].bianma') IS NOT NULL
</if>
<if test="params.corpId != null">
AND f.vehicle_corp_id =#{params.corpId}
</if> </if>
order by f.id desc order by f.id desc
</select> </select>
@ -103,19 +116,20 @@
) utmp ON c.id = utmp.corpinfo_id ) utmp ON c.id = utmp.corpinfo_id
LEFT JOIN ( LEFT JOIN (
SELECT SELECT
va.vehicle_corp_id, u.corpinfo_id,
COUNT( va.id ) pri_car_count COUNT(DISTINCT va.id) pri_car_count
FROM FROM `vehicle_apply` va
`vehicle_apply` va INNER JOIN `user` u ON va.employee_vehicle_user_id = u.id
WHERE WHERE
va.delete_enum = 'FALSE' va.delete_enum = 'FALSE'
<if test="params.corpType != null"> <if test="params.corpType != null">
<if test="params.corpType == 1"> AND va.vehicle_belong_type IN ( 1, 3 ) </if> <if test="params.corpType == 1"> AND va.vehicle_belong_type IN ( 1, 3 ) </if>
<if test="params.corpType == 2"> and va.vehicle_belong_type = 7 </if> <if test="params.corpType == 2"> and va.vehicle_belong_type = 7 </if>
</if> </if>
GROUP BY AND u.delete_enum = 'FALSE' -- 员工不能已删除
va.vehicle_corp_id AND u.main_corp_flag = 0
) prtmp ON c.id = prtmp.vehicle_corp_id GROUP BY u.corpinfo_id
) prtmp ON c.id = prtmp.corpinfo_id
LEFT JOIN ( LEFT JOIN (
SELECT SELECT
va.vehicle_corp_id, va.vehicle_corp_id,

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

@ -57,7 +57,7 @@
AND va.delete_enum = 'FALSE' AND va.delete_enum = 'FALSE'
<if test="params.processOrRecord != null"> <if test="params.processOrRecord != null">
<if test="params.processOrRecord == 1"> <if test="params.processOrRecord == 1">
AND a.audit_status = 1 AND a.audit_status = 1 AND va.audit_flag = 1
</if> </if>
<if test="params.processOrRecord == 2"> <if test="params.processOrRecord == 2">
AND a.audit_status != 1 AND a.audit_status != 1
@ -106,7 +106,7 @@
, ']') , ']')
) )
</if> </if>
ORDER BY a.id desc ORDER BY a.audit_status ASC,a.id desc
</select> </select>
<select id="carApprovalLogByvehicleApplyIdList" <select id="carApprovalLogByvehicleApplyIdList"
resultType="com.zcloud.primeport.persistence.dataobject.VehicleAuditDO"> resultType="com.zcloud.primeport.persistence.dataobject.VehicleAuditDO">

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

@ -125,11 +125,12 @@
u.user_id_card user_card, u.user_id_card user_card,
d.id department_id, d.id department_id,
d.`name` department_name, d.`name` department_name,
p.post_name, COALESCE(u.post_name, p.post_name) AS post_name,
xap.project_id, xap.project_id,
xap.project_name, xap.project_name,
xap.visit_start_time, xap.visit_start_time,
xap.visit_end_time, xap.visit_end_time,
xap.gate_level_auth_area,
pa.id apply_person_id, pa.id apply_person_id,
pa.xgf_apply_person_id, pa.xgf_apply_person_id,
IFNULL( tmp.vehicle_count, 0 ) vehicle_count, IFNULL( tmp.vehicle_count, 0 ) vehicle_count,