[feat]销售管理

客户基本信息前端页面新增导出按钮，新增导出全部和选择性导出方法；
客户基本信息Controller层新增 导出选择的客户基本信息列表接口；新增 导出所有客户基本信息列表接口；
客户基本信息新增 通过客户编号数组查询客户基本信息集合方法；新增 筛选查询导出客户基本信息集合方法；后端分页查询接口加上客户标识字段；
客户基本信息实体类字典字段加上字典属性；
处理一些必要字段和不必要字段的@Excel注解

ruoyi-admin/src/main/java/com/ruoyi/system/controller/SysCustomerController.java

@@ -156,16 +156,32 @@ public class SysCustomerController extends BaseController
 
 
     /**
-     * 导出客户基本信息列表
+     * 导出选择的客户基本信息列表
      */
 
     @RequiresPermissions("system:customer:export")
     @Log(title = "客户基本信息", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
     @ResponseBody
-    public AjaxResult export(SysCustomerVo sysCustomer)
+    public AjaxResult export(@RequestBody String[] enterpriseCodes)
     {
-        List<SysCustomerVo> list = sysCustomerService.selectSysCustomerList(sysCustomer);
+        List<SysCustomerVo> list = sysCustomerService.selectSysCustomerListByEnterpriseCodes(enterpriseCodes);
+        ExcelUtil<SysCustomerVo> util = new ExcelUtil<SysCustomerVo>(SysCustomerVo.class);
+        return util.exportExcel(list, "客户基本信息数据");
+    }
+
+
+    /**
+     * 导出所有客户基本信息列表
+     */
+
+    @RequiresPermissions("system:customer:export")
+    @Log(title = "客户基本信息", businessType = BusinessType.EXPORT)
+    @PostMapping("/exportAll")
+    @ResponseBody
+    public AjaxResult exportAll(SysCustomerVo sysCustomer)
+    {
+        List<SysCustomerVo> list = sysCustomerService.selectExportSysCustomerList(sysCustomer);
         ExcelUtil<SysCustomerVo> util = new ExcelUtil<SysCustomerVo>(SysCustomerVo.class);
         return util.exportExcel(list, "客户基本信息数据");
     }
@@ -427,64 +443,62 @@ public class SysCustomerController extends BaseController
         List<SysCustomerOper> list = sysCustomerOperService.selectSysCustomerOperList(sysCustomerOper);
         return getDataTable(list);
     }
