diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/project/common/PayProjectCommon.java b/jero-boot-incoming-payment/src/main/java/com/jero/project/common/PayProjectCommon.java index 8ef9cfa3..95c6fac0 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/project/common/PayProjectCommon.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/project/common/PayProjectCommon.java @@ -97,17 +97,22 @@ public class PayProjectCommon { public static final Integer YES = 1; /** - * 项目类型1:工作组,2:分标委, 3:理事会 + * 项目类型1:工作组,2:分标委, 3:理事会, 4:起草组 */ public final static Integer PROJECT_TYPE_FILE1 = 1; /** - * 项目类型1:工作组,2:分标委, 3:理事会 + * 项目类型1:工作组,2:分标委, 3:理事会, 4:起草组 */ public final static Integer PROJECT_TYPE_FILE2 = 2; /** - * 项目类型1:工作组,2:分标委, 3:理事会 + * 项目类型1:工作组,2:分标委, 3:理事会, 4:起草组 */ public final static Integer PROJECT_TYPE_FILE3 = 3; + + /** + * 项目类型1:工作组,2:分标委, 3:理事会, 4:起草组 + */ + public final static Integer PROJECT_TYPE_FILE4 = 4; /** * 需要发票(1:增值税普通发票,2:增值税专用发票,0:否,3:需要发票(小程序需要)) */ diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/project/controller/PayWorkingGroupDataFileController.java b/jero-boot-incoming-payment/src/main/java/com/jero/project/controller/PayWorkingGroupDataFileController.java index 254820f8..9714c766 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/project/controller/PayWorkingGroupDataFileController.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/project/controller/PayWorkingGroupDataFileController.java @@ -11,6 +11,8 @@ import com.jero.common.system.base.controller.JeroController; import com.jero.common.system.vo.LoginUser; import com.jero.common.util.ValidUtil; import com.jero.common.util.oConvertUtils; +import com.jero.drafting.entity.PayDraftingGroup; +import com.jero.drafting.service.IPayDraftingGroupService; import com.jero.modules.oss.entity.OSSFile; import com.jero.modules.oss.service.IOSSFileService; import com.jero.project.common.PayProjectCommon; @@ -59,6 +61,9 @@ public class PayWorkingGroupDataFileController extends JeroController