From af5ec666f163bbbaa04ec9f320840cf65e4d0e6d Mon Sep 17 00:00:00 2001 From: dearLin <1261008090@qq.com> Date: Fri, 27 Mar 2026 11:42:14 +0800 Subject: [PATCH] =?UTF-8?q?feat=EF=BC=9A=E7=9B=B8=E5=85=B3=E6=96=B9?= =?UTF-8?q?=E4=BA=BA=E5=91=98=E7=94=B3=E8=AF=B7=E9=80=9A=E8=BF=87=E8=BF=87?= =?UTF-8?q?=E8=BF=9B=E5=87=BA=E6=B8=AF=E6=9D=83=E9=99=90=E6=98=BE=E7=A4=BA?= =?UTF-8?q?=E4=B8=8D=E5=AF=B9=E7=9A=84bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/resources/templates/primeport.html | 4 +- .../primeport/web/PersonApplyController.java | 10 ++++- .../command/PersonApplyUpdateExe.java | 11 ++++++ .../primeport/command/VehicleApplyAddExe.java | 9 ++++- .../command/query/PersonApplyQueryExe.java | 1 - .../service/PersonApplyServiceImpl.java | 7 ++++ .../primeport/api/PersonApplyServiceI.java | 2 + .../primeport/dto/XgfApplyPersonPageQry.java | 1 + .../dto/clientobject/PersonApplyCO.java | 2 +- .../gatewayimpl/PersonApplyGatewayImpl.java | 4 +- .../main/resources/mapper/PersonApplyDO.xml | 37 ++++--------------- .../main/resources/mapper/VehicleApplyDO.xml | 2 +- 12 files changed, 52 insertions(+), 38 deletions(-) diff --git a/start/src/main/resources/templates/primeport.html b/start/src/main/resources/templates/primeport.html index 23671e2..f554435 100644 --- a/start/src/main/resources/templates/primeport.html +++ b/start/src/main/resources/templates/primeport.html @@ -1,4 +1,4 @@ ---
\ No newline at end of file + })();
\ No newline at end of file diff --git a/web-adapter/src/main/java/com/zcloud/primeport/web/PersonApplyController.java b/web-adapter/src/main/java/com/zcloud/primeport/web/PersonApplyController.java index 6a214ba..f8cd8c7 100644 --- a/web-adapter/src/main/java/com/zcloud/primeport/web/PersonApplyController.java +++ b/web-adapter/src/main/java/com/zcloud/primeport/web/PersonApplyController.java @@ -39,6 +39,9 @@ public class PersonApplyController { @ApiOperation("相关方-人员权限记录-列表") @PostMapping("/xgfPersonPermissionsList") public PageResponse xgfPersonPermissionsList(@RequestBody XgfApplyPersonPageQry qry) { + if (qry.getApplyCorpId() == null) { + qry.setApplyCorpId(AuthContext.getTenantId()); + } return personApplyService.xgfPersonPermissionsList(qry); } @@ -112,7 +115,12 @@ public class PersonApplyController { } return personApplyService.personnelVehicleManagementList(qry); } - + @ApiOperation("相关方-人员授权") + @PostMapping("/xgfPersonAuthorization") + public Response xgfPersonAuthorization(@RequestBody PersonAuthCmd cmd) { + personApplyService.xgfPersonAuthorization(cmd); + return Response.buildSuccess(); + } @ApiOperation("股份，分公司-人员授权") @PostMapping("/authorization") public Response authorization(@RequestBody PersonAuthCmd cmd) { diff --git a/web-app/src/main/java/com/zcloud/primeport/command/PersonApplyUpdateExe.java b/web-app/src/main/java/com/zcloud/primeport/command/PersonApplyUpdateExe.java index 441eec4..323c83e 100644 --- a/web-app/src/main/java/com/zcloud/primeport/command/PersonApplyUpdateExe.java +++ b/web-app/src/main/java/com/zcloud/primeport/command/PersonApplyUpdateExe.java @@ -7,6 +7,7 @@ import com.zcloud.primeport.domain.gateway.XgfApplyPersonGateway; import com.zcloud.primeport.domain.model.PersonApplyE; import com.zcloud.primeport.domain.model.XgfApplyPersonE; import com.zcloud.primeport.dto.PersonApplyUpdateCmd; +import com.zcloud.primeport.dto.PersonAuthCmd; import com.zcloud.primeport.dto.XgfPersonApplyAuditCmd; import lombok.AllArgsConstructor; import org.springframework.beans.BeanUtils; @@ -38,6 +39,7 @@ public class PersonApplyUpdateExe { throw new BizException("修改失败"); } } + @Transactional(rollbackFor = Exception.class) public void xgfPersonAudit(XgfPersonApplyAuditCmd cmd) { XgfApplyPersonE build = XgfApplyPersonE.builder() @@ -47,6 +49,7 @@ public class PersonApplyUpdateExe { personApplyGateway.xgfPersonAudit(build); } + @Transactional(rollbackFor = Exception.class) public void authorization(Long applyPersonId, Long XgfApplyPersonId, Integer mkmjPermission, String gate) { PersonApplyE personApplyE = new PersonApplyE(); personApplyE.setId(applyPersonId); @@ -57,5 +60,13 @@ public class PersonApplyUpdateExe { xgfApplyPersonE.setGateLevelAuthArea(gate); 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); + } } diff --git a/web-app/src/main/java/com/zcloud/primeport/command/VehicleApplyAddExe.java b/web-app/src/main/java/com/zcloud/primeport/command/VehicleApplyAddExe.java index ae28ec9..4180983 100644 --- a/web-app/src/main/java/com/zcloud/primeport/command/VehicleApplyAddExe.java +++ b/web-app/src/main/java/com/zcloud/primeport/command/VehicleApplyAddExe.java @@ -48,7 +48,8 @@ public class VehicleApplyAddExe { examTypeE.setAuditFlag(AuditEnum.WAITING.getCode()); // 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); if (cmd.getEmployeeVehicleUserId() == null) { 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); VehicleAuditE build = VehicleAuditE.builder().vehicleApplyId(examTypeE.getId()).batchState(1).batchType(1) .auditUserId(examTypeE.getAuditUserId()) diff --git a/web-app/src/main/java/com/zcloud/primeport/command/query/PersonApplyQueryExe.java b/web-app/src/main/java/com/zcloud/primeport/command/query/PersonApplyQueryExe.java index 5900836..f33d2e4 100644 --- a/web-app/src/main/java/com/zcloud/primeport/command/query/PersonApplyQueryExe.java +++ b/web-app/src/main/java/com/zcloud/primeport/command/query/PersonApplyQueryExe.java @@ -107,7 +107,6 @@ public class PersonApplyQueryExe { public PageResponse xgfPersonPermissionsList(XgfApplyPersonPageQry qry) { Map parmas = PageQueryHelper.toHashMap(qry); - parmas.put("applyCorpId", AuthContext.getTenantId()); PageResponse pageResponse = personApplyRepository.xgfPersonPermissionsList(parmas); List examCenterCOS = personApplyCoConvertor.converDOsToCOs(pageResponse.getData()); diff --git a/web-app/src/main/java/com/zcloud/primeport/service/PersonApplyServiceImpl.java b/web-app/src/main/java/com/zcloud/primeport/service/PersonApplyServiceImpl.java index 4e6f6da..92d8069 100644 --- a/web-app/src/main/java/com/zcloud/primeport/service/PersonApplyServiceImpl.java +++ b/web-app/src/main/java/com/zcloud/primeport/service/PersonApplyServiceImpl.java @@ -7,6 +7,7 @@ import com.zcloud.primeport.command.PersonApplyAddExe; import com.zcloud.primeport.command.PersonApplyRemoveExe; import com.zcloud.primeport.command.PersonApplyUpdateExe; import com.zcloud.primeport.command.query.PersonApplyQueryExe; +import com.zcloud.primeport.domain.model.PersonApplyE; import com.zcloud.primeport.dto.*; import com.zcloud.primeport.dto.clientobject.PersonApplyCO; import com.zcloud.primeport.dto.clientobject.PersonCountCO; @@ -112,5 +113,11 @@ public class PersonApplyServiceImpl implements PersonApplyServiceI { public PageResponse xgfPersonnelVehicleManagementList(PersonCountPageQry qry) { return personApplyQueryExe.xgfPersonnelVehicleManagementList(qry); } + + @Override + public void xgfPersonAuthorization(PersonAuthCmd cmd) { + + personApplyUpdateExe.xgfPersonAuthorization(cmd); + } } diff --git a/web-client/src/main/java/com/zcloud/primeport/api/PersonApplyServiceI.java b/web-client/src/main/java/com/zcloud/primeport/api/PersonApplyServiceI.java index 0d99e80..e1961de 100644 --- a/web-client/src/main/java/com/zcloud/primeport/api/PersonApplyServiceI.java +++ b/web-client/src/main/java/com/zcloud/primeport/api/PersonApplyServiceI.java @@ -44,5 +44,7 @@ public interface PersonApplyServiceI { PageResponse xgfPersonPermissionsList(XgfApplyPersonPageQry qry); PageResponse xgfPersonnelVehicleManagementList(PersonCountPageQry qry); + + void xgfPersonAuthorization(PersonAuthCmd cmd); } diff --git a/web-client/src/main/java/com/zcloud/primeport/dto/XgfApplyPersonPageQry.java b/web-client/src/main/java/com/zcloud/primeport/dto/XgfApplyPersonPageQry.java index c5fc103..a0af235 100644 --- a/web-client/src/main/java/com/zcloud/primeport/dto/XgfApplyPersonPageQry.java +++ b/web-client/src/main/java/com/zcloud/primeport/dto/XgfApplyPersonPageQry.java @@ -29,6 +29,7 @@ public class XgfApplyPersonPageQry extends PageQuery { @ApiModelProperty(name = "employeePersonUserName", value = "姓名") private String employeePersonUserName; private String menuPath; + private Long applyCorpId; } diff --git a/web-client/src/main/java/com/zcloud/primeport/dto/clientobject/PersonApplyCO.java b/web-client/src/main/java/com/zcloud/primeport/dto/clientobject/PersonApplyCO.java index 3a42bc4..fff5202 100644 --- a/web-client/src/main/java/com/zcloud/primeport/dto/clientobject/PersonApplyCO.java +++ b/web-client/src/main/java/com/zcloud/primeport/dto/clientobject/PersonApplyCO.java @@ -74,7 +74,7 @@ public class PersonApplyCO extends ClientObject { @ApiModelProperty(value = "当前用户是否能审核。1，能审核2不能审核", name = "currentUserCanAudit") private Integer currentUserCanAudit; - + private Integer mkmjPermission; @ApiModelProperty(value = "授权范围港区与区域",name = "gateLevelAuthArea") private String gateLevelAuthArea; diff --git a/web-infrastructure/src/main/java/com/zcloud/primeport/gatewayimpl/PersonApplyGatewayImpl.java b/web-infrastructure/src/main/java/com/zcloud/primeport/gatewayimpl/PersonApplyGatewayImpl.java index dfedfaa..8937ead 100644 --- a/web-infrastructure/src/main/java/com/zcloud/primeport/gatewayimpl/PersonApplyGatewayImpl.java +++ b/web-infrastructure/src/main/java/com/zcloud/primeport/gatewayimpl/PersonApplyGatewayImpl.java @@ -75,8 +75,8 @@ public class PersonApplyGatewayImpl implements PersonApplyGateway { BeanUtils.copyProperties(build, d); xgfApplyPersonRepository.updateById(d); UpdateWrapper objectQueryWrapper = new UpdateWrapper<>(); - objectQueryWrapper.set("mkmj_permission",2); - objectQueryWrapper.eq("xgf_apply_person_id",d.getId()); + objectQueryWrapper.set("mkmj_permission", build.getAuditFlag().equals(2) ? 1 : 2); + objectQueryWrapper.eq("xgf_apply_person_id", d.getId()); personApplyRepository.update(objectQueryWrapper); if (build.getAuditFlag().equals(2)) { // 审核通过后添加人员信息 diff --git a/web-infrastructure/src/main/resources/mapper/PersonApplyDO.xml b/web-infrastructure/src/main/resources/mapper/PersonApplyDO.xml index 621cc82..08f9540 100644 --- a/web-infrastructure/src/main/resources/mapper/PersonApplyDO.xml +++ b/web-infrastructure/src/main/resources/mapper/PersonApplyDO.xml @@ -54,38 +54,17 @@ diff --git a/web-infrastructure/src/main/resources/mapper/VehicleApplyDO.xml b/web-infrastructure/src/main/resources/mapper/VehicleApplyDO.xml index d94e4fa..9f6a4fa 100644 --- a/web-infrastructure/src/main/resources/mapper/VehicleApplyDO.xml +++ b/web-infrastructure/src/main/resources/mapper/VehicleApplyDO.xml @@ -129,7 +129,7 @@ WHERE c.delete_enum = 'FALSE' - AND c.type IN ( 0,1,2,6 ) + AND c.type IN ( 0,1,6 ) AND c.type = 5