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

feat：补充权限标识

koumen
dearLin 2026-03-25 15:59:39 +08:00
parent 81d4f9bb97
commit afb1ce0bc9
25 changed files with 260 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
start/src/main/resources/sdk.yml
View File

@ -28,6 +28,18 @@ sdk:
uri: http://jjb-saas-base uri: http://jjb-saas-base
path: /${application.gateway}/container/** path: /${application.gateway}/container/**
order: -2 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: openapi:
appId: 1871106785124999168 appId: 1871106785124999168
appKey: 7314ecfc11ff4d5fad1ac19284ed2ac3 appKey: 7314ecfc11ff4d5fad1ac19284ed2ac3

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/23 13:52:31) 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/25 10:20:20) 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/972.3da77f225242367aa99d.js"></script><script defer="defer" src="/primeport/static/js/590.e6ed735caeff8acd0b98.js"></script><script defer="defer" src="/primeport/static/js/main.177a7f0b3244a0b46297.js"></script><link href="/primeport/static/css/main.e61cf8eb7be5d4b59b73.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/23 13:52:31) 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/601.8c1c8bd3b08f849f169a.js"></script><script defer="defer" src="/primeport/static/js/745.1a4c36b2a5f096849a4e.js"></script><script defer="defer" src="/primeport/static/js/main.cea8ef14b31922fda1e3.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/25 10:20:20) App/primeport Version/master Java/<branch-name>", "color: #1890ff; border-radius: 2px; padding: 0 4px; border: 1px solid #1890ff; background: #f9fcff")</script></body></html>

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.8" "zy-react-library": "^1.2.9"
}, },
"devDependencies": { "devDependencies": {
"@antfu/eslint-config": "^5.4.1", "@antfu/eslint-config": "^5.4.1",

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

@ -13,6 +13,7 @@ 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;
import com.zcloud.primeport.dto.clientobject.XgfPersonApplyCO; import com.zcloud.primeport.dto.clientobject.XgfPersonApplyCO;
import com.zcloud.primeport.dto.clientobject.XgfPersonCountCO;
import com.zcloud.primeport.persistence.dataobject.XgfApplyPersonDO; import com.zcloud.primeport.persistence.dataobject.XgfApplyPersonDO;
import io.swagger.annotations.Api; import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiOperation;
@ -97,6 +98,12 @@ public class PersonApplyController {
return SingleResponse.buildSuccess(); return SingleResponse.buildSuccess();
} }
@ApiOperation("相关方人员及车辆管理-首页分页")
@GetMapping("/xgfPersonnelVehicleManagementList")
public PageResponse<XgfPersonCountCO> xgfPersonnelVehicleManagementList(PersonCountPageQry qry) {
return personApplyService.xgfPersonnelVehicleManagementList(qry);
}
@ApiOperation("股份，分公司-人员及车辆管理-分页") @ApiOperation("股份，分公司-人员及车辆管理-分页")
@GetMapping("/personnelVehicleManagementList") @GetMapping("/personnelVehicleManagementList")
public PageResponse<PersonCountCO> personnelVehicleManagementList(PersonCountPageQry qry) { public PageResponse<PersonCountCO> personnelVehicleManagementList(PersonCountPageQry qry) {

7
web-adapter/src/main/java/com/zcloud/primeport/web/VehicleApplyController.java
View File

@ -109,5 +109,12 @@ public class VehicleApplyController {
public PageResponse<VehicleApplyCO> getCarByVehicleBelongType(VehicleApplyPageQry qry) { public PageResponse<VehicleApplyCO> getCarByVehicleBelongType(VehicleApplyPageQry qry) {
return vehicleApplyService.getCarByVehicleBelongType(qry); return vehicleApplyService.getCarByVehicleBelongType(qry);
} }
@ApiOperation("相关方-车辆授权")
@PostMapping("/xgfCarAuthorization")
public Response xgfCarAuthorization(@RequestBody CarAuthCmd cmd) {
vehicleApplyService.xgfCarAuthorization(cmd);
return Response.buildSuccess();
}
} }

2
web-adapter/src/main/java/com/zcloud/primeport/web/close/ClosedAreaController.java
View File

@ -58,7 +58,7 @@ public class ClosedAreaController {
@ApiOperation("跟据港区选择对应的封闭区域") @ApiOperation("跟据港区选择对应的封闭区域")
@GetMapping("/listAllByhgAuthArea") @GetMapping("/listAllByhgAuthArea")
public MultiResponse<ClosedAreaCO> listAllByhgAuthArea( @RequestParam("hgAuthArea") String hgAuthArea) { public MultiResponse<ClosedAreaCO> listAllByhgAuthArea(@RequestParam("hgAuthArea") String hgAuthArea) {
return closedAreaService.listAllByhgAuthArea(hgAuthArea); return closedAreaService.listAllByhgAuthArea(hgAuthArea);
} }

2
web-app/src/main/java/com/zcloud/primeport/command/VehicleAuditUpdateExe.java
View File

@ -47,6 +47,8 @@ public class VehicleAuditUpdateExe {
VehicleApplyE vehicleApplyE = new VehicleApplyE(); VehicleApplyE vehicleApplyE = new VehicleApplyE();
vehicleApplyE.setId(cmd.getVehicleApplyId()); vehicleApplyE.setId(cmd.getVehicleApplyId());
vehicleApplyE.setAuditFlag(cmd.getAuditStatus()); vehicleApplyE.setAuditFlag(cmd.getAuditStatus());
vehicleApplyE.setMkmjPermission(1);
vehicleApplyE.setStatusFlag(2);
vehicleApplyGateway.update(vehicleApplyE); vehicleApplyGateway.update(vehicleApplyE);
vehicleAuditGateway.update(vehicleAuditE); vehicleAuditGateway.update(vehicleAuditE);
} }

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

@ -3,6 +3,7 @@ package com.zcloud.primeport.command.convertor;
import com.zcloud.primeport.domain.model.PersonApplyE; import com.zcloud.primeport.domain.model.PersonApplyE;
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;
import com.zcloud.primeport.dto.clientobject.XgfPersonCountCO;
import com.zcloud.primeport.persistence.dataobject.PersonApplyDO; import com.zcloud.primeport.persistence.dataobject.PersonApplyDO;
import com.zcloud.primeport.persistence.dataobject.PersonCountDto; import com.zcloud.primeport.persistence.dataobject.PersonCountDto;
import org.mapstruct.Mapper; import org.mapstruct.Mapper;
@ -23,6 +24,7 @@ public interface PersonApplyCoConvertor {
* @return * @return
*/ */
List<PersonApplyCO> converDOsToCOs(List<PersonApplyDO> personApplyDOs); List<PersonApplyCO> converDOsToCOs(List<PersonApplyDO> personApplyDOs);
List<XgfPersonCountCO> converDOsToXgfCOs(List<PersonApplyDO> personApplyDOs);
List<PersonCountCO> converDtosToCOs(List<PersonCountDto> data); List<PersonCountCO> converDtosToCOs(List<PersonCountDto> data);
List<PersonApplyCO> converEstosToCOs(List<PersonApplyE> data); List<PersonApplyCO> converEstosToCOs(List<PersonApplyE> data);

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