-    @RequiresPermissions("system:customer:export")
-    @Log(title = "客户基本信息", businessType = BusinessType.EXPORT)
-    @RequestMapping("/exportCustomerInfo")
-    @ResponseBody
-    public void exportCustomerInfo(@RequestBody String selectData, HttpServletResponse response) throws IOException {
-
-        //数据处理
-        JSONObject jsonObject = (JSONObject) JSONObject.parse(selectData);
-        JSONArray jsonArray = jsonObject.getJSONArray("selectData");
-        List<SysCustomerDto> selectDataList = JSONObject.parseArray(String.valueOf(jsonArray), SysCustomerDto.class);
-
-
-        //获取发票基础信息
-        SysCustomer sysCustomer = sysCustomerService.selectSysCustomerById(selectDataList.get(0).getId());
-        SysCustomerDto sysCustomerDto = new SysCustomerDto();
-        BeanUtils.copyProperties(sysCustomer,sysCustomerDto);
-
-        //填充表格
-        response.setCharacterEncoding("utf-8");
-        String fileName = URLEncoder.encode("国税发票", "UTF-8").replaceAll("\\+", "%20");
-        response.setHeader("Content-disposition", "attachment;filename*=utf-8''" + fileName + ".xlsx");
-        String templateFileName = "C:\\exportTemplates\\exportCustomerInfo.xlsx";
-        try (ExcelWriter excelWriter = EasyExcel.write(response.getOutputStream()).withTemplate(templateFileName).build()) {
-            WriteSheet writeSheet = EasyExcel.writerSheet().build();
-            Map<String, Object> map = MapUtils.newHashMap();
-//            map.put("date", DateTimeFormatter.ofPattern("yyyy/MM/dd").format(LocalDateTime.now()));
-            map.put("unifiedNumbering", sysCustomerDto.getUnifiedNumbering());
-            map.put("enterpriseCode", sysCustomerDto.getEnterpriseCode());
-            map.put("enterpriseName", sysCustomerDto.getEnterpriseName());
-            map.put("englishName", sysCustomerDto.getEnglishName());
-            map.put("customerAddress", sysCustomerDto.getCustomerAddress());
-            map.put("postalCode", sysCustomerDto.getPostalCode());
-            map.put("contactNumber", sysCustomerDto.getContactNumber());
-            map.put("customerFax", sysCustomerDto.getCustomerFax());
-            map.put("customerContact", sysCustomerDto.getCustomerContact());
-            map.put("deliveryAddress", sysCustomerDto.getDeliveryAddress());
-            map.put("paymentTerms", sysCustomerDto.getPaymentTerms());
-            map.put("taxRate", sysCustomerDto.getTaxRate());
-
-            List<SysDictData> exportSalesData = sysDictTypeService.selectDictDataByType("sys_export_sales");
-            for (int i = 0;i<exportSalesData.size();i++) {
-                if (sysCustomerDto.getExportSales().equals(exportSalesData.get(i).getDictValue())) {
-                    map.put("exportSales", exportSalesData.get(i).getDictLabel());
-                }
-            }
-
-            List<SysDictData> commonCurrencyData = sysDictTypeService.selectDictDataByType("sys_common_currency");
-            for (int i = 0;i<commonCurrencyData.size();i++) {
-                if (sysCustomerDto.getCommonCurrency().equals(commonCurrencyData.get(i).getDictValue())) {
-                    map.put("commonCurrency", commonCurrencyData.get(i).getDictLabel());
-                }
-            }
-//            System.out.println(exportSalesData);
-//            System.out.println(commonCurrencyData);
-            map.put("customerRemarks", sysCustomerDto.getCustomerRemarks());
-            excelWriter.fill(map, writeSheet);
-        }
-    }
+//    @RequiresPermissions("system:customer:export")
+//    @Log(title = "客户基本信息", businessType = BusinessType.EXPORT)
+//    @RequestMapping("/exportCustomerInfo")
+//    @ResponseBody
+//    public void exportCustomerInfo(@RequestBody String selectData, HttpServletResponse response) throws IOException {
+//
+//        //数据处理
+//        JSONObject jsonObject = (JSONObject) JSONObject.parse(selectData);
+//        JSONArray jsonArray = jsonObject.getJSONArray("selectData");
+//        List<SysCustomerDto> selectDataList = JSONObject.parseArray(String.valueOf(jsonArray), SysCustomerDto.class);
+//
+//
+//        //获取发票基础信息
+//        SysCustomer sysCustomer = sysCustomerService.selectSysCustomerById(selectDataList.get(0).getId());
+//        SysCustomerDto sysCustomerDto = new SysCustomerDto();
+//        BeanUtils.copyProperties(sysCustomer,sysCustomerDto);
+//
+//        //填充表格
+//        response.setCharacterEncoding("utf-8");
+//        String fileName = URLEncoder.encode("国税发票", "UTF-8").replaceAll("\\+", "%20");
+//        response.setHeader("Content-disposition", "attachment;filename*=utf-8''" + fileName + ".xlsx");
+//        String templateFileName = "C:\\exportTemplates\\exportCustomerInfo.xlsx";
+//        try (ExcelWriter excelWriter = EasyExcel.write(response.getOutputStream()).withTemplate(templateFileName).build()) {
+//            WriteSheet writeSheet = EasyExcel.writerSheet().build();
+//            Map<String, Object> map = MapUtils.newHashMap();
+////            map.put("date", DateTimeFormatter.ofPattern("yyyy/MM/dd").format(LocalDateTime.now()));
+//            map.put("unifiedNumbering", sysCustomerDto.getUnifiedNumbering());
+//            map.put("enterpriseCode", sysCustomerDto.getEnterpriseCode());
+//            map.put("enterpriseName", sysCustomerDto.getEnterpriseName());
+//            map.put("englishName", sysCustomerDto.getEnglishName());
+//            map.put("customerAddress", sysCustomerDto.getCustomerAddress());
+//            map.put("postalCode", sysCustomerDto.getPostalCode());
+//            map.put("contactNumber", sysCustomerDto.getContactNumber());
+//            map.put("customerFax", sysCustomerDto.getCustomerFax());
+//            map.put("customerContact", sysCustomerDto.getCustomerContact());
+//            map.put("deliveryAddress", sysCustomerDto.getDeliveryAddress());
+//            map.put("paymentTerms", sysCustomerDto.getPaymentTerms());
+//            map.put("taxRate", sysCustomerDto.getTaxRate());
+//
+//            List<SysDictData> exportSalesData = sysDictTypeService.selectDictDataByType("sys_export_sales");
+//            for (int i = 0;i<exportSalesData.size();i++) {
+//                if (sysCustomerDto.getExportSales().equals(exportSalesData.get(i).getDictValue())) {
+//                    map.put("exportSales", exportSalesData.get(i).getDictLabel());
+//                }
+//            }
+//
+//            List<SysDictData> commonCurrencyData = sysDictTypeService.selectDictDataByType("sys_common_currency");
+//            for (int i = 0;i<commonCurrencyData.size();i++) {
+//                if (sysCustomerDto.getCommonCurrency().equals(commonCurrencyData.get(i).getDictValue())) {
+//                    map.put("commonCurrency", commonCurrencyData.get(i).getDictLabel());
+//                }
+//            }
+//            map.put("customerRemarks", sysCustomerDto.getCustomerRemarks());
+//            excelWriter.fill(map, writeSheet);
+//        }
+//    }
 
     /**
      * 获取客户编号

ruoyi-admin/src/main/java/com/ruoyi/system/domain/SysCustomer.java

@@ -26,12 +26,12 @@ public class SysCustomer extends BaseEntity
 
     /** 客户/企业代码 */
     @FieldCompare(chineseName = "客户/企业代码")
