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

列表字段更改

Browse Source
This commit is contained in:
zhangchenbiao
2023-06-21 10:57:05 +08:00
parent 60315342d5
commit 349695b0c5
6 changed files with 75 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
coolstore-partner-model/src/main/java/com/cool/store/vo/BlackListVO.java
View File

@@ -31,10 +31,10 @@ public class BlackListVO {
private String phoneAddress;
@ApiModelProperty("创建时间")
private Date createTime;
private String createTime;
@ApiModelProperty("操作时间")
private Date closeTime;
private String closeTime;
@ApiModelProperty("操作人ID")
private String closeUserId;

50
coolstore-partner-model/src/main/java/com/cool/store/vo/PrivateSeaLineListVo.java
View File

@@ -1,10 +1,17 @@
package com.cool.store.vo;
import cn.hutool.core.date.DateUtil;
import com.cool.store.dto.partner.PrivateSeaLineDTO;
import com.cool.store.utils.CoolDateUtils;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import org.apache.commons.lang3.time.DateUtils;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
import java.util.Map;
/**
* @Author suzhuhong
@@ -35,7 +42,7 @@ public class PrivateSeaLineListVo {
private String partnerUserPhone;
@ApiModelProperty("截止时间")
private Date deadline;
private String deadline;
@ApiModelProperty("招商经理")
private String investmentManager;
@@ -52,11 +59,14 @@ public class PrivateSeaLineListVo {
@ApiModelProperty("意向开店区域")
private String wantShopArea;
@ApiModelProperty("意向开店区域名称")
private String wantShopAreaName;
@ApiModelProperty("0不接受调剂、1全国调剂、2省内调剂、3市内调剂")
private Integer acceptAdjustType;
@ApiModelProperty("更新时间")
private Date updateTime;
private String updateTime;
@ApiModelProperty("门店编码")
private String storeCode;
@@ -73,4 +83,40 @@ public class PrivateSeaLineListVo {
@ApiModelProperty("推荐加盟商名称")
private String recommendPartnerName;
public static List<PrivateSeaLineListVo> convertList(List<PrivateSeaLineDTO> list, Map<String, String> finalDevManagerMap, Map<Long, String> wantShopAreaNameMap){
List<PrivateSeaLineListVo> resultList = new ArrayList<>();
for (PrivateSeaLineDTO x : list) {
PrivateSeaLineListVo privateSeaLineListVo = new PrivateSeaLineListVo();
privateSeaLineListVo.setLineId(x.getLineId());
privateSeaLineListVo.setLineStatus(x.getLineStatus());
privateSeaLineListVo.setPartnerId(x.getPartnerId());
privateSeaLineListVo.setWorkflowStatus(x.getWorkflowStatus());
String deadLine = DateUtil.format(x.getDeadline(), CoolDateUtils.DATE_FORMAT_SEC);
privateSeaLineListVo.setDeadline(deadLine);
privateSeaLineListVo.setPartnerUserPhone(x.getPartnerUserPhone());
privateSeaLineListVo.setPartnerUserName(x.getPartnerUserName());
privateSeaLineListVo.setAcceptAdjustType(x.getAcceptAdjustType());
privateSeaLineListVo.setInvestmentManagerName(x.getInvestmentManager());
privateSeaLineListVo.setDevelopmentManager(x.getDevelopmentManager());
privateSeaLineListVo.setInvestmentManagerName(x.getInvestmentManagerName());
privateSeaLineListVo.setStoreCode(x.getStoreCode());
privateSeaLineListVo.setStoreName(x.getStoreName());
String updateTime = DateUtil.format(x.getUpdateTime(), CoolDateUtils.DATE_FORMAT_SEC);
privateSeaLineListVo.setUpdateTime(updateTime);
privateSeaLineListVo.setRecommendPartnerId(x.getRecommendPartnerId());
privateSeaLineListVo.setAcceptAdjustType(x.getAcceptAdjustType());
privateSeaLineListVo.setWantShopArea(x.getWantShopArea());
privateSeaLineListVo.setWantShopAreaName(wantShopAreaNameMap.get(x.getWantShopArea()));
privateSeaLineListVo.setInvestmentManager(x.getInvestmentManager());
privateSeaLineListVo.setRecommendPartnerName(x.getRecommendPartnerName());
privateSeaLineListVo.setWorkflowStage(x.getWorkflowStage());
privateSeaLineListVo.setWantShopArea(x.getWantShopArea());
privateSeaLineListVo.setWorkflowStage(x.getWorkflowStage());
privateSeaLineListVo.setDevelopmentManagerName(finalDevManagerMap.get(x.getDevelopmentManager()));
resultList.add(privateSeaLineListVo);
}
return resultList;
}
}

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

@@ -53,7 +53,7 @@ public class PublicSeaLineListVo {
private String rejectRealReason;
@ApiModelProperty("返回公海时间")
private Date LastCloseDate ;
private String LastCloseDate ;
@ApiModelProperty("招商经理")
private String lastInvestmentManager;