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

Merge #127 into master from cc_20260512_fix

Browse Source 
feat:上传租赁合同代办

* cc_20260512_fix: (1 commits squashed)

  - feat:上传租赁合同代办

Signed-off-by: 正新 <accounts_6964c7bcd2a2c377c5bbd01b@mail.teambition.com>
Merged-by: 正新 <accounts_6964c7bcd2a2c377c5bbd01b@mail.teambition.com>

CR-link: https://codeup.aliyun.com/692ea314dec569489f6f167c/hangzhou/java/custom_zxjp/change/127
This commit is contained in:
正新
2026-05-12 08:13:22 +00:00
parent 3c52808fc5
commit 27af1561ac
4 changed files with 33 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -270,11 +270,11 @@ public class ShopStageInfoDAO {
return shopStageInfoMapper.updateShopStageAndAuditInfo(shopId, shopStageInfo.getShopSubStageEnum().getShopSubStage(), shopStageInfo.getShopSubStageStatus(), isTerminated, remark, auditId);
}
public Page<RentInfoToDoVO> getRentContractToDoPage(String userId, Integer pageNum, Integer pageSize,List<String> authRegionIds,String keyword) {
public Page<RentInfoToDoVO> getRentContractToDoPage(String userId, Integer pageNum,
Integer pageSize,List<String> authRegionIds,String keyword,List<Integer> subStageStatusEnum) {
PageHelper.startPage(pageNum, pageSize);
ShopSubStageStatusEnum shopSubStageStatus = ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_21;
return shopStageInfoMapper.getRentContractToDoPage(userId, shopSubStageStatus.getShopSubStageEnum().getShopSubStage(),
shopSubStageStatus.getShopSubStageStatus(),authRegionIds,keyword);
return shopStageInfoMapper.getRentContractToDoPage(userId, ShopSubStageEnum.SHOP_STAGE_2.getShopSubStage(),
subStageStatusEnum,authRegionIds,keyword);
}
public List<ShopStageInfoDO> getShopIdListByStageStatus(Integer shopSubStageStatus) {

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

@@ -118,7 +118,7 @@ public interface ShopStageInfoMapper extends Mapper<ShopStageInfoDO> {
*/
Page<RentInfoToDoVO> getRentContractToDoPage(@Param("userId") String userId,
@Param("shopSubStage")Integer shopSubStage,
@Param("shopSubStageStatus") Integer shopSubStageStatus,
@Param("shopSubStageStatusList") List<Integer> shopSubStageStatusList,
@Param("authRegionIds") List<String> authRegionIds, @Param("keyword") String keyword);
List<ShopStageInfoDO> getShopIdListByStageStatus(@Param("shopSubStageStatus") Integer shopSubStageStatus);

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

@@ -245,9 +245,14 @@
left join xfsg_shop_info c on a.shop_id = c.id
where c.deleted=0
and a.shop_sub_stage = #{shopSubStage}
and a.shop_sub_stage_status = #{shopSubStageStatus}
and a.deleted = 0
and b.deleted = 0
<if test="shopSubStageStatusList != null and shopSubStageStatusList.size() > 0">
and a.shop_sub_stage_status in
<foreach collection="shopSubStageStatusList" item="shopSubStageStatus" index="index" open="(" separator="," close=")">
#{shopSubStageStatus}
</foreach>
</if>
<if test="authRegionIds != null and authRegionIds.size() > 0">
and c.invest_region_id in
<foreach collection="authRegionIds" item="regionId" index="index" open="(" separator="," close=")">