-    @Excel(name = "客户/企业ID")
+    @Excel(name = "客户/企业ID",sort = 1)
     private String enterpriseCode;
 
     /** 客户/企业名称 */
     @FieldCompare(chineseName = "客户/企业名称")
-    @Excel(name = "客户/企业名称")
+    @Excel(name = "客户/企业名称",sort = 2)
     private String enterpriseName;
 
     /** 英文名称 */
@@ -51,12 +51,12 @@ public class SysCustomer extends BaseEntity
 
     /** 内外销(1外销、2内销) */
     @FieldCompare(chineseName = "内外销",properties = "1:外销,2:内销")
-    @Excel(name = "内外销")
+    @Excel(name = "内外销",dictType = "sys_export_sales")
     private String exportSales;
 
     /** 国家地区(1中国、2美国、3俄罗斯) */
     @FieldCompare(chineseName = "国家地区",properties = "1:中国,2:美国,3:俄罗斯")
-    @Excel(name = "国家地区")
+    @Excel(name = "国家地区",dictType = "sys_country")
     private String customerCountry;
 
     /** 邮编 */
@@ -107,12 +107,12 @@ public class SysCustomer extends BaseEntity
 
     /** 报价币种(1RMB、2美元) */
     @FieldCompare(chineseName = "报价币种",properties = "1:RMB,2:美元")
-    @Excel(name = "报价币种")
+    @Excel(name = "报价币种",dictType = "sys_common_currency")
     private String commonCurrency;
 
     /** 是否含税(0不含税、1含税) */
     @FieldCompare(chineseName = "是否含税",properties = "0:不含税,1:含税")
