1

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

@@ -108,6 +108,9 @@ public enum StatusEnum {
     // 收款状态
     NOT_COLLECTION("1", "待回款", ""),
     COLLECTION("3", "已回款", ""),
+    // 收款状态
+    NOT_COLLECTION_PAY("1", "待付款", ""),
+//    COLLECTION("3", "已回款", ""),
 
     // 入驻公司状态
     TO_BE_REVIEWED("1", "待审核", ""),

winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/workflow/ContractCostInfoListener.java

@@ -7,7 +7,7 @@ import com.yh.saas.plugin.yiliangyiyun.entity.ContractCostInfo;
 import com.yh.saas.plugin.yiliangyiyun.service.IContractCostInfoService;
 import org.springframework.beans.factory.annotation.Autowired;
 
-@WorkflowTaskListener(name = "合同管理", group = "合同外费用")
+@WorkflowTaskListener(name = "合同管理", group = "合同费用")
 public class ContractCostInfoListener extends AbstractWorkflowTaskListener {
 
     private static final long serialVersionUID = 4103656734835351132L;
@@ -22,8 +22,8 @@ public class ContractCostInfoListener extends AbstractWorkflowTaskListener {
             return;
         }
         if (processIsEnd) {
-            contractCostInfo.setStatusFlag(StatusEnum.CONTRACT_WAIT.getFlag());
-            contractCostInfo.setStatus(StatusEnum.CONTRACT_WAIT.getName());
+            contractCostInfo.setStatusFlag(StatusEnum.NOT_COLLECTION_PAY.getFlag());
+            contractCostInfo.setStatus(StatusEnum.NOT_COLLECTION_PAY.getName());
             contractCostInfo.setWorkflowId(null);
             contractCostInfo.setApproveStatus(null);
         } else {