suzhuhong/zxjp-web
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

字段新增

Browse Source
This commit is contained in:
苏竹红
2024-01-15 15:09:13 +08:00
parent 8b5c640b5a
commit 33462d399a
9 changed files with 22 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
coolstore-partner-dao/src/main/java/com/cool/store/dao/HyPartnerExhibitionDAO.java
View File

@@ -83,11 +83,11 @@ public class HyPartnerExhibitionDAO {
return hyPartnerExhibitionMapper.getExhibitionLine(exhibitionId);
}
public List<ExhibitionLineDTO> exhibitionLineList(Integer exhibitionId,Integer participationStatus, String partnerUserId,String userId){
public List<ExhibitionLineDTO> exhibitionLineList(Integer exhibitionId,Integer participationStatus, String partnerUserId,String userId,Integer id){
if (exhibitionId == null){
return new ArrayList<>();
}
return hyPartnerExhibitionMapper.exhibitionLineList(exhibitionId,participationStatus, partnerUserId,userId);
return hyPartnerExhibitionMapper.exhibitionLineList(exhibitionId,participationStatus, partnerUserId,userId,id);
}
public void rejectExhibitionInterview(String partnerLineId) {

2
coolstore-partner-dao/src/main/java/com/cool/store/mapper/HyPartnerExhibitionMapper.java
View File

@@ -56,7 +56,7 @@ public interface HyPartnerExhibitionMapper {
HyPartnerExhibitionDO querySelective(HyPartnerExhibitionDO record);
List<ExhibitionLineDTO> exhibitionLineList(Integer exhibitionId,Integer participationStatus, String partnerUserId,String userId );
List<ExhibitionLineDTO> exhibitionLineList(Integer exhibitionId,Integer participationStatus, String partnerUserId,String userId,Integer id );
/**
* 将线索参加的会销面试状态设为不通过

3
coolstore-partner-dao/src/main/resources/mapper/HyPartnerExhibitionMapper.xml
View File

@@ -119,6 +119,9 @@
<if test="partnerUserId != null and partnerUserId!=''">
and hpui.partner_id = #{partnerUserId,jdbcType=VARCHAR}
</if>
<if test="id != null">
and hpe.id = #{id}
</if>
</where>
<if test="participationStatus == null">
ORDER BY CASE WHEN hpe.participation_status != 7 THEN 1 ELSE 2 END, hpe.create_time DESC

2
coolstore-partner-model/src/main/java/com/cool/store/vo/EnterInterviewVO.java
View File

@@ -18,4 +18,6 @@ public class EnterInterviewVO {
@ApiModelProperty("加盟商姓名")
private String partnerName;
private Long interviewPlanId;
}

2
coolstore-partner-model/src/main/java/com/cool/store/vo/exhibition/ExhibitionDetailVO.java
View File

@@ -24,4 +24,6 @@ public class ExhibitionDetailVO extends ExhibitionVO{
private String exhibitionCode;
private Integer signUpCount;
}

2
coolstore-partner-service/src/main/java/com/cool/store/service/ExhibitionService.java
View File

@@ -107,7 +107,7 @@ public interface ExhibitionService {
* @param pageNum
* @return
*/
PageInfo<ExhibitionLineVO> getExhibitionLineList(Integer exhibitionId,Integer participationStatus, String PartnerUserId ,Integer pageSize,Integer pageNum,String userId);
PageInfo<ExhibitionLineVO> getExhibitionLineList(Integer exhibitionId,Integer participationStatus, String PartnerUserId ,Integer pageSize,Integer pageNum,String userId,Integer id);
List<ExhibitionLineBaseVO> exhibitionLineBaseList(Integer exhibitionId,String partnerName);

13
coolstore-partner-service/src/main/java/com/cool/store/service/impl/exhibition/ExhibitionServiceImpl.java
View File

@@ -163,6 +163,7 @@ public class ExhibitionServiceImpl implements ExhibitionService {
//5. 返回进入面试间所需信息
EnterInterviewVO enterInterviewVO = interviewMapper.getInterviewerByInterviewPlanId(interviewPlan.getId().toString());
enterInterviewVO.setUserSign(trtcUtils.genUserSig(CurrentUserHolder.getUserId()));
enterInterviewVO.setInterviewPlanId(interviewPlan.getId());
return enterInterviewVO;
}
@@ -289,7 +290,7 @@ public class ExhibitionServiceImpl implements ExhibitionService {
.collect(Collectors.toMap(EnterpriseUserDO::getUserId,
u -> new CollaboratorVO(u.getUserId(), u.getName())));
Map<Integer, ExhibitionStatisticsDTO> StatisticsMap = hyExhibitionDAO.exhibitionStatisticsMap(codeList);
Map<Integer, ExhibitionStatisticsDTO> statisticsMap = hyExhibitionDAO.exhibitionStatisticsMap(codeList);
exhibitionList.forEach(x->{
MyExhibitionVO myExhibitionVO = new MyExhibitionVO();
@@ -307,7 +308,7 @@ public class ExhibitionServiceImpl implements ExhibitionService {
});
myExhibitionVO.setCollaborators(coll);
}
ExhibitionStatisticsDTO statistics = StatisticsMap.getOrDefault(x.getId(), new ExhibitionStatisticsDTO());
ExhibitionStatisticsDTO statistics = statisticsMap.getOrDefault(x.getId(), new ExhibitionStatisticsDTO());
myExhibitionVO.setSignUpCount(statistics.getSignUpCount());
myExhibitionVO.setCheckInCount(statistics.getCheckInCount());
myExhibitionVO.setFormFillCount(statistics.getFormFillCount());
@@ -423,6 +424,9 @@ public class ExhibitionServiceImpl implements ExhibitionService {
exhibitionDetailVO.setClosedType(hyExhibitionDO.getClosedType());
exhibitionDetailVO.setCreateTime(DateUtil.format(hyExhibitionDO.getCreateTime(), CoolDateUtils.DATE_FORMAT_SEC_7));
exhibitionDetailVO.setCloseTime(DateUtil.format(hyExhibitionDO.getCloseTime(), CoolDateUtils.DATE_FORMAT_SEC_7));
Map<Integer, ExhibitionStatisticsDTO> statisticsMap = hyExhibitionDAO.exhibitionStatisticsMap(Arrays.asList(hyExhibitionDO.getId()));
exhibitionDetailVO.setSignUpCount(statisticsMap.getOrDefault(hyExhibitionDO.getId(), new ExhibitionStatisticsDTO()).getSignUpCount());
if (StringUtils.isNotEmpty(hyExhibitionDO.getCollaborators())) {
List<String> userIdList = Arrays.asList(hyExhibitionDO.getCollaborators().substring(1).split(Constants.COMMA));
List<EnterpriseUserDO> userInfoList = enterpriseUserDAO.getUserInfoByUserIds(userIdList);
@@ -474,12 +478,12 @@ public class ExhibitionServiceImpl implements ExhibitionService {
}
@Override
public PageInfo<ExhibitionLineVO> getExhibitionLineList(Integer exhibitionId, Integer participationStatus, String partnerUserId, Integer pageSize, Integer pageNum,String userId) {
public PageInfo<ExhibitionLineVO> getExhibitionLineList(Integer exhibitionId, Integer participationStatus, String partnerUserId, Integer pageSize, Integer pageNum,String userId,Integer id) {
if (exhibitionId==null){
throw new ServiceException(ErrorCodeEnum.PARAMS_REQUIRED);
}
PageHelper.startPage(pageNum, pageSize);
List<ExhibitionLineDTO> exhibitionLineDTOS = hyPartnerExhibitionDAO.exhibitionLineList(exhibitionId, participationStatus, partnerUserId,userId);
List<ExhibitionLineDTO> exhibitionLineDTOS = hyPartnerExhibitionDAO.exhibitionLineList(exhibitionId, participationStatus, partnerUserId,userId,id);
PageInfo pageInfo = new PageInfo<>(exhibitionLineDTOS);
if (CollectionUtils.isEmpty(exhibitionLineDTOS)){
return pageInfo;
@@ -501,7 +505,6 @@ public class ExhibitionServiceImpl implements ExhibitionService {
LineInterviewDTO investment = lineInvestmentMap.getOrDefault(x.getLineId(), new LineInterviewDTO());
BeanUtil.copyProperties(x,exhibitionLineVO);
exhibitionLineVO.setChannelName(channelMap.get(x.getChannelId()));
exhibitionLineVO.setId(Integer.valueOf(x.getExhibitionId()));
exhibitionLineVO.setWantShopAreaName(x.getWantShopAreaName().replace("/", " "));
exhibitionLineVO.setInvestmentManager(investment.getInvestmentManager());
exhibitionLineVO.setLineStatus(investment.getLineStatus());

3
coolstore-partner-webb/src/main/java/com/cool/store/controller/ExhibitionController.java
View File

@@ -101,10 +101,11 @@ public class ExhibitionController {
public ResponseResult getExhibitionLineList(@RequestParam(required = true,value = "exhibitionId") Integer exhibitionId,
@RequestParam(required = false,value = "participationStatus") Integer participationStatus,
@RequestParam(required = false,value = "partnerId") String partnerId,
@RequestParam(required = false,value = "id") Integer id,
@RequestParam(required = false,value = "pageSize" ,defaultValue = "10") Integer pageSize,
@RequestParam(required = false,value = "pageNum",defaultValue = "1") Integer pageNum) {
LoginUserInfo user = CurrentUserHolder.getUser();
return ResponseResult.success(exhibitionService.getExhibitionLineList(exhibitionId,participationStatus,partnerId,pageSize,pageNum,user.getUserId()));
return ResponseResult.success(exhibitionService.getExhibitionLineList(exhibitionId,participationStatus,partnerId,pageSize,pageNum,user.getUserId(),id));
}

2
coolstore-partner-webb/src/test/java/com/cool/store/service/EventRequestTest.java
View File

@@ -99,7 +99,7 @@ class EventRequestTest extends AbstractJUnit4SpringContextTests {
randomStr = RandomUtil.randomString(12);
testWXUrl = wxUrlPrefix + randomStr;
//8. 面试未通过结束
eventCenterHttpRequest.sendSmsVariable(testPhone, SMSMsgEnum.INTERVIEW_REJECT, "不太行", testWXUrl);
eventCenterHttpRequest.sendSmsVariable(testPhone, SMSMsgEnum.EXHIBITION_CLOSE, "不太行", testWXUrl);
}
}