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

feat：参数问题

koumen
dearLin 2026-03-20 16:14:27 +08:00
parent 4779ade9fd
commit 65d664b12a
63 changed files with 573 additions and 298 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
web-adapter/src/main/java/com/zcloud/primeport/web/close/ClosedAreaCarApplyController.java
View File

@ -38,6 +38,7 @@ public class ClosedAreaCarApplyController {
@ApiOperation("分页")
@PostMapping("/list")
// todo 完善申请人查询，审批人查询 数据权限
public PageResponse<ClosedAreaCarApplyCO> page(@RequestBody ClosedAreaCarApplyPageQry qry) {
return closedAreaCarApplyService.listPage(qry);
}

69
web-adapter/src/main/java/com/zcloud/primeport/web/close/ClosedTmpApplyController.java Normal file
View File

@ -0,0 +1,69 @@
package com.zcloud.primeport.web.close;
import com.alibaba.cola.dto.PageResponse;
import com.alibaba.cola.dto.Response;
import com.alibaba.cola.dto.SingleResponse;
import com.alibaba.cola.exception.BizException;
import com.zcloud.primeport.api.ClosedAreaCarApplyServiceI;
import com.zcloud.primeport.api.ClosedAreaPersonApplyServiceI;
import com.zcloud.primeport.domain.enums.TmpApplyEnum;
import com.zcloud.primeport.dto.ClosedAreaCarApplyAddCmd;
import com.zcloud.primeport.dto.ClosedAreaCarApplyAuditCmd;
import com.zcloud.primeport.dto.ClosedAreaCarApplyPageQry;
import com.zcloud.primeport.dto.ClosedTmpApplyAddCmd;
import com.zcloud.primeport.dto.clientobject.ClosedAreaCarApplyCO;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.AllArgsConstructor;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
import java.util.HashMap;
/**
* web-adapter
*
* @Author dearLin
* @Date 2026-03-20 10:07:13
*/
@Api(tags = "封闭区域-临时人员-车辆申请")
@RequestMapping("/${application.gateway}/closedTmpApply")
@RestController
@AllArgsConstructor
public class ClosedTmpApplyController {
private final ClosedAreaCarApplyServiceI closedAreaCarApplyService;
private final ClosedAreaPersonApplyServiceI closedAreaPersonApplyServiceI;
@ApiOperation("新增")
@PostMapping("/save")
public SingleResponse<HashMap<String, Object>> add(@Validated @RequestBody ClosedTmpApplyAddCmd cmd) {
Long id = 0L;
if (cmd.getTmpApplyType().equals(TmpApplyEnum.PERSON_APPLY.getCode())) {
if (cmd.getTmpMkmjType().equals(TmpApplyEnum.TWO_LEVEL_PERSON_APPLY.getCode())) {
}
if (cmd.getTmpMkmjType().equals(TmpApplyEnum.ONE_LEVEL_PERSON_APPLY.getCode())) {
}
}
if (cmd.getTmpApplyType().equals(TmpApplyEnum.CAR_APPLY.getCode())) {
if (cmd.getTmpMkmjType().equals(TmpApplyEnum.ONE_LEVEL_CAR_APPLY.getCode())) {
}
if (cmd.getTmpMkmjType().equals(TmpApplyEnum.TWO_LEVEL_CAR_APPLY.getCode())) {
id = closedAreaCarApplyService.saveTmpCarApply(cmd);
}
}
HashMap<String, Object> stringLongHashMap = new HashMap<>();
stringLongHashMap.put("id", id);
stringLongHashMap.put("tmpApplyType", cmd.getTmpApplyType());
stringLongHashMap.put("tmpMkmjType", cmd.getTmpApplyType());
return SingleResponse.of(stringLongHashMap);
}
@ApiOperation("详情")
@GetMapping("/{id}")
public SingleResponse<ClosedAreaCarApplyCO> getInfoById(@PathVariable("id") Long id) {
return SingleResponse.of(closedAreaCarApplyService.queryById(id));
}
}

20
web-app/src/main/java/com/zcloud/primeport/service/ClosedAreaCarApplyServiceImpl.java
View File

@ -5,10 +5,8 @@ import com.zcloud.primeport.command.ClosedAreaCarApplyAddExe;
import com.zcloud.primeport.command.ClosedAreaCarApplyRemoveExe;
import com.zcloud.primeport.command.ClosedAreaCarApplyUpdateExe;
import com.zcloud.primeport.command.query.ClosedAreaCarApplyQueryExe;
import com.zcloud.primeport.dto.ClosedAreaCarApplyAddCmd;
import com.zcloud.primeport.dto.ClosedAreaCarApplyAuditCmd;
import com.zcloud.primeport.dto.ClosedAreaCarApplyPageQry;
import com.zcloud.primeport.dto.ClosedAreaCarApplyUpdateCmd;
import com.zcloud.primeport.domain.enums.CloseCarBelongTypeEnum;
import com.zcloud.primeport.dto.*;
import com.zcloud.primeport.dto.clientobject.ClosedAreaCarApplyCO;
import com.alibaba.cola.dto.PageResponse;
@ -67,5 +65,19 @@ public class ClosedAreaCarApplyServiceImpl implements ClosedAreaCarApplyServiceI
public void auditCarApply(ClosedAreaCarApplyAuditCmd auditCmd) {
closedAreaCarApplyUpdateExe.auditCarApply(auditCmd);
}
@Override
public Long saveTmpCarApply(ClosedTmpApplyAddCmd cmd) {
ClosedAreaCarApplyAddCmd closedAreaCarApplyAddCmd = new ClosedAreaCarApplyAddCmd();
// BeanUtils
closedAreaCarApplyAddCmd.setCarBelongType(CloseCarBelongTypeEnum.TEMPORARY_VEHICLES.getCode());
// ClosedAreaCarApplyAddCmd.builder()
// .carBelongType(CloseCarBelongTypeEnum.TEMPORARY_VEHICLES.getCode())
// .
//
return 0L;
}
}

7
web-client/src/main/java/com/zcloud/primeport/api/ClosedAreaCarApplyServiceI.java
View File

@ -1,9 +1,6 @@
package com.zcloud.primeport.api;
import com.zcloud.primeport.dto.ClosedAreaCarApplyAddCmd;
import com.zcloud.primeport.dto.ClosedAreaCarApplyAuditCmd;
import com.zcloud.primeport.dto.ClosedAreaCarApplyPageQry;
import com.zcloud.primeport.dto.ClosedAreaCarApplyUpdateCmd;
import com.zcloud.primeport.dto.*;
import com.zcloud.primeport.dto.clientobject.ClosedAreaCarApplyCO;
import com.alibaba.cola.dto.PageResponse;
@ -29,5 +26,7 @@ public interface ClosedAreaCarApplyServiceI {
void removeBatch(Long[] ids);
void auditCarApply(ClosedAreaCarApplyAuditCmd auditCmd);
Long saveTmpCarApply(ClosedTmpApplyAddCmd cmd);
}

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

