dev

kgraph-admin/src/main/java/com/kgraph/web/domain/AirPartStatusInfo.java

@@ -20,6 +20,10 @@ public class AirPartStatusInfo extends BaseEntity
     /** 序号 */
     private Long id;
 
+    /** 部件名称 */
+    @Excel(name = "部件名称")
+    private String name;
+
     /** 部件id */
     private Long airPartId;
 
@@ -70,6 +74,15 @@ public class AirPartStatusInfo extends BaseEntity
     {
         return id;
     }
+    public void setName(String name) 
+    {
+        this.name = name;
+    }
+
+    public String getName() 
+    {
+        return name;
+    }
     public void setAirPartId(Long airPartId) 
     {
         this.airPartId = airPartId;
@@ -165,6 +178,7 @@ public class AirPartStatusInfo extends BaseEntity
     public String toString() {
         return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
             .append("id", getId())
+            .append("name", getName())
             .append("airPartId", getAirPartId())
             .append("airModelId", getAirModelId())
             .append("airNumber", getAirNumber())

kgraph-admin/src/main/java/com/kgraph/web/domain/AirSubsystemStatusInfo.java

@@ -11,7 +11,7 @@ import com.kgraph.common.core.domain.BaseEntity;;
  * 分系统履历对象 t_air_subsystem_status_info
  * 
  * @author Allen
- * @date 2023-04-16
+ * @date 2023-05-05
  */
 public class AirSubsystemStatusInfo extends BaseEntity
 {
@@ -20,10 +20,16 @@ public class AirSubsystemStatusInfo extends BaseEntity
     /** 序号 */
     private Long id;
 
+    /** 分系统名称 */
+    @Excel(name = "分系统名称")
+    private String name;
+
     /** 子系统id */
+    @Excel(name = "子系统id")
     private Long airSubsystemId;
 
     /** 机号id */
+    @Excel(name = "机号id")
     private Long airModelId;
 
     /** 机号 */
@@ -70,6 +76,15 @@ public class AirSubsystemStatusInfo extends BaseEntity
     {
         return id;
     }
+    public void setName(String name) 
+    {
+        this.name = name;
+    }
+
+    public String getName() 
+    {
+        return name;
+    }
     public void setAirSubsystemId(Long airSubsystemId) 
     {
         this.airSubsystemId = airSubsystemId;
@@ -165,6 +180,7 @@ public class AirSubsystemStatusInfo extends BaseEntity
     public String toString() {
         return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
             .append("id", getId())
+            .append("name", getName())
             .append("airSubsystemId", getAirSubsystemId())
             .append("airModelId", getAirModelId())
             .append("airNumber", getAirNumber())

kgraph-admin/src/main/java/com/kgraph/web/domain/AirSystemStatusInfo.java

@@ -20,6 +20,10 @@ public class AirSystemStatusInfo extends BaseEntity
     /** 序号 */
     private Long id;
 
+    /** 系统名称 */
+    @Excel(name = "系统名称")
+    private String name;
+
     /** 系统id */
     private Long airSystemId;
 
@@ -34,8 +38,8 @@ public class AirSystemStatusInfo extends BaseEntity
     @Excel(name = "机号")
     private String airNumber;
 
-    /** 编号 */
-    @Excel(name = "编号")
+    /** 系统编号 */
+    @Excel(name = "系统编号")
     private String serial;
 
     /** 出厂日期 */
@@ -43,13 +47,13 @@ public class AirSystemStatusInfo extends BaseEntity
     @Excel(name = "出厂日期", width = 30, dateFormat = "yyyy-MM-dd")
     private Date productionDate;
 
-    /** 版本号 */
-    @Excel(name = "版本号")
+    /** 版本升级 */
+    @Excel(name = "版本升级")
     private String version;
 
-    /** 出厂日期 */
+    /** 升级时间 */
     @JsonFormat(pattern = "yyyy-MM-dd")
-    @Excel(name = "出厂日期", width = 30, dateFormat = "yyyy-MM-dd")
+    @Excel(name = "升级时间", width = 30, dateFormat = "yyyy-MM-dd")
     private Date versionUpdateDate;
 
     /** 维修次数 */
@@ -61,6 +65,19 @@ public class AirSystemStatusInfo extends BaseEntity
     @Excel(name = "维修时间", width = 30, dateFormat = "yyyy-MM-dd")
     private Date repairDate;
 
+    /** 返厂时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "返厂时间", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date returnFactoryTime;
+
+    /** 维修事项 */
+    @Excel(name = "维修事项")
+    private String repairItem;
+
+    /** 串件安装飞机号 */
+    @Excel(name = "串件安装飞机号")
+    private String bunchUnit;
+
     public void setId(Long id) 
     {
         this.id = id;
@@ -70,6 +87,15 @@ public class AirSystemStatusInfo extends BaseEntity
     {
         return id;
     }
+    public void setName(String name) 
+    {
+        this.name = name;
+    }
+
+    public String getName() 
+    {
+        return name;
+    }
     public void setAirSystemId(Long airSystemId) 
     {
         this.airSystemId = airSystemId;
@@ -160,11 +186,39 @@ public class AirSystemStatusInfo extends BaseEntity
     {
         return repairDate;
     }
+    public void setReturnFactoryTime(Date returnFactoryTime) 
+    {
+        this.returnFactoryTime = returnFactoryTime;
+    }
+
+    public Date getReturnFactoryTime() 
+    {
+        return returnFactoryTime;
+    }
+    public void setRepairItem(String repairItem) 
+    {
+        this.repairItem = repairItem;
+    }
+
+    public String getRepairItem() 
+    {
+        return repairItem;
+    }
+    public void setBunchUnit(String bunchUnit) 
+    {
+        this.bunchUnit = bunchUnit;
+    }
+
+    public String getBunchUnit() 
+    {
+        return bunchUnit;
+    }
 
     @Override
     public String toString() {
         return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
             .append("id", getId())
+            .append("name", getName())
             .append("airSystemId", getAirSystemId())
             .append("modelNumber", getModelNumber())
             .append("airModelId", getAirModelId())
@@ -175,6 +229,9 @@ public class AirSystemStatusInfo extends BaseEntity
             .append("versionUpdateDate", getVersionUpdateDate())
             .append("repairTimes", getRepairTimes())
             .append("repairDate", getRepairDate())
+            .append("returnFactoryTime", getReturnFactoryTime())
+            .append("repairItem", getRepairItem())
+            .append("bunchUnit", getBunchUnit())
             .append("createBy", getCreateBy())
             .append("createTime", getCreateTime())
             .append("updateBy", getUpdateBy())

kgraph-admin/src/main/java/com/kgraph/web/mapper/AirPartStatusInfoMapper.java

@@ -7,7 +7,7 @@ import com.kgraph.web.domain.AirPartStatusInfo;
  * 部件履历Mapper接口
  * 
  * @author Allen
- * @date 2023-04-16
+ * @date 2023-05-05
  */
 public interface AirPartStatusInfoMapper 
 {

kgraph-admin/src/main/java/com/kgraph/web/mapper/AirSubsystemStatusInfoMapper.java

@@ -7,7 +7,7 @@ import com.kgraph.web.domain.AirSubsystemStatusInfo;
  * 分系统履历Mapper接口
  * 
  * @author Allen
- * @date 2023-04-16
+ * @date 2023-05-05
  */
 public interface AirSubsystemStatusInfoMapper 
 {

kgraph-admin/src/main/resources/mapper/ledger/AirPartStatusInfoMapper.xml

@@ -6,6 +6,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     
     <resultMap type="AirPartStatusInfo" id="AirPartStatusInfoResult">
         <result property="id"    column="id"    />
+        <result property="name"    column="name"    />
         <result property="airPartId"    column="air_part_id"    />
         <result property="airModelId"    column="air_model_id"    />
         <result property="airNumber"    column="air_number"    />
@@ -23,12 +24,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </resultMap>
 
     <sql id="selectAirPartStatusInfoVo">
-        select id, air_part_id, air_model_id, air_number, model_number, serial, production_date, version, version_update_date, repair_times, repair_date, create_by, create_time, update_by, update_time from t_air_part_status_info
+        select id, name, air_part_id, air_model_id, air_number, model_number, serial, production_date, version, version_update_date, repair_times, repair_date, create_by, create_time, update_by, update_time from t_air_part_status_info
     </sql>
 
     <select id="selectAirPartStatusInfoList" parameterType="AirPartStatusInfo" resultMap="AirPartStatusInfoResult">
         <include refid="selectAirPartStatusInfoVo"/>
         <where>  
+            <if test="name != null  and name != ''"> and name like concat('%', #{name}, '%')</if>
             <if test="airPartId != null "> and air_part_id = #{airPartId}</if>
             <if test="airModelId != null "> and air_model_id = #{airModelId}</if>
             <if test="airNumber != null  and airNumber != ''"> and air_number = #{airNumber}</if>
@@ -50,6 +52,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <insert id="insertAirPartStatusInfo" parameterType="AirPartStatusInfo" useGeneratedKeys="true" keyProperty="id">
         insert into t_air_part_status_info
         <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="name != null">name,</if>
             <if test="airPartId != null">air_part_id,</if>
             <if test="airModelId != null">air_model_id,</if>
             <if test="airNumber != null">air_number,</if>
@@ -66,6 +69,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="updateTime != null">update_time,</if>
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="name != null">#{name},</if>
             <if test="airPartId != null">#{airPartId},</if>
             <if test="airModelId != null">#{airModelId},</if>
             <if test="airNumber != null">#{airNumber},</if>
@@ -86,6 +90,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <update id="updateAirPartStatusInfo" parameterType="AirPartStatusInfo">
         update t_air_part_status_info
         <trim prefix="SET" suffixOverrides=",">
+            <if test="name != null">name = #{name},</if>
             <if test="airPartId != null">air_part_id = #{airPartId},</if>
             <if test="airModelId != null">air_model_id = #{airModelId},</if>
             <if test="airNumber != null">air_number = #{airNumber},</if>

kgraph-admin/src/main/resources/mapper/ledger/AirSubsystemStatusInfoMapper.xml

@@ -6,6 +6,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     
     <resultMap type="AirSubsystemStatusInfo" id="AirSubsystemStatusInfoResult">
         <result property="id"    column="id"    />
+        <result property="name"    column="name"    />
         <result property="airSubsystemId"    column="air_subsystem_id"    />
         <result property="airModelId"    column="air_model_id"    />
         <result property="airNumber"    column="air_number"    />
@@ -23,12 +24,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </resultMap>
 
     <sql id="selectAirSubsystemStatusInfoVo">
-        select id, air_subsystem_id, air_model_id, air_number, model_number, serial, production_date, version, version_update_date, repair_times, repair_date, create_by, create_time, update_by, update_time from t_air_subsystem_status_info
+        select id, name, air_subsystem_id, air_model_id, air_number, model_number, serial, production_date, version, version_update_date, repair_times, repair_date, create_by, create_time, update_by, update_time from t_air_subsystem_status_info
     </sql>
 
     <select id="selectAirSubsystemStatusInfoList" parameterType="AirSubsystemStatusInfo" resultMap="AirSubsystemStatusInfoResult">
         <include refid="selectAirSubsystemStatusInfoVo"/>
         <where>  
+            <if test="name != null  and name != ''"> and name like concat('%', #{name}, '%')</if>
             <if test="airSubsystemId != null "> and air_subsystem_id = #{airSubsystemId}</if>
             <if test="airModelId != null "> and air_model_id = #{airModelId}</if>
             <if test="airNumber != null  and airNumber != ''"> and air_number = #{airNumber}</if>
@@ -50,6 +52,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <insert id="insertAirSubsystemStatusInfo" parameterType="AirSubsystemStatusInfo" useGeneratedKeys="true" keyProperty="id">
         insert into t_air_subsystem_status_info
         <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="name != null">name,</if>
             <if test="airSubsystemId != null">air_subsystem_id,</if>
             <if test="airModelId != null">air_model_id,</if>
             <if test="airNumber != null">air_number,</if>
@@ -66,6 +69,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="updateTime != null">update_time,</if>
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="name != null">#{name},</if>
             <if test="airSubsystemId != null">#{airSubsystemId},</if>
             <if test="airModelId != null">#{airModelId},</if>
             <if test="airNumber != null">#{airNumber},</if>
@@ -86,6 +90,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <update id="updateAirSubsystemStatusInfo" parameterType="AirSubsystemStatusInfo">
         update t_air_subsystem_status_info
         <trim prefix="SET" suffixOverrides=",">
+            <if test="name != null">name = #{name},</if>
             <if test="airSubsystemId != null">air_subsystem_id = #{airSubsystemId},</if>
             <if test="airModelId != null">air_model_id = #{airModelId},</if>
             <if test="airNumber != null">air_number = #{airNumber},</if>

kgraph-admin/src/main/resources/mapper/ledger/AirSystemStatusInfoMapper.xml

@@ -6,6 +6,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     
     <resultMap type="AirSystemStatusInfo" id="AirSystemStatusInfoResult">
         <result property="id"    column="id"    />
+        <result property="name"    column="name"    />
         <result property="airSystemId"    column="air_system_id"    />
         <result property="modelNumber"    column="model_number"    />
         <result property="airModelId"    column="air_model_id"    />
@@ -16,6 +17,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="versionUpdateDate"    column="version_update_date"    />
         <result property="repairTimes"    column="repair_times"    />
         <result property="repairDate"    column="repair_date"    />
+        <result property="returnFactoryTime"    column="return_factory_time"    />
+        <result property="repairItem"    column="repair_item"    />
+        <result property="bunchUnit"    column="bunch_unit"    />
         <result property="createBy"    column="create_by"    />
         <result property="createTime"    column="create_time"    />
         <result property="updateBy"    column="update_by"    />
@@ -23,12 +27,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </resultMap>
 
     <sql id="selectAirSystemStatusInfoVo">
-        select id, air_system_id, model_number, air_model_id, air_number, serial, production_date, version, version_update_date, repair_times, repair_date, create_by, create_time, update_by, update_time from t_air_system_status_info
+        select id, name, air_system_id, model_number, air_model_id, air_number, serial, production_date, version, version_update_date, repair_times, repair_date, return_factory_time, repair_item, bunch_unit, create_by, create_time, update_by, update_time from t_air_system_status_info
     </sql>
 
     <select id="selectAirSystemStatusInfoList" parameterType="AirSystemStatusInfo" resultMap="AirSystemStatusInfoResult">
         <include refid="selectAirSystemStatusInfoVo"/>
         <where>  
+            <if test="name != null  and name != ''"> and name like concat('%', #{name}, '%')</if>
             <if test="airSystemId != null "> and air_system_id = #{airSystemId}</if>
             <if test="modelNumber != null  and modelNumber != ''"> and model_number = #{modelNumber}</if>
             <if test="airModelId != null "> and air_model_id = #{airModelId}</if>
@@ -39,6 +44,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="versionUpdateDate != null "> and version_update_date = #{versionUpdateDate}</if>
             <if test="repairTimes != null "> and repair_times = #{repairTimes}</if>
             <if test="repairDate != null "> and repair_date = #{repairDate}</if>
+            <if test="returnFactoryTime != null "> and return_factory_time = #{returnFactoryTime}</if>
+            <if test="repairItem != null  and repairItem != ''"> and repair_item = #{repairItem}</if>
+            <if test="bunchUnit != null  and bunchUnit != ''"> and bunch_unit = #{bunchUnit}</if>
         </where>
     </select>
     
@@ -50,6 +58,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <insert id="insertAirSystemStatusInfo" parameterType="AirSystemStatusInfo" useGeneratedKeys="true" keyProperty="id">
         insert into t_air_system_status_info
         <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="name != null">name,</if>
             <if test="airSystemId != null">air_system_id,</if>
             <if test="modelNumber != null">model_number,</if>
             <if test="airModelId != null">air_model_id,</if>
@@ -60,12 +69,16 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="versionUpdateDate != null">version_update_date,</if>
             <if test="repairTimes != null">repair_times,</if>
             <if test="repairDate != null">repair_date,</if>
+            <if test="returnFactoryTime != null">return_factory_time,</if>
+            <if test="repairItem != null">repair_item,</if>
+            <if test="bunchUnit != null">bunch_unit,</if>
             <if test="createBy != null">create_by,</if>
             <if test="createTime != null">create_time,</if>
             <if test="updateBy != null">update_by,</if>
             <if test="updateTime != null">update_time,</if>
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="name != null">#{name},</if>
             <if test="airSystemId != null">#{airSystemId},</if>
             <if test="modelNumber != null">#{modelNumber},</if>
             <if test="airModelId != null">#{airModelId},</if>
@@ -76,6 +89,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="versionUpdateDate != null">#{versionUpdateDate},</if>
             <if test="repairTimes != null">#{repairTimes},</if>
             <if test="repairDate != null">#{repairDate},</if>
+            <if test="returnFactoryTime != null">#{returnFactoryTime},</if>
+            <if test="repairItem != null">#{repairItem},</if>
+            <if test="bunchUnit != null">#{bunchUnit},</if>
             <if test="createBy != null">#{createBy},</if>
             <if test="createTime != null">#{createTime},</if>
             <if test="updateBy != null">#{updateBy},</if>
@@ -86,6 +102,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <update id="updateAirSystemStatusInfo" parameterType="AirSystemStatusInfo">
         update t_air_system_status_info
         <trim prefix="SET" suffixOverrides=",">
+            <if test="name != null">name = #{name},</if>
             <if test="airSystemId != null">air_system_id = #{airSystemId},</if>
             <if test="modelNumber != null">model_number = #{modelNumber},</if>
             <if test="airModelId != null">air_model_id = #{airModelId},</if>
@@ -96,6 +113,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="versionUpdateDate != null">version_update_date = #{versionUpdateDate},</if>
             <if test="repairTimes != null">repair_times = #{repairTimes},</if>
             <if test="repairDate != null">repair_date = #{repairDate},</if>
+            <if test="returnFactoryTime != null">return_factory_time = #{returnFactoryTime},</if>
+            <if test="repairItem != null">repair_item = #{repairItem},</if>
+            <if test="bunchUnit != null">bunch_unit = #{bunchUnit},</if>
             <if test="createBy != null">create_by = #{createBy},</if>
             <if test="createTime != null">create_time = #{createTime},</if>
             <if test="updateBy != null">update_by = #{updateBy},</if>

sql/update20230504.sql

@@ -59,4 +59,12 @@ ADD COLUMN `name` varchar(64) NULL COMMENT '分系统名称' AFTER `id`;
 ALTER TABLE `kgraph2`.`t_air_part_status_info`
 ADD COLUMN `name` varchar(64) NULL COMMENT '部件名称' AFTER `id`;
 
+ALTER TABLE `kgraph2`.`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;