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

feat：相关方人员申请通过过进出港权限显示不对的bug

koumen
dearLin 2026-03-27 11:42:14 +08:00
parent 67dd0c63be
commit af5ec666f1
12 changed files with 52 additions and 38 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/3/26 17:31:08) 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/3/27 10:22:35) 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.01fcf9a90d6e6463589b.js"></script><script defer="defer" src="/primeport/static/js/745.1a4c36b2a5f096849a4e.js"></script><script defer="defer" src="/primeport/static/js/main.b81c1c238dcfb58ea4c8.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/3/26 17:31:08) 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.6c11d239e0f8b46a1914.js"></script><script defer="defer" src="/primeport/static/js/main.6c040d8c06cc147a531a.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/3/27 10:22:35) App/primeport Version/master Java/<branch-name>", "color: #1890ff; border-radius: 2px; padding: 0 4px; border: 1px solid #1890ff; background: #f9fcff")</script></body></html>

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

@ -39,6 +39,9 @@ public class PersonApplyController {
@ApiOperation("相关方-人员权限记录-列表") @ApiOperation("相关方-人员权限记录-列表")
@PostMapping("/xgfPersonPermissionsList") @PostMapping("/xgfPersonPermissionsList")
public PageResponse<PersonApplyCO> xgfPersonPermissionsList(@RequestBody XgfApplyPersonPageQry qry) { public PageResponse<PersonApplyCO> xgfPersonPermissionsList(@RequestBody XgfApplyPersonPageQry qry) {
if (qry.getApplyCorpId() == null) {
qry.setApplyCorpId(AuthContext.getTenantId());
}
return personApplyService.xgfPersonPermissionsList(qry); return personApplyService.xgfPersonPermissionsList(qry);
} }
@ -112,7 +115,12 @@ public class PersonApplyController {
} }
return personApplyService.personnelVehicleManagementList(qry); return personApplyService.personnelVehicleManagementList(qry);
} }
@ApiOperation("相关方-人员授权")
@PostMapping("/xgfPersonAuthorization")
public Response xgfPersonAuthorization(@RequestBody PersonAuthCmd cmd) {
personApplyService.xgfPersonAuthorization(cmd);
return Response.buildSuccess();
}
@ApiOperation("股份，分公司-人员授权") @ApiOperation("股份，分公司-人员授权")
@PostMapping("/authorization") @PostMapping("/authorization")
public Response authorization(@RequestBody PersonAuthCmd cmd) { public Response authorization(@RequestBody PersonAuthCmd cmd) {

11
web-app/src/main/java/com/zcloud/primeport/command/PersonApplyUpdateExe.java
View File

@ -7,6 +7,7 @@ import com.zcloud.primeport.domain.gateway.XgfApplyPersonGateway;
import com.zcloud.primeport.domain.model.PersonApplyE; import com.zcloud.primeport.domain.model.PersonApplyE;
import com.zcloud.primeport.domain.model.XgfApplyPersonE; import com.zcloud.primeport.domain.model.XgfApplyPersonE;
import com.zcloud.primeport.dto.PersonApplyUpdateCmd; import com.zcloud.primeport.dto.PersonApplyUpdateCmd;
import com.zcloud.primeport.dto.PersonAuthCmd;
import com.zcloud.primeport.dto.XgfPersonApplyAuditCmd; import com.zcloud.primeport.dto.XgfPersonApplyAuditCmd;
import lombok.AllArgsConstructor; import lombok.AllArgsConstructor;
import org.springframework.beans.BeanUtils; import org.springframework.beans.BeanUtils;
@ -38,6 +39,7 @@ public class PersonApplyUpdateExe {
throw new BizException("修改失败"); throw new BizException("修改失败");
} }
} }
@Transactional(rollbackFor = Exception.class)
public void xgfPersonAudit(XgfPersonApplyAuditCmd cmd) { public void xgfPersonAudit(XgfPersonApplyAuditCmd cmd) {
XgfApplyPersonE build = XgfApplyPersonE.builder() XgfApplyPersonE build = XgfApplyPersonE.builder()
@ -47,6 +49,7 @@ public class PersonApplyUpdateExe {
personApplyGateway.xgfPersonAudit(build); personApplyGateway.xgfPersonAudit(build);
} }
@Transactional(rollbackFor = Exception.class)
public void authorization(Long applyPersonId, Long XgfApplyPersonId, Integer mkmjPermission, String gate) { public void authorization(Long applyPersonId, Long XgfApplyPersonId, Integer mkmjPermission, String gate) {
PersonApplyE personApplyE = new PersonApplyE(); PersonApplyE personApplyE = new PersonApplyE();
personApplyE.setId(applyPersonId); personApplyE.setId(applyPersonId);
@ -57,5 +60,13 @@ public class PersonApplyUpdateExe {
xgfApplyPersonE.setGateLevelAuthArea(gate); xgfApplyPersonE.setGateLevelAuthArea(gate);
xgfApplyPersonGateway.update(xgfApplyPersonE); xgfApplyPersonGateway.update(xgfApplyPersonE);
} }
@Transactional(rollbackFor = Exception.class)
public void xgfPersonAuthorization(PersonAuthCmd cmd) {
PersonApplyE personApplyE = new PersonApplyE();
personApplyE.setId(cmd.getApplyPersonId());
personApplyE.setMkmjPermission(cmd.getMkmjPermission());
personApplyGateway.update(personApplyE);
}
} }

