企业管理：导出时展示字段数量和回写方式展示问题修改

jianshui-admin/src/main/java/com/jianshui/web/controller/system/CompanyserviceController.java

@@ -3,6 +3,7 @@ package com.jianshui.web.controller.system;
 import java.util.List;
 import javax.servlet.http.HttpServletResponse;
 
+import com.jianshui.common.constant.RebackType;
 import com.jianshui.common.core.domain.entity.Companyservice;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.security.access.prepost.PreAuthorize;
@@ -57,6 +58,7 @@ public class CompanyserviceController extends BaseController
     public void export(HttpServletResponse response, Companyservice companyservice)
     {
         List<Companyservice> list = companyserviceService.selectCompanyserviceList(companyservice);
+        list.forEach(e -> e.setRebackType(RebackType.getRebackType(e.getRebackType())));
         ExcelUtil<Companyservice> util = new ExcelUtil<Companyservice>(Companyservice.class);
         util.exportExcel(response, list, "销方信息数据");
     }

jianshui-common/src/main/java/com/jianshui/common/constant/RebackType.java

@@ -0,0 +1,32 @@
+package com.jianshui.common.constant;
+
+public enum RebackType {
+    REBACK_TYPE_1("1", "系统推送"),
+    REBACK_TYPE_2("2", "SAP推送"),
+    REBACK_TYPE_3("3", "数据回写");
+
+    private String rebackTypeCode;
+    private String rebackTypeMsg;
+
+    RebackType(String rebackTypeCode, String rebackTypeMsg){
+        this.rebackTypeCode = rebackTypeCode;
+        this.rebackTypeMsg = rebackTypeMsg;
+    }
+
+    public String getRebackTypeMsg(){
+        return rebackTypeMsg;
+    }
+
+    public String getrebackTypeCode(){
+        return rebackTypeCode;
+    }
+
+    public static String getRebackType(String code){
+        for(RebackType rebackType : RebackType.values()){
+            if(rebackType.getrebackTypeCode().equals(code)){
+                return rebackType.getRebackTypeMsg();
+            }
+        }
+        return "未知回调方式";
+    }
+}

jianshui-common/src/main/java/com/jianshui/common/core/domain/entity/Companyservice.java

@@ -20,6 +20,7 @@ public class Companyservice {
     /**
      * 企业编号
      */
+    @Excel(name = "企业编号")
     private Long companyid;
 
     /**
@@ -99,7 +100,7 @@ public class Companyservice {
      * 回写方式
      */
     @Excel(name = "回写方式")
-    private Long rebackType;
+    private String rebackType;
 
     /** 分机号 */
     // @Excel(name = "分机号")
@@ -281,11 +282,11 @@ public class Companyservice {
         this.rebackurl = rebackurl;
     }
 
-    public Long getRebackType() {
+    public String getRebackType() {
         return rebackType;
     }
 
-    public void setRebackType(Long rebackType) {
+    public void setRebackType(String rebackType) {
         this.rebackType = rebackType;
     }
 

jianshui-system/src/main/java/com/jianshui/system/domain/ServiceManage.java

@@ -21,9 +21,11 @@ public class ServiceManage extends BaseEntity
     private Long id;
 
     /** 企业ID */
+    @Excel(name = "企业ID")
     private Long companyId;
 
     /** 服务类型 */
+    @Excel(name = "服务类型")
     private String serviceKey;
 
     /** 服务状态 */

jianshui-system/src/main/resources/mapper/system/CompanyserviceMapper.xml

@@ -66,7 +66,7 @@
             <if test="sellertax != null  and sellertax != ''">and sellertax = #{sellertax}</if>
             <if test="sellername != null  and sellername != ''">and sellername like concat('%', #{sellername}, '%')</if>
             <if test="phone != null  and phone != ''">and phone = #{phone}</if>
-            <if test="rebackType != null ">and reback_type = #{rebackType}</if>
+            <if test="rebackType != null  and rebackType != ''">and reback_type = #{rebackType}</if>
         </where>
     </select>
 
@@ -106,7 +106,7 @@
             <if test="identity != null">identity,</if>
 
             <if test="rebackurl != null">rebackurl,</if>
-            <if test="rebackType != null">reback_type,</if>
+            <if test="rebackType != null and rebackType != ''">reback_type,</if>
 
             <if test="createTime != null">createtime,</if>
             <if test="createUser != null">create_user,</if>
@@ -125,7 +125,7 @@
             <if test="identity != null">#{identity},</if>
 
             <if test="rebackurl != null">#{rebackurl},</if>
-            <if test="rebackType != null">#{rebackType},</if>
+            <if test="rebackType != null and rebackType != ''">#{rebackType},</if>
 
             <if test="createTime != null">#{createTime},</if>
             <if test="createUser != null">#{createUser},</if>
@@ -149,7 +149,7 @@
 
 
             <if test="rebackurl != null">rebackurl = #{rebackurl},</if>
-            <if test="rebackType != null">reback_type = #{rebackType},</if>
+            <if test="rebackType != null and rebackType != ''">reback_type = #{rebackType},</if>
 
 
             <if test="createTime != null">createtime = #{createTime},</if>

jianshui-ui/src/views/system/manageservices/index.vue

@@ -197,7 +197,7 @@
     />
 
     <!-- 添加或修改服务管理对话框 -->
-    <el-dialog :title="title" :visible.sync="open" width="50%" append-to-body>
+    <el-dialog :title="title" :visible.sync="open" :close-on-click-modal="false" width="50%" append-to-body>
       <el-form ref="form" :model="form" :rules="rules" label-width="120px">
         <el-form-item label="选择销方">
           <el-row>