LK/income_payments_management
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修改项目类型常量

Browse Source
This commit is contained in:
sunzheng
2024-01-12 14:32:17 +08:00
parent 4ca44ced91
commit b9f2444ac2
4 changed files with 9 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-boot-incoming-payment/src/main/java/com/jero/common/common/ProjectCommon.java
+4 -2
View File
@@ -38,9 +38,9 @@ public class ProjectCommon {
*/ */
public final static String PROJECT_TYPE6 = "6"; 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:打包管理） * 来源（1:收入合同,2:打包管理）
*/ */
@@ -208,4 +208,6 @@ public class ProjectCommon {
* 条件 0为发送创建通知，1为发送缴费通知 * 条件 0为发送创建通知，1为发送缴费通知
*/ */
public final static String FLAG1 = "1"; public final static String FLAG1 = "1";
public final static String INFO_TYPE9 = "9";
} }
jero-boot-incoming-payment/src/main/java/com/jero/common/service/impl/ProjectDetailServiceImpl.java
+2 -2
View File
@@ -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(); LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
LambdaQueryWrapper<PayWorkingGroupDistributionRecord> queryPayWorkingGroupDistributionRecord = new LambdaQueryWrapper<>(); LambdaQueryWrapper<PayWorkingGroupDistributionRecord> queryPayWorkingGroupDistributionRecord = new LambdaQueryWrapper<>();
queryPayWorkingGroupDistributionRecord.eq(PayWorkingGroupDistributionRecord::getSubId,projectId); queryPayWorkingGroupDistributionRecord.eq(PayWorkingGroupDistributionRecord::getSubId,projectId);
@@ -302,7 +302,7 @@ public class ProjectDetailServiceImpl implements ProjectDetailService {
projectDetailVO.setPayWorkingGroupSubItemContactsList(listPayWorkingGroupSubItemContacts); 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); PayDraftingGroupSubItem payDraftingGroupSubItem = payDraftingGroupSubItemService.getById(projectId);
if(Objects.isNull(payDraftingGroupSubItem)){ if(Objects.isNull(payDraftingGroupSubItem)){
throw new JeroBootException("项目不存在！"); throw new JeroBootException("项目不存在！");
jero-boot-incoming-payment/src/main/java/com/jero/drafting/service/impl/PayDraftingGroupServiceImpl.java
+2 -3
View File
@@ -355,13 +355,12 @@ public class PayDraftingGroupServiceImpl extends ServiceImpl<PayDraftingGroupMap
} }
}); });
// TODO 待确定发送消息的path路径
listPayDraftGroupSubItem.forEach(p->{ listPayDraftGroupSubItem.forEach(p->{
JSONObject json = new JSONObject(); JSONObject json = new JSONObject();
json.put("type", ProjectCommon.PROJECT_TYPE9); json.put("type", ProjectCommon.INFO_TYPE9);
json.put("DraftingGroupId",p.getDraftingGroupId()); json.put("DraftingGroupId",p.getDraftingGroupId());
json.put("projectId",p.getId()); json.put("projectId",p.getId());
json.put("path","/workTeam/WorkTeamDetail"); json.put("path","/draftTeam/DraftTeamDetail");
//新建项目 给企业联系人发消息 //新建项目 给企业联系人发消息
List<PayDraftingGroupSubItemContacts> itemContactsList = p.getPayDraftingGroupSubItemContactsList(); List<PayDraftingGroupSubItemContacts> itemContactsList = p.getPayDraftingGroupSubItemContactsList();
for (PayDraftingGroupSubItemContacts subItemContacts : itemContactsList) { for (PayDraftingGroupSubItemContacts subItemContacts : itemContactsList) {
jero-boot-incoming-payment/src/main/java/com/jero/drafting/service/impl/PayDraftingGroupSubItemServiceImpl.java
+1 -1
View File
@@ -185,7 +185,7 @@ public class PayDraftingGroupSubItemServiceImpl extends ServiceImpl<PayDraftingG
private void sendMessage(PayDraftingGroupSubItem payDraftingGroupSubItem, PayDraftingGroup payDraftingGroup, List<PayDraftingGroupSubItemContacts> listPayDraftingGroupSubItemContactsNew) { private void sendMessage(PayDraftingGroupSubItem payDraftingGroupSubItem, PayDraftingGroup payDraftingGroup, List<PayDraftingGroupSubItemContacts> listPayDraftingGroupSubItemContactsNew) {
JSONObject json = new JSONObject(); JSONObject json = new JSONObject();
json.put("type",ProjectCommon.PROJECT_TYPE9); json.put("type",ProjectCommon.INFO_TYPE9);
json.put("draftGroupId", payDraftingGroupSubItem.getDraftingGroupId()); json.put("draftGroupId", payDraftingGroupSubItem.getDraftingGroupId());
json.put("projectId", payDraftingGroupSubItem.getId()); json.put("projectId", payDraftingGroupSubItem.getId());
json.put("path","/draftTeam/DraftTeamDetail"); json.put("path","/draftTeam/DraftTeamDetail");