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

feat：补充查询分公司里的人授权范围

koumen
dearLin 2026-03-24 17:18:28 +08:00
parent be85e4c374
commit a65cd9e8cc
12 changed files with 327 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -142,7 +142,7 @@ public class ClosedTmpApplyController {
BeanUtils.copyProperties(closedAreaPersonApplyCO, tmpApplyCO);
}
}
if (TmpApplyEnum.CAR_APPLY.getCode().equals(tmpMkmjType)) {
if (TmpApplyEnum.CAR_APPLY.getCode().equals(tmpApplyType)) {
if (TmpApplyEnum.ONE_LEVEL_CAR_APPLY.getCode().equals(tmpMkmjType)) {
VehicleApplyCO infoById = vehicleApplyServiceI.getInfoById(id);
BeanUtils.copyProperties(infoById, tmpApplyCO);

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

@ -56,6 +56,7 @@ public class ClosedAreaPersonApplyUpdateExe {
@Transactional(rollbackFor = Exception.class)
public void authPerson(ClosedAreaPersonApplyAuthCmd cmd) {
areaFgsPersonAuthGateway.removeByUserId(cmd.getUserId());
ClosedAreaFgsPersonAuthE closedAreaFgsPersonAuthE = new ClosedAreaFgsPersonAuthE();
closedAreaFgsPersonAuthE.setUserId(cmd.getUserId());
closedAreaFgsPersonAuthE.setCorpId(cmd.getCorpId());

3
web-app/src/main/java/com/zcloud/primeport/command/query/MkmjQueryExe.java
View File

@ -50,6 +50,9 @@ public class MkmjQueryExe {
if (Tools.notEmpty(qry.getHgAuthArea())) {
mkmjDOQueryWrapper.eq("hg_auth_area", qry.getHgAuthArea());
}
if (qry.getMkmjLevel() != null) {
mkmjDOQueryWrapper.eq("mkmj_level", qry.getMkmjLevel());
}
List<MkmjDO> list = mkmjRepository.list(mkmjDOQueryWrapper);
List<MkmjCO> examCenterCOS = mkmjCoConvertor.converDOsToCOs(list);
return examCenterCOS;

8
web-client/src/main/java/com/zcloud/primeport/dto/ClosedAreaCarApplyAuditCmd.java
View File

@ -1,6 +1,7 @@
package com.zcloud.primeport.dto;
import com.alibaba.cola.dto.Command;
import com.baomidou.mybatisplus.core.incrementer.DefaultIdentifierGenerator;
import io.swagger.annotations.ApiModelProperty;
import lombok.AllArgsConstructor;
import lombok.Data;
@ -27,4 +28,11 @@ public class ClosedAreaCarApplyAuditCmd extends Command {
private Integer auditFlag;
@ApiModelProperty(value = "驳回原因", name = "refusalReason", required = true)
private String refusalReason;
public static void main(String[] args) {
for (int i = 0; i < 260; i++) {
DefaultIdentifierGenerator defaultIdentifierGenerator = new DefaultIdentifierGenerator();
System.out.println(defaultIdentifierGenerator.nextId(new Object()));
}
}
}

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

@ -29,7 +29,7 @@ public class ClosedAreaPersonApplyPageQry extends PageQuery {
@ApiModelProperty(value = "随行人员按部门搜索", name = "deptId", required = true)
private Long deptId;
@ApiModelProperty(value = "1申请中2已审批", name = "processOrRecord", required = true)
@ApiModelProperty(value = "申请人名称", name = "applyPersonUserName", required = true)
private String applyPersonUserName;
@ApiModelProperty(value = "1查本单位申请中，本人待审批的数据传入这个2查已审批，本单位的申请记录的数据传入这个", name = "processOrRecord", required = true)
private Integer processOrRecord;

6
web-client/src/main/java/com/zcloud/primeport/dto/MkmjApprovalUserPageQry.java
View File

@ -30,13 +30,13 @@ public class MkmjApprovalUserPageQry extends PageQuery {
private Long deptId;
@ApiModelProperty(value = "审批人姓名", name = "userName")
private String userName;
@ApiModelProperty(value = "人员审核权限(1-无权限,2-有权限)")
@ApiModelProperty(value = "人员审核权限(1-有权限,0-没权限)")
private Integer personnelPermissionFlag;
//车辆审核权限(1-无权限,2-有权限)
@ApiModelProperty(value = "车辆审核权限(1-无权限,2-有权限)")
@ApiModelProperty(value = "车辆审核权限(1-有权限,0-没权限)")
private Integer vehiclePermissionFlag;
//临时审核权限(1-无权限,2-有权限)
@ApiModelProperty(value = "临时审核权限(1-无权限,2-有权限)")
@ApiModelProperty(value = "临时审核权限(1-有权限,0-没权限)")
private Integer temporaryPermissionFlag;

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

@ -8,16 +8,273 @@ import java.util.function.Function;
import java.util.stream.Collectors;
/**
* 菜单枚举
*
* @author zhangyue
* @date 2025/12/6 13:48
*/
@Getter
public enum MenuEnum {
MKMJ_JGD("/mkmj/jgd1", "mkmj_jgd"),
PASSAGE_JGD("/mkmj/jgd2", "mkmj_passage_jgd"),
GATE_JGD("/mkmj/jgd3", "mkmj_gate_jgd"),
MJSPR_JGD("/mkmj/jgd4", "mkmj_mjspr_jgd")
;
/**
* 门禁审批人管理
*/
JGD_FIRST_LEVEL_APPROVER("/primeport/container/supervision/firstLevelDoor/approverUser", "jgd-first-level-approver"),
/**
* 一级口门信息管理
*/
JGD_FIRST_LEVEL_DOOR_INFO("/primeport/container/supervision/firstLevelDoor/basicInfo/firstLevelDoorInfo/list", "jgd-first-level-door-info"),
/**
* 相关方人员进港审批
*/
JGD_ENTRY_STK_PERSONNEL_APPROVAL("/primeport/container/supervision/firstLevelDoor/portEntryApproval/personnelApproval/relatedPersonnel", "jgd-entry-stk-personnel-approval"),
/**
* 相关方人员进港审批记录
*/
JGD_ENTRY_STK_PERSONNEL_RECORDS("/primeport/container/supervision/firstLevelDoor/portEntryApproval/personnelApproval/relatedPersonnelRecords", "jgd-entry-stk-personnel-records"),
/**
* 股份车辆审批
*/
JGD_ENTRY_SHARE_VEHICLE_APPROVAL("/primeport/container/supervision/firstLevelDoor/portEntryApproval/longTermVehicleApproval/shareVehicles", "jgd-entry-share-vehicle-approval"),
/**
* 股份车辆审批记录
*/
JGD_ENTRY_SHARE_VEHICLE_RECORDS("/primeport/container/supervision/firstLevelDoor/portEntryApproval/longTermVehicleApproval/shareVehiclesRecords", "jgd-entry-share-vehicle-records"),
/**
* 相关方车辆审批
*/
JGD_ENTRY_STK_VEHICLE_APPROVAL("/primeport/container/supervision/firstLevelDoor/portEntryApproval/longTermVehicleApproval/relatedVehicles", "jgd-entry-stk-vehicle-approval"),
/**
* 相关方车辆审批记录
*/
JGD_ENTRY_STK_VEHICLE_RECORDS("/primeport/container/supervision/firstLevelDoor/portEntryApproval/longTermVehicleApproval/relatedVehiclesRecords", "jgd-entry-stk-vehicle-records"),
/**
* 临时人员管理
*/
JGD_ENTRY_TEMP_PERSONNEL("/primeport/container/supervision/firstLevelDoor/portEntryApproval/temporaryVisitor/temporaryPersonnel/list", "jgd-entry-temp-personnel"),
/**
* 临时人员管理记录
*/
JGD_ENTRY_TEMP_PERSONNEL_RECORDS("/primeport/container/supervision/firstLevelDoor/portEntryApproval/temporaryVisitor/temporaryPersonnelRecords/list", "jgd-entry-temp-personnel-records"),
/**
* 临时车辆管理
*/
JGD_ENTRY_TEMP_VEHICLE("/primeport/container/supervision/firstLevelDoor/portEntryApproval/temporaryVisitor/temporaryVehicle/list", "jgd-entry-temp-vehicle"),
/**
* 临时车辆管理记录
*/
JGD_ENTRY_TEMP_VEHICLE_RECORDS("/primeport/container/supervision/firstLevelDoor/portEntryApproval/temporaryVisitor/temporaryVehicleRecords/list", "jgd-entry-temp-vehicle-records"),
/**
* 股份人员及车辆管理
*/
JGD_IO_STOCK_PV("/primeport/container/supervision/firstLevelDoor/importAndExportPortInfo/stockPersonnelAndVehicles/list", "jgd-io-stock-pv"),
/**
* 个人车辆管理
*/
JGD_IO_PERSONAL_VEHICLE("/primeport/container/supervision/firstLevelDoor/importAndExportPortInfo/personalVehicle/list", "jgd-io-personal-vehicle"),
/**
* 股份单位车辆管理
*/
JGD_IO_STOCK_UNIT_VEHICLE("/primeport/container/supervision/firstLevelDoor/importAndExportPortInfo/stockVehicles/list", "jgd-io-stock-unit-vehicle"),
/**
* 分公司人员及车辆管理
*/
JGD_IO_BRANCH_PV("/primeport/container/supervision/firstLevelDoor/importAndExportPortInfo/branchPersonnelAndVehicles/list", "jgd-io-branch-pv"),
/**
* 相关方人员及车辆管理
*/
JGD_IO_STK_PV("/primeport/container/supervision/firstLevelDoor/importAndExportPortInfo/stakeholderPersonnelAndVehicles/list", "jgd-io-stk-pv"),
/**
* 驻港单位人员及车辆管理
*/
JGD_IO_PORT_UNIT_PV("/primeport/container/supervision/firstLevelDoor/importAndExportPortInfo/portBasedUnitsPersonnelAndVehicles/list", "jgd-io-port-unit-pv"),
/**
* 检查部门车辆管理
*/
JGD_IO_INSPECT_VEHICLE("/primeport/container/supervision/firstLevelDoor/importAndExportPortInfo/inspectDepartmentVehicles/list", "jgd-io-inspect-vehicle"),
/**
* 车辆违规管理
*/
JGD_CHE_LIANG_WEI_GUI_GUAN_LI("/primeport/container/supervision/firstLevelDoor/importAndExportPortInfo/vehiclesViolation/vehiclesViolation/list", "jgd-che-liang-wei-gui-guan-li"),
/**
* 车辆黑名单管理
*/
JGD_IO_BLACKLIST("/primeport/container/supervision/firstLevelDoor/importAndExportPortInfo/vehiclesViolation/vehicleBlacklist/list", "jgd-io-blacklist"),
/**
* 封闭区域管理
*/
JGD_FENG_BI_QU_YU_GUAN_LI("/primeport/container/supervision/enclosedArea/areaAndEntrance/enclosedArea/list", "jgd-feng-bi-qu-yu-guan-li"),
/**
* 封闭区域口门管理
*/
JGD_ENCLOSED_DOOR("/primeport/container/supervision/enclosedArea/areaAndEntrance/enclosedAreaDoor/list", "jgd-enclosed-door"),
/**
* 人员封闭区域申请
*/
JGD_ENCLOSED_PERSONNEL_APPLY("/primeport/container/supervision/enclosedArea/apply/personnel/list", "jgd-enclosed-personnel-apply"),
/**
* 车辆封闭区域申请
*/
JGD_ENCLOSED_VEHICLE_APPLY("/primeport/container/supervision/enclosedArea/apply/vehicle/list", "jgd-enclosed-vehicle-apply"),
/**
* 人员封闭区域申请记录
*/
JGD_ENCLOSED_PERSONNEL_RECORDS("/primeport/container/supervision/enclosedArea/apply/personnelRecords/list", "jgd-enclosed-personnel-records"),
/**
* 车辆封闭区域申请记录
*/
JGD_ENCLOSED_VEHICLE_RECORDS("/primeport/container/supervision/enclosedArea/apply/vehicleRecords/list", "jgd-enclosed-vehicle-records"),
/**
* 区域人员及车辆统计
*/
JGD_ENCLOSED_AREA_STATS("/primeport/container/supervision/enclosedArea/personnelAndVehicleStatistics/list", "jgd-enclosed-area-stats"),
/**
* 门禁审批人管理
*/
FGS_FIRST_LEVEL_APPROVER("/primeport/container/enterprise/firstLevelDoor/approverUser", "fgs-first-level-approver"),
/**
* 相关方人员进港审批
*/
JGD_ENTRY_STK_PERSON_APPROVAL("/primeport/container/enterprise/firstLevelDoor/portEntryApproval/personnelApproval/relatedPersonnel", "jgd-entry-stk-person-approval"),
/**
* 车辆审批
*/
JGD_STK_VEHICLE_APPROVAL("/primeport/container/enterprise/firstLevelDoor/portEntryApproval/longTermVehicleApproval/shareVehicles", "jgd-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_LIN_SHI_REN_YUAN_GUAN_LI("/primeport/container/enterprise/firstLevelDoor/portEntryApproval/temporaryVisitor/temporaryPersonnel/list", "fgs-lin-shi-ren-yuan-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_REN_YUAN_JI_CHE_LIANG_GUAN_LI("/primeport/container/enterprise/firstLevelDoor/importAndExportPortInfo/stockPersonnelAndVehicles/list", "fgs-ren-yuan-ji-che-liang-guan-li"),
/**
* 个人车辆管理
*/
FGS_GE_REN_CHE_LIANG_GUAN_LI("/primeport/container/enterprise/firstLevelDoor/importAndExportPortInfo/personalVehicle/list", "fgs-ge-ren-che-liang-guan-li"),
/**
* 单位车辆管理
*/
FGS_DAN_WEI_CHE_LIANG_GUAN_LI("/primeport/container/enterprise/firstLevelDoor/importAndExportPortInfo/stockVehicles/list", "fgs-dan-wei-che-liang-guan-li"),
/**
* 相关方人员及车辆管理
*/
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_CHE_LIANG_WEI_GUI_GUAN_LI("/primeport/container/enterprise/firstLevelDoor/importAndExportPortInfo/vehiclesViolation/vehiclesViolation/list", "fgs-che-liang-wei-gui-guan-li"),
/**
* 车辆黑名单管理
*/
FGS_CHE_LIANG_HEI_MING_DAN_GUAN_LI("/primeport/container/enterprise/firstLevelDoor/importAndExportPortInfo/vehiclesViolation/vehicleBlacklist/list", "fgs-che-liang-hei-ming-dan-guan-li"),
/**
* 封闭区域管理
*/
FGS_FENG_BI_QU_YU_GUAN_LI("/primeport/container/enterprise/enclosedArea/areaAndEntrance/enclosedArea/list", "fgs-feng-bi-qu-yu-guan-li"),
/**
* 封闭区域口门管理
*/
FGS_FENG_BI_QU_YU_KOU_MEN_GUAN_LI("/primeport/container/enterprise/enclosedArea/areaAndEntrance/enclosedAreaDoor/list", "fgs-feng-bi-qu-yu-kou-men-guan-li"),
/**
* 人员封闭区域申请
*/
FGS_REN_YUAN_FENG_BI_QU_YU_SHEN_QING("/primeport/container/enterprise/enclosedArea/apply/personnel/list", "fgs-ren-yuan-feng-bi-qu-yu-shen-qing"),
/**
* 车辆封闭区域申请
*/
FGS_CHE_LIANG_FENG_BI_QU_YU_SHEN_QING("/primeport/container/enterprise/enclosedArea/apply/vehicle/list", "fgs-che-liang-feng-bi-qu-yu-shen-qing"),
/**
* 人员封闭区域申请记录
*/
FGS_REN_YUAN_FENG_BI_QU_YU_SHEN_QING_JI_LU("/primeport/container/enterprise/enclosedArea/apply/personnelRecords/list", "fgs-ren-yuan-feng-bi-qu-yu-shen-qing-ji-lu"),
/**
* 车辆封闭区域申请记录
*/
FGS_CHE_LIANG_FENG_BI_QU_YU_SHEN_QING_JI_LU("/primeport/container/enterprise/enclosedArea/apply/vehicleRecords/list", "fgs-che-liang-feng-bi-qu-yu-shen-qing-ji-lu"),
/**
* 区域人员及车辆统计
*/
FGS_QU_YU_REN_YUAN_JI_CHE_LIANG_TONG_JI("/primeport/container/enterprise/enclosedArea/personnelAndVehicleStatistics/list", "fgs-qu-yu-ren-yuan-ji-che-liang-tong-ji"),
/**
* 企业人员权限
*/
JGD_ENT_PERMISSION("/primeport/container/enterprise/enclosedArea/enterprisePersonnelPermissions/list", "jgd-ent-permission"),
/**
* 长期人员审核
*/
JGD_ENT_LONG_PERSONNEL_REVIEW("/primeport/container/enterprise/enclosedArea/personnelReview/longTermPersonnelReview/list", "jgd-ent-long-personnel-review"),
/**
* 临时人员审核
*/
JGD_ENT_TEMP_PERSONNEL_REVIEW("/primeport/container/enterprise/enclosedArea/personnelReview/temporaryPersonnelReview/list", "jgd-ent-temp-personnel-review"),
/**
* 长期人员审核记录
*/
JGD_ENT_LONG_PERSONNEL_RECORDS("/primeport/container/enterprise/enclosedArea/personnelReview/longTermPersonnelReviewRecords/list", "jgd-ent-long-personnel-records"),
/**
* 临时访客人员记录
*/
JGD_ENT_TEMP_VISITOR_RECORDS("/primeport/container/enterprise/enclosedArea/personnelReview/temporaryPersonnelReviewRecords/list", "jgd-ent-temp-visitor-records"),
/**
* 长期车辆审核
*/
JGD_ENT_LONG_VEHICLE_REVIEW("/primeport/container/enterprise/enclosedArea/vehicleReview/longTermVehicleReview/list", "jgd-ent-long-vehicle-review"),
/**
* 临时车辆审核
*/
JGD_ENT_TEMP_VEHICLE_REVIEW("/primeport/container/enterprise/enclosedArea/vehicleReview/temporaryVehicleReview/list", "jgd-ent-temp-vehicle-review"),
/**
* 长期车辆审核记录
*/
JGD_ENT_LONG_VEHICLE_RECORDS("/primeport/container/enterprise/enclosedArea/vehicleReview/longTermVehicleReviewRecords/list", "jgd-ent-long-vehicle-records"),
/**
* 临时车辆审核记录
*/
JGD_ENT_TEMP_VEHICLE_RECORDS("/primeport/container/enterprise/enclosedArea/vehicleReview/temporaryVehicleReviewRecords/list", "jgd-ent-temp-vehicle-records"),
/**
* 人员权限记录
*/
JGD_STK_PERSONNEL_PERMISSION_RECORDS("/primeport/container/stakeholder/firstLevelDoor/personnelPermissionRecords/list", "jgd-stk-personnel-permission-records"),
/**
* 人员申请
*/
JGD_STK_PERSONNEL_APPLICATION("/primeport/container/stakeholder/firstLevelDoor/personnelApplication/list", "jgd-stk-personnel-application"),
/**
* 车辆申请
*/
JGD_STK_VEHICLE_APPLICATION("/primeport/container/stakeholder/firstLevelDoor/vehicleApplication/list", "jgd-stk-vehicle-application"),
/**
* 人员申请记录
*/
JGD_STK_PERSONNEL_APP_RECORDS("/primeport/container/stakeholder/firstLevelDoor/personnelApplicationRecords/list", "jgd-stk-personnel-app-records"),
/**
* 车辆申请记录
*/
JGD_STK_VEHICLE_APP_RECORDS("/primeport/container/stakeholder/firstLevelDoor/vehicleApplicationRecords/list", "jgd-stk-vehicle-app-records"),
/**
* 人员封闭区域申请
*/
XGS_REN_YUAN_FENG_BI_QU_YU_SHEN_QING("/primeport/container/stakeholder/enclosedArea/apply/personnel/list", "xgs-ren-yuan-feng-bi-qu-yu-shen-qing"),
/**
* 车辆封闭区域申请
*/
XGS_CHE_LIANG_FENG_BI_QU_YU_SHEN_QING("/primeport/container/stakeholder/enclosedArea/apply/vehicle/list", "xgs-che-liang-feng-bi-qu-yu-shen-qing"),
/**
* 人员封闭区域申请记录
*/
XGS_REN_YUAN_FENG_BI_QU_YU_SHEN_QING_JI_LU("/primeport/container/stakeholder/enclosedArea/apply/personnelRecords/list", "xgs-ren-yuan-feng-bi-qu-yu-shen-qing-ji-lu"),
/**
* 车辆封闭区域申请记录
*/
XGS_CHE_LIANG_FENG_BI_QU_YU_SHEN_QING_JI_LU("/primeport/container/stakeholder/enclosedArea/apply/vehicleRecords/list", "xgs-che-liang-feng-bi-qu-yu-shen-qing-ji-lu");
private final String path;
private final String menuKey;
@ -38,12 +295,16 @@ public enum MenuEnum {
return menuKey;
}
// 通过name获取枚举
/**
* 通过path获取枚举
*/
public static MenuEnum getByPath(String path) {
return PATH_MAP.get(path);
}
// 通过path获取age
/**
* 通过path获取menuKey
*/
public static String getMenuKeyByPath(String path) {
MenuEnum entry = PATH_MAP.get(path);
return entry != null ? entry.getMenuKey() : null;

4
web-domain/src/main/java/com/zcloud/primeport/domain/gateway/ClosedAreaFgsPersonAuthGateway.java
View File

@ -2,6 +2,8 @@ package com.zcloud.primeport.domain.gateway;
import com.zcloud.primeport.domain.model.ClosedAreaFgsPersonAuthE;
import javax.validation.constraints.NotNull;
/**
* web-domain
* @Author dearLin
@ -10,5 +12,7 @@ import com.zcloud.primeport.domain.model.ClosedAreaFgsPersonAuthE;
public interface ClosedAreaFgsPersonAuthGateway {
void addOrUpdate(ClosedAreaFgsPersonAuthE closedAreaFgsPersonAuthE);
void removeByUserId(Long userId);
}

11
web-infrastructure/src/main/java/com/zcloud/primeport/gatewayimpl/ClosedAreaFgsPersonAuthGatewayImpl.java
View File

@ -1,5 +1,6 @@
package com.zcloud.primeport.gatewayimpl;
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
import com.zcloud.primeport.domain.gateway.ClosedAreaFgsPersonAuthGateway;
import com.zcloud.primeport.domain.model.ClosedAreaFgsPersonAuthE;
import com.zcloud.primeport.persistence.dataobject.ClosedAreaFgsPersonAuthDO;
@ -19,6 +20,14 @@ public class ClosedAreaFgsPersonAuthGatewayImpl implements ClosedAreaFgsPersonAu
ClosedAreaFgsPersonAuthDO closedAreaFgsPersonAuthDO = new ClosedAreaFgsPersonAuthDO();
BeanUtils.copyProperties(closedAreaFgsPersonAuthE, closedAreaFgsPersonAuthDO);
closedAreaFgsPersonAuthRepository.saveOrUpdate(closedAreaFgsPersonAuthDO);
closedAreaFgsPersonAuthE.setUserId(closedAreaFgsPersonAuthDO.getId());
}
@Override
public void removeByUserId(Long userId) {
UpdateWrapper<ClosedAreaFgsPersonAuthDO> closedAreaFgsPersonAuthDOUpdateWrapper = new UpdateWrapper<>();
closedAreaFgsPersonAuthDOUpdateWrapper.set("delete_enum","TRUE");
closedAreaFgsPersonAuthDOUpdateWrapper.eq("user_id",userId);
closedAreaFgsPersonAuthRepository.remove(closedAreaFgsPersonAuthDOUpdateWrapper);
}
}

17
web-infrastructure/src/main/resources/mapper/ClosedAreaCarApplyMapper.xml
View File

@ -15,6 +15,23 @@
AND c.audit_flag != 1
</if>
</if>
<if test="params.carBelongType != null">
<if test="params.carBelongType == 4">
AND c.car_belong_type = 4
</if>
<if test="params.carBelongType == 1">
AND c.car_belong_type = 1
</if>
<if test="params.carBelongType == 2">
AND c.car_belong_type = 2
</if>
<if test="params.carBelongType == 3">
AND c.car_belong_type = 3
</if>
<if test="params.carBelongType == -1">
AND c.car_belong_type != 4
</if>
</if>
<if test="params.auditFlag != null">
AND c.audit_flag = #{params.auditFlag}
</if>

11
web-infrastructure/src/main/resources/mapper/ClosedAreaPersonApplyMapper.xml
View File

@ -66,7 +66,16 @@
<if test="params.personBelongType == 4">
AND c.person_belong_type = 4
</if>
<if test="params.processOrRecord != 4">
<if test="params.personBelongType == 1">
AND c.person_belong_type = 1
</if>
<if test="params.personBelongType == 2">
AND c.person_belong_type = 2
</if>
<if test="params.personBelongType == 3">
AND c.person_belong_type = 3
</if>
<if test="params.personBelongType == -1">
AND c.person_belong_type != 4
</if>
</if>

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

@ -92,7 +92,7 @@
#{item}
</foreach>
</if>
<if test="params.gateLevelAuthAreaIdList != null and params.gateLevelAuthAreaIdList.size() > 0">
<if test="params.gateLevelAuthAreaIdList != null and params.gateLevelAuthAreaIdList.length() > 0">
and JSON_OVERLAPS(
JSON_EXTRACT(va.gate_level_auth_area, '$.area[*].bianma'),
CONCAT('[',