客服服务页面调整

gic-platform-enterprise-api/src/main/java/com/gic/enterprise/service/CustomUdeskFieldApiService.java

@@ -34,6 +34,8 @@ public interface CustomUdeskFieldApiService {
     */
     ServiceResponse<List<CustomUdeskFieldDTO>> listEnterpriseField(Integer enterpriseId, String appId);
 
+    ServiceResponse<List<CustomUdeskFieldDTO>> listEnableEnterpriseField(Integer enterpriseId, String appId);
+
     /** @Description: 获取字段配置详情
      * @author taogs
      * @Date 11:12 2019/12/2

gic-platform-enterprise-service/src/main/java/com/gic/enterprise/dao/mapper/TabCustomUdeskFieldMapper.java

@@ -57,6 +57,9 @@ public interface TabCustomUdeskFieldMapper {
     List<TabCustomUdeskField> listEnterpriseField(@Param("enterpriseId") Integer enterpriseId,
                                                   @Param("appId") String appId);
 
+    List<TabCustomUdeskField> listEnableEnterpriseField(@Param("enterpriseId") Integer enterpriseId,
+                                                        @Param("appId") String appId);
+
     TabCustomUdeskField getUdeskField(@Param("enterpriseId") Integer enterpriseId,
                                       @Param("appId") String appId,
                                       @Param("gicFieldId") Integer gicFieldId);

gic-platform-enterprise-service/src/main/java/com/gic/enterprise/service/CustomUdeskFieldService.java

@@ -8,6 +8,8 @@ import java.util.List;
 public interface CustomUdeskFieldService {
     List<TabCustomUdeskField> listEnterpriseField(Integer enterpriseId, String appId);
 
+    List<TabCustomUdeskField> listEnableEnterpriseField(Integer enterpriseId, String appId);
+
     int saveEnterpriseField(TabCustomUdeskField field);
 
     int editEnterpriseField(CustomUdeskFieldDTO dto);

gic-platform-enterprise-service/src/main/java/com/gic/enterprise/service/impl/CustomUdeskFiledServiceImpl.java

@@ -22,6 +22,11 @@ public class CustomUdeskFiledServiceImpl implements CustomUdeskFieldService {
     }
 
     @Override
+    public List<TabCustomUdeskField> listEnableEnterpriseField(Integer enterpriseId, String appId) {
+        return tabCustomUdeskFieldMapper.listEnableEnterpriseField(enterpriseId, appId);
+    }
+
+    @Override
     public int saveEnterpriseField(TabCustomUdeskField field) {
         field.setUpdateTime(new Date());
 

gic-platform-enterprise-service/src/main/java/com/gic/enterprise/service/outer/impl/CustomUdeskFieldApiServiceImpl.java

@@ -55,6 +55,12 @@ public class CustomUdeskFieldApiServiceImpl implements CustomUdeskFieldApiServic
     }
 
     @Override
+    public ServiceResponse<List<CustomUdeskFieldDTO>> listEnableEnterpriseField(Integer enterpriseId, String appId) {
+        List<TabCustomUdeskField> list = this.customUdeskFieldService.listEnableEnterpriseField(enterpriseId, appId);
+        return ServiceResponse.success(EntityUtil.changeEntityListByJSON(CustomUdeskFieldDTO.class, list));
+    }
+
+    @Override
     public ServiceResponse<CustomUdeskFieldDTO> getDetail(Integer id) {
         TabCustomUdeskField detail = this.customUdeskFieldService.getDetail(id);
         return ServiceResponse.success(EntityUtil.changeEntityByJSON(CustomUdeskFieldDTO.class, detail));

gic-platform-enterprise-service/src/main/resources/mapper/TabCustomUdeskFieldMapper.xml

@@ -152,7 +152,15 @@
     select
     <include refid="Base_Column_List" />
     from tab_custom_udesk_field
-    where enterprise_id = #{enterpriseId,jdbcType=INTEGER} and status=1
+    where enterprise_id = #{enterpriseId,jdbcType=INTEGER} and status != 0
+    and app_id = #{appId}
+  </select>
+
+  <select id="listEnableEnterpriseField"  resultMap="BaseResultMap">
+    select
+    <include refid="Base_Column_List" />
+    from tab_custom_udesk_field
+    where enterprise_id = #{enterpriseId,jdbcType=INTEGER} and status = 1
     and app_id = #{appId}
   </select>