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

fixed：内测问题修复

koumen
dearLin 2026-04-14 09:39:44 +08:00
parent 7c3f37a0cb
commit fef4ee37f1
15 changed files with 74 additions and 6 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 Env/production (2026/4/1 15:47:50) App/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"><title>--</title><script>(function () { <!doctype html><html lang="zh"><head data-built-info="@cqsjjb/scripts@2.0.0 Env/production (2026/4/14 09:28:42) App/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"><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/75.7bab4be25660eb2345d0.js"></script><script defer="defer" src="/primeport/static/js/745.8d29bff9db591207737c.js"></script><script defer="defer" src="/primeport/static/js/main.10bf47ad6df6065b4cde.js"></script><link href="/primeport/static/css/main.ef1f3389c7ea99a7bdd0.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 Env/production (2026/4/1 15:47:50) App/primeport Version/master Java/<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/75.7bab4be25660eb2345d0.js"></script><script defer="defer" src="/primeport/static/js/745.6424c1e7b93a41a016b6.js"></script><script defer="defer" src="/primeport/static/js/main.ab5bf21aa2eef1348d91.js"></script><link href="/primeport/static/css/main.ef1f3389c7ea99a7bdd0.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 Env/production (2026/4/14 09:28:42) App/primeport Version/master Java/<branch-name>", "color: #1890ff; border-radius: 2px; padding: 0 4px; border: 1px solid #1890ff; background: #f9fcff")</script></body></html>

4
start/src/main/resources/templates/primeport/static/js/745.8d29bff9db591207737c.js → start/src/main/resources/templates/primeport/static/js/745.6424c1e7b93a41a016b6.js
View File

File diff suppressed because one or more lines are too long

0
start/src/main/resources/templates/primeport/static/js/745.8d29bff9db591207737c.js.LICENSE.txt → start/src/main/resources/templates/primeport/static/js/745.6424c1e7b93a41a016b6.js.LICENSE.txt
View File

2
start/src/main/resources/templates/primeport/static/js/main.ab5bf21aa2eef1348d91.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.ab5bf21aa2eef1348d91.js.LICENSE.txt Normal file
View File

@ -0,0 +1 @@
/*! regenerator-runtime -- Copyright (c) 2014-present, Facebook, Inc. -- license (MIT): https://github.com/babel/babel/blob/main/packages/babel-helpers/LICENSE */

2
start/src/main/resources/templates/primeport/static/package.json
View File

@ -34,7 +34,7 @@
"react": "^18.2.0", "react": "^18.2.0",
"react-dom": "^18.2.0", "react-dom": "^18.2.0",
"react-signature-canvas": "^1.1.0-alpha.2", "react-signature-canvas": "^1.1.0-alpha.2",
"zy-react-library": "^1.2.10" "zy-react-library": "^1.2.31"
}, },
"devDependencies": { "devDependencies": {
"@antfu/eslint-config": "^5.4.1", "@antfu/eslint-config": "^5.4.1",

5
web-adapter/src/main/java/com/zcloud/primeport/web/PersonApplyController.java
View File

@ -44,7 +44,12 @@ public class PersonApplyController {
} }
return personApplyService.xgfPersonPermissionsList(qry); return personApplyService.xgfPersonPermissionsList(qry);
} }
@ApiOperation("相关方-人员权限记录-详情")
@GetMapping("/xgfPersonPermissionsInfo/{id}")
public SingleResponse<PersonApplyCO> xgfPersonPermissionsInfo(@PathVariable("id") Long id) {
return personApplyService.xgfPersonPermissionsInfo(id);
}
@ApiOperation("相关方-人员申请-详情") @ApiOperation("相关方-人员申请-详情")
@GetMapping("/xgfPersonApplyInfoById/{id}") @GetMapping("/xgfPersonApplyInfoById/{id}")
public SingleResponse<XgfPersonApplyCO> xgfPersonApplyInfoById(@PathVariable("id") Long id) { public SingleResponse<XgfPersonApplyCO> xgfPersonApplyInfoById(@PathVariable("id") Long id) {

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

@ -23,6 +23,7 @@ public interface PersonApplyCoConvertor {
* @param personApplyDOs * @param personApplyDOs
* @return * @return
*/ */
PersonApplyCO converDOToCO(PersonApplyDO personApplyDO);
List<PersonApplyCO> converDOsToCOs(List<PersonApplyDO> personApplyDOs); List<PersonApplyCO> converDOsToCOs(List<PersonApplyDO> personApplyDOs);
List<XgfPersonCountCO> converDOsToXgfCOs(List<PersonApplyDO> personApplyDOs); List<XgfPersonCountCO> converDOsToXgfCOs(List<PersonApplyDO> personApplyDOs);

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

@ -1,6 +1,7 @@
package com.zcloud.primeport.command.query; package com.zcloud.primeport.command.query;
import com.alibaba.cola.dto.PageResponse; import com.alibaba.cola.dto.PageResponse;
import com.alibaba.cola.dto.SingleResponse;
import com.jjb.saas.framework.auth.utils.AuthContext; import com.jjb.saas.framework.auth.utils.AuthContext;
import com.zcloud.gbscommon.utils.PageQueryHelper; import com.zcloud.gbscommon.utils.PageQueryHelper;
import com.zcloud.primeport.command.convertor.PersonApplyCoConvertor; import com.zcloud.primeport.command.convertor.PersonApplyCoConvertor;
@ -120,5 +121,9 @@ public class PersonApplyQueryExe {
return PageResponse.of(examCenterCOS, pageResponse.getTotalCount(), pageResponse.getPageSize(), pageResponse.getPageIndex()); return PageResponse.of(examCenterCOS, pageResponse.getTotalCount(), pageResponse.getPageSize(), pageResponse.getPageIndex());
} }
public SingleResponse<PersonApplyCO> xgfPersonPermissionsInfo(Long id) {
return SingleResponse.of(personApplyCoConvertor.converDOToCO(personApplyRepository.xgfPersonPermissionsInfo(id)));
}
} }

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