@ -11,6 +11,7 @@ import com.zcloud.primeport.dto.XgfApplyPersonPageQry;
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;
import com.zcloud.primeport.dto.clientobject.XgfPersonApplyCO; 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.PersonApplyDO;
import com.zcloud.primeport.persistence.dataobject.PersonCountDto; import com.zcloud.primeport.persistence.dataobject.PersonCountDto;
import com.zcloud.primeport.persistence.dataobject.VehicleApplyDO; import com.zcloud.primeport.persistence.dataobject.VehicleApplyDO;
@ -112,5 +113,13 @@ public class PersonApplyQueryExe {
return PageResponse.of(examCenterCOS, pageResponse.getTotalCount(), pageResponse.getPageSize(), pageResponse.getPageIndex()); return PageResponse.of(examCenterCOS, pageResponse.getTotalCount(), pageResponse.getPageSize(), pageResponse.getPageIndex());
} }
public PageResponse<XgfPersonCountCO> xgfPersonnelVehicleManagementList(PersonCountPageQry qry) {
Map<String, Object> parmas = PageQueryHelper.toHashMap(qry);
PageResponse<PersonApplyDO> pageResponse = personApplyRepository.xgfPersonnelVehicleManagementList(parmas);
List<XgfPersonCountCO> examCenterCOS = personApplyCoConvertor.converDOsToXgfCOs(pageResponse.getData());
return PageResponse.of(examCenterCOS, pageResponse.getTotalCount(), pageResponse.getPageSize(), pageResponse.getPageIndex());
}
} }

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

