起草组修改

2024-01-12 11:04:11 +08:00
parent c3b94c991e
commit 4ca44ced91
5 changed files with 7 additions and 19 deletions
@@ -38,9 +38,9 @@ public class ProjectCommon {
     */
    public final static String PROJECT_TYPE6 = "6";
    /**
-     * 项目类型（1：普通项目，2：工作组项目，3：会议项目，4：会员项目，5：标协会员项目，6：证书,7: 起草组项目）
+     * 项目类型（1：普通项目，2：工作组项目，3：会议项目，4：会员项目，5：标协会员项目，6：证书,9: 起草组项目）
     */
-    public final static String PROJECT_TYPE7 = "7";
+    public final static String PROJECT_TYPE9 = "9";
    /**
     * 来源（1:收入合同,2:打包管理）
     */
@@ -139,7 +139,7 @@ public class ProjectDetailServiceImpl implements ProjectDetailService {
        }

        // 起草组项目资料
-        if(Objects.equals(String.valueOf(payCommonProject.getProjectType()), ProjectCommon.PROJECT_TYPE7)){
+        if(Objects.equals(String.valueOf(payCommonProject.getProjectType()), ProjectCommon.PROJECT_TYPE9)){
            LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
            LambdaQueryWrapper<PayWorkingGroupDistributionRecord> 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_TYPE7)) {
+            }else if(Objects.equals(String.valueOf(payCommonProject.getProjectType()), ProjectCommon.PROJECT_TYPE9)) {
                PayDraftingGroupSubItem payDraftingGroupSubItem = payDraftingGroupSubItemService.getById(projectId);
                if(Objects.isNull(payDraftingGroupSubItem)){
                    throw new JeroBootException("项目不存在！");
@@ -7,7 +7,6 @@ import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.jero.common.api.vo.Result;
 import com.jero.common.common.ProjectCommon;
 import com.jero.common.dto.PaySendContactsMessageDTO;
 import com.jero.common.exception.JeroBootException;
@@ -32,21 +31,12 @@ import com.jero.meeting.entity.PayMeeting;
 import com.jero.meeting.service.IPayMeetingService;
 import com.jero.modules.system.entity.SysUser;
 import com.jero.modules.system.service.ISysUserService;
-import com.jero.modules.system.service.impl.SysUserServiceImpl;
-import com.jero.project.common.PayProjectCommon;
-import com.jero.project.entity.PayResearchProject;
 import com.jero.project.entity.PayWorkingGroup;
-import com.jero.project.entity.PayWorkingGroupSubItem;
-import com.jero.project.entity.PayWorkingGroupSubItemContacts;
-import com.jero.project.mapper.PayWorkingGroupSubItemContactsMapper;
 import com.jero.project.service.IPayWorkingGroupService;
-import com.jero.project.service.IPayWorkingGroupSubItemService;
-import com.jero.project.vo.PayWorkingGroupVO;
 import com.jero.temporary.entity.PayCompanyManagementTemporary;
 import com.jero.temporary.entity.PayContactsManagementTemporary;
 import com.jero.temporary.service.IPayCompanyManagementTemporaryService;
 import com.jero.temporary.service.IPayContactsManagementTemporaryService;
-import com.sun.xml.bind.v2.TODO;
 import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.lang3.ObjectUtils;
 import org.apache.commons.lang3.StringUtils;
@@ -55,7 +45,6 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;

 import javax.annotation.Resource;
-import java.math.BigDecimal;
 import java.util.*;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
@@ -369,7 +358,7 @@ public class PayDraftingGroupServiceImpl extends ServiceImpl<PayDraftingGroupMap
 //             TODO 待确定发送消息的path路径
            listPayDraftGroupSubItem.forEach(p->{
                JSONObject json = new JSONObject();
-                json.put("type", ProjectCommon.PROJECT_TYPE7);
+                json.put("type", ProjectCommon.PROJECT_TYPE9);
                json.put("DraftingGroupId",p.getDraftingGroupId());
                json.put("projectId",p.getId());
                json.put("path","/workTeam/WorkTeamDetail");
@@ -2,7 +2,6 @@ package com.jero.drafting.service.impl;

 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -186,7 +185,7 @@ public class PayDraftingGroupSubItemServiceImpl extends ServiceImpl<PayDraftingG

    private void sendMessage(PayDraftingGroupSubItem payDraftingGroupSubItem, PayDraftingGroup payDraftingGroup, List<PayDraftingGroupSubItemContacts> listPayDraftingGroupSubItemContactsNew) {
        JSONObject json = new JSONObject();
-        json.put("type",ProjectCommon.PROJECT_TYPE7);
+        json.put("type",ProjectCommon.PROJECT_TYPE9);
        json.put("draftGroupId", payDraftingGroupSubItem.getDraftingGroupId());
        json.put("projectId", payDraftingGroupSubItem.getId());
        json.put("path","/draftTeam/DraftTeamDetail");
@@ -35,7 +35,7 @@ public interface PayMeetingMapper extends BaseMapper<PayMeeting> {

    IPage<PayMeeting> workGroupPage(Page<PayMeeting> page, @Param(Constants.WRAPPER) QueryWrapper<PayMeeting> queryWrapper);

-    IPage<PayMeeting> draftGroupPage(Page<PayMeeting> page, QueryWrapper<PayMeeting> queryWrapper);
+    IPage<PayMeeting> draftGroupPage(Page<PayMeeting> page,@Param(Constants.WRAPPER) QueryWrapper<PayMeeting> queryWrapper);


    IPage<PayMeeting> standardPage(Page<PayMeeting> page, @Param(Constants.WRAPPER) QueryWrapper<PayMeeting> queryWrapper);