From bfbbe105376f75514c53134c7426304adfaa7887 Mon Sep 17 00:00:00 2001 From: hanlinghao <2969694837@qq.com> Date: Wed, 15 Jun 2022 11:29:01 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=A7=BB=E5=BA=93=E5=9B=BE?= =?UTF-8?q?=E7=89=87=E4=B8=8D=E6=98=BE=E7=A4=BA=E9=97=AE=E9=A2=98=EF=BC=8C?= =?UTF-8?q?=E8=AE=BE=E8=AE=A1=E7=9B=98=E5=BA=93=20=E5=B7=A1=E6=A3=80=20?= =?UTF-8?q?=E7=9B=B8=E5=85=B3=E6=95=B0=E6=8D=AE=E5=BA=93?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ScmVehicleGression.java | 2 + .../ScmVehicleGressionService.java | 2 +- doc/databases/scm_tables_vehicle.sql | 147 +++++++++++++++++- 3 files changed, 149 insertions(+), 2 deletions(-) diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclegression/ScmVehicleGression.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclegression/ScmVehicleGression.java index 4048b6ad1d..1819e4b4cf 100644 --- a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclegression/ScmVehicleGression.java +++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclegression/ScmVehicleGression.java @@ -68,6 +68,8 @@ public class ScmVehicleGression extends BaseEntity { private String operator; // 经办人 @ApiModelProperty("保险状态") private String InsuranceState; // 保险状态 + @ApiModelProperty("保险状态") + private String InsuranceStateKey; // 保险状态 @ApiModelProperty("临牌") private String temporaryCard; // 临牌 @ApiModelProperty("申请状态（代办已办）") diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclegression/ScmVehicleGressionService.java b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclegression/ScmVehicleGressionService.java index 50cd791f94..b224c37af9 100644 --- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclegression/ScmVehicleGressionService.java +++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclegression/ScmVehicleGressionService.java @@ -211,7 +211,7 @@ public class ScmVehicleGressionService extends MybatisBaseService factoryImage = dto.getPolicyImage(); for (String s : factoryImage) { - if (s.indexOf(fileUploadComponent.getUrlPrefix()) > -1) { + if (s.contains(fileUploadComponent.getUrlPrefix())) { s1 = s.replace(fileUploadComponent.getUrlPrefix(), ""); } } diff --git a/doc/databases/scm_tables_vehicle.sql b/doc/databases/scm_tables_vehicle.sql index fbeb566fa8..0f69aeca53 100644 --- a/doc/databases/scm_tables_vehicle.sql +++ b/doc/databases/scm_tables_vehicle.sql @@ -128,4 +128,149 @@ CREATE TABLE `scm_file` PRIMARY KEY (`id`), KEY `id` (`id`) ) ENGINE = INNODB - DEFAULT CHARSET = utf8 COMMENT ='供应链附件表'; \ No newline at end of file + DEFAULT CHARSET = utf8 COMMENT ='供应链附件表'; + + +-- 5、盘库记录 +DROP TABLE IF EXISTS `scm_vehicle_inventory`; +CREATE TABLE `scm_vehicle_Inventory` +( + `id` int(32) NOT NULL AUTO_INCREMENT COMMENT 'id', + `sid` varchar(64) NOT NULL COMMENT 'sid', + `lockVersion` int(32) DEFAULT '0' COMMENT '版本锁', + `createTime` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间', + `modifyTime` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '修改时间', + `isEnable` int(32) DEFAULT '1' COMMENT '是否可用：1可用，0不可用', + `state` int(32) DEFAULT '1' COMMENT '状态', + `isDelete` int(32) DEFAULT '0' COMMENT '是否删除：0未删除，1已删除', + `remarks` varchar(255) DEFAULT NULL COMMENT '备注', + `createBySid` varchar(64) DEFAULT NULL COMMENT '创建人sid', + `updateBySid` varchar(64) DEFAULT NULL COMMENT '修改人sid', + `mainSid` varchar(64) DEFAULT NULL COMMENT '车架号', + `locationSid` varchar(64) DEFAULT NULL COMMENT '存放地点sid', + `location` varchar(64) DEFAULT NULL COMMENT '存放地点', + `certificate` varchar(64) DEFAULT NULL COMMENT '合格证（有/无）', + `InventoryDate` varchar(64) DEFAULT NULL COMMENT '盘库日期', + `InventoryName` varchar(64) DEFAULT NULL COMMENT '盘库人员', + `InventoryState` varchar(64) DEFAULT NULL COMMENT '盘库状态 通过/未通过', + `createOrgSid` varchar(64) DEFAULT NULL COMMENT '创建组织', + `useOrgName` varchar(64) DEFAULT NULL COMMENT '使用组织', + + PRIMARY KEY (`id`), + KEY `id` (`id`) +) ENGINE = INNODB + DEFAULT CHARSET = utf8 COMMENT ='盘库记录'; + +-- 6、待盘库记录 +DROP TABLE IF EXISTS `scm_vehicle_stay_inventory`; +CREATE TABLE `scm_vehicle_stay_inventory` +( + `id` int(32) NOT NULL AUTO_INCREMENT COMMENT 'id', + `sid` varchar(64) NOT NULL COMMENT 'sid', + `lockVersion` int(32) DEFAULT '0' COMMENT '版本锁', + `createTime` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间', + `modifyTime` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '修改时间', + `isEnable` int(32) DEFAULT '1' COMMENT '是否可用：1可用，0不可用', + `state` int(32) DEFAULT '1' COMMENT '状态', + `isDelete` int(32) DEFAULT '0' COMMENT '是否删除：0未删除，1已删除', + `remarks` varchar(255) DEFAULT NULL COMMENT '备注', + `createBySid` varchar(64) DEFAULT NULL COMMENT '创建人sid', + `updateBySid` varchar(64) DEFAULT NULL COMMENT '修改人sid', + `mainSid` varchar(64) DEFAULT NULL COMMENT '车架号', + `locationSid` varchar(64) DEFAULT NULL COMMENT '存放地点sid', + `location` varchar(64) DEFAULT NULL COMMENT '存放地点', + `InventoryDate` varchar(64) DEFAULT NULL COMMENT '上次盘库日期', + `InventoryName` varchar(64) DEFAULT NULL COMMENT '上次盘库人员', + `createOrgSid` varchar(64) DEFAULT NULL COMMENT '创建组织', + `useOrgName` varchar(64) DEFAULT NULL COMMENT '使用组织', + + PRIMARY KEY (`id`), + KEY `id` (`id`) +) ENGINE = INNODB + DEFAULT CHARSET = utf8 COMMENT ='待盘库记录'; + +-- 7、巡检记录 +DROP TABLE IF EXISTS `scm_vehicle_patrolInspection`; +CREATE TABLE `scm_vehicle_patrolInspection` +( + `id` int(32) NOT NULL AUTO_INCREMENT COMMENT 'id', + `sid` varchar(64) NOT NULL COMMENT 'sid', + `lockVersion` int(32) DEFAULT '0' COMMENT '版本锁', + `createTime` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间', + `modifyTime` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '修改时间', + `isEnable` int(32) DEFAULT '1' COMMENT '是否可用：1可用，0不可用', + `state` int(32) DEFAULT '1' COMMENT '状态', + `isDelete` int(32) DEFAULT '0' COMMENT '是否删除：0未删除，1已删除', + `remarks` varchar(255) DEFAULT NULL COMMENT '备注', + `createBySid` varchar(64) DEFAULT NULL COMMENT '创建人sid', + `updateBySid` varchar(64) DEFAULT NULL COMMENT '修改人sid', + `mainSid` varchar(64) DEFAULT NULL COMMENT '车架号', + `locationSid` varchar(64) DEFAULT NULL COMMENT '存放地点sid', + `location` varchar(64) DEFAULT NULL COMMENT '存放地点', + `certificate` varchar(64) DEFAULT NULL COMMENT '合格证（有/无）', + `patrolInspectionDate` varchar(64) DEFAULT NULL COMMENT '巡检日期', + `patrolInspectionName` varchar(64) DEFAULT NULL COMMENT '巡检人员', + `patrolInspectionState` varchar(64) DEFAULT NULL COMMENT '巡检状态（通过/不通过）', + `createOrgSid` varchar(64) DEFAULT NULL COMMENT '创建组织', + `useOrgName` varchar(64) DEFAULT NULL COMMENT '使用组织', + + PRIMARY KEY (`id`), + KEY `id` (`id`) +) ENGINE = INNODB + DEFAULT CHARSET = utf8 COMMENT ='巡检记录'; + +-- 8、待巡检记录 +DROP TABLE IF EXISTS `scm_vehicle_stay_patrolInspection`; +CREATE TABLE `scm_vehicle_stay_patrolInspection` +( + `id` int(32) NOT NULL AUTO_INCREMENT COMMENT 'id', + `sid` varchar(64) NOT NULL COMMENT 'sid', + `lockVersion` int(32) DEFAULT '0' COMMENT '版本锁', + `createTime` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间', + `modifyTime` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '修改时间', + `isEnable` int(32) DEFAULT '1' COMMENT '是否可用：1可用，0不可用', + `state` int(32) DEFAULT '1' COMMENT '状态', + `isDelete` int(32) DEFAULT '0' COMMENT '是否删除：0未删除，1已删除', + `remarks` varchar(255) DEFAULT NULL COMMENT '备注', + `createBySid` varchar(64) DEFAULT NULL COMMENT '创建人sid', + `updateBySid` varchar(64) DEFAULT NULL COMMENT '修改人sid', + `mainSid` varchar(64) DEFAULT NULL COMMENT '车架号', + `locationSid` varchar(64) DEFAULT NULL COMMENT '存放地点sid', + `location` varchar(64) DEFAULT NULL COMMENT '存放地点', + `patrolInspectionDate` varchar(64) DEFAULT NULL COMMENT '上次巡检日期', + `patrolInspectionName` varchar(64) DEFAULT NULL COMMENT '上次巡检人员', + `createOrgSid` varchar(64) DEFAULT NULL COMMENT '创建组织', + `useOrgName` varchar(64) DEFAULT NULL COMMENT '使用组织', + + PRIMARY KEY (`id`), + KEY `id` (`id`) +) ENGINE = INNODB + DEFAULT CHARSET = utf8 COMMENT ='待巡检记录'; + +-- 9、巡检单 +DROP TABLE IF EXISTS `scm_vehicle_patrolInspectionsheet`; +CREATE TABLE `scm_vehicle_patrolInspectionsheet` +( + `id` int(32) NOT NULL AUTO_INCREMENT COMMENT 'id', + `sid` varchar(64) NOT NULL COMMENT 'sid', + `lockVersion` int(32) DEFAULT '0' COMMENT '版本锁', + `createTime` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间', + `modifyTime` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '修改时间', + `isEnable` int(32) DEFAULT '1' COMMENT '是否可用：1可用，0不可用', + `state` int(32) DEFAULT '1' COMMENT '状态', + `isDelete` int(32) DEFAULT '0' COMMENT '是否删除：0未删除，1已删除', + `remarks` varchar(255) DEFAULT NULL COMMENT '备注', + `createBySid` varchar(64) DEFAULT NULL COMMENT '创建人sid', + `updateBySid` varchar(64) DEFAULT NULL COMMENT '修改人sid', + `mainSid` varchar(64) DEFAULT NULL COMMENT '主表sid', + `mainSid` varchar(64) DEFAULT NULL COMMENT '车架号', + `locationSid` varchar(64) DEFAULT NULL COMMENT '车型sid', + `location` varchar(64) DEFAULT NULL COMMENT '车型', + `patrolInspectionDate` varchar(64) DEFAULT NULL COMMENT '巡检情况说明', + `patrolInspectionName` varchar(64) DEFAULT NULL COMMENT '存在问题及处理结果', + `createOrgSid` varchar(64) DEFAULT NULL COMMENT '相关责任人', + `useOrgName` varchar(64) DEFAULT NULL COMMENT '相关责任人sid', + PRIMARY KEY (`id`), + KEY `id` (`id`) +) ENGINE = INNODB + DEFAULT CHARSET = utf8 COMMENT ='巡检单'; \ No newline at end of file