1
0
suochencheng 7 лет назад
Родитель
Сommit
402f929637

+ 13 - 0
src/main/java/com/izouma/awesomeadmin/model/OrderImage.java

@@ -67,6 +67,11 @@ public class OrderImage {
      */
     private String detailRemark;
 
+    /**
+     * 修改备注状态标注
+     */
+    private String detailRemarkFlag;
+
     /**
      * 目标返修ID
      */
@@ -328,5 +333,13 @@ public class OrderImage {
     public void setCleanFlag(String cleanFlag) {
         this.cleanFlag = cleanFlag;
     }
+
+    public String getDetailRemarkFlag() {
+        return detailRemarkFlag;
+    }
+
+    public void setDetailRemarkFlag(String detailRemarkFlag) {
+        this.detailRemarkFlag = detailRemarkFlag;
+    }
 }
 

+ 3 - 1
src/main/java/com/izouma/awesomeadmin/service/impl/OrderImageServiceImpl.java

@@ -180,7 +180,9 @@ public class OrderImageServiceImpl implements OrderImageService {
                 OrderRepair lastRepair = orderRepairList.get(orderRepairList.size() - 1);
 
                 //如果状态为已结束
-                if (lastRepair.getStatusFlag() == 3 && lastRepair.getTypeFlag() < 2) {
+                if (lastRepair.getStatusFlag() >= 1
+                        && lastRepair.getTypeFlag() < 2
+                        && !StringUtils.isNotEmpty(record.getDetailRemarkFlag())) {
                     nowOrderRepair.setOrderId(record.getOrderId());
                     nowOrderRepair.setUserId(record.getUserId());
                     nowOrderRepair.setStoreId(record.getStoreId());