修改

winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/entity/TranCarInfo.java

@@ -91,14 +91,6 @@ public class TranCarInfo extends BaseModel<TranCarInfo> {
      * 船名
      */
     private String shipName;
-    /**
-     * 反馈状态标识(1执行中3已完成)
-     */
-    private String feedbackStatusFlag;
-    /**
-     * 反馈状态
-     */
-    private String feedbackStatus;
     /**
      * 装车净重
      */

winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/entity/TranProcessInfo.java

@@ -135,6 +135,14 @@ public class TranProcessInfo extends BaseModel<TranProcessInfo> {
      * 签到数
      */
     private Long signCount;
+    /**
+     * 反馈状态标识(1执行中3已完成)
+     */
+    private String feedbackStatusFlag;
+    /**
+     * 反馈状态
+     */
+    private String feedbackStatus;
     /**
      * 接单时间
      */
@@ -206,17 +214,6 @@ public class TranProcessInfo extends BaseModel<TranProcessInfo> {
     @TableField(exist = false)
     private Date endDate;
 
-    /**
-     * 反馈状态标识(1执行中3已完成)
-     */
-    @TableField(exist = false)
-    private String feedbackStatusFlag;
-    /**
-     * 反馈状态
-     */
-    @TableField(exist = false)
-    private String feedbackStatus;
-
     @TableField(exist = false)
     private List<TranCarInfo> tranCarInfoList;
 

winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/service/impl/TranTaskInfoServiceImpl.java

@@ -69,6 +69,8 @@ public class TranTaskInfoServiceImpl extends ServiceImpl<TranTaskInfoMapper, Tra
                 tranProcessInfo.setReceivingDate(tranTaskInfo.getCreateDate());
                 tranProcessInfo.setStatusFlag(StatusEnum.PROCESS_DO.getFlag());
                 tranProcessInfo.setStatus(StatusEnum.PROCESS_DO.getName());
+                tranProcessInfo.setFeedbackStatusFlag(StatusEnum.FEEDBACK_DO.getFlag());
+                tranProcessInfo.setFeedbackStatus(StatusEnum.FEEDBACK_DO.getName());
             }
         }
         //判断任务编号是否唯一

winsea-haixin-plugin-yiliangyiyun/src/main/resources/mapper/TranProcessInfoMapper.xml

@@ -60,6 +60,7 @@
         p.delivery_date_start AS deliveryDateStart,
         p.delivery_date_end AS deliveryDateEnd,
         p.status,
+        p.feedback_status AS feedbackstatus,
         p.receiving_date AS receivingDate
         FROM tran_task_info t
         LEFT JOIN tran_process_info p ON t.id=p.info_id