From 4298b83f94a892f2795020296103521c497e3e24 Mon Sep 17 00:00:00 2001 From: mzr <1562242162@qq.com> Date: Tue, 19 Nov 2024 10:58:35 +0800 Subject: [PATCH] =?UTF-8?q?=E5=B8=82=E5=9C=BA=E6=B4=BB=E5=8A=A8=E6=9F=A5?= =?UTF-8?q?=E8=AF=A2=E8=B0=83=E6=95=B4-=E5=AE=A2=E6=88=B7=E7=9A=84?= =?UTF-8?q?=E6=9D=A5=E6=BA=90=E6=A1=A3=E6=A1=88=E5=A2=9E=E5=8A=A0=E7=A7=8D?= =?UTF-8?q?=E6=A4=8D=E6=88=B7=E6=A1=A3=E6=A1=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../archives/plantuser/PlantuserApi.java | 2 +- .../webapp/excel/view/ViewMeetingExcel.java | 8 +- .../com/yb/lb/webapp/view/ViewMeetingApi.java | 2 - .../lb/webapp/view/ViewMeetingController.java | 2 - .../view/MarketingActivityMapper.xml | 187 +----------------- .../webapp/view/view/entity/ViewMeeting.java | 4 + 6 files changed, 11 insertions(+), 194 deletions(-) diff --git a/crm-admin/src/main/java/com/yb/lb/webapp/archives/plantuser/PlantuserApi.java b/crm-admin/src/main/java/com/yb/lb/webapp/archives/plantuser/PlantuserApi.java index 8ce9e7c..c08ac71 100644 --- a/crm-admin/src/main/java/com/yb/lb/webapp/archives/plantuser/PlantuserApi.java +++ b/crm-admin/src/main/java/com/yb/lb/webapp/archives/plantuser/PlantuserApi.java @@ -479,7 +479,7 @@ public class PlantuserApi { params.put("documentsStatus", documentsStatus); } if (StringUtil.isNotEmpty(status) && status.contains(",")) { - params.put("statusArr", status); + params.put("statusArr", status.split(",", -1)); } else { params.put("status", status); } diff --git a/crm-admin/src/main/java/com/yb/lb/webapp/excel/view/ViewMeetingExcel.java b/crm-admin/src/main/java/com/yb/lb/webapp/excel/view/ViewMeetingExcel.java index 2f3cb19..8b4c2da 100644 --- a/crm-admin/src/main/java/com/yb/lb/webapp/excel/view/ViewMeetingExcel.java +++ b/crm-admin/src/main/java/com/yb/lb/webapp/excel/view/ViewMeetingExcel.java @@ -62,7 +62,6 @@ public class ViewMeetingExcel { @ApiParam(required = false, value = "营销code 2.虚拟 3.实际") @RequestParam(required = false) String code, @ApiParam(required = false, value = "经销商id") @RequestParam(required = false) String dealersId, @ApiParam(required = false, value = "客户名称") @RequestParam(required = false) String distributorName, - @ApiParam(required = false, value = "客户类型编码") @RequestParam(required = false) String clientType, @ApiParam(required = false, value = "业务员id") @RequestParam(required = false) String staffId, HttpServletRequest request, HttpServletResponse response) throws Exception { Map params = new HashMap(); @@ -83,12 +82,9 @@ public class ViewMeetingExcel { params.put("endDate", endDate); params.put("dealersId", dealersId); params.put("distributorName", distributorName); - params.put("clientType", clientType); params.put("staffId", staffId); - params.put("page", 1); - params.put("pageSize", 10000); - PageInfo pageInfo = viewMeetingService.pageList(params, ".pageList"); - EasyPoiUtils.exportExcel(pageInfo.getList(), ViewMeeting.class, "市场活动导出", response); + List list = viewMeetingService.listAll(params, ".pageList"); + EasyPoiUtils.exportExcel(list, ViewMeeting.class, "市场活动导出", response); } /** diff --git a/crm-admin/src/main/java/com/yb/lb/webapp/view/ViewMeetingApi.java b/crm-admin/src/main/java/com/yb/lb/webapp/view/ViewMeetingApi.java index ef931d5..dda782b 100644 --- a/crm-admin/src/main/java/com/yb/lb/webapp/view/ViewMeetingApi.java +++ b/crm-admin/src/main/java/com/yb/lb/webapp/view/ViewMeetingApi.java @@ -137,7 +137,6 @@ public class ViewMeetingApi extends BaseController { @ApiParam(required = false, value = "营销code 2.虚拟 3.实际") @RequestParam(required = false) String code, @ApiParam(required = false, value = "客户id") @RequestParam(required = false) String dealersId, @ApiParam(required = false, value = "客户名称") @RequestParam(required = false) String distributorName, - @ApiParam(required = false, value = "客户类型编码") @RequestParam(required = false) String clientType, @ApiParam(required = false, value = "业务员id") @RequestParam(required = false) String staffId, @ApiParam(required = true, value = "页码", defaultValue = "1") @RequestParam(required = true) String page, @ApiParam(required = true, value = "显示数量", defaultValue = "10") @RequestParam(required = true) String pageSize, @@ -161,7 +160,6 @@ public class ViewMeetingApi extends BaseController { paramsMap.put("createEndDate", createEndDate); paramsMap.put("dealersId", dealersId); paramsMap.put("distributorName", distributorName); - paramsMap.put("clientType", clientType); paramsMap.put("staffId", staffId); paramsMap.put("page", page); paramsMap.put("pageSize", pageSize); diff --git a/crm-admin/src/main/java/com/yb/lb/webapp/view/ViewMeetingController.java b/crm-admin/src/main/java/com/yb/lb/webapp/view/ViewMeetingController.java index 5167e65..73c1831 100644 --- a/crm-admin/src/main/java/com/yb/lb/webapp/view/ViewMeetingController.java +++ b/crm-admin/src/main/java/com/yb/lb/webapp/view/ViewMeetingController.java @@ -55,7 +55,6 @@ public class ViewMeetingController extends BaseController { @ApiParam(required = false, value = "营销code 2.虚拟 3.实际") @RequestParam(required = false) String code, @ApiParam(required = false, value = "经销商id") @RequestParam(required = false) String dealersId, @ApiParam(required = false, value = "客户名称") @RequestParam(required = false) String distributorName, - @ApiParam(required = false, value = "客户类型编码") @RequestParam(required = false) String clientType, @ApiParam(required = false, value = "业务员id") @RequestParam(required = false) String staffId, @ApiParam(required = true, value = "页码", defaultValue = "1") @RequestParam(required = true) String page, @ApiParam(required = true, value = "显示数量", defaultValue = "10") @RequestParam(required = true) String pageSize, @@ -79,7 +78,6 @@ public class ViewMeetingController extends BaseController { paramsMap.put("endDate", endDate); paramsMap.put("dealersId", dealersId); paramsMap.put("distributorName", distributorName); - paramsMap.put("clientType", clientType); paramsMap.put("staffId", staffId); paramsMap.put("page", page); paramsMap.put("pageSize", pageSize); diff --git a/crm-common/src/main/resources/mapper/mapper_oracle/view/MarketingActivityMapper.xml b/crm-common/src/main/resources/mapper/mapper_oracle/view/MarketingActivityMapper.xml index 34f995b..02e07ba 100644 --- a/crm-common/src/main/resources/mapper/mapper_oracle/view/MarketingActivityMapper.xml +++ b/crm-common/src/main/resources/mapper/mapper_oracle/view/MarketingActivityMapper.xml @@ -140,7 +140,7 @@ a.id, a.type_id, a.type_code, a.activity_content, a.activity_date, a.sem_id, a.ancestors, a.staff_id, a.dealers_id, a.client_type, a.region, a.company_id, a.create_user, a.staff_size, a.site, a.longitude, a.latitude, a.activity_img, a.videos, a.create_time, a.view_no, a.remark, a.status, a.auditor, a.audit_time, a.audit_content, a.process_instance_id, a.menu_code, a.area_code, - b.distributor_name, c.area_name, d.dict_name typeName, e.name staff_name, f.dict_name clientTypeName + a.distributor_name, c.area_name, d.dict_name typeName, e.name staff_name, f.dict_name clientTypeName FROM crm_marketing_activity a left join crm_distributor_user_info b on a.dealers_id = b.id left join crm_marketing_area_info c on a.sem_id = c.id @@ -172,10 +172,7 @@ and a.dealers_id = #{dealersId} - and b.distributor_name = #{distributorName} - - - and b.distributor_level = #{clientType} + and a.distributor_name = #{distributorName} and a.staff_id = #{staffId} @@ -320,7 +317,6 @@ diff --git a/crm-webapp/src/main/java/com/yb/lb/webapp/view/view/entity/ViewMeeting.java b/crm-webapp/src/main/java/com/yb/lb/webapp/view/view/entity/ViewMeeting.java index 84b4f3d..a7b617d 100644 --- a/crm-webapp/src/main/java/com/yb/lb/webapp/view/view/entity/ViewMeeting.java +++ b/crm-webapp/src/main/java/com/yb/lb/webapp/view/view/entity/ViewMeeting.java @@ -164,4 +164,8 @@ public class ViewMeeting implements Serializable { /** 营销区域编码 */ @ApiModelProperty(hidden = true) private String areaCode; + + /** 客户档案来源 1.经销商档案 2.种植户档案 */ + @ApiModelProperty(value = "客户档案来源 1.经销商档案 2.种植户档案", required = true) + private String sourceType; } \ No newline at end of file