allen před 2 roky
rodič
revize
911ec3814d

+ 1 - 1
kgraph-admin/src/main/resources/mapper/ledger/AirPartInfoMapper.xml

@@ -59,7 +59,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     
     <select id="selectAirPartInfoById" parameterType="Long" resultMap="AirPartInfoResult">
         <include refid="selectAirPartInfoVo"/>
-        where id = #{id}
+        where asi.id = #{id}
     </select>
         
     <insert id="insertAirPartInfo" parameterType="AirPartInfo" useGeneratedKeys="true" keyProperty="id">

+ 1 - 1
kgraph-admin/src/main/resources/mapper/ledger/AirSubsystemInfoMapper.xml

@@ -59,7 +59,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     
     <select id="selectAirSubsystemInfoById" parameterType="Long" resultMap="AirSubsystemInfoResult">
         <include refid="selectAirSubsystemInfoVo"/>
-        where id = #{id}
+        where asi.id = #{id}
     </select>
         
     <insert id="insertAirSubsystemInfo" parameterType="AirSubsystemInfo" useGeneratedKeys="true" keyProperty="id">

+ 1 - 1
kgraph-admin/src/main/resources/mapper/ledger/AirSystemInfoMapper.xml

@@ -59,7 +59,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     
     <select id="selectAirSystemInfoById" parameterType="Long" resultMap="AirSystemInfoResult">
         <include refid="selectAirSystemInfoVo"/>
-        where id = #{id}
+        where asi.id = #{id}
     </select>
         
     <insert id="insertAirSystemInfo" parameterType="AirSystemInfo" useGeneratedKeys="true" keyProperty="id">

+ 24 - 0
sql/update20230504-2.sql

@@ -0,0 +1,24 @@
+use kgraph;
+
+ALTER TABLE `kgraph`.`t_air_system_info`
+ADD COLUMN `name` varchar(64) NULL COMMENT '系统名称' AFTER `id`;
+ALTER TABLE `kgraph`.`t_air_subsystem_info`
+ADD COLUMN `name` varchar(64) NULL COMMENT '分系统名称' AFTER `id`;
+ALTER TABLE `kgraph`.`t_air_part_info`
+ADD COLUMN `name` varchar(64) NULL COMMENT '部件名称' AFTER `id`;
+ALTER TABLE `kgraph`.`t_air_system_status_info`
+ADD COLUMN `name` varchar(64) NULL COMMENT '系统名称' AFTER `id`;
+ALTER TABLE `kgraph`.`t_air_subsystem_status_info`
+ADD COLUMN `name` varchar(64) NULL COMMENT '分系统名称' AFTER `id`;
+ALTER TABLE `kgraph`.`t_air_part_status_info`
+ADD COLUMN `name` varchar(64) NULL COMMENT '部件名称' AFTER `id`;
+
+ALTER TABLE `kgraph`.`t_air_system_status_info`
+MODIFY COLUMN `serial` varchar(64) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '系统编号' AFTER `air_number`,
+MODIFY COLUMN `version` varchar(64) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '版本升级' AFTER `production_date`,
+MODIFY COLUMN `version_update_date` datetime NULL DEFAULT NULL COMMENT '升级时间' AFTER `version`,
+ADD COLUMN `return_factory_time` datetime NULL COMMENT '返厂时间' AFTER `repair_date`,
+ADD COLUMN `repair_item` varchar(255) NULL COMMENT '维修事项' AFTER `return_factory_time`,
+ADD COLUMN `bunch_unit` varchar(255) NULL COMMENT '串件安装飞机号' AFTER `repair_item`;
+
+commit;

+ 7 - 7
sql/update20230504.sql

@@ -46,20 +46,20 @@ values('飞机履历删除', @parentId, '4',  '#', '', 1, 0, 'F', '0', '0', 'led
 insert into sys_menu (menu_name, parent_id, order_num, path, component, is_frame, is_cache, menu_type, visible, status, perms, icon, create_by, create_time, update_by, update_time, remark)
 values('飞机履历导出', @parentId, '5',  '#', '', 1, 0, 'F', '0', '0', 'ledger:airRecord:export',       '#', 'admin', sysdate(), '', null, '');
 
-ALTER TABLE `kgraph2`.`t_air_system_info`
+ALTER TABLE `kgraph`.`t_air_system_info`
 ADD COLUMN `name` varchar(64) NULL COMMENT '系统名称' AFTER `id`;
-ALTER TABLE `kgraph2`.`t_air_subsystem_info`
+ALTER TABLE `kgraph`.`t_air_subsystem_info`
 ADD COLUMN `name` varchar(64) NULL COMMENT '分系统名称' AFTER `id`;
-ALTER TABLE `kgraph2`.`t_air_part_info`
+ALTER TABLE `kgraph`.`t_air_part_info`
 ADD COLUMN `name` varchar(64) NULL COMMENT '部件名称' AFTER `id`;
-ALTER TABLE `kgraph2`.`t_air_system_status_info`
+ALTER TABLE `kgraph`.`t_air_system_status_info`
 ADD COLUMN `name` varchar(64) NULL COMMENT '系统名称' AFTER `id`;
-ALTER TABLE `kgraph2`.`t_air_subsystem_status_info`
+ALTER TABLE `kgraph`.`t_air_subsystem_status_info`
 ADD COLUMN `name` varchar(64) NULL COMMENT '分系统名称' AFTER `id`;
-ALTER TABLE `kgraph2`.`t_air_part_status_info`
+ALTER TABLE `kgraph`.`t_air_part_status_info`
 ADD COLUMN `name` varchar(64) NULL COMMENT '部件名称' AFTER `id`;
 
-ALTER TABLE `kgraph2`.`t_air_system_status_info`
+ALTER TABLE `kgraph`.`t_air_system_status_info`
 MODIFY COLUMN `serial` varchar(64) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '系统编号' AFTER `air_number`,
 MODIFY COLUMN `version` varchar(64) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '版本升级' AFTER `production_date`,
 MODIFY COLUMN `version_update_date` datetime NULL DEFAULT NULL COMMENT '升级时间' AFTER `version`,