diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/common/common/ProjectCommon.java b/jero-boot-incoming-payment/src/main/java/com/jero/common/common/ProjectCommon.java index 8b59a143..2dd71d98 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/common/common/ProjectCommon.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/common/common/ProjectCommon.java @@ -38,9 +38,9 @@ public class ProjectCommon { */ public final static String PROJECT_TYPE6 = "6"; /** - * 项目类型(1:普通项目,2:工作组项目,3:会议项目,4:会员项目,5:标协会员项目,6:证书,9: 起草组项目) + * 项目类型(1:普通项目,2:工作组项目,3:会议项目,4:会员项目,5:标协会员项目,6:证书,7: 起草组项目) */ - public final static String PROJECT_TYPE9 = "9"; + public final static String PROJECT_TYPE7 = "7"; /** * 来源(1:收入合同,2:打包管理) */ @@ -208,4 +208,6 @@ public class ProjectCommon { * 条件 0为发送创建通知,1为发送缴费通知 */ public final static String FLAG1 = "1"; + + public final static String INFO_TYPE9 = "9"; } diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/common/service/impl/ProjectDetailServiceImpl.java b/jero-boot-incoming-payment/src/main/java/com/jero/common/service/impl/ProjectDetailServiceImpl.java index fe5a0f0b..b242e605 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/common/service/impl/ProjectDetailServiceImpl.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/common/service/impl/ProjectDetailServiceImpl.java @@ -139,7 +139,7 @@ public class ProjectDetailServiceImpl implements ProjectDetailService { } // 起草组项目资料 - if(Objects.equals(String.valueOf(payCommonProject.getProjectType()), ProjectCommon.PROJECT_TYPE9)){ + if(Objects.equals(String.valueOf(payCommonProject.getProjectType()), ProjectCommon.PROJECT_TYPE7)){ LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal(); LambdaQueryWrapper queryPayWorkingGroupDistributionRecord = new LambdaQueryWrapper<>(); queryPayWorkingGroupDistributionRecord.eq(PayWorkingGroupDistributionRecord::getSubId,projectId); @@ -302,7 +302,7 @@ public class ProjectDetailServiceImpl implements ProjectDetailService { projectDetailVO.setPayWorkingGroupSubItemContactsList(listPayWorkingGroupSubItemContacts); } } - }else if(Objects.equals(String.valueOf(payCommonProject.getProjectType()), ProjectCommon.PROJECT_TYPE9)) { + }else if(Objects.equals(String.valueOf(payCommonProject.getProjectType()), ProjectCommon.PROJECT_TYPE7)) { PayDraftingGroupSubItem payDraftingGroupSubItem = payDraftingGroupSubItemService.getById(projectId); if(Objects.isNull(payDraftingGroupSubItem)){ throw new JeroBootException("项目不存在!"); diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/drafting/service/impl/PayDraftingGroupServiceImpl.java b/jero-boot-incoming-payment/src/main/java/com/jero/drafting/service/impl/PayDraftingGroupServiceImpl.java index eb80de79..c19e818a 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/drafting/service/impl/PayDraftingGroupServiceImpl.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/drafting/service/impl/PayDraftingGroupServiceImpl.java @@ -355,13 +355,12 @@ public class PayDraftingGroupServiceImpl extends ServiceImpl{ JSONObject json = new JSONObject(); - json.put("type", ProjectCommon.PROJECT_TYPE9); + json.put("type", ProjectCommon.INFO_TYPE9); json.put("DraftingGroupId",p.getDraftingGroupId()); json.put("projectId",p.getId()); - json.put("path","/workTeam/WorkTeamDetail"); + json.put("path","/draftTeam/DraftTeamDetail"); //新建项目 给企业联系人发消息 List itemContactsList = p.getPayDraftingGroupSubItemContactsList(); for (PayDraftingGroupSubItemContacts subItemContacts : itemContactsList) { diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/drafting/service/impl/PayDraftingGroupSubItemServiceImpl.java b/jero-boot-incoming-payment/src/main/java/com/jero/drafting/service/impl/PayDraftingGroupSubItemServiceImpl.java index ee52e02b..d3ef3418 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/drafting/service/impl/PayDraftingGroupSubItemServiceImpl.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/drafting/service/impl/PayDraftingGroupSubItemServiceImpl.java @@ -185,7 +185,7 @@ public class PayDraftingGroupSubItemServiceImpl extends ServiceImpl listPayDraftingGroupSubItemContactsNew) { JSONObject json = new JSONObject(); - json.put("type",ProjectCommon.PROJECT_TYPE9); + json.put("type",ProjectCommon.INFO_TYPE9); json.put("draftGroupId", payDraftingGroupSubItem.getDraftingGroupId()); json.put("projectId", payDraftingGroupSubItem.getId()); json.put("path","/draftTeam/DraftTeamDetail");