@ -119,5 +119,10 @@ public class PersonApplyServiceImpl implements PersonApplyServiceI {
personApplyUpdateExe.xgfPersonAuthorization(cmd); personApplyUpdateExe.xgfPersonAuthorization(cmd);
} }
@Override
public SingleResponse<PersonApplyCO> xgfPersonPermissionsInfo(Long id) {
return personApplyQueryExe.xgfPersonPermissionsInfo(id);
}
} }

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

@ -46,5 +46,7 @@ public interface PersonApplyServiceI {
PageResponse<XgfPersonCountCO> xgfPersonnelVehicleManagementList(PersonCountPageQry qry); PageResponse<XgfPersonCountCO> xgfPersonnelVehicleManagementList(PersonCountPageQry qry);
void xgfPersonAuthorization(PersonAuthCmd cmd); void xgfPersonAuthorization(PersonAuthCmd cmd);
SingleResponse<PersonApplyCO> xgfPersonPermissionsInfo(Long id);
} }

2
web-infrastructure/src/main/java/com/zcloud/primeport/persistence/mapper/PersonApplyMapper.java
View File

@ -31,5 +31,7 @@ public interface PersonApplyMapper extends BaseMapper<PersonApplyDO> {
IPage<PersonApplyDO> xgfPersonPermissionsList(Page<Map<String, Object>> page, @Param("params") Map<String, Object> params, String menuPerms); IPage<PersonApplyDO> xgfPersonPermissionsList(Page<Map<String, Object>> page, @Param("params") Map<String, Object> params, String menuPerms);
IPage<PersonApplyDO> xgfPersonnelVehicleManagementList(Page<Map<String, Object>> page, Map<String, Object> params, String menuPerms); IPage<PersonApplyDO> xgfPersonnelVehicleManagementList(Page<Map<String, Object>> page, Map<String, Object> params, String menuPerms);
PersonApplyDO xgfPersonPermissionsInfo(Long id);
} }

2
web-infrastructure/src/main/java/com/zcloud/primeport/persistence/repository/PersonApplyRepository.java
View File

@ -17,5 +17,7 @@ public interface PersonApplyRepository extends BaseRepository<PersonApplyDO> {
PageResponse<PersonApplyDO> xgfPersonPermissionsList(Map<String, Object> params); PageResponse<PersonApplyDO> xgfPersonPermissionsList(Map<String, Object> params);
PageResponse<PersonApplyDO> xgfPersonnelVehicleManagementList(Map<String, Object> parmas); PageResponse<PersonApplyDO> xgfPersonnelVehicleManagementList(Map<String, Object> parmas);
PersonApplyDO xgfPersonPermissionsInfo(Long id);
} }

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

@ -67,5 +67,10 @@ public class PersonApplyRepositoryImpl extends BaseRepositoryImpl<PersonApplyMap
IPage<PersonApplyDO> result = personApplyMapper.xgfPersonnelVehicleManagementList(page, params, menuPerms); IPage<PersonApplyDO> result = personApplyMapper.xgfPersonnelVehicleManagementList(page, params, menuPerms);
return PageHelper.pageToResponse(result, result.getRecords()); return PageHelper.pageToResponse(result, result.getRecords());
} }
@Override
public PersonApplyDO xgfPersonPermissionsInfo(Long id) {
return personApplyMapper.xgfPersonPermissionsInfo(id);
}
} }

40
web-infrastructure/src/main/resources/mapper/PersonApplyDO.xml
View File

@ -42,7 +42,7 @@
xap.audit_flag = 2 AND xap.audit_flag = 2 AND
pa.person_corp_id = #{params.applyCorpId} pa.person_corp_id = #{params.applyCorpId}
<if test="params.employeePersonUserName != null and params.employeePersonUserName != ''"> <if test="params.employeePersonUserName != null and params.employeePersonUserName != ''">
AND xap.employee_person_user_name LIKE CONCAT('%', #{params.employeePersonUserName}, '%') AND pa.employee_person_user_name LIKE CONCAT('%', #{params.employeePersonUserName}, '%')
</if> </if>
<if test="params.projectName != null and params.projectName != ''"> <if test="params.projectName != null and params.projectName != ''">
AND xap.project_name like CONCAT('%', #{params.projectName}, '%') AND xap.project_name like CONCAT('%', #{params.projectName}, '%')
@ -66,6 +66,44 @@
GROUP BY GROUP BY
c.id c.id
</select> </select>
<select id="xgfPersonPermissionsInfo"
resultType="com.zcloud.primeport.persistence.dataobject.PersonApplyDO">
SELECT
pa.id,
pa.xgf_apply_person_id,
pa.mkmj_permission,
pa.person_corp_id,
pa.person_corp_name,
pa.person_department_id,
pa.person_department_name,
pa.employee_person_user_id,
pa.employee_person_user_name,
pa.user_face_url,
pa.user_phone,
pa.user_card,
xap.gate_level_auth_area,
xap.visit_start_time,
xap.visit_end_time,
xap.project_name,
xap.audit_user_id,
xap.audit_user_name,
xap.audit_dept_id,
xap.audit_dept_name,
xap.audit_corp_id,
xap.audit_corp_name,
xap.audit_time
FROM
person_apply AS pa
LEFT JOIN
xgf_apply_person AS xap
ON
pa.xgf_apply_person_id = xap.id
WHERE
pa.delete_enum = 'FALSE' AND
xap.audit_flag = 2 AND
pa.id = #{id}
</select>
</mapper> </mapper>