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

bug

Browse Source
This commit is contained in:
苏竹红
2024-03-28 12:14:10 +08:00
parent 06fbd88fb4
commit 25a797c6a3
3 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
coolstore-partner-dao/src/main/resources/mapper/LineInfoMapper.xml
View File

@@ -267,7 +267,7 @@
and want_shop_area_id = #{request.wantShopAreaId} and want_shop_area_id = #{request.wantShopAreaId}
</if> </if>
<if test="request.lineSource != null"> <if test="request.lineSource != null">
and line_source #{request.lineSource} and line_source = #{request.lineSource}
</if> </if>
<if test="request.createTimeStart!=null and request.createTimeEnd!=null"> <if test="request.createTimeStart!=null and request.createTimeEnd!=null">
and create_time between #{request.createTimeStart} and #{request.createTimeEnd} and create_time between #{request.createTimeStart} and #{request.createTimeEnd}

8
coolstore-partner-model/src/main/java/com/cool/store/vo/LineListVO.java
View File

@@ -14,16 +14,16 @@ public class LineListVO extends BaseInfoVO{
@ApiModelProperty("招商经理名称") @ApiModelProperty("招商经理名称")
private String investmentManagerUserName; private String investmentManagerUserName;
@ApiModelProperty("招商经理名称") @ApiModelProperty("线索来源名称")
private String lineSourceName; private String lineSourceName;
@ApiModelProperty("招商经理名称") @ApiModelProperty("创建时间")
private String createTime; private String createTime;
@ApiModelProperty("招商经理名称") @ApiModelProperty("更新时间")
private String updateTime; private String updateTime;
@ApiModelProperty("招商经理名称") @ApiModelProperty("更新人名称")
private String updateUserName; private String updateUserName;
public LineListVO(){} public LineListVO(){}

4
coolstore-partner-service/src/main/java/com/cool/store/service/impl/DeskServiceImpl.java
View File

@@ -21,6 +21,7 @@ import com.cool.store.vo.desk.IntendPendingVO;
import com.cool.store.vo.desk.InterviewPendingVO; import com.cool.store.vo.desk.InterviewPendingVO;
import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageHelper;
import com.github.pagehelper.PageInfo; import com.github.pagehelper.PageInfo;
import org.apache.commons.collections4.CollectionUtils;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import javax.annotation.Resource; import javax.annotation.Resource;
@@ -137,6 +138,9 @@ public class DeskServiceImpl implements DeskService {
} }
}); });
List<HyPartnerLabelDO> hyPartnerLabelDOS = hyPartnerLabelDAO.listByIds(libelIds); List<HyPartnerLabelDO> hyPartnerLabelDOS = hyPartnerLabelDAO.listByIds(libelIds);
if (CollectionUtils.isEmpty(hyPartnerLabelDOS)){
return new HashMap<>();
}
return hyPartnerLabelDOS.stream().collect(Collectors.toMap(HyPartnerLabelDO::getId, x -> x)); return hyPartnerLabelDOS.stream().collect(Collectors.toMap(HyPartnerLabelDO::getId, x -> x));
} }