Skip to content

cfld-know-partner
cfld-know-partner
Commit 4a1d5bca authored by lixinglin's avatar lixinglin
Browse files
Options

bugfixed

parent 2e229b8f
Hide whitespace changes
Inline Side-by-side
Showing with 130 additions and 67 deletions
src/main/java/com/partner/admin/VO/ProjectIntendAreaResponse.java 0 → 100644
View file @ 4a1d5bca
package com.partner.admin.VO;
import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.NoArgsConstructor;
@Data
@AllArgsConstructor
@NoArgsConstructor
public class ProjectIntendAreaResponse {
private String code;
private String name;
private String areaPersonEn;
private String areaMgrEn;
}
src/main/java/com/partner/admin/mapper/PartnerProjectInfoMapper.java
View file @ 4a1d5bca
...@@ -3,6 +3,8 @@ package com.partner.admin.mapper; ...@@ -3,6 +3,8 @@ package com.partner.admin.mapper;
import com.partner.admin.VO.*; import com.partner.admin.VO.*;
import com.partner.admin.domain.PartnerProjectInfo; import com.partner.admin.domain.PartnerProjectInfo;
import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import org.apache.ibatis.annotations.Param;
import org.apache.ibatis.annotations.Select;
import java.util.List; import java.util.List;
...@@ -33,6 +35,12 @@ public interface PartnerProjectInfoMapper extends BaseMapper<PartnerProjectInfo> ...@@ -33,6 +35,12 @@ public interface PartnerProjectInfoMapper extends BaseMapper<PartnerProjectInfo>
List<ProjectIntendAreaResponse> projectIntendAreaList(@Param("projectId") String projectId);
ProjectIntendAreaResponse projectExistAreaByCode(@Param("code") String code);
} }
......
src/main/java/com/partner/admin/service/impl/PartnerProjectInfoServiceImpl.java
View file @ 4a1d5bca
...@@ -4,6 +4,8 @@ import cn.hutool.core.date.DateUtil; ...@@ -4,6 +4,8 @@ import cn.hutool.core.date.DateUtil;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.partner.admin.VO.*; import com.partner.admin.VO.*;
import com.partner.admin.common.exception.APIException;
import com.partner.admin.common.exception.APIExceptionEnum;
import com.partner.admin.common.utils.DateUtils; import com.partner.admin.common.utils.DateUtils;
import com.partner.admin.domain.*; import com.partner.admin.domain.*;
import com.partner.admin.enumerate.*; import com.partner.admin.enumerate.*;
...@@ -21,13 +23,16 @@ import java.util.List; ...@@ -21,13 +23,16 @@ import java.util.List;
import java.util.stream.Collectors; import java.util.stream.Collectors;
/** /**
* @author 26996 * @author 26996
* @description 针对表【partner_project_info】的数据库操作Service实现 * @description 针对表【partner_project_info】的数据库操作Service实现
* @createDate 2023-10-09 17:40:32 * @createDate 2023-10-09 17:40:32
*/ */
@Service @Service
public class PartnerProjectInfoServiceImpl extends ServiceImpl<PartnerProjectInfoMapper, PartnerProjectInfo> public class PartnerProjectInfoServiceImpl extends ServiceImpl<PartnerProjectInfoMapper, PartnerProjectInfo>
implements PartnerProjectInfoService{ implements PartnerProjectInfoService {
@Autowired
ProjectInfoMapper projectInfoMapper;
@Autowired @Autowired
PartnerProjectInfoMapper partnerProjectInfoMapper; PartnerProjectInfoMapper partnerProjectInfoMapper;
...@@ -61,12 +66,12 @@ public class PartnerProjectInfoServiceImpl extends ServiceImpl<PartnerProjectInf ...@@ -61,12 +66,12 @@ public class PartnerProjectInfoServiceImpl extends ServiceImpl<PartnerProjectInf
} }
@Override @Override
public List<PartnerProjectInfoListVO> getPartnerProjectListInfoVO(Integer userId){ public List<PartnerProjectInfoListVO> getPartnerProjectListInfoVO(Integer userId) {
return partnerProjectInfoMapper.getPartnerProjectListInfoVO(userId); return partnerProjectInfoMapper.getPartnerProjectListInfoVO(userId);
} }
@Override @Override
public List<PartnerProjectInfoListVO> getToDoListInfoVO(Integer userId){ public List<PartnerProjectInfoListVO> getToDoListInfoVO(Integer userId) {
return partnerProjectInfoMapper.getToDoListInfoVO(userId); return partnerProjectInfoMapper.getToDoListInfoVO(userId);
} }
...@@ -96,15 +101,15 @@ public class PartnerProjectInfoServiceImpl extends ServiceImpl<PartnerProjectInf ...@@ -96,15 +101,15 @@ public class PartnerProjectInfoServiceImpl extends ServiceImpl<PartnerProjectInf
e.getStatus() == PartnerProjectPushEnum.PROJECTSTATUS11.getCode() || e.getStatus() == PartnerProjectPushEnum.PROJECTSTATUS11.getCode() ||
e.getStatus() == PartnerProjectPushEnum.PROJECTSTATUS12.getCode() || e.getStatus() == PartnerProjectPushEnum.PROJECTSTATUS12.getCode() ||
e.getStatus() == PartnerProjectPushEnum.PROJECTSTATUS13.getCode() || e.getStatus() == PartnerProjectPushEnum.PROJECTSTATUS13.getCode() ||
e.getStatus() == PartnerProjectPushEnum.PROJECTSTATUS14.getCode() ).collect(Collectors.toList()); e.getStatus() == PartnerProjectPushEnum.PROJECTSTATUS14.getCode()).collect(Collectors.toList());
myPartnerProjectInfoVO.setPushProjectList(pushProjectList); myPartnerProjectInfoVO.setPushProjectList(pushProjectList);
List<PartnerProjectInfoListVO> allocationProjectList = partnerProjectInfoList.stream().filter(e -> List<PartnerProjectInfoListVO> allocationProjectList = partnerProjectInfoList.stream().filter(e ->
e.getStatus() == PartnerProjectAllocationEnum.PROJECTSTATUS15.getCode() ).collect(Collectors.toList()); e.getStatus() == PartnerProjectAllocationEnum.PROJECTSTATUS15.getCode()).collect(Collectors.toList());
myPartnerProjectInfoVO.setAllocationProjectList(allocationProjectList); myPartnerProjectInfoVO.setAllocationProjectList(allocationProjectList);
List<PartnerProjectInfoListVO> saveProjectList = partnerProjectInfoList.stream().filter(e -> List<PartnerProjectInfoListVO> saveProjectList = partnerProjectInfoList.stream().filter(e ->
e.getStatus() == PartnerProjectStatusEnum.PROJECTSTATUS0.getCode() ).collect(Collectors.toList()); e.getStatus() == PartnerProjectStatusEnum.PROJECTSTATUS0.getCode()).collect(Collectors.toList());
myPartnerProjectInfoVO.setSaveProjectList(saveProjectList); myPartnerProjectInfoVO.setSaveProjectList(saveProjectList);
return myPartnerProjectInfoVO; return myPartnerProjectInfoVO;
} }
...@@ -127,23 +132,23 @@ public class PartnerProjectInfoServiceImpl extends ServiceImpl<PartnerProjectInf ...@@ -127,23 +132,23 @@ public class PartnerProjectInfoServiceImpl extends ServiceImpl<PartnerProjectInf
Integer projectId = partnerProjectInfoVO.getPartnerProjectInfo().getId(); Integer projectId = partnerProjectInfoVO.getPartnerProjectInfo().getId();
QueryWrapper<PartnerImageSource> PISQW = new QueryWrapper<>(); QueryWrapper<PartnerImageSource> PISQW = new QueryWrapper<>();
PISQW.eq("object_id",projectId); PISQW.eq("object_id", projectId);
PISQW.eq("object_type",ImageSourceTypeEnum.PROJECT.getCode()); PISQW.eq("object_type", ImageSourceTypeEnum.PROJECT.getCode());
//获取到历史数据及文件先删除文件然后删除数据。 //获取到历史数据及文件先删除文件然后删除数据。
partnerImageSourceMapper.delete(PISQW); partnerImageSourceMapper.delete(PISQW);
QueryWrapper<PartnerFileSource> PFSQW = new QueryWrapper<>(); QueryWrapper<PartnerFileSource> PFSQW = new QueryWrapper<>();
PFSQW.eq("object_id",projectId); PFSQW.eq("object_id", projectId);
PFSQW.eq("object_type",FileSourceTypeEnum.FILE.getCode()); PFSQW.eq("object_type", FileSourceTypeEnum.FILE.getCode());
//获取到历史数据及文件先删除文件然后删除数据。 //获取到历史数据及文件先删除文件然后删除数据。
partnerFileSourceMapper.delete(PFSQW); partnerFileSourceMapper.delete(PFSQW);
QueryWrapper<PartnerFormstrInfo> PFIQW = new QueryWrapper<>(); QueryWrapper<PartnerFormstrInfo> PFIQW = new QueryWrapper<>();
PFIQW.eq("project_id",projectId); PFIQW.eq("project_id", projectId);
partnerFormstrInfoMapper.delete(PFIQW); partnerFormstrInfoMapper.delete(PFIQW);
List<PartnerImageSource> partnerImageSourceList = partnerProjectInfoVO.getPartnerImageSourceList(); List<PartnerImageSource> partnerImageSourceList = partnerProjectInfoVO.getPartnerImageSourceList();
if(partnerImageSourceList != null){ if (partnerImageSourceList != null) {
for (int i = 0; i < partnerImageSourceList.size(); i++) { for (int i = 0; i < partnerImageSourceList.size(); i++) {
partnerImageSourceList.get(i).setObjectType(ImageSourceTypeEnum.PROJECT.getCode()); partnerImageSourceList.get(i).setObjectType(ImageSourceTypeEnum.PROJECT.getCode());
partnerImageSourceList.get(i).setObjectId(projectId); partnerImageSourceList.get(i).setObjectId(projectId);
...@@ -154,7 +159,7 @@ public class PartnerProjectInfoServiceImpl extends ServiceImpl<PartnerProjectInf ...@@ -154,7 +159,7 @@ public class PartnerProjectInfoServiceImpl extends ServiceImpl<PartnerProjectInf
} }
List<PartnerFileSource> partnerFileSourceList = partnerProjectInfoVO.getPartnerFileSourceList(); List<PartnerFileSource> partnerFileSourceList = partnerProjectInfoVO.getPartnerFileSourceList();
if(partnerImageSourceList != null){ if (partnerImageSourceList != null) {
for (int i = 0; i < partnerFileSourceList.size(); i++) { for (int i = 0; i < partnerFileSourceList.size(); i++) {
partnerFileSourceList.get(i).setObjectType(FileSourceTypeEnum.FILE.getCode()); partnerFileSourceList.get(i).setObjectType(FileSourceTypeEnum.FILE.getCode());
partnerFileSourceList.get(i).setObjectId(projectId); partnerFileSourceList.get(i).setObjectId(projectId);
...@@ -164,11 +169,11 @@ public class PartnerProjectInfoServiceImpl extends ServiceImpl<PartnerProjectInf ...@@ -164,11 +169,11 @@ public class PartnerProjectInfoServiceImpl extends ServiceImpl<PartnerProjectInf
} }
} }
if(statusLog == PartnerProjectExamineEnum.PROJECTSTATUS1.getCode()){ if (statusLog == PartnerProjectExamineEnum.PROJECTSTATUS1.getCode()) {
QueryWrapper<PartnerProjectStatusChangeLog> clQW= new QueryWrapper<>(); QueryWrapper<PartnerProjectStatusChangeLog> clQW = new QueryWrapper<>();
clQW.eq("project_id",projectId); clQW.eq("project_id", projectId);
boolean exists = changeLogMapper.exists(clQW); boolean exists = changeLogMapper.exists(clQW);
if( !exists){ if (!exists) {
PartnerProjectStatusChangeLog partnerProjectStatusChangeLog = new PartnerProjectStatusChangeLog(); PartnerProjectStatusChangeLog partnerProjectStatusChangeLog = new PartnerProjectStatusChangeLog();
for (PartnerProjectExamineEnum ppee : PartnerProjectExamineEnum.values()) { for (PartnerProjectExamineEnum ppee : PartnerProjectExamineEnum.values()) {
partnerProjectStatusChangeLog.setId(null);//置为空 partnerProjectStatusChangeLog.setId(null);//置为空
...@@ -177,10 +182,10 @@ public class PartnerProjectInfoServiceImpl extends ServiceImpl<PartnerProjectInf ...@@ -177,10 +182,10 @@ public class PartnerProjectInfoServiceImpl extends ServiceImpl<PartnerProjectInf
partnerProjectStatusChangeLog.setProjectStatusDisplay(ppee.getMessage()); partnerProjectStatusChangeLog.setProjectStatusDisplay(ppee.getMessage());
partnerProjectStatusChangeLog.setOperaterId(userId); partnerProjectStatusChangeLog.setOperaterId(userId);
partnerProjectStatusChangeLog.setCurrentNodeStatus(PartnerProjectStatusEnum.CURRENT_NODES_START.getCode()); partnerProjectStatusChangeLog.setCurrentNodeStatus(PartnerProjectStatusEnum.CURRENT_NODES_START.getCode());
if( ppee.getCode() == PartnerProjectExamineEnum.PROJECTSTATUS1.getCode()){ if (ppee.getCode() == PartnerProjectExamineEnum.PROJECTSTATUS1.getCode()) {
partnerProjectStatusChangeLog.setCurrentNodeStatus(PartnerProjectStatusEnum.CURRENT_NODES_END.getCode()); partnerProjectStatusChangeLog.setCurrentNodeStatus(PartnerProjectStatusEnum.CURRENT_NODES_END.getCode());
} }
if( ppee.getCode() == PartnerProjectExamineEnum.PROJECTSTATUS2.getCode()){ if (ppee.getCode() == PartnerProjectExamineEnum.PROJECTSTATUS2.getCode()) {
partnerProjectStatusChangeLog.setCurrentNodeStatus(PartnerProjectStatusEnum.CURRENT_NODES_STARTING.getCode()); partnerProjectStatusChangeLog.setCurrentNodeStatus(PartnerProjectStatusEnum.CURRENT_NODES_STARTING.getCode());
} }
changeLogMapper.insert(partnerProjectStatusChangeLog); changeLogMapper.insert(partnerProjectStatusChangeLog);
...@@ -206,7 +211,7 @@ public class PartnerProjectInfoServiceImpl extends ServiceImpl<PartnerProjectInf ...@@ -206,7 +211,7 @@ public class PartnerProjectInfoServiceImpl extends ServiceImpl<PartnerProjectInf
} }
} }
PartnerFormstrInfo partnerFormstrInfo = new PartnerFormstrInfo(); PartnerFormstrInfo partnerFormstrInfo = new PartnerFormstrInfo();
if(partnerProjectInfoVO.getFormStr() != null && !"".equals(partnerProjectInfoVO.getFormStr())){ if (partnerProjectInfoVO.getFormStr() != null && !"".equals(partnerProjectInfoVO.getFormStr())) {
partnerFormstrInfo.setFormstr(partnerProjectInfoVO.getFormStr()); partnerFormstrInfo.setFormstr(partnerProjectInfoVO.getFormStr());
partnerFormstrInfo.setProjectId(projectId); partnerFormstrInfo.setProjectId(projectId);
partnerFormstrInfoMapper.insert(partnerFormstrInfo); partnerFormstrInfoMapper.insert(partnerFormstrInfo);
...@@ -221,29 +226,29 @@ public class PartnerProjectInfoServiceImpl extends ServiceImpl<PartnerProjectInf ...@@ -221,29 +226,29 @@ public class PartnerProjectInfoServiceImpl extends ServiceImpl<PartnerProjectInf
//获取项目详情 //获取项目详情
PartnerProjectInfo partnerProjectInfo = partnerProjectInfoMapper.selectById(id); PartnerProjectInfo partnerProjectInfo = partnerProjectInfoMapper.selectById(id);
PartnerExamineDetailVO partnerExamineDetailVO = null; PartnerExamineDetailVO partnerExamineDetailVO = null;
if(ObjectUtils.isNotEmpty(partnerProjectInfo.getProjectId())){ if (ObjectUtils.isNotEmpty(partnerProjectInfo.getProjectId())) {
partnerExamineDetailVO = partnerProjectInfoMapper.getExamineProjectDetail(id); partnerExamineDetailVO = partnerProjectInfoMapper.getExamineProjectDetail(id);
}else{ } else {
partnerExamineDetailVO = new PartnerExamineDetailVO(); partnerExamineDetailVO = new PartnerExamineDetailVO();
BeanUtils.copyProperties(partnerProjectInfo,partnerExamineDetailVO); BeanUtils.copyProperties(partnerProjectInfo, partnerExamineDetailVO);
partnerExamineDetailVO.setInvestmentPromotionCompany(""); partnerExamineDetailVO.setInvestmentPromotionCompany("");
} }
partnerExamineProjectInfoVO.setPartnerProjectDetail(partnerExamineDetailVO); partnerExamineProjectInfoVO.setPartnerProjectDetail(partnerExamineDetailVO);
//获取项目节点信息 //获取项目节点信息
QueryWrapper<PartnerProjectStatusChangeLog> ppsclQW = new QueryWrapper<>(); QueryWrapper<PartnerProjectStatusChangeLog> ppsclQW = new QueryWrapper<>();
ppsclQW.eq("project_id",id); ppsclQW.eq("project_id", id);
List<Integer> list = new ArrayList<>(); List<Integer> list = new ArrayList<>();
for (PartnerProjectExamineEnum ppee : PartnerProjectExamineEnum.values()){ for (PartnerProjectExamineEnum ppee : PartnerProjectExamineEnum.values()) {
list.add(ppee.getCode()); list.add(ppee.getCode());
} }
ppsclQW.in("project_status",list); ppsclQW.in("project_status", list);
List<PartnerProjectStatusChangeLog> partnerProjectStatusChangeLogs = changeLogMapper.selectList(ppsclQW); List<PartnerProjectStatusChangeLog> partnerProjectStatusChangeLogs = changeLogMapper.selectList(ppsclQW);
List<PartnerProjectStatusChangeLogVO> collect = partnerProjectStatusChangeLogs.stream().map(e -> { List<PartnerProjectStatusChangeLogVO> collect = partnerProjectStatusChangeLogs.stream().map(e -> {
PartnerProjectStatusChangeLogVO vo = new PartnerProjectStatusChangeLogVO(); PartnerProjectStatusChangeLogVO vo = new PartnerProjectStatusChangeLogVO();
BeanUtils.copyProperties(e, vo); BeanUtils.copyProperties(e, vo);
vo.setUpdateTime(DateUtils.parseDateToStr("yyyy-MM-dd HH:mm:ss", e.getUpdateTime())); vo.setUpdateTime(DateUtils.parseDateToStr("yyyy-MM-dd HH:mm:ss", e.getUpdateTime()));
if(partnerProjectInfo.getTodoStatus()== PartnerProjectToDoEnum.TODOSTATUS1.getCode() && partnerProjectInfo.getStatus()> PartnerProjectExamineEnum.PROJECTSTATUS4.getCode() && vo.getCurrentNodeStatus() == 1){ if (partnerProjectInfo.getTodoStatus() == PartnerProjectToDoEnum.TODOSTATUS1.getCode() && partnerProjectInfo.getStatus() > PartnerProjectExamineEnum.PROJECTSTATUS4.getCode() && vo.getCurrentNodeStatus() == 1) {
vo.setTodoStatus(partnerProjectInfo.getTodoStatus()); vo.setTodoStatus(partnerProjectInfo.getTodoStatus());
vo.setTodoStatusDescription(partnerProjectInfo.getTodoStatusDescription()); vo.setTodoStatusDescription(partnerProjectInfo.getTodoStatusDescription());
} }
...@@ -253,16 +258,16 @@ public class PartnerProjectInfoServiceImpl extends ServiceImpl<PartnerProjectInf ...@@ -253,16 +258,16 @@ public class PartnerProjectInfoServiceImpl extends ServiceImpl<PartnerProjectInf
//获取合伙人信息 //获取合伙人信息
QueryWrapper<PartnerSecretaryBind> psbQW = new QueryWrapper<>(); QueryWrapper<PartnerSecretaryBind> psbQW = new QueryWrapper<>();
psbQW.eq("user_id",partnerProjectInfo.getPartnerId()); psbQW.eq("user_id", partnerProjectInfo.getPartnerId());
PartnerSecretaryBind partnerSecretaryBind = partnerSecretaryBindService.getOne(psbQW); PartnerSecretaryBind partnerSecretaryBind = partnerSecretaryBindService.getOne(psbQW);
if(ObjectUtils.isNotEmpty(partnerSecretaryBind)){ if (ObjectUtils.isNotEmpty(partnerSecretaryBind)) {
QueryWrapper<PartnerSecretary> psQW = new QueryWrapper<>(); QueryWrapper<PartnerSecretary> psQW = new QueryWrapper<>();
psQW.eq("id",partnerSecretaryBind.getSecretaryId()); psQW.eq("id", partnerSecretaryBind.getSecretaryId());
PartnerSecretary partnerSecretary = partnerSectetaryService.getOne(psQW); PartnerSecretary partnerSecretary = partnerSectetaryService.getOne(psQW);
PartnerSecretaryVO partnerSecretaryVO = new PartnerSecretaryVO(); PartnerSecretaryVO partnerSecretaryVO = new PartnerSecretaryVO();
BeanUtils.copyProperties(partnerSecretary,partnerSecretaryVO); BeanUtils.copyProperties(partnerSecretary, partnerSecretaryVO);
partnerExamineProjectInfoVO.setPartnerSecretary(partnerSecretaryVO); partnerExamineProjectInfoVO.setPartnerSecretary(partnerSecretaryVO);
}else{ } else {
PartnerSecretaryVO partnerSecretaryVO = new PartnerSecretaryVO(); PartnerSecretaryVO partnerSecretaryVO = new PartnerSecretaryVO();
partnerSecretaryVO.setId(1); partnerSecretaryVO.setId(1);
partnerSecretaryVO.setName("李卓恒"); partnerSecretaryVO.setName("李卓恒");
...@@ -275,7 +280,7 @@ public class PartnerProjectInfoServiceImpl extends ServiceImpl<PartnerProjectInf ...@@ -275,7 +280,7 @@ public class PartnerProjectInfoServiceImpl extends ServiceImpl<PartnerProjectInf
QueryWrapper<PartnerFormstrInfo> pfiQW = new QueryWrapper<>(); QueryWrapper<PartnerFormstrInfo> pfiQW = new QueryWrapper<>();
pfiQW.eq("project_id", id); pfiQW.eq("project_id", id);
PartnerFormstrInfo partnerFormstrInfo = partnerFormstrInfoMapper.selectOne(pfiQW); PartnerFormstrInfo partnerFormstrInfo = partnerFormstrInfoMapper.selectOne(pfiQW);
if(partnerFormstrInfo != null){ if (partnerFormstrInfo != null) {
partnerExamineProjectInfoVO.setFormStr(partnerFormstrInfo.getFormstr()); partnerExamineProjectInfoVO.setFormStr(partnerFormstrInfo.getFormstr());
} }
return partnerExamineProjectInfoVO; return partnerExamineProjectInfoVO;
...@@ -290,16 +295,38 @@ public class PartnerProjectInfoServiceImpl extends ServiceImpl<PartnerProjectInf ...@@ -290,16 +295,38 @@ public class PartnerProjectInfoServiceImpl extends ServiceImpl<PartnerProjectInf
// partnerPushProjectInfoVO.setPartnerPushDetailVODetail(partnerPushDetailVO); // partnerPushProjectInfoVO.setPartnerPushDetailVODetail(partnerPushDetailVO);
//获取项目详情 //获取项目详情
PartnerPushDetailVO pushProjectDetail = partnerProjectInfoMapper.getPushProjectDetail(id); PartnerPushDetailVO pushProjectDetail = partnerProjectInfoMapper.getPushProjectDetail(id);
ProjectInfo projectInfo = projectInfoMapper.selectById(id);
if (projectInfo == null) {
throw new APIException(APIExceptionEnum.NOTEXISTS_EXCEPTION);
}
String projectId = projectInfo.getProjectId();
StringBuilder pushAread = new StringBuilder();
List<ProjectIntendAreaResponse> projectIntendAreaList = partnerProjectInfoMapper.projectIntendAreaList(projectId);
for (ProjectIntendAreaResponse area : projectIntendAreaList) {
String name = "";
ProjectIntendAreaResponse existArea = partnerProjectInfoMapper.projectExistAreaByCode(area.getCode());
if (existArea != null) {
name = existArea.getName();
} else {
name = area.getName();
}
pushAread.append(name);
if (ObjectUtils.isNotEmpty(name)) {
pushAread.append(";");
}
}
pushProjectDetail.setPushArea(pushAread.toString());
partnerPushProjectInfoVO.setPartnerProjectDetail(pushProjectDetail); partnerPushProjectInfoVO.setPartnerProjectDetail(pushProjectDetail);
//获取项目节点信息 //获取项目节点信息
QueryWrapper<PartnerProjectStatusChangeLog> ppsclQW = new QueryWrapper<>(); QueryWrapper<PartnerProjectStatusChangeLog> ppsclQW = new QueryWrapper<>();
ppsclQW.eq("project_id",id); ppsclQW.eq("project_id", id);
List<Integer> list = new ArrayList<>(); List<Integer> list = new ArrayList<>();
for (PartnerProjectPushEnum pppe : PartnerProjectPushEnum.values()){ for (PartnerProjectPushEnum pppe : PartnerProjectPushEnum.values()) {
list.add(pppe.getCode()); list.add(pppe.getCode());
} }
ppsclQW.in("project_status",list); ppsclQW.in("project_status", list);
List<PartnerProjectStatusChangeLog> partnerProjectStatusChangeLogs = changeLogMapper.selectList(ppsclQW); List<PartnerProjectStatusChangeLog> partnerProjectStatusChangeLogs = changeLogMapper.selectList(ppsclQW);
List<PartnerProjectStatusChangeLogVO> collect = partnerProjectStatusChangeLogs.stream().map(e -> { List<PartnerProjectStatusChangeLogVO> collect = partnerProjectStatusChangeLogs.stream().map(e -> {
PartnerProjectStatusChangeLogVO vo = new PartnerProjectStatusChangeLogVO(); PartnerProjectStatusChangeLogVO vo = new PartnerProjectStatusChangeLogVO();
...@@ -315,16 +342,16 @@ public class PartnerProjectInfoServiceImpl extends ServiceImpl<PartnerProjectInf ...@@ -315,16 +342,16 @@ public class PartnerProjectInfoServiceImpl extends ServiceImpl<PartnerProjectInf
//获取合伙人信息 //获取合伙人信息
PartnerProjectInfo partnerProjectInfo = partnerProjectInfoMapper.selectById(id); PartnerProjectInfo partnerProjectInfo = partnerProjectInfoMapper.selectById(id);
QueryWrapper<PartnerSecretaryBind> psbQW = new QueryWrapper<>(); QueryWrapper<PartnerSecretaryBind> psbQW = new QueryWrapper<>();
psbQW.eq("user_id",partnerProjectInfo.getPartnerId()); psbQW.eq("user_id", partnerProjectInfo.getPartnerId());
PartnerSecretaryBind partnerSecretaryBind = partnerSecretaryBindService.getOne(psbQW); PartnerSecretaryBind partnerSecretaryBind = partnerSecretaryBindService.getOne(psbQW);
if(ObjectUtils.isNotEmpty(partnerSecretaryBind)){ if (ObjectUtils.isNotEmpty(partnerSecretaryBind)) {
QueryWrapper<PartnerSecretary> psQW = new QueryWrapper<>(); QueryWrapper<PartnerSecretary> psQW = new QueryWrapper<>();
psQW.eq("id",partnerSecretaryBind.getSecretaryId()); psQW.eq("id", partnerSecretaryBind.getSecretaryId());
PartnerSecretary partnerSecretary = partnerSectetaryService.getOne(psQW); PartnerSecretary partnerSecretary = partnerSectetaryService.getOne(psQW);
PartnerSecretaryVO partnerSecretaryVO = new PartnerSecretaryVO(); PartnerSecretaryVO partnerSecretaryVO = new PartnerSecretaryVO();
BeanUtils.copyProperties(partnerSecretary,partnerSecretaryVO); BeanUtils.copyProperties(partnerSecretary, partnerSecretaryVO);
partnerPushProjectInfoVO.setPartnerSecretary(partnerSecretaryVO); partnerPushProjectInfoVO.setPartnerSecretary(partnerSecretaryVO);
}else{ } else {
PartnerSecretaryVO partnerSecretaryVO = new PartnerSecretaryVO(); PartnerSecretaryVO partnerSecretaryVO = new PartnerSecretaryVO();
partnerSecretaryVO.setId(1); partnerSecretaryVO.setId(1);
partnerSecretaryVO.setName("李卓恒"); partnerSecretaryVO.setName("李卓恒");
...@@ -351,12 +378,12 @@ public class PartnerProjectInfoServiceImpl extends ServiceImpl<PartnerProjectInf ...@@ -351,12 +378,12 @@ public class PartnerProjectInfoServiceImpl extends ServiceImpl<PartnerProjectInf
//获取项目节点信息 //获取项目节点信息
QueryWrapper<PartnerProjectStatusChangeLog> ppsclQW = new QueryWrapper<>(); QueryWrapper<PartnerProjectStatusChangeLog> ppsclQW = new QueryWrapper<>();
ppsclQW.eq("project_id",id); ppsclQW.eq("project_id", id);
List<Integer> list = new ArrayList<>(); List<Integer> list = new ArrayList<>();
for (PartnerProjectAllocationEnum pppe : PartnerProjectAllocationEnum.values()){ for (PartnerProjectAllocationEnum pppe : PartnerProjectAllocationEnum.values()) {
list.add(pppe.getCode()); list.add(pppe.getCode());
} }
ppsclQW.in("project_status",list); ppsclQW.in("project_status", list);
List<PartnerProjectStatusChangeLog> partnerProjectStatusChangeLogs = changeLogMapper.selectList(ppsclQW); List<PartnerProjectStatusChangeLog> partnerProjectStatusChangeLogs = changeLogMapper.selectList(ppsclQW);
List<PartnerProjectStatusChangeLogVO> collect = partnerProjectStatusChangeLogs.stream().map(e -> { List<PartnerProjectStatusChangeLogVO> collect = partnerProjectStatusChangeLogs.stream().map(e -> {
PartnerProjectStatusChangeLogVO vo = new PartnerProjectStatusChangeLogVO(); PartnerProjectStatusChangeLogVO vo = new PartnerProjectStatusChangeLogVO();
...@@ -372,16 +399,16 @@ public class PartnerProjectInfoServiceImpl extends ServiceImpl<PartnerProjectInf ...@@ -372,16 +399,16 @@ public class PartnerProjectInfoServiceImpl extends ServiceImpl<PartnerProjectInf
//获取合伙人信息 //获取合伙人信息
PartnerProjectInfo partnerProjectInfo = partnerProjectInfoMapper.selectById(id); PartnerProjectInfo partnerProjectInfo = partnerProjectInfoMapper.selectById(id);
QueryWrapper<PartnerSecretaryBind> psbQW = new QueryWrapper<>(); QueryWrapper<PartnerSecretaryBind> psbQW = new QueryWrapper<>();
psbQW.eq("user_id",partnerProjectInfo.getPartnerId()); psbQW.eq("user_id", partnerProjectInfo.getPartnerId());
PartnerSecretaryBind partnerSecretaryBind = partnerSecretaryBindService.getOne(psbQW); PartnerSecretaryBind partnerSecretaryBind = partnerSecretaryBindService.getOne(psbQW);
if(ObjectUtils.isNotEmpty(partnerSecretaryBind)){ if (ObjectUtils.isNotEmpty(partnerSecretaryBind)) {
QueryWrapper<PartnerSecretary> psQW = new QueryWrapper<>(); QueryWrapper<PartnerSecretary> psQW = new QueryWrapper<>();
psQW.eq("id",partnerSecretaryBind.getSecretaryId()); psQW.eq("id", partnerSecretaryBind.getSecretaryId());
PartnerSecretary partnerSecretary = partnerSectetaryService.getOne(psQW); PartnerSecretary partnerSecretary = partnerSectetaryService.getOne(psQW);
PartnerSecretaryVO partnerSecretaryVO = new PartnerSecretaryVO(); PartnerSecretaryVO partnerSecretaryVO = new PartnerSecretaryVO();
BeanUtils.copyProperties(partnerSecretary,partnerSecretaryVO); BeanUtils.copyProperties(partnerSecretary, partnerSecretaryVO);
partnerAllocationProjectInfoVO.setPartnerSecretary(partnerSecretaryVO); partnerAllocationProjectInfoVO.setPartnerSecretary(partnerSecretaryVO);
}else{ } else {
PartnerSecretaryVO partnerSecretaryVO = new PartnerSecretaryVO(); PartnerSecretaryVO partnerSecretaryVO = new PartnerSecretaryVO();
partnerSecretaryVO.setId(1); partnerSecretaryVO.setId(1);
partnerSecretaryVO.setName("李卓恒"); partnerSecretaryVO.setName("李卓恒");
...@@ -419,7 +446,7 @@ public class PartnerProjectInfoServiceImpl extends ServiceImpl<PartnerProjectInf ...@@ -419,7 +446,7 @@ public class PartnerProjectInfoServiceImpl extends ServiceImpl<PartnerProjectInf
QueryWrapper<PartnerFormstrInfo> pfiQW = new QueryWrapper<>(); QueryWrapper<PartnerFormstrInfo> pfiQW = new QueryWrapper<>();
pfiQW.eq("project_id", id); pfiQW.eq("project_id", id);
PartnerFormstrInfo partnerFormstrInfo = partnerFormstrInfoMapper.selectOne(pfiQW); PartnerFormstrInfo partnerFormstrInfo = partnerFormstrInfoMapper.selectOne(pfiQW);
if(partnerFormstrInfo != null){ if (partnerFormstrInfo != null) {
partnerProjectInfoVO.setFormStr(partnerFormstrInfo.getFormstr()); partnerProjectInfoVO.setFormStr(partnerFormstrInfo.getFormstr());
} }
...@@ -427,28 +454,28 @@ public class PartnerProjectInfoServiceImpl extends ServiceImpl<PartnerProjectInf ...@@ -427,28 +454,28 @@ public class PartnerProjectInfoServiceImpl extends ServiceImpl<PartnerProjectInf
} }
public String getProjectConfirmTemplate(Integer id){ public String getProjectConfirmTemplate(Integer id) {
String content = PartnerProjectTemplate.projectConfirmTemplate; String content = PartnerProjectTemplate.projectConfirmTemplate;
ProjectConfirmTemplateVO templateContent = partnerProjectInfoMapper.getProjectConfirmTemplate(id); ProjectConfirmTemplateVO templateContent = partnerProjectInfoMapper.getProjectConfirmTemplate(id);
content = content.replace("@person",templateContent.getPerson()). content = content.replace("@person", templateContent.getPerson()).
replace("@investmentSubject",templateContent.getInvestmentSubject()). replace("@investmentSubject", templateContent.getInvestmentSubject()).
replace("@regLocation",templateContent.getRegLocation()). replace("@regLocation", templateContent.getRegLocation()).
replace("@projectInvestmentTotal", String.valueOf(templateContent.getProjectInvestmentTotal().setScale(2, RoundingMode.HALF_UP))). replace("@projectInvestmentTotal", String.valueOf(templateContent.getProjectInvestmentTotal().setScale(2, RoundingMode.HALF_UP))).
replace("@decisionMaker",templateContent.getDecisionMaker()). replace("@decisionMaker", templateContent.getDecisionMaker()).
replace("@decisionMakerPosition",templateContent.getDecisionMakerPosition()). replace("@decisionMakerPosition", templateContent.getDecisionMakerPosition()).
replace("@date", DateUtil.format(new Date(), "yyyy年MM月dd日")); replace("@date", DateUtil.format(new Date(), "yyyy年MM月dd日"));
return content; return content;
} }
public String getCommissionConfirmTemplate(Integer id){ public String getCommissionConfirmTemplate(Integer id) {
String content = PartnerProjectTemplate.commissionConfirmTemplate; String content = PartnerProjectTemplate.commissionConfirmTemplate;
ProjectConfirmTemplateVO templateContent = partnerProjectInfoMapper.getCommissionConfirmTemplate(id); ProjectConfirmTemplateVO templateContent = partnerProjectInfoMapper.getCommissionConfirmTemplate(id);
content = content.replace("@person",templateContent.getPerson()). content = content.replace("@person", templateContent.getPerson()).
replace("@investmentSubject",templateContent.getInvestmentSubject()). replace("@investmentSubject", templateContent.getInvestmentSubject()).
replace("@regLocation",templateContent.getRegLocation()). replace("@regLocation", templateContent.getRegLocation()).
replace("@projectInvestmentTotal",String.valueOf(templateContent.getProjectInvestmentTotal())). replace("@projectInvestmentTotal", String.valueOf(templateContent.getProjectInvestmentTotal())).
replace("@decisionMaker",templateContent.getDecisionMaker()). replace("@decisionMaker", templateContent.getDecisionMaker()).
replace("@decisionMakerPosition",templateContent.getDecisionMakerPosition()). replace("@decisionMakerPosition", templateContent.getDecisionMakerPosition()).
replace("@date", DateUtil.format(new Date(), "yyyy年MM月dd日")); replace("@date", DateUtil.format(new Date(), "yyyy年MM月dd日"));
return content; return content;
} }
......
src/main/resources/mapper/PartnerProjectInfoMapper.xml
View file @ 4a1d5bca
...@@ -203,6 +203,15 @@ ...@@ -203,6 +203,15 @@
where ppi.id = #{id} where ppi.id = #{id}
</select> </select>
<select id="projectIntendAreaList" parameterType="string" resultType="com.partner.admin.VO.ProjectIntendAreaResponse">
select p.code, concat(province, '-', city, '-', district) as name from project_intend_area p left join meta_city_info m on p.code = m.code where project_id = #{projectId} and status in (1, 2, 4)
</select>
<select id="projectExistAreaByCode" parameterType="string" resultType="com.partner.admin.VO.ProjectIntendAreaResponse">
select code, case when province = '' then area_name else concat(province, '-', area_name) end as name, area_person_en, area_mgr_en from exist_area where code = #{code} limit 1
</select>
<select id= "getCommissionConfirmTemplate" parameterType="Integer" resultType="com.partner.admin.VO.ProjectConfirmTemplateVO"> <select id= "getCommissionConfirmTemplate" parameterType="Integer" resultType="com.partner.admin.VO.ProjectConfirmTemplateVO">
select ppi.id,su.phonenumber person,c.ent_name investment_subject, select ppi.id,su.phonenumber person,c.ent_name investment_subject,
c.reg_location,pi.invest_amount project_investment_total, c.reg_location,pi.invest_amount project_investment_total,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment