增加指令字段， 父ID 增加注释

PHM-admin/phm-admin/src/main/java/com/phm/PHMApplication.java

@@ -14,7 +14,8 @@ public class PHMApplication {
     public static void main(String[] args) {
         // System.setProperty("spring.devtools.restart.enabled", "false");
         SpringApplication.run(PHMApplication.class, args);
-        System.out.println("         ___ ___    _____   \n" +
+        System.out.println(
+                "         ___ ___    _____   \n" +
                 "______  /   |   \\  /     \\  \n" +
                 "\\____ \\/    ~    \\/  \\ /  \\ \n" +
                 "|  |_> >    Y    /    Y    \\\n" +

PHM-admin/phm-manage/src/main/java/com/phm/manage/domain/Product.java

@@ -30,6 +30,7 @@ public class Product extends BaseEntity {
      * 父ID
      */
     @Excel(name = "父ID")
+    @JsonSerialize(using = ToStringSerializer.class)
     private Long parentId;
 
     /**

PHM-admin/phm-manage/src/main/resources/mapper/manage/OrderInfoMapper.xml

@@ -6,6 +6,8 @@
 
     <resultMap type="OrderInfo" id="OrderInfoResult">
         <result property="id" column="id"/>
+        <result property="orderBatchId" column="order_batch_id"/>
+        <result property="orderCode" column="order_code"/>
         <result property="orderName" column="order_name"/>
         <result property="orderType" column="order_type"/>
         <result property="content" column="content"/>
@@ -19,6 +21,8 @@
 
     <sql id="selectOrderInfoVo">
         select id,
+               order_batch_id,
+               order_code,
                order_name,
                order_type,
                content,
@@ -35,6 +39,8 @@
         <include refid="selectOrderInfoVo"/>
         <where>
             <if test="orderName != null  and orderName != ''">and order_name like concat('%', #{orderName}, '%')</if>
+            <if test="orderBatchId != null  and orderBatchId != ''">and order_batch_id = #{orderBatchId}</if>
+            <if test="orderCode != null  and orderCode != ''">and order_code = #{orderCode}</if>
             <if test="orderType != null  and orderType != ''">and order_type = #{orderType}</if>
             <if test="content != null  and content != ''">and content = #{content}</if>
             <if test="status != null ">and status = #{status}</if>
@@ -55,6 +61,8 @@
         insert into PHM.PHM_ORDER_INFO
         <trim prefix="(" suffix=")" suffixOverrides=",">
             <if test="id != null">id,</if>
+            <if test="orderBatchId != null">order_batch_id,</if>
+            <if test="orderCode != null">order_code,</if>
             <if test="orderName != null">order_name,</if>
             <if test="orderType != null">order_type,</if>
             <if test="content != null">content,</if>
@@ -67,6 +75,8 @@
         </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="id != null">#{id},</if>
+            <if test="orderBatchId != null">#{orderBatchId},</if>
+            <if test="orderCode != null">#{orderCode},</if>
             <if test="orderName != null">#{orderName},</if>
             <if test="orderType != null">#{orderType},</if>
             <if test="content != null">#{content},</if>
@@ -82,6 +92,8 @@
     <update id="updateOrderInfo" parameterType="OrderInfo">
         update PHM.PHM_ORDER_INFO
         <trim prefix="SET" suffixOverrides=",">
+            <if test="orderBatchId != null">order_batch_id = #{orderBatchId},</if>
+            <if test="orderCode != null">order_code = #{orderCode},</if>
             <if test="orderName != null">order_name = #{orderName},</if>
             <if test="orderType != null">order_type = #{orderType},</if>
             <if test="content != null">content = #{content},</if>