-    @Excel(name = "是否含税")
+    @Excel(name = "是否含税",dictType = "sys_confirm_tax")
     private String confirmTax;
 
     /** 税率 */
@@ -122,7 +122,7 @@ public class SysCustomer extends BaseEntity
 
     /** 诚信评级(1A、2B、3C、4D) */
     @FieldCompare(chineseName = "诚信评级",properties = "1:A,2:B,3:C,4:D")
-    @Excel(name = "诚信评级")
+    @Excel(name = "诚信评级",dictType = "sys_integrity_rating")
     private String integrityRating;
 
 
@@ -173,7 +173,7 @@ public class SysCustomer extends BaseEntity
     @Excel(name = "客户第一联系人传真")
     private String customerFax;
 
-    @Excel(name = "客户第一收货人id")
+    /** 客户第一收货人id */
     private Long deliveryAddressId;
 
     /** 客户第一收货人 */
@@ -181,7 +181,7 @@ public class SysCustomer extends BaseEntity
     @Excel(name = "客户第一收货人")
     private String deliveryCustomerPerson;
 
-    @Excel(name = "客户第一收货人职务")
+
     private String deliveryCustomerOffice;
 
     @FieldCompare(chineseName = "客户第一收货人联系电话")
@@ -204,6 +204,7 @@ public class SysCustomer extends BaseEntity
     /** 业务员 */
     @Excel(name = "业务员")
     private String businessMembers;
+
     /*业务人员名称*/
     private String businessMembersName;
     /** 确认人 */
@@ -211,19 +212,23 @@ public class SysCustomer extends BaseEntity
     private String identifyingPeople;
 
     /** 录入时间 */
-    @Excel(name = "录入时间")
+
     private String firstAddTime;
+
     /** 修改时间 */
     @Excel(name = "修改时间")
     private String updateInfoTime;
 
+    @Excel(name = "录入时间", dateFormat = "yyyy-MM-dd HH:mm:ss",sort = 3)
+    private Date createTime;
+
     /** 备注内容 */
     @Excel(name = "备注内容")
     private String customerRemarks;
     private List<SysCustomerQuote> sysCustomerQuoteList;
-    @Excel(name = "客户审核状态表示") //0表示审核中，1标识审核通过，2表示审核拒绝
+    @Excel(name = "审核状态",dictType = "auditStatus") //0表示审核中，1标识审核通过，2表示审核拒绝
     private String auditStatus;
-    @Excel(name = "客户的状态")
+    @Excel(name = "使用状态",dictType = "useStatus")
     private String useStatus;
 
     //1表示潜在客户(仅报价) 2表示 客户(已下单)
@@ -789,6 +794,16 @@ public class SysCustomer extends BaseEntity
         this.allowedCreators = allowedCreators;
     }
 
+    @Override
+    public Date getCreateTime() {
+        return createTime;
+    }
+
+    @Override
+    public void setCreateTime(Date createTime) {
+        this.createTime = createTime;
+    }
+
     @Override
     public String toString() {
         return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)

ruoyi-admin/src/main/java/com/ruoyi/system/mapper/SysCustomerMapper.java

@@ -107,4 +107,14 @@ public interface SysCustomerMapper
     * 通过开票公司名称名称查询客户详情
     * */
     SysCustomerVo selectSysCustomerByInvoiceCompanyName(String invoicingCompanyName);
+
+    /*
+    * 通过客户编号数组查询客户基本信息集合
+    * */
+    List<SysCustomerVo> selectSysCustomerListByEnterpriseCodes(String[] enterpriseCodes);
+
+    /*
+    * 筛选查询导出客户基本信息集合
+    * */
+    List<SysCustomerVo> selectExportSysCustomerList(SysCustomerVo sysCustomer);
 }

ruoyi-admin/src/main/java/com/ruoyi/system/service/ISysCustomerService.java

