From 84c851d1db6c3502d51ee4045fbcde3e9b714fbc Mon Sep 17 00:00:00 2001
From: huangdeliang <huangdeliang@skieer.com>
Date: Thu, 18 Mar 2021 11:55:44 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E9=98=BF=E9=87=8C=E4=BA=91os?=
 =?UTF-8?q?s=E7=A9=BA=E6=8C=87=E9=92=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../common/utils/oss/AliyunOSSUtils.java      |  4 +
 .../mapper/custom/SysCustomerMapper.xml       | 11 ++-
 stdiet-ui/src/views/custom/customer/index.vue | 84 ++++++++++---------
 .../recipesBuild/InfoView/PieChart/index.vue  |  2 +-
 4 files changed, 58 insertions(+), 43 deletions(-)

diff --git a/stdiet-common/src/main/java/com/stdiet/common/utils/oss/AliyunOSSUtils.java b/stdiet-common/src/main/java/com/stdiet/common/utils/oss/AliyunOSSUtils.java
index 0b77da830..0a5b163b1 100644
--- a/stdiet-common/src/main/java/com/stdiet/common/utils/oss/AliyunOSSUtils.java
+++ b/stdiet-common/src/main/java/com/stdiet/common/utils/oss/AliyunOSSUtils.java
@@ -3,6 +3,7 @@ package com.stdiet.common.utils.oss;
 import com.aliyun.oss.model.GetObjectRequest;
 import com.aliyun.oss.model.OSSObject;
 import com.stdiet.common.config.AliyunOSSConfig;
+import com.stdiet.common.utils.StringUtils;
 import com.stdiet.common.utils.file.FileUtils;
 import org.springframework.web.multipart.MultipartFile;
 
