feat：相关方人员权限记录

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<PersonApplyCO> xgfPersonPermissionsList(@RequestBody XgfApplyPersonPageQry qry) {
+        return personApplyService.xgfPersonPermissionsList(qry);
+    }
+
     @ApiOperation("相关方-人员申请-详情")
     @GetMapping("/xgfPersonApplyInfoById/{id}")
     public SingleResponse<XgfPersonApplyCO> xgfPersonApplyInfoById(@PathVariable("id") Long id) {
@@ -72,15 +78,9 @@ public class PersonApplyController {
         return SingleResponse.buildSuccess();
     }
 
-//    @ApiOperation("股份，企业-人员申请新增")
+    @ApiOperation("人员临时申请-审批待审批分页列表")
-//    @PostMapping("/save")
+    @PostMapping("/pendingApprovalList")
-//    public SingleResponse<PersonApplyCO> add(@Validated @RequestBody PersonApplyAddCmd cmd) {
+    public PageResponse<XgfPersonApplyCO> page(@RequestBody PersonApplyPageQry qry) {
-//        return personApplyService.add(cmd);
-//    }
-
-    @ApiOperation("相关方、临时申请里的人分页列表")
-    @PostMapping("/list")
-    public PageResponse<PersonApplyCO> page(@RequestBody PersonApplyPageQry qry) {
         return personApplyService.listPage(qry);
     }
 

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<FgsVehicleCountCo> fgsCount(@RequestParam HashMap<String,String> qry) {
         return vehicleApplyService.fgsCount(qry);
     }
-
 }
 

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;

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

@@ -44,10 +44,19 @@ public class PersonApplyQueryExe {
      * @param personApplyPageQry
      * @return
      */
-    public PageResponse<PersonApplyCO> execute(PersonApplyPageQry personApplyPageQry) {
+    public PageResponse<XgfPersonApplyCO> execute(PersonApplyPageQry personApplyPageQry) {
         Map<String, Object> parmas = PageQueryHelper.toHashMap(personApplyPageQry);
-        PageResponse<PersonApplyDO> pageResponse = personApplyRepository.listPage(parmas);
+        PageResponse<XgfApplyPersonDO> pageResponse = xgfPersonApplyRepository.listPage(parmas);
-        List<PersonApplyCO> examCenterCOS = personApplyCoConvertor.converDOsToCOs(pageResponse.getData());
+        List<XgfPersonApplyCO> 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<PersonApplyCO> xgfPersonPermissionsList(XgfApplyPersonPageQry qry) {
+        Map<String, Object> parmas = PageQueryHelper.toHashMap(qry);
+        parmas.put("applyCorpId", AuthContext.getTenantId());
+        PageResponse<PersonApplyDO> pageResponse = personApplyRepository.xgfPersonPermissionsList(parmas);
+        List<PersonApplyCO> examCenterCOS = personApplyCoConvertor.converDOsToCOs(pageResponse.getData());
+
+        return PageResponse.of(examCenterCOS, pageResponse.getTotalCount(), pageResponse.getPageSize(), pageResponse.getPageIndex());
+    }
 }
 

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<PersonApplyCO> listPage(PersonApplyPageQry qry) {
+    public PageResponse<XgfPersonApplyCO> 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<PersonApplyCO> xgfPersonPermissionsList(XgfApplyPersonPageQry qry) {
+        return personApplyQueryExe.xgfPersonPermissionsList(qry);
+    }
 }
 

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<VehicleAuditCO> xgfCarApplyList(XgfApplyCarPageQry qry) {
+        return null;
+    }
 }
 

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<PersonApplyCO> listPage(PersonApplyPageQry qry);
+    PageResponse<XgfPersonApplyCO> listPage(PersonApplyPageQry qry);
 
     SingleResponse<PersonApplyCO> add(PersonApplyAddCmd cmd);
 
@@ -39,5 +39,7 @@ public interface PersonApplyServiceI {
     void authorization(PersonAuthCmd cmd);
 
     XgfPersonApplyCO xgfPersonApplyInfoById(Long id);
+
+    PageResponse<PersonApplyCO> xgfPersonPermissionsList(XgfApplyPersonPageQry qry);
 }
 

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<FgsVehicleCountCo> fgsCount(HashMap<String, String> qry);
+
+    PageResponse<VehicleAuditCO> xgfCarApplyList(XgfApplyCarPageQry qry);
 }
 

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 = "访问结束时间")

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

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

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

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")

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

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<PersonApplyDO> 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());

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

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;

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<PersonApplyDO> {
 
     IPage<PersonApplyDO> listPage(Page<Map<String, Object>> page, Map<String, Object> parmas, String menuPerms);
+
+    IPage<PersonApplyDO> xgfPersonPermissionsList(Page<Map<String, Object>> page, Map<String, Object> parmas, String menuPerms);
 }
 

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<XgfApplyPersonDO> {
+    IPage<XgfApplyPersonDO> listPage(Page<Map<String, Object>> page, Map<String, Object> parmas, String menuPerms);
 
     IPage<XgfApplyPersonDO> xgfPersonAuditList(Page<Map<String, Object>> page, Map<String, Object> parmas, String menuPerms);
 
     IPage<PersonCountDto> personnelVehicleManagementList(Page<Map<String, Object>> page, Map<String, Object> parmas, String menuPerms);
+
 }
 

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<PersonApplyDO> {
     PageResponse<PersonApplyDO> listPage(Map<String, Object> parmas);
+
+    PageResponse<PersonApplyDO> xgfPersonPermissionsList(Map<String, Object> parmas);
 }
 

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

