b2894lxlx/tms-erp-api
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

1、车船模块fix bug

Browse Source 
2、运力模块fix bug
3、新增设备台账
4、其他bug 修复
5、调整组织、人员模块
This commit is contained in:
b2894lxlx
2026-08-07 08:27:47 +08:00
parent a1eea5075b
commit f716b3fc63
107 changed files with 2269 additions and 341 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
blade-service-api/blade-file-api/src/main/java/org/springblade/file/pojo/dto/FileCertificateBatchRecognitionDTO.java
View File

@@ -21,9 +21,9 @@ public class FileCertificateBatchRecognitionDTO implements Serializable {
@Serial
private static final long serialVersionUID = 1L;
/**
* 所有图像 obs key列表
* 所有图像完整 URL 列表
*/
@NotEmpty(message = "图像 obs key列表不能为空")
@NotEmpty(message = "图像 URL 列表不能为空")
private List<String> objectKeys;
/**
* 项目简称
@@ -38,19 +38,19 @@ public class FileCertificateBatchRecognitionDTO implements Serializable {
*/
private String dirName;
/**
* 磅单 obs key列表
* 磅单完整 URL 列表
*/
private List<String> poundUrls;
/**
* 车头 obs key列表
* 车头完整 URL 列表
*/
private List<String> carFrontUrls;
/**
* 驾驶证 obs key列表
* 驾驶证完整 URL 列表
*/
private List<String> driverLicenseUrls;
/**
* 行驶证 obs key列表
* 行驶证完整 URL 列表
*/
private List<String> vehicleLicenseUrls;

24
blade-service-api/blade-system-api/src/main/java/org/springblade/system/pojo/entity/Dept.java
View File

@@ -134,6 +134,30 @@ public class Dept extends TenantEntity {
*/
@Schema(description = "部门编码")
private String deptCode;
/**
* 组织简称
*/
@Schema(description = "组织简称")
private String shortName;
/**
* 拼音助记码
*/
@Schema(description = "拼音助记码")
private String pinyinMnemonic;
/**
* 助记码
*/
@Schema(description = "助记码")
private String mnemonicCode;
/**
* 承运商客商档案主键
*/
@Schema(description = "承运商客商档案主键")
private Long carrierCustomerId;
/**
* 父部门编码
*/

41
blade-service-api/blade-transport-api/src/main/java/org/springblade/transport/pojo/entity/EquipmentLedger.java Normal file
View File

@@ -0,0 +1,41 @@
/**
* BladeX Commercial License Agreement
* Copyright (c) 2018-2099, https://bladex.cn. All rights reserved.
* Author: Chill Zhuang (bladejava@qq.com)
*/
package org.springblade.transport.pojo.entity;
import com.baomidou.mybatisplus.annotation.TableName;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import lombok.EqualsAndHashCode;
import org.springblade.core.tenant.mp.TenantEntity;
import java.io.Serial;
import java.time.LocalDate;
/**
* 设备台账实体类
*
* @author Chill
*/
@Data
@EqualsAndHashCode(callSuper = true)
@TableName("blade_equipment_ledger")
@Schema(description = "设备台账")
public class EquipmentLedger extends TenantEntity {
@Serial
private static final long serialVersionUID = 1L;
private String vehicleType;
private String vehicleNo;
private String equipmentCode;
private String equipmentName;
private String equipmentBrand;
private String equipmentType;
private String specificationModel;
private LocalDate factoryDate;
private String originalEquipmentNo;
private String remark;
private String attachments;
private Integer onlineStatus;
}

6
blade-service-api/blade-transport-api/src/main/java/org/springblade/transport/pojo/entity/TransportVehicle.java
View File

@@ -213,5 +213,11 @@ public class TransportVehicle extends TenantEntity {
*/
@Schema(description = "备注")
private String remark;
/** 认证状态：0认证中 1认证通过 2认证驳回 */
@Schema(description = "认证状态：0认证中 1认证通过 2认证驳回")
private Integer certificationStatus;
/** 认证驳回原因 */
@Schema(description = "认证驳回原因")
private String certificationRejectReason;
}

29
blade-service-api/blade-transport-api/src/main/java/org/springblade/transport/pojo/vo/EquipmentLedgerVO.java Normal file
View File

@@ -0,0 +1,29 @@
/**
* BladeX Commercial License Agreement
* Copyright (c) 2018-2099, https://bladex.cn. All rights reserved.
* Author: Chill Zhuang (bladejava@qq.com)
*/
package org.springblade.transport.pojo.vo;
import com.baomidou.mybatisplus.annotation.TableField;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import lombok.EqualsAndHashCode;
import org.springblade.transport.pojo.entity.EquipmentLedger;
import java.io.Serial;
/**
* 设备台账视图实体类
*
* @author Chill
*/
@Data
@EqualsAndHashCode(callSuper = true)
@Schema(description = "设备台账")
public class EquipmentLedgerVO extends EquipmentLedger {
@Serial
private static final long serialVersionUID = 1L;
@TableField(exist = false)
private String updateUserName;
}

23
blade-service-api/blade-user-api/src/main/java/org/springblade/system/pojo/entity/User.java
View File

@@ -25,6 +25,7 @@
*/
package org.springblade.system.pojo.entity;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data;
import lombok.EqualsAndHashCode;
@@ -35,6 +36,7 @@ import org.springblade.system.pojo.context.IPhone;
import java.io.Serial;
import java.util.Date;
import java.util.List;
/**
* 实体类
@@ -133,6 +135,27 @@ public class User extends TenantEntity implements IPhone {
* 是否推送mk
*/
private Integer isPushMk;
/**
* 备注
*/
private String remark;
/**
* OA 人员 ID（由用户部门关联表聚合查询返回）
*/
@TableField(exist = false)
private String oaPersonId;
/** 人员类别：1-内部员工，2-承运商 */
private Integer personCategory;
/** 数据权限范围：1-仅所属组织，2-全部组织，3-自定义 */
private Integer dataScopeRange;
/** 数据层级范围：1-包含下级，2-仅本级 */
private Integer dataLevelRange;
/** 是否包含新增客商 */
private Integer includeNewCustomer;
@TableField(exist = false)
private List<Long> dataScopeDeptIds;
@TableField(exist = false)
private List<Long> customerIds;
}

15
blade-service-api/blade-user-api/src/main/java/org/springblade/system/pojo/entity/UserCustomerScope.java Normal file
View File

@@ -0,0 +1,15 @@
package org.springblade.system.pojo.entity;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data;
@Data
@TableName("blade_user_customer_scope")
public class UserCustomerScope {
@TableId(type = IdType.ASSIGN_ID)
private Long id;
private Long userId;
private Long customerId;
}

15
blade-service-api/blade-user-api/src/main/java/org/springblade/system/pojo/entity/UserDataScope.java Normal file
View File

@@ -0,0 +1,15 @@
package org.springblade.system.pojo.entity;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data;
@Data
@TableName("blade_user_data_scope")
public class UserDataScope {
@TableId(type = IdType.ASSIGN_ID)
private Long id;
private Long userId;
private Long deptId;
}