|
|
@@ -39,6 +39,7 @@ import java.lang.reflect.InvocationTargetException;
|
|
|
import java.lang.reflect.Method;
|
|
|
import java.net.URLEncoder;
|
|
|
import java.util.*;
|
|
|
+import java.util.stream.Collectors;
|
|
|
|
|
|
/**
|
|
|
* <p>
|
|
|
@@ -88,6 +89,9 @@ public class CustomServiceImpl extends ServiceImpl<CustomMapper, Custom> impleme
|
|
|
@Autowired
|
|
|
private ContactsMapper contactsMapper;
|
|
|
|
|
|
+ @Autowired
|
|
|
+ private TaskMapper taskMapper;
|
|
|
+
|
|
|
@Override
|
|
|
public HttpRespMsg insertAndUpdate(Custom custom, HttpServletRequest request) {
|
|
|
HttpRespMsg msg = new HttpRespMsg();
|
|
|
@@ -116,7 +120,7 @@ public class CustomServiceImpl extends ServiceImpl<CustomMapper, Custom> impleme
|
|
|
ActionLog actionLog = new ActionLog();
|
|
|
actionLog.setCode("custom");
|
|
|
actionLog.setCreatTime(new Date());
|
|
|
- actionLog.setName("创建了客户");
|
|
|
+ actionLog.setName("编辑了客户");
|
|
|
actionLog.setItemId(custom.getId());
|
|
|
actionLog.setUserId(user.getId());
|
|
|
actionLogMapper.insert(actionLog);
|
|
|
@@ -127,7 +131,7 @@ public class CustomServiceImpl extends ServiceImpl<CustomMapper, Custom> impleme
|
|
|
return msg;
|
|
|
}
|
|
|
if (customMapper.selectCount(new QueryWrapper<Custom>().eq("tel_phone", custom.getTelPhone())) > 0) {
|
|
|
-// msg.setError("电话号码重复了");
|
|
|
+ msg.setError("电话号码重复了");
|
|
|
return msg;
|
|
|
}
|
|
|
|
|
|
@@ -140,19 +144,19 @@ public class CustomServiceImpl extends ServiceImpl<CustomMapper, Custom> impleme
|
|
|
custom.setCreateTime(new Date());
|
|
|
custom.setCreatorId(user.getId());
|
|
|
custom.setIsDelete(0);
|
|
|
+ customMapper.insert(custom);
|
|
|
ActionLog actionLog = new ActionLog();
|
|
|
actionLog.setCode("custom");
|
|
|
actionLog.setCreatTime(new Date());
|
|
|
- actionLog.setName("编辑了客户");
|
|
|
+ actionLog.setName("新建了客户");
|
|
|
actionLog.setUserId(user.getId());
|
|
|
actionLog.setItemId(custom.getId());
|
|
|
actionLogMapper.insert(actionLog);
|
|
|
- customMapper.insert(custom);
|
|
|
- if (custom.getCustomName() != null && custom.getCustomName()!="" &&custom.getTelPhone() !="" &&custom.getTelPhone()!=null){
|
|
|
+ if (custom.getCustomName() != null && custom.getCustomName() != "" && custom.getTelPhone() != "" && custom.getTelPhone() != null) {
|
|
|
Contacts contacts = contactsMapper.selectOne(new QueryWrapper<Contacts>().eq("name", custom.getCustomName()).eq("phone", custom.getTelPhone()));
|
|
|
- if (contacts != null){
|
|
|
+ if (contacts != null) {
|
|
|
contacts.setCustomId(custom.getId());
|
|
|
- contactsMapper.update(contacts,new UpdateWrapper<Contacts>().eq("id",contacts.getId()));
|
|
|
+ contactsMapper.update(contacts, new UpdateWrapper<Contacts>().eq("id", contacts.getId()));
|
|
|
}
|
|
|
}
|
|
|
}
|
|
|
@@ -189,64 +193,97 @@ public class CustomServiceImpl extends ServiceImpl<CustomMapper, Custom> impleme
|
|
|
@Override
|
|
|
@Transactional(rollbackFor = Exception.class)
|
|
|
public void getAndTransfer(Custom custom, User user) {
|
|
|
- UpdateWrapper<Custom> updateWrapper = new UpdateWrapper<>();
|
|
|
- updateWrapper.eq("id", custom.getId());
|
|
|
- Custom custom1 = customMapper.selectById(custom.getId());
|
|
|
- String inchargerId = custom1.getInchargerId();
|
|
|
- if (inchargerId == null) {
|
|
|
- //认领
|
|
|
- ActionLog actionLog = new ActionLog();
|
|
|
- actionLog.setCode("custom");
|
|
|
- actionLog.setCreatTime(new Date());
|
|
|
- actionLog.setName("认领了客户");
|
|
|
- actionLog.setUserId(user.getId());
|
|
|
- actionLog.setItemId(custom.getId());
|
|
|
- actionLogMapper.insert(actionLog);
|
|
|
- } else {
|
|
|
- //转移
|
|
|
- ActionLog actionLog = new ActionLog();
|
|
|
- actionLog.setCode("custom");
|
|
|
- actionLog.setCreatTime(new Date());
|
|
|
- actionLog.setName("转移了客户");
|
|
|
- actionLog.setUserId(user.getId());
|
|
|
- actionLog.setItemId(custom.getId());
|
|
|
- actionLogMapper.insert(actionLog);
|
|
|
+ String ids1 = custom.getIds();
|
|
|
+ List<Integer> ids = Arrays.stream(ids1.split(","))
|
|
|
+ .map(Integer::parseInt)
|
|
|
+ .collect(Collectors.toList());
|
|
|
+ for (Integer id : ids) {
|
|
|
+ System.out.println(id);
|
|
|
+ UpdateWrapper<Custom> updateWrapper = new UpdateWrapper<>();
|
|
|
+ updateWrapper.eq("id", id);
|
|
|
+// updateWrapper.eq("id", custom.getId()).set("incharger_id",custom.getInchargerId());
|
|
|
+ String inchargerId = custom.getInchargerId();
|
|
|
+ if (inchargerId == null) {
|
|
|
+ //认领
|
|
|
+ ActionLog actionLog = new ActionLog();
|
|
|
+ actionLog.setCode("custom");
|
|
|
+ actionLog.setCreatTime(new Date());
|
|
|
+ actionLog.setName("认领了客户");
|
|
|
+ actionLog.setUserId(user.getId());
|
|
|
+ actionLog.setItemId(id);
|
|
|
+ actionLogMapper.insert(actionLog);
|
|
|
+ } else {
|
|
|
+ //转移
|
|
|
+ ActionLog actionLog = new ActionLog();
|
|
|
+ actionLog.setCode("custom");
|
|
|
+ actionLog.setCreatTime(new Date());
|
|
|
+ actionLog.setName("转移了客户");
|
|
|
+ actionLog.setUserId(user.getId());
|
|
|
+ actionLog.setItemId(id);
|
|
|
+ actionLogMapper.insert(actionLog);
|
|
|
+ }
|
|
|
+ customMapper.update(custom, updateWrapper);
|
|
|
}
|
|
|
- customMapper.update(custom, updateWrapper);
|
|
|
}
|
|
|
|
|
|
@Autowired
|
|
|
private SalesOrderMapper salesOrderMapper;
|
|
|
+ @Autowired
|
|
|
+ private StageMapper stageMapper;
|
|
|
+
|
|
|
@Override
|
|
|
public HttpRespMsg getInfo(Custom custom, HttpServletRequest request) {
|
|
|
Custom custom1 = customMapper.getInfo(custom.getId());
|
|
|
|
|
|
// 附件列表
|
|
|
- custom1.setFiles(uploadFileMapper.selectList(new QueryWrapper<UploadFile>().eq("code", "custom").eq("item_id",custom1.getId())));
|
|
|
+ custom1.setFiles(uploadFileMapper.selectByInfoList("custom", custom1.getId()));
|
|
|
//商机列表
|
|
|
- custom1.setBusinessOpportunitys(businessOpportunityMapper.selectList(new QueryWrapper<BusinessOpportunity>().eq("customer_id",custom1.getId())));
|
|
|
+ List<BusinessOpportunity> bos = businessOpportunityMapper.selectList(new QueryWrapper<BusinessOpportunity>().eq("customer_id", custom1.getId()));
|
|
|
+ if (bos.size() >0){
|
|
|
+ List<Integer> sIds = bos.stream().map(BusinessOpportunity::getStageId).distinct().collect(Collectors.toList());
|
|
|
+ List<Stage> stages = stageMapper.selectList(new QueryWrapper<Stage>().in("id", sIds));
|
|
|
+ Map<Integer, String> stageValue = stages.stream()
|
|
|
+ .collect(Collectors.toMap(Stage::getId, Stage::getName));
|
|
|
+ custom1.setBusinessOpportunitys(bos);
|
|
|
+ for (BusinessOpportunity bo : bos) {
|
|
|
+ bo.setCustomerName(custom1.getCustomName());
|
|
|
+ bo.setStageValue(stageValue.get(bo.getStageId()));
|
|
|
+ }
|
|
|
+ List<String> userIds = bos.stream()
|
|
|
+ .flatMap(bo -> {
|
|
|
+ List<String> ids = new ArrayList<>();
|
|
|
+ ids.add(bo.getInchargerId());
|
|
|
+ ids.add(bo.getCreatorId());
|
|
|
+ return ids.stream();
|
|
|
+ })
|
|
|
+ .distinct() // 去重
|
|
|
+ .collect(Collectors.toList());
|
|
|
+ if (userIds.size()>0){
|
|
|
+ List<User> users = userMapper.selectList(new QueryWrapper<User>().in("id", userIds));
|
|
|
+ Map<String, String> userIdToNameMap = users.stream()
|
|
|
+ .collect(Collectors.toMap(User::getId, User::getName));
|
|
|
+ for (BusinessOpportunity bo : bos) {
|
|
|
+ bo.setInchargerName(userIdToNameMap.get(bo.getInchargerId()));
|
|
|
+ bo.setCreatorName(userIdToNameMap.get(bo.getCreatorId()));
|
|
|
+ }
|
|
|
+ }
|
|
|
+ }
|
|
|
+ custom1.setBusinessOpportunitys(bos);
|
|
|
//操作记录
|
|
|
- custom1.setActionLogs(actionLogMapper.selectList(new QueryWrapper<ActionLog>().eq("code","custom").eq("item_id",custom1.getId())));
|
|
|
-// List<CustomItemContacts> contacts = customItemContactsMapper.selectList(new QueryWrapper<CustomItemContacts>().eq("contacts_id", custom1.getId()));
|
|
|
-// List<Integer> ids = new ArrayList<>();
|
|
|
-// for (CustomItemContacts contact : contacts) {
|
|
|
-// ids.add(contact.getCustomId());
|
|
|
-// }
|
|
|
-// if (ids.size() > 0){
|
|
|
-// List<Contacts> cs = contactsMapper.selectListByIds(ids);
|
|
|
-// custom1.setContactsList(cs);
|
|
|
-// }
|
|
|
+ List<ActionLog> actionLogs = actionLogMapper.selectByInfoListCustom(custom.getId());
|
|
|
+ List<Task> tasks = taskMapper.selectList(new QueryWrapper<Task>().in("custom_id", custom1.getId()));
|
|
|
+ custom1.setTasks(tasks);
|
|
|
+ custom1.setActionLogs(actionLogs);
|
|
|
//联系人
|
|
|
- custom1.setContacts(contactsMapper.selectList((new QueryWrapper<Contacts>().eq("custom_id",custom1.getId()))));
|
|
|
+ custom1.setContacts(contactsMapper.selectList((new QueryWrapper<Contacts>().eq("custom_id", custom1.getId()))));
|
|
|
//订单
|
|
|
- custom1.setSalesOrders(salesOrderMapper.selectList((new QueryWrapper<SalesOrder>().eq("custom_id",custom1.getId()))));
|
|
|
+ custom1.setSalesOrders(salesOrderMapper.selectList((new QueryWrapper<SalesOrder>().eq("custom_id", custom1.getId()))));
|
|
|
HttpRespMsg httpRespMsg = new HttpRespMsg();
|
|
|
httpRespMsg.setData(custom1);
|
|
|
return httpRespMsg;
|
|
|
}
|
|
|
|
|
|
|
|
|
-
|
|
|
@Override
|
|
|
public HttpRespMsg getList(Custom custom, HttpServletRequest request) {
|
|
|
User user = userMapper.selectById(request.getHeader("Token"));
|
|
|
@@ -254,7 +291,7 @@ public class CustomServiceImpl extends ServiceImpl<CustomMapper, Custom> impleme
|
|
|
custom.setIsDelete(0);
|
|
|
custom.setUserId(user.getId());
|
|
|
custom.setEndTime(custom.getEndTime() + " 23:59:59");
|
|
|
- custom.setPageIndex((custom.getPageIndex()-1) * custom.getPageFrom() );
|
|
|
+ custom.setPageIndex((custom.getPageIndex() - 1) * custom.getPageFrom());
|
|
|
boolean isAll = sysFunctionService.hasPriviledge(user.getRoleId(), "查看全部客户");
|
|
|
boolean isNotAll = sysFunctionService.hasPriviledge(user.getRoleId(), "查看负责部门客户");
|
|
|
List<Custom> list = new ArrayList<>();
|
|
|
@@ -287,7 +324,7 @@ public class CustomServiceImpl extends ServiceImpl<CustomMapper, Custom> impleme
|
|
|
custom.setIsDelete(1);
|
|
|
custom.setUserId(user.getId());
|
|
|
custom.setEndTime(custom.getEndTime() + " 23:59:59");
|
|
|
- custom.setPageIndex((custom.getPageIndex()-1) * custom.getPageFrom() );
|
|
|
+ custom.setPageIndex((custom.getPageIndex() - 1) * custom.getPageFrom());
|
|
|
boolean isAll = sysFunctionService.hasPriviledge(user.getRoleId(), "查看全部客户");
|
|
|
boolean isNotAll = sysFunctionService.hasPriviledge(user.getRoleId(), "查看负责部门客户");
|
|
|
List<Custom> list = new ArrayList<>();
|
|
|
@@ -316,6 +353,7 @@ public class CustomServiceImpl extends ServiceImpl<CustomMapper, Custom> impleme
|
|
|
|
|
|
@Value(value = "${upload.file}")
|
|
|
private String filePath;
|
|
|
+
|
|
|
@Override
|
|
|
public Object uploadFile(Custom custom, HttpServletRequest request, MultipartFile file) {
|
|
|
User user = userMapper.selectById(request.getHeader("token"));
|
|
|
@@ -368,7 +406,7 @@ public class CustomServiceImpl extends ServiceImpl<CustomMapper, Custom> impleme
|
|
|
e.printStackTrace();
|
|
|
// 文件上传失败的响应消息
|
|
|
HttpRespMsg msg = new HttpRespMsg();
|
|
|
- msg.setError("上传成功失败");
|
|
|
+ msg.setError("上传失败");
|
|
|
return msg;
|
|
|
}
|
|
|
} else {
|
|
|
@@ -385,7 +423,7 @@ public class CustomServiceImpl extends ServiceImpl<CustomMapper, Custom> impleme
|
|
|
try {
|
|
|
ServletOutputStream os = response.getOutputStream();
|
|
|
UploadFile uploadFile = uploadFileMapper.selectById(file.getId());
|
|
|
- if (uploadFile == null ){
|
|
|
+ if (uploadFile == null) {
|
|
|
msg.setError("文件未找到");
|
|
|
return msg;
|
|
|
}
|
|
|
@@ -401,7 +439,8 @@ public class CustomServiceImpl extends ServiceImpl<CustomMapper, Custom> impleme
|
|
|
msg.setError(MessageUtils.message("file.error"));
|
|
|
e.printStackTrace();
|
|
|
}
|
|
|
- return msg; }
|
|
|
+ return msg;
|
|
|
+ }
|
|
|
|
|
|
@Override
|
|
|
public Object deleteFile(UploadFile file, HttpServletRequest request) {
|
|
|
@@ -409,7 +448,6 @@ public class CustomServiceImpl extends ServiceImpl<CustomMapper, Custom> impleme
|
|
|
try {
|
|
|
UploadFile uploadFile = uploadFileMapper.selectById(file.getId());
|
|
|
uploadFileMapper.deleteById(uploadFile.getId());
|
|
|
- String realName = uploadFile.getRealName();
|
|
|
File file1 = new File(uploadFile.getPath());
|
|
|
file1.delete();
|
|
|
msg.setMsg("删除成功");
|
|
|
@@ -417,11 +455,15 @@ public class CustomServiceImpl extends ServiceImpl<CustomMapper, Custom> impleme
|
|
|
e.printStackTrace();
|
|
|
msg.setError("删除失败");
|
|
|
}
|
|
|
- return msg; }
|
|
|
+ return msg;
|
|
|
+ }
|
|
|
|
|
|
@Override
|
|
|
public Object reFileName(UploadFile uploadFile, HttpServletRequest request) {
|
|
|
- return uploadFileMapper.update(null, new UpdateWrapper<UploadFile>().eq("id", uploadFile.getId()).set("name", uploadFile.getName()));
|
|
|
+ uploadFileMapper.update(null, new UpdateWrapper<UploadFile>().eq("item_id", uploadFile.getId()).eq("code", "custom").set("name", uploadFile.getName()));
|
|
|
+ HttpRespMsg httpRespMsg = new HttpRespMsg();
|
|
|
+ httpRespMsg.setMsg("操作成功");
|
|
|
+ return httpRespMsg;
|
|
|
}
|
|
|
|
|
|
@Override
|
|
|
@@ -429,13 +471,13 @@ public class CustomServiceImpl extends ServiceImpl<CustomMapper, Custom> impleme
|
|
|
User user = userMapper.selectById(request.getHeader("token"));
|
|
|
Integer companyId = user.getCompanyId();
|
|
|
HttpRespMsg msg = new HttpRespMsg();
|
|
|
- msg.setData(customMapper.selectList(new QueryWrapper<Custom>().eq("company_id",companyId)));
|
|
|
+ msg.setData(customMapper.selectList(new QueryWrapper<Custom>().eq("company_id", companyId)));
|
|
|
return msg;
|
|
|
}
|
|
|
|
|
|
@Override
|
|
|
public Map<String, Object> getDataSummary(Integer companyId, String startDate, String endDate, String userId, List<String> targetUserIds) {
|
|
|
- return customMapper.getDataSummary(companyId,startDate,endDate,userId,targetUserIds);
|
|
|
+ return customMapper.getDataSummary(companyId, startDate, endDate, userId, targetUserIds);
|
|
|
}
|
|
|
|
|
|
@Override
|
|
|
@@ -448,13 +490,13 @@ public class CustomServiceImpl extends ServiceImpl<CustomMapper, Custom> impleme
|
|
|
HttpRespMsg msg = new HttpRespMsg();
|
|
|
User user = userMapper.selectById(request.getHeader("token"));
|
|
|
Integer companyId = user.getCompanyId();
|
|
|
- if (exportType==1){//员工
|
|
|
- List<UserVO> userVoList=userMapper.getCustomerTotalCount(startDate,endDate,userId,companyId);
|
|
|
- if (userVoList!=null&&!userVoList.isEmpty()){
|
|
|
+ if (exportType == 1) {//员工
|
|
|
+ List<UserVO> userVoList = userMapper.getCustomerTotalCount(startDate, endDate, userId, companyId);
|
|
|
+ if (userVoList != null && !userVoList.isEmpty()) {
|
|
|
for (UserVO userVO : userVoList) {
|
|
|
- if (userVO.getCustomertotal()==0){
|
|
|
+ if (userVO.getCustomertotal() == 0) {
|
|
|
userVO.setDealRate((double) 0);
|
|
|
- }else {
|
|
|
+ } else {
|
|
|
double v = ((double) userVO.getCustomerDeal() / userVO.getCustomertotal());
|
|
|
String formattedValue = String.format("%.2f", v);
|
|
|
userVO.setDealRate(Double.parseDouble(formattedValue));
|
|
|
@@ -462,14 +504,14 @@ public class CustomServiceImpl extends ServiceImpl<CustomMapper, Custom> impleme
|
|
|
}
|
|
|
}
|
|
|
msg.setData(userVoList);
|
|
|
- }else {
|
|
|
- List<DepartmentVO> departmentVoList=departmentMapper.getCustomerTotalCount(startDate,endDate,departmentId,companyId);
|
|
|
- if (departmentVoList!=null&&!departmentVoList.isEmpty()){
|
|
|
+ } else {
|
|
|
+ List<DepartmentVO> departmentVoList = departmentMapper.getCustomerTotalCount(startDate, endDate, departmentId, companyId);
|
|
|
+ if (departmentVoList != null && !departmentVoList.isEmpty()) {
|
|
|
for (DepartmentVO departmentVO : departmentVoList) {
|
|
|
- if (departmentVO.getCustomertotal()==0){
|
|
|
- departmentVO.setDealRate((double)0);
|
|
|
- }else {
|
|
|
- double v=((double) departmentVO.getCustomerDeal() /departmentVO.getCustomertotal());
|
|
|
+ if (departmentVO.getCustomertotal() == 0) {
|
|
|
+ departmentVO.setDealRate((double) 0);
|
|
|
+ } else {
|
|
|
+ double v = ((double) departmentVO.getCustomerDeal() / departmentVO.getCustomertotal());
|
|
|
String formattedValue = String.format("%.2f", v);
|
|
|
departmentVO.setDealRate(Double.parseDouble(formattedValue));
|
|
|
}
|
|
|
@@ -487,13 +529,13 @@ public class CustomServiceImpl extends ServiceImpl<CustomMapper, Custom> impleme
|
|
|
User user = userMapper.selectById(request.getHeader("token"));
|
|
|
Integer companyId = user.getCompanyId();
|
|
|
|
|
|
- if (exportType==1) {//员工
|
|
|
- List<UserVO> userVoList=userMapper.getCustomerTransferRate(startDate,endDate,userId,companyId);
|
|
|
- if (userVoList!=null&&!userVoList.isEmpty()){
|
|
|
+ if (exportType == 1) {//员工
|
|
|
+ List<UserVO> userVoList = userMapper.getCustomerTransferRate(startDate, endDate, userId, companyId);
|
|
|
+ if (userVoList != null && !userVoList.isEmpty()) {
|
|
|
for (UserVO userVO : userVoList) {
|
|
|
- if (userVO.getNum()==0){
|
|
|
+ if (userVO.getNum() == 0) {
|
|
|
userVO.setDealRate((double) 0);
|
|
|
- }else {
|
|
|
+ } else {
|
|
|
double v = (double) userVO.getSaleNum() / userVO.getNum();
|
|
|
String formattedValue = String.format("%.2f", v);
|
|
|
userVO.setDealRate(Double.parseDouble(formattedValue));
|
|
|
@@ -502,14 +544,13 @@ public class CustomServiceImpl extends ServiceImpl<CustomMapper, Custom> impleme
|
|
|
}
|
|
|
}
|
|
|
msg.setData(userVoList);
|
|
|
- }
|
|
|
- else {//部门
|
|
|
- List<DepartmentVO> departmentVoList=departmentMapper.getCustomerTransferRate(startDate,endDate,departmentId,companyId);
|
|
|
- if (departmentVoList!=null&&!departmentVoList.isEmpty()){
|
|
|
+ } else {//部门
|
|
|
+ List<DepartmentVO> departmentVoList = departmentMapper.getCustomerTransferRate(startDate, endDate, departmentId, companyId);
|
|
|
+ if (departmentVoList != null && !departmentVoList.isEmpty()) {
|
|
|
for (DepartmentVO departmentVO : departmentVoList) {
|
|
|
- if (departmentVO.getNum()==0){
|
|
|
- departmentVO.setDealRate((double)0);
|
|
|
- }else {
|
|
|
+ if (departmentVO.getNum() == 0) {
|
|
|
+ departmentVO.setDealRate((double) 0);
|
|
|
+ } else {
|
|
|
double v = (double) departmentVO.getSaleNum() / departmentVO.getNum();
|
|
|
String formattedValue = String.format("%.2f", v);
|
|
|
departmentVO.setDealRate(Double.parseDouble(formattedValue));
|
|
|
@@ -526,7 +567,7 @@ public class CustomServiceImpl extends ServiceImpl<CustomMapper, Custom> impleme
|
|
|
|
|
|
@Override
|
|
|
public HttpRespMsg importData(MultipartFile multipartFile) {
|
|
|
- HttpRespMsg msg=new HttpRespMsg();
|
|
|
+ HttpRespMsg msg = new HttpRespMsg();
|
|
|
String fileName = multipartFile.getOriginalFilename();
|
|
|
File file = new File(fileName == null ? "file" : fileName);
|
|
|
User user = userMapper.selectById(request.getHeader("token"));
|
|
|
@@ -554,15 +595,15 @@ public class CustomServiceImpl extends ServiceImpl<CustomMapper, Custom> impleme
|
|
|
int rowNum = sheet.getLastRowNum();
|
|
|
//获取当前表单模板 校验规则
|
|
|
SysForm sysForm = sysFormMapper.selectOne(new LambdaQueryWrapper<SysForm>().eq(SysForm::getCode, "Customer").eq(SysForm::getCompanyId, companyId).eq(SysForm::getIsCurrent, 1));
|
|
|
- if(sysForm==null){
|
|
|
+ if (sysForm == null) {
|
|
|
msg.setError("当前模块未配置自定义模板,需先完成配置");
|
|
|
return msg;
|
|
|
}
|
|
|
String config = sysForm.getConfig();
|
|
|
JSONObject configOb = JSON.parseObject(config);
|
|
|
JSONArray configObJSONArray = configOb.getJSONArray("list");
|
|
|
- List<String> userNameList=new ArrayList<>();
|
|
|
- HttpRespMsg respMsg=new HttpRespMsg();
|
|
|
+ List<String> userNameList = new ArrayList<>();
|
|
|
+ HttpRespMsg respMsg = new HttpRespMsg();
|
|
|
for (int rowIndex = 0; rowIndex <= rowNum; rowIndex++) {
|
|
|
XSSFRow row = sheet.getRow(rowIndex);
|
|
|
if (row == null) {
|
|
|
@@ -578,33 +619,34 @@ public class CustomServiceImpl extends ServiceImpl<CustomMapper, Custom> impleme
|
|
|
JSONObject item = configObJSONArray.getJSONObject(i);
|
|
|
String modelName = item.getString("model");
|
|
|
XSSFCell cell = row.getCell(i);
|
|
|
- if(cell!=null){
|
|
|
- switch (item.getString("type")){
|
|
|
+ if (cell != null) {
|
|
|
+ switch (item.getString("type")) {
|
|
|
// case "time":cell.setCellType(CellType.NUMERIC);
|
|
|
// break;
|
|
|
- default:cell.setCellType(CellType.STRING);
|
|
|
+ default:
|
|
|
+ cell.setCellType(CellType.STRING);
|
|
|
}
|
|
|
}
|
|
|
- if(modelName.equals("inchargerId")){
|
|
|
+ if (modelName.equals("inchargerId")) {
|
|
|
System.out.println("=====");
|
|
|
System.out.println(modelName);
|
|
|
System.out.println(cell.toString());
|
|
|
- if(!StringUtils.isEmpty(cell.getStringCellValue())){
|
|
|
+ if (!StringUtils.isEmpty(cell.getStringCellValue())) {
|
|
|
userNameList.add(cell.getStringCellValue());
|
|
|
}
|
|
|
}
|
|
|
|
|
|
}
|
|
|
}
|
|
|
- System.out.println("参与搜索的人员列表"+userNameList + userNameList.size());
|
|
|
- if(wxCorpInfo!=null&&wxCorpInfo.getSaasSyncContact()==1&&userNameList.size()>0){
|
|
|
- respMsg = wxCorpInfoService.getBatchSearchUserInfo(wxCorpInfo, userNameList,null);
|
|
|
- if(respMsg.code.equals("0")){
|
|
|
- msg.setError("姓名为["+String.valueOf(respMsg.data)+"]的人员存在重复,请使用工号!");
|
|
|
+ System.out.println("参与搜索的人员列表" + userNameList + userNameList.size());
|
|
|
+ if (wxCorpInfo != null && wxCorpInfo.getSaasSyncContact() == 1 && userNameList.size() > 0) {
|
|
|
+ respMsg = wxCorpInfoService.getBatchSearchUserInfo(wxCorpInfo, userNameList, null);
|
|
|
+ if (respMsg.code.equals("0")) {
|
|
|
+ msg.setError("姓名为[" + String.valueOf(respMsg.data) + "]的人员存在重复,请使用工号!");
|
|
|
return msg;
|
|
|
}
|
|
|
}
|
|
|
- List<User> targetUserList= (List<User>) respMsg.data;
|
|
|
+ List<User> targetUserList = (List<User>) respMsg.data;
|
|
|
//直接忽略空行 从row1开始
|
|
|
for (int rowIndex = 1; rowIndex <= rowNum; rowIndex++) {
|
|
|
XSSFRow row = sheet.getRow(rowIndex);
|
|
|
@@ -617,7 +659,7 @@ public class CustomServiceImpl extends ServiceImpl<CustomMapper, Custom> impleme
|
|
|
}
|
|
|
//获取到当前行的列数据
|
|
|
int cellNum = row.getLastCellNum();
|
|
|
- Custom custom =new Custom();
|
|
|
+ Custom custom = new Custom();
|
|
|
custom.setCompanyId(companyId);
|
|
|
custom.setCreateTime(new Date());
|
|
|
custom.setCreatorId(user.getId());
|
|
|
@@ -625,47 +667,48 @@ public class CustomServiceImpl extends ServiceImpl<CustomMapper, Custom> impleme
|
|
|
JSONObject item = configObJSONArray.getJSONObject(i);
|
|
|
String modelName = item.getString("model");
|
|
|
String className = modelName.substring(0, 1).toUpperCase() + modelName.substring(1);
|
|
|
- String getter="get"+className;
|
|
|
- String setter="set"+className;
|
|
|
+ String getter = "get" + className;
|
|
|
+ String setter = "set" + className;
|
|
|
XSSFCell cell = row.getCell(i);
|
|
|
- if(cell!=null){
|
|
|
- switch (item.getString("type")){
|
|
|
+ if (cell != null) {
|
|
|
+ switch (item.getString("type")) {
|
|
|
|
|
|
- default:cell.setCellType(CellType.STRING);
|
|
|
+ default:
|
|
|
+ cell.setCellType(CellType.STRING);
|
|
|
}
|
|
|
}
|
|
|
//校验当前列是否为必填
|
|
|
JSONObject options = item.getJSONObject("options");
|
|
|
JSONObject rules = options.getJSONObject("rules");
|
|
|
Boolean required = rules.getBoolean("required");
|
|
|
- if(required){
|
|
|
- if(StringUtils.isEmpty(cell.getStringCellValue())){
|
|
|
- msg.setError(item.getString("label")+"值不能为空值");
|
|
|
+ if (required) {
|
|
|
+ if (StringUtils.isEmpty(cell.getStringCellValue())) {
|
|
|
+ msg.setError(item.getString("label") + "值不能为空值");
|
|
|
return msg;
|
|
|
}
|
|
|
}
|
|
|
- if(modelName.equals("inchargerId")){
|
|
|
- if(!StringUtils.isEmpty(cell.getStringCellValue())){
|
|
|
+ if (modelName.equals("inchargerId")) {
|
|
|
+ if (!StringUtils.isEmpty(cell.getStringCellValue())) {
|
|
|
String userName = cell.getStringCellValue();
|
|
|
Optional<User> first;
|
|
|
- if(wxCorpInfo!=null&&wxCorpInfo.getSaasSyncContact()==1){
|
|
|
+ if (wxCorpInfo != null && wxCorpInfo.getSaasSyncContact() == 1) {
|
|
|
Optional<User> optional = targetUserList.stream().filter(tl -> tl.getName().equals(userName)).findFirst();
|
|
|
- first= userList.stream().filter(u ->(u.getJobNumber()!=null&&u.getJobNumber().equals(userName))||(optional.isPresent()&&u.getCorpwxUserid()!=null&&u.getCorpwxUserid().equals(optional.get().getCorpwxUserid()))).findFirst();
|
|
|
- }else {
|
|
|
- first= userList.stream().filter(u -> u.getName().equals(userName)||(u.getJobNumber()!=null&&u.getJobNumber().equals(userName))).findFirst();
|
|
|
+ first = userList.stream().filter(u -> (u.getJobNumber() != null && u.getJobNumber().equals(userName)) || (optional.isPresent() && u.getCorpwxUserid() != null && u.getCorpwxUserid().equals(optional.get().getCorpwxUserid()))).findFirst();
|
|
|
+ } else {
|
|
|
+ first = userList.stream().filter(u -> u.getName().equals(userName) || (u.getJobNumber() != null && u.getJobNumber().equals(userName))).findFirst();
|
|
|
}
|
|
|
if (first.isPresent()) {
|
|
|
custom.setInchargerId(first.get().getId());
|
|
|
} else {
|
|
|
- msg.setError("负责人["+userName+"]在系统中不存在");
|
|
|
+ msg.setError("负责人[" + userName + "]在系统中不存在");
|
|
|
return msg;
|
|
|
}
|
|
|
}
|
|
|
- }else {
|
|
|
- if(!StringUtils.isEmpty(cell.getStringCellValue())){
|
|
|
+ } else {
|
|
|
+ if (!StringUtils.isEmpty(cell.getStringCellValue())) {
|
|
|
Class<Clue> clueClass = Clue.class;
|
|
|
- Method method = clueClass.getMethod(setter,String.class);
|
|
|
- method.invoke(custom,cell.getStringCellValue());
|
|
|
+ Method method = clueClass.getMethod(setter, String.class);
|
|
|
+ method.invoke(custom, cell.getStringCellValue());
|
|
|
}
|
|
|
}
|
|
|
|
Min