@@ -132,4 +132,14 @@ public interface ISysCustomerService
      *  角色过滤数据
      * */
     Set<String> getAllowedCreators(Set<String> roleKeys);
+
+    /**
+    *  根据客户编号数组查询客户信息集合
+    * */
+    List<SysCustomerVo> selectSysCustomerListByEnterpriseCodes(String[] enterpriseCodes);
+
+    /**
+    *  筛选查询导出所有的客户基本信息
+    * */
+    List<SysCustomerVo> selectExportSysCustomerList(SysCustomerVo sysCustomer);
 }

ruoyi-admin/src/main/java/com/ruoyi/system/service/impl/SysCustomerServiceImpl.java

@@ -215,6 +215,24 @@ public class SysCustomerServiceImpl implements ISysCustomerService
     }
 
 
+    /**
+     *  根据客户编号数组查询客户信息集合
+     * */
+    @Override
+    public List<SysCustomerVo> selectSysCustomerListByEnterpriseCodes(String[] enterpriseCodes) {
+        List<SysCustomerVo> list = sysCustomerMapper.selectSysCustomerListByEnterpriseCodes(enterpriseCodes);
+        return list;
+    }
+
+    /**
+     *  筛选查询导出所有的客户基本信息
+     * */
+    @Override
+    public List<SysCustomerVo> selectExportSysCustomerList(SysCustomerVo sysCustomer) {
+        List<SysCustomerVo> list = sysCustomerMapper.selectExportSysCustomerList(sysCustomer);
+        return list;
+    }
+
     /**
      *  角色过滤数据
      * */

ruoyi-admin/src/main/resources/mapper/system/SysCustomerMapper.xml

@@ -72,7 +72,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                established_time,invoicing_customer_name,invoicing_company_name,invoice_code,deposit_bank,bank_account,
                common_currency,confirm_tax,tax_rate,integrity_rating,rmb_registered_capital,registered_capital,payment_terms,customs_code,
                customer_contact_id,customer_contact,customer_office,contact_number,customer_email,customer_fax,
-               delivery_address_id,delivery_customer_person,delivery_customer_phone,
+               delivery_address_id,delivery_customer_person,delivery_customer_phone,customer_sign,
                delivery_address,delivery_customer_postal,delivery_customer_fax,business_members,
                identifying_people,first_add_time,update_info_time, create_time ,audit_status,use_status,update_by, create_by,update_time,rmb_flag,usd_flag, cancel_remark,
                apply_user,apply_time , instance_id , instance_type from sys_customer
