认领联系人,联系人详情修改,联系人,任务导出修改,报表导出编写

fhKeeper/formulahousekeeper/management-crm/src/main/java/com/management/platform/controller/ContactsController.java

@@ -208,5 +208,31 @@ public class ContactsController {
             return msg;
         }
     }
+
+
+    //认领联系人 conctacts 里面要有要转移的负责人的 owner_id,id
+    @RequestMapping("claimContacts")
+    public HttpRespMsg claimContacts(Contacts contacts,HttpServletRequest request){
+        User user = userMapper.selectById(request.getHeader("Token"));//当前登陆的用户
+        HttpRespMsg msg = new HttpRespMsg();
+        if (contacts.getOwnerId()==null|| StringUtils.isEmpty(contacts.getOwnerId())){
+            msg.setError("请选择要认领的负责人");
+            return msg;
+        }
+        Contacts contactsGet=contactsService.getById(contacts.getId());
+        if (contactsGet.getOwnerId()!=null){
+            msg.setError("该联系人已有负责人");
+            return msg;
+        }
+        contactsGet.setOwnerId(contacts.getOwnerId());
+        int count= contactsService.claimContacts(contactsGet, user);
+        if (count>0){
+            msg.setMsg("操作成功");
+            return msg;
+        }else {
+            msg.setError("操作失败");
+            return msg;
+        }
+    }
 }
 

fhKeeper/formulahousekeeper/management-crm/src/main/java/com/management/platform/controller/ReportController.java

