zxz 4 rokov pred
rodič
commit
4e54bc95fa

+ 4 - 0
winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/constant/StatusEnum.java

@@ -49,6 +49,10 @@ public enum StatusEnum {
     FEEDBACK_DO("1", "执行中", "Under implementation"),
     FEEDBACK_COMPLETED("3", "已完成", "Completed"),
 
+    //签订合同状态
+    NOT_SIGNED("1", "未签合同", "not_signed"),
+    SIGNED("3", "已签合同", "signed"),
+
 
 
     ;

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

@@ -124,7 +124,7 @@ public class TranCarInfo extends BaseModel<TranCarInfo> {
      */
     private String signStatus;
     /**
-     * 签订状态标识(1已签合同3未签合同)
+     * 签订状态标识(1未签合同3已签合同)
      */
     private String signStatusFlag;
     /**

+ 2 - 0
winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/service/impl/TranProcessInfoServiceImpl.java

@@ -126,6 +126,8 @@ public class TranProcessInfoServiceImpl extends ServiceImpl<TranProcessInfoMappe
                     tranCarInfo.setProcessId(tranProcessInfo.getId());
                     tranCarInfo.setInfoId(tranProcessInfo.getInfoId());
                     tranCarInfo.setId(IdGenerator.generateUUID());
+                    tranCarInfo.setSignStatus(StatusEnum.NOT_SIGNED.getName());
+                    tranCarInfo.setSignStatusFlag(StatusEnum.NOT_SIGNED.getFlag());
                     //汽运类型
                     if(tranCarInfo.getTranType().equals(NumberConstant.CONSTANT1)){
                         tranCarInfo.setStatusFlag(StatusEnum.NOT_DELIVERED.getFlag());

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

@@ -60,7 +60,11 @@
         p.delivery_date_start AS deliveryDateStart,
         p.delivery_date_end AS deliveryDateEnd,
         p.status,
-        p.feedback_status AS feedbackstatus,
+        p.status_flag AS statusFlag,
+        p.tran_type AS tranType,
+        p.tran_type_key AS tranTypeKey,
+        p.feedback_status AS feedbackStatus,
+        p.feedback_status_flag AS feedbackStatusFlag,
         p.receiving_date AS receivingDate
         FROM tran_task_info t
         LEFT JOIN tran_process_info p ON t.id=p.info_id