| @@ -1,13 +1,10 @@ | |||||
| package com.iformall.service.impl; | package com.iformall.service.impl; | ||||
| import cn.afterturn.easypoi.excel.ExcelImportUtil; | import cn.afterturn.easypoi.excel.ExcelImportUtil; | ||||
| import cn.afterturn.easypoi.excel.annotation.Excel; | |||||
| import cn.afterturn.easypoi.excel.entity.ImportParams; | import cn.afterturn.easypoi.excel.entity.ImportParams; | ||||
| import cn.afterturn.easypoi.excel.entity.result.ExcelImportResult; | import cn.afterturn.easypoi.excel.entity.result.ExcelImportResult; | ||||
| import cn.afterturn.easypoi.excel.entity.result.ExcelVerifyHandlerResult; | |||||
| import cn.afterturn.easypoi.handler.impl.ExcelDataHandlerDefaultImpl; | import cn.afterturn.easypoi.handler.impl.ExcelDataHandlerDefaultImpl; | ||||
| import cn.afterturn.easypoi.handler.inter.IExcelDataHandler; | import cn.afterturn.easypoi.handler.inter.IExcelDataHandler; | ||||
| import cn.afterturn.easypoi.handler.inter.IExcelVerifyHandler; | |||||
| import com.alibaba.fastjson.JSON; | import com.alibaba.fastjson.JSON; | ||||
| import com.alibaba.fastjson.JSONObject; | import com.alibaba.fastjson.JSONObject; | ||||
| import com.github.pagehelper.PageHelper; | import com.github.pagehelper.PageHelper; | ||||
| @@ -40,14 +37,15 @@ import org.springframework.beans.factory.annotation.Autowired; | |||||
| import org.springframework.stereotype.Service; | import org.springframework.stereotype.Service; | ||||
| import org.springframework.web.multipart.MultipartFile; | import org.springframework.web.multipart.MultipartFile; | ||||
| import javax.persistence.Transient; | |||||
| import javax.servlet.http.HttpServletRequest; | import javax.servlet.http.HttpServletRequest; | ||||
| import javax.servlet.http.HttpServletResponse; | import javax.servlet.http.HttpServletResponse; | ||||
| import javax.validation.constraints.NotNull; | |||||
| import java.io.*; | import java.io.*; | ||||
| import java.text.ParseException; | import java.text.ParseException; | ||||
| import java.text.SimpleDateFormat; | import java.text.SimpleDateFormat; | ||||
| import java.util.*; | |||||
| import java.util.ArrayList; | |||||
| import java.util.Date; | |||||
| import java.util.List; | |||||
| import java.util.UUID; | |||||
| @Service | @Service | ||||
| public class WxCUserBasicInfoServiceImpl implements WxCUserBasicInfoService { | public class WxCUserBasicInfoServiceImpl implements WxCUserBasicInfoService { | ||||
| @@ -209,7 +207,7 @@ public class WxCUserBasicInfoServiceImpl implements WxCUserBasicInfoService { | |||||
| WxCUserTags uTag = wxCUserTagsMapper.selectByPrimaryKey(entity.getTagId()); | WxCUserTags uTag = wxCUserTagsMapper.selectByPrimaryKey(entity.getTagId()); | ||||
| if (StringUtils.isNotBlank(uTag.getTags())) { | if (StringUtils.isNotBlank(uTag.getTags())) { | ||||
| List<Long> ids = JSONObject.parseArray(uTag.getTags(), Long.class); | List<Long> ids = JSONObject.parseArray(uTag.getTags(), Long.class); | ||||
| if (ids.size() > 0) { | |||||
| if (!ids.isEmpty()) { | |||||
| WxTags wxTagsQ = new WxTags(); | WxTags wxTagsQ = new WxTags(); | ||||
| wxTagsQ.setIds(ids); | wxTagsQ.setIds(ids); | ||||
| List<WxTags> tagList = wxTagsMapper.findList(wxTagsQ); | List<WxTags> tagList = wxTagsMapper.findList(wxTagsQ); | ||||
| @@ -492,17 +490,18 @@ public class WxCUserBasicInfoServiceImpl implements WxCUserBasicInfoService { | |||||
| List<CUserBaseInfoT> failList = datalist.getFailList(); | List<CUserBaseInfoT> failList = datalist.getFailList(); | ||||
| logger.info("验证通过的数量:" + successList.size()); | logger.info("验证通过的数量:" + successList.size()); | ||||
| logger.info("验证未通过的数量:" + failList.size()); | logger.info("验证未通过的数量:" + failList.size()); | ||||
| for(CUserBaseInfoT uBase: successList) { | |||||
| for (CUserBaseInfoT uBase : successList) { | |||||
| if (StringUtils.isBlank(uBase.getPhone())) { | |||||
| logger.error("手机号为空", uBase.toString()); | |||||
| continue; | |||||
| } | |||||
| WxCUserBasicInfo userBase = InitUserBaseInfo(uBase, tenantId); | WxCUserBasicInfo userBase = InitUserBaseInfo(uBase, tenantId); | ||||
| if (userBase == null) { | if (userBase == null) { | ||||
| continue; | continue; | ||||
| } | } | ||||
| Date curDate = new Date(); | Date curDate = new Date(); | ||||
| if (StringUtils.isBlank(userBase.getPhone())) { | |||||
| logger.error("手机号为空", userBase.toString()); | |||||
| continue; | |||||
| } | |||||
| WxCUserBasicInfo oldUserBase = null; | WxCUserBasicInfo oldUserBase = null; | ||||
| WxCUserBasicInfo userBaseQ = new WxCUserBasicInfo(); | WxCUserBasicInfo userBaseQ = new WxCUserBasicInfo(); | ||||
| userBaseQ.setTenantId(tenantId); | userBaseQ.setTenantId(tenantId); | ||||