@ -11,6 +11,7 @@ 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;
import com.zcloud.primeport.dto.clientobject.XgfPersonApplyCO; import com.zcloud.primeport.dto.clientobject.XgfPersonApplyCO;
import com.zcloud.primeport.dto.clientobject.XgfPersonCountCO;
import lombok.AllArgsConstructor; import lombok.AllArgsConstructor;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
@ -106,5 +107,10 @@ public class PersonApplyServiceImpl implements PersonApplyServiceI {
public PageResponse<PersonApplyCO> xgfPersonPermissionsList(XgfApplyPersonPageQry qry) { public PageResponse<PersonApplyCO> xgfPersonPermissionsList(XgfApplyPersonPageQry qry) {
return personApplyQueryExe.xgfPersonPermissionsList(qry); return personApplyQueryExe.xgfPersonPermissionsList(qry);
} }
@Override
public PageResponse<XgfPersonCountCO> xgfPersonnelVehicleManagementList(PersonCountPageQry qry) {
return personApplyQueryExe.xgfPersonnelVehicleManagementList(qry);
}
} }

9
web-app/src/main/java/com/zcloud/primeport/service/VehicleApplyServiceImpl.java
View File

@ -3,6 +3,7 @@ package com.zcloud.primeport.service;
import com.alibaba.cola.dto.PageResponse; import com.alibaba.cola.dto.PageResponse;
import com.alibaba.cola.dto.SingleResponse; import com.alibaba.cola.dto.SingleResponse;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; 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.gbscommon.utils.DateUtil;
import com.zcloud.primeport.api.VehicleApplyServiceI; import com.zcloud.primeport.api.VehicleApplyServiceI;
import com.zcloud.primeport.command.VehicleApplyAddExe; import com.zcloud.primeport.command.VehicleApplyAddExe;
@ -122,5 +123,13 @@ public class VehicleApplyServiceImpl implements VehicleApplyServiceI {
public PageResponse<VehicleApplyCO> getCarByVehicleBelongType(VehicleApplyPageQry qry) { public PageResponse<VehicleApplyCO> getCarByVehicleBelongType(VehicleApplyPageQry qry) {
return vehicleApplyQueryExe.getCarByVehicleBelongType(qry); return vehicleApplyQueryExe.getCarByVehicleBelongType(qry);
} }
@Override
public void xgfCarAuthorization(CarAuthCmd cmd) {
UpdateWrapper<VehicleApplyDO> objectUpdateWrapper = new UpdateWrapper<>();
objectUpdateWrapper.set("mkmj_permission",cmd.getMkmjPermission());
objectUpdateWrapper.eq("id",cmd.getVehicleApplyId());
vehicleApplyRepository.update(objectUpdateWrapper);
}
} }

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

