From d9af75edca08b6d83bc907336e7d2f7f9ae725a3 Mon Sep 17 00:00:00 2001 From: "shuo.wang" Date: Tue, 13 May 2025 10:33:51 +0800 Subject: [PATCH 01/10] fix --- .../mapper/DecorationDesignInfoMapper.xml | 1 + .../mapper/DecorationMeasureMapper.xml | 3 +++ .../java/com/cool/store/vo/BaseInfoVO.java | 3 +++ .../vo/desk/PreparationCommonPendingVO.java | 2 ++ .../store/service/impl/DeskServiceImpl.java | 26 ++++++++++--------- 5 files changed, 23 insertions(+), 12 deletions(-) diff --git a/coolstore-partner-dao/src/main/resources/mapper/DecorationDesignInfoMapper.xml b/coolstore-partner-dao/src/main/resources/mapper/DecorationDesignInfoMapper.xml index 4239cf90c..2ae224431 100644 --- a/coolstore-partner-dao/src/main/resources/mapper/DecorationDesignInfoMapper.xml +++ b/coolstore-partner-dao/src/main/resources/mapper/DecorationDesignInfoMapper.xml @@ -43,6 +43,7 @@ c.line_id as lineId, c.region_id as regionId, c.store_type as storeType, + c.join_mode as joinMode, b.shop_stage as stage, b.shop_sub_stage as subStage, b.shop_sub_stage_status as subStageStatus, diff --git a/coolstore-partner-dao/src/main/resources/mapper/DecorationMeasureMapper.xml b/coolstore-partner-dao/src/main/resources/mapper/DecorationMeasureMapper.xml index f8a1789c4..c2ac41606 100644 --- a/coolstore-partner-dao/src/main/resources/mapper/DecorationMeasureMapper.xml +++ b/coolstore-partner-dao/src/main/resources/mapper/DecorationMeasureMapper.xml @@ -38,6 +38,7 @@ c.id as shopId, c.line_id as lineId, c.region_id as regionId, + c.join_mode as joinMode, c.store_type as storeType, b.shop_stage as stage, b.shop_sub_stage as subStage, @@ -62,6 +63,7 @@ c.line_id as lineId, c.region_id as regionId, c.store_type as storeType, + c.join_mode as joinMode, b.shop_stage as stage, b.shop_sub_stage as subStage, b.shop_sub_stage_status as subStageStatus, @@ -85,6 +87,7 @@ c.line_id as lineId, c.region_id as regionId, c.store_type as storeType, + c.join_mode as joinMode, b.shop_stage as stage, b.shop_sub_stage as subStage, b.shop_sub_stage_status as subStageStatus, diff --git a/coolstore-partner-model/src/main/java/com/cool/store/vo/BaseInfoVO.java b/coolstore-partner-model/src/main/java/com/cool/store/vo/BaseInfoVO.java index c0059250c..7527bb988 100644 --- a/coolstore-partner-model/src/main/java/com/cool/store/vo/BaseInfoVO.java +++ b/coolstore-partner-model/src/main/java/com/cool/store/vo/BaseInfoVO.java @@ -42,6 +42,8 @@ public class BaseInfoVO { @ApiModelProperty("子阶段状态") private Integer workflowSubStageStatus; + @ApiModelProperty("加盟模式") + private Integer joinMode; public BaseInfoVO(){} /** @@ -59,6 +61,7 @@ public class BaseInfoVO { this.userPortraitList = baseInfoVO.getUserPortraitList(); this.workflowStage = baseInfoVO.getWorkflowStage(); this.workflowSubStageStatus = baseInfoVO.getWorkflowSubStageStatus(); + this.joinMode = baseInfoVO.getJoinMode(); } diff --git a/coolstore-partner-model/src/main/java/com/cool/store/vo/desk/PreparationCommonPendingVO.java b/coolstore-partner-model/src/main/java/com/cool/store/vo/desk/PreparationCommonPendingVO.java index 9f3435fa9..d0a5b0df2 100644 --- a/coolstore-partner-model/src/main/java/com/cool/store/vo/desk/PreparationCommonPendingVO.java +++ b/coolstore-partner-model/src/main/java/com/cool/store/vo/desk/PreparationCommonPendingVO.java @@ -45,6 +45,8 @@ public class PreparationCommonPendingVO { private String submitTime; @ApiModelProperty("门店类型") private Integer storeType; + @ApiModelProperty("加盟模式") + private Integer joinMode; private Long regionId; private Date updateTime; diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/DeskServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/DeskServiceImpl.java index 13c0bc5f7..87afc1c9d 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/DeskServiceImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/DeskServiceImpl.java @@ -132,6 +132,7 @@ public class DeskServiceImpl implements DeskService { payStagePendingVO.setPayTime(DateUtils.parseDateToStr(SPECIAL_DATE_START, linePayDO.getPayTime())); } + list.add(payStagePendingVO); }); page.setList(list); @@ -192,6 +193,7 @@ public class DeskServiceImpl implements DeskService { }); } baseInfoVO.setUserPortraitList(labelBaseInfoList); + baseInfoVO.setJoinMode(lineInfoDO.getJoinMode()); baseInfoVO.setWantShopAreaName(wantShopAreaMap.get(lineInfoDO.getWantShopAreaId())); return baseInfoVO; } @@ -442,7 +444,7 @@ public class DeskServiceImpl implements DeskService { //只有设计组长 查询 指定当前用户和阶段为 900 待分配设计师 if (userRoleIds.contains(UserRoleEnum.HEAD_OF_DESIGN.getCode()) && !userRoleIds.contains(UserRoleEnum.DESIGN_CUSTOMER.getCode())) { PageHelper.startPage(pageNum, pageSize); - return decorationMeasureDAO.getShopIdListByDesignUserIdAndShopStage(user.getUserId()); + return decorationMeasureDAO.getShopIdListByDesignUserIdAndShopStage(user.getUserId()); } //只有设计师 查询 指定当前用户和阶段为 901 设计中 if (userRoleIds.contains(UserRoleEnum.DESIGN_CUSTOMER.getCode()) && !userRoleIds.contains(UserRoleEnum.HEAD_OF_DESIGN.getCode())) { @@ -450,7 +452,7 @@ public class DeskServiceImpl implements DeskService { return decorationDesignInfoDAO.getByDesignUserIdAndShopStage(user.getUserId()); } //有 设计组长 和 设计师 查询 指定当前用户和 阶段为 900 待分配设计师 阶段为 901 设计中 - if (userRoleIds.contains(UserRoleEnum.DESIGN_CUSTOMER.getCode()) && userRoleIds.contains(UserRoleEnum.HEAD_OF_DESIGN.getCode())) { + if (userRoleIds.contains(UserRoleEnum.DESIGN_CUSTOMER.getCode()) && userRoleIds.contains(UserRoleEnum.HEAD_OF_DESIGN.getCode())) { PageHelper.startPage(pageNum, pageSize); return decorationMeasureDAO.getShopIdListByDesignUserIdOrQuotationAndShopStage(user.getUserId()); } @@ -484,7 +486,7 @@ public class DeskServiceImpl implements DeskService { vo.setSubmitTime(deskStageMap.get(vo.getShopId()).get(0).getActualCompleteTime()); } } else if (vo.getSubStageStatus().equals(SHOP_SUB_STAGE_STATUS_111.getShopSubStageStatus())) { - vo.setSubmitTime(DateUtils.parseDateToStr( SPECIAL_DATE_START,constructionMap.get(vo.getShopId()))); + vo.setSubmitTime(DateUtils.parseDateToStr(SPECIAL_DATE_START, constructionMap.get(vo.getShopId()))); } } @@ -672,13 +674,16 @@ public class DeskServiceImpl implements DeskService { preparationCommonPendingVO.setShopId(x.getShopId()); ShopInfoDO shopInfoDO = shopInfoMap.getOrDefault(x.getShopId(), new ShopInfoDO()); preparationCommonPendingVO.setStoreType(shopInfoDO.getStoreType()); - if (shopInfoDO != null) { + if (StringUtil.isNotEmpty(shopInfoDO.getDetailAddress())) { + preparationCommonPendingVO.setShopAddress(shopInfoDO.getDetailAddress()); + } else { PointInfoDO pointInfoDO = pointMap.get(shopInfoDO.getPointId()); if (pointInfoDO != null) { preparationCommonPendingVO.setShopAddress(pointInfoDO.getAddress()); } - preparationCommonPendingVO.setShopCode(shopInfoDO.getShopCode()); } + preparationCommonPendingVO.setShopCode(shopInfoDO.getShopCode()); + preparationCommonPendingVO.setJoinMode(shopInfoDO.getJoinMode()); preparationCommonPendingVO.setInvestmentManager(lineMap.getOrDefault(x.getLineId(), new PlanLineDTO()).getInvestmentManagerName()); preparationCommonPendingVO.setStage(x.getShopStage()); preparationCommonPendingVO.setSubStage(x.getShopSubStage()); @@ -746,13 +751,10 @@ public class DeskServiceImpl implements DeskService { operationLogDOList.forEach(x -> { PreparationCommonPendingVO preparationCommonPendingVO = new PreparationCommonPendingVO(); ShopInfoDO shopInfoDO = shopInfoMap.getOrDefault(x.getShopId(), new ShopInfoDO()); - if (shopInfoDO != null) { - PointInfoDO pointInfoDO = pointMap.get(shopInfoDO.getPointId()); - if (pointInfoDO != null) { - preparationCommonPendingVO.setShopAddress(pointInfoDO.getAddress()); - } - preparationCommonPendingVO.setShopCode(shopInfoDO.getShopCode()); - } + preparationCommonPendingVO.setStoreType(shopInfoDO.getStoreType()); + preparationCommonPendingVO.setJoinMode(shopInfoDO.getJoinMode()); + preparationCommonPendingVO.setShopAddress(shopInfoDO.getDetailAddress()); + preparationCommonPendingVO.setShopCode(shopInfoDO.getShopCode()); preparationCommonPendingVO.setLineId(shopInfoDO.getLineId()); preparationCommonPendingVO.setShopId(x.getShopId()); preparationCommonPendingVO.setSubStage(x.getShopSubStage()); From 871f47acf818bedb9e380f04fa76ab88b839901f Mon Sep 17 00:00:00 2001 From: "shuo.wang" Date: Tue, 13 May 2025 14:14:22 +0800 Subject: [PATCH 02/10] =?UTF-8?q?=E5=AF=BC=E5=87=BA=E5=8A=A0=E5=AD=97?= =?UTF-8?q?=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/cool/store/dto/ExportJoinShopDTO.java | 62 +++++++++++-------- .../impl/ExportRealizeServiceImpl.java | 20 +++++- 2 files changed, 54 insertions(+), 28 deletions(-) diff --git a/coolstore-partner-model/src/main/java/com/cool/store/dto/ExportJoinShopDTO.java b/coolstore-partner-model/src/main/java/com/cool/store/dto/ExportJoinShopDTO.java index 2e6bef53f..8492cac05 100644 --- a/coolstore-partner-model/src/main/java/com/cool/store/dto/ExportJoinShopDTO.java +++ b/coolstore-partner-model/src/main/java/com/cool/store/dto/ExportJoinShopDTO.java @@ -76,95 +76,107 @@ public class ExportJoinShopDTO { @ColumnWidth(20) private String contractCode; - @ExcelProperty(value = "第一年加盟开始日期", order = 17) + @ExcelProperty(value = "合同签约时间", order = 17) @ColumnWidth(30) - private String firstYearStartTime; + private String contractSignTime; - @ExcelProperty(value = "第一年管理费到期日期", order = 18) + @ExcelProperty(value = "合同开始时间", order = 18) @ColumnWidth(30) - private String firstYearEndTime; + private String contractStartTime; - @ExcelProperty(value = "加盟费（含税）", order = 19) + @ExcelProperty(value = "合同结束时间", order = 19) + @ColumnWidth(30) + private String contractEndTime; + + @ExcelProperty(value = "第几家分店", order = 20) + @ColumnWidth(20) + private Integer partnershipSignatoryFirstWhichStore; + + @ExcelProperty(value = "保护距离", order = 21) + @ColumnWidth(20) + private Integer protectiveDistance; + + @ExcelProperty(value = "加盟费（含税）", order = 22) @ColumnWidth(20) private String franchiseFee; - @ExcelProperty(value = "第一年度管理费（含税）", order = 20) + @ExcelProperty(value = "第一年度管理费（含税）", order = 23) @ColumnWidth(40) private String firstYearManagementFee; - @ExcelProperty(value = "设计费（含税）", order = 21) + @ExcelProperty(value = "设计费（含税）", order = 24) @ColumnWidth(20) private String performanceBond; - @ExcelProperty(value = "保证金（含税）", order = 22) + @ExcelProperty(value = "保证金（含税）", order = 25) @ColumnWidth(20) private String loanMargin; - @ExcelProperty(value = "第一年度品牌使用费（含税）", order = 23) + @ExcelProperty(value = "第一年度品牌使用费（含税）", order = 26) @ColumnWidth(40) private String firstYearFee; - @ExcelProperty(value = "合计缴费金额（含税）", order = 24) + @ExcelProperty(value = "合计缴费金额（含税）", order = 27) @ColumnWidth(30) private String totalAmountContributions; - @ExcelProperty(value = "加盟费优惠原因", order = 25) + @ExcelProperty(value = "加盟费优惠原因", order = 28) @ColumnWidth(30) private String discountReason; - @ExcelProperty(value = "店面租金", order = 26) + @ExcelProperty(value = "店面租金", order = 29) @ColumnWidth(20) private String monthRent; - @ExcelProperty(value = "省", order = 27) + @ExcelProperty(value = "省", order = 30) @ColumnWidth(15) private String province; - @ExcelProperty(value = "市", order = 28) + @ExcelProperty(value = "市", order = 31) @ColumnWidth(15) private String city; - @ExcelProperty(value = "区", order = 29) + @ExcelProperty(value = "区", order = 32) @ColumnWidth(15) private String district; - @ExcelProperty(value = "场地实际面积", order = 30) + @ExcelProperty(value = "场地实际面积", order = 33) @ColumnWidth(15) private String area; - @ExcelProperty(value = "报货物流仓库", order = 31) + @ExcelProperty(value = "报货物流仓库", order = 34) @ColumnWidth(25) private String declareGoodsLogisticsWarehouseName; - @ExcelProperty(value = "报货类型", order = 32) + @ExcelProperty(value = "报货类型", order = 35) @ColumnWidth(20) private String declareGoodsType; - @ExcelProperty(value = "云流水报货时间", order = 33) + @ExcelProperty(value = "云流水报货时间", order = 36) @ColumnWidth(35) private String ylsDeclareGoodsTime; - @ExcelProperty(value = "仓库配送时间", order = 34) + @ExcelProperty(value = "仓库配送时间", order = 37) @ColumnWidth(35) private String warehouseDeliveryTime; - @ExcelProperty(value = "收款公司", order = 35) + @ExcelProperty(value = "收款公司", order = 38) @ColumnWidth(35) private String receivingFirmName; - @ExcelProperty(value = "收款公司民生银行账号", order = 36) + @ExcelProperty(value = "收款公司民生银行账号", order = 39) @ColumnWidth(35) private String receivingMsBankAccount; - @ExcelProperty(value = "店铺地址", order = 37) + @ExcelProperty(value = "店铺地址", order = 40) @ColumnWidth(40) private String shopAddress; - @ExcelProperty(value = "阶段状态-建店资料收集", order = 38) + @ExcelProperty(value = "阶段状态-建店资料收集", order = 41) @ColumnWidth(30) private String buildInformationStatus; - @ExcelProperty(value = "建店资料完成时间", order = 39) + @ExcelProperty(value = "建店资料完成时间", order = 42) @ColumnWidth(30) private String buildInformationEndTime; } \ No newline at end of file diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/ExportRealizeServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/ExportRealizeServiceImpl.java index 48fc90d0f..23ff4c1c9 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/ExportRealizeServiceImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/ExportRealizeServiceImpl.java @@ -412,6 +412,11 @@ public class ExportRealizeServiceImpl implements ExportRealizeService { Map buildStageMap = buildStages.stream().collect(Collectors.toMap(ShopStageInfoDO::getShopId, Function.identity())); Map franchiseFeeDTOMap = franchiseFees.stream().filter(o -> o.getShopId() != null) .collect(Collectors.toMap(FranchiseFeeDTO::getShopId, Function.identity())); + Set lineIds = list.stream().map(BranchShopResponse::getLineId).collect(Collectors.toSet()); + List lineInfoDOS = lineInfoDAO.getByLineIds( new ArrayList<>(lineIds)); + Map lineMap = lineInfoDOS.stream().collect(Collectors.toMap(LineInfoDO::getId, Function.identity())); + List qualificationsInfoDOList = qualificationsInfoDAO.getByLineIds(new ArrayList<>(lineIds)); + Map qualificationsInfoDOMap = qualificationsInfoDOList.stream().collect(Collectors.toMap(QualificationsInfoDO::getLineId, Function.identity())); Map signFranchiseMap = new HashMap<>(); if (signFranchises != null) { signFranchiseMap = signFranchises.stream().collect(Collectors.toMap(SignFranchiseDO::getShopId, Function.identity())); @@ -459,8 +464,6 @@ public class ExportRealizeServiceImpl implements ExportRealizeService { FranchiseFeeDTO franchiseFeeDTO = franchiseFeeDTOMap.get(response.getShopId()); dto.setStoreType(StoreTypeEnum.getMessage(response.getStoreType())); if (ObjectUtils.isNotEmpty(franchiseFeeDTO)) { - dto.setFirstYearStartTime(DateUtils.parseDateToStr(SPECIAL_DATE_START_1, franchiseFeeDTO.getFirstYearStartTime())); - dto.setFirstYearEndTime(DateUtils.parseDateToStr(SPECIAL_DATE_START_1, franchiseFeeDTO.getFirstYearEndTime())); String total = (new BigDecimal(franchiseFeeDTO.getPerformanceBond()).add(new BigDecimal(franchiseFeeDTO.getFirstYearFee())) .add(new BigDecimal(franchiseFeeDTO.getFirstYearManagementFee())) .add(new BigDecimal(franchiseFeeDTO.getYearFranchiseFee())) @@ -481,9 +484,15 @@ public class ExportRealizeServiceImpl implements ExportRealizeService { SignFranchiseDO signFranchiseDO = signFranchiseMap.get(response.getShopId()); if (signFranchiseDO != null) { dto.setContractCode(signFranchiseDO.getContractCode()); - dto.setPartnershipSignatoryFirst(signFranchiseDO.getPartnershipSignatoryFirst()); dto.setPartnershipSignatorySecond(signFranchiseDO.getPartnershipSignatorySecond()); + dto.setPartnershipSignatoryFirstMobile(signFranchiseDO.getPartnershipSignatorySecondMobile()); + dto.setPartnershipSignatorySecondIdCard(signFranchiseDO.getPartnershipSignatorySecondIdNumber()); dto.setSignType(SignTypeEnum.getDescByCode(signFranchiseDO.getSignType())); + dto.setProtectiveDistance(signFranchiseDO.getProtectiveDistance()); + dto.setPartnershipSignatoryFirstWhichStore(signFranchiseDO.getPartnershipSignatoryFirstWhichStore()); + dto.setContractSignTime(DateUtils.parseDateToStr(DateUtils.SPECIAL_DATE_START_1, signFranchiseDO.getCreateTime())); + dto.setContractStartTime(DateUtils.parseDateToStr(DateUtils.SPECIAL_DATE_START_1, signFranchiseDO.getContractStartTime())); + dto.setContractEndTime(DateUtils.parseDateToStr(DateUtils.SPECIAL_DATE_START_1, signFranchiseDO.getContractEndTime())); } ShopStageInfoDO buildStageInfoDO = buildStageMap.get(response.getShopId()); if (buildStageInfoDO != null) { @@ -493,6 +502,11 @@ public class ExportRealizeServiceImpl implements ExportRealizeService { dto.setBuildInformationEndTime(buildStageInfoDO.getActualCompleteTime()); } } + LineInfoDO lineInfoDO = lineMap.getOrDefault(response.getLineId(), new LineInfoDO()); + dto.setPartnershipSignatoryFirst(lineInfoDO.getUsername()); + dto.setPartnershipSignatoryFirstMobile(lineInfoDO.getMobile()); + QualificationsInfoDO qualificationsInfoDO = qualificationsInfoDOMap.getOrDefault(response.getLineId(), new QualificationsInfoDO()); + dto.setPartnershipSignatoryFirstIdCard(qualificationsInfoDO.getIdCardNo()); exportList.add(dto); } url = easyExcelUtil.exportExcel(ExportJoinShopDTO.class, exportList, null, From 7c2f72903d5664c458f17cf64a73a636c34e0e97 Mon Sep 17 00:00:00 2001 From: "shuo.wang" Date: Tue, 13 May 2025 14:16:40 +0800 Subject: [PATCH 03/10] fix --- .../cool/store/service/impl/ExportRealizeServiceImpl.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/ExportRealizeServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/ExportRealizeServiceImpl.java index 23ff4c1c9..c03c9dc15 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/ExportRealizeServiceImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/ExportRealizeServiceImpl.java @@ -156,10 +156,10 @@ public class ExportRealizeServiceImpl implements ExportRealizeService { if (ObjectUtils.isNotEmpty(franchiseFeeDTO)) { dto.setFirstYearStartTime(DateUtils.parseDateToStr(SPECIAL_DATE_START_1, franchiseFeeDTO.getFirstYearStartTime())); dto.setFirstYearEndTime(DateUtils.parseDateToStr(SPECIAL_DATE_START_1, franchiseFeeDTO.getFirstYearEndTime())); - String total = (new BigInteger(franchiseFeeDTO.getPerformanceBond()).add(new BigInteger(franchiseFeeDTO.getFirstYearFee())) - .add(new BigInteger(franchiseFeeDTO.getFirstYearManagementFee())) - .add(new BigInteger(franchiseFeeDTO.getYearFranchiseFee())) - .add(new BigInteger(franchiseFeeDTO.getLoanMargin())).toString()); + String total = (new BigDecimal(franchiseFeeDTO.getPerformanceBond()).add(new BigDecimal(franchiseFeeDTO.getFirstYearFee())) + .add(new BigDecimal(franchiseFeeDTO.getFirstYearManagementFee())) + .add(new BigDecimal(franchiseFeeDTO.getYearFranchiseFee())) + .add(new BigDecimal(franchiseFeeDTO.getLoanMargin())).toString()); dto.setTotalAmountContributions(total); dto.setFranchiseFeeBill(franchiseFeeDTO.getYearFranchiseFee()); dto.setLoanMargin(franchiseFeeDTO.getLoanMargin()); From f2c9dfd3897a551a62c4df8eedbdabd61ac0d45d Mon Sep 17 00:00:00 2001 From: "shuo.wang" Date: Tue, 13 May 2025 14:25:44 +0800 Subject: [PATCH 04/10] =?UTF-8?q?fix=20=E5=AF=BC=E5=87=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/mapper/SignFranchiseMapper.xml | 4 +++- .../com/cool/store/service/impl/ExportRealizeServiceImpl.java | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/coolstore-partner-dao/src/main/resources/mapper/SignFranchiseMapper.xml b/coolstore-partner-dao/src/main/resources/mapper/SignFranchiseMapper.xml index 66cd2c977..a4297f6c9 100644 --- a/coolstore-partner-dao/src/main/resources/mapper/SignFranchiseMapper.xml +++ b/coolstore-partner-dao/src/main/resources/mapper/SignFranchiseMapper.xml @@ -56,7 +56,9 @@ limit 1