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-07-03 15:11:30 +08:00
parent 61622f4086
commit f897e85969
4 changed files with 6 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -247,8 +247,8 @@ public class ShopStageInfoDAO {
} }
public List<ShopStageInfoDO> getSpecialShopStageInfo(List<Long> shopIds, Integer shopSubStage, public List<ShopStageInfoDO> getSpecialShopStageInfo(List<Long> shopIds, Integer shopSubStage,
List<Integer> shopSubStageStatusList,String investmentUserId,String supervisorId,Integer queryUserType){ List<Integer> shopSubStageStatusList,String investmentUserId){
return shopStageInfoMapper.getSpecialShopStageInfo( shopIds, shopSubStage, shopSubStageStatusList,investmentUserId,supervisorId,queryUserType); return shopStageInfoMapper.getSpecialShopStageInfo( shopIds, shopSubStage, shopSubStageStatusList,investmentUserId);
} }
/** /**
* @Auther: wangshuo * @Auther: wangshuo

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

@@ -130,9 +130,7 @@ public interface ShopStageInfoMapper extends Mapper<ShopStageInfoDO> {
List<ShopStageInfoDO> getSpecialShopStageInfo(@Param("shopIds") List<Long> shopIds, List<ShopStageInfoDO> getSpecialShopStageInfo(@Param("shopIds") List<Long> shopIds,
@Param("shopSubStage") Integer shopSubStage, @Param("shopSubStage") Integer shopSubStage,
@Param("shopSubStageStatusList") List<Integer> shopSubStageStatusList, @Param("shopSubStageStatusList") List<Integer> shopSubStageStatusList,
@Param("investmentUserId") String investmentUserId, @Param("investmentUserId") String investmentUserId);
@Param("supervisorId") String supervisorId,
@Param("queryUserType") Integer queryUserType);
List<ShopStageInfoDO> getSubStageList(@Param("shopIds") List<Long> shopIds,@Param("shopSubStage") Integer shopSubStage); List<ShopStageInfoDO> getSubStageList(@Param("shopIds") List<Long> shopIds,@Param("shopSubStage") Integer shopSubStage);
/** /**

10
coolstore-partner-dao/src/main/resources/mapper/ShopStageInfoMapper.xml
View File

@@ -234,12 +234,9 @@
select select
* *
from xfsg_shop_stage_info a from xfsg_shop_stage_info a
<if test="investmentUserId!=null and investmentUserId!='' and queryUserType == 0 "> <if test="investmentUserId!=null and investmentUserId!=''">
left join xfsg_line_info b on a.line_id = b.id left join xfsg_line_info b on a.line_id = b.id
</if> </if>
<if test="investmentUserId!=null and investmentUserId!='' and queryUserType == 1 ">
left join xfsg_system_building_shop c on a.shop_id = c.shop_id
</if>
<where> <where>
<if test="shopIds != null and shopIds.size() > 0"> <if test="shopIds != null and shopIds.size() > 0">
and a.shop_id in and a.shop_id in
@@ -256,12 +253,9 @@
#{stageStatus} #{stageStatus}
</foreach> </foreach>
</if> </if>
<if test="investmentUserId!=null and investmentUserId!='' and queryUserType == 0"> <if test="investmentUserId!=null and investmentUserId!=''">
and b.investment_manager = #{investmentUserId} and b.investment_manager = #{investmentUserId}
</if> </if>
<if test="supervisorId!=null and supervisorId!='' and queryUserType == 1">
and c.supervisor_id = #{supervisorId}
</if>
</where> </where>
</select> </select>

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

@@ -365,7 +365,7 @@ public class DeskServiceImpl implements DeskService {
PageHelper.startPage(pageNum, pageSize); PageHelper.startPage(pageNum, pageSize);
//user.getJobNumber() //user.getJobNumber()
List<ShopStageInfoDO> specialShopStageInfo = shopStageInfoDAO.getSpecialShopStageInfo(null, shopSubStageEnum.getShopSubStage(), List<ShopStageInfoDO> specialShopStageInfo = shopStageInfoDAO.getSpecialShopStageInfo(null, shopSubStageEnum.getShopSubStage(),
subStageStatusList, user.getUserId(),user.getJobNumber(),type); subStageStatusList, user.getUserId());
PageInfo result = new PageInfo<>(specialShopStageInfo); PageInfo result = new PageInfo<>(specialShopStageInfo);
List<Long> shopIds = specialShopStageInfo.stream().map(ShopStageInfoDO::getShopId).collect(Collectors.toList()); List<Long> shopIds = specialShopStageInfo.stream().map(ShopStageInfoDO::getShopId).collect(Collectors.toList());
List<Long> lineIds = specialShopStageInfo.stream().map(ShopStageInfoDO::getLineId).collect(Collectors.toList()); List<Long> lineIds = specialShopStageInfo.stream().map(ShopStageInfoDO::getLineId).collect(Collectors.toList());