@@ -382,4 +382,30 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
           and enterprise_name like concat(#{prefix}, '%') escape '\\'
     </select>
 
+    <select id="selectSysCustomerListByEnterpriseCodes" parameterType="String" resultMap="SysCustomerResult">
+        <include refid="selectSysCustomerVo"/>
+        where  enterprise_code in
+        <foreach item="enterpriseCode" collection="array" open="(" separator="," close=")">
+            #{enterpriseCode}
+        </foreach>
+    </select>
+
+    <select id="selectExportSysCustomerList" parameterType="SysCustomerVo" resultMap="SysCustomerResult">
+        <include refid="selectSysCustomerVo"/>
+        <where>
+            <if test="id != null  and id != ''"> and id = #{id}</if>
+            <if test="exportSales != null  and exportSales != ''"> and export_sales = #{exportSales}</if>
+            <if test="auditStatus!=null and auditStatus != ''"> and audit_status = #{auditStatus}</if>
+            <if test="useStatus!=null and useStatus != ''"> and use_status = #{useStatus}</if>
+            <if test="businessMembers !=null and businessMembers !=''"> and business_members = #{businessMembers}</if>
+            <if test="enterpriseCode != null  and enterpriseCode != ''"> and enterprise_code like concat('%', #{enterpriseCode}, '%')</if>
+            <if test="enterpriseName != null  and enterpriseName != ''"> and enterprise_name like concat('%', #{enterpriseName}, '%')</if>
+            <if test="customerPurser != null  and customerPurser != ''"> and customer_purser like concat('%', #{customerPurser}, '%')</if>
+            <if test="customerAbbreviation != null  and customerAbbreviation != ''"> and customer_abbreviation like concat('%', #{customerAbbreviation}, '%')</if>
+            <if test="deliveryAddress != null  and deliveryAddress != ''"> and delivery_address like concat('%', #{deliveryAddress}, '%')</if>
+            <if test="params.beginCreateTime != null and params.beginCreateTime != '' and params.endCreateTime != null and params.endCreateTime != ''"> and create_time between #{params.beginCreateTime} and #{params.endCreateTime}</if>
+            <if test="customerSign != null  and customerSign != ''"> and customer_sign = #{customerSign}</if>
+        </where>
+    </select>
+
 </mapper>

ruoyi-admin/src/main/resources/templates/system/customer/customer.html

@@ -84,6 +84,9 @@
             <a class="btn btn-success" onclick="$.operate.add()" shiro:hasPermission="system:customer:add">
                 <i class="fa fa-plus"></i> 添加
             </a>
+            <a class="btn btn-success" onclick="exportExcel()" shiro:hasPermission="system:customer:export">
+                <i class="fa fa-download"></i> 导出
+            </a>
             <a class="btn btn-success"  onclick="addContacts()" shiro:hasPermission="system:contacts:add">
                 <i class="fa fa-plus"></i> 添加其他联系人明细
             </a>
@@ -871,6 +874,63 @@
         }
     }
     function closeInvoice() {$('#invoiceModal').modal("hide");}
+
+    //导出客户资料
+    // 导出
+    function exportExcel(formId) {
+        // $.table.set();
+        var enterpriseCodeData = [];
+        var selections = $("#bootstrap-table").bootstrapTable("getSelections");
+        if(selections.length === 0){
+            $.modal.confirm("确定导出所有客户基本信息吗？", function() {
+                var currentId = $.common.isEmpty(formId) ? $('form').attr('id') : formId;
+                var params = $("#bootstrap-table").bootstrapTable('getOptions');
+                var dataParam = $("#" + currentId).serializeArray();
+                dataParam.push({ "name": "orderByColumn", "value": params.sortName });
+                dataParam.push({ "name": "isAsc", "value": params.sortOrder });
+                $.modal.loading("正在导出数据，请稍后...");
+                $.post(prefix + '/exportAll', dataParam, function(result) {
+                    if (result.code == web_status.SUCCESS) {
+                        window.location.href = ctx + "common/download?fileName=" + encodeURI(result.msg) + "&delete=" + true;
+                    } else if (result.code == web_status.WARNING) {
+                        $.modal.alertWarning(result.msg)
+                    } else {
+                        $.modal.alertError(result.msg);
+                    }
+                    $.modal.closeLoading();
+                });
+            });
+        }else {
+            $.modal.confirm("确定导出选中的所有客户基本信息吗？", function () {
+                //·拼接单号
+                for(let i=0;i<selections.length;i++){
+                    enterpriseCodeData.push(selections[i].enterpriseCode);
+                }
+                var enterpriseCodes = JSON.stringify(enterpriseCodeData);
+                // console.log(bomNos);
+                $.modal.loading("正在导出数据，请稍后...");
+                var config = {
+                    url: prefix + '/export',
+                    type: "post",
+                    dataType: "json",
+                    contentType: "application/json;charset=utf-8",
+                    data: enterpriseCodes,
+                    success: function(result) {
+                        window.location.href = ctx + "common/download?fileName=" + encodeURI(result.msg) + "&delete=" + true;
+                        $.modal.alertSuccess("导出成功！")
+                        $.modal.closeLoading();
+                    },
+                    error: function (result){
+                        $.modal.alertError(result.msg);
+                    }
+                };
+                $.ajax(config)
+            });
+        }
+    };
+
+
+
 </script>
 </body>
 </html>