Merge branch 'feature/xgh/20241月迭代' into 'developer'

增加导购code

See merge request !1669

haoban-manage3-web/src/main/java/com/gic/haoban/manage/web/controller/chat/GroupChatPlanController.java

@@ -446,8 +446,8 @@ public class GroupChatPlanController {
 
         //设置sheet的表头与表名
         String[] groupChatListSheetHead = {"任务名称", "任务状态", "已完成群主数", "未完成群主数", "完成率", "已送达群数", "任务开始时间", "任务结束时间", "创建人", "创建时间"};
-        String[] sendSheetHead = {"任务名称", "发送人", "关联导购", "关联门店", "完成状态", "已送达客户群数", "发送时间", "任务开始时间", "任务结束时间"};
-        String[] receiveSheetHead = {"任务名称", "群名称", "群人数", "发送人", "关联导购", "关联门店", "发送状态", "发送时间", "任务开始时间", "任务结束时间"};
+        String[] sendSheetHead = {"任务名称", "发送人", "关联导购","关联导购code", "关联门店", "关联门店code","完成状态", "已送达客户群数", "发送时间", "任务开始时间", "任务结束时间"};
+        String[] receiveSheetHead = {"任务名称", "群名称", "群人数", "发送人", "关联导购", "关联导购code","关联门店",  "关联门店code","发送状态", "发送时间", "任务开始时间", "任务结束时间"};
 
         List<ExcelSheet> mysheet = new ArrayList<>();
         ExcelSheet groupChatListExcel = new ExcelSheet("客户群发列表", groupChatListSheetHead, changeGroupChatPlanExcelVOList(groupChatPlanExcelVOList));
@@ -482,7 +482,7 @@ public class GroupChatPlanController {
             String sendTime = DateUtil.formatString(vo.getSendTime(), DateUtil.FORMAT_DATETIME_19);
             String startTime = DateUtil.formatString(vo.getStartTime(), DateUtil.FORMAT_DATETIME_19);
             String endTime = DateUtil.formatString(vo.getEndTime(), DateUtil.FORMAT_DATETIME_19);
-            String[] a = {vo.getName(), vo.getStaffName(), vo.getClerkName(), vo.getStoreName(),vo.getSendStatusExcel(), vo.getSendCount()==null?"":vo.getSendCount().toString(), sendTime,startTime, endTime};
+            String[] a = {vo.getName(), vo.getStaffName(), vo.getClerkName(),vo.getClerkCode(), vo.getStoreName(), vo.getStoreCode(), vo.getSendStatusExcel(), vo.getSendCount()==null?"":vo.getSendCount().toString(), sendTime,startTime, endTime};
             result.add(a);
         }
         return result;
@@ -496,7 +496,7 @@ public class GroupChatPlanController {
             String sendTime = DateUtil.formatString(vo.getSendTime(), DateUtil.FORMAT_DATETIME_19);
             String startTime = DateUtil.formatString(vo.getStartTime(), DateUtil.FORMAT_DATETIME_19);
             String endTime = DateUtil.formatString(vo.getEndTime(), DateUtil.FORMAT_DATETIME_19);
-            String[] a = {vo.getName(), vo.getChatName(), vo.getChatTotalCount()==null?"":vo.getChatTotalCount().toString(), vo.getStaffName(),vo.getClerkName(),vo.getStoreName(),vo.getSendStatusExcel(),sendTime,startTime, endTime};
+            String[] a = {vo.getName(), vo.getChatName(), vo.getChatTotalCount()==null?"":vo.getChatTotalCount().toString(), vo.getStaffName(),vo.getClerkName(),vo.getClerkCode(),vo.getStoreName(),vo.getStoreCode(),vo.getSendStatusExcel(),sendTime,startTime, endTime};
             result.add(a);
         }
         return result;

haoban-manage3-web/src/main/java/com/gic/haoban/manage/web/vo/chat/ReceiveExcelVO.java

@@ -36,10 +36,13 @@ public class ReceiveExcelVO implements Serializable {
      * 关联导购
      */
     private String clerkName;
+
+    private String clerkCode;
     /**
      * 关联门店
      */
     private String storeName;
+    private String storeCode;
     /**
      * 发送状态
      */
@@ -61,6 +64,22 @@ public class ReceiveExcelVO implements Serializable {
      */
     private Date endTime;
 
+    public String getClerkCode() {
+        return clerkCode;
+    }
+
+    public void setClerkCode(String clerkCode) {
+        this.clerkCode = clerkCode;
+    }
+
+    public String getStoreCode() {
+        return storeCode;
+    }
+
+    public void setStoreCode(String storeCode) {
+        this.storeCode = storeCode;
+    }
+
     public String getName() {
         return name;
     }

haoban-manage3-web/src/main/java/com/gic/haoban/manage/web/vo/chat/SendExcelVO.java

@@ -27,10 +27,14 @@ public class SendExcelVO implements Serializable{
 	 * 关联导购
 	 */
 	private String clerkName;
+
+	private String clerkCode ;
 	/**
 	 * 关联门店
 	 */
 	private String storeName;
+
+	private String storeCode ;
 	/**
 	 * 完成状态
 	 */
@@ -56,6 +60,22 @@ public class SendExcelVO implements Serializable{
 	 */
 	private Date endTime;
 
+	public String getClerkCode() {
+		return clerkCode;
+	}
+
+	public void setClerkCode(String clerkCode) {
+		this.clerkCode = clerkCode;
+	}
+
+	public String getStoreCode() {
+		return storeCode;
+	}
+
+	public void setStoreCode(String storeCode) {
+		this.storeCode = storeCode;
+	}
+
 	public String getName() {
 		return name;
 	}