From 33fd3ce74933c515eddc397c2bf25561c77be38f Mon Sep 17 00:00:00 2001 From: dearLin <1261008090@qq.com> Date: Tue, 17 Mar 2026 13:41:43 +0800 Subject: [PATCH] =?UTF-8?q?feat=EF=BC=9A=E5=88=86=E5=85=AC=E5=8F=B8?= =?UTF-8?q?=E7=BB=9F=E8=AE=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../zcloud/primeport/web/MkmjController.java | 9 ++++++ .../primeport/command/query/MkmjQueryExe.java | 12 ++++++++ .../command/query/VehicleApplyQueryExe.java | 15 ++++++++-- .../primeport/service/MkmjServiceImpl.java | 8 +++++ .../zcloud/primeport/api/MkmjServiceI.java | 6 ++++ .../primeport/dto/VehicleAuditUpdateCmd.java | 2 +- .../dto/clientobject/VehicleApplyCO.java | 29 +++++++++++++++++++ .../main/resources/mapper/VehicleApplyDO.xml | 3 ++ .../main/resources/mapper/VehicleAuditDO.xml | 2 +- 9 files changed, 82 insertions(+), 4 deletions(-) diff --git a/web-adapter/src/main/java/com/zcloud/primeport/web/MkmjController.java b/web-adapter/src/main/java/com/zcloud/primeport/web/MkmjController.java index 8ae5031..4341276 100644 --- a/web-adapter/src/main/java/com/zcloud/primeport/web/MkmjController.java +++ b/web-adapter/src/main/java/com/zcloud/primeport/web/MkmjController.java @@ -1,5 +1,6 @@ package com.zcloud.primeport.web; +import com.alibaba.cola.dto.MultiResponse; import com.alibaba.cola.dto.PageResponse; import com.alibaba.cola.dto.Response; import com.alibaba.cola.dto.SingleResponse; @@ -8,12 +9,14 @@ import com.zcloud.primeport.dto.MkmjAddCmd; import com.zcloud.primeport.dto.MkmjPageQry; import com.zcloud.primeport.dto.MkmjUpdateCmd; import com.zcloud.primeport.dto.clientobject.MkmjCO; +import com.zcloud.primeport.dto.clientobject.VehicleMessageCO; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.AllArgsConstructor; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; +import java.util.ArrayList; import java.util.HashMap; import java.util.Map; @@ -36,6 +39,12 @@ public class MkmjController { return mkmjService.listPage(qry); } + @ApiOperation("所有数据") + @GetMapping("/listAll") + public MultiResponse listAll(MkmjPageQry qry) { + return MultiResponse.of(mkmjService.listAll(qry)); + } + @ApiOperation("详情") @GetMapping("/{id}") public SingleResponse getInfoById(@PathVariable("id") Long id) { diff --git a/web-app/src/main/java/com/zcloud/primeport/command/query/MkmjQueryExe.java b/web-app/src/main/java/com/zcloud/primeport/command/query/MkmjQueryExe.java index f7fd7fa..fb1a8e8 100644 --- a/web-app/src/main/java/com/zcloud/primeport/command/query/MkmjQueryExe.java +++ b/web-app/src/main/java/com/zcloud/primeport/command/query/MkmjQueryExe.java @@ -1,7 +1,9 @@ package com.zcloud.primeport.command.query; import com.alibaba.cola.dto.PageResponse; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.zcloud.gbscommon.utils.PageQueryHelper; +import com.zcloud.gbscommon.utils.Tools; import com.zcloud.primeport.command.convertor.MkmjCoConvertor; import com.zcloud.primeport.dto.MkmjPageQry; import com.zcloud.primeport.dto.clientobject.MkmjCO; @@ -42,5 +44,15 @@ public class MkmjQueryExe { public MkmjCO getInfoById(Long id) { return mkmjCoConvertor.converDOToCO(mkmjRepository.getById(id)); } + + public List listAll(MkmjPageQry qry) { + QueryWrapper mkmjDOQueryWrapper = new QueryWrapper<>(); + if (Tools.notEmpty(qry.getHgAuthArea())) { + mkmjDOQueryWrapper.eq("hg_auth_area", qry.getHgAuthArea()); + } + List list = mkmjRepository.list(mkmjDOQueryWrapper); + List examCenterCOS = mkmjCoConvertor.converDOsToCOs(list); + return examCenterCOS; + } } diff --git a/web-app/src/main/java/com/zcloud/primeport/command/query/VehicleApplyQueryExe.java b/web-app/src/main/java/com/zcloud/primeport/command/query/VehicleApplyQueryExe.java index 91298d1..df52413 100644 --- a/web-app/src/main/java/com/zcloud/primeport/command/query/VehicleApplyQueryExe.java +++ b/web-app/src/main/java/com/zcloud/primeport/command/query/VehicleApplyQueryExe.java @@ -51,17 +51,28 @@ public class VehicleApplyQueryExe { public VehicleApplyCO getInfoById(Long id) { VehicleApplyDO vehicleApplyDO = vehicleApplyRepository.getById(id); QueryWrapper objectQueryWrapper = new QueryWrapper<>(); - objectQueryWrapper.eq("vehicle_apply_id",id); + objectQueryWrapper.eq("vehicle_apply_id", id); objectQueryWrapper.orderByDesc("id"); ArrayList vehicleAuditLogs = new ArrayList<>(); List list = vehicleAuditRepository.list(objectQueryWrapper); - list.forEach(item ->{ + list.forEach(item -> { VehicleApplyCO.VehicleAuditLog vehicleAuditLog = new VehicleApplyCO.VehicleAuditLog(); BeanUtils.copyProperties(item, vehicleAuditLog); vehicleAuditLogs.add(vehicleAuditLog); }); VehicleApplyCO vehicleApplyCO = vehicleApplyCoConvertor.converDOToCO(vehicleApplyDO); vehicleApplyCO.setVehicleAuditLogList(vehicleAuditLogs); + if (!list.isEmpty()) { + VehicleAuditDO vehicleAuditDO = list.get(0); + vehicleApplyCO.setCurrentAuditCorpId(vehicleAuditDO.getAuditCorpId()); + vehicleApplyCO.setCurrentAuditCorpName(vehicleAuditDO.getAuditCorpName()); + vehicleApplyCO.setCurrentAuditDeptId(vehicleAuditDO.getAuditDeptId()); + vehicleApplyCO.setCurrentAuditDeptName(vehicleAuditDO.getAuditDeptName()); + vehicleApplyCO.setCurrentAuditUserId(vehicleAuditDO.getAuditUserId()); + vehicleApplyCO.setCurrentAuditUserName(vehicleAuditDO.getAuditUserName()); + vehicleApplyCO.setCurrentAuditStatus(vehicleAuditDO.getAuditStatus()); + vehicleApplyCO.setCurrentRemarks(vehicleAuditDO.getRemarks()); + } return vehicleApplyCO; } diff --git a/web-app/src/main/java/com/zcloud/primeport/service/MkmjServiceImpl.java b/web-app/src/main/java/com/zcloud/primeport/service/MkmjServiceImpl.java index 5eb0201..a6f8d89 100644 --- a/web-app/src/main/java/com/zcloud/primeport/service/MkmjServiceImpl.java +++ b/web-app/src/main/java/com/zcloud/primeport/service/MkmjServiceImpl.java @@ -15,6 +15,9 @@ import com.zcloud.primeport.dto.clientobject.MkmjCO; import lombok.AllArgsConstructor; import org.springframework.stereotype.Service; +import java.util.Collections; +import java.util.List; + @Service @AllArgsConstructor public class MkmjServiceImpl implements MkmjServiceI { @@ -59,5 +62,10 @@ public class MkmjServiceImpl implements MkmjServiceI { public Boolean checkName(String mkmjName, Long id) { return mkmjGateway.checkName(mkmjName, id); } + + @Override + public List listAll(MkmjPageQry qry) { + return mkmjQueryExe.listAll(qry); + } } diff --git a/web-client/src/main/java/com/zcloud/primeport/api/MkmjServiceI.java b/web-client/src/main/java/com/zcloud/primeport/api/MkmjServiceI.java index dc707ce..9a8c805 100644 --- a/web-client/src/main/java/com/zcloud/primeport/api/MkmjServiceI.java +++ b/web-client/src/main/java/com/zcloud/primeport/api/MkmjServiceI.java @@ -6,6 +6,10 @@ import com.zcloud.primeport.dto.MkmjAddCmd; import com.zcloud.primeport.dto.MkmjPageQry; import com.zcloud.primeport.dto.MkmjUpdateCmd; import com.zcloud.primeport.dto.clientobject.MkmjCO; +import com.zcloud.primeport.dto.clientobject.VehicleMessageCO; + +import java.util.Collection; +import java.util.List; public interface MkmjServiceI { PageResponse listPage(MkmjPageQry qry); @@ -21,5 +25,7 @@ public interface MkmjServiceI { MkmjCO getInfoById(Long id); Boolean checkName(String mkmjName, Long id); + + List listAll(MkmjPageQry qry); } 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 618d5c0..aca427f 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 @@ -25,7 +25,7 @@ public class VehicleAuditUpdateCmd extends Command { @NotNull(message = "id不能为空") private Long id; @ApiModelProperty(value = "车辆申请id", name = "vehicleApplyId") - @NotEmpty(message = "车辆申请id不能为空") + @NotNull(message = "车辆申请id不能为空") private Long vehicleApplyId; @ApiModelProperty(value = "审批状态(2通过,3不通过)", name = "auditStatus") @NotNull(message = "审批状态不能为空") diff --git a/web-client/src/main/java/com/zcloud/primeport/dto/clientobject/VehicleApplyCO.java b/web-client/src/main/java/com/zcloud/primeport/dto/clientobject/VehicleApplyCO.java index 9272440..301250a 100644 --- a/web-client/src/main/java/com/zcloud/primeport/dto/clientobject/VehicleApplyCO.java +++ b/web-client/src/main/java/com/zcloud/primeport/dto/clientobject/VehicleApplyCO.java @@ -107,6 +107,35 @@ public class VehicleApplyCO extends ClientObject { @ApiModelProperty(value = "临时申请驾驶人身份证", name = "lsUserIdcard") private String lsUserIdcard; + // 当前审批人 + //审批状态(1,申请;2.更新) + @ApiModelProperty(value = "审批状态(1,申请;2.更新)", name = "batchState") + private Integer currentBatchState; + //审批人id + @ApiModelProperty(value = "审批人id", name = "auditUserId") + private Long currentAuditUserId; + //审批人姓名 + @ApiModelProperty(value = "审批人姓名", name = "auditUserName") + private String currentAuditUserName; + //审批部门id + @ApiModelProperty(value = "审批部门id", name = "auditDeptId") + private Long currentAuditDeptId; + //审批部门名称 + @ApiModelProperty(value = "审批部门名称", name = "auditDeptName") + private String currentAuditDeptName; + //审批人企业id + @ApiModelProperty(value = "审批人企业id", name = "auditCorpId") + private Long currentAuditCorpId; + //审批人企业名称 + @ApiModelProperty(value = "审批人企业名称", name = "auditCorpName") + private String currentAuditCorpName; + //审批状态(1,未开始,2通过,3不通过) + @ApiModelProperty(value = "审批状态(1,未开始,2通过,3不通过)", name = "auditStatus") + private Integer currentAuditStatus; + //审批意见 + @ApiModelProperty(value = "审批意见(驳回原因)", name = "remarks") + private String currentRemarks; + //1被拉黑2未拉黑 @ApiModelProperty(value = "1被拉黑2未拉黑") private Integer blockedFlag; diff --git a/web-infrastructure/src/main/resources/mapper/VehicleApplyDO.xml b/web-infrastructure/src/main/resources/mapper/VehicleApplyDO.xml index 200de99..13896a6 100644 --- a/web-infrastructure/src/main/resources/mapper/VehicleApplyDO.xml +++ b/web-infrastructure/src/main/resources/mapper/VehicleApplyDO.xml @@ -116,6 +116,9 @@ WHERE c.delete_enum = 'FALSE' AND c.type IN ( 0, 1, 6 ) + + AND c.corp_name like CONCAT('%', #{parmas.corpName}, '%') + ORDER BY c.corp_order, c.create_time DESC diff --git a/web-infrastructure/src/main/resources/mapper/VehicleAuditDO.xml b/web-infrastructure/src/main/resources/mapper/VehicleAuditDO.xml index c06269c..7f8cb9d 100644 --- a/web-infrastructure/src/main/resources/mapper/VehicleAuditDO.xml +++ b/web-infrastructure/src/main/resources/mapper/VehicleAuditDO.xml @@ -79,7 +79,7 @@ AND va.vehicle_belong_type = #{parmas.vehicleBelongType} - + AND va.vehicle_belong_type in #{item}