Skip to content

W
warehouse
提交 d52c0118 作者: chaining
操作

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

父级 ba82340f
正在显示 包含 37 行增加 和 35 行删除
pom.xml
...@@ -125,16 +125,16 @@ ...@@ -125,16 +125,16 @@
<artifactId>mapstruct</artifactId> <!-- use mapstruct-jdk8 for Java 8 or higher --> <artifactId>mapstruct</artifactId> <!-- use mapstruct-jdk8 for Java 8 or higher -->
<version>${mapstruct.version}</version> <version>${mapstruct.version}</version>
</dependency> </dependency>
<dependency> <!-- <dependency>-->
<groupId>org.mapstruct</groupId> <!-- <groupId>org.mapstruct</groupId>-->
<artifactId>mapstruct-jdk8</artifactId> <!-- <artifactId>mapstruct-jdk8</artifactId>-->
<version>${mapstruct.version}</version> <!-- <version>${mapstruct.version}</version>-->
</dependency> <!-- </dependency>-->
<dependency> <!-- <dependency>-->
<groupId>org.mapstruct</groupId> <!-- <groupId>org.mapstruct</groupId>-->
<artifactId>mapstruct-processor</artifactId> <!-- <artifactId>mapstruct-processor</artifactId>-->
<version>${mapstruct.version}</version> <!-- <version>${mapstruct.version}</version>-->
</dependency> <!-- </dependency>-->
<dependency> <dependency>
<groupId>com.alibaba</groupId> <groupId>com.alibaba</groupId>
<artifactId>easyexcel</artifactId> <artifactId>easyexcel</artifactId>
...@@ -174,24 +174,24 @@ ...@@ -174,24 +174,24 @@
</execution> </execution>
</executions> </executions>
</plugin> </plugin>
<plugin> <!-- <plugin>-->
<groupId>org.apache.maven.plugins</groupId> <!-- <groupId>org.apache.maven.plugins</groupId>-->
<artifactId>maven-pmd-plugin</artifactId> <!-- <artifactId>maven-pmd-plugin</artifactId>-->
<configuration> <!-- <configuration>-->
<printFailingErrors>true</printFailingErrors> <!-- <printFailingErrors>true</printFailingErrors>-->
<excludes> <!-- <excludes>-->
<exclude>**/call/*</exclude> <!-- <exclude>**/call/*</exclude>-->
<exclude>**/entity/**</exclude> <!-- <exclude>**/entity/**</exclude>-->
<exclude>**/service/**</exclude> <!-- <exclude>**/service/**</exclude>-->
<exclude>**/downloadfile/**</exclude> <!-- <exclude>**/downloadfile/**</exclude>-->
<exclude>**/export/**</exclude> <!-- <exclude>**/export/**</exclude>-->
<exclude>**/OrderImport.java</exclude> <!-- <exclude>**/OrderImport.java</exclude>-->
<exclude>**/wx/**</exclude> <!-- <exclude>**/wx/**</exclude>-->
<exclude>**/app/**</exclude> <!-- <exclude>**/app/**</exclude>-->
<exclude>**/ScheduleTask.java</exclude> <!-- <exclude>**/ScheduleTask.java</exclude>-->
</excludes> <!-- </excludes>-->
</configuration> <!-- </configuration>-->
</plugin> <!-- </plugin>-->
</plugins> </plugins>
</build> </build>
......
src/main/java/com/boco/nbd/wios/downloadfile/controller/CreateEntityGroup.java
package com.boco.nbd.wios.downloadfile.controller; package com.boco.nbd.wios.downloadfile.controller;
/**
*
* @author administrator
*/
public interface CreateEntityGroup { public interface CreateEntityGroup {
} }
src/main/java/com/boco/nbd/wios/flow/entity/po/OrderPO.java
...@@ -153,11 +153,6 @@ public class OrderPO implements Serializable { ...@@ -153,11 +153,6 @@ public class OrderPO implements Serializable {
@EnumConvert() @EnumConvert()
private Integer status; private Integer status;
@Column(name = "status")
@ApiModelProperty(value = "订单状态编码")
private Integer statusKey;
@Column(name = "type") @Column(name = "type")
@ApiModelProperty(value = "类型 1：普通订单 2：移桩订单") @ApiModelProperty(value = "类型 1：普通订单 2：移桩订单")
@EnumConvert() @EnumConvert()
......
src/main/java/com/boco/nbd/wios/flow/service/impl/OrderServiceImpl.java
...@@ -291,7 +291,7 @@ public class OrderServiceImpl extends BaseDaoService3<OrderPO, FlowOrderMapper> ...@@ -291,7 +291,7 @@ public class OrderServiceImpl extends BaseDaoService3<OrderPO, FlowOrderMapper>
order = new OrderPO(); order = new OrderPO();
} }
BeanUtil.copyProperties(order, bo); BeanUtil.copyProperties(order, bo);
order.setStatusKey(order.getStatus()); bo.setStatusKey(order.getStatus());
//状态 //状态
bo.setStatusStr(order.getStatus() == null ? "" : OrderStatus.getText(order.getStatus())); bo.setStatusStr(order.getStatus() == null ? "" : OrderStatus.getText(order.getStatus()));
bo.setElectricExpand(order.getElectricExpandTime() != null); bo.setElectricExpand(order.getElectricExpandTime() != null);
...@@ -342,7 +342,6 @@ public class OrderServiceImpl extends BaseDaoService3<OrderPO, FlowOrderMapper> ...@@ -342,7 +342,6 @@ public class OrderServiceImpl extends BaseDaoService3<OrderPO, FlowOrderMapper>
//个性处理运行时长 //个性处理运行时长
order.setRunTimeValue(); order.setRunTimeValue();
} }
order.setStatusKey(order.getStatus());
//order中保留关闭节点的nodeFlag //order中保留关闭节点的nodeFlag
order.setNodeFlag(Convert.toInt(item.getNodeFlag())); order.setNodeFlag(Convert.toInt(item.getNodeFlag()));
map.putAll(ProcessUtil.getFilterFields(order, filterFieldsBO, createEnumMap())); 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; ...@@ -4,6 +4,7 @@ import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
import lombok.Data; import lombok.Data;
import javax.persistence.Transient;
import java.util.Date; import java.util.Date;
/** /**
...@@ -51,6 +52,9 @@ public class MinaOrderBO { ...@@ -51,6 +52,9 @@ public class MinaOrderBO {
@ApiModelProperty(value = "订单状态") @ApiModelProperty(value = "订单状态")
private String statusStr; private String statusStr;
@ApiModelProperty(value = "订单状态编码")
private Integer statusKey;
@ApiModelProperty(value = "主机厂ID") @ApiModelProperty(value = "主机厂ID")
private Integer oemId; private Integer oemId;
......
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论