diff --git a/jero-boot/db/蔚来标准sql/dev_third_record.sql b/jero-boot/db/蔚来标准sql/dev_third_record.sql index 11f8f6fc8..a02c7e021 100644 --- a/jero-boot/db/蔚来标准sql/dev_third_record.sql +++ b/jero-boot/db/蔚来标准sql/dev_third_record.sql @@ -1265,7 +1265,7 @@ ADD COLUMN `part_number_en` varchar(255) NULL COMMENT '零件号(国外)' AF ADD COLUMN `filing_code` varchar(255) NULL COMMENT '24位备案码' AFTER `part_number_en`, ADD COLUMN `supplier_code` varchar(255) NULL COMMENT '供应商代码' AFTER `filing_code`, ADD COLUMN `product_type_code` varchar(255) NULL COMMENT '产品类型代码' AFTER `supplier_code`, -ADD COLUMN `battery_type_code` varchar(255) NULL COMMENT '电池类型代码' AFTER `Product_type _code`, +ADD COLUMN `battery_type_code` varchar(255) NULL COMMENT '电池类型代码' AFTER `product_type_code`, ADD COLUMN `specification_code` varchar(255) NULL COMMENT '规格代码' AFTER `battery_type_code`, ADD COLUMN `traceability_code` varchar(255) NULL COMMENT '追溯代码' AFTER `specification_code`, ADD COLUMN `ymd_number` varchar(255) NULL COMMENT '生产也月日序列号' AFTER `traceability_code`, @@ -1282,7 +1282,7 @@ ADD COLUMN `remark` varchar(1000) NULL COMMENT '备注' AFTER `filing_completion --平台件合规认证计划添加标识字段2023-10-09 ALTER TABLE `platform_task_planning` -ADD COLUMN `flag` varchar(255) NULL COMMENT '位置标识(用来区分上下两部分数据,up->上,down->下)' AFTER `project_id`, +ADD COLUMN `flag` varchar(255) NULL COMMENT '位置标识(用来区分上下两部分数据,up->上,down->下)' AFTER `project_id` --平台件合规认证计划初始化数据 2023-10-10 INSERT INTO `platform_task_planning`(`id`, `create_by`, `create_time`, `update_by`, `update_time`, `sys_org_code`, `node_name`, `node_time`, `project_id`, `flag`) VALUES ('08ecf06f4f947836d0e95285fd8afb96', NULL, NULL, NULL, NULL, NULL, 'KO', NULL, NULL, 'up'); diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/report/mapper/xml/ParamsReportEOMapper.xml b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/report/mapper/xml/ParamsReportEOMapper.xml index 435a7ec0c..8f9924712 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/report/mapper/xml/ParamsReportEOMapper.xml +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/report/mapper/xml/ParamsReportEOMapper.xml @@ -34,7 +34,6 @@ - platform is null AND title LIKE CONCAT(CONCAT('%',#{paramsReportEO.title}),'%') diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/report/mapper/xml/ParamsReportExportHistoryEOMapper.xml b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/report/mapper/xml/ParamsReportExportHistoryEOMapper.xml index 4087b2fcd..75f07be76 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/report/mapper/xml/ParamsReportExportHistoryEOMapper.xml +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/report/mapper/xml/ParamsReportExportHistoryEOMapper.xml @@ -30,7 +30,6 @@ - plb.platform is null AND project_name LIKE CONCAT(CONCAT('%',#{paramsReportExportHistoryEO.projectName}),'%') diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/mapper/xml/OtaManageApplyEOMapper.xml b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/mapper/xml/OtaManageApplyEOMapper.xml index 2c25f3741..7c83b88f7 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/mapper/xml/OtaManageApplyEOMapper.xml +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/mapper/xml/OtaManageApplyEOMapper.xml @@ -135,7 +135,6 @@ JOIN project_year_name_info pyni ON pyni.id = plb.year_name_id where plb.target_market =#{market} and pni.project_name =#{car} - and plb.platform is null GROUP BY plb.id ORDER BY project_version asc @@ -159,7 +158,7 @@ LEFT JOIN ota_manage_apply oma ON oma.project_version = plb.id LEFT JOIN project_name_info pni ON pni.id = plb.project_name_id LEFT JOIN project_year_name_info pyni ON pyni.project_name_id = pni.id - WHERE oma.vdr = #{vdr} and plb.platform is null + WHERE oma.vdr = #{vdr} GROUP BY plb.id diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/mapper/xml/LawsComplianceBoardMapper.xml b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/mapper/xml/LawsComplianceBoardMapper.xml index 001fd64de..ba76e12e3 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/mapper/xml/LawsComplianceBoardMapper.xml +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/mapper/xml/LawsComplianceBoardMapper.xml @@ -108,7 +108,7 @@ LEFT JOIN project_name_info pni ON ( pni.id = plb.project_name_id ) LEFT JOIN project_year_name_info pyni ON ( pyni.id = plb.year_name_id ) WHERE - 1=1 and plb.platform is null + 1=1 and pli.stand_id = #{params.id} diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/mapper/xml/NcrTrackMapper.xml b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/mapper/xml/NcrTrackMapper.xml index 2dfe3aea0..323bd8b58 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/mapper/xml/NcrTrackMapper.xml +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/mapper/xml/NcrTrackMapper.xml @@ -196,7 +196,6 @@ #{item} - and plb.platform is null order by pli.create_time desc diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/mapper/xml/ProblemManagementEOMapper.xml b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/mapper/xml/ProblemManagementEOMapper.xml index 8dce3710c..cbb36f8ad 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/mapper/xml/ProblemManagementEOMapper.xml +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/mapper/xml/ProblemManagementEOMapper.xml @@ -53,7 +53,6 @@ left join sys_user as studiouser on plb.studio_engineer=studiouser.id left join project_year_name_info as pyni on plb.year_name_id=pyni.id - plb.platform is null and plb.id in diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/mapper/xml/ProjectRxswinEOMapper.xml b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/mapper/xml/ProjectRxswinEOMapper.xml index 145e0c75e..1d03212f0 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/mapper/xml/ProjectRxswinEOMapper.xml +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/mapper/xml/ProjectRxswinEOMapper.xml @@ -34,9 +34,8 @@ LEFT JOIN project_name_info AS pni ON plb.project_name_id = pni.id LEFT JOIN project_year_name_info AS pyni ON plb.year_name_id = pyni.id LEFT JOIN sys_dict_item AS sdi ON sdi.item_value = plb.target_market - where plb.platform is null and( + where plb.parent_id = #{parentId} or plb.id = #{id} - )