@@ -18,5 +18,7 @@ public interface XgfApplyPersonRepository extends BaseRepository<XgfApplyPersonD
     PageResponse<XgfApplyPersonDO> xgfPersonAuditList(Map<String, Object> parmas);
 
     PageResponse<PersonCountDto> personnelVehicleManagementList(Map<String, Object> parmas);
+
+    PageResponse<XgfApplyPersonDO> listPage(Map<String, Object> parmas);
 }
 

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

@@ -32,7 +32,6 @@ public class PersonApplyRepositoryImpl extends BaseRepositoryImpl<PersonApplyMap
 
     @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()));
         String menuPerms = "";
@@ -42,5 +41,17 @@ public class PersonApplyRepositoryImpl extends BaseRepositoryImpl<PersonApplyMap
         IPage<PersonApplyDO> iPage = personApplyMapper.listPage(page, parmas, 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()));
+        String menuPerms = "";
+        if (!org.springframework.util.ObjectUtils.isEmpty(parmas.get("menuPath"))) {
+            menuPerms = MenuEnum.getMenuKeyByPath(parmas.get("menuPath").toString());
+        }
+        IPage<PersonApplyDO> result = personApplyMapper.xgfPersonPermissionsList(page, parmas,menuPerms);
+        return PageHelper.pageToResponse(result, result.getRecords());
+    }
 }
 

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

@@ -57,5 +57,18 @@ public class XgfApplyPersonRepositoryImpl extends BaseRepositoryImpl<XgfApplyPer
         IPage<PersonCountDto> result = xgfApplyPersonMapper.personnelVehicleManagementList(page, parmas,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()));
+        String menuPerms = "";
+        if (!org.springframework.util.ObjectUtils.isEmpty(parmas.get("menuPath"))) {
+            menuPerms = MenuEnum.getMenuKeyByPath(parmas.get("menuPath").toString());
+        }
+        IPage<XgfApplyPersonDO> result = xgfApplyPersonMapper.listPage(page, parmas,menuPerms);
+        return PageHelper.pageToResponse(result, result.getRecords());
+    }
+
+
 }
 

web-infrastructure/src/main/resources/mapper/PersonApplyDO.xml

@@ -4,49 +4,53 @@
 
 <mapper namespace="com.zcloud.primeport.persistence.mapper.PersonApplyMapper">
 