@@ -233,6 +234,9 @@ public class AliyunOSSUtils {
      * @return
      */
     public static String generatePresignedUrl(String fileUrl){
+        if(StringUtils.isEmpty(fileUrl)) {
+            return null;
+        }
         // 创建OSSClient实例。
         OSS ossClient = getOssClient();
 
diff --git a/stdiet-custom/src/main/resources/mapper/custom/SysCustomerMapper.xml b/stdiet-custom/src/main/resources/mapper/custom/SysCustomerMapper.xml
index 4e4c7bab9..89ef8a168 100644
--- a/stdiet-custom/src/main/resources/mapper/custom/SysCustomerMapper.xml
+++ b/stdiet-custom/src/main/resources/mapper/custom/SysCustomerMapper.xml
@@ -35,8 +35,15 @@
     <select id="selectSysCustomerList" parameterType="SysCustomer" resultMap="SysCustomerResult">
         <include refid="selectSysCustomerVo"/>
         where del_flag = 0
-        <if test="name != null  and name != ''"> and name like concat('%', #{name}, '%')</if>
-        <if test="phone != null  and phone != ''"> and phone like concat('%', #{phone}, '%')</if>
+        <if test="name != null  and name != ''"> and name like concat('%', #{name}, '%') or phone like concat('%', #{name}, '%')</if>
+        <if test="mainDietitian != null  and mainDietitian != ''"> and main_dietitian = #{mainDietitian}</if>
+        <if test="mainDietitian == 0"> and isnull(main_dietitian) or main_dietitian=0</if>
+        <if test="salesman != null  and salesman != ''"> and salesman = #{salesman}</if>
+        <if test="salesman == 0"> and isnull(salesman) or salesman=0</if>
+        <if test="afterDietitian != null  and afterDietitian != ''"> and after_dietitian = #{afterDietitian}</if>
+        <if test="afterDietitian == 0"> and isnull(after_dietitian) or after_dietitian=0</if>
+        <if test="assistantDietitian != null  and assistantDietitian != ''"> and assistant_dietitian = #{assistantDietitian}</if>
+        <if test="assistantDietitian == 0"> and isnull(assistant_dietitian) or assistant_dietitian=0</if>
         <if test="fansChannel != null "> and fans_channel = #{fansChannel}</if>
         order by create_time desc
     </select>
diff --git a/stdiet-ui/src/views/custom/customer/index.vue b/stdiet-ui/src/views/custom/customer/index.vue
index e2484bd46..127446616 100644
--- a/stdiet-ui/src/views/custom/customer/index.vue
+++ b/stdiet-ui/src/views/custom/customer/index.vue
@@ -7,24 +7,16 @@
       v-show="showSearch"
       label-width="86px"
     >
-      <el-form-item label="名字" prop="name">
+      <el-form-item label="客户信息" prop="name">
         <el-input
           v-model.trim="queryParams.name"
-          placeholder="请输入名字"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="手机号" prop="phone">
-        <el-input
-          v-model.trim="queryParams.phone"
-          placeholder="请输入手机号"
+          placeholder="请输入名字或手机号"
           clearable
           size="small"
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
+
       <el-form-item label="进粉渠道" prop="fansChannel">
         <el-select v-model="queryParams.fansChannel" placeholder="请选择">
           <el-option
@@ -35,39 +27,51 @@
           />
         </el-select>
       </el-form-item>
-      <!--<el-form-item label="营养师助理" prop="assistantDietitian">
-        <el-input
-          v-model="queryParams.assistantDietitian"
-          placeholder="请输入营养师助理"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
+      <el-form-item label="营养师" prop="mainDietitian">
+        <el-select v-model="queryParams.mainDietitian" placeholder="请选择">
+          <el-option
+            v-for="dict in nutritionistIdOptions"
+            :key="dict.dictValue"
+            :label="dict.dictLabel"
+            :value="parseInt(dict.dictValue)"
+          />
+        </el-select>
       </el-form-item>
-      <el-form-item label="售后营养师" prop="afterDietitian">
-        <el-input
-          v-model="queryParams.afterDietitian"
-          placeholder="请输入售后营养师"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
+      <el-form-item label="营养师助理" prop="assistantDietitian">
+        <el-select
+          v-model="queryParams.assistantDietitian"
+          placeholder="请选择"
+        >
+          <el-option
+            v-for="dict in nutriAssisIdOptions"
+            :key="dict.dictValue"
+            :label="dict.dictLabel"
+            :value="parseInt(dict.dictValue)"
+          />
+        </el-select>
       </el-form-item>
       <el-form-item label="销售人员" prop="salesman">
-        <el-input
-          v-model="queryParams.salesman"
-          placeholder="请输入销售人员"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>-->
+        <el-select v-model="queryParams.salesman" placeholder="请选择">
+          <el-option
+            v-for="dict in preSaleIdOptions"
+            :key="dict.dictValue"
+            :label="dict.dictLabel"
+            :value="parseInt(dict.dictValue)"
+          />
+        </el-select>
+      </el-form-item>
+      <el-form-item label="售后营养师" prop="afterDietitian">
+        <el-select v-model="queryParams.afterDietitian" placeholder="请选择">
+          <el-option
+            v-for="dict in afterSaleIdOptions"
+            :key="dict.dictValue"
+            :label="dict.dictLabel"
+            :value="parseInt(dict.dictValue)"
+          />
+        </el-select>
+      </el-form-item>
       <el-form-item>
-        <el-button
-          type="cyan"
-          icon="el-icon-search"
-          size="mini"
-          @click="handleQuery"
+        <el-button type="cyan" icon="el-icon-search" @click="handleQuery"
           >搜索</el-button
         >
         <el-button icon="el-icon-refresh" size="mini" @click="resetQuery"
diff --git a/stdiet-ui/src/views/custom/recipesBuild/InfoView/PieChart/index.vue b/stdiet-ui/src/views/custom/recipesBuild/InfoView/PieChart/index.vue
index a9fc668c6..1da5ce55c 100644
--- a/stdiet-ui/src/views/custom/recipesBuild/InfoView/PieChart/index.vue
+++ b/stdiet-ui/src/views/custom/recipesBuild/InfoView/PieChart/index.vue
@@ -266,7 +266,7 @@ export default {
           },
         ],
       };
-      console.log(option);
+      // console.log(option);
       this.chart.setOption(option);
     },
     handleOnViewChange(view) {