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

fix 工作台字段

Browse Source
This commit is contained in:
shuo.wang
2024-11-07 15:31:49 +08:00
parent ab784594a9
commit b3d43ed041
3 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -544,7 +544,7 @@
</if>
</select>
<select id="getLines" resultType="com.cool.store.dto.openPreparation.PlanLineDTO">
select xli.id as lineId, xli.mobile as mobile, xli.username as username,xli.investment_manager as investmentManagerId ,eu.name as name
select xli.id as lineId, xli.mobile as mobile, xli.username as username,xli.investment_manager as investmentManagerId ,eu.name as investmentManagerName
from xfsg_line_info xli
join enterprise_user_${enterpriseId} eu on xli.investment_manager = eu.user_id
where deleted = 0

2
coolstore-partner-model/src/main/java/com/cool/store/vo/desk/PreparationCommonPendingVO.java
View File

@@ -16,7 +16,7 @@ public class PreparationCommonPendingVO {
@ApiModelProperty("门店负责人名称")
private String shopManagerUserName;
@ApiModelProperty("门店编码")
private String storeNum;
private String shopCode;
@ApiModelProperty("店铺地址")
private String shopAddress;
@ApiModelProperty("督导")

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

@@ -550,9 +550,9 @@ public class DeskServiceImpl implements DeskService {
if(pointInfoDO != null) {
preparationCommonPendingVO.setShopAddress(pointInfoDO.getAddress());
}
preparationCommonPendingVO.setStoreNum(shopInfoDO.getStoreNum());
preparationCommonPendingVO.setShopCode(shopInfoDO.getShopCode());
}
preparationCommonPendingVO.setInvestmentManager(lineMap.get(x.getLineId()).getInvestmentManagerName());
preparationCommonPendingVO.setInvestmentManager(lineMap.getOrDefault(x.getLineId(),new PlanLineDTO()).getInvestmentManagerName());
preparationCommonPendingVO.setStage(x.getShopStage());
preparationCommonPendingVO.setSubStage(x.getShopSubStage());
preparationCommonPendingVO.setSubStageStatus(x.getShopSubStageStatus());
@@ -654,7 +654,7 @@ public class DeskServiceImpl implements DeskService {
if(pointInfoDO != null) {
preparationCommonPendingVO.setShopAddress(pointInfoDO.getAddress());
}
preparationCommonPendingVO.setStoreNum(shopInfoDO.getStoreNum());
preparationCommonPendingVO.setShopCode(shopInfoDO.getShopCode());
}
preparationCommonPendingVO.setLineId(shopInfoDO.getLineId());
preparationCommonPendingVO.setShopId(x.getShopId());