@ -6,6 +6,7 @@ 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;
import com.zcloud.primeport.dto.clientobject.XgfPersonApplyCO; import com.zcloud.primeport.dto.clientobject.XgfPersonApplyCO;
import com.zcloud.primeport.dto.clientobject.XgfPersonCountCO;
/** /**
* web-client * web-client
@ -41,5 +42,7 @@ public interface PersonApplyServiceI {
XgfPersonApplyCO xgfPersonApplyInfoById(Long id); XgfPersonApplyCO xgfPersonApplyInfoById(Long id);
PageResponse<PersonApplyCO> xgfPersonPermissionsList(XgfApplyPersonPageQry qry); PageResponse<PersonApplyCO> xgfPersonPermissionsList(XgfApplyPersonPageQry qry);
PageResponse<XgfPersonCountCO> xgfPersonnelVehicleManagementList(PersonCountPageQry qry);
} }

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

@ -41,5 +41,7 @@ public interface VehicleApplyServiceI {
PageResponse<VehicleApplyCO> getCarByVehicleBelongType(VehicleApplyPageQry qry); PageResponse<VehicleApplyCO> getCarByVehicleBelongType(VehicleApplyPageQry qry);
void xgfCarAuthorization(CarAuthCmd cmd);
} }

31
web-client/src/main/java/com/zcloud/primeport/dto/CarAuthCmd.java Normal file
View File

@ -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;
}

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

@ -15,6 +15,8 @@ import lombok.Data;
public class PersonCountPageQry extends PageQuery { public class PersonCountPageQry extends PageQuery {
@ApiModelProperty(value = "姓名", name = "name") @ApiModelProperty(value = "姓名", name = "name")
private String name; private String name;
@ApiModelProperty(value = "项目名称", name = "projectName")
private String projectName;
@ApiModelProperty(value = "性别", name = "sex") @ApiModelProperty(value = "性别", name = "sex")
private Long sex; private Long sex;
@ApiModelProperty(value = "部门ID", name = "departmentId") @ApiModelProperty(value = "部门ID", name = "departmentId")

3
web-client/src/main/java/com/zcloud/primeport/dto/VehicleApplyPageQry.java
View File

@ -37,7 +37,8 @@ public class VehicleApplyPageQry extends PageQuery {
private String visitEndTime; private String visitEndTime;
@ApiModelProperty(value = "授权范围港区与区域", name = "gateLevelAuthAreaId") @ApiModelProperty(value = "授权范围港区与区域", name = "gateLevelAuthAreaId")
private String gateLevelAuthAreaId; private String gateLevelAuthAreaId;
@ApiModelProperty(value = "车辆归属的企业的部门vehicleCorpId", name = "vehicleCorpId")
private Long vehicleCorpId;
@ApiModelProperty(value = "车辆归属的部门的部门depetid", name = "vehicleDepartmentId") @ApiModelProperty(value = "车辆归属的部门的部门depetid", name = "vehicleDepartmentId")
private Long vehicleDepartmentId; private Long vehicleDepartmentId;
@ApiModelProperty(value = "车辆归属的员工的员工userid", name = "employeeVehicleUserId") @ApiModelProperty(value = "车辆归属的员工的员工userid", name = "employeeVehicleUserId")

3
web-client/src/main/java/com/zcloud/primeport/dto/clientobject/VehicleApplyCO.java
View File

@ -75,6 +75,9 @@ public class VehicleApplyCO extends ClientObject {
//车辆所属人姓名(员工车辆/驾驶人名称) //车辆所属人姓名(员工车辆/驾驶人名称)
@ApiModelProperty(value = "车辆所属人姓名(员工车辆/驾驶人名称)") @ApiModelProperty(value = "车辆所属人姓名(员工车辆/驾驶人名称)")
private String employeeVehicleUserName; private String employeeVehicleUserName;
//车辆所属人姓名(员工车辆/驾驶人名称)
@ApiModelProperty(value = "车辆驾驶人姓名")
private String drivingUserName;
//排放标准名称 //排放标准名称
@ApiModelProperty(value = "排放标准名称") @ApiModelProperty(value = "排放标准名称")
private String emissionStandards; private String emissionStandards;

57
web-client/src/main/java/com/zcloud/primeport/dto/clientobject/XgfPersonCountCO.java Normal file
View File

@ -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;
}

57
web-domain/src/main/java/com/zcloud/primeport/domain/enums/MenuEnum.java
View File

@ -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_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_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"),
/** /**
* 人员封闭区域申请 * 人员封闭区域申请
*/ */

7
web-infrastructure/src/main/java/com/zcloud/primeport/persistence/dataobject/PersonApplyDO.java
View File

