From 3e52b995785e0324ad45d198d78686c6b715f761 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期五, 18 四月 2025 16:32:16 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
server/src/main/java/com/doumee/service/business/impl/WorkorderServiceImpl.java | 602 ++++++++++++++++++++++++++++++++++++++++++++++++------
1 files changed, 528 insertions(+), 74 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 d784f22..0507cab 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
@@ -14,6 +14,7 @@
import com.doumee.core.utils.qiyeweixin.model.request.QywxTextCardMsgRequest;
import com.doumee.dao.business.*;
import com.doumee.dao.business.model.*;
+import com.doumee.dao.business.vo.WorkorderIndexNumVO;
import com.doumee.dao.web.dto.*;
import com.doumee.dao.web.vo.WorkOrderDataVO;
import com.doumee.service.business.WorkorderService;
@@ -21,7 +22,10 @@
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 com.sun.corba.se.spi.orbutil.threadpool.Work;
+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 +46,7 @@
* @since 2025/04/02 17:49
*/
@Service
+@Slf4j
public class WorkorderServiceImpl implements WorkorderService {
@Autowired
@@ -55,6 +60,8 @@
@Autowired
private SystemDictDataBiz systemDictDataBiz;
+ @Autowired
+ private EmailService emailService;
@Autowired
private MemberMapper memberMapper;
@@ -73,13 +80,15 @@
@Override
+ @Transactional(rollbackFor = {BusinessException.class,Exception.class})
public Integer create(Workorder workorder) {
this.isValidBaseParam(workorder);
- workorder.setCreateDate(new Date());
workorder.setEditDate(new Date());
workorder.setMemberId(workorder.getMemberId());
workorder.setIsdeleted(Constants.ZERO);
workorder.setCode(this.getNextCode(workorder.getType()));
+ workorder.setEmailStatus(Constants.ZERO);
+ workorder.setCreateDate(new Date());
//澶勭悊浜哄憳绫讳俊鎭�
this.dealNoticeData(workorder);
//澶勭悊SHE浜嬩欢鐘舵��
@@ -115,8 +124,14 @@
* @param csInfo 鎶勯�佷俊鎭�
*/
public void sendQwMsg(Workorder workorder,String qwIds,Member member,String categoryName,Integer contentType,String csInfo){
+ if(Constants.equalsInteger(workorder.getType(),Constants.TWO)){
+ workorder = workorderMapper.selectById(workorder.getDcaRecordId());
+ }
+ 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 = "";
@@ -132,7 +147,12 @@
qywxSendMsgRequest.setTextcard(textCard);
QywxUtil.sendMsg(systemDictDataBiz.queryByCode(Constants.QYWX,Constants.QYWX_TOKEN).getCode(),
qywxSendMsgRequest);
+
+
+ //https://open.weixin.qq.com/connect/oauth2/authorize?appid=${corpId}&redirect_uri=https://dmtest.ahapp.net/lianhelihua_web/&response_type=code&scope=snsapi_base&state={status}#wechat_redirect
}
+
+ private static final String jumpUrl = "https://open.weixin.qq.com/connect/oauth2/authorize?appid={corpId}&redirect_uri={ourUrl}";
/**
@@ -147,6 +167,11 @@
public QywxTextCardMsgRequest dealMessageContent(Workorder workorder,String userName ,String categoryName,Integer contentType,String csInfo){
QywxTextCardMsgRequest textCard = new QywxTextCardMsgRequest();
String message = "";
+ String url = jumpUrl.replace("{corpId}",systemDictDataBiz.queryByCode(Constants.QYWX,Constants.QYWX_CORPID).getCode());
+ String jumpOurUrl = systemDictDataBiz.queryByCode(Constants.QYWX,Constants.JUMP_OUT_URL).getCode().replace("{status}",
+ workorder.getType()+"_"+workorder.getId());
+ textCard.setUrl(url.replace("{ourUrl}",jumpOurUrl));
+ log.error("浼佸井閾炬帴鍦板潃"+url);
if(Constants.equalsInteger(workorder.getType(),Constants.ZERO)){
textCard.setTitle("銆怱HE浜嬩欢涓婃姤銆�");
if(Constants.equalsInteger(workorder.getMemberType(),Constants.ZERO)){
@@ -154,19 +179,20 @@
}else {
message = Constants.equalsInteger(workorder.getMemberType(),Constants.ONE)?"鍚屼簨":"渚涘簲鍟�";
}
- message = message + "-" + workorder.getMemberNames() + " " + DateUtil.formatDate(new Date(),"yyyy-MM-dd HH:mm") + workorder.getLocationName() + categoryName;
- textCard.setDescription(" <div class=\"normal\">"+message+"</div>");
+ message = message + "-" + workorder.getMemberNames() + " " + DateUtil.formatDate(new Date(),"yyyy-MM-dd HH:mm") + "/" +workorder.getLocationName() + "/" + categoryName;
+ textCard.setDescription("<div class=\"normal\">"+message+"</div>");
+
}else{
- textCard.setTitle(Constants.equalsInteger(workorder.getType(),Constants.ONE)?"銆怐CA涓婃姤銆�":"璺岀粖婊戦闄╀笂鎶�");
+ textCard.setTitle(Constants.equalsInteger(workorder.getType(),Constants.ONE)?"銆怐CA涓婃姤銆�":"銆愯穼缁婃粦椋庨櫓涓婃姤銆�");
if(Constants.equalsInteger(workorder.getType(),Constants.THREE)){
message = message + " <div class=\"normal\">"+ (org.apache.commons.lang3.StringUtils.isNotBlank(userName)?userName:"绯荤粺") + (Constants.equalsInteger(contentType,Constants.ZERO)?"浠诲姟鍒嗛厤缁欎綘":(Constants.equalsInteger(contentType,Constants.ONE)?"瀵硅宸ュ崟杩涜浜嗗偓淇冿紝璇峰敖蹇鐞�":"浠诲姟宸插鐞�")) +"</div>";
message = message + " <div class=\"normal\">"+ DateUtil.formatDate(new Date(),"yyyy-MM-dd HH:mm") +"/"+ workorder.getLocationName() +"/"+ categoryName+"</div>";
}else{
- message = message + " <div class=\"normal\">"+ (org.apache.commons.lang3.StringUtils.isNotBlank(userName)?userName:"绯荤粺") + (Constants.equalsInteger(contentType,Constants.ZERO)?"浠诲姟鍒嗛厤缁欎綘":(Constants.equalsInteger(contentType,Constants.ONE)?"瀵硅宸ュ崟杩涜浜嗗偓淇冿紝璇峰敖蹇鐞�":((Constants.equalsInteger(contentType,Constants.TWO)?"鎶勯�佺粰浣�":"宸插鐞嗕竴椤�")))) +"</div>";
- message = message + " <div class=\"normal\">瑙傚療涓婚"+ categoryName +"</div>";
- message = message + " <div class=\"normal\">绗﹀悎锛�"+ workorder.getDcaYesNum() +" 涓嶇鍚堬細"+workorder.getDcaNoNum()+"</div>";
+ message = message + " <div class=\"normal\">"+ (org.apache.commons.lang3.StringUtils.isNotBlank(userName)?userName:"绯荤粺") + (Constants.equalsInteger(contentType,Constants.ZERO)?"浠诲姟鍒嗛厤缁欎綘":(Constants.equalsInteger(contentType,Constants.ONE)?"瀵硅宸ュ崟杩涜浜嗗偓淇冿紝璇峰敖蹇鐞�":((Constants.equalsInteger(contentType,Constants.TWO)?"鎶勯�佺粰浣�":"宸插鐞嗕竴椤�")))) +"</div>";
+ message = message + " <div class=\"normal\">瑙傚療涓婚"+ categoryName +"</div>";
+ message = message + " <div class=\"normal\">绗﹀悎锛�"+ workorder.getDcaYesNum() +" 涓嶇鍚堬細"+workorder.getDcaNoNum()+"</div>";
if(Constants.equalsInteger(contentType,Constants.TWO)){
- message = message + " <div class=\"normal\">璇存槑锛�"+ csInfo +"</div>";
+ message = message + " <div class=\"normal\">璇存槑锛�"+ csInfo +"</div>";
}
}
textCard.setDescription(message);
@@ -180,7 +206,8 @@
if (Constants.equalsInteger(workorder.getType(), Constants.THREE) || Constants.equalsInteger(workorder.getType(), Constants.TWO) ) {
//澶勭悊涓婃姤鏃ュ織 DCA宸ュ崟 鏃ュ織瀛樺偍鑷冲瓙涓氬姟 涓嶅瓨鍦ㄤ簬鐖剁骇 涓庤穼缁婃粦
String logTitle = Constants.equalsInteger(workorder.getType(), Constants.THREE) ? "璺岀粖婊戦闄�" : "DCA";
- this.saveLog(null,workorder,Constants.ZERO,workorder.getMemberId(),workOrderStatus.getLogTitle().replace("{title}",logTitle),null);
+ workorder.setCreateDate(workorder.getSubmitDate());
+ this.saveLog(null,workorder,Constants.ZERO,workorder.getMemberId(),workOrderStatus.getLogTitle().replace("{title}",logTitle),null,null);
}
}
@@ -192,12 +219,15 @@
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());
multifile.setObjType(Constants.multiFileType.upload);
+ multifileMapper.insert(multifile);
}
- multifileMapper.insert(multifileList);
}
}
@@ -207,11 +237,16 @@
* @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)){
+ Integer indexCode = 0 ;
for (DCANoProblemDTO dcaNoProblemDTO:dcaNoProblemDTOList) {
+ indexCode = indexCode + 1;
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());
@@ -226,10 +261,21 @@
dcaWorkOrder.setProblemId(problem.getId());
dcaWorkOrder.setProblemInfo(problem.getRemark());
dcaWorkOrder.setDcaRecordId(workorder.getId());
+ dcaWorkOrder.setHappenTime(workorder.getHappenTime());
+ dcaWorkOrder.setLocaltionId(workorder.getLocaltionId());
+ dcaWorkOrder.setLocationName(workorder.getLocationName());
+ dcaWorkOrder.setSubmitDate(workorder.getSubmitDate());
+ dcaWorkOrder.setCode(workorder.getCode()+"_"+ org.apache.commons.lang3.StringUtils.leftPad(indexCode.toString(),2,"0"));
dcaWorkOrder.setEventInfo(dcaNoProblemDTO.getEventInfo());
+ dcaWorkOrder.setQwnoticeMemberIds(workorder.getQwnoticeMemberIds());
+ dcaWorkOrder.setMemberNames(workorder.getMemberNames());
workorderMapper.insert(dcaWorkOrder);
//瀛樺偍鏃ュ織
this.dealLogData(dcaWorkOrder,workOrderStatus);
+
+ //瀛樺偍寰呭姙浜哄憳淇℃伅
+ this.saveNotice(Arrays.asList(dcaWorkOrder.getQwnoticeMemberIds().split(",")),dcaWorkOrder.getId(),Constants.ZERO,Constants.ZERO);
+
List<Multifile> multifileList = dcaNoProblemDTO.getMultifileList();
if(com.github.xiaoymin.knife4j.core.util.CollectionUtils.isNotEmpty(multifileList)){
for (Multifile multifile:multifileList) {
@@ -241,6 +287,52 @@
multifileMapper.insert(multifileList);
}
}
+ }else{
+ workorder.setStatus(Constants.WorkOrderStatus.sheClose.getKey());
+ workorderMapper.updateById(workorder);
+ }
+
+ //鏌ヨ涓婚涓嬬殑鎵�鏈夎瀵熼」
+ Category type = categoryMapper.selectById(workorder.getTypeId());
+ if(Objects.nonNull(type)){
+ //瀛樺偍DCA宸ュ崟璇︽儏
+ Map<String,Object> detail = new HashMap<>();
+ detail.put("title","瑙傚療涓婚锛�"+type.getName());
+ List<Category> categoryList = categoryMapper.selectList(new QueryWrapper<Category>().lambda().eq(Category::getType,4)
+ .eq(Category::getIsdeleted,Constants.ZERO)
+ .eq(Category::getParentId,workorder.getTypeId()));
+ if(com.github.xiaoymin.knife4j.core.util.CollectionUtils.isNotEmpty(categoryList)){
+ List<Map<String,Object>> childMapList = new ArrayList<>();
+ for (Category category:categoryList) {
+ Map<String,Object> childMap = new HashMap<>();
+ childMap.put("childTitle",category.getName());
+ List<Category> problemList = categoryMapper.selectList(new QueryWrapper<Category>().lambda()
+ .eq(Category::getIsdeleted,Constants.ZERO)
+ .eq(Category::getType,6).eq(Category::getParentId,category.getId()));
+ List<Map<String,Object>> problemMapList = new ArrayList<>();
+ Integer index = Constants.ONE;
+ for (Category problem:problemList) {
+ Map<String,Object> problemMap = new HashMap<>();
+ problemMap.put("title",index + "銆�" + problem.getName());
+ List<DCANoProblemDTO> pList = dcaNoProblemDTOList.stream().filter(i->Constants.equalsInteger(i.getProblemId(),problem.getId())).collect(Collectors.toList());
+ if(pList.size()>Constants.ZERO){
+ DCANoProblemDTO dcaNoProblemDTO = pList.get(Constants.ZERO);
+ problemMap.put("status",Constants.TWO);
+ problemMap.put("eventInfo","涓嶇鍚堝師鍥狅細"+dcaNoProblemDTO.getEventInfo());
+ problemMap.put("imgList",dcaNoProblemDTO.getMultifileList().stream().map(i->i.getFileurl()).collect(Collectors.joining(",")));
+ }else{
+ problemMap.put("status",Constants.ONE);
+ }
+ index = index + Constants.ONE;
+ problemMapList.add(problemMap);
+ }
+ childMap.put("problemMapList",problemMapList);
+ childMapList.add(childMap);
+ }
+ detail.put("childMapList",childMapList);
+ }
+ workorder.setRemark(JSONObject.toJSONString(detail));
+ workorderMapper.updateById(workorder);
}
}
}
@@ -259,10 +351,31 @@
workorder.setMemberNames(memberList.stream().map(i->i.getName()).collect(Collectors.joining(",")));
}
}
- //璺岀粖婊戜簨浠朵笂鎶� 鏌ヨSHE璐熻矗浜�
+
+ if(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.THREE).orderByAsc(Managers::getSortnum)
+ );
+ if(Objects.isNull(managersList)){
+ throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"鏈煡璇㈠埌SHE澶勭悊鎶勯�佷汉鍛�");
+ }
+ if(com.github.xiaoymin.knife4j.core.util.CollectionUtils.isNotEmpty(managersList)){
+ 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().filter(i->Constants.equalsInteger(i.getIsEmail(),Constants.ONE)).map(i->i.getMemberId().toString()).collect(Collectors.joining(",")));
+ }
+ }
+ }
+
+ //璺岀粖婊戜簨浠朵笂鎶� \ DCA 鏌ヨSHE璐熻矗浜�
if(Constants.equalsInteger(workorder.getType(),Constants.THREE) || Constants.equalsInteger(workorder.getType(),Constants.ONE)){
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)
@@ -271,14 +384,15 @@
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(",")));
- if(Constants.equalsInteger(workorder.getType(),Constants.ZERO)){
- workorder.setEmialMemberIds(managersList.stream().map(i->i.getMemberId().toString()).collect(Collectors.joining(",")));
+ workorder.setQwnoticeMemberIds(managersList.stream().map(i->i.getQwId()).collect(Collectors.joining(",")));
+ List<Member> memberList = memberMapper.selectList(new QueryWrapper<Member>().lambda().eq(Member::getIsdeleted,Constants.ZERO)
+ .in(Member::getQwId,workorder.getQwnoticeMemberIds().split(",")));
+ if(com.github.xiaoymin.knife4j.core.util.CollectionUtils.isNotEmpty(memberList)){
+ workorder.setMemberNames(memberList.stream().map(i->i.getName()).collect(Collectors.joining(",")));
}
+
}
}
-
-
}
@@ -288,15 +402,17 @@
* @param afterWorkorder
* @param objType 鎿嶄綔绫诲瀷 0浠诲姟涓婃姤 1浠诲姟鍒嗛厤鐗╀笟涓荤 2浠诲姟鍒嗛厤澶勭悊浜� 3浠诲姟澶勭悊鍏抽棴 4浠诲姟鍌績
* @param memberId
+ * @param paramr2 杞氦缁欑殑澶勭悊浜�
*/
- public Integer saveLog(String beforeJson,Workorder afterWorkorder,Integer objType,Integer memberId,String title,String content){
+ public Integer saveLog(String beforeJson,Workorder afterWorkorder,Integer objType,Integer memberId,String title,String content,String paramr2){
WorkorderLog workorderLog = new WorkorderLog();
- workorderLog.setCreateDate(new Date());
- workorderLog.setEditDate(new Date());
+ workorderLog.setCreateDate(afterWorkorder.getCreateDate());
+ workorderLog.setEditDate(afterWorkorder.getCreateDate());
workorderLog.setIsdeleted(Constants.ZERO);
workorderLog.setBeforeContent(beforeJson);
workorderLog.setAfterContent(JSONObject.toJSONString(afterWorkorder));
workorderLog.setParam1(memberId.toString());
+ workorderLog.setParam2(paramr2);
workorderLog.setObjId(afterWorkorder.getId().toString());
workorderLog.setObjType(objType);
workorderLog.setTitle(title);
@@ -346,7 +462,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);
}
@@ -365,7 +481,7 @@
}
@Override
- public Workorder getDetail(Integer id){
+ public Workorder getDetail(Integer id,Member member){
Workorder workorder = workorderMapper.selectJoinOne(Workorder.class,
new MPJLambdaWrapper<Workorder>()
.selectAll(Workorder.class)
@@ -373,6 +489,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 ") //椋庨櫓绫诲瀷
@@ -380,46 +497,118 @@
.eq(Workorder::getId,id)
.last(" limit 1 ")
);
- if(Objects.nonNull(workorder)){
- //鏌ヨ闄勪欢淇℃伅
- 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));
+ String path = systemDictDataBiz.queryByCode(Constants.FTP,Constants.FTP_RESOURCE_PATH).getCode()
+ +systemDictDataBiz.queryByCode(Constants.FTP,Constants.WORKORDER_FILE_PATH).getCode();
+
+ workorder.setPath(path);
+ if(com.github.xiaoymin.knife4j.core.util.CollectionUtils.isNotEmpty(multifileList)){
+ for (Multifile multifile:multifileList) {
+ multifile.setFileurlFull(path+multifile.getFileurl());
+ }
+ workorder.setMultifileList(multifileList);
+ }
+
//鏌ヨ鏃ュ織淇℃伅
- workorder.setLogList(this.getLogList(workorder.getId()));
+ workorder.setLogList(this.getLogList(workorder,member));
if(Constants.equalsInteger(workorder.getType(),Constants.ONE)){
//濡傛灉鏄疍CA鎻愪氦璁板綍锛屾煡璇㈠瓙宸ュ崟闆嗗悎
Workorder param = new Workorder();
param.setIsdeleted(Constants.ZERO);
param.setDcaRecordId(workorder.getId());
- workorder.setDcaChildList(findList(param));
+ List<Workorder> dcaChildList = findList(param);
+ for (Workorder dcaChild:dcaChildList) {
+ this.dealButton(dcaChild,member);
+ }
+
+ workorder.setDcaChildList(dcaChildList);
}
return workorder;
}
+ public void dealButton(Workorder workorder,Member member){
+ workorder.setPassOnButton(Constants.ZERO);
+ workorder.setCloseButton(Constants.ZERO);
+ if(member!=null && org.apache.commons.lang3.StringUtils.isNotBlank(member.getQwId())){
+ List<String> closeUserList = new ArrayList<>();
+ if(org.apache.commons.lang3.StringUtils.isNotBlank(workorder.getQwnoticeMemberIds())&&
+ (Constants.equalsInteger(workorder.getStatus(),Constants.ZERO)||
+ Constants.equalsInteger(workorder.getStatus(),Constants.ONE)||Constants.equalsInteger(workorder.getStatus(),Constants.TWO))){
+ closeUserList.addAll(Arrays.asList(workorder.getQwnoticeMemberIds().split(",")));
+ }
+ if(org.apache.commons.lang3.StringUtils.isNotBlank(workorder.getManagerId())&&
+ (Constants.equalsInteger(workorder.getStatus(),Constants.ONE)||Constants.equalsInteger(workorder.getStatus(),Constants.TWO))){
+ closeUserList.add(workorder.getManagerId());
+ }
+ if(org.apache.commons.lang3.StringUtils.isNotBlank(workorder.getDealerId())&&
+ (Constants.equalsInteger(workorder.getStatus(),Constants.TWO))){
+ closeUserList.add(workorder.getDealerId());
+ }
+ if(com.github.xiaoymin.knife4j.core.util.CollectionUtils.isNotEmpty(closeUserList)){
+ 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<>();
+ //寰呭垎閰嶇姸鎬� 澶勭悊杞氦鎸夐挳
+ if(Constants.equalsInteger(workorder.getStatus(),Constants.WorkOrderStatus.waitConfirm.getKey())
+ ){
+ passOnUserList.addAll(Arrays.asList(workorder.getQwnoticeMemberIds().split(",")));
+ }
+ if(Constants.equalsInteger(workorder.getStatus(),Constants.WorkOrderStatus.waitAllocation.getKey())
+ || Constants.equalsInteger(workorder.getStatus(),Constants.WorkOrderStatus.waitDeal.getKey())
+ ){
+ passOnUserList.add(workorder.getManagerId());
+ }
+ if(com.github.xiaoymin.knife4j.core.util.CollectionUtils.isNotEmpty(passOnUserList)){
+ workorder.setPassOnButton(passOnUserList.stream().filter(i->i.equals(member.getQwId())).collect(Collectors.toList()).size()>Constants.ZERO?Constants.ONE:Constants.ZERO);
+ }
+ }
- public List<WorkorderLog> getLogList(Integer orderId){
+ }
+
+
+ public List<WorkorderLog> getLogList(Workorder workorder,Member loginMember){
List<WorkorderLog> logList = workorderLogMapper.selectJoinList(WorkorderLog.class,
new MPJLambdaWrapper<WorkorderLog>()
.selectAll(WorkorderLog.class)
.selectAs(Member::getName,WorkorderLog::getUserName)
.selectAs(Member::getCompanyName,WorkorderLog::getCompanyName)
.leftJoin(Member.class,Member::getId,WorkorderLog::getParam1)
- .eq(WorkorderLog::getObjId,orderId)
- .orderByAsc(WorkorderLog::getId)
+ .eq(WorkorderLog::getObjId,workorder.getId())
+ .orderByDesc(WorkorderLog::getId)
);
+
if(com.github.xiaoymin.knife4j.core.util.CollectionUtils.isNotEmpty(logList)){
String path = systemDictDataBiz.queryByCode(Constants.FTP,Constants.FTP_RESOURCE_PATH).getCode()
- +systemDictDataBiz.queryByCode(Constants.FTP,Constants.WORKORDER_FILE_PATH).getCode();
+ +systemDictDataBiz.queryByCode(Constants.FTP,Constants.WORKORDER_LOG_FILE_PATH).getCode();
+ Boolean canOpenUrgeButton = true;
for (WorkorderLog workorderLog:logList) {
+ workorderLog.setUrgeButton(Constants.ZERO);
+ //鐗╀笟涓荤澶勭悊涓�
+ if(Constants.equalsInteger(workorder.getStatus(),Constants.ONE)){
+ Member member = memberMapper.selectById(workorderLog.getParam1());
+ if(Objects.nonNull(member) && org.apache.commons.lang3.StringUtils.isNotBlank(member.getQwId())
+ && Objects.nonNull(loginMember) && Constants.equalsInteger(member.getId(),loginMember.getId())
+ && workorder.getQwnoticeMemberIds().indexOf(member.getQwId())>=Constants.ZERO){
+ workorderLog.setUrgeButton(Constants.ONE);
+ }
+ }
+ //宸ョ▼甯堝鐞嗕腑
+ if(Constants.equalsInteger(workorder.getStatus(),Constants.TWO)){
+ Member member = memberMapper.selectById(workorderLog.getParam1());
+ if(Objects.nonNull(member) && org.apache.commons.lang3.StringUtils.isNotBlank(member.getQwId())
+ && canOpenUrgeButton
+ && (workorder.getQwnoticeMemberIds().indexOf(member.getQwId()) >= Constants.ZERO || member.getQwId().equals(workorder.getManagerId()) )
+ ){
+ workorderLog.setUrgeButton(Constants.ONE);
+ canOpenUrgeButton = false;
+ }
+ }
//鏌ヨ闄勪欢淇℃伅
List<Multifile> multifileList = multifileMapper.selectList(new QueryWrapper<Multifile>().lambda()
.eq(Multifile::getIsdeleted,Constants.ZERO)
@@ -501,9 +690,21 @@
.selectAs(Member::getPhone,Workorder::getMemberPhone)
.select(" c2.name ",Workorder::getCategoryName)
.select(" c3.name ",Workorder::getTypeName)
+ .select(" c3.name_path ",Workorder::getTypeNamePath)
.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 )) ")
+ .ne(org.apache.commons.lang3.StringUtils.isNotBlank(pageWrap.getQwId()),Workorder::getType,Constants.TWO)
+ .in(Objects.nonNull(pageWrap.getDealStatus())&&
+ Constants.equalsInteger(pageWrap.getDealStatus(),Constants.ZERO),
+ Workorder::getStatus,Constants.WorkOrderStatus.waitConfirm.getKey(),Constants.WorkOrderStatus.waitAllocation.getKey(),Constants.WorkOrderStatus.waitDeal.getKey())
+ .in(Objects.nonNull(pageWrap.getDealStatus())&&
+ Constants.equalsInteger(pageWrap.getDealStatus(),Constants.ONE),
+ Workorder::getStatus,Constants.WorkOrderStatus.sheClose.getKey(),Constants.WorkOrderStatus.close.getKey(),Constants.WorkOrderStatus.wtsClose.getKey())
.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()))
@@ -550,12 +751,13 @@
.eq( pageWrap.getDcaYesNum() != null, Workorder::getDcaYesNum, pageWrap.getDcaYesNum())
.eq( pageWrap.getDcaNoNum() != null, Workorder::getDcaNoNum, pageWrap.getDcaNoNum())
.eq( pageWrap.getDcaRecordId() != null, Workorder::getDcaRecordId, pageWrap.getDcaRecordId())
+ .likeRight( pageWrap.getTypeIdPath() != null,"c3.id_path", pageWrap.getTypeIdPath())
.eq( pageWrap.getDcaCsIds() != null, Workorder::getDcaCsIds, pageWrap.getDcaCsIds()) ;
if ( pageWrap.getMemberName() != null) {
queryWrapper.and( ms->ms.like(Member::getName, pageWrap.getMemberName())
.or().like(Member::getPhone, pageWrap.getMemberName()) );
}
- queryWrapper.orderByDesc(Workorder::getProblemId);
+ queryWrapper.orderByDesc(Workorder::getId);
return queryWrapper;
}
@@ -582,9 +784,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");
@@ -606,7 +810,7 @@
if(Objects.isNull(closeDTO)
|| Objects.isNull(closeDTO.getWorkorderId())
|| org.apache.commons.lang3.StringUtils.isBlank(closeDTO.getInfo())
- || com.github.xiaoymin.knife4j.core.util.CollectionUtils.isNotEmpty(closeDTO.getMultifileList())){
+ || com.github.xiaoymin.knife4j.core.util.CollectionUtils.isEmpty(closeDTO.getMultifileList())){
throw new BusinessException(ResponseStatus.BAD_REQUEST);
}
Workorder workorder = workorderMapper.selectById(closeDTO.getWorkorderId());
@@ -637,7 +841,7 @@
throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"瀵逛笉璧凤紝褰撳墠宸ュ崟闈炴偍鐨勫伐鍗曪紝鏃犳硶杩涜澶勭悊");
}
workorder.setStatus(Constants.WorkOrderStatus.wtsClose.getKey());
- qwIds = Arrays.asList(workorder.getQwnoticeMemberIds());
+ qwIds.addAll(Arrays.asList(workorder.getQwnoticeMemberIds().split(",")));
qwIds.add(workorder.getManagerId());
qwIds.remove(closeDTO.getMember().getQwId());
}else if(Constants.equalsInteger(workorder.getStatus(),Constants.WorkOrderStatus.waitDeal.getKey())){
@@ -647,7 +851,7 @@
throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"瀵逛笉璧凤紝褰撳墠宸ュ崟闈炴偍鐨勫伐鍗曪紝鏃犳硶杩涜澶勭悊");
}
workorder.setStatus(Constants.WorkOrderStatus.wtsClose.getKey());
- qwIds = Arrays.asList(workorder.getQwnoticeMemberIds());
+ qwIds.addAll(Arrays.asList(workorder.getQwnoticeMemberIds().split(",")));
qwIds.add(workorder.getDealerId());
qwIds.remove(closeDTO.getMember().getQwId());
}else{
@@ -658,15 +862,16 @@
workorder.setDealInfo(closeDTO.getInfo());
workorderMapper.updateById(workorder);
//澶勭悊涓婃姤鏃ュ織
- Integer logId = this.saveLog(beforeJson,workorder,Constants.THREE,workorder.getMemberId(),"浠诲姟宸插鐞�",closeDTO.getInfo());
- List<Multifile> multifileList = workorder.getMultifileList();
+ Integer logId = this.saveLog(beforeJson,workorder,Constants.THREE,workorder.getMemberId(),"浠诲姟宸插鐞�",closeDTO.getInfo(),null);
+ List<Multifile> multifileList = closeDTO.getMultifileList();
if(com.github.xiaoymin.knife4j.core.util.CollectionUtils.isNotEmpty(multifileList)){
for (Multifile multifile:multifileList) {
multifile.setObjId(logId);
+ multifile.setIsdeleted(Constants.ZERO);
multifile.setCreateDate(new Date());
multifile.setObjType(Constants.multiFileType.deal);
+ multifileMapper.insert(multifile);
}
- multifileMapper.insert(multifileList);
}
//鍙戦�佷紒寰�氱煡
if(com.github.xiaoymin.knife4j.core.util.CollectionUtils.isNotEmpty(qwIds)){
@@ -686,11 +891,11 @@
public void passOn(PassOnDTO passOnDTO){
if(Objects.isNull(passOnDTO)
|| Objects.isNull(passOnDTO.getWorkorderId())
- || Objects.isNull(passOnDTO.getPassOnUserId())
+ || org.apache.commons.lang3.StringUtils.isBlank(passOnDTO.getPassOnUserId())
){
throw new BusinessException(ResponseStatus.BAD_REQUEST);
}
- Member member = memberMapper.selectById(passOnDTO.getPassOnUserId());
+ Member member = memberMapper.selectOne(new QueryWrapper<Member>().lambda().eq(Member::getQwId,passOnDTO.getPassOnUserId()));
if(Objects.isNull(member)){
throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(),"鏈煡璇㈠埌琚浆浜や汉淇℃伅");
}
@@ -717,13 +922,14 @@
workorder.setStatus(Constants.WorkOrderStatus.waitDeal.getKey());
}
workorder.setEditDate(new Date());
- workorder.setUrgeDate(DateUtil.afterHoursDate(new Date(),24));
+ workorder.setUrgeDate(DateUtil.afterMinutesDate(new Date(),2));
workorderMapper.updateById(workorder);
+ String paramr2 = member.getCompanyName()+"/"+member.getName();
//澶勭悊涓婃姤鏃ュ織
Integer logId = this.saveLog(beforeJson,workorder,
Constants.equalsInteger(passOnDTO.getPassOnType(),Constants.ZERO)?Constants.ONE:Constants.TWO
- ,workorder.getMemberId(),"浠诲姟鍒嗛厤",passOnDTO.getInfo());
- List<Multifile> multifileList = workorder.getMultifileList();
+ ,workorder.getMemberId(),"浠诲姟鍒嗛厤",passOnDTO.getInfo(),paramr2);
+ List<Multifile> multifileList = passOnDTO.getMultifileList();
if(com.github.xiaoymin.knife4j.core.util.CollectionUtils.isNotEmpty(multifileList)){
for (Multifile multifile:multifileList) {
multifile.setObjId(logId);
@@ -737,10 +943,12 @@
Category category = categoryMapper.selectById(workorder.getTypeId());
if(Objects.nonNull(passOnDTO.getMember())&&Objects.nonNull(category)){
// 鍙戦�佷紒寰�氱煡
- this.sendQwMsg(workorder,member.getQwId(),passOnDTO.getMember(),category.getName(),Constants.ZERO,null);
+ this.sendQwMsg(workorder,passOnDTO.getPassOnUserId(),passOnDTO.getMember(),category.getName(),Constants.ZERO,null);
}
//瀛樺偍寰呭姙浜哄憳淇℃伅
- this.saveNotice(Arrays.asList(passOnDTO.getMember().getQwId().split(",")),workorder.getId(),Constants.ZERO,Constants.TWO);
+ this.saveNotice(Arrays.asList(passOnDTO.getPassOnUserId().split(",")),
+ Constants.equalsInteger(workorder.getType(),Constants.TWO)?workorder.getDcaRecordId():workorder.getId(),Constants.ZERO,Constants.TWO);
+
}
@@ -757,18 +965,162 @@
}
List<Member> memberList = memberMapper.selectList(new QueryWrapper<Member>().lambda().eq(Member::getIsdeleted, Constants.ZERO)
.isNotNull(Member::getQwId)
- .in(Member::getId, sendCopyDTO.getUserIds().split(",")));
+ .in(Member::getQwId, sendCopyDTO.getUserIds().split(",")));
if (com.github.xiaoymin.knife4j.core.util.CollectionUtils.isNotEmpty(memberList)) {
List<String> qwIdList = memberList.stream().map(i -> i.getQwId()).collect(Collectors.toList());
Category category = categoryMapper.selectById(workorder.getTypeId());
if (Objects.nonNull(category)) {
// 鍙戦�佷紒寰�氱煡
- this.sendQwMsg(workorder, String.join(",", qwIdList), sendCopyDTO.getMember(), category.getName(), Constants.ONE, null);
+ this.sendQwMsg(workorder, String.join(",", qwIdList), sendCopyDTO.getMember(), category.getName(), Constants.TWO, sendCopyDTO.getInfo());
}
//瀛樺偍寰呭姙淇℃伅
- this.saveNotice(qwIdList, workorder.getId(), Constants.ONE, Constants.ONE);
+ this.saveNotice(qwIdList, Constants.equalsInteger(workorder.getType(),Constants.TWO)?workorder.getDcaRecordId():workorder.getId(), Constants.ONE, Constants.ONE);
}
+ }
+ @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.getCompanyName()+"/" +workorder.getMemberName());
+ 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
@@ -776,7 +1128,7 @@
public void urge(Integer workorderId,Member member){
Workorder workorder = workorderMapper.selectById(workorderId);
workorder.setEditDate(new Date());
- workorder.setUrgeDate(DateUtil.afterHoursDate(new Date(),24));
+ workorder.setUrgeDate(DateUtil.afterMinutesDate(new Date(),2));//DateUtil.afterHoursDate(new Date(),24));
workorderMapper.updateById(workorder);
if(Objects.isNull(workorder)){
throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(),"鏈煡璇㈠埌宸ュ崟鏁版嵁");
@@ -785,20 +1137,20 @@
//濡傛灉宸插垎閰� wts 鍒欐槸鍌績wts
if(Constants.equalsInteger(workorder.getStatus(),Constants.WorkOrderStatus.waitAllocation.getKey())){
urgeUser = memberMapper.selectOne(new QueryWrapper<Member>().lambda().eq(Member::getIsdeleted,Constants.ZERO).eq(Member::getQwId,workorder.getManagerId()).last("limit 1 "));
- }else if(Constants.equalsInteger(workorder.getStatus(),Constants.WorkOrderStatus.waitAllocation.getKey())){
+ }else if(Constants.equalsInteger(workorder.getStatus(),Constants.WorkOrderStatus.waitDeal.getKey())){
urgeUser = memberMapper.selectOne(new QueryWrapper<Member>().lambda().eq(Member::getIsdeleted,Constants.ZERO).eq(Member::getQwId,workorder.getDealerId()).last("limit 1 "));
}else{
throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(),"鐘舵�佸凡娴佽浆鏃犳硶杩涜璇ユ搷浣�");
}
this.saveLog(null,workorder,
- Constants.ONE
- ,member.getId(),"鍌績","宸插偓淇� "+urgeUser.getCompanyName() + "/" + urgeUser.getName());
+ Constants.FOUR
+ ,member.getId(),"鍌績","宸插偓淇� "+urgeUser.getCompanyName() + "/" + urgeUser.getName(),null);
//鍙戦�佷紒寰�氱煡
Category category = categoryMapper.selectById(workorder.getTypeId());
if(Objects.nonNull(category)){
// 鍙戦�佷紒寰�氱煡
- this.sendQwMsg(workorder,urgeUser.getQwId(),null,category.getName(),Constants.ONE,null);
+ this.sendQwMsg(workorder,urgeUser.getQwId(),member,category.getName(),Constants.ONE,null);
}
}
@@ -813,7 +1165,7 @@
for (Workorder workorder:workorderList) {
this.autoUrge(workorder);
workorder.setEditDate(new Date());
- workorder.setUrgeDate(DateUtil.afterHoursDate(new Date(),24));
+ workorder.setUrgeDate(DateUtil.afterMinutesDate(new Date(),2));//DateUtil.afterHoursDate(new Date(),24));
workorderMapper.updateById(workorder);
}
}
@@ -843,7 +1195,7 @@
}
- public void saveNotice(List<String> qwIdList ,Integer workorderId,Integer isSendCopy,Integer type){
+ public void saveNotice(List<String> qwIdList , Integer workorderId, Integer isSendCopy, Integer type){
List<Notices> noticesList = new ArrayList<>();
for (String qwId:qwIdList) {
//瀛樺偍鎶勯�佽褰�
@@ -871,13 +1223,15 @@
* @throws Exception
*/
@Override
- public List<WorkOrderDataVO> getWorkOrderData(OrderDataDTO orderDataDTO) throws Exception {
+ public List<WorkOrderDataVO> getWorkOrderData(OrderDataDTO orderDataDTO) {
if (Objects.isNull(orderDataDTO.getQueryType())||Objects.isNull(orderDataDTO.getOrderType())) {
throw new BusinessException(ResponseStatus.BAD_REQUEST);
}
String year = DateUtil.getNowYear();
- Integer nowMonth = DateUtil.getNowMonth();
- Integer quarter = (nowMonth - 1) / 3 + 1;
+// Integer nowMonth = DateUtil.getNowMonth();
+ Integer nowMonth = 12;
+// Integer quarter = (nowMonth - 1) / 3 + 1;
+ Integer quarter =4;
List<WorkOrderDataVO> workOrderDataVOList = new ArrayList<>();
//鏌ヨ浠婂勾鎵�鏈夌殑鏁版嵁
List<Workorder> workorderList = workorderMapper.selectJoinList(Workorder.class,new MPJLambdaWrapper<Workorder>()
@@ -892,17 +1246,25 @@
if(Constants.equalsInteger(orderDataDTO.getQueryType(),Constants.ZERO)){
for (int i = 1 ; i <= nowMonth; i++) {
WorkOrderDataVO workOrderDataVO = new WorkOrderDataVO();
- String monthDay = year + "-" + org.apache.commons.lang3.StringUtils.leftPad(nowMonth.toString(),2,"0");
+ String monthDay = year + "-" + org.apache.commons.lang3.StringUtils.leftPad(i+"",2,"0");
List<Workorder> dataList = workorderList.stream().filter(j->DateUtil.formatDate(j.getCreateDate(),"yyyy-MM").equals(monthDay))
.collect(Collectors.toList());
- workOrderDataVO.setDateStr(monthDay);
+ workOrderDataVO.setDateStr(i+"鏈�");
workOrderDataVO.setGcsTotal(Constants.ZERO);
workOrderDataVO.setWtsTotal(Constants.ZERO);
workOrderDataVO.setSheTotal(Constants.ZERO);
+ workOrderDataVO.setDcaNoTotal(Constants.ZERO);
+ workOrderDataVO.setDcaYesTotal(Constants.ZERO);
workOrderDataVO.setUnCloseTotal(Constants.ZERO);
workOrderDataVO.setTotal(Constants.ZERO);
if(com.github.xiaoymin.knife4j.core.util.CollectionUtils.isNotEmpty(dataList)){
workOrderDataVO.setTotal(dataList.size());
+ for(Workorder e :dataList){
+ if(Constants.equalsInteger(e.getType(),Constants.ONE)){
+ workOrderDataVO.setDcaYesTotal(workOrderDataVO.getDcaYesTotal()+Constants.formatIntegerNum(e.getDcaYesNum()));//DCA绗﹀悎椤�
+ workOrderDataVO.setDcaNoTotal(workOrderDataVO.getDcaNoTotal()+Constants.formatIntegerNum(e.getDcaNoNum()));//DCA涓嶇鍚堥」
+ }
+ }
workOrderDataVO.setGcsTotal(dataList.stream().filter(j->Constants.equalsInteger(j.getStatus(),Constants.WorkOrderStatus.close.getKey())).collect(Collectors.toList()).size());
workOrderDataVO.setSheTotal(dataList.stream().filter(j->Constants.equalsInteger(j.getStatus(),Constants.WorkOrderStatus.sheClose.getKey())).collect(Collectors.toList()).size());
workOrderDataVO.setWtsTotal(dataList.stream().filter(j->Constants.equalsInteger(j.getStatus(),Constants.WorkOrderStatus.wtsClose.getKey())).collect(Collectors.toList()).size());
@@ -934,7 +1296,16 @@
workOrderDataVO.setSheTotal(Constants.ZERO);
workOrderDataVO.setUnCloseTotal(Constants.ZERO);
workOrderDataVO.setTotal(Constants.ZERO);
+ workOrderDataVO.setDcaNoTotal(Constants.ZERO);
+ workOrderDataVO.setDcaYesTotal(Constants.ZERO);
+
if(com.github.xiaoymin.knife4j.core.util.CollectionUtils.isNotEmpty(dataList)){
+ for(Workorder e :dataList){
+ if(Constants.equalsInteger(e.getType(),Constants.ONE)){
+ workOrderDataVO.setDcaYesTotal(workOrderDataVO.getDcaYesTotal()+Constants.formatIntegerNum(e.getDcaYesNum()));//DCA绗﹀悎椤�
+ workOrderDataVO.setDcaNoTotal(workOrderDataVO.getDcaNoTotal()+Constants.formatIntegerNum(e.getDcaNoNum()));//DCA涓嶇鍚堥」
+ }
+ }
workOrderDataVO.setTotal(dataList.size());
workOrderDataVO.setGcsTotal(dataList.stream().filter(j->Constants.equalsInteger(j.getStatus(),Constants.WorkOrderStatus.close.getKey())).collect(Collectors.toList()).size());
workOrderDataVO.setSheTotal(dataList.stream().filter(j->Constants.equalsInteger(j.getStatus(),Constants.WorkOrderStatus.sheClose.getKey())).collect(Collectors.toList()).size());
@@ -942,11 +1313,94 @@
workOrderDataVO.setUnCloseTotal(workOrderDataVO.getTotal() - workOrderDataVO.getSheTotal() - workOrderDataVO.getWtsTotal() - workOrderDataVO.getGcsTotal());
}
workOrderDataVOList.add(workOrderDataVO);
-
}
}
return workOrderDataVOList;
}
+ /**
+ * SHE / 璺岀粖婊戞姤琛�
+ * @return
+ * @throws Exception
+ */
+ @Override
+ public WorkorderIndexNumVO getIndexData(Workorder workorder) {
+ WorkorderIndexNumVO model = new WorkorderIndexNumVO();
+ List<WorkOrderDataVO> workOrderDataVOList = new ArrayList<>();
+ //鏌ヨ浠婂勾鎵�鏈夌殑鏁版嵁
+ List<Workorder> list = workorderMapper.selectJoinList(Workorder.class,new MPJLambdaWrapper<Workorder>()
+ .select("type,count(id) as num")
+ .eq(Workorder::getIsdeleted,Constants.ZERO)
+ .groupBy(Workorder::getType ));
+ if(list !=null){
+ for(Workorder w : list){
+ if(Constants.equalsInteger(w.getType(),Constants.ZERO)){
+ //SHE
+ model.setSheNum(Constants.formatLongNum(w.getNum()));
+ }else if(Constants.equalsInteger(w.getType(),Constants.ONE)){
+ //DCA鎻愪氦鏁�
+ model.setDcaNum(Constants.formatLongNum(w.getNum()));
+ }else if(Constants.equalsInteger(w.getType(),Constants.TWO)){
+ //DCA瀛愬伐鍗�
+ model.setDcaChildNum(Constants.formatLongNum(w.getNum()));
+ }else if(Constants.equalsInteger(w.getType(),Constants.THREE)){
+ //璺岀粖婊�
+ model.setDbhNum(Constants.formatLongNum(w.getNum()));
+ }
+ }
+ }
+ List<Workorder> todays = workorderMapper.selectJoinList(Workorder.class,new MPJLambdaWrapper<Workorder>()
+ .select("type,count(id) as num")
+ .eq(Workorder::getIsdeleted,Constants.ZERO)
+ .apply("to_days(create_date)=to_days(now())")
+ .groupBy(Workorder::getType ));
+ if(todays !=null){
+ for(Workorder w : todays){
+ if(Constants.equalsInteger(w.getType(),Constants.ZERO)){
+ //SHE
+ model.setTodaySheNum(Constants.formatLongNum(w.getNum()));
+ }else if(Constants.equalsInteger(w.getType(),Constants.ONE)){
+ //DCA鎻愪氦鏁�
+ model.setTodayDcaNum(Constants.formatLongNum(w.getNum()));
+ }else if(Constants.equalsInteger(w.getType(),Constants.TWO)){
+ //DCA瀛愬伐鍗�
+ model.setTodayDcaChildNum(Constants.formatLongNum(w.getNum()));
+ }else if(Constants.equalsInteger(w.getType(),Constants.THREE)){
+ //璺岀粖婊�
+ model.setTodayDbhNum(Constants.formatLongNum(w.getNum()));
+ }
+ }
+ }
+
+ List<Workorder> yeslist = workorderMapper.selectJoinList(Workorder.class,new MPJLambdaWrapper<Workorder>()
+ .select("type,count(id) as num")
+ .eq(Workorder::getIsdeleted,Constants.ZERO)
+ .in(Workorder::getStatus,Constants.THREE,Constants.FOUR,Constants.FIVE)
+ .in(Workorder::getType,Constants.THREE,Constants.TWO)
+ .groupBy(Workorder::getType ));
+ if(yeslist !=null){
+ for(Workorder w : yeslist){
+ if(Constants.equalsInteger(w.getType(),Constants.TWO)){
+ //DCA瀛愬伐鍗曞凡瑙ｅ喅鍜屾湭瑙ｅ喅
+ model.setDcaChildYesNum(Constants.formatLongNum(w.getNum()));
+ model.setDcaChildNoNum(Constants.formatLongNum(model.getDcaChildNum()) -model.getDcaChildYesNum());
+ }else if(Constants.equalsInteger(w.getType(),Constants.THREE)){
+ //璺岀粖婊戝凡瑙ｅ喅鍜屾湭瑙ｅ喅
+ model.setDbhYesNum(Constants.formatLongNum(w.getNum()));
+ model.setDbhNoNum(Constants.formatLongNum(model.getDbhNum()) -model.getDbhYesNum());
+ }
+ }
+ }
+ Workorder dcaList = workorderMapper.selectJoinOne(Workorder.class,new MPJLambdaWrapper<Workorder>()
+ .select("sum(dca_yes_num) as dcaYesNum,sum(dca_no_num) as dcaNoNum")
+ .eq(Workorder::getIsdeleted,Constants.ZERO)
+ .eq(Workorder::getType,Constants.ONE) );
+ if(dcaList !=null){
+ //DCA绗﹀悎椤瑰拰涓嶇鍚堥」缁熻
+ model.setDcaYesNum((long)Constants.formatIntegerNum(dcaList.getDcaYesNum()));
+ model.setDcaNoNum((long)Constants.formatIntegerNum(dcaList.getDcaNoNum()));
+ }
+ return model;
+ }
--
Gitblit v1.9.3