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

feat：分公司统计

koumen
dearLin 2026-03-17 13:41:43 +08:00
parent 5e8c2d8772
commit 33fd3ce749
9 changed files with 82 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
web-adapter/src/main/java/com/zcloud/primeport/web/MkmjController.java
View File

@ -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<MkmjCO> listAll(MkmjPageQry qry) {
return MultiResponse.of(mkmjService.listAll(qry));
}
@ApiOperation("详情")
@GetMapping("/{id}")
public SingleResponse<MkmjCO> getInfoById(@PathVariable("id") Long id) {

12
web-app/src/main/java/com/zcloud/primeport/command/query/MkmjQueryExe.java
View File

@ -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<MkmjCO> listAll(MkmjPageQry qry) {
QueryWrapper<MkmjDO> mkmjDOQueryWrapper = new QueryWrapper<>();
if (Tools.notEmpty(qry.getHgAuthArea())) {
mkmjDOQueryWrapper.eq("hg_auth_area", qry.getHgAuthArea());
}
List<MkmjDO> list = mkmjRepository.list(mkmjDOQueryWrapper);
List<MkmjCO> examCenterCOS = mkmjCoConvertor.converDOsToCOs(list);
return examCenterCOS;
}
}

15
web-app/src/main/java/com/zcloud/primeport/command/query/VehicleApplyQueryExe.java
View File

@ -51,17 +51,28 @@ public class VehicleApplyQueryExe {
public VehicleApplyCO getInfoById(Long id) {
VehicleApplyDO vehicleApplyDO = vehicleApplyRepository.getById(id);
QueryWrapper<VehicleAuditDO> objectQueryWrapper = new QueryWrapper<>();
objectQueryWrapper.eq("vehicle_apply_id",id);
objectQueryWrapper.eq("vehicle_apply_id", id);
objectQueryWrapper.orderByDesc("id");
ArrayList<VehicleApplyCO.VehicleAuditLog> vehicleAuditLogs = new ArrayList<>();
List<VehicleAuditDO> 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;
}

8
web-app/src/main/java/com/zcloud/primeport/service/MkmjServiceImpl.java
View File

@ -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<MkmjCO> listAll(MkmjPageQry qry) {
return mkmjQueryExe.listAll(qry);
}
}

6
web-client/src/main/java/com/zcloud/primeport/api/MkmjServiceI.java
View File

@ -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<MkmjCO> listPage(MkmjPageQry qry);
@ -21,5 +25,7 @@ public interface MkmjServiceI {
MkmjCO getInfoById(Long id);
Boolean checkName(String mkmjName, Long id);
List<MkmjCO> listAll(MkmjPageQry qry);
}

2
web-client/src/main/java/com/zcloud/primeport/dto/VehicleAuditUpdateCmd.java
View File

@ -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 = "审批状态不能为空")

29
web-client/src/main/java/com/zcloud/primeport/dto/clientobject/VehicleApplyCO.java
View File

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

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

@ -116,6 +116,9 @@
WHERE
c.delete_enum = 'FALSE'
AND c.type IN ( 0, 1, 6 )
<if test="parmas.corpName != null and parmas.corpName != ''">
AND c.corp_name like CONCAT('%', #{parmas.corpName}, '%')
</if>
ORDER BY
c.corp_order,
c.create_time DESC

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

@ -79,7 +79,7 @@
<if test="parmas.vehicleBelongType != null and parmas.vehicleBelongType != ''">
AND va.vehicle_belong_type = #{parmas.vehicleBelongType}
</if>
<if test="parmas.vehicleBelongTypeArrList != null and parmas.vehicleBelongTypeArrList.size() > 0">
<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=")">
#{item}