Merge branch 'master' of http://1.14.104.71:10880/root/ylrz_his_scrm_java into openIm

fs-service/src/main/java/com/fs/hisStore/config/MedicalMallConfig.java

@@ -28,6 +28,8 @@ public class MedicalMallConfig {
     private boolean isAudit;
     // 资源配置
     private boolean isResource;
+    // 多店铺
+    private boolean isStores;
     @PostConstruct
     public void init() {
         JSONObject jsonObject = configUtil.generateConfigByKey("medicalMall.func.switch");
@@ -36,6 +38,7 @@ public class MedicalMallConfig {
             this.isStatics = Objects.equals(jsonObject.getString("statics"), "1");
             this.isAudit = Objects.equals(jsonObject.getString("isAudit"), "1");
             this.isResource = Objects.equals(jsonObject.getString("isResource"), "1");
+            this.isStores = Objects.equals(jsonObject.getString("isStores"), "1");
         }
     }
 

fs-service/src/main/resources/application-config-druid-jnlzjk.yml

@@ -83,8 +83,8 @@ headerImg:
   imgUrl:
 
 ipad:
-  ipadUrl: http://ipad.cdwjyyh.com
-  aiApi: 1212121212
+  ipadUrl: http://ipad.ljhehualu.com
+  aiApi: http://49.232.181.28:3000/
 
 wx_miniapp_temp:
   pay_order_temp_id:

fs-service/src/main/resources/mapper/qw/QwUserVoiceLogMapper.xml

@@ -29,6 +29,10 @@
             <id column="qw_user_id" property="qwUserId"></id>
             <result column="qw_user_name" property="qwUserName"></result>
         </association>
+        <association property="qwExternalContact" javaType="com.fs.qw.domain.QwExternalContact" autoMapping="true">
+            <id column="id" property="id"></id>
+            <result column="name" property="name"></result>
+        </association>
     </resultMap>
 
     <resultMap type="com.fs.qw.vo.QwUserVoiceLogVo" id="QwUserVoiceLogVoResult" extends="QwUserVoiceLogResult">
@@ -57,7 +61,7 @@
     </sql>
 
     <select id="selectQwUserVoiceLogList" resultMap="QwUserVoiceLogVoResult">
-        select uvl.id, ext_id, uvl.qw_user_id, duration, title, uvl.status, uvl.corp_id, uvl.company_id, uvl.company_user_id, uvl.create_time,qec.`name`,qec.tag_ids,c.company_name,cu.user_name,qu.qw_user_name
+        select uvl.id, ext_id, uvl.qw_user_id, duration, title, uvl.status, uvl.corp_id, uvl.company_id, uvl.company_user_id, uvl.create_time,qec.`name`,qec.tag_ids tagIds,c.company_name,cu.user_name,qu.qw_user_name
         from qw_user_voice_log uvl
         left join qw_external_contact qec on uvl.ext_id = qec.id
         left join company c on uvl.company_id = c.company_id
@@ -98,7 +102,7 @@
     </select>
     <select id="selectQwUserVoiceLogTotalList" resultMap="QwUserVoiceLogVoTotalResult">
         SELECT uvl.id, ext_id, uvl.qw_user_id, duration, title, uvl.status, uvl.corp_id,
-               uvl.company_id, uvl.company_user_id, uvl.create_time,qec.`name`,qec.tag_ids,qu.qw_user_name,
+               uvl.company_id, uvl.company_user_id, uvl.create_time,qec.`name`,qec.tag_ids tagIds,qu.qw_user_name,
         SUM(duration) duration,
         COUNT(CASE WHEN uvl.status=1 THEN 1 END) AS connectCount,
         COUNT(CASE WHEN uvl.status=2 THEN 1 END) AS noConnectCount