导出运营报表2-经纪人日程管理,销售目标,活动量

yd-api/src/main/java/com/yd/api/agms/service/impl/AgmsPractitionerServiceImpl.java

@@ -228,7 +228,7 @@ public class AgmsPractitionerServiceImpl implements AgmsPractitionerService {
                 buf.append(i + 1).append(CSV_COLUMN_SEPARATOR);
                 buf.append(i + 1).append(CSV_COLUMN_SEPARATOR);
 
 
                 for (int j = 1; j < columnName.length; j++) {
                 for (int j = 1; j < columnName.length; j++) {
-                    buf.append(map.get(j + "")).append("\t").append(CSV_COLUMN_SEPARATOR);
+                    buf.append(map.get(j + "") == null ? "" : map.get(j + "")).append("\t").append(CSV_COLUMN_SEPARATOR);
                 }
                 }
 
 
                 buf.append(CSV_ROW_SEPARATOR);
                 buf.append(CSV_ROW_SEPARATOR);

yd-api/src/main/resources/mapper/agms/AgmsPractitionerMapper.xml

@@ -116,7 +116,7 @@
                 op.drop_option_name '4',
                 op.drop_option_name '4',
                 t.task_time_from '5',
                 t.task_time_from '5',
                 task_time_end '6',
                 task_time_end '6',
-                t.notice '7',
+                REPLACE(t.notice,',',';') '7',
                 date_format(t.created_at, '%Y-%m-%d %H:%i:%s') '8'
                 date_format(t.created_at, '%Y-%m-%d %H:%i:%s') '8'
         FROM ag_mkt_schedule_task_tracking t, ag_acl_practitioner p, ag_md_drop_options op
         FROM ag_mkt_schedule_task_tracking t, ag_acl_practitioner p, ag_md_drop_options op
         WHERE t.practitioner_id = p.id AND op.id = t.md_drop_option_id
         WHERE t.practitioner_id = p.id AND op.id = t.md_drop_option_id