WL/laws_weilai
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

合并master数据

Browse Source
This commit is contained in:
zer0Black
2022-06-21 22:21:07 +08:00
parent b86fa3a064 c530d98f47
commit 4182b4df14
36 changed files with 559 additions and 249 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-boot/db/蔚来标准sql/first_bug_fix_record.sql
+1
View File
@@ -0,0 +1 @@
-- 一阶段的bug修复导致的字段增删、必须数据增删添加到此处
jero-boot/db/蔚来标准sql/laws_weilai_stand.sql → jero-boot/db/蔚来标准sql/laws_weilai_stand_20220621上线.sql
+132 -58
View File
@@ -14018,22 +14018,22 @@ INSERT INTO `sys_dict_item` VALUES ('1496785163561398273', '1496785004400144386'
INSERT INTO `sys_dict_item` VALUES ('1496785251536924674', '1496785004400144386', '转换成功', '转换成功', '', '2', '1', 'admin', '2022-02-24 17:53:08', null, null, null, null, null, '0', 'convert success');
INSERT INTO `sys_dict_item` VALUES ('1496785330251427841', '1496785004400144386', '转换失败', '转换失败', '', '3', '1', 'admin', '2022-02-24 17:53:26', null, null, null, null, null, '0', 'convert fail');
INSERT INTO `sys_dict_item` VALUES ('1498191033453182978', '1493098515761917954', '输入框（链接）', '11', '', '10', '1', 'admin', '2022-02-28 14:59:12', null, null, '1', null, null, '0', 'input box (link)');
INSERT INTO `sys_dict_item` VALUES ('1499310320945061889', '1513417672023441409', 'Homo', '1', 'Homo', '1', '1', 'admin', '2022-04-13 18:18:08', 'admin', '2022-04-20 09:34:58', '1', '1', null, '0', 'Homo');
INSERT INTO `sys_dict_item` VALUES ('1499310432987504642', '1513417672023441409', 'ELV', '2', 'ELV', '2', '1', 'admin', '2022-04-13 18:18:08', 'admin', '2022-04-20 09:34:58', '1', '1', null, '0', 'ELV');
INSERT INTO `sys_dict_item` VALUES ('1499310525526433793', '1513417672023441409', 'Body', '3', 'Body', '3', '1', 'admin', '2022-04-13 18:18:08', 'admin', '2022-04-20 09:34:58', '1', '1', null, '0', 'Body');
INSERT INTO `sys_dict_item` VALUES ('1499323041683509249', '1513417672023441409', 'Exterior - BDC', '4', 'Exterior - BDC', '4', '1', 'admin', '2022-04-13 18:18:08', 'admin', '2022-04-20 09:34:58', '1', '1', null, '0', 'Exterior - BDC');
INSERT INTO `sys_dict_item` VALUES ('1499347656818892802', '1513417672023441409', 'Exterior - EXT', '5', 'Exterior - EXT', '5', '1', 'admin', '2022-04-13 18:18:08', 'admin', '2022-04-20 09:34:58', '1', '1', null, '0', 'Exterior - EXT');
INSERT INTO `sys_dict_item` VALUES ('1499348334878466049', '1513417672023441409', 'Exterior - BMC', '6', 'Exterior - BMC', '6', '1', 'admin', '2022-04-13 18:18:08', 'admin', '2022-04-20 09:34:58', '1', '1', null, '0', 'Exterior - BMC');
INSERT INTO `sys_dict_item` VALUES ('1499348645818998786', '1513417672023441409', 'Interior - Restraint', '7', 'Interior - Restraint', '7', '1', 'admin', '2022-04-13 18:18:08', 'admin', '2022-04-20 09:34:58', '1', '1', null, '0', 'Interior - Restraint');
INSERT INTO `sys_dict_item` VALUES ('1499348980260216833', '1513417672023441409', 'Interior - Trim', '8', 'Interior - Trim', '8', '1', 'admin', '2022-04-13 18:18:08', 'admin', '2022-04-20 09:34:58', '1', '1', null, '0', 'Interior - Trim');
INSERT INTO `sys_dict_item` VALUES ('1499349325464018945', '1513417672023441409', 'Interior - Seat', '9', 'Interior - Seat', '9', '1', 'admin', '2022-04-13 18:18:08', 'admin', '2022-04-20 09:34:58', '1', '1', null, '0', 'Interior - Seat');
INSERT INTO `sys_dict_item` VALUES ('1499352221484130306', '1513417672023441409', 'Interior - HVAC', '10', 'Interior - HVAC', '10', '1', 'admin', '2022-04-13 18:18:08', 'admin', '2022-04-20 09:34:58', '1', '1', null, '0', 'Interior - HVAC');
INSERT INTO `sys_dict_item` VALUES ('1499353029571321857', '1513417672023441409', 'Vehicle Concepts', '11', 'Vehicle Concepts', '11', '1', 'admin', '2022-04-13 18:18:08', 'admin', '2022-04-20 09:34:58', '1', '1', null, '0', 'Vehicle Concepts');
INSERT INTO `sys_dict_item` VALUES ('1499353250279792642', '1513417672023441409', 'VC - HMI', '12', 'VC - HMI', '12', '1', 'admin', '2022-04-13 18:18:08', 'admin', '2022-04-20 09:34:58', '1', '1', null, '0', 'VC - HMI');
INSERT INTO `sys_dict_item` VALUES ('1499353370555654145', '1513417672023441409', 'VAS', '13', 'VAS', '13', '1', 'admin', '2022-04-13 18:18:08', 'admin', '2022-04-20 09:34:58', '1', '1', null, '0', 'VAS');
INSERT INTO `sys_dict_item` VALUES ('1499354303599525890', '1513417672023441409', 'Chassis', '14', 'Chassis', '14', '1', 'admin', '2022-04-13 18:18:08', 'admin', '2022-04-20 09:34:58', '1', '1', null, '0', 'Chassis');
INSERT INTO `sys_dict_item` VALUES ('1499354897148067841', '1513417672023441409', 'Chassis - Steering', '15', 'Chassis - Steering', '15', '1', 'admin', '2022-04-13 18:18:08', 'admin', '2022-04-20 09:34:58', '1', '1', null, '0', 'Chassis - Steering');
INSERT INTO `sys_dict_item` VALUES ('1499358101004906498', '1513417672023441409', 'Chassis - Braking', '16', 'Chassis - Braking', '16', '1', 'admin', '2022-04-13 18:18:08', 'admin', '2022-04-20 09:34:58', '1', '1', null, '0', 'Chassis - Braking');
INSERT INTO `sys_dict_item` VALUES ('1499310320945061889', '1513417672023441409', 'Homo', '1', 'Homo', '1', '1', 'admin', '2022-04-13 18:18:08', 'admin', '2022-04-20 09:34:58', '1', '1', null, '1', 'Homo');
INSERT INTO `sys_dict_item` VALUES ('1499310432987504642', '1513417672023441409', 'ELV', '2', 'ELV', '2', '1', 'admin', '2022-04-13 18:18:08', 'admin', '2022-04-20 09:34:58', '1', '1', null, '1', 'ELV');
INSERT INTO `sys_dict_item` VALUES ('1499310525526433793', '1513417672023441409', 'Body', '3', 'Body', '3', '1', 'admin', '2022-04-13 18:18:08', 'admin', '2022-04-20 09:34:58', '1', '1', null, '1', 'Body');
INSERT INTO `sys_dict_item` VALUES ('1499323041683509249', '1513417672023441409', 'Exterior - BDC', '4', 'Exterior - BDC', '4', '1', 'admin', '2022-04-13 18:18:08', 'admin', '2022-04-20 09:34:58', '1', '1', null, '1', 'Exterior - BDC');
INSERT INTO `sys_dict_item` VALUES ('1499347656818892802', '1513417672023441409', 'Exterior - EXT', '5', 'Exterior - EXT', '5', '1', 'admin', '2022-04-13 18:18:08', 'admin', '2022-04-20 09:34:58', '1', '1', null, '1', 'Exterior - EXT');
INSERT INTO `sys_dict_item` VALUES ('1499348334878466049', '1513417672023441409', 'Exterior - BMC', '6', 'Exterior - BMC', '6', '1', 'admin', '2022-04-13 18:18:08', 'admin', '2022-04-20 09:34:58', '1', '1', null, '1', 'Exterior - BMC');
INSERT INTO `sys_dict_item` VALUES ('1499348645818998786', '1513417672023441409', 'Interior - Restraint', '7', 'Interior - Restraint', '7', '1', 'admin', '2022-04-13 18:18:08', 'admin', '2022-04-20 09:34:58', '1', '1', null, '1', 'Interior - Restraint');
INSERT INTO `sys_dict_item` VALUES ('1499348980260216833', '1513417672023441409', 'Interior - Trim', '8', 'Interior - Trim', '8', '1', 'admin', '2022-04-13 18:18:08', 'admin', '2022-04-20 09:34:58', '1', '1', null, '1', 'Interior - Trim');
INSERT INTO `sys_dict_item` VALUES ('1499349325464018945', '1513417672023441409', 'Interior - Seat', '9', 'Interior - Seat', '9', '1', 'admin', '2022-04-13 18:18:08', 'admin', '2022-04-20 09:34:58', '1', '1', null, '1', 'Interior - Seat');
INSERT INTO `sys_dict_item` VALUES ('1499352221484130306', '1513417672023441409', 'Interior - HVAC', '10', 'Interior - HVAC', '10', '1', 'admin', '2022-04-13 18:18:08', 'admin', '2022-04-20 09:34:58', '1', '1', null, '1', 'Interior - HVAC');
INSERT INTO `sys_dict_item` VALUES ('1499353029571321857', '1513417672023441409', 'Vehicle Concepts', '11', 'Vehicle Concepts', '11', '1', 'admin', '2022-04-13 18:18:08', 'admin', '2022-04-20 09:34:58', '1', '1', null, '1', 'Vehicle Concepts');
INSERT INTO `sys_dict_item` VALUES ('1499353250279792642', '1513417672023441409', 'VC - HMI', '12', 'VC - HMI', '12', '1', 'admin', '2022-04-13 18:18:08', 'admin', '2022-04-20 09:34:58', '1', '1', null, '1', 'VC - HMI');
INSERT INTO `sys_dict_item` VALUES ('1499353370555654145', '1513417672023441409', 'VAS', '13', 'VAS', '77', '1', 'admin', '2022-04-13 18:18:08', 'xuetao.li3.o', '2022-06-21 18:12:04', '1', '1', null, '0', 'VAS');
INSERT INTO `sys_dict_item` VALUES ('1499354303599525890', '1513417672023441409', 'Chassis', '14', 'Chassis', '14', '1', 'admin', '2022-04-13 18:18:08', 'admin', '2022-04-20 09:34:58', '1', '1', null, '1', 'Chassis');
INSERT INTO `sys_dict_item` VALUES ('1499354897148067841', '1513417672023441409', 'Chassis - Steering', '15', 'Chassis - Steering', '15', '1', 'admin', '2022-04-13 18:18:08', 'admin', '2022-04-20 09:34:58', '1', '1', null, '1', 'Chassis - Steering');
INSERT INTO `sys_dict_item` VALUES ('1499358101004906498', '1513417672023441409', 'Chassis - Braking', '16', 'Chassis - Braking', '16', '1', 'admin', '2022-04-13 18:18:08', 'admin', '2022-04-20 09:34:58', '1', '1', null, '1', 'Chassis - Braking');
INSERT INTO `sys_dict_item` VALUES ('1499579924762963970', '1499579824007393282', '正式工', '1', '', '1', '1', 'admin', '2022-03-04 10:58:10', null, null, null, null, null, '0', null);
INSERT INTO `sys_dict_item` VALUES ('1499579959437275137', '1499579824007393282', '临时工', '2', '', '1', '1', 'admin', '2022-03-04 10:58:18', null, null, null, null, null, '0', null);
INSERT INTO `sys_dict_item` VALUES ('1499580716597227521', '1174511106530525185', '默认', 'DEFAULT', '', '1', '1', 'admin', '2022-03-04 11:01:18', 'admin', '2022-03-04 11:02:24', null, null, null, '0', null);
@@ -14045,25 +14045,25 @@ INSERT INTO `sys_dict_item` VALUES ('1499649246870540290', '1493098515761917954'
INSERT INTO `sys_dict_item` VALUES ('1499649643987243010', '1493098515761917954', '单选下拉框', '3', '', '3', '1', 'admin', '2022-03-04 15:35:12', null, null, '1', null, null, '0', 'single date selection ');
INSERT INTO `sys_dict_item` VALUES ('1499649954617397249', '1493098515761917954', '多选下拉框', '4', '', '4', '1', 'admin', '2022-03-04 15:36:26', null, null, '1', null, null, '0', 'multiple choice drop-down box');
INSERT INTO `sys_dict_item` VALUES ('1499650224227258370', '1493098515761917954', '人员选择', '9', '', '9', '1', 'admin', '2022-03-04 15:37:30', 'admin', '2022-04-15 18:07:15', null, null, null, '0', 'personnel selection ');
INSERT INTO `sys_dict_item` VALUES ('1500650121430355970', '1513417672023441409', 'Chassis - Wheels & Tools', '17', 'Chassis - Wheels & Tools', '17', '1', 'admin', '2022-04-13 18:18:08', 'admin', '2022-04-20 09:34:58', '1', '1', null, '0', 'Chassis - Wheels & Tools');
INSERT INTO `sys_dict_item` VALUES ('1500650240003330049', '1513417672023441409', 'Chassis - Suspension', '18', 'Chassis - Suspension', '18', '1', 'admin', '2022-04-13 18:18:08', 'admin', '2022-04-20 09:34:58', '1', '1', null, '0', 'Chassis - Suspension');
INSERT INTO `sys_dict_item` VALUES ('1500659340875468802', '1513417672023441409', 'Performance', '19', 'Performance', '19', '1', 'admin', '2022-04-13 18:18:08', 'admin', '2022-04-20 09:34:58', '1', '1', null, '0', 'Performance');
INSERT INTO `sys_dict_item` VALUES ('1500659833550999554', '1513417672023441409', 'Performance - Drive Performance', '20', 'Performance - Drive Performance', '20', '1', 'admin', '2022-04-13 18:18:08', 'admin', '2022-04-20 09:34:58', '1', '1', null, '0', 'Performance - Drive Performance');
INSERT INTO `sys_dict_item` VALUES ('1500661649894346753', '1513417672023441409', 'Performance - Vehicle Dynamic', '21', 'Performance - Vehicle Dynamic', '21', '1', 'admin', '2022-04-13 18:18:08', 'admin', '2022-04-20 09:34:58', '1', '1', null, '0', 'Performance - Vehicle Dynamic');
INSERT INTO `sys_dict_item` VALUES ('1500662975541874689', '1513417672023441409', 'Performance - Mass', '22', 'Performance - Mass', '22', '1', 'admin', '2022-04-13 18:18:08', 'admin', '2022-04-20 09:34:58', '1', '1', null, '0', 'Performance - Mass');
INSERT INTO `sys_dict_item` VALUES ('1500664310781775873', '1513417672023441409', 'Performance - Thermal', '23', 'Performance - Thermal', '23', '1', 'admin', '2022-04-13 18:18:08', 'admin', '2022-04-20 09:34:58', '1', '1', null, '0', 'Performance - Thermal');
INSERT INTO `sys_dict_item` VALUES ('1500664606840918018', '1513417672023441409', 'Performance - Drive Quality', '24', 'Performance - Drive Quality', '24', '1', 'admin', '2022-04-13 18:18:08', 'admin', '2022-04-20 09:34:58', '1', '1', null, '0', 'Performance - Drive Quality');
INSERT INTO `sys_dict_item` VALUES ('1500667743811211266', '1513417672023441409', 'Attribute - Passive Safety', '25', 'Attribute - Passive Safety', '25', '1', 'admin', '2022-04-13 18:18:08', 'admin', '2022-04-20 09:34:58', '1', '1', null, '0', 'Attribute - Passive Safety');
INSERT INTO `sys_dict_item` VALUES ('1500669003687858178', '1513417672023441409', 'Attribute - NVH', '26', 'Attribute - NVH', '26', '1', 'admin', '2022-04-13 18:18:08', 'admin', '2022-04-20 09:34:58', '1', '1', null, '0', 'Attribute - NVH');
INSERT INTO `sys_dict_item` VALUES ('1500754484325588994', '1513417672023441409', 'Attribute - Durability', '27', 'Attribute - Durability', '27', '1', 'admin', '2022-04-13 18:18:08', 'admin', '2022-04-20 09:34:58', '1', '1', null, '0', 'Attribute - Durability');
INSERT INTO `sys_dict_item` VALUES ('1500771838370619393', '1513417672023441409', 'Attribute - Sealing', '28', 'Attribute - Sealing', '28', '1', 'admin', '2022-04-13 18:18:08', 'admin', '2022-04-20 09:34:58', '1', '1', null, '0', 'Attribute - Sealing');
INSERT INTO `sys_dict_item` VALUES ('1500838822529773569', '1513417672023441409', 'E/E Body', '29', 'E/E Body', '29', '1', 'admin', '2022-04-13 18:18:08', 'admin', '2022-04-20 09:34:58', '1', '1', null, '0', 'E/E Body');
INSERT INTO `sys_dict_item` VALUES ('1501130852074790913', '1513417672023441409', 'E/E Distribution', '30', 'E/E Distribution', '30', '1', 'admin', '2022-04-13 18:18:08', 'admin', '2022-04-20 09:34:58', '1', '1', null, '0', 'E/E Distribution');
INSERT INTO `sys_dict_item` VALUES ('1500650121430355970', '1513417672023441409', 'Chassis - Wheels & Tools', '17', 'Chassis - Wheels & Tools', '17', '1', 'admin', '2022-04-13 18:18:08', 'admin', '2022-04-20 09:34:58', '1', '1', null, '1', 'Chassis - Wheels & Tools');
INSERT INTO `sys_dict_item` VALUES ('1500650240003330049', '1513417672023441409', 'Chassis - Suspension', '18', 'Chassis - Suspension', '18', '1', 'admin', '2022-04-13 18:18:08', 'admin', '2022-04-20 09:34:58', '1', '1', null, '1', 'Chassis - Suspension');
INSERT INTO `sys_dict_item` VALUES ('1500659340875468802', '1513417672023441409', 'Performance', '19', 'Performance', '19', '1', 'admin', '2022-04-13 18:18:08', 'admin', '2022-04-20 09:34:58', '1', '1', null, '1', 'Performance');
INSERT INTO `sys_dict_item` VALUES ('1500659833550999554', '1513417672023441409', 'Performance - Drive Performance', '20', 'Performance - Drive Performance', '20', '1', 'admin', '2022-04-13 18:18:08', 'admin', '2022-04-20 09:34:58', '1', '1', null, '1', 'Performance - Drive Performance');
INSERT INTO `sys_dict_item` VALUES ('1500661649894346753', '1513417672023441409', 'Performance - Vehicle Dynamic', '21', 'Performance - Vehicle Dynamic', '21', '1', 'admin', '2022-04-13 18:18:08', 'admin', '2022-04-20 09:34:58', '1', '1', null, '1', 'Performance - Vehicle Dynamic');
INSERT INTO `sys_dict_item` VALUES ('1500662975541874689', '1513417672023441409', 'Performance - Mass', '22', 'Performance - Mass', '22', '1', 'admin', '2022-04-13 18:18:08', 'admin', '2022-04-20 09:34:58', '1', '1', null, '1', 'Performance - Mass');
INSERT INTO `sys_dict_item` VALUES ('1500664310781775873', '1513417672023441409', 'Performance - Thermal', '23', 'Performance - Thermal', '23', '1', 'admin', '2022-04-13 18:18:08', 'admin', '2022-04-20 09:34:58', '1', '1', null, '1', 'Performance - Thermal');
INSERT INTO `sys_dict_item` VALUES ('1500664606840918018', '1513417672023441409', 'Performance - Drive Quality', '24', 'Performance - Drive Quality', '24', '1', 'admin', '2022-04-13 18:18:08', 'admin', '2022-04-20 09:34:58', '1', '1', null, '1', 'Performance - Drive Quality');
INSERT INTO `sys_dict_item` VALUES ('1500667743811211266', '1513417672023441409', 'Attribute - Passive Safety', '25', 'Attribute - Passive Safety', '25', '1', 'admin', '2022-04-13 18:18:08', 'admin', '2022-04-20 09:34:58', '1', '1', null, '1', 'Attribute - Passive Safety');
INSERT INTO `sys_dict_item` VALUES ('1500669003687858178', '1513417672023441409', 'Attribute - NVH', '26', 'Attribute - NVH', '26', '1', 'admin', '2022-04-13 18:18:08', 'admin', '2022-04-20 09:34:58', '1', '1', null, '1', 'Attribute - NVH');
INSERT INTO `sys_dict_item` VALUES ('1500754484325588994', '1513417672023441409', 'Attribute - Durability', '27', 'Attribute - Durability', '27', '1', 'admin', '2022-04-13 18:18:08', 'admin', '2022-04-20 09:34:58', '1', '1', null, '1', 'Attribute - Durability');
INSERT INTO `sys_dict_item` VALUES ('1500771838370619393', '1513417672023441409', 'Attribute - Sealing', '28', 'Attribute - Sealing', '28', '1', 'admin', '2022-04-13 18:18:08', 'admin', '2022-04-20 09:34:58', '1', '1', null, '1', 'Attribute - Sealing');
INSERT INTO `sys_dict_item` VALUES ('1500838822529773569', '1513417672023441409', 'E/E Body', '29', 'E/E Body', '29', '1', 'admin', '2022-04-13 18:18:08', 'admin', '2022-04-20 09:34:58', '1', '1', null, '1', 'E/E Body');
INSERT INTO `sys_dict_item` VALUES ('1501130852074790913', '1513417672023441409', 'E/E Distribution', '30', 'E/E Distribution', '30', '1', 'admin', '2022-04-13 18:18:08', 'admin', '2022-04-20 09:34:58', '1', '1', null, '1', 'E/E Distribution');
INSERT INTO `sys_dict_item` VALUES ('1501368312280412161', '1493146941712789505', 'M2', '3', 'M2', '3', '1', 'admin', '2022-03-09 09:24:34', 'admin', '2022-03-10 18:28:56', null, null, null, '0', 'M2');
INSERT INTO `sys_dict_item` VALUES ('1501400473964388353', '1513417672023441409', 'E/E Infotainment', '31', 'E/E Infotainment', '31', '1', 'admin', '2022-04-13 18:18:08', 'admin', '2022-04-20 09:34:58', '1', '1', null, '0', 'E/E Infotainment');
INSERT INTO `sys_dict_item` VALUES ('1501437634935853058', '1513417672023441409', 'E/E Lighting', '32', 'E/E Lighting', '32', '1', 'admin', '2022-04-13 18:18:08', 'admin', '2022-04-20 09:34:58', '1', '1', null, '0', 'E/E Lighting');
INSERT INTO `sys_dict_item` VALUES ('1501437936523087873', '1513417672023441409', 'EDS', '33', 'EDS', '33', '1', 'admin', '2022-04-13 18:18:08', 'admin', '2022-04-20 09:34:58', '1', '1', null, '0', 'EDS');
INSERT INTO `sys_dict_item` VALUES ('1501440300743200770', '1513417672023441409', 'BS', '34', 'BS', '34', '1', 'admin', '2022-04-13 18:18:08', 'admin', '2022-04-20 09:34:58', '1', '1', null, '0', 'BS');
INSERT INTO `sys_dict_item` VALUES ('1501400473964388353', '1513417672023441409', 'E/E Infotainment', '31', 'E/E Infotainment', '31', '1', 'admin', '2022-04-13 18:18:08', 'admin', '2022-04-20 09:34:58', '1', '1', null, '1', 'E/E Infotainment');
INSERT INTO `sys_dict_item` VALUES ('1501437634935853058', '1513417672023441409', 'E/E Lighting', '32', 'E/E Lighting', '32', '1', 'admin', '2022-04-13 18:18:08', 'admin', '2022-04-20 09:34:58', '1', '1', null, '1', 'E/E Lighting');
INSERT INTO `sys_dict_item` VALUES ('1501437936523087873', '1513417672023441409', 'EDS', '33', 'EDS', '73', '1', 'admin', '2022-04-13 18:18:08', 'xuetao.li3.o', '2022-06-21 18:12:04', '1', '1', null, '0', 'EDS');
INSERT INTO `sys_dict_item` VALUES ('1501440300743200770', '1513417672023441409', 'BS', '34', 'BS', '48', '1', 'admin', '2022-04-13 18:18:08', 'xuetao.li3.o', '2022-06-21 18:12:04', '1', '1', null, '0', 'BS');
INSERT INTO `sys_dict_item` VALUES ('1501823531598540802', '1513417672023441409', 'ADAS', '35', 'ADAS', '35', '1', 'admin', '2022-04-13 18:18:08', 'admin', '2022-04-20 09:34:58', '1', '1', null, '0', 'ADAS');
INSERT INTO `sys_dict_item` VALUES ('1501866879738785794', '1493782496880451585', '标准法规', '3', '标准法规', '3', '1', 'admin', '2022-03-10 18:25:42', null, null, null, null, null, '0', 'Standard & Regulation');
INSERT INTO `sys_dict_item` VALUES ('1501867864003522561', '1493146941712789505', 'M3', '4', 'M3', '4', '1', 'admin', '2022-03-10 18:29:37', null, null, null, null, null, '0', 'M3');
@@ -14079,8 +14079,8 @@ INSERT INTO `sys_dict_item` VALUES ('1501869957632307202', '1493782653286047745'
INSERT INTO `sys_dict_item` VALUES ('1501870049911189506', '1493782653286047745', 'TB', '5', 'TB', '5', '1', 'admin', '2022-06-06 17:03:59', null, null, null, null, null, '0', 'TB');
INSERT INTO `sys_dict_item` VALUES ('1501870582021566465', '1493782890096451586', '插电式混合动力', '3', '插电式混合动力', '3', '1', 'admin', '2022-03-10 18:40:25', 'admin', '2022-03-10 18:41:00', null, null, null, '0', 'PHEV');
INSERT INTO `sys_dict_item` VALUES ('1501870668084490241', '1493782890096451586', '非插电式混合动车', '4', '非插电式混合动车', '4', '1', 'admin', '2022-03-10 18:40:45', 'admin', '2022-03-10 18:41:17', null, null, null, '0', 'MHEV');
INSERT INTO `sys_dict_item` VALUES ('1501883988254457858', '1513417672023441409', 'DD - ICV SIM Card', '36', 'DD - ICV SIM Card', '36', '1', 'admin', '2022-04-13 18:18:08', 'admin', '2022-04-20 09:34:58', '1', '1', null, '0', 'DD - ICV SIM Card');
INSERT INTO `sys_dict_item` VALUES ('1501885863586492418', '1513417672023441409', 'DD - eCoC', '37', 'DD - eCoC', '37', '1', 'admin', '2022-04-13 18:18:08', 'admin', '2022-04-20 09:34:58', '1', '1', null, '0', 'DD - eCoC');
INSERT INTO `sys_dict_item` VALUES ('1501883988254457858', '1513417672023441409', 'DD - ICV SIM Card', '36', 'DD - ICV SIM Card', '36', '1', 'admin', '2022-04-13 18:18:08', 'admin', '2022-04-20 09:34:58', '1', '1', null, '1', 'DD - ICV SIM Card');
INSERT INTO `sys_dict_item` VALUES ('1501885863586492418', '1513417672023441409', 'DD - eCoC', '37', 'DD - eCoC', '37', '1', 'admin', '2022-04-13 18:18:08', 'admin', '2022-04-20 09:34:58', '1', '1', null, '1', 'DD - eCoC');
INSERT INTO `sys_dict_item` VALUES ('1507311752583352322', '1507311644861042690', '未同步', '未同步', '', '1', '1', 'admin', '2022-03-25 19:01:41', 'admin', '2022-03-25 19:01:49', null, null, null, '0', 'sync no');
INSERT INTO `sys_dict_item` VALUES ('1507311835571851265', '1507311644861042690', '已同步', '已同步', '', '1', '1', 'admin', '2022-03-25 19:02:01', 'admin', '2022-03-25 19:02:09', null, null, null, '0', 'sync yes');
INSERT INTO `sys_dict_item` VALUES ('1509105815083024386', '1493146941712789505', 'L4', '11', 'L4', '11', '1', 'admin', '2022-03-30 17:50:39', null, null, null, null, null, '0', 'L4');
@@ -14103,8 +14103,8 @@ INSERT INTO `sys_dict_item` VALUES ('1514185240585805825', '1514182488166080513'
INSERT INTO `sys_dict_item` VALUES ('1514185277181108225', '1514182488166080513', 'Com.Cert-VTA', '2', 'Com.Cert-VTA', '2', '1', 'admin', '2022-04-13 18:14:37', 'ning.chen', '2022-04-22 13:44:43', null, null, null, '0', 'Com.Cert-VTA');
INSERT INTO `sys_dict_item` VALUES ('1514185437390938113', '1514182179729547266', 'CCC', '1', 'CCC', '1', '1', 'admin', '2022-04-13 18:15:15', 'ning.chen', '2022-04-22 13:44:53', null, null, null, '0', 'CCC');
INSERT INTO `sys_dict_item` VALUES ('1514185490679570434', '1514182179729547266', 'TRIAS', '42', 'TRIAS', '42', '1', 'admin', '2022-04-13 18:15:28', 'ning.chen', '2022-04-22 13:44:58', null, null, null, '0', 'TRIAS');
INSERT INTO `sys_dict_item` VALUES ('1514186163995385857', '1513417672023441409', 'Fuctional Safety', '54', 'Fuctional Safety', '54', '1', 'admin', '2022-04-13 18:18:08', 'admin', '2022-04-20 09:34:58', '1', '1', null, '0', 'Fuctional Safety');
INSERT INTO `sys_dict_item` VALUES ('1514186206542405634', '1513417672023441409', 'SO', '55', 'SO', '55', '1', 'admin', '2022-04-13 18:18:08', 'admin', '2022-04-20 09:34:58', '1', '1', null, '0', 'SO');
INSERT INTO `sys_dict_item` VALUES ('1514186163995385857', '1513417672023441409', 'Fuctional Safety', '54', 'Fuctional Safety', '78', '1', 'admin', '2022-04-13 18:18:08', 'xuetao.li3.o', '2022-06-21 18:12:04', '1', '1', null, '0', 'Fuctional Safety');
INSERT INTO `sys_dict_item` VALUES ('1514186206542405634', '1513417672023441409', 'SO', '55', 'SO', '71', '1', 'admin', '2022-04-13 18:18:08', 'xuetao.li3.o', '2022-06-21 18:12:04', '1', '1', null, '0', 'SO');
INSERT INTO `sys_dict_item` VALUES ('1514420267072434178', '1514419802704261122', '强制', '1', '强制', '1', '1', 'admin', '2022-04-14 09:48:23', 'ning.chen', '2022-04-22 13:41:26', null, null, null, '0', 'Mandatory');
INSERT INTO `sys_dict_item` VALUES ('1514420298202558465', '1514419802704261122', '安装则强制', '2', '安装则强制', '2', '1', 'admin', '2022-04-14 09:48:30', 'ning.chen', '2022-04-22 13:41:34', null, null, null, '0', 'Mandatory (if fitted)');
INSERT INTO `sys_dict_item` VALUES ('1514528928260235266', '1514528244223778818', '法规工程师', '1', '法规工程师', null, '1', 'admin', '2022-04-14 17:00:10', null, null, null, null, null, '0', 'Regulatory Engineer');
@@ -14121,34 +14121,34 @@ INSERT INTO `sys_dict_item` VALUES ('1517410144030359554', '1517409905311547394'
INSERT INTO `sys_dict_item` VALUES ('1517410200083038209', '1517409905311547394', 'CCC申报类别', 'CCCSB', '', '2', '1', 'admin', '2022-04-22 15:49:18', 'admin', '2022-04-22 15:50:14', null, null, null, '0', 'CCC declaration category');
INSERT INTO `sys_dict_item` VALUES ('1517410242789441537', '1517409905311547394', '信息公开申报类别', 'XXGK', '', '3', '1', 'admin', '2022-04-22 15:49:29', 'admin', '2022-04-22 15:50:20', null, null, null, '0', 'Information disclosure declaration category');
INSERT INTO `sys_dict_item` VALUES ('1517410280903081986', '1517409905311547394', '北环申报类别', 'BHSB', '', '4', '1', 'admin', '2022-04-22 15:49:38', 'admin', '2022-04-22 15:50:24', null, null, null, '0', 'North ring declaration category');
INSERT INTO `sys_dict_item` VALUES ('1517441951236947970', '1513417672023441409', 'DC', '38', 'DC', '38', '1', 'admin', '2022-04-13 18:18:08', 'admin', '2022-04-20 09:34:58', '1', '1', null, '0', 'DC');
INSERT INTO `sys_dict_item` VALUES ('1517441951287279617', '1513417672023441409', 'DC - Speedometer/Reversing Detection', '39', 'DC - Speedometer/Reversing Detection', '39', '1', 'admin', '2022-04-13 18:18:08', 'admin', '2022-04-20 09:34:58', '1', '1', null, '0', 'DC - Speedometer/Reversing Detection');
INSERT INTO `sys_dict_item` VALUES ('1519863013618769922', '1513417672023441409', 'DC - Symbol/IC', '40', 'DC - Symbol/IC', '40', '1', 'admin', '2022-04-13 18:18:08', 'admin', '2022-04-20 09:34:58', '1', '1', null, '0', 'DC - Symbol/IC');
INSERT INTO `sys_dict_item` VALUES ('1519877297438613505', '1513417672023441409', 'DC - CDC/ICS (sw) ', '41', 'DC - CDC, ICS (sw) ', '41', '1', 'admin', '2022-04-13 18:18:08', 'admin', '2022-04-20 09:34:58', '1', '1', null, '0', 'DC - CDC, ICS (sw) ');
INSERT INTO `sys_dict_item` VALUES ('1519877297447002113', '1513417672023441409', 'DC - DAB', '42', 'DC - DAB', '42', '1', 'admin', '2022-04-13 18:18:08', 'admin', '2022-04-20 09:34:58', '1', '1', null, '0', 'DC - DAB');
INSERT INTO `sys_dict_item` VALUES ('1517441951236947970', '1513417672023441409', 'DC', '38', 'DC', '64', '1', 'admin', '2022-04-13 18:18:08', 'xuetao.li3.o', '2022-06-21 18:12:04', '1', '1', null, '0', 'DC');
INSERT INTO `sys_dict_item` VALUES ('1517441951287279617', '1513417672023441409', 'DC - Speedometer/Reversing Detection', '39', 'DC - Speedometer/Reversing Detection', '39', '1', 'admin', '2022-04-13 18:18:08', 'admin', '2022-04-20 09:34:58', '1', '1', null, '1', 'DC - Speedometer/Reversing Detection');
INSERT INTO `sys_dict_item` VALUES ('1519863013618769922', '1513417672023441409', 'DC - Symbol/IC', '40', 'DC - Symbol/IC', '40', '1', 'admin', '2022-04-13 18:18:08', 'admin', '2022-04-20 09:34:58', '1', '1', null, '1', 'DC - Symbol/IC');
INSERT INTO `sys_dict_item` VALUES ('1519877297438613505', '1513417672023441409', 'DC - CDC/ICS (sw)', '41', 'DC - CDC, ICS (sw) ', '41', '1', 'admin', '2022-04-13 18:18:08', 'admin', '2022-04-20 09:34:58', '1', '1', null, '1', 'DC - CDC/ICS (sw)');
INSERT INTO `sys_dict_item` VALUES ('1519877297447002113', '1513417672023441409', 'DC - DAB', '42', 'DC - DAB', '42', '1', 'admin', '2022-04-13 18:18:08', 'admin', '2022-04-20 09:34:58', '1', '1', null, '1', 'DC - DAB');
INSERT INTO `sys_dict_item` VALUES ('1519936925488783362', '14818fb3e59545ab82d47e24f1128ab5', 'NT1', '436a564d0448442f9e537fe7b267d3c8', 'NT1', null, '1', 'admin', '2022-04-29 15:09:37', null, null, null, null, null, '0', 'NT1');
INSERT INTO `sys_dict_item` VALUES ('1519936955616468993', '14818fb3e59545ab82d47e24f1128ab5', 'NT2', '62854485a7ea4c90877d94c6a7dbf4f6', 'NT2', null, '1', 'admin', '2022-04-29 15:09:44', null, null, null, null, null, '0', 'NT2');
INSERT INTO `sys_dict_item` VALUES ('1519936984569749506', '14818fb3e59545ab82d47e24f1128ab5', 'NT3', '8436be318b614d10b3b309c90a5a3331', 'NT3', null, '1', 'admin', '2022-04-29 15:09:51', null, null, null, null, null, '0', 'NT3');
INSERT INTO `sys_dict_item` VALUES ('1519937119588589569', '1a1f7a6ef92f4a6e95ead0a33a3bf39f', 'NP1', '89cb2804bb654b99a0705ee09acd5306', 'NP1', null, '1', 'admin', '2022-04-29 15:10:23', null, null, null, null, null, '0', 'NP1');
INSERT INTO `sys_dict_item` VALUES ('1519937147698814977', '1a1f7a6ef92f4a6e95ead0a33a3bf39f', 'NP2', 'c49f7cc7233d451d953fd1dcf08e023b', 'NP2', null, '1', 'admin', '2022-04-29 15:10:30', null, null, null, null, null, '0', 'NP2');
INSERT INTO `sys_dict_item` VALUES ('1519937176081670146', '1a1f7a6ef92f4a6e95ead0a33a3bf39f', 'NP3', '65eb06bd095946e39ed25e269e6b75f3', 'NP3', null, '1', 'admin', '2022-04-29 15:10:37', null, null, null, null, null, '0', 'NP3');
INSERT INTO `sys_dict_item` VALUES ('1519951320444989441', '1513417672023441409', 'DA', '43', 'DA', '43', '1', 'admin', '2022-04-13 18:18:08', 'admin', '2022-04-20 09:34:58', '1', '1', null, '0', 'DA');
INSERT INTO `sys_dict_item` VALUES ('1519951320453378049', '1513417672023441409', 'DA - DSSAD', '44', 'DA - DSSAD', '44', '1', 'admin', '2022-04-13 18:18:08', 'admin', '2022-04-20 09:34:58', '1', '1', null, '0', 'DA - DSSAD');
INSERT INTO `sys_dict_item` VALUES ('1519951320461766658', '1513417672023441409', 'DA - IMMO', '45', 'DA - IMMO', '45', '1', 'admin', '2022-04-13 18:18:08', 'admin', '2022-04-20 09:34:58', '1', '1', null, '0', 'DA - IMMO');
INSERT INTO `sys_dict_item` VALUES ('1519953368313917442', '1513417672023441409', 'DA - Alcohol lock', '46', 'DA - Alcohol lock', '46', '1', 'admin', '2022-04-13 18:18:08', 'admin', '2022-04-20 09:34:58', '1', '1', null, '0', 'DA - Alcohol lock');
INSERT INTO `sys_dict_item` VALUES ('1519953368313917443', '1513417672023441409', 'DA - OBD', '47', 'DA - OBD', '47', '1', 'admin', '2022-04-13 18:18:08', 'admin', '2022-04-20 09:34:58', '1', '1', null, '0', 'DA - OBD');
INSERT INTO `sys_dict_item` VALUES ('1519953368322306050', '1513417672023441409', 'DPD - eCall', '48', 'DPD - eCall', '48', '1', 'admin', '2022-04-13 18:18:08', 'admin', '2022-04-20 09:34:58', '1', '1', null, '0', 'DPD - eCall');
INSERT INTO `sys_dict_item` VALUES ('1523571983504240641', '1513417672023441409', 'DPD - EVM', '49', 'DPD - EVM', '49', '1', 'admin', '2022-04-13 18:18:08', 'admin', '2022-04-20 09:34:58', '1', '1', null, '0', 'DPD - EVM');
INSERT INTO `sys_dict_item` VALUES ('1519951320444989441', '1513417672023441409', 'DA', '43', 'DA', '64', '1', 'admin', '2022-04-13 18:18:08', 'xuetao.li3.o', '2022-06-21 18:12:04', '1', '1', null, '0', 'DA');
INSERT INTO `sys_dict_item` VALUES ('1519951320453378049', '1513417672023441409', 'DA - DSSAD', '44', 'DA - DSSAD', '44', '1', 'admin', '2022-04-13 18:18:08', 'admin', '2022-04-20 09:34:58', '1', '1', null, '1', 'DA - DSSAD');
INSERT INTO `sys_dict_item` VALUES ('1519951320461766658', '1513417672023441409', 'DA - IMMO', '45', 'DA - IMMO', '45', '1', 'admin', '2022-04-13 18:18:08', 'admin', '2022-04-20 09:34:58', '1', '1', null, '1', 'DA - IMMO');
INSERT INTO `sys_dict_item` VALUES ('1519953368313917442', '1513417672023441409', 'DA - Alcohol lock', '46', 'DA - Alcohol lock', '46', '1', 'admin', '2022-04-13 18:18:08', 'admin', '2022-04-20 09:34:58', '1', '1', null, '1', 'DA - Alcohol lock');
INSERT INTO `sys_dict_item` VALUES ('1519953368313917443', '1513417672023441409', 'DA - OBD', '47', 'DA - OBD', '47', '1', 'admin', '2022-04-13 18:18:08', 'admin', '2022-04-20 09:34:58', '1', '1', null, '1', 'DA - OBD');
INSERT INTO `sys_dict_item` VALUES ('1519953368322306050', '1513417672023441409', 'DPD - eCall', '48', 'DPD - eCall', '48', '1', 'admin', '2022-04-13 18:18:08', 'admin', '2022-04-20 09:34:58', '1', '1', null, '1', 'DPD - eCall');
INSERT INTO `sys_dict_item` VALUES ('1523571983504240641', '1513417672023441409', 'DPD - EVM', '49', 'DPD - EVM', '49', '1', 'admin', '2022-04-13 18:18:08', 'admin', '2022-04-20 09:34:58', '1', '1', null, '1', 'DPD - EVM');
INSERT INTO `sys_dict_item` VALUES ('1524311354002771970', '1524311122804346881', '实验通过', 'Test passed', '实验通过', null, '1', 'admin', '2022-05-11 16:52:02', null, null, null, null, null, '0', 'Test passed');
INSERT INTO `sys_dict_item` VALUES ('1524311478934310914', '1524311122804346881', '实验失败', 'Test failed', '实验失败', null, '1', 'admin', '2022-05-11 16:52:32', null, null, null, null, null, '0', 'Test failed');
INSERT INTO `sys_dict_item` VALUES ('1524311601424764929', '1524311122804346881', '待开始', 'Not start', '待开始', null, '1', 'admin', '2022-05-11 16:53:01', null, null, null, null, null, '0', 'Not start');
INSERT INTO `sys_dict_item` VALUES ('1524311703367323649', '1524311122804346881', '进行中', 'In progress', '进行中', null, '1', 'admin', '2022-05-11 16:53:25', null, null, null, null, null, '0', 'In progress');
INSERT INTO `sys_dict_item` VALUES ('1524311785378549761', '1524311122804346881', '不涉及', 'NA', '不涉及', null, '1', 'admin', '2022-05-11 16:53:45', null, null, null, null, null, '0', 'NA');
INSERT INTO `sys_dict_item` VALUES ('1526410840813604865', '1513417672023441409', 'DEI - EMC', '50', 'DEI - EMC', '50', '1', 'admin', '2022-04-13 18:18:08', 'admin', '2022-04-20 09:34:58', '1', '1', null, '0', 'DEI - EMC');
INSERT INTO `sys_dict_item` VALUES ('1526846408559173634', '1513417672023441409', 'CVS - OTA', '51', 'CVS - OTA', '51', '1', 'admin', '2022-04-13 18:18:08', 'admin', '2022-04-20 09:34:58', '1', '1', null, '0', 'CVS - OTA');
INSERT INTO `sys_dict_item` VALUES ('1526410840813604865', '1513417672023441409', 'DEI - EMC', '50', 'DEI - EMC', '50', '1', 'admin', '2022-04-13 18:18:08', 'admin', '2022-04-20 09:34:58', '1', '1', null, '1', 'DEI - EMC');
INSERT INTO `sys_dict_item` VALUES ('1526846408559173634', '1513417672023441409', 'CVS - OTA', '51', 'CVS - OTA', '51', '1', 'admin', '2022-04-13 18:18:08', 'admin', '2022-04-20 09:34:58', '1', '1', null, '1', 'CVS - OTA');
INSERT INTO `sys_dict_item` VALUES ('1529645459642023937', '1517409905311547394', '免税申报类别', 'MSSB', '', '5', '1', 'admin', '2022-04-22 15:49:05', 'admin', '2022-04-22 15:50:10', null, null, null, '0', 'Tax exemption category');
INSERT INTO `sys_dict_item` VALUES ('1530002197088075778', '1513417672023441409', 'Cyber Security', '52', 'Cyber Security', '52', '1', 'admin', '2022-04-13 18:18:08', 'admin', '2022-04-20 09:34:58', '1', '1', null, '0', 'Cyber Security');
INSERT INTO `sys_dict_item` VALUES ('1530102991372165121', '1513417672023441409', 'Data Security', '53', 'Data Security', '53', '1', 'admin', '2022-04-13 18:18:08', 'admin', '2022-04-20 09:34:58', '1', '1', null, '0', 'Data Security');
INSERT INTO `sys_dict_item` VALUES ('1530002197088075778', '1513417672023441409', 'Cyber Security', '52', 'Cyber Security', '52', '1', 'admin', '2022-04-13 18:18:08', 'admin', '2022-04-20 09:34:58', '1', '1', null, '1', 'Cyber Security');
INSERT INTO `sys_dict_item` VALUES ('1530102991372165121', '1513417672023441409', 'Data Security', '53', 'Data Security', '53', '1', 'admin', '2022-04-13 18:18:08', 'admin', '2022-04-20 09:34:58', '1', '1', null, '1', 'Data Security');
INSERT INTO `sys_dict_item` VALUES ('1531893962971901953', '1517409905311547394', '推荐目录申报类别', 'TJMLSB', null, '6', '1', 'admin', '2022-04-22 15:49:18', 'admin', '2022-04-22 15:50:14', null, null, null, '0', 'Recommended catalogue declaration category');
INSERT INTO `sys_dict_item` VALUES ('1531898875365912577', '1517409905311547394', 'EU申报参数', 'EUSB', null, '7', '1', 'admin', '2022-04-22 15:49:29', 'admin', '2022-04-22 15:50:20', null, null, null, '0', 'EU declaration parameters');
INSERT INTO `sys_dict_item` VALUES ('1531898876028612609', '1517409905311547394', 'EU单项参数', 'EUDX', null, '8', '1', 'admin', '2022-04-22 15:49:38', 'admin', '2022-04-22 15:50:24', null, null, null, '0', 'EU single parameter');
@@ -14245,7 +14245,81 @@ INSERT INTO `sys_dict_item` VALUES ('1533747839887224834', '1514182179729547266'
INSERT INTO `sys_dict_item` VALUES ('1533748200085663745', '1514182488166080513', 'Com.Cert-Market', '3', 'Com.Cert-Market', '3', '1', 'admin', '2022-06-06 17:50:41', null, null, null, null, null, '0', 'Com.Cert-Market');
INSERT INTO `sys_dict_item` VALUES ('1533748223842201601', '1514182488166080513', 'Regu-Market', '4', 'Regu-Market', '4', '1', 'admin', '2022-06-06 17:50:47', null, null, null, null, null, '0', 'Regu-Market');
INSERT INTO `sys_dict_item` VALUES ('1533748246323671041', '1514182488166080513', 'NA', '5', 'NA', '5', '1', 'admin', '2022-06-06 17:50:52', null, null, null, null, null, '0', 'NA');
INSERT INTO `sys_dict_item` VALUES ('1537703712120655873', '1513417672023441409', 'PE&QI', '059fec949b9f43ca9f816935cc711779', null, '56', '1', 'admin', '2022-06-17 15:48:29', null, null, '1', null, null, '0', 'PE&QI');
INSERT INTO `sys_dict_item` VALUES ('1537703712120655873', '1513417672023441409', 'PE&QI', '059fec949b9f43ca9f816935cc711779', null, '79', '1', 'admin', '2022-06-17 15:48:29', 'xuetao.li3.o', '2022-06-21 18:12:04', '1', null, null, '0', 'PE&QI');
INSERT INTO `sys_dict_item` VALUES ('1539186763120009217', '1513417672023441409', 'VC-P', 'f125c2bcb21d404dac5d877bbeadacf5', null, '76', '1', 'xuetao.li3.o', '2022-06-21 18:01:36', 'xuetao.li3.o', '2022-06-21 18:12:04', '1', null, null, '0', 'VC-P');
INSERT INTO `sys_dict_item` VALUES ('1539186787954483202', '1513417672023441409', 'VC-HMI', '53ead6cfe7204b2fbed875214a298314', null, '75', '1', 'xuetao.li3.o', '2022-06-21 18:01:42', 'xuetao.li3.o', '2022-06-21 18:12:04', '1', null, null, '0', 'VC-HMI');
INSERT INTO `sys_dict_item` VALUES ('1539186814777057281', '1513417672023441409', 'VC', '3276ba7acc624e3ab2af09fe119be7bd', null, '74', '1', 'xuetao.li3.o', '2022-06-21 18:01:48', 'xuetao.li3.o', '2022-06-21 18:12:04', '1', null, null, '0', 'VC');
INSERT INTO `sys_dict_item` VALUES ('1539186855428251649', '1513417672023441409', 'VAS-P', '4988c4cc848d42c598b2333503b93731', null, '73', '1', 'xuetao.li3.o', '2022-06-21 18:01:58', 'xuetao.li3.o', '2022-06-21 18:12:04', '1', null, null, '0', 'VAS-P');
INSERT INTO `sys_dict_item` VALUES ('1539186907336957954', '1513417672023441409', 'SO-P', '5114239a6b2d41ce84dfab2bec33d215', null, '72', '1', 'xuetao.li3.o', '2022-06-21 18:02:10', 'xuetao.li3.o', '2022-06-21 18:12:04', '1', null, null, '0', 'SO-P');
INSERT INTO `sys_dict_item` VALUES ('1539187113461833730', '1513417672023441409', 'SHW-P', '3f2ce5eb1636425c8b336349751f7eb1', null, '70', '1', 'xuetao.li3.o', '2022-06-21 18:02:59', 'xuetao.li3.o', '2022-06-21 18:12:04', '1', null, null, '0', 'SHW-P');
INSERT INTO `sys_dict_item` VALUES ('1539187140653506562', '1513417672023441409', 'SHW', 'c770a0f8059f4250a3a6c43e81193592', null, '69', '1', 'xuetao.li3.o', '2022-06-21 18:03:06', 'xuetao.li3.o', '2022-06-21 18:12:04', '1', null, null, '0', 'SHW');
INSERT INTO `sys_dict_item` VALUES ('1539187167971008514', '1513417672023441409', 'Seat-P', 'b1b85a0c29f6430895c315eca978102f', null, '68', '1', 'xuetao.li3.o', '2022-06-21 18:03:12', 'xuetao.li3.o', '2022-06-21 18:12:04', '1', null, null, '0', 'Seat-P');
INSERT INTO `sys_dict_item` VALUES ('1539187195783438337', '1513417672023441409', 'Seat', 'b604a7b91ab4400bbe187f109ead8c5f', null, '67', '1', 'xuetao.li3.o', '2022-06-21 18:03:19', 'xuetao.li3.o', '2022-06-21 18:12:04', '1', null, null, '0', 'Seat');
INSERT INTO `sys_dict_item` VALUES ('1539187233557340162', '1513417672023441409', 'PI-Vehicle Dynamic', '443aca2b61da4827bf3855defaff64cf', null, '66', '1', 'xuetao.li3.o', '2022-06-21 18:03:28', 'xuetao.li3.o', '2022-06-21 18:12:04', '1', null, null, '0', 'PI-Vehicle Dynamic');
INSERT INTO `sys_dict_item` VALUES ('1539187261600456706', '1513417672023441409', 'PI-Thermal', 'c615dd5e934542cc949ca9d0ea566979', null, '65', '1', 'xuetao.li3.o', '2022-06-21 18:03:35', 'xuetao.li3.o', '2022-06-21 18:12:04', '1', null, null, '0', 'PI-Thermal');
INSERT INTO `sys_dict_item` VALUES ('1539187290889281538', '1513417672023441409', 'PI-P', 'c2cee5791620439283fa0c13dc051e3c', null, '64', '1', 'xuetao.li3.o', '2022-06-21 18:03:42', 'xuetao.li3.o', '2022-06-21 18:12:04', '1', null, null, '0', 'PI-P');
INSERT INTO `sys_dict_item` VALUES ('1539187315174301697', '1513417672023441409', 'PI-Mass', '2f954d745bf2429fab032271dee7564c', null, '63', '1', 'xuetao.li3.o', '2022-06-21 18:03:47', 'xuetao.li3.o', '2022-06-21 18:12:04', '1', null, null, '0', 'PI-Mass');
INSERT INTO `sys_dict_item` VALUES ('1539187341460004866', '1513417672023441409', 'PI-Drive Quality', '6dc52d5b61674317a48a7ce6f9c69283', null, '62', '1', 'xuetao.li3.o', '2022-06-21 18:03:54', 'xuetao.li3.o', '2022-06-21 18:12:04', '1', null, null, '0', 'PI-Drive Quality');
INSERT INTO `sys_dict_item` VALUES ('1539187372736929794', '1513417672023441409', 'PI-Drive Performance', 'c08c27b86ef844bc8b032e22ba8d2809', null, '61', '1', 'xuetao.li3.o', '2022-06-21 18:04:01', 'xuetao.li3.o', '2022-06-21 18:12:04', '1', null, null, '0', 'PI-Drive Performance');
INSERT INTO `sys_dict_item` VALUES ('1539187401300140033', '1513417672023441409', 'PI', 'ee16ca6612854d59acca594abaeff381', null, '60', '1', 'xuetao.li3.o', '2022-06-21 18:04:08', 'xuetao.li3.o', '2022-06-21 18:12:04', '1', null, null, '0', 'PI');
INSERT INTO `sys_dict_item` VALUES ('1539187450591600641', '1513417672023441409', 'Int.-Trim-P', '61465c677ec34312b6265416201e8700', null, '59', '1', 'xuetao.li3.o', '2022-06-21 18:04:20', 'xuetao.li3.o', '2022-06-21 18:12:04', '1', null, null, '0', 'Int.-Trim-P');
INSERT INTO `sys_dict_item` VALUES ('1539187481084190721', '1513417672023441409', 'Int.-Trim', '5af014ee071b49d6b11765b9b637b398', null, '58', '1', 'xuetao.li3.o', '2022-06-21 18:04:27', 'xuetao.li3.o', '2022-06-21 18:12:04', '1', null, null, '0', 'Int.-Trim');
INSERT INTO `sys_dict_item` VALUES ('1539187807703031809', '1513417672023441409', 'Int.-Restraint-P', '80b0bf10650d4c02a004324055380668', null, '57', '1', 'xuetao.li3.o', '2022-06-21 18:05:45', 'xuetao.li3.o', '2022-06-21 18:12:04', '1', null, null, '0', 'Int.-Restraint-P');
INSERT INTO `sys_dict_item` VALUES ('1539187836601786369', '1513417672023441409', 'Int.-Restraint', 'f0dc498db77a44f5a4ba0a22f7007bfe', null, '56', '1', 'xuetao.li3.o', '2022-06-21 18:05:52', 'xuetao.li3.o', '2022-06-21 18:12:04', '1', null, null, '0', 'Int.-Restraint');
INSERT INTO `sys_dict_item` VALUES ('1539187907418415105', '1513417672023441409', 'Int.-HVAC-P', '18822db5df72424c9936eb1259a24922', null, '55', '1', 'xuetao.li3.o', '2022-06-21 18:06:09', 'xuetao.li3.o', '2022-06-21 18:12:04', '1', null, null, '0', 'Int.-HVAC-P');
INSERT INTO `sys_dict_item` VALUES ('1539187956873453569', '1513417672023441409', 'Int.-HVAC', 'cbc3473f0ba141a3baba561dfc4d7df2', null, '54', '1', 'xuetao.li3.o', '2022-06-21 18:06:20', 'xuetao.li3.o', '2022-06-21 18:12:04', '1', null, null, '0', 'Int.-HVAC');
INSERT INTO `sys_dict_item` VALUES ('1539187983125602305', '1513417672023441409', 'HOM-P', '8af699da48054a358431917e2013aa7b', null, '53', '1', 'xuetao.li3.o', '2022-06-21 18:06:27', 'xuetao.li3.o', '2022-06-21 18:12:04', '1', null, null, '0', 'HOM-P');
INSERT INTO `sys_dict_item` VALUES ('1539188011785281537', '1513417672023441409', 'HOM', 'c37fece8534346809a5634148c1a59b0', null, '52', '1', 'xuetao.li3.o', '2022-06-21 18:06:33', 'xuetao.li3.o', '2022-06-21 18:12:04', '1', null, null, '0', 'HOM');
INSERT INTO `sys_dict_item` VALUES ('1539188061441646594', '1513417672023441409', 'Env.-P', '0c66290d521f4e6b860d9089e4140f96', null, '51', '1', 'xuetao.li3.o', '2022-06-21 18:06:45', 'xuetao.li3.o', '2022-06-21 18:12:04', '1', null, null, '0', 'Env.-P');
INSERT INTO `sys_dict_item` VALUES ('1539188087232421890', '1513417672023441409', 'Env.', '82e044a6009d4b41b68f46faccbac1bb', null, '50', '1', 'xuetao.li3.o', '2022-06-21 18:06:51', 'xuetao.li3.o', '2022-06-21 18:12:04', '1', null, null, '0', 'Env.');
INSERT INTO `sys_dict_item` VALUES ('1539188111450333185', '1513417672023441409', 'EEL-P', '623007a9147c4180bfe7e891616575d9', null, '49', '1', 'xuetao.li3.o', '2022-06-21 18:06:57', 'xuetao.li3.o', '2022-06-21 18:12:04', '1', null, null, '0', 'EEL-P');
INSERT INTO `sys_dict_item` VALUES ('1539188134594502657', '1513417672023441409', 'EEL', '23bffadb21134416b1a073d64eafbe0f', null, '48', '1', 'xuetao.li3.o', '2022-06-21 18:07:03', 'xuetao.li3.o', '2022-06-21 18:12:04', '1', null, null, '0', 'EEL');
INSERT INTO `sys_dict_item` VALUES ('1539188159697412097', '1513417672023441409', 'EEI', 'e4fce392bb6240d495460943a9076273', null, '47', '1', 'xuetao.li3.o', '2022-06-21 18:07:09', 'xuetao.li3.o', '2022-06-21 18:12:04', '1', null, null, '0', 'EEI');
INSERT INTO `sys_dict_item` VALUES ('1539188185739845633', '1513417672023441409', 'EED-P', 'fca8d0b319084c25ad9859005eb0be3b', null, '46', '1', 'xuetao.li3.o', '2022-06-21 18:07:15', 'xuetao.li3.o', '2022-06-21 18:12:04', '1', null, null, '0', 'EED-P');
INSERT INTO `sys_dict_item` VALUES ('1539188213950734337', '1513417672023441409', 'EED', 'f2e2a11992c34b4eae641188ec16ecda', null, '45', '1', 'xuetao.li3.o', '2022-06-21 18:07:22', 'xuetao.li3.o', '2022-06-21 18:12:04', '1', null, null, '0', 'EED');
INSERT INTO `sys_dict_item` VALUES ('1539188235765309441', '1513417672023441409', 'EEB-P', '7cea41b9d72b4fc1be1ccace86008d0c', null, '44', '1', 'xuetao.li3.o', '2022-06-21 18:07:27', 'xuetao.li3.o', '2022-06-21 18:12:04', '1', null, null, '0', 'EEB-P');
INSERT INTO `sys_dict_item` VALUES ('1539188256933961730', '1513417672023441409', 'EEB', '61c7f6b4204d4116832f08093cb4f726', null, '43', '1', 'xuetao.li3.o', '2022-06-21 18:07:32', 'xuetao.li3.o', '2022-06-21 18:12:04', '1', null, null, '0', 'EEB');
INSERT INTO `sys_dict_item` VALUES ('1539188281307062274', '1513417672023441409', 'EDS-P', '5ccbe701cba04806a903563625c79474', null, '42', '1', 'xuetao.li3.o', '2022-06-21 18:07:38', 'xuetao.li3.o', '2022-06-21 18:12:04', '1', null, null, '0', 'EDS-P');
INSERT INTO `sys_dict_item` VALUES ('1539188338794192897', '1513417672023441409', 'DS-Data Security', '3e33da3590314adc82721a3d719965fc', null, '41', '1', 'xuetao.li3.o', '2022-06-21 18:07:51', 'xuetao.li3.o', '2022-06-21 18:12:04', '1', null, null, '0', 'DS-Data Security');
INSERT INTO `sys_dict_item` VALUES ('1539188363423145986', '1513417672023441409', 'DS-Cyber Security', '4a56be27ef1943d49a7a66aa87bbb7d8', null, '40', '1', 'xuetao.li3.o', '2022-06-21 18:07:57', 'xuetao.li3.o', '2022-06-21 18:12:04', '1', null, null, '0', 'DS-Cyber Security');
INSERT INTO `sys_dict_item` VALUES ('1539188385183195138', '1513417672023441409', 'DS-CVS-OTA', '57f245183e444fc882337371a5a9cc85', null, '39', '1', 'xuetao.li3.o', '2022-06-21 18:08:02', 'xuetao.li3.o', '2022-06-21 18:12:04', '1', null, null, '0', 'DS-CVS-OTA');
INSERT INTO `sys_dict_item` VALUES ('1539188407106822145', '1513417672023441409', 'DPD-EVM', 'a6ec2645891d433fa5a405afdf81624b', null, '38', '1', 'xuetao.li3.o', '2022-06-21 18:08:08', 'xuetao.li3.o', '2022-06-21 18:12:04', '1', null, null, '0', 'DPD-EVM');
INSERT INTO `sys_dict_item` VALUES ('1539188431182127105', '1513417672023441409', 'DPD-eCall', '36e16bb6cb904e44a9a2739be1d7654b', null, '37', '1', 'xuetao.li3.o', '2022-06-21 18:08:13', 'xuetao.li3.o', '2022-06-21 18:12:04', '1', null, null, '0', 'DPD-eCall');
INSERT INTO `sys_dict_item` VALUES ('1539188454204661761', '1513417672023441409', 'DEI-P', '7170197fa9f043ceb806a01b8811127e', null, '36', '1', 'xuetao.li3.o', '2022-06-21 18:08:19', 'xuetao.li3.o', '2022-06-21 18:12:04', '1', null, null, '0', 'DEI-P');
INSERT INTO `sys_dict_item` VALUES ('1539188486270115841', '1513417672023441409', 'DEI-EMC', '8666a5494f7e470f92771e9a0b0505e3', null, '35', '1', 'xuetao.li3.o', '2022-06-21 18:08:27', 'xuetao.li3.o', '2022-06-21 18:12:04', '1', null, null, '0', 'DEI-EMC');
INSERT INTO `sys_dict_item` VALUES ('1539188508533481474', '1513417672023441409', 'DD-ICV SIM Card', 'aabaade83f674c85be3761b219da4b95', null, '34', '1', 'xuetao.li3.o', '2022-06-21 18:08:32', 'xuetao.li3.o', '2022-06-21 18:12:04', '1', null, null, '0', 'DD-ICV SIM Card');
INSERT INTO `sys_dict_item` VALUES ('1539188536501100545', '1513417672023441409', 'DD-eCoC', '5be9bdf7f5064d96800afa433c9bb2ae', null, '33', '1', 'xuetao.li3.o', '2022-06-21 18:08:39', 'xuetao.li3.o', '2022-06-21 18:12:04', '1', null, null, '0', 'DD-eCoC');
INSERT INTO `sys_dict_item` VALUES ('1539188558219206658', '1513417672023441409', 'DC-Symbol\\IC', '64437af387e142c3a23b6cb26acfd7ae', null, '32', '1', 'xuetao.li3.o', '2022-06-21 18:08:44', 'xuetao.li3.o', '2022-06-21 18:12:04', '1', null, null, '0', 'DC-Symbol\\IC');
INSERT INTO `sys_dict_item` VALUES ('1539188583246618625', '1513417672023441409', 'DC-Speedometer\\Reversing Detection', '1749ecb2fb5f4a8d9e5935baaea5a4fc', null, '31', '1', 'xuetao.li3.o', '2022-06-21 18:08:50', 'xuetao.li3.o', '2022-06-21 18:12:04', '1', null, null, '0', 'DC-Speedometer\\Reversing Detection');
INSERT INTO `sys_dict_item` VALUES ('1539188609695899650', '1513417672023441409', 'DC-P', '8f65cd9399dd4150a5d36a6000fc13dc', null, '30', '1', 'xuetao.li3.o', '2022-06-21 18:08:56', 'xuetao.li3.o', '2022-06-21 18:12:04', '1', null, null, '0', 'DC-P');
INSERT INTO `sys_dict_item` VALUES ('1539188631615332354', '1513417672023441409', 'DC-DAB', 'b5c1243928154d20845753cadf97aab7', null, '29', '1', 'xuetao.li3.o', '2022-06-21 18:09:01', 'xuetao.li3.o', '2022-06-21 18:12:04', '1', null, null, '0', 'DC-DAB');
INSERT INTO `sys_dict_item` VALUES ('1539188659121577986', '1513417672023441409', 'DC-CDC\\ICS (sw)', '3062e5dbb59748c7b1f657ba05d4c4ed', null, '28', '1', 'xuetao.li3.o', '2022-06-21 18:09:08', 'xuetao.li3.o', '2022-06-21 18:12:04', '1', null, null, '0', 'DC-CDC\\ICS (sw)');
INSERT INTO `sys_dict_item` VALUES ('1539188710854123522', '1513417672023441409', 'DA-P', 'd8585f3bbd39445c95647799381c57ec', null, '27', '1', 'xuetao.li3.o', '2022-06-21 18:09:20', 'xuetao.li3.o', '2022-06-21 18:12:04', '1', null, null, '0', 'DA-P');
INSERT INTO `sys_dict_item` VALUES ('1539188737756389378', '1513417672023441409', 'DA-OBD', 'a4d8aa9031f449069b94654ee246c81e', null, '26', '1', 'xuetao.li3.o', '2022-06-21 18:09:26', 'xuetao.li3.o', '2022-06-21 18:12:04', '1', null, null, '0', 'DA-OBD');
INSERT INTO `sys_dict_item` VALUES ('1539188763131928578', '1513417672023441409', 'DA-IMMO', '4ac9f7cb38394b57916f449c16e5d1c9', null, '25', '1', 'xuetao.li3.o', '2022-06-21 18:09:33', 'xuetao.li3.o', '2022-06-21 18:12:04', '1', null, null, '0', 'DA-IMMO');
INSERT INTO `sys_dict_item` VALUES ('1539188789031755778', '1513417672023441409', 'DA-DSSAD', '8884e5900bb043ee87cbe17c3ee1ef10', null, '24', '1', 'xuetao.li3.o', '2022-06-21 18:09:39', 'xuetao.li3.o', '2022-06-21 18:12:04', '1', null, null, '0', 'DA-DSSAD');
INSERT INTO `sys_dict_item` VALUES ('1539188815283904513', '1513417672023441409', 'DA-Alcohol lock', '988948c0959449c9a379dbe75c7941f1', null, '23', '1', 'xuetao.li3.o', '2022-06-21 18:09:45', 'xuetao.li3.o', '2022-06-21 18:12:04', '1', null, null, '0', 'DA-Alcohol lock');
INSERT INTO `sys_dict_item` VALUES ('1539188868207632385', '1513417672023441409', 'CHS-Wheels & Tools', '1de06d97e8894f36bc86cd52ba20ca82', null, '22', '1', 'xuetao.li3.o', '2022-06-21 18:09:58', 'xuetao.li3.o', '2022-06-21 18:12:04', '1', null, null, '0', 'CHS-Wheels & Tools');
INSERT INTO `sys_dict_item` VALUES ('1539188897207050241', '1513417672023441409', 'CHS-Suspension', '2bdb778a294e41239a8fc15a4d04ca0c', null, '21', '1', 'xuetao.li3.o', '2022-06-21 18:10:04', 'xuetao.li3.o', '2022-06-21 18:12:04', '1', null, null, '0', 'CHS-Suspension');
INSERT INTO `sys_dict_item` VALUES ('1539188918711246850', '1513417672023441409', 'CHS-Steering', '473b2ea5a58445a0beaffc65ca317caf', null, '20', '1', 'xuetao.li3.o', '2022-06-21 18:10:10', 'xuetao.li3.o', '2022-06-21 18:12:04', '1', null, null, '0', 'CHS-Steering');
INSERT INTO `sys_dict_item` VALUES ('1539188943407308802', '1513417672023441409', 'CHS-P', 'd5206f0077bc4006bb9de38982ce8600', null, '19', '1', 'xuetao.li3.o', '2022-06-21 18:10:16', 'xuetao.li3.o', '2022-06-21 18:12:04', '1', null, null, '0', 'CHS-P');
INSERT INTO `sys_dict_item` VALUES ('1539188967344201729', '1513417672023441409', 'CHS-Braking', '8ee3be2bcee746b186338704d71a8795', null, '18', '1', 'xuetao.li3.o', '2022-06-21 18:10:21', 'xuetao.li3.o', '2022-06-21 18:12:04', '1', null, null, '0', 'CHS-Braking');
INSERT INTO `sys_dict_item` VALUES ('1539188988617711618', '1513417672023441409', 'CHS', 'f9b8b43c72674516bee7fa3c6256cc3e', null, '17', '1', 'xuetao.li3.o', '2022-06-21 18:10:26', 'xuetao.li3.o', '2022-06-21 18:12:04', '1', null, null, '0', 'CHS');
INSERT INTO `sys_dict_item` VALUES ('1539189010402926594', '1513417672023441409', 'BS-P', '24a0bdf256ff4a2aad5d37951de501c0', null, '16', '1', 'xuetao.li3.o', '2022-06-21 18:10:31', 'xuetao.li3.o', '2022-06-21 18:12:04', '1', null, null, '0', 'BS-P');
INSERT INTO `sys_dict_item` VALUES ('1539189054426341377', '1513417672023441409', 'B&E-EXT-P', 'db090e78a1ba4222b1aeb6fae1b3fd9b', null, '15', '1', 'xuetao.li3.o', '2022-06-21 18:10:42', 'xuetao.li3.o', '2022-06-21 18:12:04', '1', null, null, '0', 'B&E-EXT-P');
INSERT INTO `sys_dict_item` VALUES ('1539189081186000898', '1513417672023441409', 'B&E-EXT', 'f1fea4b47dd44ace99c070705695efae', null, '14', '1', 'xuetao.li3.o', '2022-06-21 18:10:48', 'xuetao.li3.o', '2022-06-21 18:12:04', '1', null, null, '0', 'B&E-EXT');
INSERT INTO `sys_dict_item` VALUES ('1539189103541641217', '1513417672023441409', 'B&E-Body-P', '644541473ade45b1966fb5e5aaa4f16b', null, '13', '1', 'xuetao.li3.o', '2022-06-21 18:10:54', 'xuetao.li3.o', '2022-06-21 18:12:04', '1', null, null, '0', 'B&E-Body-P');
INSERT INTO `sys_dict_item` VALUES ('1539189125117140993', '1513417672023441409', 'B&E-Body', '910672c9e70648c4b3d78faa02e0a2d6', null, '12', '1', 'xuetao.li3.o', '2022-06-21 18:10:59', 'xuetao.li3.o', '2022-06-21 18:12:04', '1', null, null, '0', 'B&E-Body');
INSERT INTO `sys_dict_item` VALUES ('1539189147560861698', '1513417672023441409', 'B&E-BMC-P', '1841d387beef43d996cbe937e2c743d2', null, '11', '1', 'xuetao.li3.o', '2022-06-21 18:11:04', 'xuetao.li3.o', '2022-06-21 18:12:04', '1', null, null, '0', 'B&E-BMC-P');
INSERT INTO `sys_dict_item` VALUES ('1539189167978733569', '1513417672023441409', 'B&E-BMC', 'b64cb6a2d0714fd3babcdf541a7ab9c3', null, '10', '1', 'xuetao.li3.o', '2022-06-21 18:11:09', 'xuetao.li3.o', '2022-06-21 18:12:04', '1', null, null, '0', 'B&E-BMC');
INSERT INTO `sys_dict_item` VALUES ('1539189197762486274', '1513417672023441409', 'B&E-BDC-P', 'b8e06682aa304ea98846181ab6cef88b', null, '9', '1', 'xuetao.li3.o', '2022-06-21 18:11:16', 'xuetao.li3.o', '2022-06-21 18:12:04', '1', null, null, '0', 'B&E-BDC-P');
INSERT INTO `sys_dict_item` VALUES ('1539189219669336066', '1513417672023441409', 'B&E-BDC', '7587a6bdeab64250a23b247da10fefd8', null, '8', '1', 'xuetao.li3.o', '2022-06-21 18:11:21', 'xuetao.li3.o', '2022-06-21 18:12:04', '1', null, null, '0', 'B&E-BDC');
INSERT INTO `sys_dict_item` VALUES ('1539189242385686530', '1513417672023441409', 'ATT-Sealing', '3f90045fea0548a6a46dc66de44a186c', null, '7', '1', 'xuetao.li3.o', '2022-06-21 18:11:27', 'xuetao.li3.o', '2022-06-21 18:12:04', '1', null, null, '0', 'ATT-Sealing');
INSERT INTO `sys_dict_item` VALUES ('1539189267509567489', '1513417672023441409', 'ATT-SAF-P', '58099cb2190447b98332b54d485acd7d', null, '6', '1', 'xuetao.li3.o', '2022-06-21 18:11:33', 'xuetao.li3.o', '2022-06-21 18:12:04', '1', null, null, '0', 'ATT-SAF-P');
INSERT INTO `sys_dict_item` VALUES ('1539189290800537601', '1513417672023441409', 'ATT-SAF', '64895cc3bd7749459f4f93a1bc3a7b7f', null, '5', '1', 'xuetao.li3.o', '2022-06-21 18:11:38', 'xuetao.li3.o', '2022-06-21 18:12:04', '1', null, null, '0', 'ATT-SAF');
INSERT INTO `sys_dict_item` VALUES ('1539189312841605121', '1513417672023441409', 'ATT-NVH', '94d3e51c08354d60ae901a3f35d708fe', null, '4', '1', 'xuetao.li3.o', '2022-06-21 18:11:44', 'xuetao.li3.o', '2022-06-21 18:12:04', '1', null, null, '0', 'ATT-NVH');
INSERT INTO `sys_dict_item` VALUES ('1539189334131892225', '1513417672023441409', 'ATT-Durability', '7806805aebe34d3289b4df66afb44136', null, '3', '1', 'xuetao.li3.o', '2022-06-21 18:11:49', 'xuetao.li3.o', '2022-06-21 18:12:04', '1', null, null, '0', 'ATT-Durability');
INSERT INTO `sys_dict_item` VALUES ('1539189358475632641', '1513417672023441409', 'ADAS-P', 'fcaf7aed728e4d6fa0511cc4f169c99b', null, '2', '1', 'xuetao.li3.o', '2022-06-21 18:11:54', 'xuetao.li3.o', '2022-06-21 18:12:04', '1', null, null, '0', 'ADAS-P');
INSERT INTO `sys_dict_item` VALUES ('222705e11ef0264d4214affff1fb4ff9', '4f69be5f507accea8d5df5f11346181a', '短信', '1', '', '1', '1', 'admin', '2023-02-28 10:50:36', 'admin', '2019-04-28 10:58:11', null, null, null, '0', null);
INSERT INTO `sys_dict_item` VALUES ('23a5bb76004ed0e39414e928c4cde155', '4e4602b3e3686f0911384e188dc7efb4', '不等于', '!=', '不等于', '3', '1', 'admin', '2019-04-01 16:46:15', 'admin', '2019-04-01 17:48:40', null, null, null, '0', null);
INSERT INTO `sys_dict_item` VALUES ('25847e9cb661a7c711f9998452dc09e6', '4e4602b3e3686f0911384e188dc7efb4', '小于等于', '<=', '小于等于', '6', '1', 'admin', '2019-04-01 16:44:34', 'admin', '2019-04-01 17:49:10', null, null, null, '0', null);
@@ -139072,7 +139146,7 @@ INSERT INTO `sys_user_role` VALUES ('1536745865434308609', '29954', '15340203184
INSERT INTO `sys_user_role` VALUES ('1536749413584805890', '29955', '1534020318437208065');
INSERT INTO `sys_user_role` VALUES ('1536740514332876802', '29956', '1534020318437208065');
INSERT INTO `sys_user_role` VALUES ('1536747660890021889', '29957', '1534020318437208065');
INSERT INTO `sys_user_role` VALUES ('1536751719172743169', '29958', '1534020318437208065');
INSERT INTO `sys_user_role` VALUES ('1536751719172743169', '29958', 'f6817f48af4fb3af11b9e8bf182f618b');
INSERT INTO `sys_user_role` VALUES ('1536742876187402241', '29959', '1534020318437208065');
INSERT INTO `sys_user_role` VALUES ('1536739981807263746', '2996', '1534020318437208065');
INSERT INTO `sys_user_role` VALUES ('1536742936916729858', '29960', '1534020318437208065');
@@ -148343,7 +148417,7 @@ INSERT INTO `sys_user_role` VALUES ('1536744851750723585', '39694', '15340203184
INSERT INTO `sys_user_role` VALUES ('1536745744885817345', '39697', '1534020318437208065');
INSERT INTO `sys_user_role` VALUES ('1536744369594507265', '39698', '1534020318437208065');
INSERT INTO `sys_user_role` VALUES ('1536743137727422465', '397', '1534020318437208065');
INSERT INTO `sys_user_role` VALUES ('1536752409995583490', '3970', '1534020318437208065');
INSERT INTO `sys_user_role` VALUES ('1536752409995583490', '3970', 'f6817f48af4fb3af11b9e8bf182f618b');
INSERT INTO `sys_user_role` VALUES ('1536740685988962305', '39700', '1534020318437208065');
INSERT INTO `sys_user_role` VALUES ('1536743954601680898', '39701', '1534020318437208065');
INSERT INTO `sys_user_role` VALUES ('1536742709342183425', '39702', '1534020318437208065');
@@ -154616,7 +154690,7 @@ INSERT INTO `sys_user_role` VALUES ('1536748133957181442', '46362', '15340203184
INSERT INTO `sys_user_role` VALUES ('1536747917312991233', '46363', '1534020318437208065');
INSERT INTO `sys_user_role` VALUES ('1536744339735257089', '46365', '1534020318437208065');
INSERT INTO `sys_user_role` VALUES ('1536740449941921793', '46366', '1534020318437208065');
INSERT INTO `sys_user_role` VALUES ('1537689400182554626', '46367', '1537687400871084034');
INSERT INTO `sys_user_role` VALUES ('1537689400182554626', '46367', 'f6817f48af4fb3af11b9e8bf182f618b');
INSERT INTO `sys_user_role` VALUES ('1536750778038034434', '46368', '1534020318437208065');
INSERT INTO `sys_user_role` VALUES ('1536740624974422017', '4637', '1534020318437208065');
INSERT INTO `sys_user_role` VALUES ('1536743462198779905', '46370', '1534020318437208065');
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/service/impl/BussDocumentLibraryEOServiceImpl.java
+4 -5
View File
@@ -272,11 +272,9 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl<BussDocumentLi
}
//文档动态-------------------
//http://localhost:3000/docManage/library/detail?id=7a10adf4d01248b7a82368c0aed3a03f&wen2_ben3_kuang4=&shu1_ru4_kuang4_lian4_jie1=&serial_number=ceshi20220607&ren2_yuan2_xuan3_ze2=&biao1_zhun3_xuan3_ze2=&title=ceshi20220607&e_e_e=&title_en=ceshi20220607&state=%E7%8E%B0%E8%A1%8C&region=&issue_time=2022-06-07&technology_territory=&shu4_zi4_shu1_ru4_kuang4=&collectFlag=0&subscribeFlag=0
String hrefTemp =category + " " + "<a href='/docManage/library/detail?id=" + id +
"&title=" + title +
"&serial_number=" + serialNumber + "'" + " target='_blank'>" + serialNumber + "</a>" + " " + titleEn + ",";
HomeDocumentDynamicEO homeDocumentDynamicEO = new HomeDocumentDynamicEO();
sbTemp.append(hrefTemp);
serialNumberListTemp.add(category + " " + serialNumber + " " + titleEn);
//---------------------------
@@ -296,7 +294,7 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl<BussDocumentLi
String msgContent = "The " + StringUtils.join(serialNumberListTemp,",") + " has been deleted from the document library.";
String msgContentInfo = "The " + substring + " has been deleted from the document library.";
homeDocumentDynamicEO.setMsgContent(msgContent);
homeDocumentDynamicEO.setMsgContentInfo(msgContentInfo);
homeDocumentDynamicEO.setMsgContentInfo(msgContent);
homeDocumentDynamicEOService.save(homeDocumentDynamicEO);
}
@@ -4777,7 +4775,7 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl<BussDocumentLi
@SneakyThrows
@Override
public void importZip(MultipartFile file,String cut) {
List<String> list = getWorkbookTitle("cn");
List<String> list = getWorkbookTitle(cut);
int pos = file.getOriginalFilename().lastIndexOf(".");
String str = file.getOriginalFilename().substring(pos + 1).toLowerCase();
String filenameorg = file.getOriginalFilename().substring(0, pos);
@@ -4961,7 +4959,7 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl<BussDocumentLi
//普通数据字典
List<SysDictItem> dictItemList = sysDictItemServiceImpl.selectItemsAll();
//表头
List<Map<String, Object>> addForm = getField(ModuleEnum.DOCUMENT_LIBRARY.getValue(), "cn", "add");
List<Map<String, Object>> addForm = getField(ModuleEnum.DOCUMENT_LIBRARY.getValue(), cut, "add");
exportDatas(dataList, addForm, categoryList, dictItemList, zipEntryName,saveDirectory,cut);
//删除原上传文件
FileUnZip.deleteDir(saveDirectory);
@@ -5621,6 +5619,7 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl<BussDocumentLi
fieldListQuery.add("title");
fieldListQuery.add("title_en");
fieldListQuery.add("state");
fieldListQuery.add("region");
fieldListQuery.add("technology_territory");
fieldListQuery.add("xin1_che1_xing2_shi2_shi1_ri4_qi1");
fieldListQuery.add("implement_time");
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/service/impl/DummyInventoryBaseEOServiceImpl.java
+16 -2
View File
@@ -429,10 +429,17 @@ public class DummyInventoryBaseEOServiceImpl extends ServiceImpl<DummyInventoryB
if(CollectionUtils.isNotEmpty(updateLogList)){
List<String> contentLogList = updateLogList.stream().map(e -> e.getLogContent()).collect(Collectors.toList());
for(int i=0 ; i < contentLogList.size() ;i++){
contentLog += "（"+ (i+1) +"）" + contentLogList.get(i) + "</br>";
String content = contentLogList.get(i);
if(StringUtils.isNotBlank(content) && content.endsWith("</br>")){
content = content.substring(0,content.length()-5);
}
contentLog += "（"+ (i+1) +"）" + content + "</br>";
}
}
}
if(StringUtils.isNotBlank(contentLog) && contentLog.endsWith("</br>")){
contentLog = contentLog.substring(0,contentLog.length()-5);
}
//列表,维护清单不同的字段,addSerialNumber,deleteSerialNumber都为空->证明是没有更新的数据,不发送消息,数据不处理
if(MapUtils.isNotEmpty(baseDiff) || StringUtils.isNotEmpty(contentLog)) {
@@ -481,7 +488,14 @@ public class DummyInventoryBaseEOServiceImpl extends ServiceImpl<DummyInventoryB
List<String> contentLogList = updateLogList.stream().map(e -> e.getLogContent()).collect(Collectors.toList());
for(int i=0 ; i < contentLogList.size() ;i++){
contentLog += "（"+ (i+1) +"）" + contentLogList.get(i) + "</br>";
String content = contentLogList.get(i);
if(StringUtils.isNotBlank(content) && content.endsWith("</br>")){
content = content.substring(0,content.length()-5);
}
contentLog += "（"+ (i+1) +"）" + content + "</br>";
}
if(StringUtils.isNotBlank(contentLog) && contentLog.endsWith("</br>")){
contentLog = contentLog.substring(0,contentLog.length()-5);
}
iDummyContentChangeEOService.saveBatch(list);
sendMsg(null,dummyInventoryInfoEOList.get(0).getDummyInventoryBaseId(),contentLog ,dummyInventoryBaseEO.getState(),dummyInventoryBaseEO.getCut());
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/service/impl/DummyInventoryInfoEOServiceImpl.java
+36 -23
View File
@@ -411,45 +411,52 @@ public class DummyInventoryInfoEOServiceImpl extends ServiceImpl<DummyInventoryI
//实施类别 implementType
if(StringUtils.isNotBlank(dummyInventoryInfoEO.getImplementType())){
dummyInventoryInfoEOTemp.setImplementType(dummyInventoryInfoEO.getImplementType());
}else{
dummyInventoryInfoEOTemp.setImplementType("");
}
// else{
// dummyInventoryInfoEOTemp.setImplementType("");
// }
//认证类型 attestationType
if(StringUtils.isNotBlank(dummyInventoryInfoEO.getAttestationType())){
dummyInventoryInfoEOTemp.setAttestationType(dummyInventoryInfoEO.getAttestationType());
}else{
dummyInventoryInfoEOTemp.setAttestationType("");
}
// else{
// dummyInventoryInfoEOTemp.setAttestationType("");
// }
//认证级别 attestationRank
if(StringUtils.isNotBlank(dummyInventoryInfoEO.getAttestationRank())){
dummyInventoryInfoEOTemp.setAttestationRank(dummyInventoryInfoEO.getAttestationRank());
}else{
dummyInventoryInfoEOTemp.setAttestationRank("");
}
// else{
// dummyInventoryInfoEOTemp.setAttestationRank("");
// }
//责任领域 dutyTerritory
if(StringUtils.isNotBlank(dummyInventoryInfoEO.getDutyTerritory())){
dummyInventoryInfoEOTemp.setDutyTerritory(dummyInventoryInfoEO.getDutyTerritory());
}else{
dummyInventoryInfoEOTemp.setDutyTerritory("");
}
// else{
// dummyInventoryInfoEOTemp.setDutyTerritory("");
// }
//适用范围 shi4Yong4Fan4Wei2
if(StringUtils.isNotBlank(dummyInventoryInfoEO.getShi4Yong4Fan4Wei2())){
dummyInventoryInfoEOTemp.setShi4Yong4Fan4Wei2(dummyInventoryInfoEO.getShi4Yong4Fan4Wei2());
}else{
dummyInventoryInfoEOTemp.setShi4Yong4Fan4Wei2("");
}
// else{
// dummyInventoryInfoEOTemp.setShi4Yong4Fan4Wei2("");
// }
//技术领域 technologyTerritory
if(StringUtils.isNotBlank(dummyInventoryInfoEO.getTechnologyTerritory())){
dummyInventoryInfoEOTemp.setTechnologyTerritory(dummyInventoryInfoEO.getTechnologyTerritory());
}else{
dummyInventoryInfoEOTemp.setTechnologyTerritory("");
}
// else{
// dummyInventoryInfoEOTemp.setTechnologyTerritory("");
// }
//适用地区 region
if(StringUtils.isNotBlank(dummyInventoryInfoEO.getRegion())){
dummyInventoryInfoEOTemp.setRegion(dummyInventoryInfoEO.getRegion());
}else{
dummyInventoryInfoEOTemp.setRegion("");
}
// else{
// dummyInventoryInfoEOTemp.setRegion("");
// }
//新车实施日期
if(ObjectUtils.isNotEmpty(dummyInventoryInfoEO.getXin1Che1Xing2Shi2Shi1Ri4Qi1())){
dummyInventoryInfoEOTemp.setXin1Che1Xing2Shi2Shi1Ri4Qi1(dummyInventoryInfoEO.getXin1Che1Xing2Shi2Shi1Ri4Qi1());
@@ -461,14 +468,14 @@ public class DummyInventoryInfoEOServiceImpl extends ServiceImpl<DummyInventoryI
dummyInventoryInfoEOList.add(dummyInventoryInfoEOTemp);
}
// this.updateBatchById(dummyInventoryInfoEOList);
for (DummyInventoryInfoEO inventoryInfoEO : dummyInventoryInfoEOList) {
LambdaUpdateWrapper<DummyInventoryInfoEO> updateWrapper = new LambdaUpdateWrapper<>();
updateWrapper.in(DummyInventoryInfoEO::getId,inventoryInfoEO.getId());
setDateNull(inventoryInfoEO, updateWrapper);
//保存
this.update(inventoryInfoEO,updateWrapper);
}
this.updateBatchById(dummyInventoryInfoEOList);
// for (DummyInventoryInfoEO inventoryInfoEO : dummyInventoryInfoEOList) {
// LambdaUpdateWrapper<DummyInventoryInfoEO> updateWrapper = new LambdaUpdateWrapper<>();
// updateWrapper.in(DummyInventoryInfoEO::getId,inventoryInfoEO.getId());
// setDateNull(inventoryInfoEO, updateWrapper);
// //保存
// this.update(inventoryInfoEO,updateWrapper);
// }
//更新log
LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
@@ -1836,8 +1843,14 @@ public class DummyInventoryInfoEOServiceImpl extends ServiceImpl<DummyInventoryI
fileTemp.mkdirs();
//文件
exportFile(dataList,fileInfos);
String excelName = "";
if(CutEnum.CN.getValue().equals(dummyInventoryInfoEO.getCut())){
excelName = "虚拟清单.xlsx";
}else{
excelName = "Virtual list.xlsx";
}
//excel
OutputStream excelOS = new FileOutputStream(path + File.separator + "虚拟清单.xlsx");
OutputStream excelOS = new FileOutputStream(path + File.separator + excelName);
ExportParams exportParams = new ExportParams();
exportParams.setType(ExcelType.XSSF);
if(CutEnum.CN.getValue().equals(dummyInventoryInfoEO.getCut())){
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/job/InventoryAffirmJob.java
+9
View File
@@ -4,12 +4,14 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.jero.modules.project.entity.ProjectLawsInventoryEO;
import com.jero.modules.project.entity.ProjectLibraryBase;
import com.jero.modules.project.entity.ProjectNameInfoEO;
import com.jero.modules.project.entity.ProjectYearNameInfoEO;
import com.jero.modules.project.enums.InventoryAffirmStatusEnum;
import com.jero.modules.project.enums.JumpLinkEnum;
import com.jero.modules.project.enums.SendMsgFlagEnum;
import com.jero.modules.project.mapper.ProjectLawsInventoryEOMapper;
import com.jero.modules.project.mapper.ProjectLibraryBaseMapper;
import com.jero.modules.project.mapper.ProjectNameInfoEOMapper;
import com.jero.modules.project.mapper.ProjectYearNameInfoEOMapper;
import com.jero.modules.project.service.IProjectLawsInventoryEOService;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.collections4.CollectionUtils;
@@ -42,6 +44,9 @@ public class InventoryAffirmJob implements Job {
@Autowired
private ProjectNameInfoEOMapper projectNameInfoEOMapper;
@Autowired
private ProjectYearNameInfoEOMapper projectYearNameInfoEOMapper;
@Value(value = "${jero.backUrl}")
private String backUrl;
@@ -85,6 +90,10 @@ public class InventoryAffirmJob implements Job {
projectNameInfoEOQueryWrapper.lambda().eq(ProjectNameInfoEO::getId,projectLibraryBase.getProjectNameId());
ProjectNameInfoEO projectNameInfoEO = projectNameInfoEOMapper.selectOne(projectNameInfoEOQueryWrapper);
QueryWrapper<ProjectYearNameInfoEO> projectYearInfoEOQueryWrapper = new QueryWrapper<>();
projectYearInfoEOQueryWrapper.lambda().eq(ProjectYearNameInfoEO::getId,projectLibraryBase.getYearNameId());
ProjectYearNameInfoEO projectYearNameInfoEO = projectYearNameInfoEOMapper.selectOne(projectYearInfoEOQueryWrapper);
List<String> threeDaysUserIdList = new ArrayList<>();
List<String> currentDaysUserIdList = new ArrayList<>();
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/job/PrehomoJob.java
+9 -4
View File
@@ -1,16 +1,14 @@
package com.jero.modules.project.job;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.jero.modules.project.entity.ProjectLawsInventoryEO;
import com.jero.modules.project.entity.ProjectLibraryBase;
import com.jero.modules.project.entity.ProjectNameInfoEO;
import com.jero.modules.project.entity.ProjectTaskInventoryEO;
import com.jero.modules.project.entity.*;
import com.jero.modules.project.enums.DesignComplianceStatusEnum;
import com.jero.modules.project.enums.JumpLinkEnum;
import com.jero.modules.project.enums.SendMsgFlagEnum;
import com.jero.modules.project.mapper.ProjectLawsInventoryEOMapper;
import com.jero.modules.project.mapper.ProjectLibraryBaseMapper;
import com.jero.modules.project.mapper.ProjectNameInfoEOMapper;
import com.jero.modules.project.mapper.ProjectYearNameInfoEOMapper;
import com.jero.modules.project.service.IProjectLawsInventoryEOService;
import com.jero.modules.project.service.IProjectTaskInventoryEOService;
import lombok.extern.slf4j.Slf4j;
@@ -43,6 +41,9 @@ public class PrehomoJob implements Job {
@Autowired
private ProjectNameInfoEOMapper projectNameInfoEOMapper;
@Autowired
private ProjectYearNameInfoEOMapper projectYearNameInfoEOMapper;
@Autowired
private IProjectTaskInventoryEOService projectTaskInventoryEOService;
@@ -91,6 +92,10 @@ public class PrehomoJob implements Job {
projectNameInfoEOQueryWrapper.lambda().eq(ProjectNameInfoEO::getId,projectLibraryBase.getProjectNameId());
ProjectNameInfoEO projectNameInfoEO = projectNameInfoEOMapper.selectOne(projectNameInfoEOQueryWrapper);
QueryWrapper<ProjectYearNameInfoEO> projectYearInfoEOQueryWrapper = new QueryWrapper<>();
projectYearInfoEOQueryWrapper.lambda().eq(ProjectYearNameInfoEO::getId,projectLibraryBase.getYearNameId());
ProjectYearNameInfoEO projectYearNameInfoEO = projectYearNameInfoEOMapper.selectOne(projectYearInfoEOQueryWrapper);
for (ProjectLawsInventoryEO projectLawsInventoryEO: projectLawsInventoryEOList) {
List<String> threeDaysUserIdList = new ArrayList<>();
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/job/VerifyComplianceJob.java
+8 -4
View File
@@ -1,16 +1,14 @@
package com.jero.modules.project.job;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.jero.modules.project.entity.ProjectLawsInventoryEO;
import com.jero.modules.project.entity.ProjectLibraryBase;
import com.jero.modules.project.entity.ProjectNameInfoEO;
import com.jero.modules.project.entity.ProjectTaskInventoryEO;
import com.jero.modules.project.entity.*;
import com.jero.modules.project.enums.DesignComplianceStatusEnum;
import com.jero.modules.project.enums.JumpLinkEnum;
import com.jero.modules.project.enums.SendMsgFlagEnum;
import com.jero.modules.project.mapper.ProjectLawsInventoryEOMapper;
import com.jero.modules.project.mapper.ProjectLibraryBaseMapper;
import com.jero.modules.project.mapper.ProjectNameInfoEOMapper;
import com.jero.modules.project.mapper.ProjectYearNameInfoEOMapper;
import com.jero.modules.project.service.IProjectLawsInventoryEOService;
import com.jero.modules.project.service.IProjectTaskInventoryEOService;
import lombok.extern.slf4j.Slf4j;
@@ -43,6 +41,9 @@ public class VerifyComplianceJob implements Job {
@Autowired
private ProjectNameInfoEOMapper projectNameInfoEOMapper;
@Autowired
private ProjectYearNameInfoEOMapper projectYearNameInfoEOMapper;
@Autowired
private IProjectTaskInventoryEOService projectTaskInventoryEOService;
@@ -90,6 +91,9 @@ public class VerifyComplianceJob implements Job {
projectNameInfoEOQueryWrapper.lambda().eq(ProjectNameInfoEO::getId,projectLibraryBase.getProjectNameId());
ProjectNameInfoEO projectNameInfoEO = projectNameInfoEOMapper.selectOne(projectNameInfoEOQueryWrapper);
QueryWrapper<ProjectYearNameInfoEO> projectYearInfoEOQueryWrapper = new QueryWrapper<>();
projectYearInfoEOQueryWrapper.lambda().eq(ProjectYearNameInfoEO::getId,projectLibraryBase.getYearNameId());
ProjectYearNameInfoEO projectYearNameInfoEO = projectYearNameInfoEOMapper.selectOne(projectYearInfoEOQueryWrapper);
for (ProjectLawsInventoryEO projectLawsInventoryEO: projectLawsInventoryEOList) {
List<String> threeDaysUserIdList = new ArrayList<>();
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/job/designComplianceJob.java
+8 -6
View File
@@ -8,6 +8,7 @@ import com.jero.modules.project.enums.SendMsgFlagEnum;
import com.jero.modules.project.mapper.ProjectLawsInventoryEOMapper;
import com.jero.modules.project.mapper.ProjectLibraryBaseMapper;
import com.jero.modules.project.mapper.ProjectNameInfoEOMapper;
import com.jero.modules.project.mapper.ProjectYearNameInfoEOMapper;
import com.jero.modules.project.service.IProjectLawsInventoryEOService;
import com.jero.modules.project.service.IProjectTaskInventoryEOService;
import lombok.extern.slf4j.Slf4j;
@@ -40,6 +41,9 @@ public class designComplianceJob implements Job {
@Autowired
private ProjectNameInfoEOMapper projectNameInfoEOMapper;
@Autowired
private ProjectYearNameInfoEOMapper projectYearNameInfoEOMapper;
@Autowired
private IProjectTaskInventoryEOService projectTaskInventoryEOService;
@@ -87,6 +91,9 @@ public class designComplianceJob implements Job {
projectNameInfoEOQueryWrapper.lambda().eq(ProjectNameInfoEO::getId,projectLibraryBase.getProjectNameId());
ProjectNameInfoEO projectNameInfoEO = projectNameInfoEOMapper.selectOne(projectNameInfoEOQueryWrapper);
QueryWrapper<ProjectYearNameInfoEO> projectYearInfoEOQueryWrapper = new QueryWrapper<>();
projectYearInfoEOQueryWrapper.lambda().eq(ProjectYearNameInfoEO::getId,projectLibraryBase.getYearNameId());
ProjectYearNameInfoEO projectYearNameInfoEO = projectYearNameInfoEOMapper.selectOne(projectYearInfoEOQueryWrapper);
for (ProjectLawsInventoryEO projectLawsInventoryEO: projectLawsInventoryEOList) {
List<String> threeDaysUserIdList = new ArrayList<>();
@@ -133,15 +140,10 @@ public class designComplianceJob implements Job {
+ " are 3 days. Please check and address it in a timely manner.";
//飞书跳转链接
String hrefFeishu = backUrl
+ JumpLinkEnum.DESIGN_AFFIRM_LINK.getLink()
+ projectLibraryBase.getId()
+ JumpLinkEnum.DESIGN_AFFIRM_LINK.getType()
+ "&projectName=" + projectNameInfoEO.getProjectName();
String hrefFeishu = backUrl + JumpLinkEnum.DESIGN_AFFIRM_LINK.getLink() + projectLibraryBase.getId() + JumpLinkEnum.DESIGN_AFFIRM_LINK.getType();
//系统内部跳转链接
String href = "<a href='"
+ JumpLinkEnum.DESIGN_AFFIRM_LINK.getLink() + projectLibraryBase.getId() + JumpLinkEnum.DESIGN_AFFIRM_LINK.getType()
+ "&projectName=" + projectNameInfoEO.getProjectName()
+ "'>" + "Jump link" + "</a>";
String contentInfo = msgContentEN + " " + href;
Map<String,Object> sendMessageMap = new HashMap<>();
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectCommentEOServiceImpl.java
+5 -1
View File
@@ -9,6 +9,7 @@ import com.jero.modules.project.mapper.ProjectCommentEOMapper;
import com.jero.modules.project.service.IProjectCommentEOService;
import com.jero.modules.project.service.IProjectReplyEOService;
import com.jero.modules.project.vo.ProjectCommentVO;
import com.jero.modules.system.util.StringUtils;
import org.apache.shiro.SecurityUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@@ -107,7 +108,10 @@ public class ProjectCommentEOServiceImpl extends ServiceImpl<ProjectCommentEOMap
public List<ProjectCommentVO> getInfoList(ProjectCommentEO projectCommentEOTemp) {
LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
LambdaQueryWrapper<ProjectCommentEO> wrapper = new LambdaQueryWrapper<>();
if(StringUtils.isNotBlank(projectCommentEOTemp.getCommentContent())){
String replace = projectCommentEOTemp.getCommentContent().replaceAll("\\*", "");
wrapper.like(ProjectCommentEO::getCommentContent,replace);
}
//验证当前用户在该项目中是什么角色
int isProjectRole = projectLawsInventoryEOService.checkUserRole(projectCommentEOTemp.getProjectLibraryId(), sysUser.getId(), "");
if(!ProjectRoleEnum.STUDIO_ENGINEER.getValue().equals(String.valueOf(isProjectRole))){
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java
+12 -4
View File
@@ -40,10 +40,7 @@ import com.jero.modules.oss.entity.OSSFile;
import com.jero.modules.oss.service.IOSSFileService;
import com.jero.modules.project.entity.*;
import com.jero.modules.project.enums.*;
import com.jero.modules.project.mapper.ProjectLawsInventoryEOMapper;
import com.jero.modules.project.mapper.ProjectLibraryBaseMapper;
import com.jero.modules.project.mapper.ProjectNameInfoEOMapper;
import com.jero.modules.project.mapper.ProjectRelatedPersonnelMapper;
import com.jero.modules.project.mapper.*;
import com.jero.modules.project.service.*;
import com.jero.modules.project.util.WordUtil;
import com.jero.modules.split.common.FileUnZip;
@@ -153,6 +150,9 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
@Autowired
private ProjectNameInfoEOMapper projectNameInfoEOMapper;
@Autowired
private ProjectYearNameInfoEOMapper projectYearNameInfoEOMapper;
@Autowired
private IProjectTaskInventoryEOService projectTaskInventoryEOService;
@@ -1097,6 +1097,10 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
projectNameInfoEOQueryWrapper.lambda().eq(ProjectNameInfoEO::getId,projectLibraryBase.getProjectNameId());
ProjectNameInfoEO projectNameInfoEO = projectNameInfoEOMapper.selectOne(projectNameInfoEOQueryWrapper);
QueryWrapper<ProjectYearNameInfoEO> projectYearInfoEOQueryWrapper = new QueryWrapper<>();
projectYearInfoEOQueryWrapper.lambda().eq(ProjectYearNameInfoEO::getId,projectLibraryBase.getYearNameId());
ProjectYearNameInfoEO projectYearNameInfoEO = projectYearNameInfoEOMapper.selectOne(projectYearInfoEOQueryWrapper);
//消息内容
String msgContentEN = currentUser.getUsername() + " initiated the regulation list confirmation for " + projectNameInfoEO.getProjectName()
+ ". The due date is：" +inventoryAffirmDueDate+ " .Please check and address it in a timely manner.";
@@ -5777,6 +5781,10 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
projectNameInfoEOQueryWrapper.lambda().eq(ProjectNameInfoEO::getId,projectLibraryBase.getProjectNameId());
ProjectNameInfoEO projectNameInfoEO = projectNameInfoEOMapper.selectOne(projectNameInfoEOQueryWrapper);
QueryWrapper<ProjectYearNameInfoEO> projectYearInfoEOQueryWrapper = new QueryWrapper<>();
projectYearInfoEOQueryWrapper.lambda().eq(ProjectYearNameInfoEO::getId,projectLibraryBase.getYearNameId());
ProjectYearNameInfoEO projectYearNameInfoEO = projectYearNameInfoEOMapper.selectOne(projectYearInfoEOQueryWrapper);
//消息内容
String msgContentEN = "Please address the regulation list confirmation process for "+ projectNameInfoEO.getProjectName() +" ASAP. ";
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLibraryBaseServiceImpl.java
+4 -4
View File
@@ -233,9 +233,9 @@ public class ProjectLibraryBaseServiceImpl extends ServiceImpl<ProjectLibraryBas
if (!(inventoryAffirmFlag && taskAffirmFlag)) {
if (CutEnum.CN.getValue().equals(cut)) {
throw new JeroBootException("数据不能删除");
throw new JeroBootException("当前项目下有未走完的流程，不能删除");
}else{
throw new JeroBootException("Data cannot be deleted.");
throw new JeroBootException("There are unfinished processes under the current project and cannot be deleted.");
}
}
@@ -256,9 +256,9 @@ public class ProjectLibraryBaseServiceImpl extends ServiceImpl<ProjectLibraryBas
if (!(designStatusFlag && verifyStatusFlag && prehomoStatusFlag)) {
if (CutEnum.CN.getValue().equals(cut)) {
throw new JeroBootException("数据不能删除");
throw new JeroBootException("当前项目下有未走完的流程，不能删除");
}else{
throw new JeroBootException("Data cannot be deleted.");
throw new JeroBootException("There are unfinished processes under the current project and cannot be deleted.");
}
}
}
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectRelatedPersonnelServiceImpl.java
+14 -2
View File
@@ -506,7 +506,13 @@ public class ProjectRelatedPersonnelServiceImpl extends ServiceImpl<ProjectRelat
nowFile.delete();
}
nowFile.mkdirs();
HSSFSheet sheet = workbook.createSheet("虚拟清单导入模板");
String excelName = "";
if(CutEnum.CN.getValue().equals(cut)){
excelName = "相关人员名单";
}else{
excelName = "Personal List";
}
HSSFSheet sheet = workbook.createSheet(excelName);
sheet.setDefaultColumnWidth(16);//列宽
HSSFCellStyle cellStyle = workbook.createCellStyle();
cellStyle.setWrapText(true);//自动换行
@@ -614,7 +620,13 @@ public class ProjectRelatedPersonnelServiceImpl extends ServiceImpl<ProjectRelat
nowFile.delete();
}
nowFile.mkdirs();
HSSFSheet sheet = workbook.createSheet("虚拟清单导入模板");
String sheetName = "";
if(CutEnum.CN.getValue().equals(projectRelatedPersonnel.getCut())){
sheetName = "相关人员名单";
}else{
sheetName = "Personal List";
}
HSSFSheet sheet = workbook.createSheet(sheetName);
sheet.setDefaultColumnWidth(16);//列宽
HSSFCellStyle cellStyle = workbook.createCellStyle();
cellStyle.setWrapText(true);//自动换行
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectTaskInventoryDetailEOServiceImpl.java
+7 -4
View File
@@ -9,10 +9,7 @@ import com.jero.common.system.vo.LoginUser;
import com.jero.modules.project.entity.*;
import com.jero.modules.project.enums.JumpLinkEnum;
import com.jero.modules.project.enums.MsgTypeEnum;
import com.jero.modules.project.mapper.ProjectLawsInventoryEOMapper;
import com.jero.modules.project.mapper.ProjectLibraryBaseMapper;
import com.jero.modules.project.mapper.ProjectNameInfoEOMapper;
import com.jero.modules.project.mapper.ProjectTaskInventoryDetailEOMapper;
import com.jero.modules.project.mapper.*;
import com.jero.modules.project.service.IProjectTaskInventoryDetailEOService;
import com.jero.modules.project.service.IProjectTaskInventoryFeedbackEOService;
import com.jero.modules.project.util.SendMessageUtils;
@@ -45,6 +42,9 @@ public class ProjectTaskInventoryDetailEOServiceImpl extends ServiceImpl<Project
@Autowired
private ProjectNameInfoEOMapper projectNameInfoEOMapper;
@Autowired
private ProjectYearNameInfoEOMapper projectYearNameInfoEOMapper;
@Autowired
private ISysUserService sysUserService;
@@ -255,6 +255,9 @@ public class ProjectTaskInventoryDetailEOServiceImpl extends ServiceImpl<Project
String projectNameId = projectLibraryBase.getProjectNameId();
ProjectNameInfoEO projectNameInfoEO = projectNameInfoEOMapper.selectOne(new QueryWrapper<ProjectNameInfoEO>().lambda().eq(ProjectNameInfoEO::getId, projectNameId));
QueryWrapper<ProjectYearNameInfoEO> projectYearInfoEOQueryWrapper = new QueryWrapper<>();
projectYearInfoEOQueryWrapper.lambda().eq(ProjectYearNameInfoEO::getId,projectLibraryBase.getYearNameId());
ProjectYearNameInfoEO projectYearNameInfoEO = projectYearNameInfoEOMapper.selectOne(projectYearInfoEOQueryWrapper);
String id = UUID.randomUUID().toString().replace("-", "");
//给工程师下发消息
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectTaskInventoryEOServiceImpl.java
+7
View File
@@ -61,6 +61,9 @@ public class ProjectTaskInventoryEOServiceImpl extends ServiceImpl<ProjectTaskIn
@Autowired
private ProjectNameInfoEOMapper projectNameInfoEOMapper;
@Autowired
private ProjectYearNameInfoEOMapper projectYearNameInfoEOMapper;
@Autowired
private SysUserMapper sysUserMapper;
@@ -306,6 +309,10 @@ public class ProjectTaskInventoryEOServiceImpl extends ServiceImpl<ProjectTaskIn
projectNameInfoEOQueryWrapper.lambda().eq(ProjectNameInfoEO::getId,projectLibraryBase.getProjectNameId());
ProjectNameInfoEO projectNameInfoEO = projectNameInfoEOMapper.selectOne(projectNameInfoEOQueryWrapper);
QueryWrapper<ProjectYearNameInfoEO> projectYearInfoEOQueryWrapper = new QueryWrapper<>();
projectYearInfoEOQueryWrapper.lambda().eq(ProjectYearNameInfoEO::getId,projectLibraryBase.getYearNameId());
ProjectYearNameInfoEO projectYearNameInfoEO = projectYearNameInfoEOMapper.selectOne(projectYearInfoEOQueryWrapper);
String dreUserIds = jsonObject.getString("dreUserIds"); //dre用户id
userIdList.addAll(Arrays.asList(dreUserIds.split(",")));
if(StringUtils.equals(msgType,MsgTypeEnum.DESIGN_REMIND_MSG.getValue())){
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/searchcenter/service/impl/DocumentSearchServiceImpl.java
+20 -5
View File
@@ -344,14 +344,29 @@ public class DocumentSearchServiceImpl implements IDocumentSearchService {
for (Map.Entry<String, Object> entry : otherMap.entrySet()) {
String key = entry.getKey();
String value = (String) entry.getValue();
if (ObjectUtils.isNotEmpty(value)) {
if("technology_territory".equals(key) && ObjectUtils.isNotEmpty(value)){
Map<String, Object> queryMapNew = new HashMap<>();
Map<String, Object> queryMapTempNew = new HashMap<>();
queryMapTempNew.put(key, "*"+value.replaceAll(",","*")+"*");
queryMapNew.put("wildcard", queryMapTempNew);
must.add(queryMapNew);
}else{
Map<String, Object> map = new HashMap<>();
Map<String, Object> queryMap = new HashMap<>();
Map<String, Object> queryMapTemp = new HashMap<>();
queryMapTemp.put(key, "*"+value.replaceAll(",","*")+"*");
// queryMapTemp.put(key, "*"+value+"*");
queryMap.put("wildcard", queryMapTemp);
must.add(queryMap);
queryMapTemp.put("query", value);
queryMap.put(key, queryMapTemp);
map.put("match",queryMap);
must.add(map);
}
// if (ObjectUtils.isNotEmpty(value)) {
// Map<String, Object> queryMap = new HashMap<>();
// Map<String, Object> queryMapTemp = new HashMap<>();
// queryMapTemp.put(key, "*"+value.replaceAll(",","*")+"*");
//// queryMapTemp.put(key, "*"+value+"*");
// queryMap.put("wildcard", queryMapTemp);
// must.add(queryMap);
// }
}
}
//封装时间类型字段查询(时间范围)
jero-boot/jero-boot-single-startup/src/main/resources/application-dev.yml
+2 -2
View File
@@ -142,8 +142,8 @@ spring:
# username: root
# password: 123456
# driver-class-name: com.mysql.cj.jdbc.Driver
url: jdbc:mysql://121.36.69.172:3307/laws_weilai?useUnicode=true&characterEncoding=utf8&serverTimezone=Asia/Shanghai&useSSL=false
# url: jdbc:mysql://121.36.69.172:3307/laws_weilai_stand?characterEncoding=UTF-8&useUnicode=true&useSSL=false&tinyInt1isBit=false&allowPublicKeyRetrieval=true&serverTimezone=Asia/Shanghai
# url: jdbc:mysql://121.36.69.172:3307/laws_weilai?useUnicode=true&characterEncoding=utf8&serverTimezone=Asia/Shanghai&useSSL=false
url: jdbc:mysql://121.36.69.172:3307/laws_weilai_stand?characterEncoding=UTF-8&useUnicode=true&useSSL=false&tinyInt1isBit=false&allowPublicKeyRetrieval=true&serverTimezone=Asia/Shanghai
username: root
password: hzwlsoft.com
driver-class-name: com.mysql.cj.jdbc.Driver
jero-boot/jero-boot-single-startup/src/main/resources/application-prod.yml
+11 -11
View File
@@ -1,5 +1,5 @@
server:
port: 8008
port: 8013
tomcat:
max-swallow-size: -1
error:
@@ -136,7 +136,7 @@ spring:
# password: 123456
# driver-class-name: com.mysql.cj.jdbc.Driver
# url: jdbc:mysql://10.10.10.44:3306/laws_weilai_test?useUnicode=true&characterEncoding=utf8&serverTimezone=Asia/Shanghai&useSSL=false
url: jdbc:mysql://121.36.69.172:3307/laws_weilai_zhn?characterEncoding=UTF-8&useUnicode=true&useSSL=false&tinyInt1isBit=false&allowPublicKeyRetrieval=true&serverTimezone=Asia/Shanghai
url: jdbc:mysql://10.132.162.58:3306/laws_weilai?characterEncoding=UTF-8&useUnicode=true&useSSL=false&tinyInt1isBit=false&allowPublicKeyRetrieval=true&serverTimezone=Asia/Shanghai
username: root
password: hzwlsoft.com
driver-class-name: com.mysql.cj.jdbc.Driver
@@ -152,7 +152,7 @@ spring:
allow-bean-definition-overriding: true
redis:
database: 2
host: 121.36.69.172
host: 10.132.162.58
lettuce:
pool:
max-active: 8 #最大连接数据库连接数,设 0 为没有限制
@@ -161,7 +161,7 @@ spring:
min-idle: 0 #最小等待连接中的数量,设 0 为没有限制
shutdown-timeout: 100ms
password: 'hzwlsoft.com'
port: 4780
port: 6379
#mybatis plus 设置
mybatis-plus:
mapper-locations: classpath*:com/jero/**/xml/*Mapper.xml
@@ -184,9 +184,9 @@ jero :
uploadType: local
path :
#文件上传根目录 设置
upload: /data/DeploymentPackage/laws-weilai/upFiles
upload: /data/DeploymentPackage/upFiles
#webapp文件路径
webapp: /data/DeploymentPackage/laws-weilai/webapp
webapp: /data/DeploymentPackage/webapp
shiro:
excludeUrls: /test/jeroDemo/demo3,/test/jeroDemo/redisDemo/**,/category/**,/visual/**,/map/**,/jmreport/bigscreen2/**
#阿里云oss存储配置
@@ -199,7 +199,7 @@ jero :
# ElasticSearch 6设置
elasticsearch:
cluster-name: elasticsearch
cluster-nodes: 121.36.69.172:9200
cluster-nodes: 10.132.162.58:9200
check-enabled: false
# 表单设计器配置
desform:
@@ -248,7 +248,7 @@ jero :
data-type: yml
#分布式锁配置
redisson:
address: 127.0.0.1:4780
address: 10.132.162.58:6379
password:
type: STANDALONE
enabled: true
@@ -301,7 +301,7 @@ OCR:
#handleFileUrl: http://sws.trans-cosmos.com.cn/WebService.asmx/FileConversion
handleFileUrl: http://61.136.1.103:8091/WebService.asmx/FileConversion
# OCR回调接口地址 配置客户本地的IP及端口号
callBackUrl: http://139.9.235.66:8012/local-tool/ocr/ocrHandleResult
callBackUrl: http://10.132.130.150:8014/local-tool/ocr/ocrHandleResult
# OCR认证用户
userId: dayuzhou1234
# OCR认证编码
@@ -311,7 +311,7 @@ OCR:
# OCR文件存储路径
ocrPath: /data/DeploymentPackage/laws_weilai/APPSOFT/LAWSOCRDEMO/OCRFILE/
# OCR文件下载地址
ocrDownPath: http://139.9.235.66:9020/downfile/
ocrDownPath: http://139.9.235.66:8013/downfile/
# OCR接口超时时间
times: 20
# OCR转换类型
@@ -359,6 +359,6 @@ Feishu:
batchSendMessageUrl: https://open.feishu.cn/open-apis/message/v4/batch_send/
# local-tool
local-tool:
uri: http://139.9.235.66:8012
uri: http://10.132.130.150:8014
opensso:
redirectUri: http%3A%2F%2F139.9.235.66%3A8010
jero-web/src/common/lang/en-us.js
+3 -3
View File
@@ -915,11 +915,11 @@ module.exports = {
testReportLocation: 'Report Location',
explain: 'Comment',
dataCannotEmpty: 'Data Cannot Empty',
documentDynamics: 'Document Dynamics',
documentDynamics: 'Document Update',
theNumberAgain: 'The number already exists and cannot be added again',
myList: 'My to-do list',
myNews: 'My News',
monthlyReportRegulations: 'Monthly report regulations',
myNews: 'My Message',
monthlyReportRegulations: 'Regulation Monthly Report',
Pending: 'Pending',
custom: 'Custom',
notSelected: 'Not selected',
jero-web/src/common/lang/zh-cn.js
+1 -1
View File
@@ -881,7 +881,7 @@ module.exports = {
listConfirmationProgress: '清单确认进度',
taskConfirmationProgress: '任务确认进度',
designComplianceConfirmationProgress: '设计符合性确认进度',
preHomeConfirmProgress: 'Pre-Home确认进度',
preHomeConfirmProgress: 'Pre-Homo确认进度',
verificationComplianceConfirmationProgress: '验证符合性确认进度',
totalTable: '总数',
applicableSupplement: '适用增补件',
jero-web/src/components/tools/UserMenu.vue
+4 -1
View File
@@ -222,12 +222,15 @@
onOk() {
return that.Logout({}).then(() => {
// update-begin author:wangshuai date:20200601 for: 退出登录跳转登录页面
// TODO 在部署线上时注掉以下代码
that.$router.push({ path: '/user/login' })
// window.location.href = 'https://signin-test.nio.com/logout?client_id=100679&redirect_uri=' +
// encodeURIComponent('http://localhost:3000/dashboard/analysis') + '&response_type=code' //本地
// TODO 在部署线上时解开以下代码
// window.location.href = 'https://signin.nio.com/logout?client_id=100679&redirect_uri=' +
// encodeURIComponent('http://grp.nioint.com/dashboard/analysis') + '&response_type=code' //线上
localStorage.removeItem('language')
// update-end author:wangshuai date:20200601 for: 退出登录跳转登录页面
//window.location.reload()
jero-web/src/permission.js
+14 -3
View File
@@ -11,9 +11,15 @@ import { getAction } from '@/api/manage'
import { welcome } from '@/utils/util'
NProgress.configure({ showSpinner: false }) // NProgress Configuration
// TODO 线上部署在conmponetns/tools/UserMenu.vue的退出登录时需解开代码以及注释代码
// TODO 在部署线上时注掉以下代码
const whiteList = ['/user/login', '/user/register', '/user/register-result', '/user/alteration']
// TODO 在部署线上时解开一下代码
// const whiteList = []
// no redirect whitelist
router.beforeEach((to, from, next) => {
@@ -89,7 +95,9 @@ router.beforeEach((to, from, next) => {
})*/
// query: { redirect: to.fullPath }
store.dispatch('Logout').then(() => {
// TODO 在部署线上时注掉此代码
next({ path: '/user/login', query: { redirect: to.fullPath } })
let fullPath = ''
if (to.fullPath == '/') {
fullPath = INDEX_MAIN_PAGE_PATH
@@ -100,8 +108,9 @@ router.beforeEach((to, from, next) => {
// window.location.href = 'https://signin-test.nio.com/oauth2/authorize?client_id=100679&redirect_uri='
// + encodeURIComponent('http://localhost:3000' + fullPath) + '&response_type=code&state=' + JSON.stringify(to.query) //本地
// TODO 在部署线上时解开此代码
// window.location.href = 'https://signin.nio.com/oauth2/authorize?client_id=100679&redirect_uri='
// + encodeURIComponent('http://grp.nioint.com' + fullPath) + '&response_type=code&state=' + JSON.stringify(to.query) //线上
// + encodeURIComponent('https://grp.nioint.com' + fullPath) + '&response_type=code&state=' + JSON.stringify(to.query) //线上
})
})
} else {
@@ -113,6 +122,7 @@ router.beforeEach((to, from, next) => {
// 在免登录白名单，直接进入
next()
} else {
// TODO 在部署线上时注掉此代码
next({ path: '/user/login', query: { redirect: to.fullPath } })
let fullPath = ''
@@ -124,9 +134,10 @@ router.beforeEach((to, from, next) => {
// http://grp.nioint.com
// window.location.href = 'https://signin-test.nio.com/oauth2/authorize?client_id=100679&redirect_uri='
// + encodeURIComponent('http://localhost:3000' + fullPath) + '&response_type=code&state=' + JSON.stringify(to.query) //本地
// TODO 在部署线上时解开此代码
// window.location.href = 'https://signin.nio.com/oauth2/authorize?client_id=100679&redirect_uri='
// + encodeURIComponent('http://grp.nioint.com' + fullPath) + '&response_type=code&state=' + JSON.stringify(to.query) //线上
// + encodeURIComponent('https://grp.nioint.com' + fullPath) + '&response_type=code&state=' + JSON.stringify(to.query) //线上
NProgress.done() // if current page is login will not trigger afterEach hook, so manually handle it
}
}
jero-web/src/views/dashboard/components/customContent.vue
+15 -8
View File
@@ -1,18 +1,19 @@
<template>
<div class="customContent-box">
<div style="display: inline-block">
<div class="box-content-top">
<div class="box-content" v-for="(item,index) in dataSourceContentList" :key="index" @click="urlClick(item)">
<img :src="item.iconPath" class="img" alt="">
<div class="text" :title="item.iconName">{{item.iconName}}</div>
</div>
<div class="box-content-top">
<div class="box-content" v-for="(item,index) in dataSourceContentList" :key="index"
@click="urlClick(item)">
<img :src="item.iconPath" class="img" alt="">
<div class="text" :title="item.iconName">{{item.iconName}}</div>
</div>
<div class="box-content" @click="customClick()" style=";margin-top: 0;float: right">
<div class="box-content" @click="customClick()" style=";margin-top: 0;">
<img src="../../../assets/zdy.png" class="img" alt="">
<div class="text">{{$t('custom')}}</div>
</div>
</div>
<div class="box-content-right">
</div>
<a-modal
:title="$t('custom')"
:width="1180"
@@ -174,11 +175,12 @@
.customContent-box {
width: 100%;
text-align: center;
overflow: hidden;
.box-content-top {
max-width: calc(100% - 130px);
display: inline-block;
overflow: hidden;
overflow: auto;
white-space: nowrap;
}
@@ -249,4 +251,9 @@
margin-top: 10px;
margin-bottom: 30px;
}
.box-content-right {
display: inline-block;
overflow: hidden;
}
</style>
jero-web/src/views/dashboard/customContentList.vue
+1 -1
View File
@@ -39,7 +39,7 @@
:row-selection="{ selectedRowKeys: selectedRowKeys, onChange: onSelectChange }"
:columns="columns"
:dataSource="dataSource"
:scroll="{x: 1600}"
:scroll="{x: '100%'}"
:pagination="ipagination"
:loading="loading"
@change="handleTableChange">
jero-web/src/views/documentManage/splitting/modules/SplitDetail.vue
+9 -1
View File
@@ -185,7 +185,7 @@
:confirm-loading="confirmLoading"
@ok="modalOk"
@cancel="batSetCancel"
style="width: 1000px"
style="width: 1000px;height: auto"
>
<split-bat-form
ref="fileForm"
@@ -1306,6 +1306,14 @@
min-width: 700px;
}
.ant-select-dropdown--multiple {
max-height: 39vh !important;
}
.ant-modal-body {
overflow-y: visible !important;
}
.ant-modal-footer {
text-align: center;
}
jero-web/src/views/documentTools/searchCenter/components/whole.vue
+4 -1
View File
@@ -124,7 +124,10 @@
}
},
mounted() {
this.getList()
this.conList = []
// if (!this.queryParam.selectValue) {
// this.getList()
// }
},
methods: {
checkedClick(item) {
jero-web/src/views/documentTools/searchCenter/index.vue
+13
View File
@@ -105,12 +105,25 @@
this.$refs.wholeRef.searchData(this.selectValueTwo)
}
})
} else {
this.$nextTick(() => {
if (this.$refs.wholeRef) {
this.$refs.wholeRef.searchData()
}
})
}
},
methods: {
callback(key) {
this.active = key
this.selectValueTwo = ''
if (this.active == this.$t('whole')) {
this.$nextTick(() => {
if (this.$refs.wholeRef) {
this.$refs.wholeRef.searchData()
}
})
}
},
ResetSearch() {
this.selectValueTwo = ''
jero-web/src/views/documentTools/virtualList/components/addModel.vue
+53 -47
View File
@@ -11,37 +11,37 @@
<div style="margin-bottom: 60px">
<div class="table-page-search-wrapper">
<a-form layout="inline" @keyup.enter.native="searchQuery">
<a-row :gutter="24">
<a-col :md="12" :sm="8">
<div class="box-title-text">
<div class="title-text" :title="$t('standard')">
<span>{{$t('standard')}}</span>
<a-row :gutter="24">
<a-col :md="12" :sm="8">
<div class="box-title-text">
<div class="title-text" :title="$t('standard')">
<span>{{$t('standard')}}</span>
</div>
<a-input class="box-input" :placeholder="$t('PleaseEnter')+$t('standard')"
v-model="queryParam.serial_number"></a-input>
</div>
<a-input class="box-input" :placeholder="$t('PleaseEnter')+$t('standard')"
v-model="queryParam.serial_number"></a-input>
</div>
</a-col>
<a-col :md="12" :sm="8">
<div class="box-title-text">
<div class="title-text" :title="$t('title')">
<span>{{$t('title')}}</span>
</a-col>
<a-col :md="12" :sm="8">
<div class="box-title-text">
<div class="title-text" :title="$t('title')">
<span>{{$t('title')}}</span>
</div>
<a-input class="box-input" :placeholder="$t('PleaseEnter')+$t('title')"
v-model="queryParam.title"></a-input>
</div>
<a-input class="box-input" :placeholder="$t('PleaseEnter')+$t('title')"
v-model="queryParam.title"></a-input>
</div>
</a-col>
<a-col :md="12" :sm="8">
<div class="box-title-text">
<div class="title-text" :title="$t('status')">
<span>{{$t('status')}}</span>
</a-col>
<a-col :md="12" :sm="8">
<div class="box-title-text">
<div class="title-text" :title="$t('status')">
<span>{{$t('status')}}</span>
</div>
<j-dict-select-tag class="box-input" v-model="queryParam.state"
:placeholder="$t('PleaseSelect')+$t('status')"
:type="'select'"
:triggerChange="false" :dictCode="'state'"/>
</div>
<j-dict-select-tag class="box-input" v-model="queryParam.state"
:placeholder="$t('PleaseSelect')+$t('status')"
:type="'select'"
:triggerChange="false" :dictCode="'state'"/>
</div>
</a-col>
<span style="float: right;overflow: hidden;" class="table-page-search-submitButtons">
</a-col>
<span style="float: right;overflow: hidden;" class="table-page-search-submitButtons">
<a-col :md="12" :sm="24">
<globalAdvancedQuery ref="globalAdvancedQueryRef"
@handleSuperQuery="handleSuperQuery"
@@ -50,7 +50,7 @@
<a-button class="box-button" style="margin-left: 8px" @click="searchReset">{{$t('reset')}}</a-button>
</a-col>
</span>
</a-row>
</a-row>
</a-form>
</div>
<div style="width: 100%">
@@ -121,17 +121,23 @@
ellipsis: true
},
{
title: this.$t('status'),
dataIndex: 'state',
align: 'center',
ellipsis: true
},
{
title: this.$t('technicalField'),
dataIndex: 'technology_territory',
title: this.$t('zoneOfApplication'),
dataIndex: 'region',
align: 'center',
ellipsis: true
},
// {
// title: this.$t('status'),
// dataIndex: 'state',
// align: 'center',
// ellipsis: true
// },
// {
// title: this.$t('technicalField'),
// dataIndex: 'technology_territory',
// align: 'center',
// ellipsis: true
// },
{
title: this.$t('ImplementationDate'),
dataIndex: 'xin1_che1_xing2_shi2_shi1_ri4_qi1',
@@ -143,13 +149,13 @@
dataIndex: 'implement_time',
align: 'center',
ellipsis: true
},
{
title: this.$t('correspondingStandard'),
dataIndex: 'corresponding_standard',
align: 'center',
ellipsis: true
}
// {
// title: this.$t('correspondingStandard'),
// dataIndex: 'corresponding_standard',
// align: 'center',
// ellipsis: true
// }
],
dataList: [],
content: [],
@@ -159,7 +165,7 @@
total: 0,
fieldList: [],
queryParamQuery: {},
queryConditionVOList: [],
queryConditionVOList: []
}
},
mounted() {
@@ -201,7 +207,7 @@
pageNo: this.pageNo,
pageSize: this.pageSize,
...this.queryParam,
queryConditionVOList: JSON.stringify(queryConditionVOList),
queryConditionVOList: JSON.stringify(queryConditionVOList)
}
this.loading = true
postAction(this.url.addModelList, query).then((res) => {
@@ -266,8 +272,8 @@
} else {
this.$refs.globalAdvancedQueryRef.superQueryFlag = true
this.queryConditionVOList = params
this.queryConditionVOList.forEach(res=>{
res.type = matchType
this.queryConditionVOList.forEach(res => {
res.type = matchType
})
}
this.replacePage()
jero-web/src/views/documentTools/virtualList/components/editModel.vue
+48
View File
@@ -373,6 +373,22 @@
</div>
</a-col>
</a-row>
<a-row :gutter="24">
<a-col :span="24">
<div class="box-title-text">
<div class="title-text">
<span class="title-text-text"
:title="$t('descriptionDeliverables')">{{$t('descriptionDeliverables')}}</span>
</div>
<a-form-model-item class="itemModel-text" :prop="'designRemark'">
<a-textarea
style="width: 100%"
:placeholder="$t('PleaseEnter')+$t('descriptionDeliverables')"
v-model="formInline.designRemark" :rows="4"/>
</a-form-model-item>
</div>
</a-col>
</a-row>
<div class="header-text">
&nbsp;{{$t('PrehomoConfirmation')}}
</div>
@@ -456,6 +472,22 @@
</div>
</a-col>
</a-row>
<a-row :gutter="24">
<a-col :span="24">
<div class="box-title-text">
<div class="title-text">
<span class="title-text-text"
:title="$t('descriptionDeliverables')">{{$t('descriptionDeliverables')}}</span>
</div>
<a-form-model-item class="itemModel-text" :prop="'prehomoRemark'">
<a-textarea
style="width: 100%"
:placeholder="$t('PleaseEnter')+$t('descriptionDeliverables')"
v-model="formInline.prehomoRemark" :rows="4"/>
</a-form-model-item>
</div>
</a-col>
</a-row>
<div class="header-text">
&nbsp;{{$t('verificationAndConformityconfirmation')}}
</div>
@@ -538,6 +570,22 @@
</div>
</a-col>
</a-row>
<a-row :gutter="24">
<a-col :span="24">
<div class="box-title-text">
<div class="title-text">
<span class="title-text-text"
:title="$t('descriptionDeliverables')">{{$t('descriptionDeliverables')}}</span>
</div>
<a-form-model-item class="itemModel-text" :prop="'verifyRemark'">
<a-textarea
style="width: 100%"
:placeholder="$t('PleaseEnter')+$t('descriptionDeliverables')"
v-model="formInline.verifyRemark" :rows="4"/>
</a-form-model-item>
</div>
</a-col>
</a-row>
</a-form-model>
</a-spin>
<div class="drawer-bootom-button">
jero-web/src/views/documentTools/virtualList/components/virtualListDetails.vue
+21 -3
View File
@@ -424,7 +424,6 @@
{
title: this.$t('confirmationOfDesignConformity'),
width: 540,
children: [
{
// TODO 未按要求实现，该列分为上下行，上行显示交付物类型，下行显示交付物模板名称，且交付物模板名称点击可下载。其他2个流程同理
@@ -448,12 +447,18 @@
width: 180,
ellipsis: true,
align: 'center'
},
{
title: this.$t('descriptionDeliverables'),
dataIndex: 'designRemark',
align: 'center',
width: 220,
ellipsis: true
}
]
},
{
title: this.$t('PrehomoConfirmation'),
width: 540,
children: [
{
title: this.$t('Deliverables'),
@@ -476,12 +481,18 @@
width: 180,
ellipsis: true,
align: 'center'
},
{
title: this.$t('descriptionDeliverables'),
dataIndex: 'prehomoRemark',
align: 'center',
width: 220,
ellipsis: true
}
]
},
{
title: this.$t('verificationAndConformityconfirmation'),
width: 540,
children: [
{
title: this.$t('Deliverables'),
@@ -504,6 +515,13 @@
width: 180,
align: 'center',
ellipsis: true
},
{
title: this.$t('descriptionDeliverables'),
dataIndex: 'verifyRemark',
align: 'center',
width: 220,
ellipsis: true
}
]
},
jero-web/src/views/projectManagement/components/TaskList.vue
+2 -2
View File
@@ -543,8 +543,8 @@
text-align: center;
line-height: 32px;
border-radius: 4px;
background: #dbf6e2;
color: #26BD4B;
background: #f1f3f5;
color: #919399;
}
.accordColor {
jero-web/src/views/projectManagement/components/certificationProgressEchart.vue
+4 -4
View File
@@ -102,7 +102,7 @@
name: this.$t('notInvolved'),
status: res.certificationProgress
})
color.push('#9DB9D4')
color.push('#707486')
this.dataSource[0].notInvolved = res.certificationProgressCount
} else if (res.certificationProgress == 'Not start') {
data.push({
@@ -110,7 +110,7 @@
name: this.$t('toBeStarted'),
status: res.certificationProgress
})
color.push('#FDB033')
color.push('#00B3BE')
this.dataSource[0].toBeStarted = res.certificationProgressCount
} else if (res.certificationProgress == 'In progress') {
data.push({
@@ -118,7 +118,7 @@
name: this.$t('inProgress'),
status: res.certificationProgress
})
color.push('#FF8543')
color.push('#FDA71C')
this.dataSource[0].inProgress = res.certificationProgressCount
} else if (res.certificationProgress == 'Test failed') {
data.push({
@@ -134,7 +134,7 @@
name: this.$t('experimentPassed'),
status: res.certificationProgress
})
color.push('#2F8DF3')
color.push('#26BD4B')
this.dataSource[0].experimentPassed = res.certificationProgressCount
}
})
jero-web/src/views/projectManagement/components/commentList.vue
+31 -14
View File
@@ -9,10 +9,14 @@
@close="handleCancel"
:visible="visible">
<div class="button-box">
<j-input class="box-input" :placeholder="$t('PleaseEnter')+$t('comment')"
v-model="commentContent"></j-input>
<a-input-search class="box-input box-input-search" allowClear
@search="allowClearChange"
:placeholder="$t('PleaseEnter')+$t('comment')"
v-model="commentContent"></a-input-search>
<a-button @click="submitQuery" style="margin-right: 8px;" type="primary">{{$t('query')}}</a-button>
<a-button @click="handleSubmit" class="button-text" :title="$t('publishComment')" type="primary">{{$t('publishComment')}}</a-button>
<a-button @click="handleSubmit" class="button-text" :title="$t('publishComment')" type="primary">
{{$t('publishComment')}}
</a-button>
</div>
<div class="comment-box" v-if="dataList && dataList.length > 0">
<div class="comment-box-top-box" v-for="(item,index) in dataList" :key="index">
@@ -102,7 +106,7 @@
visible: false,
dataList: [],
formInline: {},
commentContent:'',
commentContent: '',
loading: false,
title: this.$t('comment'),
confirmLoading: false,
@@ -148,12 +152,18 @@
this.$refs.ruleForm.clearValidate()
})
},
submitQuery(){
allowClearChange() {
this.getList()
},
submitQuery() {
this.getList()
},
getList() {
this.loading = true
getAction(this.url.list, { projectLibraryId: this.$route.query.id,commentContent:this.commentContent }).then((res) => {
getAction(this.url.list, {
projectLibraryId: this.$route.query.id,
commentContent: this.commentContent
}).then((res) => {
if (res.success) {
this.loading = false
this.dataList = res.result || []
@@ -315,7 +325,7 @@
position: absolute;
bottom: 0;
width: 100%;
z-index:100;
z-index: 100;
border-top: 1px solid #e8e8e8;
padding: 10px 16px;
text-align: right;
@@ -363,14 +373,21 @@
text-align: center;
margin-top: 40px;
}
.box-input{
width: calc(100% - 168px);
margin-right: 8px;
.box-input {
width: calc(100% - 168px);
margin-right: 8px;
}
.button-text{
width: 80px;
.button-text {
width: 73px;
overflow: hidden;
padding:0 10px;
padding: 0 8px;
box-sizing: border-box;
}
</style>
<style>
.box-input-search .ant-input-suffix .ant-input-search-icon{
display: none;
}
</style>
jero-web/src/views/projectManagement/components/deliverableStatusEchart.vue
+10 -10
View File
@@ -54,7 +54,7 @@
getData() {
getAction(this.url.getProjectDetailsStatistics, { id: this.$route.query.id }).then((res) => {
if (res.success) {
if (res.result){
if (res.result) {
let listingToConfirmMap = res.result.listingToConfirmMap ? res.result.listingToConfirmMap.listingToConfirmMapList : []
let taskToConfirmMap = res.result.taskToConfirmMap ? res.result.taskToConfirmMap.taskToConfirmMapList : []
@@ -82,28 +82,28 @@
name: this.$t('notLaunch'),
status: res.inventoryAffirmStatus || res.taskAffirmStatus
})
color.push('#00BEBE')
color.push('#707486')
} else if (res.inventoryAffirmStatus == 'List to confirm' || res.taskAffirmStatus == 'List to confirm') {
data.push({
value: res.inventoryAffirmStatusCount || res.taskAffirmStatusCount,
name: this.$t('toBeConfirmed'),
status: res.inventoryAffirmStatus || res.taskAffirmStatus
})
color.push('#FDB033')
color.push('#00B3BE')
} else if (res.inventoryAffirmStatus == 'Accepted' || res.taskAffirmStatus == 'Accepted') {
data.push({
value: res.inventoryAffirmStatusCount || res.taskAffirmStatusCount,
name: this.$t('accept'),
status: res.inventoryAffirmStatus || res.taskAffirmStatus
})
color.push('#2F8DF3')
color.push('#26BD4B')
} else if (res.inventoryAffirmStatus == 'Rejected' || res.taskAffirmStatus == 'Rejected') {
data.push({
value: res.inventoryAffirmStatusCount || res.taskAffirmStatusCount,
name: this.$t('refuse'),
status: res.inventoryAffirmStatus || res.taskAffirmStatus
})
color.push('#9DB9D4')
color.push('#E83030')
}
})
}
@@ -124,35 +124,35 @@
name: this.$t('toBeConfirmed'),
status: res.designFlowTaskStatus || res.prehomoFlowTaskStatus || res.verifyFlowTaskStatus
})
color.push('#37CED1')
color.push('#00B3BE')
} else if (res.designFlowTaskStatus == 'Compliance' || res.prehomoFlowTaskStatus == 'Compliance' || res.verifyFlowTaskStatus == 'Compliance') {
data.push({
value: res.designFlowTaskStatusCount || res.prehomoFlowTaskStatusCount || res.verifyFlowTaskStatusCount,
name: this.$t('accord'),
status: res.designFlowTaskStatus || res.prehomoFlowTaskStatus || res.verifyFlowTaskStatus
})
color.push('#2F8DF3')
color.push('#26BD4B')
} else if (res.designFlowTaskStatus == 'Non-Compliance' || res.prehomoFlowTaskStatus == 'Non-Compliance' || res.verifyFlowTaskStatus == 'Non-Compliance') {
data.push({
value: res.designFlowTaskStatusCount || res.prehomoFlowTaskStatusCount || res.verifyFlowTaskStatusCount,
name: this.$t('nonConformity'),
status: res.designFlowTaskStatus || res.prehomoFlowTaskStatus || res.verifyFlowTaskStatus
})
color.push('#FF8543')
color.push('#E83030')
} else if (res.designFlowTaskStatus == 'To be tracked' || res.prehomoFlowTaskStatus == 'To be tracked' || res.verifyFlowTaskStatus == 'To be tracked') {
data.push({
value: res.designFlowTaskStatusCount || res.prehomoFlowTaskStatusCount || res.verifyFlowTaskStatusCount,
name: this.$t('Tracked'),
status: res.designFlowTaskStatus || res.prehomoFlowTaskStatus || res.verifyFlowTaskStatus
})
color.push('#FDB033')
color.push('#FDA71C')
} else if (res.designFlowTaskStatus == 'NA' || res.prehomoFlowTaskStatus == 'NA' || res.verifyFlowTaskStatus == 'NA') {
data.push({
value: res.designFlowTaskStatusCount || res.prehomoFlowTaskStatusCount || res.verifyFlowTaskStatusCount,
name: this.$t('notInvolved'),
status: res.designFlowTaskStatus || res.prehomoFlowTaskStatus || res.verifyFlowTaskStatus
})
color.push('#9DB9D4')
color.push('#707486')
} else if (res.designFlowTaskStatus == 'Termination of task' || res.prehomoFlowTaskStatus == 'Termination of task' || res.verifyFlowTaskStatus == 'Termination of task') {
data.push({
value: res.designFlowTaskStatusCount || res.prehomoFlowTaskStatusCount || res.verifyFlowTaskStatusCount,
jero-web/src/views/projectManagement/components/listAddModel.vue
+20 -14
View File
@@ -113,17 +113,23 @@
ellipsis: true
},
{
title: this.$t('status'),
dataIndex: 'state',
align: 'center',
ellipsis: true
},
{
title: this.$t('technicalField'),
dataIndex: 'technology_territory',
title: this.$t('zoneOfApplication'),
dataIndex: 'region',
align: 'center',
ellipsis: true
},
// {
// title: this.$t('status'),
// dataIndex: 'state',
// align: 'center',
// ellipsis: true
// },
// {
// title: this.$t('technicalField'),
// dataIndex: 'technology_territory',
// align: 'center',
// ellipsis: true
// },
{
title: this.$t('ImplementationDate'),
dataIndex: 'xin1_che1_xing2_shi2_shi1_ri4_qi1',
@@ -136,12 +142,12 @@
align: 'center',
ellipsis: true
},
{
title: this.$t('correspondingStandard'),
dataIndex: 'corresponding_standard',
align: 'center',
ellipsis: true
}
// {
// title: this.$t('correspondingStandard'),
// dataIndex: 'corresponding_standard',
// align: 'center',
// ellipsis: true
// }
],
dataList: [],
content: [],
jero-web/src/views/system/UserAnnouncementList.vue
+1 -1
View File
@@ -61,7 +61,7 @@
:row-selection="{ selectedRowKeys: selectedRowKeys, onChange: onSelectChange }"
:columns="columns"
:dataSource="dataSource"
:scroll="{x: 1600}"
:scroll="{x: '100%'}"
:pagination="ipagination"
:loading="loading"
@change="handleTableChange">