-    <select id="listPage" resultType="com.zcloud.primeport.persistence.dataobject.PersonApplyDO">
+    <select id="listPage" resultType="com.zcloud.primeport.persistence.dataobject.PersonApplyDO"></select>
+    <select id="xgfPersonPermissionsList"
+            resultType="com.zcloud.primeport.persistence.dataobject.PersonApplyDO">
         SELECT
-            p.id,
+            pa.id,
-            p.xgf_apply_person_id,
+            pa.xgf_apply_person_id,
-            p.person_corp_name,
+            pa.mkmj_permission,
-            p.person_corp_id,
+            pa.person_corp_id,
-            p.person_department_id,
+            pa.person_corp_name,
-            p.person_department_name,
+            pa.person_department_id,
-            p.employee_person_user_id,
+            pa.person_department_name,
-            p.employee_person_user_name,
+            pa.employee_person_user_id,
-            p.user_face_url,
+            pa.employee_person_user_name,
-            p.user_phone,
+            pa.user_face_url,
-            p.user_card,
+            pa.user_phone,
-            ap.mkmj_id,
+            pa.user_card,
-            m.mkmj_name,
+            xap.gate_level_auth_area,
-            ap.audit_flag,
+            xap.visit_start_time,
-            ap.reasons_refusal,
+            xap.visit_end_time,
-            ap.reason_visit,
+            xap.project_name,
-            ap.mkmj_permission,
+            xap.audit_user_id,
-            ap.visit_start_time,
+            xap.audit_user_name,
-            ap.visit_end_time,
+            xap.audit_dept_id,
-            ap.inform_sign_id,
+            xap.audit_dept_name,
-            ap.project_id,
+            xap.audit_corp_id,
-            ap.project_name,
+            xap.audit_corp_name,
-            ap.audit_user_id,
+            xap.audit_time
-            ap.audit_user_name,
-            ap.audit_dept_id,
-            ap.audit_dept_name,
-            ap.audit_corp_id,
-            ap.audit_corp_name,
-            ap.person_belong_type
         FROM
-            person_apply AS p
+            person_apply AS pa
-                LEFT JOIN xgf_apply_person AS ap ON p.xgf_apply_person_id = ap.id
+                LEFT JOIN
-                LEFT JOIN mkmj AS m ON m.id = ap.mkmj_id
+            xgf_apply_person AS xap
+            ON
+                pa.xgf_apply_person_id = xap.id
         WHERE
