diff --git a/start/src/main/resources/sdk.yml b/start/src/main/resources/sdk.yml index c722eb2..4cdc71c 100644 --- a/start/src/main/resources/sdk.yml +++ b/start/src/main/resources/sdk.yml @@ -28,6 +28,18 @@ sdk: uri: http://jjb-saas-base path: /${application.gateway}/container/** order: -2 + - client: + system-code: ${application.name}-h5 + name: ${application.cn-name}-h5-前端 + group-code: public_api + service: + system-code: ${application.name}-h5 + name: ${application.cn-name}-h5-前端 + group-code: public_api + strip-prefix: 0 + uri: http://${application.name} + path: /${application.gateway}-h5/** + order: -3 openapi: appId: 1871106785124999168 appKey: 7314ecfc11ff4d5fad1ac19284ed2ac3 diff --git a/start/src/main/resources/templates/primeport.html b/start/src/main/resources/templates/primeport.html index 287c478..8d8794d 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/start/src/main/resources/templates/primeport/static/package.json b/start/src/main/resources/templates/primeport/static/package.json index 182f8dd..d0c2fd0 100644 --- a/start/src/main/resources/templates/primeport/static/package.json +++ b/start/src/main/resources/templates/primeport/static/package.json @@ -34,7 +34,7 @@ "react": "^18.2.0", "react-dom": "^18.2.0", "react-signature-canvas": "^1.1.0-alpha.2", - "zy-react-library": "^1.2.8" + "zy-react-library": "^1.2.9" }, "devDependencies": { "@antfu/eslint-config": "^5.4.1", 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 8e4e4f3..6a214ba 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 @@ -13,6 +13,7 @@ import com.zcloud.primeport.dto.*; import com.zcloud.primeport.dto.clientobject.PersonApplyCO; import com.zcloud.primeport.dto.clientobject.PersonCountCO; import com.zcloud.primeport.dto.clientobject.XgfPersonApplyCO; +import com.zcloud.primeport.dto.clientobject.XgfPersonCountCO; import com.zcloud.primeport.persistence.dataobject.XgfApplyPersonDO; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; @@ -97,6 +98,12 @@ public class PersonApplyController { return SingleResponse.buildSuccess(); } + @ApiOperation("相关方人员及车辆管理-首页分页") + @GetMapping("/xgfPersonnelVehicleManagementList") + public PageResponse xgfPersonnelVehicleManagementList(PersonCountPageQry qry) { + return personApplyService.xgfPersonnelVehicleManagementList(qry); + } + @ApiOperation("股份，分公司-人员及车辆管理-分页") @GetMapping("/personnelVehicleManagementList") public PageResponse personnelVehicleManagementList(PersonCountPageQry qry) { diff --git a/web-adapter/src/main/java/com/zcloud/primeport/web/VehicleApplyController.java b/web-adapter/src/main/java/com/zcloud/primeport/web/VehicleApplyController.java index 046311f..9ef3cc4 100644 --- a/web-adapter/src/main/java/com/zcloud/primeport/web/VehicleApplyController.java +++ b/web-adapter/src/main/java/com/zcloud/primeport/web/VehicleApplyController.java @@ -109,5 +109,12 @@ public class VehicleApplyController { public PageResponse getCarByVehicleBelongType(VehicleApplyPageQry qry) { return vehicleApplyService.getCarByVehicleBelongType(qry); } + + @ApiOperation("相关方-车辆授权") + @PostMapping("/xgfCarAuthorization") + public Response xgfCarAuthorization(@RequestBody CarAuthCmd cmd) { + vehicleApplyService.xgfCarAuthorization(cmd); + return Response.buildSuccess(); + } } diff --git a/web-adapter/src/main/java/com/zcloud/primeport/web/close/ClosedAreaController.java b/web-adapter/src/main/java/com/zcloud/primeport/web/close/ClosedAreaController.java index 77bde4a..f28e530 100644 --- a/web-adapter/src/main/java/com/zcloud/primeport/web/close/ClosedAreaController.java +++ b/web-adapter/src/main/java/com/zcloud/primeport/web/close/ClosedAreaController.java @@ -58,7 +58,7 @@ public class ClosedAreaController { @ApiOperation("跟据港区选择对应的封闭区域") @GetMapping("/listAllByhgAuthArea") - public MultiResponse listAllByhgAuthArea( @RequestParam("hgAuthArea") String hgAuthArea) { + public MultiResponse listAllByhgAuthArea(@RequestParam("hgAuthArea") String hgAuthArea) { return closedAreaService.listAllByhgAuthArea(hgAuthArea); } diff --git a/web-app/src/main/java/com/zcloud/primeport/command/VehicleAuditUpdateExe.java b/web-app/src/main/java/com/zcloud/primeport/command/VehicleAuditUpdateExe.java index c6bc5f3..70f8581 100644 --- a/web-app/src/main/java/com/zcloud/primeport/command/VehicleAuditUpdateExe.java +++ b/web-app/src/main/java/com/zcloud/primeport/command/VehicleAuditUpdateExe.java @@ -47,6 +47,8 @@ public class VehicleAuditUpdateExe { VehicleApplyE vehicleApplyE = new VehicleApplyE(); vehicleApplyE.setId(cmd.getVehicleApplyId()); vehicleApplyE.setAuditFlag(cmd.getAuditStatus()); + vehicleApplyE.setMkmjPermission(1); + vehicleApplyE.setStatusFlag(2); vehicleApplyGateway.update(vehicleApplyE); vehicleAuditGateway.update(vehicleAuditE); } diff --git a/web-app/src/main/java/com/zcloud/primeport/command/convertor/PersonApplyCoConvertor.java b/web-app/src/main/java/com/zcloud/primeport/command/convertor/PersonApplyCoConvertor.java index 238c4d2..7dabd20 100644 --- a/web-app/src/main/java/com/zcloud/primeport/command/convertor/PersonApplyCoConvertor.java +++ b/web-app/src/main/java/com/zcloud/primeport/command/convertor/PersonApplyCoConvertor.java @@ -3,6 +3,7 @@ package com.zcloud.primeport.command.convertor; import com.zcloud.primeport.domain.model.PersonApplyE; import com.zcloud.primeport.dto.clientobject.PersonApplyCO; import com.zcloud.primeport.dto.clientobject.PersonCountCO; +import com.zcloud.primeport.dto.clientobject.XgfPersonCountCO; import com.zcloud.primeport.persistence.dataobject.PersonApplyDO; import com.zcloud.primeport.persistence.dataobject.PersonCountDto; import org.mapstruct.Mapper; @@ -23,6 +24,7 @@ public interface PersonApplyCoConvertor { * @return */ List converDOsToCOs(List personApplyDOs); + List converDOsToXgfCOs(List personApplyDOs); List converDtosToCOs(List data); List converEstosToCOs(List data); 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 58d9a38..88aa352 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 @@ -11,6 +11,7 @@ import com.zcloud.primeport.dto.XgfApplyPersonPageQry; import com.zcloud.primeport.dto.clientobject.PersonApplyCO; import com.zcloud.primeport.dto.clientobject.PersonCountCO; import com.zcloud.primeport.dto.clientobject.XgfPersonApplyCO; +import com.zcloud.primeport.dto.clientobject.XgfPersonCountCO; import com.zcloud.primeport.persistence.dataobject.PersonApplyDO; import com.zcloud.primeport.persistence.dataobject.PersonCountDto; import com.zcloud.primeport.persistence.dataobject.VehicleApplyDO; @@ -112,5 +113,13 @@ public class PersonApplyQueryExe { return PageResponse.of(examCenterCOS, pageResponse.getTotalCount(), pageResponse.getPageSize(), pageResponse.getPageIndex()); } + + public PageResponse xgfPersonnelVehicleManagementList(PersonCountPageQry qry) { + Map parmas = PageQueryHelper.toHashMap(qry); + PageResponse pageResponse = personApplyRepository.xgfPersonnelVehicleManagementList(parmas); + List examCenterCOS = personApplyCoConvertor.converDOsToXgfCOs(pageResponse.getData()); + return PageResponse.of(examCenterCOS, pageResponse.getTotalCount(), pageResponse.getPageSize(), pageResponse.getPageIndex()); + + } } 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 025e169..4e6f6da 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 @@ -11,6 +11,7 @@ import com.zcloud.primeport.dto.*; import com.zcloud.primeport.dto.clientobject.PersonApplyCO; import com.zcloud.primeport.dto.clientobject.PersonCountCO; import com.zcloud.primeport.dto.clientobject.XgfPersonApplyCO; +import com.zcloud.primeport.dto.clientobject.XgfPersonCountCO; import lombok.AllArgsConstructor; import org.springframework.stereotype.Service; @@ -106,5 +107,10 @@ public class PersonApplyServiceImpl implements PersonApplyServiceI { public PageResponse xgfPersonPermissionsList(XgfApplyPersonPageQry qry) { return personApplyQueryExe.xgfPersonPermissionsList(qry); } + + @Override + public PageResponse xgfPersonnelVehicleManagementList(PersonCountPageQry qry) { + return personApplyQueryExe.xgfPersonnelVehicleManagementList(qry); + } } diff --git a/web-app/src/main/java/com/zcloud/primeport/service/VehicleApplyServiceImpl.java b/web-app/src/main/java/com/zcloud/primeport/service/VehicleApplyServiceImpl.java index bae1932..e217728 100644 --- a/web-app/src/main/java/com/zcloud/primeport/service/VehicleApplyServiceImpl.java +++ b/web-app/src/main/java/com/zcloud/primeport/service/VehicleApplyServiceImpl.java @@ -3,6 +3,7 @@ package com.zcloud.primeport.service; import com.alibaba.cola.dto.PageResponse; import com.alibaba.cola.dto.SingleResponse; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; import com.zcloud.gbscommon.utils.DateUtil; import com.zcloud.primeport.api.VehicleApplyServiceI; import com.zcloud.primeport.command.VehicleApplyAddExe; @@ -122,5 +123,13 @@ public class VehicleApplyServiceImpl implements VehicleApplyServiceI { public PageResponse getCarByVehicleBelongType(VehicleApplyPageQry qry) { return vehicleApplyQueryExe.getCarByVehicleBelongType(qry); } + + @Override + public void xgfCarAuthorization(CarAuthCmd cmd) { + UpdateWrapper objectUpdateWrapper = new UpdateWrapper<>(); + objectUpdateWrapper.set("mkmj_permission",cmd.getMkmjPermission()); + objectUpdateWrapper.eq("id",cmd.getVehicleApplyId()); + vehicleApplyRepository.update(objectUpdateWrapper); + } } 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 4e694b7..0d99e80 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 @@ -6,6 +6,7 @@ import com.zcloud.primeport.dto.*; import com.zcloud.primeport.dto.clientobject.PersonApplyCO; import com.zcloud.primeport.dto.clientobject.PersonCountCO; import com.zcloud.primeport.dto.clientobject.XgfPersonApplyCO; +import com.zcloud.primeport.dto.clientobject.XgfPersonCountCO; /** * web-client @@ -41,5 +42,7 @@ public interface PersonApplyServiceI { XgfPersonApplyCO xgfPersonApplyInfoById(Long id); PageResponse xgfPersonPermissionsList(XgfApplyPersonPageQry qry); + + PageResponse xgfPersonnelVehicleManagementList(PersonCountPageQry qry); } diff --git a/web-client/src/main/java/com/zcloud/primeport/api/VehicleApplyServiceI.java b/web-client/src/main/java/com/zcloud/primeport/api/VehicleApplyServiceI.java index 6e68b9d..5704776 100644 --- a/web-client/src/main/java/com/zcloud/primeport/api/VehicleApplyServiceI.java +++ b/web-client/src/main/java/com/zcloud/primeport/api/VehicleApplyServiceI.java @@ -41,5 +41,7 @@ public interface VehicleApplyServiceI { PageResponse getCarByVehicleBelongType(VehicleApplyPageQry qry); + + void xgfCarAuthorization(CarAuthCmd cmd); } diff --git a/web-client/src/main/java/com/zcloud/primeport/dto/CarAuthCmd.java b/web-client/src/main/java/com/zcloud/primeport/dto/CarAuthCmd.java new file mode 100644 index 0000000..358d8fd --- /dev/null +++ b/web-client/src/main/java/com/zcloud/primeport/dto/CarAuthCmd.java @@ -0,0 +1,31 @@ +package com.zcloud.primeport.dto; + +import com.alibaba.cola.dto.Command; +import io.swagger.annotations.ApiModelProperty; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.NoArgsConstructor; + +import javax.validation.constraints.NotEmpty; +import javax.validation.constraints.NotNull; + +/** + * web-client + * + * @Author makejava + * @Date 2026-03-05 11:33:22 + */ +@EqualsAndHashCode(callSuper = true) +@Data +@NoArgsConstructor +@AllArgsConstructor +public class CarAuthCmd extends Command { + @ApiModelProperty(value = "车辆申请id", name = "vehicleApplyId") + private Long vehicleApplyId; + + @ApiModelProperty(value = "进出港权限(1:有 2：无)", name = "mkmjPermission") + @NotNull(message = "进出港权限(1:有 2：无)不能为空") + private Integer mkmjPermission; +} + diff --git a/web-client/src/main/java/com/zcloud/primeport/dto/PersonCountPageQry.java b/web-client/src/main/java/com/zcloud/primeport/dto/PersonCountPageQry.java index fd346ad..5f3be5e 100644 --- a/web-client/src/main/java/com/zcloud/primeport/dto/PersonCountPageQry.java +++ b/web-client/src/main/java/com/zcloud/primeport/dto/PersonCountPageQry.java @@ -15,6 +15,8 @@ import lombok.Data; public class PersonCountPageQry extends PageQuery { @ApiModelProperty(value = "姓名", name = "name") private String name; + @ApiModelProperty(value = "项目名称", name = "projectName") + private String projectName; @ApiModelProperty(value = "性别", name = "sex") private Long sex; @ApiModelProperty(value = "部门ID", name = "departmentId") diff --git a/web-client/src/main/java/com/zcloud/primeport/dto/VehicleApplyPageQry.java b/web-client/src/main/java/com/zcloud/primeport/dto/VehicleApplyPageQry.java index d3e1bd0..998c298 100644 --- a/web-client/src/main/java/com/zcloud/primeport/dto/VehicleApplyPageQry.java +++ b/web-client/src/main/java/com/zcloud/primeport/dto/VehicleApplyPageQry.java @@ -37,7 +37,8 @@ public class VehicleApplyPageQry extends PageQuery { private String visitEndTime; @ApiModelProperty(value = "授权范围港区与区域", name = "gateLevelAuthAreaId") private String gateLevelAuthAreaId; - + @ApiModelProperty(value = "车辆归属的企业的部门vehicleCorpId", name = "vehicleCorpId") + private Long vehicleCorpId; @ApiModelProperty(value = "车辆归属的部门的部门depetid", name = "vehicleDepartmentId") private Long vehicleDepartmentId; @ApiModelProperty(value = "车辆归属的员工的员工userid", name = "employeeVehicleUserId") diff --git a/web-client/src/main/java/com/zcloud/primeport/dto/clientobject/VehicleApplyCO.java b/web-client/src/main/java/com/zcloud/primeport/dto/clientobject/VehicleApplyCO.java index a0a1f08..e4dbe5d 100644 --- a/web-client/src/main/java/com/zcloud/primeport/dto/clientobject/VehicleApplyCO.java +++ b/web-client/src/main/java/com/zcloud/primeport/dto/clientobject/VehicleApplyCO.java @@ -75,6 +75,9 @@ public class VehicleApplyCO extends ClientObject { //车辆所属人姓名(员工车辆/驾驶人名称) @ApiModelProperty(value = "车辆所属人姓名(员工车辆/驾驶人名称)") private String employeeVehicleUserName; + //车辆所属人姓名(员工车辆/驾驶人名称) + @ApiModelProperty(value = "车辆驾驶人姓名") + private String drivingUserName; //排放标准名称 @ApiModelProperty(value = "排放标准名称") private String emissionStandards; diff --git a/web-client/src/main/java/com/zcloud/primeport/dto/clientobject/XgfPersonCountCO.java b/web-client/src/main/java/com/zcloud/primeport/dto/clientobject/XgfPersonCountCO.java new file mode 100644 index 0000000..9d2414a --- /dev/null +++ b/web-client/src/main/java/com/zcloud/primeport/dto/clientobject/XgfPersonCountCO.java @@ -0,0 +1,57 @@ +package com.zcloud.primeport.dto.clientobject; + +import com.alibaba.cola.dto.ClientObject; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + + +/** + * web-client + * + * @Author makejava + * @Date 2026-03-05 11:33:21 + */ +@Data +public class XgfPersonCountCO extends ClientObject { + @ApiModelProperty(value = "用户ID") + private Long userId; + @ApiModelProperty(value = "手机号") + private String userPhone; + @ApiModelProperty(value = "用户名") + private String userName; + @ApiModelProperty(value = "身份证号") + private String userCard; + @ApiModelProperty(value = "企业id") + private Long corpinfoId; + @ApiModelProperty(value = "企业名称") + private String corpName; + @ApiModelProperty(value = "企业id") + private Long applyCorpId; + @ApiModelProperty(value = "企业名称") + private String applyCorpName; + @ApiModelProperty(value = "部门id") + private Long departmentId; + @ApiModelProperty(value = "部门名称") + private String departmentName; + @ApiModelProperty(value = "职位名称") + private String postName; + @ApiModelProperty(value = "项目ID") + private Long projectId; + @ApiModelProperty(value = "项目名称") + private String projectName; + @ApiModelProperty(value = "访问开始时间") + private String visitStartTime; + @ApiModelProperty(value = "访问结束时间") + private String visitEndTime; + @ApiModelProperty(value = "项目申请人员ID") + private Long xgfApplyPersonId; + @ApiModelProperty(value = "人员门禁权限id") + private Long applyPersonId; + @ApiModelProperty(value = "车辆数量") + private Integer vehicleCount; + @ApiModelProperty(value = "项目数量") + private Integer projectCount; + @ApiModelProperty(value = "是否允许访问") + private Integer mkmjPermission; +} + diff --git a/web-domain/src/main/java/com/zcloud/primeport/domain/enums/MenuEnum.java b/web-domain/src/main/java/com/zcloud/primeport/domain/enums/MenuEnum.java index 643c60b..f5cea7f 100644 --- a/web-domain/src/main/java/com/zcloud/primeport/domain/enums/MenuEnum.java +++ b/web-domain/src/main/java/com/zcloud/primeport/domain/enums/MenuEnum.java @@ -134,15 +134,23 @@ public enum MenuEnum { /** * 相关方人员进港审批 */ - JGD_ENTRY_STK_PERSON_APPROVAL("/primeport/container/enterprise/firstLevelDoor/portEntryApproval/personnelApproval/relatedPersonnel", "jgd-entry-stk-person-approval"), + FGS_ENTRY_STK_PERSON_APPROVAL("/primeport/container/enterprise/firstLevelDoor/portEntryApproval/personnelApproval/relatedPersonnel", "fgs-entry-stk-person-approval"), /** - * 车辆审批 + * 长期车辆审批 */ - JGD_STK_VEHICLE_APPROVAL("/primeport/container/enterprise/firstLevelDoor/portEntryApproval/longTermVehicleApproval/shareVehicles", "jgd-stk-vehicle-approval"), + FGS_STK_VEHICLE_APPROVAL("/primeport/container/enterprise/firstLevelDoor/portEntryApproval/longTermVehicleApproval/shareVehicles", "fgs-stk-vehicle-approval"), /** * 相关方车辆审批 */ FGS_XIANG_GUAN_FANG_CHE_LIANG_SHEN_PI("/primeport/container/enterprise/firstLevelDoor/portEntryApproval/longTermVehicleApproval/relatedVehicles", "fgs-xiang-guan-fang-che-liang-shen-pi"), + /** + * 长期车辆审批记录 + */ + FGS_STK_VEHICLE_APPROVAL_RECORD("/primeport/container/enterprise/firstLevelDoor/portEntryApproval/longTermVehicleApproval/relatedVehiclesRecords", "fgs-stk-vehicle-approval-record"), + /** + * 相关方车辆审批记录 + */ + FGS_XIANG_GUAN_FANG_CHE_LIANG_SHEN_PI_RECORD("/primeport/container/enterprise/firstLevelDoor/portEntryApproval/longTermVehicleApproval/relatedVehiclesRecords", "fgs-stk-vehicle-approval-record"), /** * 临时人员管理 */ @@ -151,6 +159,15 @@ public enum MenuEnum { * 临时车辆管理 */ FGS_LIN_SHI_CHE_LIANG_GUAN_LI("/primeport/container/enterprise/firstLevelDoor/portEntryApproval/temporaryVisitor/temporaryVehicle/list", "fgs-lin-shi-che-liang-guan-li"), + /** + * 临时人员管理记录 + */ + FGS_LIN_SHI_REN_YUAN_GUAN_LI_RECORD("/primeport/container/enterprise/firstLevelDoor/portEntryApproval/temporaryVisitor/temporaryPersonnelRecords/list", "fgs-lsyr-aduit-record"), + /** + * 临时车辆管理记录 + */ + FGS_LIN_SHI_CHE_LIANG_GUAN_LI_RECORD("/primeport/container/enterprise/firstLevelDoor/portEntryApproval/temporaryVisitor/temporaryVehicleRecords/list", "fgs-lscl-aduit-record"), + /** * 人员及车辆管理 */ @@ -158,15 +175,15 @@ public enum MenuEnum { /** * 个人车辆管理 */ - FGS_GE_REN_CHE_LIANG_GUAN_LI("/primeport/container/enterprise/firstLevelDoor/importAndExportPortInfo/personalVehicle/list", "fgs-ge-ren-che-liang-guan-li"), + FGS_GE_REN_CHE_LIANG_GUAN_LI("/primeport/container/enterprise/firstLevelDoor/importAndExportPortInfo/personalVehicle/list", "fgs-grclgl"), /** * 单位车辆管理 */ - FGS_DAN_WEI_CHE_LIANG_GUAN_LI("/primeport/container/enterprise/firstLevelDoor/importAndExportPortInfo/stockVehicles/list", "fgs-dan-wei-che-liang-guan-li"), + FGS_DAN_WEI_CHE_LIANG_GUAN_LI("/primeport/container/enterprise/firstLevelDoor/importAndExportPortInfo/stockVehicles/list", "fgs-dwclgl"), /** * 相关方人员及车辆管理 */ - FGS_XIANG_GUAN_FANG_REN_YUAN_JI_CHE_LIANG_GUAN_LI("/primeport/container/enterprise/firstLevelDoor/importAndExportPortInfo/stakeholderPersonnelAndVehicles/list", "fgs-xiang-guan-fang-ren-yuan-ji-che-liang-guan-li"), + FGS_XIANG_GUAN_FANG_REN_YUAN_JI_CHE_LIANG_GUAN_LI("/primeport/container/enterprise/firstLevelDoor/importAndExportPortInfo/stakeholderPersonnelAndVehicles/list", "fgs-xgfryjclgl"), /** * 车辆违规管理 */ @@ -206,59 +223,59 @@ public enum MenuEnum { /** * 企业人员权限 */ - JGD_ENT_PERMISSION("/primeport/container/enterprise/enclosedArea/enterprisePersonnelPermissions/list", "jgd-ent-permission"), + FGS_ENT_PERMISSION("/primeport/container/enterprise/enclosedArea/enterprisePersonnelPermissions/list", "fgs-ent-permission"), /** * 长期人员审核 */ - JGD_ENT_LONG_PERSONNEL_REVIEW("/primeport/container/enterprise/enclosedArea/personnelReview/longTermPersonnelReview/list", "jgd-ent-long-personnel-review"), + FGS_ENT_LONG_PERSONNEL_REVIEW("/primeport/container/enterprise/enclosedArea/personnelReview/longTermPersonnelReview/list", "fgs-ent-long-personnel-review"), /** * 临时人员审核 */ - JGD_ENT_TEMP_PERSONNEL_REVIEW("/primeport/container/enterprise/enclosedArea/personnelReview/temporaryPersonnelReview/list", "jgd-ent-temp-personnel-review"), + FGS_ENT_TEMP_PERSONNEL_REVIEW("/primeport/container/enterprise/enclosedArea/personnelReview/temporaryPersonnelReview/list", "fgs-ent-temp-personnel-review"), /** * 长期人员审核记录 */ - JGD_ENT_LONG_PERSONNEL_RECORDS("/primeport/container/enterprise/enclosedArea/personnelReview/longTermPersonnelReviewRecords/list", "jgd-ent-long-personnel-records"), + FGS_ENT_LONG_PERSONNEL_RECORDS("/primeport/container/enterprise/enclosedArea/personnelReview/longTermPersonnelReviewRecords/list", "fgs-ent-long-personnel-records"), /** * 临时访客人员记录 */ - JGD_ENT_TEMP_VISITOR_RECORDS("/primeport/container/enterprise/enclosedArea/personnelReview/temporaryPersonnelReviewRecords/list", "jgd-ent-temp-visitor-records"), + FGS_ENT_TEMP_VISITOR_RECORDS("/primeport/container/enterprise/enclosedArea/personnelReview/temporaryPersonnelReviewRecords/list", "fgs-ent-temp-visitor-records"), /** * 长期车辆审核 */ - JGD_ENT_LONG_VEHICLE_REVIEW("/primeport/container/enterprise/enclosedArea/vehicleReview/longTermVehicleReview/list", "jgd-ent-long-vehicle-review"), + FGS_ENT_LONG_VEHICLE_REVIEW("/primeport/container/enterprise/enclosedArea/vehicleReview/longTermVehicleReview/list", "fgs-ent-long-vehicle-review"), /** * 临时车辆审核 */ - JGD_ENT_TEMP_VEHICLE_REVIEW("/primeport/container/enterprise/enclosedArea/vehicleReview/temporaryVehicleReview/list", "jgd-ent-temp-vehicle-review"), + FGS_ENT_TEMP_VEHICLE_REVIEW("/primeport/container/enterprise/enclosedArea/vehicleReview/temporaryVehicleReview/list", "fgs-ent-temp-vehicle-review"), /** * 长期车辆审核记录 */ - JGD_ENT_LONG_VEHICLE_RECORDS("/primeport/container/enterprise/enclosedArea/vehicleReview/longTermVehicleReviewRecords/list", "jgd-ent-long-vehicle-records"), + FGS_ENT_LONG_VEHICLE_RECORDS("/primeport/container/enterprise/enclosedArea/vehicleReview/longTermVehicleReviewRecords/list", "fgs-ent-long-vehicle-records"), /** * 临时车辆审核记录 */ - JGD_ENT_TEMP_VEHICLE_RECORDS("/primeport/container/enterprise/enclosedArea/vehicleReview/temporaryVehicleReviewRecords/list", "jgd-ent-temp-vehicle-records"), + FGS_ENT_TEMP_VEHICLE_RECORDS("/primeport/container/enterprise/enclosedArea/vehicleReview/temporaryVehicleReviewRecords/list", "fgs-ent-temp-vehicle-records"), /** * 人员权限记录 */ - JGD_STK_PERSONNEL_PERMISSION_RECORDS("/primeport/container/stakeholder/firstLevelDoor/personnelPermissionRecords/list", "jgd-stk-personnel-permission-records"), + JGD_STK_PERSONNEL_PERMISSION_RECORDS("/primeport/container/stakeholder/firstLevelDoor/personnelPermissionRecords/list", "xgf-stk-personnel-permission-records"), /** * 人员申请 */ - JGD_STK_PERSONNEL_APPLICATION("/primeport/container/stakeholder/firstLevelDoor/personnelApplication/list", "jgd-stk-personnel-application"), + JGD_STK_PERSONNEL_APPLICATION("/primeport/container/stakeholder/firstLevelDoor/personnelApplication/list", "xgf-stk-personnel-application"), /** * 车辆申请 */ - JGD_STK_VEHICLE_APPLICATION("/primeport/container/stakeholder/firstLevelDoor/vehicleApplication/list", "jgd-stk-vehicle-application"), + JGD_STK_VEHICLE_APPLICATION("/primeport/container/stakeholder/firstLevelDoor/vehicleApplication/list", "xgf-stk-vehicle-application"), /** * 人员申请记录 */ - JGD_STK_PERSONNEL_APP_RECORDS("/primeport/container/stakeholder/firstLevelDoor/personnelApplicationRecords/list", "jgd-stk-personnel-app-records"), + JGD_STK_PERSONNEL_APP_RECORDS("/primeport/container/stakeholder/firstLevelDoor/personnelApplicationRecords/list", "xgf-stk-personnel-app-records"), /** * 车辆申请记录 */ - JGD_STK_VEHICLE_APP_RECORDS("/primeport/container/stakeholder/firstLevelDoor/vehicleApplicationRecords/list", "jgd-stk-vehicle-app-records"), + JGD_STK_VEHICLE_APP_RECORDS("/primeport/container/stakeholder/firstLevelDoor/vehicleApplicationRecords/list", "xgf-stk-vehicle-app-records"), /** * 人员封闭区域申请 */ diff --git a/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/dataobject/PersonApplyDO.java b/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/dataobject/PersonApplyDO.java index 9f8293e..84c1306 100644 --- a/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/dataobject/PersonApplyDO.java +++ b/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/dataobject/PersonApplyDO.java @@ -85,6 +85,11 @@ public class PersonApplyDO extends BaseDO { private String auditCorpName; @TableField(exist = false) private String auditTime; - + @TableField(exist = false) + private Integer projectCount; + @TableField(exist = false) + private Long applyCorpId; + @TableField(exist = false) + private String applyCorpName; } diff --git a/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/mapper/PersonApplyMapper.java b/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/mapper/PersonApplyMapper.java index d613f14..b5a0b12 100644 --- a/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/mapper/PersonApplyMapper.java +++ b/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/mapper/PersonApplyMapper.java @@ -22,5 +22,7 @@ public interface PersonApplyMapper extends BaseMapper { IPage listPage(Page> page, @Param("params") Map params, String menuPerms); IPage xgfPersonPermissionsList(Page> page, @Param("params") Map params, String menuPerms); + + IPage xgfPersonnelVehicleManagementList(Page> page, Map params, String menuPerms); } diff --git a/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/repository/PersonApplyRepository.java b/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/repository/PersonApplyRepository.java index 64a5791..db16c5a 100644 --- a/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/repository/PersonApplyRepository.java +++ b/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/repository/PersonApplyRepository.java @@ -15,5 +15,7 @@ public interface PersonApplyRepository extends BaseRepository { PageResponse listPage(Map params); PageResponse xgfPersonPermissionsList(Map params); + + PageResponse xgfPersonnelVehicleManagementList(Map parmas); } diff --git a/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/repository/impl/PersonApplyRepositoryImpl.java b/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/repository/impl/PersonApplyRepositoryImpl.java index df18e8b..7b10b99 100644 --- a/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/repository/impl/PersonApplyRepositoryImpl.java +++ b/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/repository/impl/PersonApplyRepositoryImpl.java @@ -50,7 +50,19 @@ public class PersonApplyRepositoryImpl extends BaseRepositoryImpl result = personApplyMapper.xgfPersonPermissionsList(page, params,menuPerms); + IPage result = personApplyMapper.xgfPersonPermissionsList(page, params, menuPerms); + return PageHelper.pageToResponse(result, result.getRecords()); + } + + @Override + public PageResponse xgfPersonnelVehicleManagementList(Map params) { + Page> page = new Page<>(Integer.parseInt(params.get("pageIndex").toString()) + , Integer.parseInt(params.get("pageSize").toString())); + String menuPerms = ""; + if (!org.springframework.util.ObjectUtils.isEmpty(params.get("menuPath"))) { + menuPerms = MenuEnum.getMenuKeyByPath(params.get("menuPath").toString()); + } + IPage result = personApplyMapper.xgfPersonnelVehicleManagementList(page, params, menuPerms); return PageHelper.pageToResponse(result, result.getRecords()); } } diff --git a/web-infrastructure/src/main/resources/mapper/PersonApplyDO.xml b/web-infrastructure/src/main/resources/mapper/PersonApplyDO.xml index affb313..1add0bd 100644 --- a/web-infrastructure/src/main/resources/mapper/PersonApplyDO.xml +++ b/web-infrastructure/src/main/resources/mapper/PersonApplyDO.xml @@ -51,6 +51,41 @@ pa.employee_person_user_id, pa.id DESC + diff --git a/web-infrastructure/src/main/resources/mapper/VehicleApplyDO.xml b/web-infrastructure/src/main/resources/mapper/VehicleApplyDO.xml index f116c56..4ec7138 100644 --- a/web-infrastructure/src/main/resources/mapper/VehicleApplyDO.xml +++ b/web-infrastructure/src/main/resources/mapper/VehicleApplyDO.xml @@ -29,6 +29,8 @@ f.emission_standards, f.attachment_id, f.driving_license_id, + f.driving_user_id, + f.driving_user_name, f.inform_sign_id, f.project_id, f.project_name, @@ -64,10 +66,13 @@ AND f.vehicle_belong_type = #{params.vehicleBelongType} - + AND f.vehicle_department_id = #{params.vehicleDepartmentId} - + + AND f.vehicle_corp_id = #{params.vehicleCorpId} + + AND f.employee_vehicle_user_id = #{params.employeeVehicleUserId}