From 6d30a1ef0014acd773f23e0a7dc968d6608f4666 Mon Sep 17 00:00:00 2001 From: jiangping <jp@doumee.com> Date: 星期二, 15 四月 2025 08:34:20 +0800 Subject: [PATCH] 代码初始化 --- server/src/main/java/com/doumee/service/business/impl/WorkorderServiceImpl.java | 291 +++++++++++++++++++++++++++++++++++++++------------------ 1 files changed, 197 insertions(+), 94 deletions(-) diff --git a/server/src/main/java/com/doumee/service/business/impl/WorkorderServiceImpl.java b/server/src/main/java/com/doumee/service/business/impl/WorkorderServiceImpl.java index 782492f..803815e 100644 --- a/server/src/main/java/com/doumee/service/business/impl/WorkorderServiceImpl.java +++ b/server/src/main/java/com/doumee/service/business/impl/WorkorderServiceImpl.java @@ -21,7 +21,9 @@ import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.doumee.service.common.EmailService; import com.github.yulichang.wrapper.MPJLambdaWrapper; +import lombok.extern.slf4j.Slf4j; import org.apache.catalina.Manager; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.data.redis.core.RedisTemplate; @@ -42,6 +44,7 @@ * @since 2025/04/02 17:49 */ @Service +@Slf4j public class WorkorderServiceImpl implements WorkorderService { @Autowired @@ -55,6 +58,8 @@ @Autowired private SystemDictDataBiz systemDictDataBiz; + @Autowired + private EmailService emailService; @Autowired private MemberMapper memberMapper; @@ -73,6 +78,7 @@ @Override + @Transactional(rollbackFor = {BusinessException.class,Exception.class}) public Integer create(Workorder workorder) { this.isValidBaseParam(workorder); workorder.setCreateDate(new Date()); @@ -115,8 +121,11 @@ * @param csInfo 鎶勯�佷俊鎭� */ public void sendQwMsg(Workorder workorder,String qwIds,Member member,String categoryName,Integer contentType,String csInfo){ + if(StringUtils.isEmpty(qwIds)){ + return; + } QywxSendMsgRequest qywxSendMsgRequest = new QywxSendMsgRequest(); - qywxSendMsgRequest.setMsgtype("text"); + qywxSendMsgRequest.setMsgtype("textcard"); qywxSendMsgRequest.setTouser(qwIds.replace(",","|")); qywxSendMsgRequest.setAgentid(systemDictDataBiz.queryByCode(Constants.QYWX,Constants.QYWX_AGENTID).getCode()); String sendUser = ""; @@ -195,6 +204,9 @@ List<Multifile> multifileList = workorder.getMultifileList(); if(com.github.xiaoymin.knife4j.core.util.CollectionUtils.isNotEmpty(multifileList)){ for (Multifile multifile:multifileList) { + if(StringUtils.isEmpty(multifile.getFileurl())){ + throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"闄勪欢淇℃伅閿欒锛�"); + } multifile.setIsdeleted(Constants.ZERO); multifile.setObjId(workorder.getId()); multifile.setCreateDate(new Date()); @@ -210,11 +222,14 @@ * @param workorder */ public void saveProblemData(Workorder workorder){ - if(Constants.equalsInteger(workorder.getType(),Constants.TWO)){ + if(Constants.equalsInteger(workorder.getType(),Constants.ONE)){ List<DCANoProblemDTO> dcaNoProblemDTOList = workorder.getDcaNoProblemDTOList(); if(com.github.xiaoymin.knife4j.core.util.CollectionUtils.isNotEmpty(dcaNoProblemDTOList)){ for (DCANoProblemDTO dcaNoProblemDTO:dcaNoProblemDTOList) { Category problem = categoryMapper.selectById(dcaNoProblemDTO.getProblemId()); + if(!Constants.equalsInteger(problem.getType(),6)){ + throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"棰樼洰鍒嗙被閿欒"); + } Constants.WorkOrderStatus workOrderStatus = Constants.WorkOrderStatus.waitConfirm; Workorder dcaWorkOrder = new Workorder(); dcaWorkOrder.setCreateDate(new Date()); @@ -263,9 +278,10 @@ } } //璺岀粖婊戜簨浠朵笂鎶� 鏌ヨSHE璐熻矗浜� - if(Constants.equalsInteger(workorder.getType(),Constants.THREE) || Constants.equalsInteger(workorder.getType(),Constants.ONE)){ + if(Constants.equalsInteger(workorder.getType(),Constants.THREE) || Constants.equalsInteger(workorder.getType(),Constants.ONE)|| Constants.equalsInteger(workorder.getType(),Constants.ZERO)){ List<Managers> managersList = managersMapper.selectJoinList(Managers.class,new MPJLambdaWrapper<Managers>().selectAll(Managers.class) .selectAs(Member::getName,Managers::getMemberName) + .selectAs(Member::getQwId,Managers::getQwId) .leftJoin(Member.class,Member::getId,Managers::getMemberId) .eq(Managers::getIsdeleted,Constants.ZERO) .eq(Managers::getType,Constants.ZERO).orderByAsc(Managers::getSortnum) @@ -274,14 +290,12 @@ throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"鏈煡璇㈠埌SHE澶勭悊鎶勯�佷汉鍛�"); } if(com.github.xiaoymin.knife4j.core.util.CollectionUtils.isNotEmpty(managersList)){ - workorder.setQwnoticeMemberIds(managersList.stream().map(i->i.getMemberId().toString()).collect(Collectors.joining(","))); + workorder.setQwnoticeMemberIds(managersList.stream().filter(i->Constants.equalsInteger(i.getIsQw(),Constants.ONE)).map(i->i.getQwId()).collect(Collectors.joining(","))); if(Constants.equalsInteger(workorder.getType(),Constants.ZERO)){ - workorder.setEmialMemberIds(managersList.stream().map(i->i.getMemberId().toString()).collect(Collectors.joining(","))); + workorder.setEmialMemberIds(managersList.stream().filter(i->Constants.equalsInteger(i.getIsEmail(),Constants.ONE)).map(i->i.getQwId()).collect(Collectors.joining(","))); } } } - - } @@ -349,7 +363,7 @@ if(Constants.equalsInteger(workorder.getType(),Constants.ONE)){ if(Objects.isNull(workorder.getDcaYesNum()) || Objects.isNull(workorder.getDcaNoNum()) - || Objects.isNull(workorder.getCategoryId()) +// || Objects.isNull(workorder.getCategoryId()) ){ throw new BusinessException(ResponseStatus.BAD_REQUEST); } @@ -376,6 +390,7 @@ .selectAs(Member::getName,Workorder::getMemberName) .selectAs(Member::getCompanyName,Workorder::getCompanyName) .select(" c3.name ",Workorder::getTypeName) + .select(" c3.name_path ",Workorder::getTypeNamePath) .select(" c4.name ",Workorder::getCategoryName) .leftJoin(Member.class,Member::getId,Workorder::getMemberId) .leftJoin(" category c3 on t.TYPE_ID = c3.id ") //椋庨櫓绫诲瀷 @@ -383,20 +398,22 @@ .eq(Workorder::getId,id) .last(" limit 1 ") ); - if(Objects.nonNull(workorder)){ - this.dealButton(workorder,member); - //鏌ヨ闄勪欢淇℃伅 - List<Multifile> multifileList = multifileMapper.selectList(new QueryWrapper<Multifile>().lambda().eq(Multifile::getIsdeleted,Constants.ZERO) - .eq(Multifile::getObjId,workorder.getId()).orderByAsc(Multifile::getId)); - if(com.github.xiaoymin.knife4j.core.util.CollectionUtils.isNotEmpty(multifileList)){ - String path = systemDictDataBiz.queryByCode(Constants.FTP,Constants.FTP_RESOURCE_PATH).getCode() - +systemDictDataBiz.queryByCode(Constants.FTP,Constants.WORKORDER_FILE_PATH).getCode(); - for (Multifile multifile:multifileList) { - multifile.setFileurlFull(path+multifile.getFileurl()); - } - workorder.setMultifileList(multifileList); - } + if(Objects.isNull(workorder)){ + throw new BusinessException(ResponseStatus.DATA_EMPTY); } + this.dealButton(workorder,member); + //鏌ヨ闄勪欢淇℃伅 + List<Multifile> multifileList = multifileMapper.selectList(new QueryWrapper<Multifile>().lambda().eq(Multifile::getIsdeleted,Constants.ZERO) + .eq(Multifile::getObjId,workorder.getId()).orderByAsc(Multifile::getId)); + if(com.github.xiaoymin.knife4j.core.util.CollectionUtils.isNotEmpty(multifileList)){ + String path = systemDictDataBiz.queryByCode(Constants.FTP,Constants.FTP_RESOURCE_PATH).getCode() + +systemDictDataBiz.queryByCode(Constants.FTP,Constants.WORKORDER_FILE_PATH).getCode(); + for (Multifile multifile:multifileList) { + multifile.setFileurlFull(path+multifile.getFileurl()); + } + workorder.setMultifileList(multifileList); + } + //鏌ヨ鏃ュ織淇℃伅 workorder.setLogList(this.getLogList(workorder.getId())); if(Constants.equalsInteger(workorder.getType(),Constants.ONE)){ @@ -412,11 +429,15 @@ public void dealButton(Workorder workorder,Member member){ workorder.setPassOnButton(Constants.ZERO); workorder.setCloseButton(Constants.ZERO); - if(org.apache.commons.lang3.StringUtils.isNotBlank(member.getQwId())){ + if(member!=null && org.apache.commons.lang3.StringUtils.isNotBlank(member.getQwId())){ List<String> closeUserList = new ArrayList<>(); closeUserList.addAll(Arrays.asList(workorder.getQwnoticeMemberIds().split(","))); - closeUserList.add(org.apache.commons.lang3.StringUtils.isNotBlank(workorder.getManagerId())?workorder.getManagerId():null); - closeUserList.add(org.apache.commons.lang3.StringUtils.isNotBlank(workorder.getDealerId())?workorder.getDealerId():null); + if(org.apache.commons.lang3.StringUtils.isNotBlank(workorder.getManagerId())){ + closeUserList.add(workorder.getManagerId()); + } + if(org.apache.commons.lang3.StringUtils.isNotBlank(workorder.getDealerId())){ + closeUserList.add(workorder.getDealerId()); + } workorder.setCloseButton(closeUserList.stream().filter(i->i.equals(member.getQwId())).collect(Collectors.toList()).size()>Constants.ZERO?Constants.ONE:Constants.ZERO); List<String> passOnUserList = new ArrayList<>(); //寰呭垎閰嶇姸鎬� 澶勭悊杞氦鎸夐挳 @@ -531,6 +552,9 @@ .leftJoin(Member.class,Member::getId,Workorder::getMemberId) .leftJoin(" category c3 on t.TYPE_ID = c3.id ") //椋庨櫓绫诲瀷 .leftJoin(" category c2 on t.CATEGORY_ID = c2.id ") //DCA涓�绾ч棶棰樼紪鐮� + .apply(Objects.nonNull(pageWrap.getMyWorkOrder())&& org.apache.commons.lang3.StringUtils.isNotBlank(pageWrap.getQwId()) + &&Constants.equalsInteger(Constants.ONE,pageWrap.getMyWorkOrder()), + " ( t.id in ( select OBJ_ID from notices where param1 = '"+pageWrap.getQwId()+"' and type != 3 )) ") .eq( pageWrap.getId() != null, Workorder::getId, pageWrap.getId()) .eq( pageWrap.getCreator() != null, Workorder::getCreator, pageWrap.getCreator()) .ge( pageWrap.getCreateDate() != null, Workorder::getCreateDate, Utils.Date.getStart( pageWrap.getCreateDate())) @@ -592,73 +616,6 @@ Utils.MP.blankToNull(pageWrap.getModel()); pageWrap.getModel().setIsdeleted(Constants.ZERO); MPJLambdaWrapper<Workorder> queryWrapper = getJoinQueryMapper(pageWrap.getModel()); - queryWrapper - .selectAll(Workorder.class) - .selectAs(Member::getName,Workorder::getMemberName) - .selectAs(Member::getCompanyName,Workorder::getCompanyName) - .selectAs(Member::getPhone,Workorder::getMemberPhone) - .select(" c2.name ",Workorder::getCategoryName) - .select(" c3.name ",Workorder::getTypeName) - .select(" c4.name ",Workorder::getProblemName) - .leftJoin(Member.class,Member::getId,Workorder::getMemberId) - .leftJoin(" category c3 on t.TYPE_ID = c3.id ") //椋庨櫓绫诲瀷 - .leftJoin(" category c4 on t.PROBLEM_ID = c4.id ") //DCA闂缂栫爜 - .leftJoin(" category c2 on t.CATEGORY_ID = c2.id ") //DCA闂缂栫爜 - .apply(Objects.nonNull(pageWrap.getModel().getMyWorkOrder())&& org.apache.commons.lang3.StringUtils.isNotBlank(pageWrap.getModel().getQwId()) - &&Constants.equalsInteger(Constants.ONE,pageWrap.getModel().getMyWorkOrder()), - " ( t.id in ( select OBJ_ID from notices where param1 = '"+pageWrap.getModel().getQwId()+"' )) ") - .eq(pageWrap.getModel().getId() != null, Workorder::getId, pageWrap.getModel().getId()) - .eq(pageWrap.getModel().getCreator() != null, Workorder::getCreator, pageWrap.getModel().getCreator()) - .ge(pageWrap.getModel().getCreateDate() != null, Workorder::getCreateDate, Utils.Date.getStart(pageWrap.getModel().getCreateDate())) - .le(pageWrap.getModel().getCreateDate() != null, Workorder::getCreateDate, Utils.Date.getEnd(pageWrap.getModel().getCreateDate())) - .eq(pageWrap.getModel().getEditor() != null, Workorder::getEditor, pageWrap.getModel().getEditor()) - .ge(pageWrap.getModel().getEditDate() != null, Workorder::getEditDate, Utils.Date.getStart(pageWrap.getModel().getEditDate())) - .le(pageWrap.getModel().getEditDate() != null, Workorder::getEditDate, Utils.Date.getEnd(pageWrap.getModel().getEditDate())) - .eq(pageWrap.getModel().getIsdeleted() != null, Workorder::getIsdeleted, pageWrap.getModel().getIsdeleted()) - .eq(pageWrap.getModel().getCategoryId() != null, Workorder::getCategoryId, pageWrap.getModel().getCategoryId()) - .eq(pageWrap.getModel().getRemark() != null, Workorder::getRemark, pageWrap.getModel().getRemark()) - .eq(pageWrap.getModel().getStatus() != null, Workorder::getStatus, pageWrap.getModel().getStatus()) - .eq(pageWrap.getModel().getSortnum() != null, Workorder::getSortnum, pageWrap.getModel().getSortnum()) - .eq(pageWrap.getModel().getType() != null, Workorder::getType, pageWrap.getModel().getType()) - .eq(pageWrap.getModel().getMemberId() != null, Workorder::getMemberId, pageWrap.getModel().getMemberId()) - .eq(pageWrap.getModel().getCompanyId() != null, Workorder::getCompanyId, pageWrap.getModel().getCompanyId()) - .eq(pageWrap.getModel().getSubmitDate() != null, Workorder::getSubmitDate, pageWrap.getModel().getSubmitDate()) - .eq(pageWrap.getModel().getMemberType() != null, Workorder::getMemberType, pageWrap.getModel().getMemberType()) - .eq(pageWrap.getModel().getMemberQwids() != null, Workorder::getMemberQwids, pageWrap.getModel().getMemberQwids()) - .like(pageWrap.getModel().getMemberNames() != null, Workorder::getMemberNames, pageWrap.getModel().getMemberNames()) - .eq(pageWrap.getModel().getLocaltionId() != null, Workorder::getLocaltionId, pageWrap.getModel().getLocaltionId()) - .eq(pageWrap.getModel().getOutJiuyi() != null, Workorder::getOutJiuyi, pageWrap.getModel().getOutJiuyi()) - .eq(pageWrap.getModel().getIsYiwushi() != null, Workorder::getIsYiwushi, pageWrap.getModel().getIsYiwushi()) - .eq(pageWrap.getModel().getIsHurted() != null, Workorder::getIsHurted, pageWrap.getModel().getIsHurted()) - .eq(pageWrap.getModel().getWorkRelated() != null, Workorder::getWorkRelated, pageWrap.getModel().getWorkRelated()) - .eq(pageWrap.getModel().getEventInfo() != null, Workorder::getEventInfo, pageWrap.getModel().getEventInfo()) - .eq(pageWrap.getModel().getEmialMemberIds() != null, Workorder::getEmialMemberIds, pageWrap.getModel().getEmialMemberIds()) - .eq(pageWrap.getModel().getQwnoticeMemberIds() != null, Workorder::getQwnoticeMemberIds, pageWrap.getModel().getQwnoticeMemberIds()) - .eq(pageWrap.getModel().getHappenTime() != null, Workorder::getHappenTime, pageWrap.getModel().getHappenTime()) - .eq(pageWrap.getModel().getTypeId() != null, Workorder::getTypeId, pageWrap.getModel().getTypeId()) - .eq(pageWrap.getModel().getRiskInfo() != null, Workorder::getRiskInfo, pageWrap.getModel().getRiskInfo()) - .eq(pageWrap.getModel().getManagerId() != null, Workorder::getManagerId, pageWrap.getModel().getManagerId()) - .eq(pageWrap.getModel().getDealerId() != null, Workorder::getDealerId, pageWrap.getModel().getDealerId()) - .ge(pageWrap.getModel().getDispatchTime() != null, Workorder::getDispatchTime, Utils.Date.getStart(pageWrap.getModel().getDispatchTime())) - .le(pageWrap.getModel().getDispatchTime() != null, Workorder::getDispatchTime, Utils.Date.getEnd(pageWrap.getModel().getDispatchTime())) - .eq(pageWrap.getModel().getDispatchInfo() != null, Workorder::getDispatchInfo, pageWrap.getModel().getDispatchInfo()) - .ge(pageWrap.getModel().getDealTime() != null, Workorder::getDealTime, Utils.Date.getStart(pageWrap.getModel().getDealTime())) - .le(pageWrap.getModel().getDealTime() != null, Workorder::getDealTime, Utils.Date.getEnd(pageWrap.getModel().getDealTime())) - .eq(pageWrap.getModel().getDealInfo() != null, Workorder::getDealInfo, pageWrap.getModel().getDealInfo()) - .eq(pageWrap.getModel().getProblemTitle() != null, Workorder::getProblemTitle, pageWrap.getModel().getProblemTitle()) - .eq(pageWrap.getModel().getProblemId() != null, Workorder::getProblemId, pageWrap.getModel().getProblemId()) - .eq(pageWrap.getModel().getProblemInfo() != null, Workorder::getProblemInfo, pageWrap.getModel().getProblemInfo()) - .eq(pageWrap.getModel().getLocationName() != null, Workorder::getLocationName, pageWrap.getModel().getLocationName()) - .like(pageWrap.getModel().getCode() != null, Workorder::getCode, pageWrap.getModel().getCode()) - .eq(pageWrap.getModel().getDcaYesNum() != null, Workorder::getDcaYesNum, pageWrap.getModel().getDcaYesNum()) - .eq(pageWrap.getModel().getDcaNoNum() != null, Workorder::getDcaNoNum, pageWrap.getModel().getDcaNoNum()) - .eq(pageWrap.getModel().getDcaRecordId() != null, Workorder::getDcaRecordId, pageWrap.getModel().getDcaRecordId()) - .eq(pageWrap.getModel().getDcaCsIds() != null, Workorder::getDcaCsIds, pageWrap.getModel().getDcaCsIds()) ; - if (pageWrap.getModel().getMemberName() != null) { - queryWrapper.and( ms->ms.like(Member::getName,pageWrap.getModel().getMemberName()) - .or().like(Member::getPhone,pageWrap.getModel().getMemberName()) ); - } - queryWrapper.orderByDesc(Workorder::getCreateDate); return PageData.from(workorderMapper.selectJoinPage(page,Workorder.class, queryWrapper)); } @@ -676,9 +633,11 @@ }else if(Constants.equalsInteger(type,Constants.THREE)){ key = "A"; } - String code = redisTemplate.opsForValue().get(key+"_CODE").toString(); - if(StringUtils.isEmpty(code)){ - code = "01"; + String code = "01"; + try{ + code = redisTemplate.opsForValue().get(key+"_CODE").toString(); + }catch (Exception e){ + } redisTemplate.opsForValue().set(key+"_CODE",Integer.valueOf(code)+1); return key + date + org.apache.commons.lang3.StringUtils.leftPad(code,2,"0"); @@ -864,6 +823,150 @@ } } + @Override + public void sendSheEmail(){ + if(Constants.WORKORDER_SHE_EMAIL_SENDING){ + return; + } + Constants.WORKORDER_SHE_EMAIL_SENDING = true; + try { + List<Workorder> list = workorderMapper.selectJoinList(Workorder.class,new MPJLambdaWrapper<Workorder>() + .selectAll(Workorder.class) + .selectAs(Member::getName,Workorder::getMemberName) + .selectAs(Member::getCompanyName,Workorder::getCompanyName) + .selectAs(Member::getPhone,Workorder::getMemberPhone) + .select(" c2.name_path ",Workorder::getCategoryName) + .select(" c3.name_path ",Workorder::getTypeName) + .leftJoin(Member.class,Member::getId,Workorder::getMemberId) + .leftJoin(" category c3 on t.TYPE_ID = c3.id ") //椋庨櫓绫诲瀷 + .leftJoin(" category c2 on t.CATEGORY_ID = c2.id ") //DCA涓�绾ч棶棰樼紪鐮� + .eq(Workorder::getIsdeleted,Constants.ZERO) + .eq(Workorder::getEmailStatus,Constants.ZERO) + .eq(Workorder::getType,Constants.ZERO) + .isNotNull(Workorder::getEmialMemberIds )//閭閫氱煡 + ); + if(list!=null && list.size()>0){ + Date date = new Date(); + String path = systemDictDataBiz.queryByCode(Constants.FTP,Constants.FTP_RESOURCE_PATH).getCode() + +systemDictDataBiz.queryByCode(Constants.FTP,Constants.WORKORDER_FILE_PATH).getCode(); + for(Workorder workorder :list){ + dealEmailBiz(workorder,date,path); + } + } + + }catch (Exception e){ + log.error("==================瀹氭椂鍙戠敓SHE閭欢澶辫触锛�"+e.getMessage()); + }finally { + Constants.WORKORDER_SHE_EMAIL_SENDING = false; + } + + + } + @Transactional + private void dealEmailBiz(Workorder workorder, Date date,String path) { + List<Notices> noticesList = new ArrayList<>(); + int status =1; + String info ="閭宸插彂閫侊細"; + String ids = workorder.getEmialMemberIds(); + List<Member> memberList = getEmailMemberlistByIDs(ids); + if(memberList == null || memberList.size() ==0){ + status = 2; + info ="鏃犳晥鍛樺伐淇℃伅锛屾棤娉曞彂閫侀偖绠�"; + }else{ + List<String> successInfo = new ArrayList<>(); + List<String> errorInfo = new ArrayList<>(); + Map<String,String> contentForm = getEmailContentFormByModel(workorder); + List<String> imgList = getEmailImglistByModel(workorder,path); + for(Member m : memberList){ + if(org.apache.commons.lang3.StringUtils.isNotBlank(m.getEmail())){ + //濡傛灉閭涓嶄负绌猴紝杩涜閭鍙戦�� + successInfo.add(m.getName()+"閭"+m.getEmail()+""); + if( emailService.sendEmailWithImages(m.getEmail(),"SHE浜嬩欢宸ュ崟涓婃姤閫氱煡", contentForm,imgList)){ + Notices notices = new Notices(); + notices.setType(Constants.THREE+""); + notices.setIsdeleted(Constants.ZERO); + notices.setObjId(workorder.getId()); + notices.setTitle("SHE浜嬩欢宸ュ崟涓婃姤閭欢閫氱煡"); + notices.setContent(JSONObject.toJSONString(contentForm)); + notices.setRemark(JSONObject.toJSONString(imgList)); + notices.setObjType(Constants.ZERO+""); + notices.setStatus(Constants.ZERO); + notices.setSendacopy(Constants.ONE); + notices.setMemberId(m.getId()); + noticesList.add(notices); + }else{ + errorInfo.add(m.getName()+"/鏃犻偖绠�"); + } + }else{ + errorInfo.add(m.getName()+"/閭"+m.getEmail()+""); + } + + } + info += "鎴愬姛锛�"+JSONObject.toJSONString(successInfo) +"澶辫触锛�"+JSONObject.toJSONString(errorInfo); + } + + Workorder update = new Workorder(); + update.setId(workorder.getId()); + update.setEmailDate(date); + update.setEmailStatus(status ); + update.setEmailInfo(info); + this.updateById(update);//鏇存柊宸ュ崟閭欢鍙戦�佺姸鎬� + if(noticesList.size()>0){ + noticesMapper.insert(noticesList); + } + } + + private List<String> getEmailImglistByModel(Workorder workorder, String path ) { + List<String> list = new ArrayList<>(); + //鏌ヨ闄勪欢淇℃伅 + List<Multifile> multifileList = multifileMapper.selectList(new QueryWrapper<Multifile>().lambda().eq(Multifile::getIsdeleted,Constants.ZERO) + .eq(Multifile::getObjId,workorder.getId()).orderByAsc(Multifile::getId)); + if(com.github.xiaoymin.knife4j.core.util.CollectionUtils.isNotEmpty(multifileList)){ + for (Multifile multifile:multifileList) { + list.add(path+multifile.getFileurl()); + } + } + return list; + } + + private List<Member> getEmailMemberlistByIDs(String ids) { + List<Member> memberList = new ArrayList<>(); + if(org.apache.commons.lang3.StringUtils.isNotBlank(ids)){ + String[] tt = ids.split(","); + List<Integer> idList =new ArrayList<>(); + if(tt.length>0){ + for(String s :tt){ + try { + idList.add(Integer.parseInt(s)); + }catch (Exception e){ + + } + } + } + if(idList.size()>0){ + memberList = memberMapper.selectList(new QueryWrapper<Member>().lambda() + .eq(Member::getIsdeleted,Constants.ZERO) + .in(Member::getId,idList) + ); + } + } + + return memberList; + } + + private Map<String, String> getEmailContentFormByModel(Workorder workorder) { + Map<String, String> map = new LinkedHashMap<>(); + map.put("涓婃姤浜�",workorder.getMemberName()+"/" +workorder.getCompanyName()); + map.put("涓婃姤鏃堕棿",DateUtil.getPlusTime2(workorder.getSubmitDate())); + map.put("浜嬩欢鍙戠敓鏃堕棿/鍦扮偣",DateUtil.getPlusTime2(workorder.getHappenTime())+"/"+workorder.getLocationName()); + map.put("浼ゅ绫诲瀷", workorder.getTypeName()); + map.put("鏄惁澶栭儴灏卞尰", Constants.equalsInteger(workorder.getOutJiuyi(),Constants.ONE)?"鏄�":"鍚�"); + map.put("鏄惁鍖诲姟瀹�", Constants.equalsInteger(workorder.getIsYiwushi(),Constants.ONE)?"鏄�":"鍚�"); + map.put("鏄惁鍙椾激", Constants.equalsInteger(workorder.getIsHurted(),Constants.ONE)?"鏄�":"鍚�"); + map.put("鏄惁鍜屽伐浣滅浉鍏�", Constants.equalsInteger(workorder.getWorkRelated(),Constants.ONE)?"鏄�":"鍚�"); + map.put("浜嬩欢璇存槑", org.apache.commons.lang3.StringUtils.defaultString(workorder.getEventInfo(),"-")); + return map; + } @Override @Transactional(rollbackFor = {BusinessException.class,Exception.class}) -- Gitblit v1.9.3