@@ -226,13 +226,23 @@ public class ReportController {
      * @return
      */
     @RequestMapping("/getCustomerTotalCount")
-    public HttpRespMsg getCustomerTotalCount(String startDate, String endDate, String userId) {
-        return  customService.getCustomerTotalCount(startDate, endDate, userId, request);
+    public HttpRespMsg getCustomerTotalCount(String startDate, String endDate, String userId,Integer departmentId,Integer exportType) {
+        return  customService.getCustomerTotalCount(startDate, endDate, userId,departmentId,exportType, request);
     }
+    @RequestMapping("/exportCustomerTotalCount")
+    public HttpRespMsg exportCustomerTotalCount(String startDate, String endDate,String userId,Integer departmentId,Integer exportType) throws Exception {
+        return reportService.exportCustomerTotalCount(startDate, endDate,userId, departmentId,exportType, request);
+    }
+
 
     @RequestMapping("/getCustomerTransferRate")
-    public HttpRespMsg getCustomerTransferRate(String startDate, String endDate, String userId) {
-        return  customService.getCustomerTransferRate(startDate, endDate, userId, request);
+    public HttpRespMsg getCustomerTransferRate(String startDate, String endDate, String userId,Integer departmentId,Integer exportType) {
+        return  customService.getCustomerTransferRate(startDate, endDate, userId,departmentId,exportType, request);
+    }
+
+    @RequestMapping("/exportCustomerTransferRate")
+    public HttpRespMsg exportCustomerTransferRate(String startDate, String endDate,String userId,Integer departmentId,Integer exportType) throws Exception {
+        return reportService.exportCustomerTransferRate(startDate, endDate,userId, departmentId,exportType, request);
     }
 
     @RequestMapping("/getReportList")

fhKeeper/formulahousekeeper/management-crm/src/main/java/com/management/platform/entity/ContactsLog.java

@@ -63,6 +63,9 @@ public class ContactsLog extends Model<ContactsLog> {
     @TableField("company_id")
     private Integer companyId;
 
+    @TableField(exist = false)
+    private String operateName;
+
 
     @Override
     protected Serializable pkVal() {

fhKeeper/formulahousekeeper/management-crm/src/main/java/com/management/platform/service/ContactsService.java

@@ -45,4 +45,6 @@ public interface ContactsService extends IService<Contacts> {
     HttpRespMsg getAllContacts(Integer customerId, HttpServletRequest request);
 
     int transferContacts(Contacts contactsGet, User user);
+
+    int claimContacts(Contacts contactsGet, User user);
 }

fhKeeper/formulahousekeeper/management-crm/src/main/java/com/management/platform/service/CustomService.java

@@ -55,7 +55,7 @@ public interface CustomService extends IService<Custom> {
 
     void deleterDelete(List<Integer> ids);
 
-    HttpRespMsg getCustomerTotalCount(String startDate, String endDate, String userId, HttpServletRequest request);
+    HttpRespMsg getCustomerTotalCount(String startDate, String endDate, String userId, Integer departmentId, Integer exportType, HttpServletRequest request);
 
-    HttpRespMsg getCustomerTransferRate(String startDate, String endDate, String userId, HttpServletRequest request);
+    HttpRespMsg getCustomerTransferRate(String startDate, String endDate, String userId, Integer departmentId, Integer exportType, HttpServletRequest request);
 }

fhKeeper/formulahousekeeper/management-crm/src/main/java/com/management/platform/service/ReportService.java

@@ -149,4 +149,8 @@ public interface ReportService extends IService<Report> {
     HttpRespMsg getHasPushForSap(String startDate, String endDate, String employeeID);
 
     HttpRespMsg getCustomDataWithDate(String startDate, String endDate, HttpServletRequest request);
+
+    HttpRespMsg exportCustomerTotalCount(String startDate, String endDate, String userId, Integer departmentId, Integer exportType, HttpServletRequest request) throws Exception;
+
+    HttpRespMsg exportCustomerTransferRate(String startDate, String endDate, String userId, Integer departmentId, Integer exportType, HttpServletRequest request) throws Exception;
 }

fhKeeper/formulahousekeeper/management-crm/src/main/java/com/management/platform/service/impl/ContactsServiceImpl.java

@@ -75,6 +75,9 @@ public class ContactsServiceImpl extends ServiceImpl<ContactsMapper, Contacts> i
     @Resource
     private ExcelExportServiceImpl excelExportService;
 
+    @Resource
+    private StageMapper stageMapper;
+
     @Value(value = "${upload.path}")
     private String path;
 
@@ -270,11 +273,24 @@ public class ContactsServiceImpl extends ServiceImpl<ContactsMapper, Contacts> i
 
         ContactsVo contactsVo = new ContactsVo();
         Contacts contactsSelect = contactsMapper.selectById(contacts.getId());
+
+        String token = String.valueOf(request.getHeader("Token"));
+        User user = userMapper.selectById(token);
+
+        List<User> userList = userMapper.selectList(new QueryWrapper<User>().eq("company_id", user.getCompanyId()).eq("is_active", 1));
         if (contactsSelect != null) {
             //操作记录
             LambdaQueryWrapper<ContactsLog> cLoglqw = new LambdaQueryWrapper<>();
             cLoglqw.eq(ContactsLog::getContactsId, contactsSelect.getId());
             List<ContactsLog> contactsLogs = contactsLogMapper.selectList(cLoglqw);
+            if (contactsLogs!=null&&!contactsLogs.isEmpty()){
+                for (ContactsLog contactsLog : contactsLogs) {
+                    if (contactsLog.getOperateId()!=null&&StringUtils.isNotEmpty(contactsLog.getOperateId())){
+                        Optional<User> first = userList.stream().filter(u -> u.getId().equals(contactsLog.getOperateId())).findFirst();
+                        first.ifPresent(value -> contactsLog.setOperateName(value.getName()));
+                    }
+                }
+            }
 
             //相关任务
             LambdaQueryWrapper<Task> tLqw = new LambdaQueryWrapper<>();
@@ -297,6 +313,9 @@ public class ContactsServiceImpl extends ServiceImpl<ContactsMapper, Contacts> i
             LambdaQueryWrapper<BusinessOpportunity> bLqw = new LambdaQueryWrapper<>();
             bLqw.eq(BusinessOpportunity::getContactsId,contactsSelect.getId());
             List<BusinessOpportunity> opportunityList = businessOpportunityMapper.selectList(bLqw);
+            LambdaQueryWrapper<Stage> stageLQW = new LambdaQueryWrapper<>();
+            List<Stage> stages = stageMapper.selectList(stageLQW);
+
             opportunityList.forEach(businessOpportunity -> {
                 Custom custom = customMapper.selectById(businessOpportunity.getCustomerId());
                 businessOpportunity.setCustomerName(custom.getCustomName());
@@ -308,6 +327,10 @@ public class ContactsServiceImpl extends ServiceImpl<ContactsMapper, Contacts> i
                     User creatorUser = userMapper.selectById(businessOpportunity.getCreatorId());
                     businessOpportunity.setCreatorName(creatorUser.getName());
                 }
+                if (businessOpportunity.getStageId()!=null){
+                    Optional<Stage> first = stages.stream().filter(s -> s.getId().equals(businessOpportunity.getStageId())).findFirst();
+                    first.ifPresent(stage -> businessOpportunity.setStageValue(stage.getName()));
+                }
             });
 
             //附件信息查询
@@ -321,6 +344,22 @@ public class ContactsServiceImpl extends ServiceImpl<ContactsMapper, Contacts> i
             contactsVo.setTaskList(taskList);
             contactsVo.setBusinessOpportunityList(opportunityList);
             contactsVo.setContactsDocumentList(contactsDocuments);
+            if (contactsVo.getCustomId()!=null){
+                Custom custom = customMapper.selectById(contactsVo.getCustomId());
+                contactsVo.setCustomName(custom.getCustomName());
+            }
+            if (StringUtils.isNotEmpty(contactsVo.getOwnerId())){
+//                User user = userMapper.selectById(contactsVo.getOwnerId());
+//                contactsVo.setOwnerName(user.getName());
+                Optional<User> first = userList.stream().filter(u -> u.getId().equals(contactsVo.getOwnerId())).findFirst();
+                first.ifPresent(value -> contactsVo.setOwnerName(value.getName()));
+            }
+            if (StringUtils.isNotEmpty(contactsVo.getCreatorId())){
+//                User user = userMapper.selectById(contactsVo.getCreatorId());
+//                contactsVo.setCreatorName(user.getName());
+                Optional<User> first = userList.stream().filter(u -> u.getId().equals(contactsVo.getCreatorId())).findFirst();
+                first.ifPresent(value -> contactsVo.setCreatorName(value.getName()));
+            }
         }
         msg.setData(contactsVo);
         return msg;
@@ -539,9 +578,26 @@ public class ContactsServiceImpl extends ServiceImpl<ContactsMapper, Contacts> i
         JSONArray configObJSONArray = configOb.getJSONArray("list");
         List<List<String>> dataList=new ArrayList<>();
         List<String> titleList=new ArrayList<>();
+        List<String> modelList=new ArrayList<>();
         for (int i = 0; i < configObJSONArray.size(); i++) {
             JSONObject item = configObJSONArray.getJSONObject(i);
-            titleList.add(item.getString("label"));
+            String type = item.getString("type");
+            if (type.equals("grid")){
+                JSONArray columns = item.getJSONArray("columns");
+                for (int j = 0; j < columns.size(); j++) {
+                    JSONObject columnsJSONObject = columns.getJSONObject(j);
+                    JSONArray listJsonArray = columnsJSONObject.getJSONArray("list");
+                    for (int k = 0; k < listJsonArray.size(); k++) {
+                        JSONObject listJsonArrayJSONObject = listJsonArray.getJSONObject(k);
+                        titleList.add(listJsonArrayJSONObject.getString("label"));
+                        modelList.add(listJsonArrayJSONObject.getString("model"));
+                    }
+                }
+            }
+            else {
+                titleList.add(item.getString("label"));
+                modelList.add(item.getString("model"));
+            }
         }
         dataList.add(titleList);
 
@@ -557,26 +613,40 @@ public class ContactsServiceImpl extends ServiceImpl<ContactsMapper, Contacts> i
 
         for (ContactsVo contactsVo : records) {
             List<String> item=new ArrayList<>();
-            for (int i = 0; i < configObJSONArray.size(); i++) {
-                JSONObject target = configObJSONArray.getJSONObject(i);
-                String model = target.getString("model");
-//                String targetName = model.substring(0, 1).toUpperCase() + model.substring(1);
+            for (int i = 0; i < modelList.size(); i++) {
+
+                String model = modelList.get(i);
+                String targetName = model.substring(0, 1).toUpperCase() + model.substring(1);
                 Class<? extends ContactsVo> aClass = contactsVo.getClass();
-                String value="";
-//                String value = String.valueOf(aClass.getMethod("get" + targetName).invoke(contactsVo)==null?"":aClass.getMethod("get" + targetName).invoke(contactsVo));
-                /*if(model.equals("inchargerId")){
+                String value = "";
+
+                if(model.equals("customId")){
                     if(wxCorpInfo!=null&&wxCorpInfo.getSaasSyncContact()==1){
-                        value = "$userName"+String.valueOf(aClass.getMethod("getInchargerName").invoke(product))+"$";
+                        value = "$userName"+String.valueOf(aClass.getMethod("getCustomName").invoke(contactsVo))+"$";
                     }else {
-                        value = String.valueOf(aClass.getMethod("getInchargerName").invoke(product));
+                        value = String.valueOf(aClass.getMethod("getCustomName").invoke(contactsVo)).equals("null") ?"" :String.valueOf(aClass.getMethod("getCustomName").invoke(contactsVo));
                     }
-                }*/
-                if(model.equals("sex")){
-                    value = String.valueOf(aClass.getMethod("getSex").invoke(contactsVo)).equals("null") ?"":String.valueOf(aClass.getMethod("getSex").invoke(contactsVo));
                 }
-                if(model.equals("name")){
-                    value = String.valueOf(aClass.getMethod("getName").invoke(contactsVo)).equals("null")?"":String.valueOf(aClass.getMethod("getName").invoke(contactsVo));
+                else if(model.equals("sex")){
+                    value = String.valueOf(aClass.getMethod("getSex").invoke(contactsVo)).equals("null") ?"":String.valueOf(aClass.getMethod("getSex").invoke(contactsVo));
+                    if (StringUtils.isNotEmpty(value)){
+                        if (value.equals("0")){
+                            value="女";
+                        }else {
+                            value="男";
+                        }
+                    }
+
                 }
+                else if(model.equals("ownerId")){
+                    if(wxCorpInfo!=null&&wxCorpInfo.getSaasSyncContact()==1){
+                        value = "$userName"+String.valueOf(aClass.getMethod("getOwnerName").invoke(contactsVo))+"$";
+                    }else {
+                        value = String.valueOf(aClass.getMethod("getOwnerName").invoke(contactsVo)).equals("null") ? "" :String.valueOf(aClass.getMethod("getOwnerName").invoke(contactsVo));
+                    }
+                }else
+                    value= String.valueOf(aClass.getMethod("get" + targetName).invoke(contactsVo)==null?"":aClass.getMethod("get" + targetName).invoke(contactsVo));
+
                 item.add(value);
             }
             dataList.add(item);
@@ -620,5 +690,26 @@ public class ContactsServiceImpl extends ServiceImpl<ContactsMapper, Contacts> i
         }
     }
 
+    @Override
+    public int claimContacts(Contacts contactsGet, User user) {
+        UpdateWrapper<Contacts> contactsUpdateWrapper = new UpdateWrapper<>();
+        contactsUpdateWrapper.eq("id", contactsGet.getId());
+        contactsUpdateWrapper.set("owner_id", contactsGet.getOwnerId());
+        int count1 = contactsMapper.update(null, contactsUpdateWrapper);
+
+        ContactsLog contactsLog = new ContactsLog();
+        contactsLog.setCompanyId(user.getCompanyId());
+        contactsLog.setContactsId(contactsGet.getId());
+        contactsLog.setOperateId(user.getId());
+        contactsLog.setOperateDate(LocalDateTime.now());
+        contactsLog.setMsg("认领联系人");
+        int count2 = contactsLogMapper.insert(contactsLog);
+        if (count1>0&&count2>0){
+            return 1;
+        }else {
+            return 0;
+        }
+    }
+
 
 }

fhKeeper/formulahousekeeper/management-crm/src/main/java/com/management/platform/service/impl/CustomServiceImpl.java

@@ -393,7 +393,7 @@ public class CustomServiceImpl extends ServiceImpl<CustomMapper, Custom> impleme
     }
 
     @Override
-    public HttpRespMsg getCustomerTotalCount(String startDate, String endDate, String userId, HttpServletRequest request) {
+    public HttpRespMsg getCustomerTotalCount(String startDate, String endDate, String userId, Integer departmentId, Integer exportType, HttpServletRequest request) {
         User user = userMapper.selectById(request.getHeader("token"));
         Integer companyId = user.getCompanyId();
         List<UserVO> userVoList=userMapper.getCustomerTotalCount(startDate,endDate,userId,companyId);
@@ -412,7 +412,7 @@ public class CustomServiceImpl extends ServiceImpl<CustomMapper, Custom> impleme
     }
 
     @Override
-    public HttpRespMsg getCustomerTransferRate(String startDate, String endDate, String userId, HttpServletRequest request) {
+    public HttpRespMsg getCustomerTransferRate(String startDate, String endDate, String userId, Integer departmentId, Integer exportType, HttpServletRequest request) {
         User user = userMapper.selectById(request.getHeader("token"));
         Integer companyId = user.getCompanyId();
         List<UserVO> userVoList=userMapper.getCustomerTransferRate(startDate,endDate,userId,companyId);

fhKeeper/formulahousekeeper/management-crm/src/main/java/com/management/platform/service/impl/ReportServiceImpl.java

@@ -22,12 +22,10 @@ import org.apache.commons.io.FileUtils;
 import org.apache.poi.EncryptedDocumentException;
 import org.apache.poi.openxml4j.exceptions.InvalidFormatException;
 import org.apache.poi.ss.usermodel.*;
-import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.http.*;
 import org.springframework.http.client.ClientHttpResponse;
-import org.springframework.scheduling.annotation.Async;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.StringUtils;
@@ -37,7 +35,6 @@ import org.springframework.web.client.RestTemplate;
 import org.springframework.web.multipart.MultipartFile;
 
 import javax.annotation.Resource;
-import javax.print.DocFlavor;
 import javax.servlet.http.HttpServletRequest;
 import java.io.*;
 import java.math.BigDecimal;
@@ -168,6 +165,8 @@ public class ReportServiceImpl extends ServiceImpl<ReportMapper, Report> impleme
     @Resource
     private TaskService taskService;
     @Resource
+    private CustomService customService;
+    @Resource
     private ReportAuditorSettingService reportAuditorSettingService;
     @Resource
     private ReportAuditorSettingMapper reportAuditorSettingMapper;
@@ -5575,8 +5574,8 @@ public class ReportServiceImpl extends ServiceImpl<ReportMapper, Report> impleme
                             if (company.getIsInternational() == 1) {
                                 operateDate = operateDate.plusSeconds(offsetSeconds);
                             }
-							
-								
+
+
                             String time = dtf.format(operateDate);
                             String msg= "";
 							if (auditMsg != null) {
@@ -5605,7 +5604,7 @@ public class ReportServiceImpl extends ServiceImpl<ReportMapper, Report> impleme
 								}else {
 									msg = time+" " + auditMsg;
 								}
-							} 
+							}
                             if (!isFirst) {
                                 sb.append("->");
                             } else {
@@ -8732,4 +8731,56 @@ public class ReportServiceImpl extends ServiceImpl<ReportMapper, Report> impleme
         httpRespMsg.data = finalMap;
         return httpRespMsg;
     }
+
+    @Override
+    public HttpRespMsg exportCustomerTotalCount(String startDate, String endDate, String userId, Integer departmentId, Integer exportType, HttpServletRequest request) throws Exception {
+        User user = userMapper.selectById(request.getHeader("token"));
+        WxCorpInfo wxCorpInfo = wxCorpInfoService.getOne(new LambdaQueryWrapper<WxCorpInfo>().eq(WxCorpInfo::getCompanyId, user.getCompanyId()));
+
+
+        List<List<String>> dataList=new ArrayList<>();
+        List<String> titleList=new ArrayList<>();
+        Collections.addAll(titleList,"员工姓名","新增客户数","成交客户数","客户成交率");
+        dataList.add(titleList);
+        HttpRespMsg respMsg = customService.getCustomerTotalCount(startDate, endDate, userId,departmentId, exportType, request);
+        List<UserVO> userVOList = (List<UserVO>) respMsg.getData();
+        for (UserVO userVO : userVOList) {
+            List<String> item = new ArrayList<>();
+            item.add(userVO.getName());
+            item.add((userVO.getCustomertotal()==null ? 0: userVO.getCustomertotal())+"");
+            item.add((userVO.getCustomerDeal()==null ? 0: userVO.getCustomerDeal())+"");
+            item.add((userVO.getDealRate()==null ? 0: userVO.getDealRate())+"");
+
+            dataList.add(item);
+
+        }
+        String fileName="客户总量分析表_"+ System.currentTimeMillis();
+        return excelExportService.exportGeneralExcelByTitleAndList(wxCorpInfo,fileName,dataList,path);
+    }
+
+    @Override
+    public HttpRespMsg exportCustomerTransferRate(String startDate, String endDate, String userId, Integer departmentId, Integer exportType, HttpServletRequest request) throws Exception {
+        User user = userMapper.selectById(request.getHeader("token"));
+        WxCorpInfo wxCorpInfo = wxCorpInfoService.getOne(new LambdaQueryWrapper<WxCorpInfo>().eq(WxCorpInfo::getCompanyId, user.getCompanyId()));
+
+
+        List<List<String>> dataList=new ArrayList<>();
+        List<String> titleList=new ArrayList<>();
+        Collections.addAll(titleList,"员工姓名","客户转化率");
+
+        HttpRespMsg respMsg = customService.getCustomerTransferRate(startDate, endDate, userId, departmentId, exportType, request);
+        List<UserVO> userVOList = (List<UserVO>) respMsg.getData();
+
+        dataList.add(titleList);
+
+
+        for (UserVO userVO : userVOList) {
+            List<String> item = new ArrayList<>();
+            item.add(userVO.getName());
+            item.add(userVO.getDealRate()+"");
+            dataList.add(item);
+        }
+        String fileName="客户转化率分析表_"+ System.currentTimeMillis();
+        return excelExportService.exportGeneralExcelByTitleAndList(wxCorpInfo,fileName,dataList,path);
+    }
 }

fhKeeper/formulahousekeeper/management-crm/src/main/java/com/management/platform/service/impl/TaskServiceImpl.java

@@ -736,9 +736,26 @@ public class TaskServiceImpl extends ServiceImpl<TaskMapper, Task> implements Ta
         JSONArray configObJSONArray = configOb.getJSONArray("list");
         List<List<String>> dataList=new ArrayList<>();
         List<String> titleList=new ArrayList<>();
+        List<String> modelList=new ArrayList<>();
         for (int i = 0; i < configObJSONArray.size(); i++) {
             JSONObject item = configObJSONArray.getJSONObject(i);
-            titleList.add(item.getString("label"));
+            String type = item.getString("type");
+            if (type.equals("grid")){
+                JSONArray columns = item.getJSONArray("columns");
+                for (int j = 0; j < columns.size(); j++) {
+                    JSONObject columnsJSONObject = columns.getJSONObject(j);
+                    JSONArray listJsonArray = columnsJSONObject.getJSONArray("list");
+                    for (int k = 0; k < listJsonArray.size(); k++) {
+                        JSONObject listJsonArrayJSONObject = listJsonArray.getJSONObject(k);
+                        titleList.add(listJsonArrayJSONObject.getString("label"));
+                        modelList.add(listJsonArrayJSONObject.getString("model"));
+                    }
+                }
+            }
+            else {
+                titleList.add(item.getString("label"));
+                modelList.add(item.getString("model"));
+            }
         }
         dataList.add(titleList);//设置表头
 
@@ -762,23 +779,13 @@ public class TaskServiceImpl extends ServiceImpl<TaskMapper, Task> implements Ta
 
         for (TasKVo tasKVo : taskVoList) {
             List<String> item=new ArrayList<>();
-            for (int i = 0; i < configObJSONArray.size(); i++) {
-                JSONObject target = configObJSONArray.getJSONObject(i);
-                String model = target.getString("model");
-//                String targetName = model.substring(0, 1).toUpperCase() + model.substring(1);
+            for (int i = 0; i <  modelList.size(); i++) {
+
+                String model = modelList.get(i);
+                String targetName = model.substring(0, 1).toUpperCase() + model.substring(1);
                 Class<? extends TasKVo> aClass = tasKVo.getClass();
                 String value="";
-//                String value = String.valueOf(aClass.getMethod("get" + targetName).invoke(tasKVo)==null?"":aClass.getMethod("get" + targetName).invoke(tasKVo));
-                /*if(model.equals("inchargerId")){
-                    if(wxCorpInfo!=null&&wxCorpInfo.getSaasSyncContact()==1){
-                        value = "$userName"+String.valueOf(aClass.getMethod("getInchargerName").invoke(product))+"$";
-                    }else {
-                        value = String.valueOf(aClass.getMethod("getInchargerName").invoke(product));
-                    }
-                }*/
-                /*if(model.equals("sex")){
-                    value = String.valueOf(aClass.getMethod("getSex").invoke(tasKVo)).equals("null") ?"":String.valueOf(aClass.getMethod("getSex").invoke(tasKVo));
-                }*/
+
                 if(model.equals("taskName")){
                     value = String.valueOf(aClass.getMethod("getTaskName").invoke(tasKVo)).equals("null")?"":String.valueOf(aClass.getMethod("getTaskName").invoke(tasKVo));
                 }
@@ -846,6 +853,7 @@ public class TaskServiceImpl extends ServiceImpl<TaskMapper, Task> implements Ta
                 else if(model.equals("phone")){
                     value = String.valueOf(aClass.getMethod("getContactsPhone").invoke(tasKVo)).equals("null")?"":String.valueOf(aClass.getMethod("getContactsPhone").invoke(tasKVo));
                 }
+                else value= String.valueOf(aClass.getMethod("get" + targetName).invoke(tasKVo)==null?"":aClass.getMethod("get" + targetName).invoke(tasKVo));
                 item.add(value);
             }
             dataList.add(item);