From 461d18653433cb5ea8a9117b977c0460f8fa7825 Mon Sep 17 00:00:00 2001 From: dearLin <1261008090@qq.com> Date: Wed, 18 Mar 2026 16:06:05 +0800 Subject: [PATCH] =?UTF-8?q?feat=EF=BC=9A=E7=9B=B8=E5=85=B3=E6=96=B9?= =?UTF-8?q?=E4=BA=BA=E5=91=98=E6=9D=83=E9=99=90=E8=AE=B0=E5=BD=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../primeport/web/PersonApplyController.java | 18 ++--- .../primeport/web/VehicleApplyController.java | 3 +- .../primeport/command/PersonApplyAddExe.java | 2 + .../command/query/PersonApplyQueryExe.java | 24 +++++- .../service/PersonApplyServiceImpl.java | 7 +- .../service/VehicleApplyServiceImpl.java | 6 ++ .../primeport/api/PersonApplyServiceI.java | 4 +- .../primeport/api/VehicleApplyServiceI.java | 3 + .../primeport/dto/PersonApplyPageQry.java | 7 +- .../primeport/dto/VehicleAuditPageQry.java | 5 +- .../primeport/dto/XgfApplyCarPageQry.java | 22 +++++ .../primeport/dto/XgfApplyPersonPageQry.java | 2 + .../primeport/dto/XgfPersonApplyAddCmd.java | 2 + .../dto/clientobject/PersonApplyCO.java | 24 ++++++ .../gatewayimpl/PersonApplyGatewayImpl.java | 4 + .../persistence/dataobject/PersonApplyDO.java | 22 +++++ .../dataobject/XgfApplyPersonDO.java | 6 +- .../persistence/mapper/PersonApplyMapper.java | 3 + .../mapper/XgfApplyPersonMapper.java | 2 + .../repository/PersonApplyRepository.java | 2 + .../repository/XgfApplyPersonRepository.java | 2 + .../impl/PersonApplyRepositoryImpl.java | 13 ++- .../impl/XgfApplyPersonRepositoryImpl.java | 13 +++ .../main/resources/mapper/PersonApplyDO.xml | 80 ++++++++++--------- .../main/resources/mapper/VehicleAuditDO.xml | 7 +- .../resources/mapper/XgfApplyPersonDO.xml | 68 ++++++++++++++++ 26 files changed, 290 insertions(+), 61 deletions(-) create mode 100644 web-client/src/main/java/com/zcloud/primeport/dto/XgfApplyCarPageQry.java diff --git a/web-adapter/src/main/java/com/zcloud/primeport/web/PersonApplyController.java b/web-adapter/src/main/java/com/zcloud/primeport/web/PersonApplyController.java index af54a13..7edd4c3 100644 --- a/web-adapter/src/main/java/com/zcloud/primeport/web/PersonApplyController.java +++ b/web-adapter/src/main/java/com/zcloud/primeport/web/PersonApplyController.java @@ -35,6 +35,12 @@ import java.util.ArrayList; public class PersonApplyController { private final PersonApplyServiceI personApplyService; + @ApiOperation("相关方-人员权限记录-列表") + @GetMapping("/xgfPersonPermissionsList") + public PageResponse xgfPersonPermissionsList(@RequestBody XgfApplyPersonPageQry qry) { + return personApplyService.xgfPersonPermissionsList(qry); + } + @ApiOperation("相关方-人员申请-详情") @GetMapping("/xgfPersonApplyInfoById/{id}") public SingleResponse xgfPersonApplyInfoById(@PathVariable("id") Long id) { @@ -72,15 +78,9 @@ public class PersonApplyController { return SingleResponse.buildSuccess(); } -// @ApiOperation("股份，企业-人员申请新增") -// @PostMapping("/save") -// public SingleResponse add(@Validated @RequestBody PersonApplyAddCmd cmd) { -// return personApplyService.add(cmd); -// } - - @ApiOperation("相关方、临时申请里的人分页列表") - @PostMapping("/list") - public PageResponse page(@RequestBody PersonApplyPageQry qry) { + @ApiOperation("人员临时申请-审批待审批分页列表") + @PostMapping("/pendingApprovalList") + public PageResponse page(@RequestBody PersonApplyPageQry qry) { return personApplyService.listPage(qry); } diff --git a/web-adapter/src/main/java/com/zcloud/primeport/web/VehicleApplyController.java b/web-adapter/src/main/java/com/zcloud/primeport/web/VehicleApplyController.java index a0ef3fb..cd52f19 100644 --- a/web-adapter/src/main/java/com/zcloud/primeport/web/VehicleApplyController.java +++ b/web-adapter/src/main/java/com/zcloud/primeport/web/VehicleApplyController.java @@ -11,6 +11,8 @@ import com.zcloud.primeport.api.VehicleApplyServiceI; import com.zcloud.primeport.dto.*; import com.zcloud.primeport.dto.clientobject.FgsVehicleCountCo; import com.zcloud.primeport.dto.clientobject.VehicleApplyCO; +import com.zcloud.primeport.dto.clientobject.VehicleAuditCO; +import com.zcloud.primeport.dto.clientobject.XgfPersonApplyCO; import io.swagger.annotations.Api; import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiOperation; @@ -100,6 +102,5 @@ public class VehicleApplyController { public PageResponse fgsCount(@RequestParam HashMap qry) { return vehicleApplyService.fgsCount(qry); } - } diff --git a/web-app/src/main/java/com/zcloud/primeport/command/PersonApplyAddExe.java b/web-app/src/main/java/com/zcloud/primeport/command/PersonApplyAddExe.java index 45b897d..db35d56 100644 --- a/web-app/src/main/java/com/zcloud/primeport/command/PersonApplyAddExe.java +++ b/web-app/src/main/java/com/zcloud/primeport/command/PersonApplyAddExe.java @@ -1,5 +1,6 @@ package com.zcloud.primeport.command; +import com.alibaba.cola.dto.PageResponse; import com.alibaba.cola.dto.SingleResponse; import com.alibaba.cola.exception.BizException; import com.jjb.saas.framework.auth.utils.AuthContext; @@ -9,6 +10,7 @@ import com.zcloud.primeport.domain.model.PersonApplyE; import com.zcloud.primeport.domain.model.XgfApplyPersonE; import com.zcloud.primeport.dto.PersonApplyAddCmd; import com.zcloud.primeport.dto.PersonAuthCmd; +import com.zcloud.primeport.dto.XgfApplyPersonPageQry; import com.zcloud.primeport.dto.XgfPersonApplyAddCmd; import com.zcloud.primeport.dto.clientobject.PersonApplyCO; import com.zcloud.primeport.dto.clientobject.XgfPersonApplyCO; diff --git a/web-app/src/main/java/com/zcloud/primeport/command/query/PersonApplyQueryExe.java b/web-app/src/main/java/com/zcloud/primeport/command/query/PersonApplyQueryExe.java index 1b00735..8d11a8e 100644 --- a/web-app/src/main/java/com/zcloud/primeport/command/query/PersonApplyQueryExe.java +++ b/web-app/src/main/java/com/zcloud/primeport/command/query/PersonApplyQueryExe.java @@ -44,10 +44,19 @@ public class PersonApplyQueryExe { * @param personApplyPageQry * @return */ - public PageResponse execute(PersonApplyPageQry personApplyPageQry) { + public PageResponse execute(PersonApplyPageQry personApplyPageQry) { Map parmas = PageQueryHelper.toHashMap(personApplyPageQry); - PageResponse pageResponse = personApplyRepository.listPage(parmas); - List examCenterCOS = personApplyCoConvertor.converDOsToCOs(pageResponse.getData()); + PageResponse pageResponse = xgfPersonApplyRepository.listPage(parmas); + List examCenterCOS = xgfApplyPersonCoConvertor.converDOsToCOs(pageResponse.getData()); + Long userId = AuthContext.getUserId(); + examCenterCOS.forEach(item -> { + item.setCurrentUserCanAudit(2); + if (item.getAuditFlag() == 1) { + if (item.getAuditUserId().equals(userId)) { + item.setCurrentUserCanAudit(1); + } + } + }); return PageResponse.of(examCenterCOS, pageResponse.getTotalCount(), pageResponse.getPageSize(), pageResponse.getPageIndex()); } @@ -90,5 +99,14 @@ public class PersonApplyQueryExe { return PageResponse.of(examCenterCOS, pageResponse.getTotalCount(), pageResponse.getPageSize(), pageResponse.getPageIndex()); } + + public PageResponse xgfPersonPermissionsList(XgfApplyPersonPageQry qry) { + Map parmas = PageQueryHelper.toHashMap(qry); + parmas.put("applyCorpId", AuthContext.getTenantId()); + PageResponse pageResponse = personApplyRepository.xgfPersonPermissionsList(parmas); + List examCenterCOS = personApplyCoConvertor.converDOsToCOs(pageResponse.getData()); + + return PageResponse.of(examCenterCOS, pageResponse.getTotalCount(), pageResponse.getPageSize(), pageResponse.getPageIndex()); + } } diff --git a/web-app/src/main/java/com/zcloud/primeport/service/PersonApplyServiceImpl.java b/web-app/src/main/java/com/zcloud/primeport/service/PersonApplyServiceImpl.java index f2e2c6a..4f3891c 100644 --- a/web-app/src/main/java/com/zcloud/primeport/service/PersonApplyServiceImpl.java +++ b/web-app/src/main/java/com/zcloud/primeport/service/PersonApplyServiceImpl.java @@ -29,7 +29,7 @@ public class PersonApplyServiceImpl implements PersonApplyServiceI { private final PersonApplyQueryExe personApplyQueryExe; @Override - public PageResponse listPage(PersonApplyPageQry qry) { + public PageResponse listPage(PersonApplyPageQry qry) { return personApplyQueryExe.execute(qry); } @@ -101,5 +101,10 @@ public class PersonApplyServiceImpl implements PersonApplyServiceI { public XgfPersonApplyCO xgfPersonApplyInfoById(Long id) { return personApplyAddExe.xgfPersonApplyInfoById(id); } + + @Override + public PageResponse xgfPersonPermissionsList(XgfApplyPersonPageQry qry) { + return personApplyQueryExe.xgfPersonPermissionsList(qry); + } } diff --git a/web-app/src/main/java/com/zcloud/primeport/service/VehicleApplyServiceImpl.java b/web-app/src/main/java/com/zcloud/primeport/service/VehicleApplyServiceImpl.java index f8896bd..78422ee 100644 --- a/web-app/src/main/java/com/zcloud/primeport/service/VehicleApplyServiceImpl.java +++ b/web-app/src/main/java/com/zcloud/primeport/service/VehicleApplyServiceImpl.java @@ -14,6 +14,7 @@ import com.zcloud.primeport.domain.model.VehicleApplyE; import com.zcloud.primeport.dto.*; import com.zcloud.primeport.dto.clientobject.FgsVehicleCountCo; import com.zcloud.primeport.dto.clientobject.VehicleApplyCO; +import com.zcloud.primeport.dto.clientobject.VehicleAuditCO; import com.zcloud.primeport.persistence.dataobject.VehicleApplyDO; import com.zcloud.primeport.persistence.repository.VehicleApplyRepository; import lombok.AllArgsConstructor; @@ -111,5 +112,10 @@ public class VehicleApplyServiceImpl implements VehicleApplyServiceI { return vehicleApplyQueryExe.fgsCount(qry); } + + @Override + public PageResponse xgfCarApplyList(XgfApplyCarPageQry qry) { + return null; + } } diff --git a/web-client/src/main/java/com/zcloud/primeport/api/PersonApplyServiceI.java b/web-client/src/main/java/com/zcloud/primeport/api/PersonApplyServiceI.java index f588478..51aaf9d 100644 --- a/web-client/src/main/java/com/zcloud/primeport/api/PersonApplyServiceI.java +++ b/web-client/src/main/java/com/zcloud/primeport/api/PersonApplyServiceI.java @@ -14,7 +14,7 @@ import com.zcloud.primeport.dto.clientobject.XgfPersonApplyCO; * @Date 2026-03-05 11:33:22 */ public interface PersonApplyServiceI { - PageResponse listPage(PersonApplyPageQry qry); + PageResponse listPage(PersonApplyPageQry qry); SingleResponse add(PersonApplyAddCmd cmd); @@ -39,5 +39,7 @@ public interface PersonApplyServiceI { void authorization(PersonAuthCmd cmd); XgfPersonApplyCO xgfPersonApplyInfoById(Long id); + + PageResponse xgfPersonPermissionsList(XgfApplyPersonPageQry qry); } diff --git a/web-client/src/main/java/com/zcloud/primeport/api/VehicleApplyServiceI.java b/web-client/src/main/java/com/zcloud/primeport/api/VehicleApplyServiceI.java index 131a24e..549a73d 100644 --- a/web-client/src/main/java/com/zcloud/primeport/api/VehicleApplyServiceI.java +++ b/web-client/src/main/java/com/zcloud/primeport/api/VehicleApplyServiceI.java @@ -5,6 +5,7 @@ import com.alibaba.cola.dto.SingleResponse; import com.zcloud.primeport.dto.*; import com.zcloud.primeport.dto.clientobject.FgsVehicleCountCo; import com.zcloud.primeport.dto.clientobject.VehicleApplyCO; +import com.zcloud.primeport.dto.clientobject.VehicleAuditCO; import java.util.HashMap; @@ -34,5 +35,7 @@ public interface VehicleApplyServiceI { void inspectCarEdit(VehicleApplyInspectUpdateCmd cmd); PageResponse fgsCount(HashMap qry); + + PageResponse xgfCarApplyList(XgfApplyCarPageQry qry); } diff --git a/web-client/src/main/java/com/zcloud/primeport/dto/PersonApplyPageQry.java b/web-client/src/main/java/com/zcloud/primeport/dto/PersonApplyPageQry.java index 805f2f4..eaabd50 100644 --- a/web-client/src/main/java/com/zcloud/primeport/dto/PersonApplyPageQry.java +++ b/web-client/src/main/java/com/zcloud/primeport/dto/PersonApplyPageQry.java @@ -16,11 +16,14 @@ public class PersonApplyPageQry extends PageQuery { @ApiModelProperty(name = "xgf_apply_person_id", value = "相关方人员申请ID 从相关方申请里查询人只填这个") private Long xgfApplyPersonId; - + @ApiModelProperty(name = "employeePersonUserName", value = "访问人姓名") + private String employeePersonUserName; @ApiModelProperty(name = "person_belong_type", value = "人员所属类型3相关方4临时人员") - private Integer personBelongType; + private String personBelongType; @ApiModelProperty(name = "auditFlag", value = "审核状态(1:审核中;2审核通过; 3：审核驳回)") private Integer auditFlag; + @ApiModelProperty(name = "processOrRecord", value = "审核状态1待审批，2已审批") + private Integer processOrRecord; @ApiModelProperty(name = "visitStartTime", value = "访问开始时间") private String visitStartTime; @ApiModelProperty(name = "visitEndTime", value = "访问结束时间") diff --git a/web-client/src/main/java/com/zcloud/primeport/dto/VehicleAuditPageQry.java b/web-client/src/main/java/com/zcloud/primeport/dto/VehicleAuditPageQry.java index c003cf8..efc5a8e 100644 --- a/web-client/src/main/java/com/zcloud/primeport/dto/VehicleAuditPageQry.java +++ b/web-client/src/main/java/com/zcloud/primeport/dto/VehicleAuditPageQry.java @@ -51,7 +51,10 @@ public class VehicleAuditPageQry extends PageQuery { @ApiModelProperty(name = "vehicleApplyId", value = "车辆申请ID（车辆审批记录用）") private Long vehicleApplyId; - + @ApiModelProperty(name = "applyCorpId", value = "申请企业id") + private Long applyCorpId; + @ApiModelProperty(name = "projectName", value = "项目名称") + private String projectName; @ApiModelProperty(name = "h5UserIdCard", value = "H5查询用，申请的临时车辆驾驶人的身份证，车辆申请记录") private String h5UserIdCard; } diff --git a/web-client/src/main/java/com/zcloud/primeport/dto/XgfApplyCarPageQry.java b/web-client/src/main/java/com/zcloud/primeport/dto/XgfApplyCarPageQry.java new file mode 100644 index 0000000..ca84754 --- /dev/null +++ b/web-client/src/main/java/com/zcloud/primeport/dto/XgfApplyCarPageQry.java @@ -0,0 +1,22 @@ +package com.zcloud.primeport.dto; + +import com.alibaba.cola.dto.PageQuery; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + + +/** + * web-client + * + * @Author makejava + * @Date 2026-03-05 11:33:22 + */ +@Data +public class XgfApplyCarPageQry extends PageQuery { + + @ApiModelProperty(name = "processOrRecord", value = "1审批中数据，2审批记录") + private Integer processOrRecord; + @ApiModelProperty(name = "applyCorpId", value = "申请单位") + private Long applyCorpId; +} + diff --git a/web-client/src/main/java/com/zcloud/primeport/dto/XgfApplyPersonPageQry.java b/web-client/src/main/java/com/zcloud/primeport/dto/XgfApplyPersonPageQry.java index e05af7a..1f3f811 100644 --- a/web-client/src/main/java/com/zcloud/primeport/dto/XgfApplyPersonPageQry.java +++ b/web-client/src/main/java/com/zcloud/primeport/dto/XgfApplyPersonPageQry.java @@ -26,5 +26,7 @@ public class XgfApplyPersonPageQry extends PageQuery { @ApiModelProperty(name = "userCard", value = "临时访客h5二维码用根据身份证号查询申请记录") private String userCard; + @ApiModelProperty(name = "userName", value = "姓名") + private String userName; } diff --git a/web-client/src/main/java/com/zcloud/primeport/dto/XgfPersonApplyAddCmd.java b/web-client/src/main/java/com/zcloud/primeport/dto/XgfPersonApplyAddCmd.java index 20167c3..4d0017a 100644 --- a/web-client/src/main/java/com/zcloud/primeport/dto/XgfPersonApplyAddCmd.java +++ b/web-client/src/main/java/com/zcloud/primeport/dto/XgfPersonApplyAddCmd.java @@ -43,6 +43,8 @@ public class XgfPersonApplyAddCmd extends Command { private Long projectId; @ApiModelProperty(value = "项目名称", name = "projectName") private String projectName; + @ApiModelProperty(value = "来访事由", name = "reasonVisit") + private String reasonVisit; @ApiModelProperty(value = "审核企业", name = "auditCorpId") diff --git a/web-client/src/main/java/com/zcloud/primeport/dto/clientobject/PersonApplyCO.java b/web-client/src/main/java/com/zcloud/primeport/dto/clientobject/PersonApplyCO.java index 374f61c..3a42bc4 100644 --- a/web-client/src/main/java/com/zcloud/primeport/dto/clientobject/PersonApplyCO.java +++ b/web-client/src/main/java/com/zcloud/primeport/dto/clientobject/PersonApplyCO.java @@ -1,6 +1,7 @@ package com.zcloud.primeport.dto.clientobject; import com.alibaba.cola.dto.ClientObject; +import com.baomidou.mybatisplus.annotation.TableField; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -70,5 +71,28 @@ public class PersonApplyCO extends ClientObject { private Long mkmjId; @ApiModelProperty(value = "访问口门名称",name = "mkmjId") private String mkmjName; + + @ApiModelProperty(value = "当前用户是否能审核。1，能审核2不能审核", name = "currentUserCanAudit") + private Integer currentUserCanAudit; + + @ApiModelProperty(value = "授权范围港区与区域",name = "gateLevelAuthArea") + private String gateLevelAuthArea; + + + @ApiModelProperty(value = "审批人id",name = "auditDeptName") + private String auditUserId; + @ApiModelProperty(value = "审批人",name = "auditDeptName") + private String auditUserName; + @ApiModelProperty(value = "审批企业单位ID",name = "auditDeptName") + private String auditDeptId; + @ApiModelProperty(value = "审批企业单位",name = "auditDeptName") + private String auditDeptName; + @ApiModelProperty(value = "审批企业ID",name = "auditCorpId") + private String auditCorpId; + @ApiModelProperty(value = "审批企业",name = "auditCorpName") + private String auditCorpName; + @ApiModelProperty(value = "审批时间",name = "auditTime") + private String auditTime; + } diff --git a/web-infrastructure/src/main/java/com/zcloud/primeport/gatewayimpl/PersonApplyGatewayImpl.java b/web-infrastructure/src/main/java/com/zcloud/primeport/gatewayimpl/PersonApplyGatewayImpl.java index 2530342..dfedfaa 100644 --- a/web-infrastructure/src/main/java/com/zcloud/primeport/gatewayimpl/PersonApplyGatewayImpl.java +++ b/web-infrastructure/src/main/java/com/zcloud/primeport/gatewayimpl/PersonApplyGatewayImpl.java @@ -74,6 +74,10 @@ public class PersonApplyGatewayImpl implements PersonApplyGateway { XgfApplyPersonDO d = new XgfApplyPersonDO(); BeanUtils.copyProperties(build, d); xgfApplyPersonRepository.updateById(d); + UpdateWrapper objectQueryWrapper = new UpdateWrapper<>(); + objectQueryWrapper.set("mkmj_permission",2); + objectQueryWrapper.eq("xgf_apply_person_id",d.getId()); + personApplyRepository.update(objectQueryWrapper); if (build.getAuditFlag().equals(2)) { // 审核通过后添加人员信息 XgfApplyPersonDO byId = xgfApplyPersonRepository.getById(d.getId()); diff --git a/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/dataobject/PersonApplyDO.java b/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/dataobject/PersonApplyDO.java index d2f768b..9f8293e 100644 --- a/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/dataobject/PersonApplyDO.java +++ b/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/dataobject/PersonApplyDO.java @@ -64,5 +64,27 @@ public class PersonApplyDO extends BaseDO { @TableField(exist = false) private Integer personBelongType; private Integer mkmjPermission; + + + + @TableField(exist = false) + private String gateLevelAuthArea; + @TableField(exist = false) + private String projectName; + @TableField(exist = false) + private String auditUserId; + @TableField(exist = false) + private String auditUserName; + @TableField(exist = false) + private String auditDeptId; + @TableField(exist = false) + private String auditDeptName; + @TableField(exist = false) + private String auditCorpId; + @TableField(exist = false) + private String auditCorpName; + @TableField(exist = false) + private String auditTime; + } diff --git a/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/dataobject/XgfApplyPersonDO.java b/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/dataobject/XgfApplyPersonDO.java index c0ffb30..d900d44 100644 --- a/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/dataobject/XgfApplyPersonDO.java +++ b/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/dataobject/XgfApplyPersonDO.java @@ -24,9 +24,6 @@ public class XgfApplyPersonDO extends BaseDO { //审核状态(1:审核中;2审核通过; 3：审核驳回，4无需审批（长期人员）) @ApiModelProperty(value = "审核状态(1:审核中;2审核通过; 3：审核驳回，4无需审批（长期人员）)") private Integer auditFlag; - //进出港权限(1:有 2：无) -// @ApiModelProperty(value = "进出港权限(1:有 2：无)") -// private Integer mkmjPermission; //访问起始时间 @ApiModelProperty(value = "访问起始时间") private String visitStartTime; @@ -36,6 +33,7 @@ public class XgfApplyPersonDO extends BaseDO { //告知签字 @ApiModelProperty(value = "告知签字") private String informSignId; + @ApiModelProperty(value = "门口门禁id") private Long mkmjId; @TableField(exist = false) private Long mkmjName; @@ -45,7 +43,9 @@ public class XgfApplyPersonDO extends BaseDO { //项目名称 @ApiModelProperty(value = "项目名称") private String projectName; + @ApiModelProperty(value = "申请企业id") private Long applyCorpId; + @ApiModelProperty(value = "申请企业名称") private String applyCorpName; private Long auditCorpId; private String auditCorpName; diff --git a/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/mapper/PersonApplyMapper.java b/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/mapper/PersonApplyMapper.java index 7068ce9..68e3515 100644 --- a/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/mapper/PersonApplyMapper.java +++ b/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/mapper/PersonApplyMapper.java @@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.zcloud.primeport.persistence.dataobject.PersonApplyDO; +import com.zcloud.primeport.persistence.dataobject.XgfApplyPersonDO; import org.apache.ibatis.annotations.Mapper; import java.util.Map; @@ -18,5 +19,7 @@ import java.util.Map; public interface PersonApplyMapper extends BaseMapper { IPage listPage(Page> page, Map parmas, String menuPerms); + + IPage xgfPersonPermissionsList(Page> page, Map parmas, String menuPerms); } diff --git a/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/mapper/XgfApplyPersonMapper.java b/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/mapper/XgfApplyPersonMapper.java index 851dc60..c3bc81b 100644 --- a/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/mapper/XgfApplyPersonMapper.java +++ b/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/mapper/XgfApplyPersonMapper.java @@ -18,9 +18,11 @@ import java.util.Map; */ @Mapper public interface XgfApplyPersonMapper extends BaseMapper { + IPage listPage(Page> page, Map parmas, String menuPerms); IPage xgfPersonAuditList(Page> page, Map parmas, String menuPerms); IPage personnelVehicleManagementList(Page> page, Map parmas, String menuPerms); + } diff --git a/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/repository/PersonApplyRepository.java b/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/repository/PersonApplyRepository.java index 024c0c4..4e83d98 100644 --- a/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/repository/PersonApplyRepository.java +++ b/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/repository/PersonApplyRepository.java @@ -13,5 +13,7 @@ import java.util.Map; */ public interface PersonApplyRepository extends BaseRepository { PageResponse listPage(Map parmas); + + PageResponse xgfPersonPermissionsList(Map parmas); } diff --git a/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/repository/XgfApplyPersonRepository.java b/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/repository/XgfApplyPersonRepository.java index 532105f..b06eefa 100644 --- a/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/repository/XgfApplyPersonRepository.java +++ b/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/repository/XgfApplyPersonRepository.java @@ -18,5 +18,7 @@ public interface XgfApplyPersonRepository extends BaseRepository xgfPersonAuditList(Map parmas); PageResponse personnelVehicleManagementList(Map parmas); + + PageResponse listPage(Map parmas); } diff --git a/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/repository/impl/PersonApplyRepositoryImpl.java b/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/repository/impl/PersonApplyRepositoryImpl.java index 15b9576..35a23c2 100644 --- a/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/repository/impl/PersonApplyRepositoryImpl.java +++ b/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/repository/impl/PersonApplyRepositoryImpl.java @@ -32,7 +32,6 @@ public class PersonApplyRepositoryImpl extends BaseRepositoryImpl listPage(Map parmas) { - Page> page = new Page<>(Integer.parseInt(parmas.get("pageIndex").toString()), Integer.parseInt(parmas.get("pageSize").toString())); String menuPerms = ""; @@ -42,5 +41,17 @@ public class PersonApplyRepositoryImpl extends BaseRepositoryImpl iPage = personApplyMapper.listPage(page, parmas, menuPerms); return PageHelper.pageToResponse(iPage, iPage.getRecords()); } + + @Override + public PageResponse xgfPersonPermissionsList(Map parmas) { + Page> page = new Page<>(Integer.parseInt(parmas.get("pageIndex").toString()) + , Integer.parseInt(parmas.get("pageSize").toString())); + String menuPerms = ""; + if (!org.springframework.util.ObjectUtils.isEmpty(parmas.get("menuPath"))) { + menuPerms = MenuEnum.getMenuKeyByPath(parmas.get("menuPath").toString()); + } + IPage result = personApplyMapper.xgfPersonPermissionsList(page, parmas,menuPerms); + return PageHelper.pageToResponse(result, result.getRecords()); + } } diff --git a/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/repository/impl/XgfApplyPersonRepositoryImpl.java b/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/repository/impl/XgfApplyPersonRepositoryImpl.java index 55d670e..5cfc524 100644 --- a/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/repository/impl/XgfApplyPersonRepositoryImpl.java +++ b/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/repository/impl/XgfApplyPersonRepositoryImpl.java @@ -57,5 +57,18 @@ public class XgfApplyPersonRepositoryImpl extends BaseRepositoryImpl result = xgfApplyPersonMapper.personnelVehicleManagementList(page, parmas,menuPerms); return PageHelper.pageToResponse(result, result.getRecords()); } + + @Override + public PageResponse listPage(Map parmas) { + Page> page = new Page<>(Integer.parseInt(parmas.get("pageIndex").toString()), Integer.parseInt(parmas.get("pageSize").toString())); + String menuPerms = ""; + if (!org.springframework.util.ObjectUtils.isEmpty(parmas.get("menuPath"))) { + menuPerms = MenuEnum.getMenuKeyByPath(parmas.get("menuPath").toString()); + } + IPage result = xgfApplyPersonMapper.listPage(page, parmas,menuPerms); + return PageHelper.pageToResponse(result, result.getRecords()); + } + + } diff --git a/web-infrastructure/src/main/resources/mapper/PersonApplyDO.xml b/web-infrastructure/src/main/resources/mapper/PersonApplyDO.xml index cfedd51..0ab1524 100644 --- a/web-infrastructure/src/main/resources/mapper/PersonApplyDO.xml +++ b/web-infrastructure/src/main/resources/mapper/PersonApplyDO.xml @@ -4,49 +4,53 @@ - + + diff --git a/web-infrastructure/src/main/resources/mapper/VehicleAuditDO.xml b/web-infrastructure/src/main/resources/mapper/VehicleAuditDO.xml index 1959e11..ac55d7c 100644 --- a/web-infrastructure/src/main/resources/mapper/VehicleAuditDO.xml +++ b/web-infrastructure/src/main/resources/mapper/VehicleAuditDO.xml @@ -53,7 +53,6 @@ WHERE a.delete_enum = 'FALSE' AND va.delete_enum = 'FALSE' - AND a.audit_status = 1 @@ -65,6 +64,9 @@ AND va.licence_no like CONCAT('%', #{parmas.licenceNo}, '%') + + AND va.project_name like CONCAT('%', #{parmas.projectName}, '%') + AND va.employee_vehicle_user_name LIKE CONCAT('%', #{parmas.employeeVehicleUserName}, '%') @@ -80,6 +82,9 @@ AND va.vehicle_belong_type = #{parmas.vehicleBelongType} + + AND va.tenant_id = #{parmas.applyCorpId} + AND va.vehicle_belong_type in diff --git a/web-infrastructure/src/main/resources/mapper/XgfApplyPersonDO.xml b/web-infrastructure/src/main/resources/mapper/XgfApplyPersonDO.xml index 68bd346..7867650 100644 --- a/web-infrastructure/src/main/resources/mapper/XgfApplyPersonDO.xml +++ b/web-infrastructure/src/main/resources/mapper/XgfApplyPersonDO.xml @@ -3,6 +3,74 @@ "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> +