Merge remote-tracking branch 'origin/master'

zxkf-api/src/main/java/api/controller/call/CallLogController.java

@@ -132,6 +132,18 @@ public class CallLogController extends BaseController {
                 {
                     callLog.setCallTypeName("呼出");
                 }
+              if (list.get(i ).getIsAnswer()!=null)
+              {
+                  if (list.get(i ).getIsAnswer()==0)
+                  {
+                      callLog.setIsAnswerName("否");
+                  }
+                  else
+                  {
+                      callLog.setIsAnswerName("是");
+                  }
+              }
+
                 if(list.get(i ).getMyd()!=null&&list.get(i ).getMyd()>0)
                 {
                     if (list.get(i ).getMyd()==1)

zxkf-api/src/main/java/api/controller/order/WorkOrderBaseController.java

@@ -26,7 +26,7 @@ import api.util.annotation.Log;
 import api.util.enums.BusinessType;
 import api.util.helper.StringHelper;
 
-import com.sun.org.apache.bcel.internal.generic.SWITCH;
+
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 

zxkf-api/src/main/java/api/controller/system/CustomerController.java

@@ -1,10 +1,14 @@
 package api.controller.system;
 
+import api.entity.database.call.CallLog;
 import api.entity.database.system.DictData;
+import api.entity.view.call.CallLogExportView;
 import api.entity.view.order.WorkOrderBaseView;
 import api.entity.view.system.CustomerView;
+import api.entity.view.system.CustomerViewExportView;
 import api.service.system.IDictDataService;
 import api.util.annotation.Anonymous;
+import api.util.helper.ExcelHelper;
 import com.alibaba.fastjson2.JSON;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -23,6 +27,7 @@ import lombok.var;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import java.time.temporal.ChronoUnit;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Date;
@@ -77,7 +82,60 @@ public class CustomerController extends BaseController {
             return Success("成功", customerService.getList(qw));
         }
     }
+    @ApiOperation("导出Excel")
+    @Log(title = "导出excel", businessType = BusinessType.EXPORT)
+    @GetMapping("/exportExcel")
+    @Anonymous
+    public void ExportExcel(Customer input) {
+        LambdaQueryWrapper<Customer> qw = new LambdaQueryWrapper<>();
+        qw.eq(input.getCustomerId() != null && input.getCustomerId() > 0, Customer::getCustomerId, input.getCustomerId());
+        qw.like(!StringHelper.isEmpty(input.getCustomerName()), Customer::getCustomerName, input.getCustomerName());
+        qw.eq(!StringHelper.isEmpty(input.getCustomerSex()), Customer::getCustomerSex, input.getCustomerSex());
+        qw.like(!StringHelper.isEmpty(input.getCustomerPhone()), Customer::getCustomerPhone, input.getCustomerPhone());
+        qw.like(!StringHelper.isEmpty(input.getCustomerMobile()), Customer::getCustomerMobile, input.getCustomerMobile());
+        qw.like(!StringHelper.isEmpty(input.getCustomerNumber()), Customer::getCustomerNumber, input.getCustomerNumber());
+        qw.like(!StringHelper.isEmpty(input.getRemarks()), Customer::getRemarks, input.getRemarks());
+        qw.eq(Customer::getFIsdelete, 0);
+        qw.eq(input.getFCreatetime() != null , Customer::getFCreatetime, input.getFCreatetime());
+        qw.eq(input.getFUpdatetime() != null , Customer::getFUpdatetime, input.getFUpdatetime());
+        qw.eq(input.getType() != null && input.getType() > 0, Customer::getType, input.getType());
+        qw.like(!StringHelper.isEmpty(input.getIcon()), Customer::getIcon, input.getIcon());
+        qw.orderByDesc(Customer::getCustomerId);
+
+        var list=customerService.getList(qw);
 
+        List<CustomerViewExportView>  customerView=  JSON.parseArray(JSON.toJSONString(list),CustomerViewExportView.class);
+        int i=0;
+        if (customerView!=null && customerView.size()>0)
+        {
+            for (CustomerViewExportView customer : customerView) {
+
+                if (list.get(i ).getType()!=null)
+                {
+                    if (list.get(i ).getType()==1)
+                    {
+                        customer.setTypeName("普通");
+                    }
+                    else if (list.get(i ).getType()==2)
+                    {
+                        customer.setTypeName("微信");
+                    }
+                    else
+                    {
+                        customer.setTypeName("官网");
+                    }
+                    if ( list.get(i ).getProject() != null && list.get(i ).getProject() > 0) {
+
+                        DictData dicdata = dictDataService.getEntity(list.get(i ).getProject());
+                        customer.setProjectname(dicdata.getDictLabel());
+                    }
+                }
+                i++;
+            }
+        }
+        ExcelHelper<CustomerViewExportView> excel = new ExcelHelper<>(CustomerViewExportView.class);
+        excel.exportExcel("xlsx", customerView);
+    }
     @ApiOperation("详情")
     @Log(title = "查询sys_customer详情",businessType = BusinessType.QUERY)
     @GetMapping("/{id}")

zxkf-api/src/main/java/api/controller/system/WorkroderTypeController.java

@@ -1,5 +1,6 @@
 package api.controller.system;
 
+import api.entity.database.call.CallLog;
 import api.entity.database.system.Menu;
 import api.entity.database.system.WorkroderType;
 import api.service.system.IWorkroderTypeService;
@@ -44,6 +45,7 @@ public class WorkroderTypeController extends BaseController {
         qw.eq(input.getCreate_time() != null , WorkroderType::getCreate_time, input.getCreate_time());
         qw.eq(WorkroderType::getIsDelete, 0);
         qw.like(!StringHelper.isEmpty(input.getCreateBy()), WorkroderType::getCreateBy, input.getCreateBy());
+        qw.orderByDesc(WorkroderType::getTypeOrder);
         if (pageInput.getPageNum() == null) {
             pageInput.setPageNum(1);
         }
@@ -173,6 +175,7 @@ public class WorkroderTypeController extends BaseController {
     public AjaxResult treeselect(Menu menu) {
         LambdaQueryWrapper<WorkroderType> qw = new LambdaQueryWrapper<>();
         qw.eq(WorkroderType::getIsDelete, 0);
+        qw.orderByDesc(WorkroderType::getTypeOrder);
         List<WorkroderType> menus = workrodertypeService.getList(qw);
         return Success("获取菜单下拉树列表成功", workrodertypeService.buildMenuTreeSelect(menus));
     }

zxkf-entity/src/main/java/api/entity/view/call/CallLogExportView.java

@@ -37,7 +37,7 @@ public class CallLogExportView {
     private Date answerTime;
     /** 被叫是否接听 */
     @ApiModelProperty("被叫是否接听")
-    private Long isAnswer;
+    private String  isAnswerName;
     /** 坐席挂机时间 */
     @ApiModelProperty("坐席挂机时间")
     private Date endTime;

zxkf-entity/src/main/java/api/entity/view/system/CustomerViewExportView.java

@@ -0,0 +1,31 @@
+package api.entity.view.system;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.Date;
+@Data
+public class CustomerViewExportView {
+
+    /** 姓名 */
+    @ApiModelProperty("姓名")
+    private String customerName;
+    /** 性别 */
+    @ApiModelProperty("性别")
+    private String customerSex;
+
+    /** 一键通 */
+    @ApiModelProperty("电话")
+    private String customerPhone;
+
+    @ApiModelProperty("公司")
+    private String company;
+    @ApiModelProperty("项目名")
+    private String projectname;
+    /** 类型 */
+    @ApiModelProperty("类型") //1系统添加2微信3网站
+    private String typeName;
+
+    @ApiModelProperty("创建时间")
+    private Date fCreatetime;
+}