9
web-app/src/main/java/com/zcloud/primeport/command/VehicleApplyAddExe.java
View File

@ -48,7 +48,8 @@ public class VehicleApplyAddExe {
examTypeE.setAuditFlag(AuditEnum.WAITING.getCode()); examTypeE.setAuditFlag(AuditEnum.WAITING.getCode());
// examTypeE.setApplyTime(DateUtil.date2Str(new Date())); // examTypeE.setApplyTime(DateUtil.date2Str(new Date()));
// 股份、分公司个人车辆 // 股份、分公司个人车辆
if (cmd.getVehicleBelongType().equals(VehicleBelongTypeEnum.JGD_PRI_VEHICLES.getCode()) || cmd.getVehicleBelongType().equals(VehicleBelongTypeEnum.FGS_PRI_VEHICLES.getCode())) { if (cmd.getVehicleBelongType().equals(VehicleBelongTypeEnum.JGD_PRI_VEHICLES.getCode())
|| cmd.getVehicleBelongType().equals(VehicleBelongTypeEnum.FGS_PRI_VEHICLES.getCode())) {
examTypeE.setMkmjPermission(1); examTypeE.setMkmjPermission(1);
if (cmd.getEmployeeVehicleUserId() == null) { if (cmd.getEmployeeVehicleUserId() == null) {
SSOUser user = AuthContext.getCurrentUser(); SSOUser user = AuthContext.getCurrentUser();
@ -62,6 +63,12 @@ public class VehicleApplyAddExe {
} }
} }
} }
if (cmd.getVehicleBelongType().equals(VehicleBelongTypeEnum.XGF_VEHICLES.getCode())){
// 相关方车辆
SSOUser user = AuthContext.getCurrentUser();
examTypeE.setVehicleCorpId(user.getTenantId());
examTypeE.setVehicleCorpName(user.getTenantName());
}
VehicleApplyE add = vehicleApplyGateway.add(examTypeE); VehicleApplyE add = vehicleApplyGateway.add(examTypeE);
VehicleAuditE build = VehicleAuditE.builder().vehicleApplyId(examTypeE.getId()).batchState(1).batchType(1) VehicleAuditE build = VehicleAuditE.builder().vehicleApplyId(examTypeE.getId()).batchState(1).batchType(1)
.auditUserId(examTypeE.getAuditUserId()) .auditUserId(examTypeE.getAuditUserId())

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

