Merge #44 into master from cc_20251208_visit
fix:我的铺位导出
* cc_20251208_visit: (39 commits squashed)
- feat:拜访记录
- fix:拜访详情接口新增字段
- fix:新增状态转义字段
- fix:惩处单查询提供惩处待处理、惩处已处理状态筛选
- fix
- fix:管理员能查看所有加盟商
- fix:去掉部分字段非空校验
- fix:空校验
- Merge branch 'master' into cc_20251208_visit
# Conflicts:
#	coolstore-partner-common/src/main/java/com/cool/store/enums/ErrorCodeEnum.java
#	coolstore-partner-dao/src/main/java/com/cool/store/dao/store/StoreMasterSignerInfoDAO.java
#	coolstore-partner-service/src/main/java/com/cool/store/service/impl/UserAuthMappingServiceImpl.java
- fix
- fix:拜访记录失效延时消息
- fix:拜访记录统计
- fix:拜访记录统计新增筛选条件
- fix:字段转义
- feat:拜访调整
- feat:拜访调整_过滤我的
- feat:拜访调整_过滤我的
- feat:拜访字段调整
- feat:拜访字段调整
- Merge branch 'master' into cc_20251208_visit
- fix:拜访我的加盟商取消管辖权限过滤
- Merge branch 'master' into cc_20251208_visit
- fix:新增已分配招商经理的线索查询接口；拜访记录列表接口新增字段
- fix:新增字段
- fix:新老加盟商判断逻辑修复；统计接口新增筛选条件
- fix:过滤未分配招商经理的线索
- Merge branch 'master' into cc_20251208_visit
# Conflicts:
#	coolstore-partner-dao/src/main/resources/mapper/LineInfoMapper.xml
- Merge branch 'master' into cc_20251208_visit
- Merge branch 'master' into cc_20251208_visit
- fix:拜访记录导出
- fix:拜访记录导出限制
- fix:拜访记录导出限制
- fix:铺位导出
- fix:铺位及拜访记录导出加锁时机修改
- fix:铺位导出新增字段
- fix:铺位导出新增字段
- fix
- fix:我的铺位导出
- Merge branch 'master' into cc_20251208_visit
# Conflicts:
#	coolstore-partner-common/src/main/java/com/cool/store/constants/RedisConstant.java
#	coolstore-partner-common/src/main/java/com/cool/store/enums/FileTypeEnum.java
#	coolstore-partner-service/src/main/java/com/cool/store/service/ExportRealizeService.java
#	coolstore-partner-service/src/main/java/com/cool/store/service/ExportService.java
#	coolstore-partner-service/src/main/java/com/cool/store/service/impl/ExportRealizeServiceImpl.java
#	coolstore-partner-service/src/main/java/com/cool/store/service/impl/ExportServiceImpl.java
#	coolstore-partner-web/src/main/java/com/cool/store/controller/webb/ExportController.java
Signed-off-by: 王非凡 <accounts_67eba0c5fee9c49c80c8e2b4@mail.teambition.com>
Merged-by: 正新 <accounts_6964c7bcd2a2c377c5bbd01b@mail.teambition.com>
CR-link: https://codeup.aliyun.com/692ea314dec569489f6f167c/hangzhou/java/custom_zxjp/change/44
This commit is contained in:
王非凡
@@ -130,6 +130,61 @@
|
||||
</if>
|
||||
order by a.id desc
|
||||
</select>
|
||||
<select id="getMyPointCount" resultType="java.lang.Long">
|
||||
select COUNT(1)
|
||||
from xfsg_point_info a
|
||||
left join xfsg_shop_info b on a.shop_id = b.id
|
||||
left join store_${eid} c on b.shop_code = c.store_num
|
||||
where a.deleted = 0
|
||||
<if test="request.developmentManager!=null and request.developmentManager!=''">
|
||||
and a.development_manager = #{request.developmentManager}
|
||||
</if>
|
||||
<if test="request.keyword != null and request.keyword != ''">
|
||||
and (a.point_code like concat('%', #{request.keyword}, '%') or a.point_name like concat('%',
|
||||
#{request.keyword},
|
||||
'%'))
|
||||
</if>
|
||||
<if test="request.developmentStartTime != null and request.developmentStartTime != ''">
|
||||
and a.development_time >= #{request.developmentStartTime}
|
||||
</if>
|
||||
<if test="request.developmentEndTime != null and request.developmentEndTime != ''">
|
||||
<![CDATA[and a.development_time <= #{request.developmentEndTime}]]>
|
||||
</if>
|
||||
<if test="request.pointStatusList != null and request.pointStatusList.size() > 0">
|
||||
and a.point_status in
|
||||
<foreach collection="request.pointStatusList" item="pointStatus" open="(" close=")" separator=",">
|
||||
#{pointStatus}
|
||||
</foreach>
|
||||
</if>
|
||||
<if test="request.storageStatus != null">
|
||||
and a.storage_status = #{request.storageStatus}
|
||||
</if>
|
||||
<if test="request.operateUserId != null and request.operateUserId != ''">
|
||||
and a.operate_user_id = #{request.operateUserId}
|
||||
</if>
|
||||
<if test="request.createStartTime != null and request.createStartTime != ''">
|
||||
and a.create_time >= #{request.createStartTime}
|
||||
</if>
|
||||
<if test="request.createEndTime != null and request.createEndTime != ''">
|
||||
<![CDATA[and a.create_time <= #{request.createEndTime}]]>
|
||||
</if>
|
||||
<if test="request.regionIds != null and request.regionIds.size() > 0">
|
||||
and a.region_id in
|
||||
<foreach collection="request.regionIds" item="regionId" index="index" open="(" separator="," close=")">
|
||||
#{regionId}
|
||||
</foreach>
|
||||
</if>
|
||||
<if test="request.authRegionIds != null and request.authRegionIds.size() > 0">
|
||||
and a.region_id in
|
||||
<foreach collection="request.authRegionIds" item="regionId" index="index" open="(" separator="," close=")">
|
||||
#{regionId}
|
||||
</foreach>
|
||||
</if>
|
||||
<if test="request.areaCode!=null and request.areaCode!=''">
|
||||
and (a.province_code = #{request.areaCode} or a.city_code = #{request.areaCode} or a.district_code =
|
||||
#{request.areaCode})
|
||||
</if>
|
||||
</select>
|
||||
<select id="getSelectedShopNum" resultType="com.cool.store.dto.point.LineCountDTO">
|
||||
select
|
||||
line_id as lineId,
|
||||
|
||||
Reference in New Issue
Block a user