diff --git a/manage/ad-platform-management/src/main/java/com/baiye/modules/system/domain/WeChatUser.java b/manage/ad-platform-management/src/main/java/com/baiye/modules/system/domain/WeChatUser.java index 1d49e51c..77ee9a6b 100644 --- a/manage/ad-platform-management/src/main/java/com/baiye/modules/system/domain/WeChatUser.java +++ b/manage/ad-platform-management/src/main/java/com/baiye/modules/system/domain/WeChatUser.java @@ -21,7 +21,6 @@ import java.util.Date; public class WeChatUser extends BaseEntity { private static final long serialVersionUID = -4755997517585953316L; - @Id @Column(name = "id") @ApiModelProperty(value = "id") diff --git a/manage/ad-platform-management/src/main/java/com/baiye/modules/system/service/impl/WeChatUserServiceImpl.java b/manage/ad-platform-management/src/main/java/com/baiye/modules/system/service/impl/WeChatUserServiceImpl.java index c48e9df5..a1619c26 100644 --- a/manage/ad-platform-management/src/main/java/com/baiye/modules/system/service/impl/WeChatUserServiceImpl.java +++ b/manage/ad-platform-management/src/main/java/com/baiye/modules/system/service/impl/WeChatUserServiceImpl.java @@ -105,7 +105,7 @@ public class WeChatUserServiceImpl implements WeChatUserService { map.put("type", weChatFriendDTO.getType()); if (weChatFriendDTO.getType() == DefaultNumberConstants.ZERO_NUMBER - && StringUtils.isNotBlank(weChatFriendDTO.getTagetWxId())) { + && StringUtils.isBlank(weChatFriendDTO.getTagetWxId())) { Clue body = sourceClueClient.queryDetails (Long.parseLong(weChatFriendDTO.getClueId())).getBody(); tagetWxId = body.getNid(); @@ -151,8 +151,7 @@ public class WeChatUserServiceImpl implements WeChatUserService { WeChatResponse weChatResponse = JSONUtil.toBean(getQrCodeResult, WeChatResponse.class); return JSONUtil.toBean - (JSONUtil.toJsonStr - (weChatResponse.getData()), + (JSONUtil.toJsonStr(weChatResponse.getData()), WeChatParseResponse.class).getStatus(); } } diff --git a/services/ad-platform-source/src/main/java/com/baiye/module/dao/ClueJpa.java b/services/ad-platform-source/src/main/java/com/baiye/module/dao/ClueJpa.java index 52c0d2ea..23c650b1 100644 --- a/services/ad-platform-source/src/main/java/com/baiye/module/dao/ClueJpa.java +++ b/services/ad-platform-source/src/main/java/com/baiye/module/dao/ClueJpa.java @@ -111,6 +111,9 @@ public class ClueJpa { if (clueQueryCriteria.getClueCallStatus() != null){ sql.append("and cm.clue_call_status = :clueCallStatus "); } + if (clueQueryCriteria.getClueStage() != null){ + sql.append("and cm.clue_stage = :clueStage "); + } if (newestCallTimeList != null && newestCallTimeList.size() == 2){ sql.append("and cm.newest_call_time between :createTimeBegin and :createTimeEnd "); } @@ -136,6 +139,9 @@ public class ClueJpa { if (clueQueryCriteria.getMemberStatus() != null) { query.setParameter("memberStatus", clueQueryCriteria.getMemberStatus()); } + if (clueQueryCriteria.getClueStage() != null){ + query.setParameter("clueStage", clueQueryCriteria.getClueStage()); + } if (clueQueryCriteria.getLabel() != null){ query.setParameter("sourceLabel", "%" + clueQueryCriteria.getLabel() + "%"); } diff --git a/services/ad-platform-source/src/main/java/com/baiye/module/service/impl/ConductRecordServiceImpl.java b/services/ad-platform-source/src/main/java/com/baiye/module/service/impl/ConductRecordServiceImpl.java index 202716bc..befe40be 100644 --- a/services/ad-platform-source/src/main/java/com/baiye/module/service/impl/ConductRecordServiceImpl.java +++ b/services/ad-platform-source/src/main/java/com/baiye/module/service/impl/ConductRecordServiceImpl.java @@ -5,20 +5,18 @@ import com.baiye.feign.UserClient; import com.baiye.module.dao.ConductRecordRepository; import com.baiye.module.entity.ConductRecord; import com.baiye.module.service.ConductRecordService; -import com.baiye.module.service.dto.ConductRecordDto; import com.baiye.module.service.dto.ConductRecordQueryCriteria; import com.baiye.module.service.mapstruct.ConductRecordMapper; import com.baiye.util.QueryHelp; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; -import org.springframework.beans.factory.annotation.Value; -import org.springframework.http.HttpStatus; -import org.springframework.http.ResponseEntity; +import org.springframework.data.domain.Sort; import org.springframework.stereotype.Service; import javax.transaction.Transactional; -import java.util.*; -import java.util.stream.Collectors; +import java.util.HashSet; +import java.util.Map; +import java.util.Set; @Service @Slf4j @@ -51,7 +49,9 @@ public class ConductRecordServiceImpl implements ConductRecordService { @Override public Object query(ConductRecordQueryCriteria conductRecordQueryCriteria) { - return conductRecordMapper.toDto(conductRecordRepository.findAll((root, criteriaQuery, criteriaBuilder) -> QueryHelp.getPredicate(root, conductRecordQueryCriteria, criteriaBuilder))); + Sort sort = Sort.by(Sort.Direction.DESC, "createTime"); + return conductRecordMapper.toDto(conductRecordRepository.findAll + ((root, criteriaQuery, criteriaBuilder) -> QueryHelp.getPredicate(root, conductRecordQueryCriteria, criteriaBuilder), sort)); } }