@ -107,7 +107,6 @@ public class PersonApplyQueryExe {
public PageResponse<PersonApplyCO> xgfPersonPermissionsList(XgfApplyPersonPageQry qry) { public PageResponse<PersonApplyCO> xgfPersonPermissionsList(XgfApplyPersonPageQry qry) {
Map<String, Object> parmas = PageQueryHelper.toHashMap(qry); Map<String, Object> parmas = PageQueryHelper.toHashMap(qry);
parmas.put("applyCorpId", AuthContext.getTenantId());
PageResponse<PersonApplyDO> pageResponse = personApplyRepository.xgfPersonPermissionsList(parmas); PageResponse<PersonApplyDO> pageResponse = personApplyRepository.xgfPersonPermissionsList(parmas);
List<PersonApplyCO> examCenterCOS = personApplyCoConvertor.converDOsToCOs(pageResponse.getData()); List<PersonApplyCO> examCenterCOS = personApplyCoConvertor.converDOsToCOs(pageResponse.getData());

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

@ -7,6 +7,7 @@ import com.zcloud.primeport.command.PersonApplyAddExe;
import com.zcloud.primeport.command.PersonApplyRemoveExe; import com.zcloud.primeport.command.PersonApplyRemoveExe;
import com.zcloud.primeport.command.PersonApplyUpdateExe; import com.zcloud.primeport.command.PersonApplyUpdateExe;
import com.zcloud.primeport.command.query.PersonApplyQueryExe; import com.zcloud.primeport.command.query.PersonApplyQueryExe;
import com.zcloud.primeport.domain.model.PersonApplyE;
import com.zcloud.primeport.dto.*; import com.zcloud.primeport.dto.*;
import com.zcloud.primeport.dto.clientobject.PersonApplyCO; import com.zcloud.primeport.dto.clientobject.PersonApplyCO;
import com.zcloud.primeport.dto.clientobject.PersonCountCO; import com.zcloud.primeport.dto.clientobject.PersonCountCO;
@ -112,5 +113,11 @@ public class PersonApplyServiceImpl implements PersonApplyServiceI {
public PageResponse<XgfPersonCountCO> xgfPersonnelVehicleManagementList(PersonCountPageQry qry) { public PageResponse<XgfPersonCountCO> xgfPersonnelVehicleManagementList(PersonCountPageQry qry) {
return personApplyQueryExe.xgfPersonnelVehicleManagementList(qry); return personApplyQueryExe.xgfPersonnelVehicleManagementList(qry);
} }
@Override
public void xgfPersonAuthorization(PersonAuthCmd cmd) {
personApplyUpdateExe.xgfPersonAuthorization(cmd);
}
} }

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

@ -44,5 +44,7 @@ public interface PersonApplyServiceI {
PageResponse<PersonApplyCO> xgfPersonPermissionsList(XgfApplyPersonPageQry qry); PageResponse<PersonApplyCO> xgfPersonPermissionsList(XgfApplyPersonPageQry qry);
PageResponse<XgfPersonCountCO> xgfPersonnelVehicleManagementList(PersonCountPageQry qry); PageResponse<XgfPersonCountCO> xgfPersonnelVehicleManagementList(PersonCountPageQry qry);
void xgfPersonAuthorization(PersonAuthCmd cmd);
} }

1
web-client/src/main/java/com/zcloud/primeport/dto/XgfApplyPersonPageQry.java
View File

@ -29,6 +29,7 @@ public class XgfApplyPersonPageQry extends PageQuery {
@ApiModelProperty(name = "employeePersonUserName", value = "姓名") @ApiModelProperty(name = "employeePersonUserName", value = "姓名")
private String employeePersonUserName; private String employeePersonUserName;
private String menuPath; private String menuPath;
private Long applyCorpId;
} }

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