@ -85,6 +85,11 @@ public class PersonApplyDO extends BaseDO {
private String auditCorpName; private String auditCorpName;
@TableField(exist = false) @TableField(exist = false)
private String auditTime; private String auditTime;
@TableField(exist = false)
private Integer projectCount;
@TableField(exist = false)
private Long applyCorpId;
@TableField(exist = false)
private String applyCorpName;
} }

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

@ -22,5 +22,7 @@ public interface PersonApplyMapper extends BaseMapper<PersonApplyDO> {
IPage<PersonApplyDO> listPage(Page<Map<String, Object>> page, @Param("params") Map<String, Object> params, String menuPerms); IPage<PersonApplyDO> listPage(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> 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);
} }

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

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

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

@ -50,7 +50,19 @@ public class PersonApplyRepositoryImpl extends BaseRepositoryImpl<PersonApplyMap
if (!org.springframework.util.ObjectUtils.isEmpty(params.get("menuPath"))) { if (!org.springframework.util.ObjectUtils.isEmpty(params.get("menuPath"))) {
menuPerms = MenuEnum.getMenuKeyByPath(params.get("menuPath").toString()); menuPerms = MenuEnum.getMenuKeyByPath(params.get("menuPath").toString());
} }
IPage<PersonApplyDO> result = personApplyMapper.xgfPersonPermissionsList(page, params,menuPerms); IPage<PersonApplyDO> result = personApplyMapper.xgfPersonPermissionsList(page, params, menuPerms);
return PageHelper.pageToResponse(result, result.getRecords());
}
@Override
public PageResponse<PersonApplyDO> xgfPersonnelVehicleManagementList(Map<String, Object> params) {
Page<Map<String, Object>> 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<PersonApplyDO> result = personApplyMapper.xgfPersonnelVehicleManagementList(page, params, menuPerms);
return PageHelper.pageToResponse(result, result.getRecords()); return PageHelper.pageToResponse(result, result.getRecords());
} }
} }

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

@ -51,6 +51,41 @@
pa.employee_person_user_id, pa.employee_person_user_id,
pa.id DESC pa.id DESC
</select> </select>
<select id="xgfPersonnelVehicleManagementList"
resultType="com.zcloud.primeport.persistence.dataobject.PersonApplyDO">
SELECT
apply_corp_id,
c.corp_name apply_corp_name,
SUM( tmp.project_count ) project_count
FROM
(
SELECT
'person' type,
xap.apply_corp_id,
COUNT( DISTINCT xap.project_id ) project_count
FROM
xgf_apply_person xap
WHERE
xap.person_belong_type = 3
AND xap.delete_enum = 'FALSE'
GROUP BY
xap.apply_corp_id UNION ALL
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
GROUP BY
tmp.apply_corp_id;
</select>
</mapper> </mapper>

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

@ -29,6 +29,8 @@
f.emission_standards, f.emission_standards,
f.attachment_id, f.attachment_id,
f.driving_license_id, f.driving_license_id,
f.driving_user_id,
f.driving_user_name,
f.inform_sign_id, f.inform_sign_id,
f.project_id, f.project_id,
f.project_name, f.project_name,
@ -64,10 +66,13 @@
<if test="params.vehicleBelongType != null and params.vehicleBelongType != ''"> <if test="params.vehicleBelongType != null and params.vehicleBelongType != ''">
AND f.vehicle_belong_type = #{params.vehicleBelongType} AND f.vehicle_belong_type = #{params.vehicleBelongType}
</if> </if>
<if test="params.vehicleDepartmentId != null and params.vehicleDepartmentId != ''"> <if test="params.vehicleDepartmentId != null">
AND f.vehicle_department_id = #{params.vehicleDepartmentId} AND f.vehicle_department_id = #{params.vehicleDepartmentId}
</if> </if>
<if test="params.employeeVehicleUserId != null and params.employeeVehicleUserId != ''"> <if test="params.vehicleCorpId != null">
AND f.vehicle_corp_id = #{params.vehicleCorpId}
</if>
<if test="params.employeeVehicleUserId != null">
AND f.employee_vehicle_user_id = #{params.employeeVehicleUserId} AND f.employee_vehicle_user_id = #{params.employeeVehicleUserId}
</if> </if>
</select> </select>