fix: 修复新增订单statusKey重复问题

pom.xml

@@ -125,16 +125,16 @@
             <artifactId>mapstruct</artifactId> <!-- use mapstruct-jdk8 for Java 8 or higher -->
             <version>${mapstruct.version}</version>
         </dependency>
-        <dependency>
-            <groupId>org.mapstruct</groupId>
-            <artifactId>mapstruct-jdk8</artifactId>
-            <version>${mapstruct.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.mapstruct</groupId>
-            <artifactId>mapstruct-processor</artifactId>
-            <version>${mapstruct.version}</version>
-        </dependency>
+<!--        <dependency>-->
+<!--            <groupId>org.mapstruct</groupId>-->
+<!--            <artifactId>mapstruct-jdk8</artifactId>-->
+<!--            <version>${mapstruct.version}</version>-->
+<!--        </dependency>-->
+<!--        <dependency>-->
+<!--            <groupId>org.mapstruct</groupId>-->
+<!--            <artifactId>mapstruct-processor</artifactId>-->
+<!--            <version>${mapstruct.version}</version>-->
+<!--        </dependency>-->
         <dependency>
             <groupId>com.alibaba</groupId>
             <artifactId>easyexcel</artifactId>
@@ -174,24 +174,24 @@
                     </execution>
                 </executions>
             </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-pmd-plugin</artifactId>
-                <configuration>
-                    <printFailingErrors>true</printFailingErrors>
-                    <excludes>
-                        <exclude>**/call/*</exclude>
-                        <exclude>**/entity/**</exclude>
-                        <exclude>**/service/**</exclude>
-                        <exclude>**/downloadfile/**</exclude>
-                        <exclude>**/export/**</exclude>
-                        <exclude>**/OrderImport.java</exclude>
-                        <exclude>**/wx/**</exclude>
-                        <exclude>**/app/**</exclude>
-                        <exclude>**/ScheduleTask.java</exclude>
-                    </excludes>
-                </configuration>
-            </plugin>
+<!--            <plugin>-->
+<!--                <groupId>org.apache.maven.plugins</groupId>-->
+<!--                <artifactId>maven-pmd-plugin</artifactId>-->
+<!--                <configuration>-->
+<!--                    <printFailingErrors>true</printFailingErrors>-->
+<!--                    <excludes>-->
+<!--                        <exclude>**/call/*</exclude>-->
+<!--                        <exclude>**/entity/**</exclude>-->
+<!--                        <exclude>**/service/**</exclude>-->
+<!--                        <exclude>**/downloadfile/**</exclude>-->
+<!--                        <exclude>**/export/**</exclude>-->
+<!--                        <exclude>**/OrderImport.java</exclude>-->
+<!--                        <exclude>**/wx/**</exclude>-->
+<!--                        <exclude>**/app/**</exclude>-->
+<!--                        <exclude>**/ScheduleTask.java</exclude>-->
+<!--                    </excludes>-->
+<!--                </configuration>-->
+<!--            </plugin>-->
         </plugins>
 
     </build>

src/main/java/com/boco/nbd/wios/downloadfile/controller/CreateEntityGroup.java

 package com.boco.nbd.wios.downloadfile.controller;
 
+/**
+ *
+ * @author administrator
+ */
 public interface CreateEntityGroup {
 }

src/main/java/com/boco/nbd/wios/flow/entity/po/OrderPO.java

@@ -153,11 +153,6 @@ public class OrderPO implements Serializable {
     @EnumConvert()
     private Integer status;
 
-    @Column(name = "status")
-    @ApiModelProperty(value = "订单状态编码")
-    private Integer statusKey;
-
-
     @Column(name = "type")
     @ApiModelProperty(value = "类型 1：普通订单 2：移桩订单")
     @EnumConvert()

src/main/java/com/boco/nbd/wios/flow/service/impl/OrderServiceImpl.java

@@ -291,7 +291,7 @@ public class OrderServiceImpl extends BaseDaoService3<OrderPO, FlowOrderMapper>
                 order = new OrderPO();
             }
             BeanUtil.copyProperties(order, bo);
-            order.setStatusKey(order.getStatus());
+            bo.setStatusKey(order.getStatus());
             //状态
             bo.setStatusStr(order.getStatus() == null ? "" : OrderStatus.getText(order.getStatus()));
             bo.setElectricExpand(order.getElectricExpandTime() != null);
@@ -342,7 +342,6 @@ public class OrderServiceImpl extends BaseDaoService3<OrderPO, FlowOrderMapper>
                 //个性处理运行时长
                 order.setRunTimeValue();
             }
-            order.setStatusKey(order.getStatus());
             //order中保留关闭节点的nodeFlag
             order.setNodeFlag(Convert.toInt(item.getNodeFlag()));
             map.putAll(ProcessUtil.getFilterFields(order, filterFieldsBO, createEnumMap()));

src/main/java/com/boco/nbd/wios/wx/entity/bo/MinaOrderBO.java

@@ -4,6 +4,7 @@ import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import javax.persistence.Transient;
 import java.util.Date;
 
 /**
@@ -51,6 +52,9 @@ public class MinaOrderBO {
     @ApiModelProperty(value = "订单状态")
     private String statusStr;
 
+    @ApiModelProperty(value = "订单状态编码")
+    private Integer statusKey;
+
     @ApiModelProperty(value = "主机厂ID")
     private Integer oemId;