@ -74,7 +74,7 @@ public class PersonApplyCO extends ClientObject {
@ApiModelProperty(value = "当前用户是否能审核。1，能审核2不能审核", name = "currentUserCanAudit") @ApiModelProperty(value = "当前用户是否能审核。1，能审核2不能审核", name = "currentUserCanAudit")
private Integer currentUserCanAudit; private Integer currentUserCanAudit;
private Integer mkmjPermission;
@ApiModelProperty(value = "授权范围港区与区域",name = "gateLevelAuthArea") @ApiModelProperty(value = "授权范围港区与区域",name = "gateLevelAuthArea")
private String gateLevelAuthArea; private String gateLevelAuthArea;

2
web-infrastructure/src/main/java/com/zcloud/primeport/gatewayimpl/PersonApplyGatewayImpl.java
View File

@ -75,7 +75,7 @@ public class PersonApplyGatewayImpl implements PersonApplyGateway {
BeanUtils.copyProperties(build, d); BeanUtils.copyProperties(build, d);
xgfApplyPersonRepository.updateById(d); xgfApplyPersonRepository.updateById(d);
UpdateWrapper<PersonApplyDO> objectQueryWrapper = new UpdateWrapper<>(); UpdateWrapper<PersonApplyDO> objectQueryWrapper = new UpdateWrapper<>();
objectQueryWrapper.set("mkmj_permission",2); objectQueryWrapper.set("mkmj_permission", build.getAuditFlag().equals(2) ? 1 : 2);
objectQueryWrapper.eq("xgf_apply_person_id", d.getId()); objectQueryWrapper.eq("xgf_apply_person_id", d.getId());
personApplyRepository.update(objectQueryWrapper); personApplyRepository.update(objectQueryWrapper);
if (build.getAuditFlag().equals(2)) { if (build.getAuditFlag().equals(2)) {

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

@ -54,38 +54,17 @@
<select id="xgfPersonnelVehicleManagementList" <select id="xgfPersonnelVehicleManagementList"
resultType="com.zcloud.primeport.persistence.dataobject.PersonApplyDO"> resultType="com.zcloud.primeport.persistence.dataobject.PersonApplyDO">
SELECT SELECT
apply_corp_id, c.id apply_corp_id,
c.corp_name apply_corp_name, c.corp_name apply_corp_name,
SUM( tmp.project_count ) project_count IFNULL( SUM( vxc.project_count ), 0 ) project_count
FROM FROM
( corp_info c
SELECT LEFT JOIN vi_xgf_count vxc ON c.id = vxc.apply_corp_id
'person' type,
xap.apply_corp_id,
COUNT( DISTINCT xap.project_id ) project_count
FROM
xgf_apply_person xap
WHERE WHERE
xap.person_belong_type = 3 c.delete_enum = 'FALSE'
AND xap.delete_enum = 'FALSE' and c.type = 3
GROUP BY GROUP BY
xap.apply_corp_id UNION ALL c.id
SELECT
'car' type,
va.vehicle_corp_id apply_corp_id,
COUNT( DISTINCT va.project_id ) project_count
FROM
vehicle_apply va
WHERE
va.vehicle_belong_type = 5
AND va.delete_enum = 'FALSE'
GROUP BY
va.vehicle_corp_id
) tmp
LEFT JOIN corp_info c on tmp.apply_corp_id = c.id
where 1 = 1
GROUP BY
tmp.apply_corp_id;
</select> </select>
</mapper> </mapper>

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

@ -129,7 +129,7 @@
WHERE WHERE
c.delete_enum = 'FALSE' c.delete_enum = 'FALSE'
<if test="params.corpType != null"> <if test="params.corpType != null">
<if test="params.corpType == 1"> AND c.type IN ( 0,1,2,6 ) </if> <if test="params.corpType == 1"> AND c.type IN ( 0,1,6 ) </if>
<if test="params.corpType == 2"> AND c.type = 5 </if> <if test="params.corpType == 2"> AND c.type = 5 </if>
</if> </if>
<if test="params.corpName != null and params.corpName != ''"> <if test="params.corpName != null and params.corpName != ''">