提交 5a27dc9d authored 作者: 000516's avatar 000516 提交者: Coding

1、城市经理由原来的approve_name(流程审批人)改为manage_name(店铺负责人)

Merge Request: 1、城市经理由原来的approve_name(流程审批人)改为manage_name(店铺负责人) Created By: @李秋林 Accepted By: @李秋林 URL: https://g-pkkp8204.coding.net/p/promotion/d/wangxiaolu-export/git/merge/232?initial=true
...@@ -34,7 +34,7 @@ public class TemporaryActivityReportedDO implements Serializable { ...@@ -34,7 +34,7 @@ public class TemporaryActivityReportedDO implements Serializable {
private String city; private String city;
@TableField(exist = false) @TableField(exist = false)
private String approveName; private String manageName;
@TableField(exist = false) @TableField(exist = false)
private String createDate; private String createDate;
......
...@@ -107,7 +107,7 @@ public class ActivityToFeishuSheetServiceImpl implements ActivityToFeishuSheetSe ...@@ -107,7 +107,7 @@ public class ActivityToFeishuSheetServiceImpl implements ActivityToFeishuSheetSe
row.add(rdo.getOrgName()); row.add(rdo.getOrgName());
// 城市经理 // 城市经理
row.add(rdo.getApproveName()); row.add(rdo.getManageName());
// 执行城市 // 执行城市
row.add(rdo.getCity()); row.add(rdo.getCity());
...@@ -340,7 +340,7 @@ public class ActivityToFeishuSheetServiceImpl implements ActivityToFeishuSheetSe ...@@ -340,7 +340,7 @@ public class ActivityToFeishuSheetServiceImpl implements ActivityToFeishuSheetSe
// 推广成交照片2 >>> // 推广成交照片2 >>>
if (!(photosType3Size < 2 || Objects.isNull(photosType3.get(1)))) { if (!(photosType3Size < 2 || Objects.isNull(photosType3.get(1)))) {
valuesImageToSheetByRobot2(String.format(rangFormat, "AG", "AG"), photosType3.get(1).getPhotoUrl()); valuesImageToSheetByRobot2(String.format(rangFormat, "AJ", "AJ"), photosType3.get(1).getPhotoUrl());
pct.append("、成交2:"+DateUtil.formatDateTime(photosType3.get(1).getCreateTime())); pct.append("、成交2:"+DateUtil.formatDateTime(photosType3.get(1).getCreateTime()));
} }
......
...@@ -12,7 +12,7 @@ ...@@ -12,7 +12,7 @@
<result property="approveStatus" column="approve_status" jdbcType="VARCHAR"/> <result property="approveStatus" column="approve_status" jdbcType="VARCHAR"/>
<result property="storeName" column="store_name" jdbcType="VARCHAR"/> <result property="storeName" column="store_name" jdbcType="VARCHAR"/>
<result property="city" column="city" jdbcType="VARCHAR"/> <result property="city" column="city" jdbcType="VARCHAR"/>
<result property="approveName" column="approve_name" jdbcType="VARCHAR"/> <result property="manageName" column="manage_name" jdbcType="VARCHAR"/>
<result property="createDate" column="create_date" jdbcType="CHAR"/> <result property="createDate" column="create_date" jdbcType="CHAR"/>
<result property="dealerName" column="dealer_name" jdbcType="VARCHAR"/> <result property="dealerName" column="dealer_name" jdbcType="VARCHAR"/>
<result property="lineName" column="line_name" jdbcType="VARCHAR"/> <result property="lineName" column="line_name" jdbcType="VARCHAR"/>
...@@ -48,7 +48,7 @@ ...@@ -48,7 +48,7 @@
temporary_id, temporary_id,
approver_id, approver_id,
temporary_name, temporary_name,
approve_name, manage_name,
city, city,
create_date, create_date,
dealer_name, dealer_name,
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论