From 4cc55b5e554648172e0eb03a57f31432f5d5d17f Mon Sep 17 00:00:00 2001 From: dearLin <1261008090@qq.com> Date: Fri, 13 Mar 2026 09:12:38 +0800 Subject: [PATCH] =?UTF-8?q?feat=EF=BC=9A=E7=9B=B8=E5=85=B3=E6=96=B9?= =?UTF-8?q?=E3=80=81=E4=B8=B4=E6=97=B6=E8=AE=BF=E5=AE=A2=E4=BA=BA=E5=91=98?= =?UTF-8?q?=E9=97=A8=E7=A6=81=E7=94=B3=E8=AF=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../primeport/web/PersonApplyController.java | 70 +++++++------ .../primeport/web/VehicleApplyController.java | 2 +- .../primeport/web/VehicleAuditController.java | 2 +- .../primeport/command/PersonApplyAddExe.java | 12 ++- .../command/VehicleViolationsAddExe.java | 7 +- .../command/conf/CiolationProperties.java | 15 +++ .../convertor/XgfApplyPersonCoConvertor.java | 26 +++++ .../command/query/PersonApplyQueryExe.java | 31 ++++++ .../command/query/VehicleAuditQueryExe.java | 6 +- .../service/PersonApplyServiceImpl.java | 16 ++- .../primeport/api/PersonApplyServiceI.java | 10 +- .../primeport/dto/PersonApplyPageQry.java | 23 ++--- .../primeport/dto/VehicleApplyAddCmd.java | 17 ++-- .../primeport/dto/VehicleApplyUpdateCmd.java | 3 - .../primeport/dto/VehicleAuditPageQry.java | 6 ++ .../primeport/dto/VehicleAuditUpdateCmd.java | 8 +- .../primeport/dto/XgfApplyPersonPageQry.java | 26 +++++ .../primeport/dto/XgfPersonApplyAddCmd.java | 63 ++++++------ .../dto/XgfPersonApplyUpdateCmd.java | 98 +++++++++++++++++++ .../dto/clientobject/PersonApplyCO.java | 13 +-- .../dto/clientobject/VehicleAuditCO.java | 63 ++++++------ .../dto/clientobject/XgfPersonApplyCO.java | 33 +++++++ .../primeport/domain/model/PersonApplyE.java | 18 ---- .../domain/model/XgfApplyPersonE.java | 10 ++ .../gatewayimpl/PersonApplyGatewayImpl.java | 6 +- .../XgfApplyPersonGatewayImpl.java | 9 +- .../persistence/dataobject/PersonApplyDO.java | 35 ------- .../dataobject/XgfApplyPersonDO.java | 9 ++ .../mapper/XgfApplyPersonMapper.java | 1 + .../repository/XgfApplyPersonRepository.java | 1 + .../impl/XgfApplyPersonRepositoryImpl.java | 16 +++ .../main/resources/mapper/VehicleAuditDO.xml | 10 +- .../resources/mapper/XgfApplyPersonDO.xml | 29 ++++++ 33 files changed, 486 insertions(+), 208 deletions(-) create mode 100644 web-app/src/main/java/com/zcloud/primeport/command/conf/CiolationProperties.java create mode 100644 web-app/src/main/java/com/zcloud/primeport/command/convertor/XgfApplyPersonCoConvertor.java create mode 100644 web-client/src/main/java/com/zcloud/primeport/dto/XgfApplyPersonPageQry.java create mode 100644 web-client/src/main/java/com/zcloud/primeport/dto/XgfPersonApplyUpdateCmd.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 1a3659e..f89b753 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 @@ -8,12 +8,10 @@ import com.alibaba.cola.dto.SingleResponse; import com.jjb.saas.framework.auth.model.SSOUser; import com.jjb.saas.framework.auth.utils.AuthContext; import com.zcloud.primeport.api.PersonApplyServiceI; -import com.zcloud.primeport.dto.PersonApplyAddCmd; -import com.zcloud.primeport.dto.PersonApplyPageQry; -import com.zcloud.primeport.dto.PersonApplyUpdateCmd; -import com.zcloud.primeport.dto.XgfPersonApplyAddCmd; +import com.zcloud.primeport.dto.*; import com.zcloud.primeport.dto.clientobject.PersonApplyCO; import com.zcloud.primeport.dto.clientobject.XgfPersonApplyCO; +import com.zcloud.primeport.persistence.dataobject.XgfApplyPersonDO; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.AllArgsConstructor; @@ -34,7 +32,32 @@ import java.util.ArrayList; @AllArgsConstructor public class PersonApplyController { private final PersonApplyServiceI personApplyService; - + @ApiOperation("详情") + @GetMapping("/xgfPersonApplyInfoById") + public SingleResponse xgfPersonApplyInfoById(@PathVariable("id") Long id) { + return SingleResponse.of(new XgfPersonApplyCO()); + } + @ApiOperation("待审批的相关方申请列表-同已审批记录") + @PostMapping("/xgfPersonAuditList") + public PageResponse xgfPersonAuditList(@Validated @RequestBody XgfApplyPersonPageQry qry) { + return personApplyService.xgfPersonAuditList(qry); + } + @ApiOperation("相关方人员入场申请列表") + @PostMapping("/xgfPersonApplyList") + public PageResponse xgfPersonApplyList(@Validated @RequestBody XgfApplyPersonPageQry qry) { + return personApplyService.xgfPersonApplyList(qry); + } + @ApiOperation("临时访客人员入场申请列表-H5") + @PostMapping("/tmpPersonApplyH5List") + public PageResponse tmpPersonApplyH5List(@Validated @RequestBody XgfApplyPersonPageQry qry) { + return personApplyService.xgfPersonApplyList(qry); + } + @ApiOperation("相关方、临时-人员申请审批") + @PostMapping("/xgfPersonAudit") + public Response xgfPersonAudit(@Validated @RequestBody XgfPersonApplyAddCmd cmd) { + personApplyService.xgfPersonSave(cmd); + return SingleResponse.buildSuccess(); + } @ApiOperation("相关方-人员申请新增") @PostMapping("/xgfPersonSave") @@ -43,24 +66,18 @@ public class PersonApplyController { return SingleResponse.buildSuccess(); } - @ApiOperation("股份，企业-人员申请新增") - @PostMapping("/save") - public SingleResponse add(@Validated @RequestBody PersonApplyAddCmd cmd) { - return personApplyService.add(cmd); - } +// @ApiOperation("股份，企业-人员申请新增") +// @PostMapping("/save") +// public SingleResponse add(@Validated @RequestBody PersonApplyAddCmd cmd) { +// return personApplyService.add(cmd); +// } - @ApiOperation("分页") + @ApiOperation("相关方、临时申请里的人分页列表") @PostMapping("/list") public PageResponse page(@RequestBody PersonApplyPageQry qry) { return personApplyService.listPage(qry); } - @ApiOperation("所有数据") - @GetMapping("/listAll") - public MultiResponse listAll() { - return MultiResponse.of(new ArrayList()); - } - @ApiOperation("详情") @GetMapping("/{id}") public SingleResponse getInfoById(@PathVariable("id") Long id) { @@ -74,18 +91,11 @@ public class PersonApplyController { return SingleResponse.buildSuccess(); } - @ApiOperation("删除多个") - @DeleteMapping("/ids") - public Response removeBatch(@RequestParam Long[] ids) { - personApplyService.removeBatch(ids); - return SingleResponse.buildSuccess(); - } - - @ApiOperation("修改") - @PutMapping("/edit") - public SingleResponse edit(@Validated @RequestBody PersonApplyUpdateCmd personApplyUpdateCmd) { - personApplyService.edit(personApplyUpdateCmd); - return SingleResponse.buildSuccess(); - } +// @ApiOperation("修改") +// @PutMapping("/edit") +// public SingleResponse edit(@Validated @RequestBody PersonApplyUpdateCmd personApplyUpdateCmd) { +// personApplyService.edit(personApplyUpdateCmd); +// return SingleResponse.buildSuccess(); +// } } 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 55c8ecd..d0d76e8 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 @@ -38,7 +38,7 @@ import java.util.Map; public class VehicleApplyController { private final VehicleApplyServiceI vehicleApplyService; - @ApiOperation("新增-长期") + @ApiOperation("新增-长期车辆录入") @PostMapping("/save") public SingleResponse add(@Validated @RequestBody VehicleApplyAddCmd cmd) { return vehicleApplyService.add(cmd); diff --git a/web-adapter/src/main/java/com/zcloud/primeport/web/VehicleAuditController.java b/web-adapter/src/main/java/com/zcloud/primeport/web/VehicleAuditController.java index bfbfecc..8579ef9 100644 --- a/web-adapter/src/main/java/com/zcloud/primeport/web/VehicleAuditController.java +++ b/web-adapter/src/main/java/com/zcloud/primeport/web/VehicleAuditController.java @@ -33,7 +33,7 @@ import java.util.ArrayList; public class VehicleAuditController { private final VehicleAuditServiceI vehicleAuditService; -// @ApiOperation("新增") + // @ApiOperation("新增") // @PostMapping("/save") // public SingleResponse add(@Validated @RequestBody VehicleAuditAddCmd cmd) { // SSOUser ssoUser = AuthContext.getCurrentUser(); 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 c07580a..249f85d 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 @@ -49,8 +49,17 @@ public class PersonApplyAddExe { public SingleResponse xgfPersonSave(XgfPersonApplyAddCmd cmd) { // 先进行相关方申请的保存 XgfApplyPersonE build = XgfApplyPersonE.builder() + .personBelongType(cmd.getPersonBelongType()) .gateLevelAuthArea(cmd.getGateLevelAuthArea()) .mkmjPermission(2) + .mkmjId(cmd.getMkmjId()) + .auditFlag(1) + .auditCorpId(cmd.getAuditCorpId()) + .auditCorpName(cmd.getAuditCorpName()) + .auditDeptId(cmd.getAuditDeptId()) + .auditDeptName(cmd.getAuditDeptName()) + .auditUserId(cmd.getAuditUserId()) + .auditUserName(cmd.getAuditUserName()) .visitStartTime(cmd.getVisitStartTime()) .visitEndTime(cmd.getVisitEndTime()) .projectId(cmd.getProjectId()) @@ -64,9 +73,6 @@ public class PersonApplyAddExe { PersonApplyE personApplyE = new PersonApplyE(); BeanUtils.copyProperties(personApply, personApplyE); personApplyE.setXgfApplyPersonId(build.getId()); - personApplyE.setPersonBelongType(3); - personApplyE.setAuditFlag(1); - personApplyE.setMkmjPermission(2); personApplyES.add(personApplyE); }); personApplyGateway.saveBatch(personApplyES); diff --git a/web-app/src/main/java/com/zcloud/primeport/command/VehicleViolationsAddExe.java b/web-app/src/main/java/com/zcloud/primeport/command/VehicleViolationsAddExe.java index a53ff84..307b75c 100644 --- a/web-app/src/main/java/com/zcloud/primeport/command/VehicleViolationsAddExe.java +++ b/web-app/src/main/java/com/zcloud/primeport/command/VehicleViolationsAddExe.java @@ -1,6 +1,7 @@ package com.zcloud.primeport.command; import com.alibaba.cola.exception.BizException; +import com.zcloud.primeport.command.conf.CiolationProperties; import com.zcloud.primeport.domain.gateway.VehicleApplyGateway; import com.zcloud.primeport.domain.gateway.VehicleBlackGateway; import com.zcloud.primeport.domain.gateway.VehicleViolationsGateway; @@ -30,14 +31,12 @@ public class VehicleViolationsAddExe { private final VehicleViolationsGateway vehicleViolationsGateway; private final VehicleApplyGateway vehicleApplyGateway; private final VehicleBlackGateway vehicleBlackGateway; - - @Value("${ciolation.limit}") - private Integer limit; + private final CiolationProperties ciolationProperties; @Transactional(rollbackFor = Exception.class) public boolean execute(VehicleViolationsAddCmd cmd) { List vehicleViolationsList = vehicleViolationsGateway.listVehicleViolationByLicenceNo(cmd.getLicenceNo()); - if (limit != null && (vehicleViolationsList.size() + 1) >= limit) { + if (ciolationProperties.getLimit() != null && (vehicleViolationsList.size() + 1) >= ciolationProperties.getLimit()) { // 进入黑名单 vehicleBlackGateway.saveIfAbsent(cmd.getLicenceNo()); // 申请的车辆拉黑 diff --git a/web-app/src/main/java/com/zcloud/primeport/command/conf/CiolationProperties.java b/web-app/src/main/java/com/zcloud/primeport/command/conf/CiolationProperties.java new file mode 100644 index 0000000..74d3a94 --- /dev/null +++ b/web-app/src/main/java/com/zcloud/primeport/command/conf/CiolationProperties.java @@ -0,0 +1,15 @@ +package com.zcloud.primeport.command.conf; + +import lombok.Data; +import org.springframework.boot.context.properties.ConfigurationProperties; +import org.springframework.cloud.context.config.annotation.RefreshScope; +import org.springframework.stereotype.Component; + +@Data +@Component +@RefreshScope +@ConfigurationProperties(prefix = "ciolation") +public class CiolationProperties { + // 默认值，防止配置缺失 + private Integer limit = 5; +} diff --git a/web-app/src/main/java/com/zcloud/primeport/command/convertor/XgfApplyPersonCoConvertor.java b/web-app/src/main/java/com/zcloud/primeport/command/convertor/XgfApplyPersonCoConvertor.java new file mode 100644 index 0000000..a707337 --- /dev/null +++ b/web-app/src/main/java/com/zcloud/primeport/command/convertor/XgfApplyPersonCoConvertor.java @@ -0,0 +1,26 @@ +package com.zcloud.primeport.command.convertor; + +import com.zcloud.primeport.dto.clientobject.PersonApplyCO; +import com.zcloud.primeport.dto.clientobject.XgfPersonApplyCO; +import com.zcloud.primeport.persistence.dataobject.PersonApplyDO; +import com.zcloud.primeport.persistence.dataobject.XgfApplyPersonDO; +import org.mapstruct.Mapper; + +import java.util.List; + + +/** + * web-app + * + * @Author makejava + * @Date 2026-03-05 11:33:21 + */ +@Mapper(componentModel = "spring") +public interface XgfApplyPersonCoConvertor { + /** + * @param personApplyDOs + * @return + */ + List converDOsToCOs(List personApplyDOs); +} + 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 9922aac..c24f570 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 @@ -1,12 +1,19 @@ package com.zcloud.primeport.command.query; import com.alibaba.cola.dto.PageResponse; +import com.jjb.saas.framework.auth.utils.AuthContext; import com.zcloud.gbscommon.utils.PageQueryHelper; import com.zcloud.primeport.command.convertor.PersonApplyCoConvertor; +import com.zcloud.primeport.command.convertor.XgfApplyPersonCoConvertor; import com.zcloud.primeport.dto.PersonApplyPageQry; +import com.zcloud.primeport.dto.XgfApplyPersonPageQry; import com.zcloud.primeport.dto.clientobject.PersonApplyCO; +import com.zcloud.primeport.dto.clientobject.XgfPersonApplyCO; import com.zcloud.primeport.persistence.dataobject.PersonApplyDO; +import com.zcloud.primeport.persistence.dataobject.VehicleApplyDO; +import com.zcloud.primeport.persistence.dataobject.XgfApplyPersonDO; import com.zcloud.primeport.persistence.repository.PersonApplyRepository; +import com.zcloud.primeport.persistence.repository.XgfApplyPersonRepository; import lombok.AllArgsConstructor; import org.springframework.stereotype.Component; @@ -24,7 +31,9 @@ import java.util.Map; @AllArgsConstructor public class PersonApplyQueryExe { private final PersonApplyRepository personApplyRepository; + private final XgfApplyPersonRepository xgfPersonApplyRepository; private final PersonApplyCoConvertor personApplyCoConvertor; + private final XgfApplyPersonCoConvertor xgfApplyPersonCoConvertor; /** * 分页 @@ -38,5 +47,27 @@ public class PersonApplyQueryExe { List examCenterCOS = personApplyCoConvertor.converDOsToCOs(pageResponse.getData()); return PageResponse.of(examCenterCOS, pageResponse.getTotalCount(), pageResponse.getPageSize(), pageResponse.getPageIndex()); } + + public PageResponse xgfPersonAuditList(XgfApplyPersonPageQry qry) { + Map parmas = PageQueryHelper.toHashMap(qry); + PageResponse pageResponse = xgfPersonApplyRepository.xgfPersonAuditList(parmas); + List examCenterCOS = xgfApplyPersonCoConvertor.converDOsToCOs(pageResponse.getData()); + Long userId = AuthContext.getUserId(); + examCenterCOS.forEach(item -> { + item.setCurrentUserCanAudit(2); + if (item.getAuditUserId().equals(userId)) { + item.setCurrentUserCanAudit(1); + } + }); + return PageResponse.of(examCenterCOS, pageResponse.getTotalCount(), pageResponse.getPageSize(), pageResponse.getPageIndex()); + } + + public PageResponse xgfPersonApplyList(XgfApplyPersonPageQry qry) { + Map parmas = PageQueryHelper.toHashMap(qry); + parmas.put("applyCorpId", AuthContext.getTenantId()); + PageResponse pageResponse = xgfPersonApplyRepository.xgfPersonAuditList(parmas); + List examCenterCOS = xgfApplyPersonCoConvertor.converDOsToCOs(pageResponse.getData()); + return PageResponse.of(examCenterCOS, pageResponse.getTotalCount(), pageResponse.getPageSize(), pageResponse.getPageIndex()); + } } diff --git a/web-app/src/main/java/com/zcloud/primeport/command/query/VehicleAuditQueryExe.java b/web-app/src/main/java/com/zcloud/primeport/command/query/VehicleAuditQueryExe.java index a7e8fe5..00ccb38 100644 --- a/web-app/src/main/java/com/zcloud/primeport/command/query/VehicleAuditQueryExe.java +++ b/web-app/src/main/java/com/zcloud/primeport/command/query/VehicleAuditQueryExe.java @@ -41,8 +41,10 @@ public class VehicleAuditQueryExe { Long userId = AuthContext.getUserId(); examCenterCOS.forEach(item -> { item.setCurrentUserCanAudit(2); - if (item.getAuditUserId().equals(userId)) { - item.setCurrentUserCanAudit(1); + if (item.getAuditStatus() == 1) { + if (item.getAuditUserId().equals(userId)) { + item.setCurrentUserCanAudit(1); + } } }); 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 3fc0993..26c4151 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 @@ -7,11 +7,9 @@ import com.zcloud.primeport.command.PersonApplyAddExe; import com.zcloud.primeport.command.PersonApplyRemoveExe; import com.zcloud.primeport.command.PersonApplyUpdateExe; import com.zcloud.primeport.command.query.PersonApplyQueryExe; -import com.zcloud.primeport.dto.PersonApplyAddCmd; -import com.zcloud.primeport.dto.PersonApplyPageQry; -import com.zcloud.primeport.dto.PersonApplyUpdateCmd; -import com.zcloud.primeport.dto.XgfPersonApplyAddCmd; +import com.zcloud.primeport.dto.*; import com.zcloud.primeport.dto.clientobject.PersonApplyCO; +import com.zcloud.primeport.dto.clientobject.XgfPersonApplyCO; import lombok.AllArgsConstructor; import org.springframework.stereotype.Service; @@ -61,5 +59,15 @@ public class PersonApplyServiceImpl implements PersonApplyServiceI { public void xgfPersonSave(XgfPersonApplyAddCmd cmd) { personApplyAddExe.xgfPersonSave(cmd); } + + @Override + public PageResponse xgfPersonAuditList(XgfApplyPersonPageQry qry) { + return personApplyQueryExe.xgfPersonAuditList(qry); + } + + @Override + public PageResponse xgfPersonApplyList(XgfApplyPersonPageQry qry) { + return personApplyQueryExe.xgfPersonApplyList(qry); + } } 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 638c341..b263bd3 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 @@ -2,11 +2,9 @@ package com.zcloud.primeport.api; import com.alibaba.cola.dto.PageResponse; import com.alibaba.cola.dto.SingleResponse; -import com.zcloud.primeport.dto.PersonApplyAddCmd; -import com.zcloud.primeport.dto.PersonApplyPageQry; -import com.zcloud.primeport.dto.PersonApplyUpdateCmd; -import com.zcloud.primeport.dto.XgfPersonApplyAddCmd; +import com.zcloud.primeport.dto.*; import com.zcloud.primeport.dto.clientobject.PersonApplyCO; +import com.zcloud.primeport.dto.clientobject.XgfPersonApplyCO; /** * web-client @@ -26,5 +24,9 @@ public interface PersonApplyServiceI { void removeBatch(Long[] ids); void xgfPersonSave(XgfPersonApplyAddCmd cmd); + + PageResponse xgfPersonAuditList(XgfApplyPersonPageQry qry); + + PageResponse xgfPersonApplyList(XgfApplyPersonPageQry 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 29b8726..805f2f4 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 @@ -1,6 +1,7 @@ package com.zcloud.primeport.dto; import com.alibaba.cola.dto.PageQuery; +import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -13,16 +14,16 @@ import lombok.Data; @Data public class PersonApplyPageQry extends PageQuery { - /** - * 查询条件操作前缀,支持以下几种数据库查询操作： - * - `like`: 模糊匹配查询，对应SQL的LIKE操作符 - * - `eq`: 等值查询，对应SQL的=操作符 - * - `gt`: 大于比较查询 - * - `lt`: 小于比较查询 - * - `ge`: 大于等于比较查询 - * - `le`: 小于等于比较查询 - * - `ne`: 不等比较查询，对应SQL的!=操作符 - */ - private Object likePersonBelongType; + @ApiModelProperty(name = "xgf_apply_person_id", value = "相关方人员申请ID 从相关方申请里查询人只填这个") + private Long xgfApplyPersonId; + + @ApiModelProperty(name = "person_belong_type", value = "人员所属类型3相关方4临时人员") + private Integer personBelongType; + @ApiModelProperty(name = "auditFlag", value = "审核状态(1:审核中;2审核通过; 3：审核驳回)") + private Integer auditFlag; + @ApiModelProperty(name = "visitStartTime", value = "访问开始时间") + private String visitStartTime; + @ApiModelProperty(name = "visitEndTime", value = "访问结束时间") + private String visitEndTime; } diff --git a/web-client/src/main/java/com/zcloud/primeport/dto/VehicleApplyAddCmd.java b/web-client/src/main/java/com/zcloud/primeport/dto/VehicleApplyAddCmd.java index 6a5a6b2..065926d 100644 --- a/web-client/src/main/java/com/zcloud/primeport/dto/VehicleApplyAddCmd.java +++ b/web-client/src/main/java/com/zcloud/primeport/dto/VehicleApplyAddCmd.java @@ -22,8 +22,8 @@ import java.util.Date; @NoArgsConstructor @AllArgsConstructor public class VehicleApplyAddCmd extends Command { - @ApiModelProperty(value = "车辆状态(1未启用,2启用)", name = "statusFlag", required = true) - private Integer statusFlag; +// @ApiModelProperty(value = "车辆状态(1未启用,2启用)", name = "statusFlag", required = true) +// private Integer statusFlag; @ApiModelProperty(value = "车牌类型数据字典", name = "licenceType", required = true) @NotEmpty(message = "车牌类型数据字典不能为空") private String licenceType; @@ -45,12 +45,12 @@ public class VehicleApplyAddCmd extends Command { @ApiModelProperty(value = "授权范围港区与区域", name = "gateLevelAuthArea", required = true) @NotEmpty(message = "授权范围港区与区域不能为空") private String gateLevelAuthArea; - @ApiModelProperty(value = "审核状态(1:审核中;2审核通过; 3：审核驳回，4无需审批（检查部门车辆）)", name = "auditFlag", required = true) -// @NotNull(message = "审核状态(1:审核中;2审核通过; 3：审核驳回，4无需审批（检查部门车辆）)不能为空") - private Integer auditFlag; - @ApiModelProperty(value = "进出港权限(1:有 2：无)", name = "mkmjPermission", required = true) - @NotNull(message = "进出港权限(1:有 2：无)不能为空") - private Integer mkmjPermission; +// @ApiModelProperty(value = "审核状态(1:审核中;2审核通过; 3：审核驳回，4无需审批（检查部门车辆）)", name = "auditFlag", required = true) +//// @NotNull(message = "审核状态(1:审核中;2审核通过; 3：审核驳回，4无需审批（检查部门车辆）)不能为空") +// private Integer auditFlag; +// @ApiModelProperty(value = "进出港权限(1:有 2：无)", name = "mkmjPermission", required = true) +// @NotNull(message = "进出港权限(1:有 2：无)不能为空") +// private Integer mkmjPermission; @ApiModelProperty(value = "访问起始时间", name = "visitStartTime", required = true) @NotEmpty(message = "访问起始时间不能为空") private String visitStartTime; @@ -97,6 +97,5 @@ public class VehicleApplyAddCmd extends Command { @ApiModelProperty(value = "审核用户名称", name = "auditUserName", required = true) private String auditUserName; - } diff --git a/web-client/src/main/java/com/zcloud/primeport/dto/VehicleApplyUpdateCmd.java b/web-client/src/main/java/com/zcloud/primeport/dto/VehicleApplyUpdateCmd.java index 859a0e5..ecfba05 100644 --- a/web-client/src/main/java/com/zcloud/primeport/dto/VehicleApplyUpdateCmd.java +++ b/web-client/src/main/java/com/zcloud/primeport/dto/VehicleApplyUpdateCmd.java @@ -25,9 +25,6 @@ public class VehicleApplyUpdateCmd extends Command { @ApiModelProperty(value = "id", name = "id", required = true) @NotNull(message = "id不能为空") private Long id; - @ApiModelProperty(value = "车辆状态(1未启用,2启用)", name = "statusFlag", required = true) - @NotNull(message = "车辆状态(1未启用,2启用)不能为空") - private Integer statusFlag; @ApiModelProperty(value = "车牌类型数据字典", name = "licenceType", required = true) @NotEmpty(message = "车牌类型数据字典不能为空") private String licenceType; 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 aa35387..541b6c2 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 @@ -44,5 +44,11 @@ public class VehicleAuditPageQry extends PageQuery { private String vehicleBelongTypeArr; @ApiModelProperty(name = "vehicleBelongType", value = "车辆所属类型 1-股份员工车辆，2-股份单位车辆，3-分公司员工车辆，4-分公司单位车辆 ，5-相关方车辆， 6:临时车辆，7检查部门车辆") private String vehicleBelongType; + @ApiModelProperty(name = "processOrRecord", value = "1审批中数据，2审批记录") + private Integer processOrRecord; + + + @ApiModelProperty(name = "vehicleApplyId", value = "车辆申请ID（车辆审批记录用）") + private Long vehicleApplyId; } diff --git a/web-client/src/main/java/com/zcloud/primeport/dto/VehicleAuditUpdateCmd.java b/web-client/src/main/java/com/zcloud/primeport/dto/VehicleAuditUpdateCmd.java index 6d8369c..618d5c0 100644 --- a/web-client/src/main/java/com/zcloud/primeport/dto/VehicleAuditUpdateCmd.java +++ b/web-client/src/main/java/com/zcloud/primeport/dto/VehicleAuditUpdateCmd.java @@ -21,16 +21,16 @@ import javax.validation.constraints.NotNull; @NoArgsConstructor @AllArgsConstructor public class VehicleAuditUpdateCmd extends Command { - @ApiModelProperty(value = "id", name = "id", required = true) + @ApiModelProperty(value = "id", name = "id") @NotNull(message = "id不能为空") private Long id; - @ApiModelProperty(value = "车辆申请id", name = "vehicleApplyId", required = true) + @ApiModelProperty(value = "车辆申请id", name = "vehicleApplyId") @NotEmpty(message = "车辆申请id不能为空") private Long vehicleApplyId; - @ApiModelProperty(value = "审批状态(2通过,3不通过)", name = "auditStatus", required = true) + @ApiModelProperty(value = "审批状态(2通过,3不通过)", name = "auditStatus") @NotNull(message = "审批状态不能为空") private Integer auditStatus; - @ApiModelProperty(value = "驳回原因", name = "remarks", required = true) + @ApiModelProperty(value = "驳回原因", name = "remarks") private String remarks; } 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 new file mode 100644 index 0000000..7039334 --- /dev/null +++ b/web-client/src/main/java/com/zcloud/primeport/dto/XgfApplyPersonPageQry.java @@ -0,0 +1,26 @@ +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 XgfApplyPersonPageQry extends PageQuery { + + @ApiModelProperty(name = "processOrRecord", value = "1审批中数据，2审批记录") + private Integer processOrRecord; + @ApiModelProperty(name = "projectName", value = "项目名称") + private String projectName; + @ApiModelProperty(name = "applyCorpName", value = "申请单位名称") + private String applyCorpName; + @ApiModelProperty(name = "auditFlag", value = "审核状态(1:审核中;2审核通过; 3：审核驳回)") + private Integer auditFlag; +} + 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 92d28e9..6bd8d17 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 @@ -22,75 +22,74 @@ import java.util.List; @NoArgsConstructor @AllArgsConstructor public class XgfPersonApplyAddCmd extends Command { - @ApiModelProperty(value = "1股份2分公司3相关方4临时人员", name = "personBelongType", required = true) - @NotNull(message = "1股份2分公司3相关方4临时人员不能为空") + @ApiModelProperty(value = "3相关方4临时人员", name = "personBelongType") + @NotNull(message = "3相关方4临时人员不能为空") private Integer personBelongType; - @ApiModelProperty(value = "授权范围港区与区域", name = "gateLevelAuthArea", required = true) + @ApiModelProperty(value = "授权范围港区与区域", name = "gateLevelAuthArea") @NotEmpty(message = "授权范围港区与区域不能为空") private String gateLevelAuthArea; - @ApiModelProperty(value = "访问起始时间", name = "visitStartTime", required = true) + @ApiModelProperty(value = "访问起始时间", name = "visitStartTime") @NotEmpty(message = "访问起始时间不能为空") private String visitStartTime; - @ApiModelProperty(value = "访问结束时间", name = "visitEndTime", required = true) + @ApiModelProperty(value = "访问结束时间", name = "visitEndTime") @NotEmpty(message = "访问结束时间不能为空") private String visitEndTime; - @ApiModelProperty(value = "告知签字", name = "informSignId", required = true) -// @NotNull(message = "告知签字不能为空") + @ApiModelProperty(value = "告知签字", name = "informSignId") private Long informSignId; - @ApiModelProperty(value = "项目id", name = "projectId", required = true) -// @NotNull(message = "项目id不能为空") + @ApiModelProperty(value = "口门id，临时申请用。", name = "mkmjId") + private Long mkmjId; + @ApiModelProperty(value = "项目id", name = "projectId") private Long projectId; - @ApiModelProperty(value = "项目名称", name = "projectName", required = true) -// @NotEmpty(message = "项目名称不能为空") + @ApiModelProperty(value = "项目名称", name = "projectName") private String projectName; - @ApiModelProperty(value = "审核企业", name = "auditCorpId", required = true) + @ApiModelProperty(value = "审核企业", name = "auditCorpId") private Long auditCorpId; - @ApiModelProperty(value = "审核企业名称", name = "auditCorpName", required = true) + @ApiModelProperty(value = "审核企业名称", name = "auditCorpName") private String auditCorpName; - @ApiModelProperty(value = "审核部门", name = "auditDeptId", required = true) + @ApiModelProperty(value = "审核部门", name = "auditDeptId") private Long auditDeptId; - @ApiModelProperty(value = "审核部门名称", name = "auditDeptName", required = true) + @ApiModelProperty(value = "审核部门名称", name = "auditDeptName") private String auditDeptName; - @ApiModelProperty(value = "审核用户", name = "auditUserId", required = true) + @ApiModelProperty(value = "审核用户", name = "auditUserId") private Long auditUserId; - @ApiModelProperty(value = "审核用户名称", name = "auditUserName", required = true) + @ApiModelProperty(value = "审核用户名称", name = "auditUserName") private String auditUserName; - @ApiModelProperty(value = "待审批人员列表", name = "personApplyList", required = true) + @ApiModelProperty(value = "待审批人员列表", name = "personApplyList") private List personApplyList; @Data @NoArgsConstructor @AllArgsConstructor public static class PersonApplyAddCmdExt { - @ApiModelProperty(value = "待审批人员所属企业ID", name = "personCorpId", required = true) - @NotNull(message = "待审批人员所属企业ID不能为空") + @ApiModelProperty(value = "待审批人员所属企业ID", name = "personCorpId") +// @NotNull(message = "待审批人员所属企业ID不能为空") private Long personCorpId; - @ApiModelProperty(value = "待审批人员所属企业名称", name = "personCorpName", required = true) - @NotEmpty(message = "待审批人员所属企业名称不能为空") + @ApiModelProperty(value = "待审批人员所属企业名称", name = "personCorpName") +// @NotEmpty(message = "待审批人员所属企业名称不能为空") private String personCorpName; - @ApiModelProperty(value = "待审批人员所属部门id", name = "personDepartmentId", required = true) - @NotNull(message = "待审批人员所属部门id不能为空") + @ApiModelProperty(value = "待审批人员所属部门id", name = "personDepartmentId") +// @NotNull(message = "待审批人员所属部门id不能为空") private Long personDepartmentId; - @ApiModelProperty(value = "待审批人员部门名称", name = "personDepartmentName", required = true) - @NotEmpty(message = "待审批人员部门名称不能为空") + @ApiModelProperty(value = "待审批人员部门名称", name = "personDepartmentName") +// @NotEmpty(message = "待审批人员部门名称不能为空") private String personDepartmentName; - @ApiModelProperty(value = "待审批人员id", name = "employeePersonUserId", required = true) - @NotNull(message = "待审批人员id不能为空") + @ApiModelProperty(value = "待审批人员id", name = "employeePersonUserId") +// @NotNull(message = "待审批人员id不能为空") private Long employeePersonUserId; - @ApiModelProperty(value = "待审批人员姓名", name = "employeePersonUserName", required = true) + @ApiModelProperty(value = "待审批人员姓名", name = "employeePersonUserName") @NotEmpty(message = "待审批人员姓名不能为空") private String employeePersonUserName; - @ApiModelProperty(value = "头像", name = "userFaceUrl", required = true) + @ApiModelProperty(value = "头像", name = "userFaceUrl") @NotEmpty(message = "头像不能为空") private String userFaceUrl; - @ApiModelProperty(value = "手机号", name = "userPhone", required = true) + @ApiModelProperty(value = "手机号", name = "userPhone") @NotEmpty(message = "手机号不能为空") private String userPhone; - @ApiModelProperty(value = "身份证号码", name = "userCard", required = true) + @ApiModelProperty(value = "身份证号码", name = "userCard") @NotEmpty(message = "身份证号码不能为空") private String userCard; } diff --git a/web-client/src/main/java/com/zcloud/primeport/dto/XgfPersonApplyUpdateCmd.java b/web-client/src/main/java/com/zcloud/primeport/dto/XgfPersonApplyUpdateCmd.java new file mode 100644 index 0000000..5838ddb --- /dev/null +++ b/web-client/src/main/java/com/zcloud/primeport/dto/XgfPersonApplyUpdateCmd.java @@ -0,0 +1,98 @@ +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; +import java.util.List; + +/** + * web-client + * + * @Author makejava + * @Date 2026-03-05 11:33:21 + */ +@EqualsAndHashCode(callSuper = true) +@Data +@NoArgsConstructor +@AllArgsConstructor +public class XgfPersonApplyUpdateCmd extends Command { +// @ApiModelProperty(value = "1股份2分公司3相关方4临时人员", name = "personBelongType", required = true) +// @NotNull(message = "1股份2分公司3相关方4临时人员不能为空") +// private Integer personBelongType; + @ApiModelProperty(value = "授权范围港区与区域", name = "gateLevelAuthArea", required = true) + @NotEmpty(message = "授权范围港区与区域不能为空") + private String gateLevelAuthArea; + @ApiModelProperty(value = "访问起始时间", name = "visitStartTime", required = true) + @NotEmpty(message = "访问起始时间不能为空") + private String visitStartTime; + @ApiModelProperty(value = "访问结束时间", name = "visitEndTime", required = true) + @NotEmpty(message = "访问结束时间不能为空") + private String visitEndTime; + + @ApiModelProperty(value = "告知签字", name = "informSignId", required = true) +// @NotNull(message = "告知签字不能为空") + private Long informSignId; + @ApiModelProperty(value = "项目id", name = "projectId", required = true) +// @NotNull(message = "项目id不能为空") + private Long projectId; + @ApiModelProperty(value = "项目名称", name = "projectName", required = true) +// @NotEmpty(message = "项目名称不能为空") + private String projectName; + + + @ApiModelProperty(value = "审核企业", name = "auditCorpId", required = true) + private Long auditCorpId; + @ApiModelProperty(value = "审核企业名称", name = "auditCorpName", required = true) + private String auditCorpName; + @ApiModelProperty(value = "审核部门", name = "auditDeptId", required = true) + private Long auditDeptId; + @ApiModelProperty(value = "审核部门名称", name = "auditDeptName", required = true) + private String auditDeptName; + @ApiModelProperty(value = "审核用户", name = "auditUserId", required = true) + private Long auditUserId; + @ApiModelProperty(value = "审核用户名称", name = "auditUserName", required = true) + private String auditUserName; + + @ApiModelProperty(value = "待审批人员列表", name = "personApplyList", required = true) + private List personApplyList; + + @Data + @NoArgsConstructor + @AllArgsConstructor + public static class PersonApplyAddCmdExt { + @ApiModelProperty(value = "待审批人员所属企业ID", name = "personCorpId", required = true) + @NotNull(message = "待审批人员所属企业ID不能为空") + private Long personCorpId; + @ApiModelProperty(value = "待审批人员所属企业名称", name = "personCorpName", required = true) + @NotEmpty(message = "待审批人员所属企业名称不能为空") + private String personCorpName; + @ApiModelProperty(value = "待审批人员所属部门id", name = "personDepartmentId", required = true) + @NotNull(message = "待审批人员所属部门id不能为空") + private Long personDepartmentId; + @ApiModelProperty(value = "待审批人员部门名称", name = "personDepartmentName", required = true) + @NotEmpty(message = "待审批人员部门名称不能为空") + private String personDepartmentName; + @ApiModelProperty(value = "待审批人员id", name = "employeePersonUserId", required = true) + @NotNull(message = "待审批人员id不能为空") + private Long employeePersonUserId; + @ApiModelProperty(value = "待审批人员姓名", name = "employeePersonUserName", required = true) + @NotEmpty(message = "待审批人员姓名不能为空") + private String employeePersonUserName; + @ApiModelProperty(value = "头像", name = "userFaceUrl", required = true) + @NotEmpty(message = "头像不能为空") + private String userFaceUrl; + @ApiModelProperty(value = "手机号", name = "userPhone", required = true) + @NotEmpty(message = "手机号不能为空") + private String userPhone; + @ApiModelProperty(value = "身份证号码", name = "userCard", required = true) + @NotEmpty(message = "身份证号码不能为空") + private String userCard; + } +} + 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 b54f542..4be9dfb 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 @@ -20,16 +20,7 @@ public class PersonApplyCO extends ClientObject { private Long id; //1股份2分公司3相关方4临时人员 @ApiModelProperty(value = "1股份2分公司3相关方4临时人员") - private Object personBelongType; - //授权范围港区与区域 - @ApiModelProperty(value = "授权范围港区与区域") - private Object gateLevelAuthArea; - //审核状态(1:审核中;2审核通过; 3：审核驳回，4无需审批（长期人员）) - @ApiModelProperty(value = "审核状态(1:审核中;2审核通过; 3：审核驳回，4无需审批（长期人员）)") - private Integer auditFlag; - //进出港权限(1:有 2：无) - @ApiModelProperty(value = "进出港权限(1:有 2：无)") - private Integer mkmjPermission; + private Integer personBelongType; //访问起始时间 @ApiModelProperty(value = "访问起始时间") private String visitStartTime; @@ -72,7 +63,7 @@ public class PersonApplyCO extends ClientObject { //项目名称 @ApiModelProperty(value = "项目名称") private String projectName; - //来访事由 + //来访事由 驳回原因 @ApiModelProperty(value = "来访事由") private String remarks; } diff --git a/web-client/src/main/java/com/zcloud/primeport/dto/clientobject/VehicleAuditCO.java b/web-client/src/main/java/com/zcloud/primeport/dto/clientobject/VehicleAuditCO.java index 09b7232..6b955b2 100644 --- a/web-client/src/main/java/com/zcloud/primeport/dto/clientobject/VehicleAuditCO.java +++ b/web-client/src/main/java/com/zcloud/primeport/dto/clientobject/VehicleAuditCO.java @@ -19,95 +19,96 @@ public class VehicleAuditCO extends ClientObject { @ApiModelProperty(value = "id") private Long id; //车辆申请id - @ApiModelProperty(value = "车辆申请id") + @ApiModelProperty(value = "车辆申请id", name = "vehicleApplyId") private String vehicleApplyId; //审批批次(1.普通车辆.2危险化学品车辆) - @ApiModelProperty(value = "审批批次(1.普通车辆.2危险化学品车辆)") + @ApiModelProperty(value = "审批批次(1.普通车辆.2危险化学品车辆)", name = "batchType") private Integer batchType; //审批状态(1,申请;2.更新) - @ApiModelProperty(value = "审批状态(1,申请;2.更新)") + @ApiModelProperty(value = "审批状态(1,申请;2.更新)", name = "batchState") private Integer batchState; //审批人id - @ApiModelProperty(value = "审批人id") + @ApiModelProperty(value = "审批人id", name = "auditUserId") private Long auditUserId; //审批人姓名 - @ApiModelProperty(value = "审批人姓名") + @ApiModelProperty(value = "审批人姓名", name = "auditUserName") private String auditUserName; //审批部门id - @ApiModelProperty(value = "审批部门id") + @ApiModelProperty(value = "审批部门id", name = "auditDeptId") private Long auditDeptId; //审批部门名称 - @ApiModelProperty(value = "审批部门名称") + @ApiModelProperty(value = "审批部门名称", name = "auditDeptName") private String auditDeptName; //审批人企业id - @ApiModelProperty(value = "审批人企业id") + @ApiModelProperty(value = "审批人企业id", name = "auditCorpId") private Long auditCorpId; //审批人企业名称 - @ApiModelProperty(value = "审批人企业名称") + @ApiModelProperty(value = "审批人企业名称", name = "auditCorpName") private String auditCorpName; //审批状态(1,未开始,2通过,3不通过) - @ApiModelProperty(value = "审批状态(1,未开始,2通过,3不通过)") + @ApiModelProperty(value = "审批状态(1,未开始,2通过,3不通过)", name = "auditStatus") private Integer auditStatus; //审批意见 - @ApiModelProperty(value = "审批意见") + @ApiModelProperty(value = "审批意见(驳回原因)", name = "remarks") private String remarks; //访问起始时间 - @ApiModelProperty(value = "访问起始时间") + @ApiModelProperty(value = "访问起始时间", name = "visitStartTime") private String visitStartTime; //访问结束时间 - @ApiModelProperty(value = "访问结束时间") + @ApiModelProperty(value = "访问结束时间", name = "visitEndTime") private String visitEndTime; //车辆所属企业ID - @ApiModelProperty(value = "车辆所属企业ID") + @ApiModelProperty(value = "车辆所属企业ID", name = "vehicleCorpId") private Long vehicleCorpId; //车辆所属企业名称 - @ApiModelProperty(value = "车辆所属企业名称") + @ApiModelProperty(value = "车辆所属企业名称", name = "vehicleCorpName") private String vehicleCorpName; //车辆所属部门id - @ApiModelProperty(value = "车辆所属部门id") + @ApiModelProperty(value = "车辆所属部门id", name = "vehicleDepartmentId") private Long vehicleDepartmentId; //车辆所属部门名称 - @ApiModelProperty(value = "车辆所属部门名称") + @ApiModelProperty(value = "车辆所属部门名称", name = "vehicleDepartmentName") private String vehicleDepartmentName; //车辆所属人id(员工车辆/驾驶人id) - @ApiModelProperty(value = "车辆所属人id(员工车辆/驾驶人id)") + @ApiModelProperty(value = "车辆所属人id(员工车辆/驾驶人id)", name = "employeeVehicleUserId") private Long employeeVehicleUserId; //车辆所属人姓名(员工车辆/驾驶人名称) - @ApiModelProperty(value = "车辆所属人姓名(员工车辆/驾驶人名称)") + @ApiModelProperty(value = "车辆所属人姓名(员工车辆/驾驶人名称)", name = "employeeVehicleUserName") private String employeeVehicleUserName; //车牌类型数据字典 - @ApiModelProperty(value = "车牌类型数据字典") + @ApiModelProperty(value = "车牌类型数据字典", name = "licenceType") private String licenceType; //车牌类型名称0-白牌 1- 蓝牌 2-黄牌 3-绿牌 4-黑牌 - @ApiModelProperty(value = "车牌类型名称0-白牌 1- 蓝牌 2-黄牌 3-绿牌 4-黑牌") + @ApiModelProperty(value = "车牌类型名称0-白牌 1- 蓝牌 2-黄牌 3-绿牌 4-黑牌", name = "licenceTypeName") private String licenceTypeName; //车牌号 - @ApiModelProperty(value = "车牌号") + @ApiModelProperty(value = "车牌号", name = "licenceNo") private String licenceNo; //车辆类型 - @ApiModelProperty(value = "车辆类型") + @ApiModelProperty(value = "车辆类型", name = "vehicleType") private String vehicleType; //车辆类型-名字 - @ApiModelProperty(value = "车辆类型-名字") + @ApiModelProperty(value = "车辆类型-名字", name = "vehicleTypeName") private String vehicleTypeName; //车辆所属类型 1-股份员工车辆，2-股份单位车辆，3-分公司员工车辆，4-分公司单位车辆 ，5-相关方车辆， 6:临时车辆，7检查部门车辆 - @ApiModelProperty(value = "车辆所属类型 1-股份员工车辆，2-股份单位车辆，3-分公司员工车辆，4-分公司单位车辆 ，5-相关方车辆， 6:临时车辆，7检查部门车辆") + @ApiModelProperty(value = "车辆所属类型 1-股份员工车辆，2-股份单位车辆，3-分公司员工车辆，4-分公司单位车辆 ，5-相关方车辆， 6:临时车辆，7检查部门车辆", name = "vehicleBelongType") private String vehicleBelongType; //授权范围港区与区域 - @ApiModelProperty(value = "授权范围港区与区域",name = "gateLevelAuthArea") + @ApiModelProperty(value = "授权范围港区与区域", name = "gateLevelAuthArea") private String gateLevelAuthArea; - @ApiModelProperty(value = "项目名称",name = "projectName") + @ApiModelProperty(value = "项目名称", name = "projectName") private String projectName; - @ApiModelProperty(value = "项目id",name = "projectId") + @ApiModelProperty(value = "项目id", name = "projectId") private Long projectId; - @ApiModelProperty(value = "当前用户是否能审核", name = "currentUserCanAudit") + @ApiModelProperty(value = "当前用户是否能审核。1，能审核2不能审核", name = "currentUserCanAudit") private Integer currentUserCanAudit; - @ApiModelProperty(value = "待审核信息",name = "changeAfter") + + @ApiModelProperty(value = "待审核信息", name = "changeAfter") private String changeAfter; //变更前信息 - @ApiModelProperty(value = "变更前信息",name = "changeBefore") + @ApiModelProperty(value = "变更前信息", name = "changeBefore") private String changeBefore; } diff --git a/web-client/src/main/java/com/zcloud/primeport/dto/clientobject/XgfPersonApplyCO.java b/web-client/src/main/java/com/zcloud/primeport/dto/clientobject/XgfPersonApplyCO.java index a4296e3..77d3829 100644 --- a/web-client/src/main/java/com/zcloud/primeport/dto/clientobject/XgfPersonApplyCO.java +++ b/web-client/src/main/java/com/zcloud/primeport/dto/clientobject/XgfPersonApplyCO.java @@ -1,9 +1,12 @@ package com.zcloud.primeport.dto.clientobject; import com.alibaba.cola.dto.ClientObject; +import com.zcloud.primeport.dto.XgfPersonApplyAddCmd; import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import java.util.List; + /** * web-client @@ -40,5 +43,35 @@ public class XgfPersonApplyCO extends ClientObject { //项目名称 @ApiModelProperty(value = "项目名称",name = "projectName") private String projectName; + @ApiModelProperty(value = "申请单位id",name = "applyCorpId") + private Long applyCorpId; + @ApiModelProperty(name = "applyCorpName", value = "申请单位名称") + private String applyCorpName; + + @ApiModelProperty(value = "当前用户是否能审核。1，能审核2不能审核", name = "currentUserCanAudit") + private Integer currentUserCanAudit; + + //审批人id + @ApiModelProperty(value = "审批人id", name = "auditUserId") + private Long auditUserId; + //审批人姓名 + @ApiModelProperty(value = "审批人姓名", name = "auditUserName") + private String auditUserName; + //审批部门id + @ApiModelProperty(value = "审批部门id", name = "auditDeptId") + private Long auditDeptId; + //审批部门名称 + @ApiModelProperty(value = "审批部门名称", name = "auditDeptName") + private String auditDeptName; + //审批人企业id + @ApiModelProperty(value = "审批人企业id", name = "auditCorpId") + private Long auditCorpId; + //审批人企业名称 + @ApiModelProperty(value = "审批人企业名称", name = "auditCorpName") + private String auditCorpName; + @ApiModelProperty(value = "驳回原因", name = "reasonsRefusal") + private String reasonsRefusal; + @ApiModelProperty(value = "来访事由", name = "reasonVisit") + private String reasonVisit; } diff --git a/web-domain/src/main/java/com/zcloud/primeport/domain/model/PersonApplyE.java b/web-domain/src/main/java/com/zcloud/primeport/domain/model/PersonApplyE.java index 7f669f1..0003e00 100644 --- a/web-domain/src/main/java/com/zcloud/primeport/domain/model/PersonApplyE.java +++ b/web-domain/src/main/java/com/zcloud/primeport/domain/model/PersonApplyE.java @@ -20,18 +20,6 @@ import java.util.Date; @Builder public class PersonApplyE extends BaseE { private Long xgfApplyPersonId; - //1股份2分公司3相关方4临时人员 - private Integer personBelongType; - //授权范围港区与区域 - private String gateLevelAuthArea; - //审核状态(1:审核中;2审核通过; 3：审核驳回，4无需审批（长期人员）) - private Integer auditFlag; - //进出港权限(1:有 2：无) - private Integer mkmjPermission; - //访问起始时间 - private String visitStartTime; - //访问结束时间 - private String visitEndTime; //待审批人员所属企业ID private Long personCorpId; //待审批人员所属企业名称 @@ -50,11 +38,5 @@ public class PersonApplyE extends BaseE { private String userPhone; //身份证号码 private String userCard; - //告知签字 - private Long informSignId; - //项目id - private Long projectId; - //项目名称 - private String projectName; } diff --git a/web-domain/src/main/java/com/zcloud/primeport/domain/model/XgfApplyPersonE.java b/web-domain/src/main/java/com/zcloud/primeport/domain/model/XgfApplyPersonE.java index 7e36f2c..852fa7b 100644 --- a/web-domain/src/main/java/com/zcloud/primeport/domain/model/XgfApplyPersonE.java +++ b/web-domain/src/main/java/com/zcloud/primeport/domain/model/XgfApplyPersonE.java @@ -1,6 +1,7 @@ package com.zcloud.primeport.domain.model; import com.jjb.saas.framework.domain.model.BaseE; +import io.swagger.annotations.ApiModelProperty; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; @@ -17,6 +18,8 @@ import lombok.NoArgsConstructor; @AllArgsConstructor @Builder public class XgfApplyPersonE extends BaseE { + private Integer personBelongType; + private Long mkmjId; //授权范围港区与区域 private String gateLevelAuthArea; //审核状态(1:审核中;2审核通过; 3：审核驳回，4无需审批（长期人员）) @@ -33,5 +36,12 @@ public class XgfApplyPersonE extends BaseE { private Long projectId; //项目名称 private String projectName; + + private Long auditCorpId; + private String auditCorpName; + private Long auditDeptId; + private String auditDeptName; + private Long auditUserId; + private String auditUserName; } 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 1535596..3987726 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 @@ -51,7 +51,11 @@ public class PersonApplyGatewayImpl implements PersonApplyGateway { @Override public void saveBatch(ArrayList personApplyES) { ArrayList d = new ArrayList<>(); - BeanUtils.copyProperties(personApplyES, d); + personApplyES.forEach(item ->{ + PersonApplyDO doItem = new PersonApplyDO(); + BeanUtils.copyProperties(item, doItem); + d.add(doItem); + }); personApplyRepository.saveBatch(d); } } diff --git a/web-infrastructure/src/main/java/com/zcloud/primeport/gatewayimpl/XgfApplyPersonGatewayImpl.java b/web-infrastructure/src/main/java/com/zcloud/primeport/gatewayimpl/XgfApplyPersonGatewayImpl.java index 5ad68ec..2b45e36 100644 --- a/web-infrastructure/src/main/java/com/zcloud/primeport/gatewayimpl/XgfApplyPersonGatewayImpl.java +++ b/web-infrastructure/src/main/java/com/zcloud/primeport/gatewayimpl/XgfApplyPersonGatewayImpl.java @@ -5,6 +5,8 @@ import com.zcloud.primeport.domain.gateway.XgfApplyPersonGateway; import com.zcloud.primeport.domain.model.PersonApplyE; import com.zcloud.primeport.domain.model.XgfApplyPersonE; import com.zcloud.primeport.persistence.dataobject.PersonApplyDO; +import com.zcloud.primeport.persistence.dataobject.XgfApplyPersonDO; +import com.zcloud.primeport.persistence.mapper.XgfApplyPersonMapper; import com.zcloud.primeport.persistence.repository.PersonApplyRepository; import lombok.AllArgsConstructor; import org.springframework.beans.BeanUtils; @@ -21,13 +23,14 @@ import java.util.Collections; @Service @AllArgsConstructor public class XgfApplyPersonGatewayImpl implements XgfApplyPersonGateway { - private final PersonApplyRepository personApplyRepository; + private final XgfApplyPersonMapper xgfApplyPersonMapper; @Override public void save(XgfApplyPersonE build) { - PersonApplyDO d = new PersonApplyDO(); + XgfApplyPersonDO d = new XgfApplyPersonDO(); BeanUtils.copyProperties(build, d); - personApplyRepository.save(d); + xgfApplyPersonMapper.insert(d); + build.setId(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 9671503..6030de2 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 @@ -21,25 +21,6 @@ import java.util.Date; @EqualsAndHashCode(callSuper = true) public class PersonApplyDO extends BaseDO { private Long xgfApplyPersonId; - //1股份2分公司3相关方4临时人员 - @ApiModelProperty(value = "1股份2分公司3相关方4临时人员") - private Integer personBelongType; - //授权范围港区与区域 - @ApiModelProperty(value = "授权范围港区与区域") - private String gateLevelAuthArea; - //审核状态(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; - //访问结束时间 - @ApiModelProperty(value = "访问结束时间") - private String visitEndTime; - //待审批人员所属企业ID @ApiModelProperty(value = "待审批人员所属企业ID") private Long personCorpId; //待审批人员所属企业名称 @@ -66,21 +47,5 @@ public class PersonApplyDO extends BaseDO { //身份证号码 @ApiModelProperty(value = "身份证号码") private String userCard; - //告知签字 - @ApiModelProperty(value = "告知签字") - private Long informSignId; - //项目id - @ApiModelProperty(value = "项目id") - private Long projectId; - //项目名称 - @ApiModelProperty(value = "项目名称") - private String projectName; - //删除标识 - @ApiModelProperty(value = "删除标识") - private String deleteEnum; - //来访事由 - @ApiModelProperty(value = "来访事由") - private String remarks; - } 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 2e5e336..82683c0 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 @@ -16,6 +16,7 @@ import lombok.EqualsAndHashCode; @TableName("xgf_apply_person") @EqualsAndHashCode(callSuper = true) public class XgfApplyPersonDO extends BaseDO { + private Integer personBelongType; //授权范围港区与区域 @ApiModelProperty(value = "授权范围港区与区域") private String gateLevelAuthArea; @@ -34,11 +35,19 @@ public class XgfApplyPersonDO extends BaseDO { //告知签字 @ApiModelProperty(value = "告知签字") private Long informSignId; + private Long mkmjId; //项目id @ApiModelProperty(value = "项目id") private Long projectId; //项目名称 @ApiModelProperty(value = "项目名称") private String projectName; + + private Long auditCorpId; + private String auditCorpName; + private Long auditDeptId; + private String auditDeptName; + private Long auditUserId; + private String auditUserName; } 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 985dea9..6404349 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,5 +18,6 @@ import java.util.Map; @Mapper public interface XgfApplyPersonMapper extends BaseMapper { + IPage xgfPersonAuditList(Page> page, Map parmas, String menuPerms); } 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 8315be9..12bff9d 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 @@ -14,5 +14,6 @@ import java.util.Map; * @Date 2026-03-05 11:33:22 */ public interface XgfApplyPersonRepository extends BaseRepository { + PageResponse xgfPersonAuditList(Map parmas); } 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 d258d41..67761f1 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 @@ -3,11 +3,16 @@ package com.zcloud.primeport.persistence.repository.impl; import com.alibaba.cola.dto.PageResponse; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.jjb.saas.framework.auth.utils.AuthContext; import com.jjb.saas.framework.repository.common.PageHelper; import com.jjb.saas.framework.repository.repo.impl.BaseRepositoryImpl; import com.zcloud.gbscommon.utils.PageQueryHelper; import com.zcloud.gbscommon.utils.Query; +import com.zcloud.gbscommon.utils.Tools; +import com.zcloud.primeport.domain.enums.MenuEnum; import com.zcloud.primeport.persistence.dataobject.PersonApplyDO; +import com.zcloud.primeport.persistence.dataobject.VehicleApplyDO; import com.zcloud.primeport.persistence.dataobject.XgfApplyPersonDO; import com.zcloud.primeport.persistence.mapper.PersonApplyMapper; import com.zcloud.primeport.persistence.mapper.XgfApplyPersonMapper; @@ -16,6 +21,7 @@ import com.zcloud.primeport.persistence.repository.XgfApplyPersonRepository; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; +import java.util.List; import java.util.Map; /** @@ -29,5 +35,15 @@ import java.util.Map; public class XgfApplyPersonRepositoryImpl extends BaseRepositoryImpl implements XgfApplyPersonRepository { private final XgfApplyPersonMapper xgfApplyPersonMapper; + @Override + public PageResponse xgfPersonAuditList(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.xgfPersonAuditList(page, parmas,menuPerms); + return PageHelper.pageToResponse(result, result.getRecords()); + } } diff --git a/web-infrastructure/src/main/resources/mapper/VehicleAuditDO.xml b/web-infrastructure/src/main/resources/mapper/VehicleAuditDO.xml index e8117da..c06269c 100644 --- a/web-infrastructure/src/main/resources/mapper/VehicleAuditDO.xml +++ b/web-infrastructure/src/main/resources/mapper/VehicleAuditDO.xml @@ -52,7 +52,15 @@ WHERE a.delete_enum = 'FALSE' AND va.delete_enum = 'FALSE' - AND a.audit_status = 1 + + + + AND a.audit_status = 1 + + + AND a.audit_status != 1 + + AND va.licence_no like CONCAT('%', #{parmas.licenceNo}, '%') diff --git a/web-infrastructure/src/main/resources/mapper/XgfApplyPersonDO.xml b/web-infrastructure/src/main/resources/mapper/XgfApplyPersonDO.xml index acc4f20..f748ced 100644 --- a/web-infrastructure/src/main/resources/mapper/XgfApplyPersonDO.xml +++ b/web-infrastructure/src/main/resources/mapper/XgfApplyPersonDO.xml @@ -4,5 +4,34 @@ +