-            p.delete_enum = 'FALSE'
+            pa.delete_enum = 'FALSE' AND
-        <if test="parmas.userCard != null and parmas.userCard != ''">
+            xap.audit_flag = 2 AND
-            AND p.user_card = #{parmas.userCard}
+            pa.person_corp_id = #{parmas.applyCorpId}
+        <if test="parmas.employeePersonUserName != null and parmas.employeePersonUserName != ''">
+            AND xap.employee_person_user_name LIKE CONCAT('%', #{parmas.employeePersonUserName}, '%')
         </if>
-        <if test="parmas.personBelongType != null and parmas.personBelongType != ''">
+        <if test="parmas.projectName != null and parmas.projectName != ''">
-            AND ap.person_belong_type = #{parmas.personBelongType}
+            AND xap.project_name like  CONCAT('%', #{parmas.projectName}, '%')
         </if>
+        ORDER BY
+        pa.employee_person_user_id,
+        pa.id DESC
     </select>
+
 </mapper>
 

web-infrastructure/src/main/resources/mapper/VehicleAuditDO.xml

@@ -53,7 +53,6 @@
         WHERE
             a.delete_enum = 'FALSE'
           AND va.delete_enum = 'FALSE'
-
         <if test="parmas.processOrRecord != null">
             <if test="parmas.processOrRecord == 1">
                 AND a.audit_status = 1
@@ -65,6 +64,9 @@
         <if test="parmas.licenceNo != null and parmas.licenceNo != ''">
             AND va.licence_no like  CONCAT('%', #{parmas.licenceNo}, '%')
         </if>
+        <if test="parmas.projectName != null and parmas.projectName != ''">
+            AND va.project_name like  CONCAT('%', #{parmas.projectName}, '%')
+        </if>
         <if test="parmas.employeeVehicleUserName != null and parmas.employeeVehicleUserName != ''">
             AND va.employee_vehicle_user_name LIKE CONCAT('%', #{parmas.employeeVehicleUserName}, '%')
         </if>
@@ -80,6 +82,9 @@
         <if test="parmas.vehicleBelongType != null and parmas.vehicleBelongType != ''">
             AND va.vehicle_belong_type = #{parmas.vehicleBelongType}
         </if>
+        <if test="parmas.applyCorpId != null">
+            AND va.tenant_id = #{parmas.applyCorpId}
+        </if>
         <if test="parmas.vehicleBelongTypeArrList != null and parmas.vehicleBelongTypeArrList.length > 0">
             AND va.vehicle_belong_type in
             <foreach collection="parmas.vehicleBelongTypeArrList" item="item" open="(" separator="," close=")">

web-infrastructure/src/main/resources/mapper/XgfApplyPersonDO.xml

@@ -3,6 +3,74 @@
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 
 <mapper namespace="com.zcloud.primeport.persistence.mapper.XgfApplyPersonMapper">
+    <select id="listPage" resultType="com.zcloud.primeport.persistence.dataobject.XgfApplyPersonDO">
+        SELECT
+        xap.id,
+        xap.person_belong_type,
+        xap.gate_level_auth_area,
+        xap.mkmj_id,
+        xap.audit_flag,
+        xap.reasons_refusal,
+        xap.reason_visit,
+        xap.visit_start_time,
+        xap.visit_end_time,
+        xap.inform_sign_id,
+        xap.project_id,
+        xap.project_name,
+        xap.apply_corp_id,
+        xap.apply_corp_name,
+        xap.audit_user_id,
+        xap.audit_user_name,
+        xap.audit_dept_id,
+        xap.audit_dept_name,
+        xap.audit_corp_id,
+        xap.audit_corp_name,
+        xap.audit_time,
+        pa.person_corp_id,
+        pa.person_corp_name,
+        pa.person_department_id,
+        pa.person_department_name,
+        pa.mkmj_permission,
+        pa.employee_person_user_name,
+        pa.employee_person_user_id,
+        pa.user_face_url,
+        pa.user_phone,
+        pa.user_card
+        FROM
+        xgf_apply_person AS xap
+        LEFT JOIN person_apply AS pa ON xap.id = pa.xgf_apply_person_id
+        AND pa.delete_enum = 'FALSE'
+        WHERE
+        xap.delete_enum = 'FALSE'
+        <if test="parmas.auditFlag != null">
+            AND xap.audit_flag = #{parmas.auditFlag}
+        </if>
+        <if test="parmas.processOrRecord != null">
+            <if test="parmas.processOrRecord == 1">
+                AND xap.audit_status = 1
+            </if>
+            <if test="parmas.processOrRecord == 2">
+                AND xap.audit_status != 1
+            </if>
+        </if>
+        <if test="parmas.mkmjId != null">
+            AND xap.mkmj_id = #{parmas.mkmjId}
+        </if>
+        <if test="parmas.visitStartTime != null and parmas.visitStartTime != ''">
+            AND xap.visit_start_time LIKE CONCAT('%', #{parmas.visitStartTime}, '%')
+        </if>
+        <if test="parmas.employeePersonUserName != null and parmas.employeePersonUserName != ''">
+            AND xap.employee_person_user_name LIKE CONCAT('%', #{parmas.employeePersonUserName}, '%')
+        </if>
+        <if test="parmas.visitEndTime != null and parmas.visitEndTime != ''">
+            AND xap.visit_end_time LIKE CONCAT('%', #{parmas.visitEndTime}, '%')
+        </if>
+        <if test="parmas.vehicleBelongType != null and parmas.vehicleBelongType != ''">
+            AND xap.person_belong_type = #{parmas.vehicleBelongType}
+        </if>
+        ORDER BY
+        xap.id DESC
+    </select>
 
     <select id="xgfPersonAuditList" resultType="com.zcloud.primeport.persistence.dataobject.XgfApplyPersonDO">
         SELECT