1、调整导入运单

2、调整对账
2026-09-10 22:50:00 +08:00
parent e7d7e61846
commit 93c7e6f8f5
33 changed files with 553 additions and 22 deletions
@@ -64,6 +64,7 @@ public interface ISysClient {
 	String ROLE_NAMES = API_PREFIX + "/role-names";
 	String ROLE_ALIAS = API_PREFIX + "/role-alias";
 	String ROLE_ALIASES = API_PREFIX + "/role-aliases";
+	String ROLE_ID_BY_ALIAS = API_PREFIX + "/role-id-by-alias";
 	String TENANT = API_PREFIX + "/tenant";
 	String TENANT_ID = API_PREFIX + "/tenant-id";
 	String TENANT_PACKAGE = API_PREFIX + "/tenant-package";
@@ -240,6 +241,16 @@ public interface ISysClient {
 	@GetMapping(ROLE_ALIASES)
 	R<List<String>> getRoleAliases(@RequestParam("roleIds") String roleIds);

+	/**
+	 * 根据角色别名获取角色id
+	 *
+	 * @param tenantId  租户id
+	 * @param roleAlias 角色别名
+	 * @return 角色id
+	 */
+	@GetMapping(ROLE_ID_BY_ALIAS)
+	R<String> getRoleIdByAlias(@RequestParam("tenantId") String tenantId, @RequestParam("roleAlias") String roleAlias);
+
 	/**
 	 * 获取租户
 	 *
@@ -129,6 +129,11 @@ public class ISysClientFallback implements ISysClient {
 		return R.fail("获取数据失败");
 	}

+	@Override
+	public R<String> getRoleIdByAlias(String tenantId, String roleAlias) {
+		return R.fail("获取数据失败");
+	}
+
 	@Override
 	public R<Tenant> getTenant(Long id) {
 		return R.fail("获取数据失败");
@@ -191,6 +191,11 @@ public class Driver extends TenantEntity {
 	 */
 	@Schema(description = "手机号")
 	private String mobile;
+	/**
+	 * 关联系统用户ID
+	 */
+	@Schema(description = "关联系统用户ID")
+	private Long userId;
 	/**
 	 * 与联系人关系
 	 */
@@ -118,6 +118,9 @@ public class ProjectApply extends TenantEntity {
 	@Schema(description = "业务类型")
 	private String businessType;

+	@Schema(description = "业务模式")
+	private String businessMode;
+
 	@Schema(description = "项目规模(万元)")
 	@TableField(insertStrategy = FieldStrategy.ALWAYS, updateStrategy = FieldStrategy.ALWAYS)
 	private BigDecimal projectScale;
@@ -126,6 +129,10 @@ public class ProjectApply extends TenantEntity {
 	@TableField(insertStrategy = FieldStrategy.ALWAYS, updateStrategy = FieldStrategy.ALWAYS)
 	private BigDecimal estimatedProfit;

+	@Schema(description = "利润率(%)")
+	@TableField(insertStrategy = FieldStrategy.ALWAYS, updateStrategy = FieldStrategy.ALWAYS)
+	private BigDecimal profitRate;
+
 	@Schema(description = "资金需求(万元)")
 	@TableField(insertStrategy = FieldStrategy.ALWAYS, updateStrategy = FieldStrategy.ALWAYS)
 	private BigDecimal fundDemand;
@@ -53,6 +53,11 @@ public class TransportVehicle extends TenantEntity {
 	 */
 	@Schema(description = "所属组织")
 	private String organizationName;
+	/**
+	 * 使用部门
+	 */
+	@Schema(description = "使用部门")
+	private String useDepartment;
 	/**
 	 * 车牌号
 	 */
@@ -69,4 +69,11 @@ public class TransportVehicleVO extends TransportVehicle {
 	@DateTimeFormat(pattern = "yyyy-MM-dd")
 	private LocalDate warningDate;

+	/**
+	 * 绑定司机（按车牌反查司机驾驶车辆，多个用顿号拼接）
+	 */
+	@TableField(exist = false)
+	@Schema(description = "绑定司机")
+	private String boundDriver;
+
 }
@@ -57,6 +57,7 @@ public interface IUserClient {
 	String USER_BY_ACCOUNT = API_PREFIX + "/user-by-account";
 	String USER_AUTH_INFO = API_PREFIX + "/user-auth-info";
 	String SAVE_USER = API_PREFIX + "/save-user";
+	String UPDATE_USER = API_PREFIX + "/update-user";
 	String SAVE_IAM_USER = API_PREFIX + "/save-iam-user";
 	String REGISTER_USER = API_PREFIX + "/register-user";
 	String REMOVE_USER = API_PREFIX + "/remove-user";
@@ -150,6 +151,15 @@ public interface IUserClient {
 	@PostMapping(SAVE_USER)
 	R<Boolean> saveUser(@RequestBody User user);

+	/**
+	 * 更新用户
+	 *
+	 * @param user 用户实体
+	 * @return
+	 */
+	@PostMapping(UPDATE_USER)
+	R<Boolean> updateUser(@RequestBody User user);
+
 	/**
 	 * 新建IAM用户
 	 *