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

Merge remote-tracking branch 'origin/cc_20230520_partner' into cc_20230520_partner

Browse Source
This commit is contained in:
pserimal
2023-06-27 10:31:34 +08:00
parent 0b37821fbb f274e8b24e
commit f71d23d360
26 changed files with 521 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -52,11 +52,11 @@ public class HyIntendDevMappingDAO {
return hyIntendDevelopementMappingMapper.selectByMappingIdList(idList);
}
public List<ZoneCheckDTO> selectByOpenAreaMappingIdList(List<Long> idList,String type){
public List<ZoneCheckDTO> selectByOpenAreaMappingIdList(List<Long> idList,String type,Long currentId){
if (CollectionUtils.isEmpty(idList)){
return new ArrayList<>();
}
return hyIntendDevelopementMappingMapper.selectByOpenAreaMappingIdList(idList,type);
return hyIntendDevelopementMappingMapper.selectByOpenAreaMappingIdList(idList,type,currentId);
}
public HyIntendDevelopementMappingDO selectByOpenAreaMappingId(Long id,String type){

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

@@ -126,7 +126,7 @@ public class HyPartnerLineInfoDAO {
return hyPartnerLineInfoMapper.joinAndRemoveBlack(lineId,status,joinReason,removeReason);
}
public List<PublicSeaLineDTO> getPublicSeaLineList( String userNameKeyword, String phoneKeyword, String intentArea, Integer acceptAdjustType, Date updateStartTime, Date updateEndTime, List<String> userIdList){
public List<PublicSeaLineDTO> getPublicSeaLineList( String userNameKeyword, String phoneKeyword, String intentArea, Integer acceptAdjustType, String updateStartTime, String updateEndTime, List<String> userIdList){
return hyPartnerLineInfoMapper.getPublicSeaLineList(userNameKeyword,phoneKeyword,intentArea,acceptAdjustType,updateStartTime,updateEndTime,userIdList);
}

3
coolstore-partner-dao/src/main/java/com/cool/store/mapper/HyIntendDevelopementMappingMapper.java
View File

@@ -56,7 +56,8 @@ public interface HyIntendDevelopementMappingMapper {
List<ZoneCheckDTO> selectByMappingIdList(@Param("mappingIdList") List<Long> mappingIdList);
List<ZoneCheckDTO> selectByOpenAreaMappingIdList(@Param("openAreaMappingIdList") List<Long> openAreaMappingIdList,
@Param("type") String type);
@Param("type") String type,
@Param("currentId") Long currentId);
HyIntendDevelopementMappingDO selectByOpenAreaMappingId(@Param("openAreaMappingId") Long openAreaMappingId,

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

@@ -154,8 +154,8 @@ public interface HyPartnerLineInfoMapper {
@Param("phoneKeyword") String phoneKeyword,
@Param("intentArea") String intentArea,
@Param("acceptAdjustType") Integer acceptAdjustType,
@Param("updateStartTime") Date updateStartTime,
@Param("updateEndTime") Date updateEndTime,
@Param("updateStartTime") String updateStartTime,
@Param("updateEndTime") String updateEndTime,
@Param("userIdList") List<String> userIdList);

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

@@ -147,6 +147,9 @@
#{mappingId}
</foreach>
</if>
<if test="currentId!=null">
and a.mapping_id != #{currentId}
</if>
</where>
</select>

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

@@ -186,7 +186,7 @@
hy_open_area_info
where area_status = 'keyOpen'
and province_city_flag = 1
and parent_id is null
and parent_id is not null
</select>
<select id="queryByKeyword" resultMap="BaseResultMap">

6
coolstore-partner-dao/src/main/resources/mapper/HyPartnerInterviewPlanMapper.xml
View File

@@ -298,16 +298,16 @@
hpli.partner_id as partnerId,
hpli.deadline as deadline,
hpli.workflow_status as status,
a.id as id,
a.id as interviewId,
a.auth_code as authCode,
a.approve_time as approveTime,
a.process_info as processInfo,
b.id as interviewId,
b.start_time as startTime,
b.end_time as endTime,
b.interviewer as interviewer,
b.create_time as createTime,
b.room_id as roomId
b.room_id as roomId,
b.id as id
from hy_partner_line_info hpli
left join hy_partner_interview a on hpli.id = a.partner_line_id
left join hy_partner_interview_plan b on a.interview_plan_id = b.id

4
coolstore-partner-dao/src/main/resources/mapper/HyPartnerLineInfoMapper.xml
View File

@@ -531,12 +531,14 @@
SELECT MAX(h2.create_time)
FROM hy_partner_line_info h2
WHERE h1.partner_id = h2.partner_id
and h2.deleted= 1
<if test="partnerIdList!=null and partnerIdList.size>0">
<foreach collection="partnerIdList" item="partnerId" open="and h1.partner_id in (" close=")" separator=",">
#{partnerId}
</foreach>
</if>
)
</select>
<select id="getFollowCountList" resultType="com.cool.store.dto.partner.LineCountDTO">
@@ -563,7 +565,7 @@
<select id="getLineFollowHistoryList" resultMap="BaseResultMap">
SELECT <include refid="Base_Column_List"></include>
FROM hy_partner_line_info
where deleted = 1
where (deleted = 1 or (deleted=0 and line_status=0))
and partner_id = #{partner_id}
</select>