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

0627 - bug修改

koumen
tianxinlei 2026-06-27 15:18:53 +08:00
parent a5fc467659
commit 3327942642
7 changed files with 31 additions and 16 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/6/23 15:42:08] 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/6/25 17:42:07] 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 = {
antd: {
'ant-prefix': 'micro-temp',
@ -20,4 +20,4 @@
redirect: '',
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.86fd942c0d684f8e.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/6/23 15:42:08] 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.5ccab198cca7b812.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/6/25 17:42:07] 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.5ccab198cca7b812.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.e97cd396c9727aa0.js Normal file
View File

File diff suppressed because one or more lines are too long

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

@ -34,6 +34,8 @@ public class ClosedAreaCarApplyPageQry extends PageQuery {
private Integer processOrRecord;
@ApiModelProperty(value = "1股份2分公司3相关方4临时人员", name = "carBelongType")
private Integer carBelongType;
@ApiModelProperty(value = "申请人公司名称", name = "applyPersonCorpName")
private String applyPersonCorpName;
private String menuPath;
}

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

@ -30,6 +30,8 @@ public class ClosedAreaPersonApplyPageQry extends PageQuery {
private Long deptId;
@ApiModelProperty(value = "1带自己，2不带自己", name = "noSelf", required = true)
private Integer noSelf;
@ApiModelProperty(value = "申请人公司名称", name = "applyPersonCorpName", required = true)
private String applyPersonCorpName;
@ApiModelProperty(value = "申请人名称", name = "applyPersonUserName", required = true)
private String applyPersonUserName;

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

@ -7,6 +7,10 @@
<select id="listPage" resultType="com.zcloud.primeport.persistence.dataobject.ClosedAreaCarApplyDO">
select c.*,c.create_name from closed_area_car_apply c
where c.delete_enum = 'FALSE'
<if test="params.applyPersonCorpName != null">
c.apply_person_corp_name like CONCAT('%', #{params.applyPersonCorpName}, '%')
</if>
<if test="params.processOrRecord != null">
<if test="params.processOrRecord == 1">
AND c.audit_flag = 1

33
web-infrastructure/src/main/resources/mapper/ClosedAreaPersonApplyMapper.xml
View File

@ -26,20 +26,20 @@
`user` AS u
LEFT JOIN corp_info c ON u.corpinfo_id = c.id
LEFT JOIN department d ON u.department_id = d.id
LEFT JOIN closed_area_fgs_person_auth cafpa on cafpa.user_id = u.user_id and cafpa.delete_enum = 'FALSE'
LEFT JOIN closed_area_fgs_person_auth cafpa on cafpa.user_id = u.id and cafpa.delete_enum = 'FALSE'
LEFT JOIN (
SELECT
va.employee_vehicle_user_id,
COUNT( va.id ) vehicle_count
FROM
`vehicle_apply` va
WHERE
va.audit_flag = 2
AND va.vehicle_belong_type = 3
AND va.delete_enum = 'FALSE'
GROUP BY
va.employee_vehicle_user_id
) vehicle_tmp ON u.user_id = vehicle_tmp.employee_vehicle_user_id
SELECT
va.employee_vehicle_user_id,
COUNT( va.id ) vehicle_count
FROM
`vehicle_apply` va
WHERE
va.audit_flag = 2
AND va.vehicle_belong_type = 3
AND va.delete_enum = 'FALSE'
GROUP BY
va.employee_vehicle_user_id
) vehicle_tmp ON u.id = vehicle_tmp.employee_vehicle_user_id
WHERE
u.delete_enum = 'FALSE'
AND u.main_corp_flag = 0
@ -58,8 +58,13 @@
u.department_id
</select>
<select id="listPage" resultType="com.zcloud.primeport.persistence.dataobject.ClosedAreaPersonApplyDO">
select c.*,c.create_name apply_user_name from closed_area_person_apply c
select c.*,c.create_name apply_user_name
from closed_area_person_apply c
where c.delete_enum = 'FALSE'
<if test="params.applyPersonCorpName != null">
AND c.apply_person_corp_name like CONCAT('%', #{params.applyPersonCorpName}, '%')
</if>
<if test="params.deptId != null">
AND c.apply_person_department_id = #{params.deptId}
</if>