@ -2,10 +2,7 @@ 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 lombok.*;
import javax.validation.constraints.*;
@ -19,6 +16,7 @@ import javax.validation.constraints.*;
@Data
@NoArgsConstructor
@AllArgsConstructor
@Builder
public class ClosedAreaCarApplyAddCmd extends Command {
@ApiModelProperty(value = "申请归属1股份2分公司3相关方4临时人员5分公司内部车辆", name = "carBelongType", required = true)
@NotNull(message = "申请归属1股份2分公司3相关方4临时人员不能为空")

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

@ -0,0 +1,30 @@
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.NotNull;
/**
* web-client
*
* @Author dearLin
* @Date 2026-03-20 10:07:15
*/
@EqualsAndHashCode(callSuper = true)
@Data
@NoArgsConstructor
@AllArgsConstructor
public class ClosedAreaCarApplyAuditCmd extends Command {
@ApiModelProperty(value = "主键", name = "id", required = true)
@NotNull(message = "主键不能为空")
private Long id;
@ApiModelProperty(value = "审核状态2审核通过; 3：审核驳回", name = "auditFlag", required = true)
private Integer auditFlag;
@ApiModelProperty(value = "驳回原因", name = "refusalReason", required = true)
private String refusalReason;
}

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

@ -0,0 +1,128 @@
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 dearLin
* @Date 2026-03-20 10:07:13
*/
@EqualsAndHashCode(callSuper = true)
@Data
@NoArgsConstructor
@AllArgsConstructor
public class ClosedTmpApplyAddCmd extends Command {
// 人或者车
@ApiModelProperty(value = "临时申请类型PERSON_APPLY，CAR_APPLY不能为空", name = "tmpApplyType", required = true)
@NotNull(message = "临时申请类型 PERSON_APPLY，CAR_APPLY 不能为空")
private String tmpApplyType;
@ApiModelProperty(value = "临时口门类型LEVEL_ONE 一级，LEVEL_TOW 二级不能为空", name = "tmpMkmjType", required = true)
@NotNull(message = "临时口门类型LEVEL_ONE 一级，LEVEL_TOW 二级不能为空")
private String tmpMkmjType;
// 审批通用
@ApiModelProperty(value = "审批人员所属企业ID", name = "auditPersonCorpId", required = true)
@NotNull(message = "审批人员所属企业ID不能为空")
private Long auditPersonCorpId;
@ApiModelProperty(value = "审批人员所属企业名称", name = "auditPersonCorpName", required = true)
@NotEmpty(message = "审批人员所属企业名称不能为空")
private String auditPersonCorpName;
@ApiModelProperty(value = "审批人员所属部门id", name = "auditPersonDepartmentId", required = true)
@NotNull(message = "审批人员所属部门id不能为空")
private Long auditPersonDepartmentId;
@ApiModelProperty(value = "审批人员部门名称", name = "auditPersonDepartmentName", required = true)
@NotEmpty(message = "审批人员部门名称不能为空")
private String auditPersonDepartmentName;
@ApiModelProperty(value = "审批人员id", name = "auditPersonUserId", required = true)
@NotNull(message = "审批人员id不能为空")
private Long auditPersonUserId;
@ApiModelProperty(value = "审批人员姓名", name = "auditPersonUserName", required = true)
@NotEmpty(message = "审批人员姓名不能为空")
private String auditPersonUserName;
// 通用
@ApiModelProperty(value = "申请人员姓名", name = "applyPersonUserName", required = true)
private String applyPersonUserName;
//申请人头像
@ApiModelProperty(value = "申请人头像", name = "userFaceUrl", required = true)
private String userFaceUrl;
//申请人手机号
@ApiModelProperty(value = "申请人手机号", name = "userPhone", required = true)
private String userPhone;
//申请人身份证号码
@ApiModelProperty(value = "申请人身份证号码", name = "userCard", required = true)
private String userCard;
@ApiModelProperty(value = "申请理由", name = "applyReason", required = true)
@NotEmpty(message = "申请理由不能为空")
private String applyReason;
@ApiModelProperty(value = "访问起始时间", name = "visitStartTime", required = true)
@NotNull(message = "访问起始时间不能为空")
private String visitStartTime;
@ApiModelProperty(value = "访问结束时间", name = "visitEndTime", required = true)
@NotNull(message = "访问结束时间不能为空")
private String visitEndTime;
@ApiModelProperty(value = "所属港区", name = "hgAuthArea", required = true)
@NotEmpty(message = "所属港区不能为空")
private String hgAuthArea;
@ApiModelProperty(value = "所属港区名称", name = "hgAuthAreaName", required = true)
@NotEmpty(message = "所属港区名称不能为空")
private String hgAuthAreaName;
@ApiModelProperty(value = "一级口门id", name = "levelOneMkmjId", required = true)
private Long levelOneMkmjId;
@ApiModelProperty(value = "一级口门名称", name = "levelOneMkmjName", required = true)
@NotEmpty(message = "一级口门名称不能为空")
private String levelOneMkmjName;
@ApiModelProperty(value = "告知签字", name = "informSignId", required = true)
@NotNull(message = "告知签字不能为空")
private Long informSignId;
// 临时人申请
@ApiModelProperty(value = "区域管辖单位名id", name = "jurisdictionalCorpId", required = true)
private Long jurisdictionalCorpId;
@ApiModelProperty(value = "区域管辖单位名称", name = "jurisdictionalCorpName", required = true)
private String jurisdictionalCorpName;
@ApiModelProperty(value = "封闭区域id", name = "closedAreaId", required = true)
private Long closedAreaId;
@ApiModelProperty(value = "封闭区域名称", name = "closedAreaName", required = true)
private String closedAreaName;
@ApiModelProperty(value = "二级口门id(封闭区域口门)", name = "levelTwoMkmjId", required = true)
private Long levelTwoMkmjId;
@ApiModelProperty(value = "二级口门id(封闭区域口门)", name = "levelTwoMkmjName", required = true)
private String levelTwoMkmjName;
// 临时车
@ApiModelProperty(value = "车牌类型数据字典", name = "licenceType", required = true)
private String licenceType;
@ApiModelProperty(value = "车牌类型名称0-白牌 1- 蓝牌 2-黄牌 3-绿牌 4-黑牌", name = "licenceTypeName", required = true)
private String licenceTypeName;
@ApiModelProperty(value = "车牌号", name = "licenceNo", required = true)
private String licenceNo;
@ApiModelProperty(value = "车辆类型", name = "vehicleType", required = true)
private String vehicleType;
@ApiModelProperty(value = "车辆类型-名字", name = "vehicleTypeName", required = true)
private String vehicleTypeName;
@ApiModelProperty(value = "行驶证照片", name = "drivingLicenseId", required = true)
private String drivingLicenseId;
@ApiModelProperty(value = "车辆照片", name = "attachmentId", required = true)
private String attachmentId;
}

25
web-domain/src/main/java/com/zcloud/primeport/domain/enums/TmpApplyEnum.java Normal file
View File

@ -0,0 +1,25 @@
package com.zcloud.primeport.domain.enums;
public enum TmpApplyEnum {
CAR_APPLY("CAR_APPLY", "临时车辆申请"),
PERSON_APPLY("PERSON_APPLY", "临时人申请"),
ONE_LEVEL_CAR_APPLY("ONE_LEVEL_CAR_APPLY", "一级临时车"),
ONE_LEVEL_PERSON_APPLY("ONE_PERSON_APPLY", "一级临时人"),
TWO_LEVEL_PERSON_APPLY("TWO_LEVEL_PERSON_APPLY", "二级临时人"),
TWO_LEVEL_CAR_APPLY("TWO_LEVEL_CAR_APPLY", "二级临时车");
private String code;
private String desc;
TmpApplyEnum(String code, String desc) {
this.code = code;
this.desc = desc;
}
public String getCode() {
return code;
}
public String getDesc() {
return desc;
}
}

3
web-infrastructure/src/main/java/com/zcloud/primeport/persistence/mapper/ClosedAreaCarApplyMapper.java
View File

@ -7,6 +7,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import org.apache.ibatis.annotations.Mapper;
import java.util.Map;
import org.apache.ibatis.annotations.Param;
/**
* web-infrastructure
@ -17,6 +18,6 @@ import java.util.Map;
@Mapper
public interface ClosedAreaCarApplyMapper extends BaseMapper<ClosedAreaCarApplyDO> {
IPage<ClosedAreaCarApplyDO> listPage(Page<Map<String, Object>> page, Map<String, Object> params, String menuPerms);
IPage<ClosedAreaCarApplyDO> listPage(Page<Map<String, Object>> page, @Param("params") Map<String, Object> params, String menuPerms);
}

3
web-infrastructure/src/main/java/com/zcloud/primeport/persistence/mapper/ClosedAreaMapper.java
View File

@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
import com.zcloud.primeport.persistence.dataobject.ClosedAreaDO;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import java.util.List;
import java.util.Map;
@ -19,6 +20,6 @@ public interface ClosedAreaMapper extends BaseMapper<ClosedAreaDO> {
List<ClosedAreaDO> getCountByHgAuthArea();
IPage<ClosedAreaDO> listPage(IPage<ClosedAreaDO> iPage, Map<String, Object> params);
IPage<ClosedAreaDO> listPage(IPage<ClosedAreaDO> iPage, @Param("params") Map<String, Object> params);
}

5
web-infrastructure/src/main/java/com/zcloud/primeport/persistence/mapper/ClosedAreaPersonApplyMapper.java
View File

@ -6,6 +6,7 @@ import com.zcloud.primeport.persistence.dataobject.ClosedAreaPersonApplyDO;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.zcloud.primeport.persistence.dataobject.UserDto;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import java.util.Map;
@ -17,8 +18,8 @@ import java.util.Map;
@Mapper
public interface ClosedAreaPersonApplyMapper extends BaseMapper<ClosedAreaPersonApplyDO> {
IPage<UserDto> getCorpUserList(IPage<ClosedAreaPersonApplyDO> iPage, Map<String, Object> params);
IPage<UserDto> getCorpUserList(IPage<ClosedAreaPersonApplyDO> iPage, @Param("params") Map<String, Object> params);
IPage<ClosedAreaPersonApplyDO> listPage(Page<Map<String, Object>> page, Map<String, Object> parmas, String menuPerms);
IPage<ClosedAreaPersonApplyDO> listPage(Page<Map<String, Object>> page, @Param("params") Map<String, Object> params, String menuPerms);
}

3
web-infrastructure/src/main/java/com/zcloud/primeport/persistence/mapper/MkmjApprovalUserMapper.java
View File

@ -9,6 +9,7 @@ import com.zcloud.primeport.persistence.dataobject.MkmjApprovalUserDO;
import org.apache.ibatis.annotations.Mapper;
import java.util.Map;
import org.apache.ibatis.annotations.Param;
/**
* web-infrastructure
@ -22,6 +23,6 @@ import java.util.Map;
)
public interface MkmjApprovalUserMapper extends BaseMapper<MkmjApprovalUserDO> {
IPage<MkmjApprovalUserDO> listPage(Page<Map<String, Object>> page, Map<String, Object> parmas, String menuPerms);
IPage<MkmjApprovalUserDO> listPage(Page<Map<String, Object>> page, @Param("params") Map<String, Object> params, String menuPerms);
}

3
web-infrastructure/src/main/java/com/zcloud/primeport/persistence/mapper/MkmjGateMapper.java
View File

@ -7,6 +7,7 @@ import com.zcloud.primeport.persistence.dataobject.MkmjGateDO;
import org.apache.ibatis.annotations.Mapper;
import java.util.Map;
import org.apache.ibatis.annotations.Param;
/**
* web-infrastructure
@ -17,6 +18,6 @@ import java.util.Map;
@Mapper
public interface MkmjGateMapper extends BaseMapper<MkmjGateDO> {
IPage<MkmjGateDO> listPage(Page<Map<String, Object>> page, Map<String, Object> parmas, String menuPerms);
IPage<MkmjGateDO> listPage(Page<Map<String, Object>> page, @Param("params") Map<String, Object> params, String menuPerms);
}

3
web-infrastructure/src/main/java/com/zcloud/primeport/persistence/mapper/MkmjMapper.java
View File

@ -9,6 +9,7 @@ import com.zcloud.primeport.persistence.dataobject.MkmjDO;
import org.apache.ibatis.annotations.Mapper;
import java.util.Map;
import org.apache.ibatis.annotations.Param;
/**
* web-infrastructure
@ -22,6 +23,6 @@ import java.util.Map;
)
public interface MkmjMapper extends BaseMapper<MkmjDO> {
IPage<MkmjDO> listPage(Page<Map<String, Object>> page, Map<String, Object> parmas, String menuPerms);
IPage<MkmjDO> listPage(Page<Map<String, Object>> page, @Param("params") Map<String, Object> params, String menuPerms);
}

3
web-infrastructure/src/main/java/com/zcloud/primeport/persistence/mapper/MkmjPassageMapper.java
View File

@ -7,9 +7,10 @@ import com.zcloud.primeport.persistence.dataobject.MkmjPassageDO;
import org.apache.ibatis.annotations.Mapper;
import java.util.Map;
import org.apache.ibatis.annotations.Param;
@Mapper
public interface MkmjPassageMapper extends BaseMapper<MkmjPassageDO> {
IPage<MkmjPassageDO> listPage(Page<Map<String, Object>> page, Map<String, Object> parmas, String menuPerms);
IPage<MkmjPassageDO> listPage(Page<Map<String, Object>> page, @Param("params") Map<String, Object> params, String menuPerms);
}

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

@ -8,6 +8,7 @@ import com.zcloud.primeport.persistence.dataobject.XgfApplyPersonDO;
import org.apache.ibatis.annotations.Mapper;
import java.util.Map;
import org.apache.ibatis.annotations.Param;
/**
* web-infrastructure
@ -18,8 +19,8 @@ import java.util.Map;
@Mapper
public interface PersonApplyMapper extends BaseMapper<PersonApplyDO> {
IPage<PersonApplyDO> listPage(Page<Map<String, Object>> page, Map<String, Object> parmas, 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, Map<String, Object> parmas, String menuPerms);
IPage<PersonApplyDO> xgfPersonPermissionsList(Page<Map<String, Object>> page, @Param("params") Map<String, Object> params, String menuPerms);
}

3
web-infrastructure/src/main/java/com/zcloud/primeport/persistence/mapper/VehicleApplyMapper.java
View File

@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.zcloud.primeport.persistence.dataobject.FgsVehicleCountDto;
import com.zcloud.primeport.persistence.dataobject.VehicleApplyDO;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import java.util.HashMap;
import java.util.Map;
@ -19,7 +20,7 @@ import java.util.Map;
@Mapper
public interface VehicleApplyMapper extends BaseMapper<VehicleApplyDO> {
IPage<VehicleApplyDO> listPage(Page<Map<String, Object>> page, Map<String, Object> parmas, String menuPerms);
IPage<VehicleApplyDO> listPage(Page<Map<String, Object>> page, @Param("params") Map<String, Object> params, String menuPerms);
IPage<FgsVehicleCountDto> fgsCount(Page<Map<String, Object>> page, HashMap<String, String> qry);
}

5
web-infrastructure/src/main/java/com/zcloud/primeport/persistence/mapper/VehicleAuditMapper.java
View File

@ -9,6 +9,7 @@ import com.zcloud.primeport.persistence.dataobject.VehicleAuditDO;
import org.apache.ibatis.annotations.Mapper;
import java.util.Map;
import org.apache.ibatis.annotations.Param;
/**
* web-infrastructure
@ -22,7 +23,7 @@ import java.util.Map;
)
public interface VehicleAuditMapper extends BaseMapper<VehicleAuditDO> {
IPage<VehicleAuditDO> listPage(Page<Map<String, Object>> page, Map<String, Object> parmas, String menuPerms);
IPage<VehicleAuditDO> listPage(Page<Map<String, Object>> page, @Param("params") Map<String, Object> params, String menuPerms);
IPage<VehicleAuditDO> carApprovalLogByvehicleApplyIdList(Page<Map<String, Object>> page, Map<String, Object> parmas);
IPage<VehicleAuditDO> carApprovalLogByvehicleApplyIdList(Page<Map<String, Object>> page, @Param("params") Map<String, Object> params);
}

3
web-infrastructure/src/main/java/com/zcloud/primeport/persistence/mapper/VehicleBlackMapper.java
View File

@ -8,6 +8,7 @@ import com.zcloud.primeport.persistence.dataobject.VehicleBlackDO;
import org.apache.ibatis.annotations.Mapper;
import java.util.Map;
import org.apache.ibatis.annotations.Param;
/**
* web-infrastructure
@ -20,6 +21,6 @@ public interface VehicleBlackMapper extends BaseMapper<VehicleBlackDO> {
VehicleBlackDO getInfoById(Long id);
IPage<VehicleBlackDO> listPage(Page<Map<String, Object>> page, Map<String, Object> parmas);
IPage<VehicleBlackDO> listPage(Page<Map<String, Object>> page, @Param("params") Map<String, Object> params);
}

3
web-infrastructure/src/main/java/com/zcloud/primeport/persistence/mapper/VehicleViolationsMapper.java
View File

@ -8,6 +8,7 @@ import org.apache.ibatis.annotations.Mapper;
import java.util.List;
import java.util.Map;
import org.apache.ibatis.annotations.Param;
/**
* web-infrastructure
@ -18,7 +19,7 @@ import java.util.Map;
@Mapper
public interface VehicleViolationsMapper extends BaseMapper<VehicleViolationsDO> {
IPage<VehicleViolationsDO> violationRecordslistPage(Page<Map<String, Object>> page, Map<String, Object> parmas);
IPage<VehicleViolationsDO> violationRecordslistPage(Page<Map<String, Object>> page, @Param("params") Map<String, Object> params);
List<VehicleViolationsDO> listVehicleViolationByLicenceNo(String licenceNo);
}

7
web-infrastructure/src/main/java/com/zcloud/primeport/persistence/mapper/XgfApplyPersonMapper.java
View File

@ -9,6 +9,7 @@ import com.zcloud.primeport.persistence.dataobject.XgfApplyPersonDO;
import org.apache.ibatis.annotations.Mapper;
import java.util.Map;
import org.apache.ibatis.annotations.Param;
/**
* web-infrastructure
@ -18,11 +19,11 @@ import java.util.Map;
*/
@Mapper
public interface XgfApplyPersonMapper extends BaseMapper<XgfApplyPersonDO> {
IPage<XgfApplyPersonDO> listPage(Page<Map<String, Object>> page, Map<String, Object> parmas, String menuPerms);
IPage<XgfApplyPersonDO> listPage(Page<Map<String, Object>> page, @Param("params") Map<String, Object> params, String menuPerms);
IPage<XgfApplyPersonDO> xgfPersonAuditList(Page<Map<String, Object>> page, Map<String, Object> parmas, String menuPerms);
IPage<XgfApplyPersonDO> xgfPersonAuditList(Page<Map<String, Object>> page, @Param("params") Map<String, Object> params, String menuPerms);
IPage<PersonCountDto> personnelVehicleManagementList(Page<Map<String, Object>> page, Map<String, Object> parmas, String menuPerms);
IPage<PersonCountDto> personnelVehicleManagementList(Page<Map<String, Object>> page, @Param("params") Map<String, Object> params, String menuPerms);
}

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

@ -13,6 +13,6 @@ import java.util.Map;
* @Date 2026-03-20 10:07:14
*/
public interface ClosedAreaCarApplyRepository extends BaseRepository<ClosedAreaCarApplyDO> {
PageResponse<ClosedAreaCarApplyDO> listPage(Map<String, Object> params);
PageResponse<ClosedAreaCarApplyDO> listPage(@Param("params") Map<String, Object> params);
}

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

@ -15,6 +15,6 @@ import java.util.Map;
public interface ClosedAreaPersonApplyRepository extends BaseRepository<ClosedAreaPersonApplyDO> {
PageResponse<ClosedAreaPersonApplyDO> listPage(Map<String,Object> params);
PageResponse<UserDto> getCorpUserList(Map<String, Object> params);
PageResponse<UserDto> getCorpUserList(@Param("params") Map<String, Object> params);
}

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

@ -6,7 +6,7 @@ import com.zcloud.primeport.persistence.dataobject.MkmjApprovalUserDO;
import java.util.Map;
public interface MkmjApprovalUserRepository extends BaseRepository<MkmjApprovalUserDO> {
PageResponse<MkmjApprovalUserDO> listPage(Map<String, Object> parmas);
PageResponse<MkmjApprovalUserDO> listPage(@Param("params") Map<String, Object> params);
Integer countByMkmjId(Long mkmjId);
}

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

@ -6,7 +6,7 @@ import com.zcloud.primeport.persistence.dataobject.MkmjGateDO;
import java.util.Map;
public interface MkmjGateRepository extends BaseRepository<MkmjGateDO> {
PageResponse<MkmjGateDO> listPage(Map<String, Object> parmas);
PageResponse<MkmjGateDO> listPage(@Param("params") Map<String, Object> params);
Integer countByMkmjId(Long mkmjId);

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

@ -6,7 +6,7 @@ import com.zcloud.primeport.persistence.dataobject.MkmjPassageDO;
import java.util.Map;
public interface MkmjPassageRepository extends BaseRepository<MkmjPassageDO> {
PageResponse<MkmjPassageDO> listPage(Map<String, Object> parmas);
PageResponse<MkmjPassageDO> listPage(@Param("params") Map<String, Object> params);
Integer countByMkmjId(Long mkmjId);
}

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

@ -7,7 +7,7 @@ import com.zcloud.primeport.persistence.dataobject.MkmjDO;
import java.util.Map;
public interface MkmjRepository extends BaseRepository<MkmjDO> {
PageResponse<MkmjDO> listPage(Map<String, Object> parmas);
PageResponse<MkmjDO> listPage(@Param("params") Map<String, Object> params);
Boolean checkName(String mkmjName, Long excludeId);
}

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

@ -12,8 +12,8 @@ import java.util.Map;
* @Date 2026-03-05 11:33:22
*/
public interface PersonApplyRepository extends BaseRepository<PersonApplyDO> {
PageResponse<PersonApplyDO> listPage(Map<String, Object> parmas);
PageResponse<PersonApplyDO> listPage(@Param("params") Map<String, Object> params);
PageResponse<PersonApplyDO> xgfPersonPermissionsList(Map<String, Object> parmas);
PageResponse<PersonApplyDO> xgfPersonPermissionsList(@Param("params") Map<String, Object> params);
}

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

@ -12,6 +12,6 @@ import java.util.Map;
* @Date 2026-03-05 11:33:21
*/
public interface PersonMessageRepository extends BaseRepository<PersonMessageDO> {
PageResponse<PersonMessageDO> listPage(Map<String, Object> parmas);
PageResponse<PersonMessageDO> listPage(@Param("params") Map<String, Object> params);
}

4
web-infrastructure/src/main/java/com/zcloud/primeport/persistence/repository/VehicleApplyRepository.java
View File

@ -15,10 +15,10 @@ import java.util.Map;
* @Date 2026-03-05 11:33:24
*/
public interface VehicleApplyRepository extends BaseRepository<VehicleApplyDO> {
PageResponse<VehicleApplyDO> listPage(Map<String, Object> parmas);
PageResponse<VehicleApplyDO> listPage(@Param("params") Map<String, Object> params);
PageResponse<FgsVehicleCountDto> fgsCount(HashMap<String, String> qry);
PageResponse<VehicleApplyDO> getCarByVehicleBelongType(Map<String, Object> parmas);
PageResponse<VehicleApplyDO> getCarByVehicleBelongType(@Param("params") Map<String, Object> params);
}

4
web-infrastructure/src/main/java/com/zcloud/primeport/persistence/repository/VehicleAuditRepository.java
View File

@ -12,9 +12,9 @@ import java.util.Map;
* @Date 2026-03-05 11:33:25
*/
public interface VehicleAuditRepository extends BaseRepository<VehicleAuditDO> {
PageResponse<VehicleAuditDO> listPage(Map<String, Object> parmas);
PageResponse<VehicleAuditDO> listPage(@Param("params") Map<String, Object> params);
PageResponse<VehicleAuditDO> carApprovalLogByvehicleApplyIdList( Map<String, Object> parmas);
PageResponse<VehicleAuditDO> carApprovalLogByvehicleApplyIdList( @Param("params") Map<String, Object> params);
}

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

@ -12,7 +12,7 @@ import java.util.Map;
* @Date 2026-03-05 11:33:27
*/
public interface VehicleBlackRepository extends BaseRepository<VehicleBlackDO> {
PageResponse<VehicleBlackDO> listPage(Map<String, Object> parmas);
PageResponse<VehicleBlackDO> listPage(@Param("params") Map<String, Object> params);
VehicleBlackDO getInfoById(Long id);
}

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

@ -13,6 +13,6 @@ import java.util.Map;
* @Date 2026-03-05 11:33:28
*/
public interface VehicleMessageRepository extends BaseRepository<VehicleMessageDO> {
PageResponse<VehicleMessageDO> listPage(Map<String, Object> parmas);
PageResponse<VehicleMessageDO> listPage(@Param("params") Map<String, Object> params);
}

4
web-infrastructure/src/main/java/com/zcloud/primeport/persistence/repository/VehicleViolationsRepository.java
View File

@ -15,9 +15,9 @@ import java.util.Map;
* @Date 2026-03-05 11:33:29
*/
public interface VehicleViolationsRepository extends BaseRepository<VehicleViolationsDO> {
PageResponse<VehicleViolationsDO> listPage(Map<String, Object> parmas);
PageResponse<VehicleViolationsDO> listPage(@Param("params") Map<String, Object> params);
PageResponse<VehicleViolationsDO> violationRecordslistPage(Map<String, Object> parmas);
PageResponse<VehicleViolationsDO> violationRecordslistPage(@Param("params") Map<String, Object> params);
List<VehicleViolationsDO> listVehicleViolationByLicenceNo(String licenceNo);
}

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

@ -6,7 +6,7 @@ import com.zcloud.primeport.persistence.dataobject.VideoDO;
import java.util.Map;
public interface VideoRepository extends BaseRepository<VideoDO> {
PageResponse<VideoDO> listPage(Map<String, Object> parmas);
PageResponse<VideoDO> listPage(@Param("params") Map<String, Object> params);
Integer countByForeignIdAndDeviceType(Long foreignId, Integer deviceType);

6
web-infrastructure/src/main/java/com/zcloud/primeport/persistence/repository/XgfApplyPersonRepository.java
View File

@ -15,10 +15,10 @@ import java.util.Map;
* @Date 2026-03-05 11:33:22
*/
public interface XgfApplyPersonRepository extends BaseRepository<XgfApplyPersonDO> {
PageResponse<XgfApplyPersonDO> xgfPersonAuditList(Map<String, Object> parmas);
PageResponse<XgfApplyPersonDO> xgfPersonAuditList(@Param("params") Map<String, Object> params);
PageResponse<PersonCountDto> personnelVehicleManagementList(Map<String, Object> parmas);
PageResponse<PersonCountDto> personnelVehicleManagementList(@Param("params") Map<String, Object> params);
PageResponse<XgfApplyPersonDO> listPage(Map<String, Object> parmas);
PageResponse<XgfApplyPersonDO> listPage(@Param("params") Map<String, Object> params);
}

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

@ -26,7 +26,7 @@ public class ClosedAreaCarApplyRepositoryImpl extends BaseRepositoryImpl<ClosedA
private final ClosedAreaCarApplyMapper closedAreaCarApplyMapper;
@Override
public PageResponse<ClosedAreaCarApplyDO> listPage(Map<String, Object> params) {
public PageResponse<ClosedAreaCarApplyDO> listPage(@Param("params") 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 = "";

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

@ -31,19 +31,19 @@ public class ClosedAreaPersonApplyRepositoryImpl extends BaseRepositoryImpl<Clos
private final ClosedAreaPersonApplyMapper closedAreaPersonApplyMapper;
@Override
public PageResponse<ClosedAreaPersonApplyDO> listPage(Map<String, Object> parmas) {
Page<Map<String, Object>> page = new Page<>(Integer.parseInt(parmas.get("pageIndex").toString()),
Integer.parseInt(parmas.get("pageSize").toString()));
public PageResponse<ClosedAreaPersonApplyDO> listPage(@Param("params") 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(parmas.get("menuPath"))) {
menuPerms = MenuEnum.getMenuKeyByPath(parmas.get("menuPath").toString());
if (!org.springframework.util.ObjectUtils.isEmpty(params.get("menuPath"))) {
menuPerms = MenuEnum.getMenuKeyByPath(params.get("menuPath").toString());
}
IPage<ClosedAreaPersonApplyDO> result = closedAreaPersonApplyMapper.listPage(page, parmas,menuPerms);
IPage<ClosedAreaPersonApplyDO> result = closedAreaPersonApplyMapper.listPage(page, params,menuPerms);
return PageHelper.pageToResponse(result, result.getRecords());
}
@Override
public PageResponse<UserDto> getCorpUserList(Map<String, Object> params) {
public PageResponse<UserDto> getCorpUserList(@Param("params") Map<String, Object> params) {
IPage<ClosedAreaPersonApplyDO> iPage = new Query<ClosedAreaPersonApplyDO>().getPage(params);
IPage<UserDto> result = closedAreaPersonApplyMapper.getCorpUserList(iPage, params);
return PageHelper.pageToResponse(result, result.getRecords());

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

@ -29,7 +29,7 @@ public class ClosedAreaRepositoryImpl extends BaseRepositoryImpl<ClosedAreaMappe
private final ClosedAreaMapper closedAreaMapper;
@Override
public PageResponse<ClosedAreaDO> listPage(Map<String, Object> params) {
public PageResponse<ClosedAreaDO> listPage(@Param("params") Map<String, Object> params) {
IPage<ClosedAreaDO> iPage = new Query<ClosedAreaDO>().getPage(params);
IPage<ClosedAreaDO> result = closedAreaMapper.listPage(iPage, params);

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

@ -24,14 +24,14 @@ public class MkmjApprovalUserRepositoryImpl extends BaseRepositoryImpl<MkmjAppro
private final MkmjApprovalUserMapper mkmjApprovalUserMapper;
@Override
public PageResponse<MkmjApprovalUserDO> listPage(Map<String, Object> parmas) {
Page<Map<String, Object>> page = new Page<>(Integer.parseInt(parmas.get("pageIndex").toString()),
Integer.parseInt(parmas.get("pageSize").toString()));
public PageResponse<MkmjApprovalUserDO> listPage(@Param("params") 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(parmas.get("menuPath"))) {
menuPerms = MenuEnum.getMenuKeyByPath(parmas.get("menuPath").toString());
if (!org.springframework.util.ObjectUtils.isEmpty(params.get("menuPath"))) {
menuPerms = MenuEnum.getMenuKeyByPath(params.get("menuPath").toString());
}
IPage<MkmjApprovalUserDO> result = mkmjApprovalUserMapper.listPage(page, parmas,menuPerms);
IPage<MkmjApprovalUserDO> result = mkmjApprovalUserMapper.listPage(page, params,menuPerms);
return PageHelper.pageToResponse(result, result.getRecords());
}

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

@ -25,14 +25,14 @@ public class MkmjGateRepositoryImpl extends BaseRepositoryImpl<MkmjGateMapper, M
private final MkmjGateMapper mkmjGateMapper;
@Override
public PageResponse<MkmjGateDO> listPage(Map<String, Object> parmas) {
Page<Map<String, Object>> page = new Page<>(Integer.parseInt(parmas.get("pageIndex").toString()),
Integer.parseInt(parmas.get("pageSize").toString()));
public PageResponse<MkmjGateDO> listPage(@Param("params") 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(parmas.get("menuPath"))) {
menuPerms = MenuEnum.getMenuKeyByPath(parmas.get("menuPath").toString());
if (!org.springframework.util.ObjectUtils.isEmpty(params.get("menuPath"))) {
menuPerms = MenuEnum.getMenuKeyByPath(params.get("menuPath").toString());
}
IPage<MkmjGateDO> result = mkmjGateMapper.listPage(page, parmas, menuPerms);
IPage<MkmjGateDO> result = mkmjGateMapper.listPage(page, params, menuPerms);
return PageHelper.pageToResponse(result, result.getRecords());
}

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

@ -23,13 +23,13 @@ public class MkmjPassageRepositoryImpl extends BaseRepositoryImpl<MkmjPassageMap
private final MkmjPassageMapper mkmjPassageMapper;
@Override
public PageResponse<MkmjPassageDO> listPage(Map<String, Object> parmas) {
Page<Map<String, Object>> page = new Page<>(Integer.parseInt(parmas.get("pageIndex").toString()), Integer.parseInt(parmas.get("pageSize").toString()));
public PageResponse<MkmjPassageDO> listPage(@Param("params") 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(parmas.get("menuPath"))) {
menuPerms = MenuEnum.getMenuKeyByPath(parmas.get("menuPath").toString());
if (!org.springframework.util.ObjectUtils.isEmpty(params.get("menuPath"))) {
menuPerms = MenuEnum.getMenuKeyByPath(params.get("menuPath").toString());
}
IPage<MkmjPassageDO> iPage = mkmjPassageMapper.listPage(page, parmas, menuPerms);
IPage<MkmjPassageDO> iPage = mkmjPassageMapper.listPage(page, params, menuPerms);
return PageHelper.pageToResponse(iPage, iPage.getRecords());
}

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

@ -23,13 +23,13 @@ public class MkmjRepositoryImpl extends BaseRepositoryImpl<MkmjMapper, MkmjDO> i
private final MkmjMapper mkmjMapper;
@Override
public PageResponse<MkmjDO> listPage(Map<String, Object> parmas) {
Page<Map<String, Object>> page = new Page<>(Integer.parseInt(parmas.get("pageIndex").toString()), Integer.parseInt(parmas.get("pageSize").toString()));
public PageResponse<MkmjDO> listPage(@Param("params") 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(parmas.get("menuPath"))) {
menuPerms = MenuEnum.getMenuKeyByPath(parmas.get("menuPath").toString());
if (!org.springframework.util.ObjectUtils.isEmpty(params.get("menuPath"))) {
menuPerms = MenuEnum.getMenuKeyByPath(params.get("menuPath").toString());
}
IPage<MkmjDO> iPage = mkmjMapper.listPage(page, parmas, menuPerms);
IPage<MkmjDO> iPage = mkmjMapper.listPage(page, params, menuPerms);
return PageHelper.pageToResponse(iPage, iPage.getRecords());
}

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

@ -31,26 +31,26 @@ public class PersonApplyRepositoryImpl extends BaseRepositoryImpl<PersonApplyMap
private final PersonApplyMapper personApplyMapper;
@Override
public PageResponse<PersonApplyDO> listPage(Map<String, Object> parmas) {
Page<Map<String, Object>> page = new Page<>(Integer.parseInt(parmas.get("pageIndex").toString()),
Integer.parseInt(parmas.get("pageSize").toString()));
public PageResponse<PersonApplyDO> listPage(@Param("params") 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(parmas.get("menuPath"))) {
menuPerms = MenuEnum.getMenuKeyByPath(parmas.get("menuPath").toString());
if (!org.springframework.util.ObjectUtils.isEmpty(params.get("menuPath"))) {
menuPerms = MenuEnum.getMenuKeyByPath(params.get("menuPath").toString());
}
IPage<PersonApplyDO> iPage = personApplyMapper.listPage(page, parmas, menuPerms);
IPage<PersonApplyDO> iPage = personApplyMapper.listPage(page, params, menuPerms);
return PageHelper.pageToResponse(iPage, iPage.getRecords());
}
@Override
public PageResponse<PersonApplyDO> xgfPersonPermissionsList(Map<String, Object> parmas) {
Page<Map<String, Object>> page = new Page<>(Integer.parseInt(parmas.get("pageIndex").toString())
, Integer.parseInt(parmas.get("pageSize").toString()));
public PageResponse<PersonApplyDO> xgfPersonPermissionsList(@Param("params") 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(parmas.get("menuPath"))) {
menuPerms = MenuEnum.getMenuKeyByPath(parmas.get("menuPath").toString());
if (!org.springframework.util.ObjectUtils.isEmpty(params.get("menuPath"))) {
menuPerms = MenuEnum.getMenuKeyByPath(params.get("menuPath").toString());
}
IPage<PersonApplyDO> result = personApplyMapper.xgfPersonPermissionsList(page, parmas,menuPerms);
IPage<PersonApplyDO> result = personApplyMapper.xgfPersonPermissionsList(page, params,menuPerms);
return PageHelper.pageToResponse(result, result.getRecords());
}
}

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

@ -26,10 +26,10 @@ public class PersonMessageRepositoryImpl extends BaseRepositoryImpl<PersonMessag
private final PersonMessageMapper personMessageMapper;
@Override
public PageResponse<PersonMessageDO> listPage(Map<String, Object> parmas) {
IPage<PersonMessageDO> iPage = new Query<PersonMessageDO>().getPage(parmas);
public PageResponse<PersonMessageDO> listPage(@Param("params") Map<String, Object> params) {
IPage<PersonMessageDO> iPage = new Query<PersonMessageDO>().getPage(params);
QueryWrapper<PersonMessageDO> queryWrapper = new QueryWrapper<>();
queryWrapper = PageQueryHelper.createPageQueryWrapper(queryWrapper, parmas);
queryWrapper = PageQueryHelper.createPageQueryWrapper(queryWrapper, params);
queryWrapper.orderByDesc("create_time");
IPage<PersonMessageDO> result = personMessageMapper.selectPage(iPage, queryWrapper);
return PageHelper.pageToResponse(result, result.getRecords());

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

@ -36,14 +36,14 @@ public class VehicleApplyRepositoryImpl extends BaseRepositoryImpl<VehicleApplyM
private final VehicleApplyMapper vehicleApplyMapper;
@Override
public PageResponse<VehicleApplyDO> listPage(Map<String, Object> parmas) {
Page<Map<String, Object>> page = new Page<>(Integer.parseInt(parmas.get("pageIndex").toString()),
Integer.parseInt(parmas.get("pageSize").toString()));
public PageResponse<VehicleApplyDO> listPage(@Param("params") 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(parmas.get("menuPath"))) {
menuPerms = MenuEnum.getMenuKeyByPath(parmas.get("menuPath").toString());
if (!org.springframework.util.ObjectUtils.isEmpty(params.get("menuPath"))) {
menuPerms = MenuEnum.getMenuKeyByPath(params.get("menuPath").toString());
}
IPage<VehicleApplyDO> result = vehicleApplyMapper.listPage(page, parmas,menuPerms);
IPage<VehicleApplyDO> result = vehicleApplyMapper.listPage(page, params,menuPerms);
return PageHelper.pageToResponse(result, result.getRecords());
}
@ -57,14 +57,14 @@ public class VehicleApplyRepositoryImpl extends BaseRepositoryImpl<VehicleApplyM
}
@Override
public PageResponse<VehicleApplyDO> getCarByVehicleBelongType(Map<String, Object> parmas) {
IPage<VehicleApplyDO> iPage = new Query<VehicleApplyDO>().getPage(parmas);
public PageResponse<VehicleApplyDO> getCarByVehicleBelongType(@Param("params") Map<String, Object> params) {
IPage<VehicleApplyDO> iPage = new Query<VehicleApplyDO>().getPage(params);
QueryWrapper<VehicleApplyDO> queryWrapper = new QueryWrapper<>();
queryWrapper.eq("vehicle_belong_type", parmas.get("vehicleBelongType"));
queryWrapper.eq("vehicle_belong_type", params.get("vehicleBelongType"));
queryWrapper.eq("audit_flag", AuditEnum.APPROVED.getCode());
queryWrapper.eq("mkmj_permission", 1);
queryWrapper.like(Tools.notEmpty(parmas.get("licenceNo").toString()),"mkmj_permission", parmas.get("licenceNo"));
String vehicleBelongType = parmas.get("vehicleBelongType").toString();
queryWrapper.like(Tools.notEmpty(params.get("licenceNo").toString()),"mkmj_permission", params.get("licenceNo"));
String vehicleBelongType = params.get("vehicleBelongType").toString();
if (VehicleBelongTypeEnum.JGD_PRI_VEHICLES.getCode().equals(vehicleBelongType) ||VehicleBelongTypeEnum.FGS_PRI_VEHICLES.getCode().equals(vehicleBelongType)) {
// 分公司、股份个人车，查询当前登录用户车辆
queryWrapper.eq("employee_vehicle_user_id", AuthContext.getUserId());

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

@ -32,27 +32,27 @@ public class VehicleAuditRepositoryImpl extends BaseRepositoryImpl<VehicleAuditM
private final VehicleAuditMapper vehicleAuditMapper;
@Override
public PageResponse<VehicleAuditDO> listPage(Map<String, Object> parmas) {
Page<Map<String, Object>> page = new Page<>(Integer.parseInt(parmas.get("pageIndex").toString()), Integer.parseInt(parmas.get("pageSize").toString()));
public PageResponse<VehicleAuditDO> listPage(@Param("params") 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(parmas.get("menuPath"))) {
menuPerms = MenuEnum.getMenuKeyByPath(parmas.get("menuPath").toString());
if (!org.springframework.util.ObjectUtils.isEmpty(params.get("menuPath"))) {
menuPerms = MenuEnum.getMenuKeyByPath(params.get("menuPath").toString());
}
if (!Tools.isEmpty(parmas.get("gateLevelAuthAreaId"))) {
parmas.put("gateLevelAuthAreaIdList",parmas.get("gateLevelAuthAreaId").toString().split(","));
if (!Tools.isEmpty(params.get("gateLevelAuthAreaId"))) {
params.put("gateLevelAuthAreaIdList",params.get("gateLevelAuthAreaId").toString().split(","));
}
if (!Tools.isEmpty(parmas.get("vehicleBelongTypeArr"))) {
parmas.put("vehicleBelongTypeArrList",parmas.get("vehicleBelongTypeArr").toString().split(","));
if (!Tools.isEmpty(params.get("vehicleBelongTypeArr"))) {
params.put("vehicleBelongTypeArrList",params.get("vehicleBelongTypeArr").toString().split(","));
}
IPage<VehicleAuditDO> result = vehicleAuditMapper.listPage(page, parmas, menuPerms);
IPage<VehicleAuditDO> result = vehicleAuditMapper.listPage(page, params, menuPerms);
return PageHelper.pageToResponse(result, result.getRecords());
}
@Override
public PageResponse<VehicleAuditDO> carApprovalLogByvehicleApplyIdList(Map<String, Object> parmas) {
Page<Map<String, Object>> page = new Page<>(Integer.parseInt(parmas.get("pageIndex").toString()),
Integer.parseInt(parmas.get("pageSize").toString()));
IPage<VehicleAuditDO> result = vehicleAuditMapper.carApprovalLogByvehicleApplyIdList(page, parmas);
public PageResponse<VehicleAuditDO> carApprovalLogByvehicleApplyIdList(@Param("params") Map<String, Object> params) {
Page<Map<String, Object>> page = new Page<>(Integer.parseInt(params.get("pageIndex").toString()),
Integer.parseInt(params.get("pageSize").toString()));
IPage<VehicleAuditDO> result = vehicleAuditMapper.carApprovalLogByvehicleApplyIdList(page, params);
return PageHelper.pageToResponse(result, result.getRecords());
}

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

@ -30,10 +30,10 @@ public class VehicleBlackRepositoryImpl extends BaseRepositoryImpl<VehicleBlackM
private final VehicleBlackMapper vehicleBlackMapper;
@Override
public PageResponse<VehicleBlackDO> listPage(Map<String, Object> parmas) {
Page<Map<String, Object>> page = new Page<>(Integer.parseInt(parmas.get("pageIndex").toString()),
Integer.parseInt(parmas.get("pageSize").toString()));
IPage<VehicleBlackDO> result = vehicleBlackMapper.listPage(page, parmas);
public PageResponse<VehicleBlackDO> listPage(@Param("params") Map<String, Object> params) {
Page<Map<String, Object>> page = new Page<>(Integer.parseInt(params.get("pageIndex").toString()),
Integer.parseInt(params.get("pageSize").toString()));
IPage<VehicleBlackDO> result = vehicleBlackMapper.listPage(page, params);
return PageHelper.pageToResponse(result, result.getRecords());
}

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

@ -27,10 +27,10 @@ public class VehicleMessageRepositoryImpl extends BaseRepositoryImpl<VehicleMess
private final VehicleMessageMapper vehicleMessageMapper;
@Override
public PageResponse<VehicleMessageDO> listPage(Map<String, Object> parmas) {
IPage<VehicleMessageDO> iPage = new Query<VehicleMessageDO>().getPage(parmas);
public PageResponse<VehicleMessageDO> listPage(@Param("params") Map<String, Object> params) {
IPage<VehicleMessageDO> iPage = new Query<VehicleMessageDO>().getPage(params);
QueryWrapper<VehicleMessageDO> queryWrapper = new QueryWrapper<>();
queryWrapper = PageQueryHelper.createPageQueryWrapper(queryWrapper, parmas);
queryWrapper = PageQueryHelper.createPageQueryWrapper(queryWrapper, params);
queryWrapper.orderByDesc("create_time");
IPage<VehicleMessageDO> result = vehicleMessageMapper.selectPage(iPage, queryWrapper);
return PageHelper.pageToResponse(result, result.getRecords());

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

@ -32,20 +32,20 @@ public class VehicleViolationsRepositoryImpl extends BaseRepositoryImpl<VehicleV
private final VehicleViolationsMapper vehicleViolationsMapper;
@Override
public PageResponse<VehicleViolationsDO> listPage(Map<String, Object> parmas) {
IPage<VehicleViolationsDO> iPage = new Query<VehicleViolationsDO>().getPage(parmas);
public PageResponse<VehicleViolationsDO> listPage(@Param("params") Map<String, Object> params) {
IPage<VehicleViolationsDO> iPage = new Query<VehicleViolationsDO>().getPage(params);
QueryWrapper<VehicleViolationsDO> queryWrapper = new QueryWrapper<>();
queryWrapper = PageQueryHelper.createPageQueryWrapper(queryWrapper, parmas);
queryWrapper = PageQueryHelper.createPageQueryWrapper(queryWrapper, params);
queryWrapper.orderByDesc("create_time");
IPage<VehicleViolationsDO> result = vehicleViolationsMapper.selectPage(iPage, queryWrapper);
return PageHelper.pageToResponse(result, result.getRecords());
}
@Override
public PageResponse<VehicleViolationsDO> violationRecordslistPage(Map<String, Object> parmas) {
Page<Map<String, Object>> page = new Page<>(Integer.parseInt(parmas.get("pageIndex").toString()), Integer.parseInt(parmas.get("pageSize").toString()));
public PageResponse<VehicleViolationsDO> violationRecordslistPage(@Param("params") Map<String, Object> params) {
Page<Map<String, Object>> page = new Page<>(Integer.parseInt(params.get("pageIndex").toString()), Integer.parseInt(params.get("pageSize").toString()));
IPage<VehicleViolationsDO> iPage = vehicleViolationsMapper.violationRecordslistPage(page, parmas);
IPage<VehicleViolationsDO> iPage = vehicleViolationsMapper.violationRecordslistPage(page, params);
return PageHelper.pageToResponse(iPage, iPage.getRecords());
}

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

@ -21,10 +21,10 @@ public class VideoRepositoryImpl extends BaseRepositoryImpl<VideoMapper, VideoDO
private final VideoMapper videoMapper;
@Override
public PageResponse<VideoDO> listPage(Map<String, Object> parmas) {
IPage<VideoDO> iPage = new Query<VideoDO>().getPage(parmas);
public PageResponse<VideoDO> listPage(@Param("params") Map<String, Object> params) {
IPage<VideoDO> iPage = new Query<VideoDO>().getPage(params);
QueryWrapper<VideoDO> queryWrapper = new QueryWrapper<>();
queryWrapper = PageQueryHelper.createPageQueryWrapper(queryWrapper, parmas);
queryWrapper = PageQueryHelper.createPageQueryWrapper(queryWrapper, params);
queryWrapper.orderByDesc("create_time");
IPage<VideoDO> result = videoMapper.selectPage(iPage, queryWrapper);
return PageHelper.pageToResponse(result, result.getRecords());

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

@ -37,35 +37,35 @@ public class XgfApplyPersonRepositoryImpl extends BaseRepositoryImpl<XgfApplyPer
private final XgfApplyPersonMapper xgfApplyPersonMapper;
@Override
public PageResponse<XgfApplyPersonDO> xgfPersonAuditList(Map<String, Object> parmas) {
Page<Map<String, Object>> page = new Page<>(Integer.parseInt(parmas.get("pageIndex").toString()), Integer.parseInt(parmas.get("pageSize").toString()));
public PageResponse<XgfApplyPersonDO> xgfPersonAuditList(@Param("params") 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(parmas.get("menuPath"))) {
menuPerms = MenuEnum.getMenuKeyByPath(parmas.get("menuPath").toString());
if (!org.springframework.util.ObjectUtils.isEmpty(params.get("menuPath"))) {
menuPerms = MenuEnum.getMenuKeyByPath(params.get("menuPath").toString());
}
IPage<XgfApplyPersonDO> result = xgfApplyPersonMapper.xgfPersonAuditList(page, parmas,menuPerms);
IPage<XgfApplyPersonDO> result = xgfApplyPersonMapper.xgfPersonAuditList(page, params,menuPerms);
return PageHelper.pageToResponse(result, result.getRecords());
}
@Override
public PageResponse<PersonCountDto> personnelVehicleManagementList(Map<String, Object> parmas) {
Page<Map<String, Object>> page = new Page<>(Integer.parseInt(parmas.get("pageIndex").toString()), Integer.parseInt(parmas.get("pageSize").toString()));
public PageResponse<PersonCountDto> personnelVehicleManagementList(@Param("params") 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(parmas.get("menuPath"))) {
menuPerms = MenuEnum.getMenuKeyByPath(parmas.get("menuPath").toString());
if (!org.springframework.util.ObjectUtils.isEmpty(params.get("menuPath"))) {
menuPerms = MenuEnum.getMenuKeyByPath(params.get("menuPath").toString());
}
IPage<PersonCountDto> result = xgfApplyPersonMapper.personnelVehicleManagementList(page, parmas,menuPerms);
IPage<PersonCountDto> result = xgfApplyPersonMapper.personnelVehicleManagementList(page, params,menuPerms);
return PageHelper.pageToResponse(result, result.getRecords());
}
@Override
public PageResponse<XgfApplyPersonDO> listPage(Map<String, Object> parmas) {
Page<Map<String, Object>> page = new Page<>(Integer.parseInt(parmas.get("pageIndex").toString()), Integer.parseInt(parmas.get("pageSize").toString()));
public PageResponse<XgfApplyPersonDO> listPage(@Param("params") 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(parmas.get("menuPath"))) {
menuPerms = MenuEnum.getMenuKeyByPath(parmas.get("menuPath").toString());
if (!org.springframework.util.ObjectUtils.isEmpty(params.get("menuPath"))) {
menuPerms = MenuEnum.getMenuKeyByPath(params.get("menuPath").toString());
}
IPage<XgfApplyPersonDO> result = xgfApplyPersonMapper.listPage(page, parmas,menuPerms);
IPage<XgfApplyPersonDO> result = xgfApplyPersonMapper.listPage(page, params,menuPerms);
return PageHelper.pageToResponse(result, result.getRecords());
}

8
web-infrastructure/src/main/resources/mapper/ClosedAreaMapper.xml
View File

@ -41,11 +41,11 @@
AND child.delete_enum = 'FALSE'
WHERE
c.delete_enum = 'FALSE'
<if test="parmas.parentId != null">
AND c.parent_id = #{parmas.parentId}
<if test="params.parentId != null">
AND c.parent_id = #{params.parentId}
</if>
<if test="parmas.closedAreaName != null and parmas.closedAreaName != ''">
AND C.closed_area_name LIKE CONCAT('%', #{parmas.closedAreaName}, '%')
<if test="params.closedAreaName != null and params.closedAreaName != ''">
AND C.closed_area_name LIKE CONCAT('%', #{params.closedAreaName}, '%')
</if>
GROUP BY
c.id

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

@ -42,11 +42,11 @@
u.delete_enum = 'FALSE'
AND u.main_corp_flag = 0
AND u.corpinfo_id = #{params.corpinfoId}
<if test="parmas.deptId != null">
AND u.department_id = #{parmas.deptId}
<if test="params.deptId != null">
AND u.department_id = #{params.deptId}
</if>
<if test="parmas.name != null and parmas.name != ''">
AND u.name like CONCAT('%', #{parmas.name}, '%')
<if test="params.name != null and params.name != ''">
AND u.name like CONCAT('%', #{params.name}, '%')
</if>
ORDER BY
u.department_id
@ -54,24 +54,24 @@
<select id="listPage" resultType="com.zcloud.primeport.persistence.dataobject.ClosedAreaPersonApplyDO">
select * from closed_area_person_apply c
where c.delete_enum = 'FALSE'
<if test="parmas.processOrRecord != null">
<if test="parmas.processOrRecord == 1">
<if test="params.processOrRecord != null">
<if test="params.processOrRecord == 1">
AND c.audit_flag = 1
</if>
<if test="parmas.processOrRecord == 2">
<if test="params.processOrRecord == 2">
AND c.audit_flag != 1
</if>
</if>
<if test="parmas.personBelongType != null">
<if test="parmas.personBelongType == 4">
<if test="params.personBelongType != null">
<if test="params.personBelongType == 4">
AND c.person_belong_type = 4
</if>
<if test="parmas.processOrRecord != 4">
<if test="params.processOrRecord != 4">
AND c.person_belong_type != 4
</if>
</if>
<if test="parmas.applyPersonUserName != null and parmas.applyPersonUserName != ''">
AND c.apply_person_user_name like CONCAT('%', #{parmas.applyPersonUserName}, '%')
<if test="params.applyPersonUserName != null and params.applyPersonUserName != ''">
AND c.apply_person_user_name like CONCAT('%', #{params.applyPersonUserName}, '%')
</if>
</select>
</mapper>

10
web-infrastructure/src/main/resources/mapper/MkmjApprovalUserDO.xml
View File

@ -7,12 +7,12 @@
<select id="listPage" resultType="com.zcloud.primeport.persistence.dataobject.MkmjApprovalUserDO">
select * from mkmj_approval_user g
where g.delete_enum = 'FALSE'
and g.corp_id = #{parmas.corpId}
<if test="parmas.dept_id != null">
AND g.dept_id = #{parmas.deptId}
and g.corp_id = #{params.corpId}
<if test="params.dept_id != null">
AND g.dept_id = #{params.deptId}
</if>
<if test="parmas.userName != null and parmas.userName != ''">
AND g.user_name LIKE CONCAT('%', #{parmas.userName}, '%')
<if test="params.userName != null and params.userName != ''">
AND g.user_name LIKE CONCAT('%', #{params.userName}, '%')
</if>
order by g.dept_id, g.create_time desc
</select>

20
web-infrastructure/src/main/resources/mapper/MkmjDO.xml
View File

@ -33,20 +33,20 @@
LEFT JOIN closed_area ca ON m.closed_area_id = ca.id AND ca.delete_enum = 'false'
WHERE
m.delete_enum = 'false'
<if test="parmas.hgAuthArea != null and parmas.hgAuthArea != ''">
AND m.hg_auth_area = #{parmas.hgAuthArea}
<if test="params.hgAuthArea != null and params.hgAuthArea != ''">
AND m.hg_auth_area = #{params.hgAuthArea}
</if>
<if test="parmas.mkmjName != null and parmas.mkmjName != ''">
AND m.mkmj_name LIKE CONCAT('%', #{parmas.mkmjName}, '%')
<if test="params.mkmjName != null and params.mkmjName != ''">
AND m.mkmj_name LIKE CONCAT('%', #{params.mkmjName}, '%')
</if>
<if test="parmas.mkmjLevel != null">
AND m.mkmj_level = #{parmas.mkmjLevel}
<if test="params.mkmjLevel != null">
AND m.mkmj_level = #{params.mkmjLevel}
</if>
<if test="parmas.mkmjType != null and parmas.mkmjType != ''">
AND m.mkmj_type = #{parmas.mkmjType}
<if test="params.mkmjType != null and params.mkmjType != ''">
AND m.mkmj_type = #{params.mkmjType}
</if>
<if test="parmas.mkmjStatus != null">
AND m.mkmj_status = #{parmas.mkmjStatus}
<if test="params.mkmjStatus != null">
AND m.mkmj_status = #{params.mkmjStatus}
</if>
GROUP BY m.id
ORDER BY m.mkmj_status asc,m.id DESC

24
web-infrastructure/src/main/resources/mapper/MkmjGateDO.xml
View File

@ -34,24 +34,24 @@
WHERE
g.delete_enum = 'false'
<if test="parmas.mkmjId != null and parmas.mkmjId != ''">
AND g.mkmj_id = #{parmas.mkmjId}
<if test="params.mkmjId != null and params.mkmjId != ''">
AND g.mkmj_id = #{params.mkmjId}
</if>
<if test="parmas.passageId != null and parmas.passageId != ''">
AND g.passage_id = #{parmas.passageId}
<if test="params.passageId != null and params.passageId != ''">
AND g.passage_id = #{params.passageId}
</if>
<if test="parmas.gateName != null and parmas.gateName != ''">
AND g.gate_name LIKE CONCAT('%', #{parmas.gateName}, '%')
<if test="params.gateName != null and params.gateName != ''">
AND g.gate_name LIKE CONCAT('%', #{params.gateName}, '%')
</if>
<if test="parmas.gateType != null and parmas.gateType != ''">
AND g.gate_type = #{parmas.gateType}
<if test="params.gateType != null and params.gateType != ''">
AND g.gate_type = #{params.gateType}
</if>
<if test="parmas.gateCategory != null and parmas.gateCategory != ''">
AND g.gate_category = #{parmas.gateCategory}
<if test="params.gateCategory != null and params.gateCategory != ''">
AND g.gate_category = #{params.gateCategory}
</if>
<if test="parmas.gateStatus != null">
AND g.gate_status = #{parmas.gateStatus}
<if test="params.gateStatus != null">
AND g.gate_status = #{params.gateStatus}
</if>
ORDER BY g.id DESC
</select>

16
web-infrastructure/src/main/resources/mapper/MkmjPassageDO.xml
View File

@ -25,17 +25,17 @@
LEFT JOIN video v ON m.id = v.foreign_id AND v.device_type = 2 AND v.delete_enum = 'false'
WHERE
p.delete_enum = 'false'
<if test="parmas.eqMkmjId != null">
AND p.mkmj_id = #{parmas.eqMkmjId}
<if test="params.eqMkmjId != null">
AND p.mkmj_id = #{params.eqMkmjId}
</if>
<if test="parmas.likePassageName != null and parmas.likePassageName != ''">
AND p.passage_name LIKE CONCAT('%', #{parmas.likePassageName}, '%')
<if test="params.likePassageName != null and params.likePassageName != ''">
AND p.passage_name LIKE CONCAT('%', #{params.likePassageName}, '%')
</if>
<if test="parmas.eqPassageType != null and parmas.eqPassageType != ''">
AND p.passage_type = #{parmas.eqPassageType}
<if test="params.eqPassageType != null and params.eqPassageType != ''">
AND p.passage_type = #{params.eqPassageType}
</if>
<if test="parmas.eqPassageStatus != null">
AND p.passage_status = #{parmas.eqPassageStatus}
<if test="params.eqPassageStatus != null">
AND p.passage_status = #{params.eqPassageStatus}
</if>
GROUP BY p.id

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

@ -40,12 +40,12 @@
WHERE
pa.delete_enum = 'FALSE' AND
xap.audit_flag = 2 AND
pa.person_corp_id = #{parmas.applyCorpId}
<if test="parmas.employeePersonUserName != null and parmas.employeePersonUserName != ''">
AND xap.employee_person_user_name LIKE CONCAT('%', #{parmas.employeePersonUserName}, '%')
pa.person_corp_id = #{params.applyCorpId}
<if test="params.employeePersonUserName != null and params.employeePersonUserName != ''">
AND xap.employee_person_user_name LIKE CONCAT('%', #{params.employeePersonUserName}, '%')
</if>
<if test="parmas.projectName != null and parmas.projectName != ''">
AND xap.project_name like CONCAT('%', #{parmas.projectName}, '%')
<if test="params.projectName != null and params.projectName != ''">
AND xap.project_name like CONCAT('%', #{params.projectName}, '%')
</if>
ORDER BY
pa.employee_person_user_id,

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

@ -46,29 +46,29 @@
AND a.audit_status = 1
WHERE
f.delete_enum = 'FALSE'
<if test="parmas.remarks != null and parmas.remarks != ''">
AND f.remarks like CONCAT('%', #{parmas.remarks}, '%')
<if test="params.remarks != null and params.remarks != ''">
AND f.remarks like CONCAT('%', #{params.remarks}, '%')
</if>
<if test="parmas.licenceNo != null and parmas.licenceNo != ''">
AND f.licence_no like CONCAT('%', #{parmas.licenceNo}, '%')
<if test="params.licenceNo != null and params.licenceNo != ''">
AND f.licence_no like CONCAT('%', #{params.licenceNo}, '%')
</if>
<if test="parmas.auditFlag != null">
AND f.audit_flag = #{parmas.auditFlag}
<if test="params.auditFlag != null">
AND f.audit_flag = #{params.auditFlag}
</if>
<if test="parmas.visitStartTime != null and parmas.visitStartTime != ''">
AND f.visit_start_time LIKE CONCAT('%', #{parmas.gateName}, '%')
<if test="params.visitStartTime != null and params.visitStartTime != ''">
AND f.visit_start_time LIKE CONCAT('%', #{params.gateName}, '%')
</if>
<if test="parmas.visitEndTime != null and parmas.visitEndTime != ''">
AND f.visit_end_time LIKE CONCAT('%', #{parmas.gateName}, '%')
<if test="params.visitEndTime != null and params.visitEndTime != ''">
AND f.visit_end_time LIKE CONCAT('%', #{params.gateName}, '%')
</if>
<if test="parmas.vehicleBelongType != null and parmas.vehicleBelongType != ''">
AND f.vehicle_belong_type = #{parmas.vehicleBelongType}
<if test="params.vehicleBelongType != null and params.vehicleBelongType != ''">
AND f.vehicle_belong_type = #{params.vehicleBelongType}
</if>
<if test="parmas.vehicleDepartmentId != null and parmas.vehicleDepartmentId != ''">
AND f.vehicle_department_id = #{parmas.vehicleDepartmentId}
<if test="params.vehicleDepartmentId != null and params.vehicleDepartmentId != ''">
AND f.vehicle_department_id = #{params.vehicleDepartmentId}
</if>
<if test="parmas.employeeVehicleUserId != null and parmas.employeeVehicleUserId != ''">
AND f.employee_vehicle_user_id = #{parmas.employeeVehicleUserId}
<if test="params.employeeVehicleUserId != null and params.employeeVehicleUserId != ''">
AND f.employee_vehicle_user_id = #{params.employeeVehicleUserId}
</if>
</select>
<select id="fgsCount" resultType="com.zcloud.primeport.persistence.dataobject.FgsVehicleCountDto">
@ -100,9 +100,9 @@
`vehicle_apply` va
WHERE
va.delete_enum = 'FALSE'
<if test="parmas.corpType != null">
<if test="parmas.corpType == 1"> AND va.vehicle_belong_type IN ( 1, 3 ) </if>
<if test="parmas.corpType == 2"> and va.vehicle_belong_type = 7 </if>
<if test="params.corpType != null">
<if test="params.corpType == 1"> AND va.vehicle_belong_type IN ( 1, 3 ) </if>
<if test="params.corpType == 2"> and va.vehicle_belong_type = 7 </if>
</if>
GROUP BY
va.vehicle_corp_id
@ -113,20 +113,20 @@
COUNT(va.id) pub_car_count
FROM
`vehicle_apply` va WHERE va.delete_enum = 'FALSE'
<if test="parmas.corpType != null">
<if test="parmas.corpType == 1"> and va.vehicle_belong_type in (2,4) </if>
<if test="parmas.corpType == 2"> and va.vehicle_belong_type = 8 </if>
<if test="params.corpType != null">
<if test="params.corpType == 1"> and va.vehicle_belong_type in (2,4) </if>
<if test="params.corpType == 2"> and va.vehicle_belong_type = 8 </if>
</if>
GROUP BY
va.vehicle_corp_id) pubtmp on pubtmp.vehicle_corp_id = c.id
WHERE
c.delete_enum = 'FALSE'
<if test="parmas.corpType != null">
<if test="parmas.corpType == 1"> AND c.type IN ( 0,1,2,6 ) </if>
<if test="parmas.corpType == 2"> AND c.type = 5 </if>
<if test="params.corpType != null">
<if test="params.corpType == 1"> AND c.type IN ( 0,1,2,6 ) </if>
<if test="params.corpType == 2"> AND c.type = 5 </if>
</if>
<if test="parmas.corpName != null and parmas.corpName != ''">
AND c.corp_name like CONCAT('%', #{parmas.corpName}, '%')
<if test="params.corpName != null and params.corpName != ''">
AND c.corp_name like CONCAT('%', #{params.corpName}, '%')
</if>
ORDER BY
c.corp_order,

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

@ -54,49 +54,49 @@
WHERE
a.delete_enum = 'FALSE'
AND va.delete_enum = 'FALSE'
<if test="parmas.processOrRecord != null">
<if test="parmas.processOrRecord == 1">
<if test="params.processOrRecord != null">
<if test="params.processOrRecord == 1">
AND a.audit_status = 1
</if>
<if test="parmas.processOrRecord == 2">
<if test="params.processOrRecord == 2">
AND a.audit_status != 1
</if>
</if>
<if test="parmas.licenceNo != null and parmas.licenceNo != ''">
AND va.licence_no like CONCAT('%', #{parmas.licenceNo}, '%')
<if test="params.licenceNo != null and params.licenceNo != ''">
AND va.licence_no like CONCAT('%', #{params.licenceNo}, '%')
</if>
<if test="parmas.projectName != null and parmas.projectName != ''">
AND va.project_name like CONCAT('%', #{parmas.projectName}, '%')
<if test="params.projectName != null and params.projectName != ''">
AND va.project_name like CONCAT('%', #{params.projectName}, '%')
</if>
<if test="parmas.employeeVehicleUserName != null and parmas.employeeVehicleUserName != ''">
AND va.employee_vehicle_user_name LIKE CONCAT('%', #{parmas.employeeVehicleUserName}, '%')
<if test="params.employeeVehicleUserName != null and params.employeeVehicleUserName != ''">
AND va.employee_vehicle_user_name LIKE CONCAT('%', #{params.employeeVehicleUserName}, '%')
</if>
<if test="parmas.visitStartTime != null and parmas.visitStartTime != ''">
AND va.visit_start_time &gt;= #{parmas.visitStartTime}
<if test="params.visitStartTime != null and params.visitStartTime != ''">
AND va.visit_start_time &gt;= #{params.visitStartTime}
</if>
<if test="parmas.visitEndTime != null and parmas.visitEndTime != ''">
AND va.visit_end_time &lt;= #{parmas.visitEndTime}
<if test="params.visitEndTime != null and params.visitEndTime != ''">
AND va.visit_end_time &lt;= #{params.visitEndTime}
</if>
<if test="parmas.vehicleDepartmentId != null">
AND va.vehicle_department_id = #{parmas.vehicleDepartmentId}
<if test="params.vehicleDepartmentId != null">
AND va.vehicle_department_id = #{params.vehicleDepartmentId}
</if>
<if test="parmas.vehicleBelongType != null and parmas.vehicleBelongType != ''">
AND va.vehicle_belong_type = #{parmas.vehicleBelongType}
<if test="params.vehicleBelongType != null and params.vehicleBelongType != ''">
AND va.vehicle_belong_type = #{params.vehicleBelongType}
</if>
<if test="parmas.applyCorpId != null">
AND va.tenant_id = #{parmas.applyCorpId}
<if test="params.applyCorpId != null">
AND va.tenant_id = #{params.applyCorpId}
</if>
<if test="parmas.vehicleBelongTypeArrList != null and parmas.vehicleBelongTypeArrList.length > 0">
<if test="params.vehicleBelongTypeArrList != null and params.vehicleBelongTypeArrList.length > 0">
AND va.vehicle_belong_type in
<foreach collection="parmas.vehicleBelongTypeArrList" item="item" open="(" separator="," close=")">
<foreach collection="params.vehicleBelongTypeArrList" item="item" open="(" separator="," close=")">
#{item}
</foreach>
</if>
<if test="parmas.gateLevelAuthAreaIdList != null and parmas.gateLevelAuthAreaIdList.size() > 0">
<if test="params.gateLevelAuthAreaIdList != null and params.gateLevelAuthAreaIdList.size() > 0">
and JSON_OVERLAPS(
JSON_EXTRACT(va.gate_level_auth_area, '$.area[*].bianma'),
CONCAT('[',
<foreach collection="parmas.gateLevelAuthAreaIdList" item="item" separator=",">
<foreach collection="params.gateLevelAuthAreaIdList" item="item" separator=",">
#{item}
</foreach>
, ']')
@ -136,7 +136,7 @@
LEFT JOIN vehicle_apply vap on va.vehicle_apply_id = vap.id
WHERE
va.delete_enum = 'FALSE' and vap.delete_enum = 'FALSE'
and va.vehicle_apply_id = #{parmas.vehicleApplyId}
and va.vehicle_apply_id = #{params.vehicleApplyId}
ORDER BY va.id desc
</select>
</mapper>

16
web-infrastructure/src/main/resources/mapper/VehicleBlackDO.xml
View File

@ -67,17 +67,17 @@
LEFT JOIN vehicle_apply AS a ON b.licence_no = a.licence_no
WHERE
b.delete_enum = 'FALSE'
<if test="parmas.licenceNo != null and parmas.licenceNo != ''">
AND b.licence_no LIKE CONCAT('%', #{parmas.licenceNo}, '%')
<if test="params.licenceNo != null and params.licenceNo != ''">
AND b.licence_no LIKE CONCAT('%', #{params.licenceNo}, '%')
</if>
<if test="parmas.employeeVehicleUserName != null and parmas.employeeVehicleUserName != ''">
AND a.employee_vehicle_user_name LIKE CONCAT('%', #{parmas.employeeVehicleUserName}, '%')
<if test="params.employeeVehicleUserName != null and params.employeeVehicleUserName != ''">
AND a.employee_vehicle_user_name LIKE CONCAT('%', #{params.employeeVehicleUserName}, '%')
</if>
<if test="parmas.vehicleDepartmentId != null">
AND a.vehicle_department_id = #{parmas.vehicleDepartmentId}
<if test="params.vehicleDepartmentId != null">
AND a.vehicle_department_id = #{params.vehicleDepartmentId}
</if>
<if test="parmas.vehicleType != null and parmas.vehicleType != ''">
AND a.vehicleType LIKE CONCAT('%', #{parmas.vehicleType}, '%')
<if test="params.vehicleType != null and params.vehicleType != ''">
AND a.vehicleType LIKE CONCAT('%', #{params.vehicleType}, '%')
</if>
</select>
</mapper>

62
web-infrastructure/src/main/resources/mapper/XgfApplyPersonDO.xml
View File

@ -42,31 +42,31 @@
AND pa.delete_enum = 'FALSE'
WHERE
xap.delete_enum = 'FALSE'
<if test="parmas.auditFlag != null">
AND xap.audit_flag = #{parmas.auditFlag}
<if test="params.auditFlag != null">
AND xap.audit_flag = #{params.auditFlag}
</if>
<if test="parmas.processOrRecord != null">
<if test="parmas.processOrRecord == 1">
<if test="params.processOrRecord != null">
<if test="params.processOrRecord == 1">
AND xap.audit_status = 1
</if>
<if test="parmas.processOrRecord == 2">
<if test="params.processOrRecord == 2">
AND xap.audit_status != 1
</if>
</if>
<if test="parmas.mkmjId != null">
AND xap.mkmj_id = #{parmas.mkmjId}
<if test="params.mkmjId != null">
AND xap.mkmj_id = #{params.mkmjId}
</if>
<if test="parmas.visitStartTime != null and parmas.visitStartTime != ''">
AND xap.visit_start_time LIKE CONCAT('%', #{parmas.visitStartTime}, '%')
<if test="params.visitStartTime != null and params.visitStartTime != ''">
AND xap.visit_start_time LIKE CONCAT('%', #{params.visitStartTime}, '%')
</if>
<if test="parmas.employeePersonUserName != null and parmas.employeePersonUserName != ''">
AND xap.employee_person_user_name LIKE CONCAT('%', #{parmas.employeePersonUserName}, '%')
<if test="params.employeePersonUserName != null and params.employeePersonUserName != ''">
AND xap.employee_person_user_name LIKE CONCAT('%', #{params.employeePersonUserName}, '%')
</if>
<if test="parmas.visitEndTime != null and parmas.visitEndTime != ''">
AND xap.visit_end_time LIKE CONCAT('%', #{parmas.visitEndTime}, '%')
<if test="params.visitEndTime != null and params.visitEndTime != ''">
AND xap.visit_end_time LIKE CONCAT('%', #{params.visitEndTime}, '%')
</if>
<if test="parmas.vehicleBelongType != null and parmas.vehicleBelongType != ''">
AND xap.person_belong_type = #{parmas.vehicleBelongType}
<if test="params.vehicleBelongType != null and params.vehicleBelongType != ''">
AND xap.person_belong_type = #{params.vehicleBelongType}
</if>
ORDER BY
xap.id DESC
@ -80,25 +80,25 @@
xgf_apply_person p
LEFT JOIN ( SELECT f.xgf_apply_person_id, COUNT( f.id ) person_apply_count FROM person_apply f WHERE f.delete_enum = 'FALSE' GROUP BY f.xgf_apply_person_id ) tmp ON p.id = tmp.xgf_apply_person_id
where p.delete_enum = 'FALSE'
<if test="parmas.processOrRecord != null">
<if test="parmas.processOrRecord == 1">
<if test="params.processOrRecord != null">
<if test="params.processOrRecord == 1">
AND p.audit_flag = 1
</if>
<if test="parmas.processOrRecord == 2">
<if test="params.processOrRecord == 2">
AND p.audit_flag != 1
</if>
</if>
<if test="parmas.auditFlag != null">
and p.audit_flag = #{parmas.auditFlag}
<if test="params.auditFlag != null">
and p.audit_flag = #{params.auditFlag}
</if>
<if test="parmas.applyCorpId != null and parmas.applyCorpId != ''">
AND p.apply_corp_id = #{parmas.applyCorpId}
<if test="params.applyCorpId != null and params.applyCorpId != ''">
AND p.apply_corp_id = #{params.applyCorpId}
</if>
<if test="parmas.projectName != null and parmas.projectName != ''">
AND p.project_name like CONCAT('%', #{parmas.projectName}, '%')
<if test="params.projectName != null and params.projectName != ''">
AND p.project_name like CONCAT('%', #{params.projectName}, '%')
</if>
<if test="parmas.applyCorpName != null and parmas.applyCorpName != ''">
AND p.apply_corp_name like CONCAT('%', #{parmas.applyCorpName}, '%')
<if test="params.applyCorpName != null and params.applyCorpName != ''">
AND p.apply_corp_name like CONCAT('%', #{params.applyCorpName}, '%')
</if>
</select>
<select id="personnelVehicleManagementList"
@ -144,12 +144,12 @@
WHERE
u.delete_enum = 'FALSE'
AND u.main_corp_flag = 0
AND u.corpinfo_id = #{parmas.corpId}
<if test="parmas.departmentId != null and parmas.departmentId != ''">
AND u.department_id = #{parmas.departmentId}
AND u.corpinfo_id = #{params.corpId}
<if test="params.departmentId != null and params.departmentId != ''">
AND u.department_id = #{params.departmentId}
</if>
<if test="parmas.name != null and parmas.name != ''">
AND u.name like CONCAT('%', #{parmas.name}, '%')
<if test="params.name != null and params.name != ''">
AND u.name like CONCAT('%', #{params.name}, '%')
</if>
ORDER BY
u.department_id