From 9f7777c83f2d07c8d83c506ab2a13bc543f47de9 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期四, 10 四月 2025 11:08:25 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
server/src/main/java/com/doumee/service/business/impl/WorkorderServiceImpl.java | 541 +++++++++++++++++++++++++++++++++++++++++++++++------
1 files changed, 477 insertions(+), 64 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 a89cd1a..659e1f3 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
@@ -7,9 +7,15 @@
import com.doumee.core.exception.BusinessException;
import com.doumee.core.model.PageData;
import com.doumee.core.model.PageWrap;
+import com.doumee.core.utils.DateUtil;
import com.doumee.core.utils.Utils;
+import com.doumee.core.utils.qiyeweixin.QywxUtil;
import com.doumee.dao.business.*;
import com.doumee.dao.business.model.*;
+import com.doumee.dao.web.dto.CloseDTO;
+import com.doumee.dao.web.dto.DCANoProblemDTO;
+import com.doumee.dao.web.dto.PassOnDTO;
+import com.doumee.dao.web.vo.WorkOrderDataVO;
import com.doumee.service.business.WorkorderService;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
@@ -18,14 +24,16 @@
import com.github.yulichang.wrapper.MPJLambdaWrapper;
import org.apache.catalina.Manager;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.redis.core.RedisTemplate;
import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
import org.springframework.util.CollectionUtils;
import org.springframework.util.StringUtils;
-import java.util.Arrays;
-import java.util.Date;
-import java.util.List;
-import java.util.Objects;
+import javax.annotation.Resource;
+import java.io.Serializable;
+import java.util.*;
+import java.util.concurrent.TimeUnit;
import java.util.stream.Collectors;
/**
@@ -54,6 +62,13 @@
@Autowired
private ManagersMapper managersMapper;
+ @Autowired
+ private CategoryMapper categoryMapper;
+
+ @Resource(name="sessionRedisTemplate")
+ private RedisTemplate<Object, Serializable> redisTemplate;
+
+
@Override
public Integer create(Workorder workorder) {
this.isValidBaseParam(workorder);
@@ -61,35 +76,123 @@
workorder.setEditDate(new Date());
workorder.setMemberId(workorder.getMemberId());
workorder.setIsdeleted(Constants.ZERO);
- workorder.setStatus(Constants.ZERO);
- //璺岀粖婊戜簨浠朵笂鎶� 鏌ヨSHE璐熻矗浜�
- if(Constants.equalsInteger(workorder.getType(),Constants.THREE)){
- List<Managers> managersList = managersMapper.selectList(new QueryWrapper<Managers>().lambda().eq(Managers::getIsdeleted,Constants.ZERO)
- .eq(Managers::getType,Constants.ZERO).orderByAsc(Managers::getSortnum)
- );
- if(com.github.xiaoymin.knife4j.core.util.CollectionUtils.isNotEmpty(managersList)){
- workorder.setQwnoticeMemberIds(managersList.stream().map(i->i.getMemberId().toString()).collect(Collectors.joining(",")));
- }
- }
+ workorder.setCode(this.getNextCode(workorder.getType()));
+ //澶勭悊浜哄憳绫讳俊鎭�
+ this.dealNoticeData(workorder);
+ //澶勭悊SHE浜嬩欢鐘舵��
+ workorder.setStatus(Constants.equalsInteger(workorder.getType(),Constants.ZERO)?Constants.WorkOrderStatus.close.getKey():Constants.WorkOrderStatus.waitConfirm.getKey());
workorderMapper.insert(workorder);
+ //瀛樺偍DCA 闂璁板綍琛�
+ this.saveProblemData(workorder);
//瀛樺偍闄勪欢淇℃伅
+ this.saveMutiFile(workorder);
+ //瀛樺偍鏃ュ織
+ this.dealLogData(workorder);
+ //TODO 鍙戦�佷紒寰�氱煡
+
+ return workorder.getId();
+ }
+
+
+ public void dealLogData(Workorder workorder){
+ //澶勭悊涓婃姤鏃ュ織 DCA宸ュ崟 鏃ュ織瀛樺偍鑷冲瓙涓氬姟 涓嶅瓨鍦ㄤ簬鐖剁骇
+ if(!Constants.equalsInteger(workorder.getType(),Constants.ONE)){
+ String logTitle = "宸ュ崟鎻愭姤";
+ if(!Constants.equalsInteger(workorder.getType(),Constants.ZERO)){
+ logTitle = Constants.equalsInteger(workorder.getType(),Constants.ONE)?"璺岀粖婊戦闄╂彁鎶�":"DCA涓婃姤";
+ }
+ this.saveLog(null,workorder,Constants.ZERO,workorder.getMemberId(),logTitle,null);
+ }
+ }
+
+ /**
+ * 瀛樺偍闄勪欢淇℃伅
+ * @param workorder
+ */
+ public void saveMutiFile(Workorder workorder){
List<Multifile> multifileList = workorder.getMultifileList();
if(com.github.xiaoymin.knife4j.core.util.CollectionUtils.isNotEmpty(multifileList)){
for (Multifile multifile:multifileList) {
multifile.setObjId(workorder.getId());
multifile.setCreateDate(new Date());
- //TODO 鍚庣画鏁寸悊澶勭悊
- if(Constants.equalsInteger(workorder.getType(),Constants.ZERO)){//SHE浜嬩欢涓婃姤鍥剧墖
- multifile.setObjType(Constants.ZERO);
- }else if(Constants.equalsInteger(workorder.getType(),Constants.THREE)){//璺岀粖婊戜簨浠朵笂鎶ュ浘鐗�
- multifile.setObjType(Constants.ONE);
- }
+ multifile.setObjType(Constants.multiFileType.upload);
}
multifileMapper.insert(multifileList);
}
- //澶勭悊涓婃姤鏃ュ織
- this.saveLog(null,workorder,Constants.ZERO,workorder.getMemberId());
- return workorder.getId();
+ }
+
+
+ /**
+ * 澶勭悊 DCA 鎻愭姤 闂鏁版嵁
+ * @param workorder
+ */
+ public void saveProblemData(Workorder workorder){
+ if(Constants.equalsInteger(workorder.getType(),Constants.TWO)){
+ 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());
+ Workorder dcaWorkOrder = new Workorder();
+ dcaWorkOrder.setCreateDate(new Date());
+ dcaWorkOrder.setEditDate(new Date());
+ dcaWorkOrder.setMemberId(workorder.getMemberId());
+ dcaWorkOrder.setTypeId(dcaNoProblemDTO.getProblemId());
+ dcaWorkOrder.setType(Constants.TWO);
+ dcaWorkOrder.setStatus(Constants.ZERO);
+ dcaWorkOrder.setIsdeleted(Constants.ZERO);
+ dcaWorkOrder.setProblemTitle(problem.getName());
+ dcaWorkOrder.setProblemId(problem.getId());
+ dcaWorkOrder.setProblemInfo(problem.getRemark());
+ dcaWorkOrder.setDcaRecordId(workorder.getId());
+ dcaWorkOrder.setEventInfo(dcaNoProblemDTO.getEventInfo());
+ workorderMapper.insert(dcaWorkOrder);
+ //瀛樺偍鏃ュ織
+ this.dealLogData(dcaWorkOrder);
+ List<Multifile> multifileList = dcaNoProblemDTO.getMultifileList();
+ if(com.github.xiaoymin.knife4j.core.util.CollectionUtils.isNotEmpty(multifileList)){
+ for (Multifile multifile:multifileList) {
+ multifile.setObjId(dcaWorkOrder.getId());
+ multifile.setCreateDate(new Date());
+ multifile.setObjType(Constants.multiFileType.upload);
+ }
+ multifileMapper.insert(multifileList);
+ }
+ }
+ }
+ }
+ }
+
+
+
+ /**
+ * 澶勭悊閫氱煡绫讳汉鍛樹俊鎭�
+ * @param workorder
+ */
+ public void dealNoticeData(Workorder workorder){
+ //SHE涓婃姤 鎻愪氦绫诲瀷涓哄悓浜� 澶勭悊鍚屼簨淇℃伅
+ if(Constants.equalsInteger(workorder.getType(),Constants.ZERO)&&Constants.equalsInteger(workorder.getMemberType(),Constants.ONE)){
+ List<Member> memberList = memberMapper.selectList(new QueryWrapper<Member>().lambda().eq(Member::getIsdeleted,Constants.ZERO).in(Member::getQwId,workorder.getMemberQwids().split(",")));
+ if(com.github.xiaoymin.knife4j.core.util.CollectionUtils.isNotEmpty(memberList)){
+ workorder.setMemberNames(memberList.stream().map(i->i.getName()).collect(Collectors.joining(",")));
+ }
+ }
+ //璺岀粖婊戜簨浠朵笂鎶� 鏌ヨ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)
+ .leftJoin(Member.class,Member::getId,Managers::getMemberId)
+ .eq(Managers::getIsdeleted,Constants.ZERO)
+ .eq(Managers::getType,Constants.ZERO).orderByAsc(Managers::getSortnum)
+ );
+ 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(",")));
+ }
+ }
+ }
+
+
}
@@ -97,10 +200,10 @@
*
* @param beforeJson
* @param afterWorkorder
- * @param objType 鎿嶄綔绫诲瀷 0浠诲姟涓婃姤 1浠诲姟纭 2浠诲姟鍒嗛厤鐗╀笟涓荤 3浠诲姟鍏抽棴 4浠诲姟鍒嗛厤澶勭悊浜� 5浠诲姟鍌績
+ * @param objType 鎿嶄綔绫诲瀷 0浠诲姟涓婃姤 1浠诲姟鍒嗛厤鐗╀笟涓荤 2浠诲姟鍒嗛厤澶勭悊浜� 3浠诲姟澶勭悊鍏抽棴 4浠诲姟鍌績
* @param memberId
*/
- public void saveLog(String beforeJson,Workorder afterWorkorder,Integer objType,Integer memberId){
+ public Integer saveLog(String beforeJson,Workorder afterWorkorder,Integer objType,Integer memberId,String title,String content){
WorkorderLog workorderLog = new WorkorderLog();
workorderLog.setCreateDate(new Date());
workorderLog.setEditDate(new Date());
@@ -110,7 +213,10 @@
workorderLog.setParam1(memberId.toString());
workorderLog.setObjId(afterWorkorder.getId().toString());
workorderLog.setObjType(objType);
+ workorderLog.setTitle(title);
+ workorderLog.setContent(content);
workorderLogMapper.insert(workorderLog);
+ return workorderLog.getId();
}
@@ -123,22 +229,21 @@
|| Objects.isNull(workorder.getSubmitDate())
|| Objects.isNull(workorder.getHappenTime())
|| Objects.isNull(workorder.getType())
- || !( Constants.equalsInteger(workorder.getType(),Constants.ZERO) || Constants.equalsInteger(workorder.getType(),Constants.ONE)
- || Constants.equalsInteger(workorder.getType(),Constants.TWO) || Constants.equalsInteger(workorder.getType(),Constants.THREE)
+ || Objects.isNull(workorder.getTypeId())
+ || Objects.isNull(workorder.getLocaltionId())
+ || !( Constants.equalsInteger(workorder.getType(),Constants.ZERO) || Constants.equalsInteger(workorder.getType(),Constants.ONE) ||Constants.equalsInteger(workorder.getType(),Constants.THREE)
)){
throw new BusinessException(ResponseStatus.BAD_REQUEST);
}
//SHE 浜嬩欢涓婃姤
if(Constants.equalsInteger(workorder.getType(),Constants.ZERO)){
if(Objects.isNull(workorder.getMemberType())
- || Objects.isNull(workorder.getLocaltionId())
|| Objects.isNull(workorder.getOutJiuyi())
|| (Constants.equalsInteger(workorder.getOutJiuyi(),Constants.ZERO) && Objects.isNull(workorder.getIsYiwushi()))
|| (Constants.equalsInteger(workorder.getIsYiwushi(),Constants.ZERO) && Objects.isNull(workorder.getIsHurted()))
- || Objects.isNull(workorder.getCategoryId())
|| Objects.isNull(workorder.getWorkRelated())
|| (Constants.equalsInteger(workorder.getMemberType(),Constants.TWO) && StringUtils.isEmpty(workorder.getMemberNames()))
- || (Constants.equalsInteger(workorder.getMemberType(),Constants.ZERO) && StringUtils.isEmpty(workorder.getMemberQwids()))
+ || (Constants.equalsInteger(workorder.getMemberType(),Constants.ONE) && StringUtils.isEmpty(workorder.getMemberQwids()))
|| org.apache.commons.lang3.StringUtils.isBlank(workorder.getEventInfo())
){
throw new BusinessException(ResponseStatus.BAD_REQUEST);
@@ -146,15 +251,30 @@
}
//璺岀粖婊� 浜嬩欢涓婃姤
if(Constants.equalsInteger(workorder.getType(),Constants.THREE)){
- if(Objects.isNull(workorder.getTypeId())
- || Objects.isNull(workorder.getLocaltionId())
- || org.apache.commons.lang3.StringUtils.isBlank(workorder.getEventInfo())
+ if(org.apache.commons.lang3.StringUtils.isBlank(workorder.getRiskInfo())
+ ){
+ throw new BusinessException(ResponseStatus.BAD_REQUEST);
+ }
+ }
+ //DCA 浜嬩欢涓婃姤
+ if(Constants.equalsInteger(workorder.getType(),Constants.ONE)){
+ if(Objects.isNull(workorder.getDcaYesNum())
+ || Objects.isNull(workorder.getDcaNoNum())
){
throw new BusinessException(ResponseStatus.BAD_REQUEST);
}
}
-
+ //鏁版嵁搴撴暟鎹牎楠�
+ Category typeCategory = categoryMapper.selectById(workorder.getTypeId());
+ if(Objects.isNull(typeCategory)){
+ throw new BusinessException(ResponseStatus.BAD_REQUEST);
+ }
+ Category locationCategory = categoryMapper.selectById(workorder.getLocaltionId());
+ if(Objects.isNull(locationCategory)){
+ throw new BusinessException(ResponseStatus.BAD_REQUEST);
+ }
+ workorder.setLocationName(locationCategory.getNamePath());
}
@Override
@@ -162,29 +282,18 @@
Workorder workorder = workorderMapper.selectJoinOne(Workorder.class,
new MPJLambdaWrapper<Workorder>()
.selectAll(Workorder.class)
+ .selectAs(Member::getPhone,Workorder::getMemberPhone)
.selectAs(Member::getName,Workorder::getMemberName)
- .selectAs(Company::getNamePath,Workorder::getCompanyName)
- .select(" c1.name ",Workorder::getHurtTypeName)
- .select(" c2.name ",Workorder::getLocationTypeName)
+ .selectAs(Workorder::getCompanyName,Workorder::getCompanyName)
.select(" c3.name ",Workorder::getTypeName)
.select(" c4.name ",Workorder::getProblemName)
.leftJoin(Member.class,Member::getId,Workorder::getMemberId)
- .leftJoin(Company.class,Company::getId,Member::getCompanyId)
- .leftJoin(" category c1 on t.CATEGORY_ID = c1.id ") //鍙椾激绫诲埆
- .leftJoin(" category c2 on t.LOCALTION_ID = c2.id ") //鍙戠敓鍦扮偣
.leftJoin(" category c3 on t.TYPE_ID = c3.id ") //椋庨櫓绫诲瀷
.leftJoin(" category c4 on t.PROBLEM_ID = c4.id ") //DCA闂缂栫爜
.eq(Workorder::getId,id)
.last(" limit 1 ")
);
if(Objects.nonNull(workorder)){
- //濡傛灉鏄疭HE浜嬩欢涓婃姤 SHE娑夊強浜哄憳绫诲瀷涓哄悓浜嬩俊鎭� 闇�瑕佹煡璇㈠悓浜嬪悕绉�
- if(Constants.equalsInteger(workorder.getType(),Constants.ZERO)&&Constants.equalsInteger(workorder.getMemberType(),Constants.ONE)){
- List<Member> memberList = memberMapper.selectList(new QueryWrapper<Member>().lambda().eq(Member::getIsdeleted,Constants.ZERO).in(Member::getQwId, Arrays.asList(workorder.getMemberQwids().split(","))));
- if(com.github.xiaoymin.knife4j.core.util.CollectionUtils.isNotEmpty(memberList)){
- workorder.setColleague(memberList.stream().map(i->i.getName()).collect(Collectors.joining(",")));
- }
- }
//鏌ヨ闄勪欢淇℃伅
List<Multifile> multifileList = multifileMapper.selectList(new QueryWrapper<Multifile>().lambda().eq(Multifile::getIsdeleted,Constants.ZERO)
.eq(Multifile::getObjId,workorder).orderByAsc(Multifile::getId));
@@ -197,12 +306,43 @@
workorder.setMultifileList(multifileList);
}
}
-
-
+ //鏌ヨ鏃ュ織淇℃伅
+ workorder.setLogList(this.getLogList(workorder.getId()));
return workorder;
}
+ public List<WorkorderLog> getLogList(Integer orderId){
+ 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)
+ );
+ 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();
+ for (WorkorderLog workorderLog:logList) {
+ //鏌ヨ闄勪欢淇℃伅
+ List<Multifile> multifileList = multifileMapper.selectList(new QueryWrapper<Multifile>().lambda()
+ .eq(Multifile::getIsdeleted,Constants.ZERO)
+ .ne(Multifile::getObjType,Constants.multiFileType.upload)
+ .eq(Multifile::getObjId,workorderLog.getId())
+ .orderByAsc(Multifile::getId));
+ if(com.github.xiaoymin.knife4j.core.util.CollectionUtils.isNotEmpty(multifileList)){
+ for (Multifile multifile:multifileList) {
+ multifile.setFileurlFull(path+multifile.getFileurl());
+ }
+ workorderLog.setMultifileList(multifileList);
+ }
+ }
+ }
+ return logList;
+
+ }
@@ -260,9 +400,19 @@
@Override
public PageData<Workorder> findPage(PageWrap<Workorder> pageWrap) {
IPage<Workorder> page = new Page<>(pageWrap.getPage(), pageWrap.getCapacity());
- QueryWrapper<Workorder> queryWrapper = new QueryWrapper<>();
Utils.MP.blankToNull(pageWrap.getModel());
- queryWrapper.lambda()
+ MPJLambdaWrapper<Workorder> queryWrapper = new MPJLambdaWrapper<>();
+ pageWrap.getModel().setIsdeleted(Constants.ZERO);
+ queryWrapper
+ .selectAll(Workorder.class)
+ .selectAs(Member::getName,Workorder::getMemberName)
+ .selectAs(Member::getCompanyName,Workorder::getCompanyName)
+ .selectAs(Member::getPhone,Workorder::getMemberPhone)
+ .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闂缂栫爜
.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()))
@@ -281,7 +431,7 @@
.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())
- .eq(pageWrap.getModel().getMemberNames() != null, Workorder::getMemberNames, pageWrap.getModel().getMemberNames())
+ .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())
@@ -291,8 +441,7 @@
.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())
- .ge(pageWrap.getModel().getTypeId() != null, Workorder::getTypeId, Utils.Date.getStart(pageWrap.getModel().getTypeId()))
- .le(pageWrap.getModel().getTypeId() != null, Workorder::getTypeId, Utils.Date.getEnd(pageWrap.getModel().getTypeId()))
+ .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())
@@ -310,16 +459,9 @@
.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())
- ;
- for(PageWrap.SortData sortData: pageWrap.getSorts()) {
- if (sortData.getDirection().equalsIgnoreCase(PageWrap.DESC)) {
- queryWrapper.orderByDesc(sortData.getProperty());
- } else {
- queryWrapper.orderByAsc(sortData.getProperty());
- }
- }
- return PageData.from(workorderMapper.selectPage(page, queryWrapper));
+ .eq(pageWrap.getModel().getDcaCsIds() != null, Workorder::getDcaCsIds, pageWrap.getModel().getDcaCsIds()) ;
+ queryWrapper.orderByDesc(Workorder::getCreateDate);
+ return PageData.from(workorderMapper.selectJoinPage(page,Workorder.class, queryWrapper));
}
@Override
@@ -328,12 +470,283 @@
return workorderMapper.selectCount(wrapper);
}
+ public String getNextCode(Integer type){
+ String date = DateUtil.getFomartDate(new Date(),"yyyyMMddHHmmss");
+ String key = "S";
+ if(Constants.equalsInteger(type,Constants.ONE)){
+ key = "D";
+ }else if(Constants.equalsInteger(type,Constants.THREE)){
+ key = "A";
+ }
+ String code = redisTemplate.opsForValue().get(key+"_CODE").toString();
+ if(StringUtils.isEmpty(code)){
+ code = "01";
+ }
+ redisTemplate.opsForValue().set(key+"_CODE",Integer.valueOf(code)+1);
+ return key + date + org.apache.commons.lang3.StringUtils.leftPad(code,2,"0");
+ }
+ @Override
+ public void initializationCode(){
+ redisTemplate.opsForValue().set("A_CODE",1);
+ redisTemplate.opsForValue().set("S_CODE",1);
+ redisTemplate.opsForValue().set("D_CODE",1);
+ }
+ @Override
+ public void closeWorkOrder(CloseDTO closeDTO){
+ 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())){
+ throw new BusinessException(ResponseStatus.BAD_REQUEST);
+ }
+ Workorder workorder = workorderMapper.selectById(closeDTO.getWorkorderId());
+ String beforeJson = JSONObject.toJSONString(workorder);
+ if(Objects.isNull(workorder)){
+ throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(),"鏈煡璇㈠埌宸ュ崟鏁版嵁");
+ }
+ if(Constants.equalsInteger(workorder.getType(),Constants.ZERO)){
+ throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(),"SHE宸ュ崟鏃犳硶杩涜璇ユ搷浣�");
+ }
+ if(Constants.equalsInteger(workorder.getStatus(),Constants.WorkOrderStatus.sheClose.getKey())||Constants.equalsInteger(workorder.getStatus(),Constants.WorkOrderStatus.wtsClose.getKey())||Constants.equalsInteger(workorder.getStatus(),Constants.WorkOrderStatus.close.getKey())){
+ throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(),"宸ュ崟鐘舵�佸凡娴佽浆");
+ }
+ //鎻愪氦鍚庣殑 寰呯‘璁�/寰呭垵瀹＄姸鎬� 濡傛灉鍘诲叧闂� 鍙湁宸ュ崟閲岀粦瀹氱殑SHE浜哄憳鍙互鍏抽棴
+ if(Constants.equalsInteger(workorder.getStatus(),Constants.WorkOrderStatus.waitConfirm.getKey())){
+ //鍒ゆ柇SHE浜哄憳鍐呮槸鍚︽湁褰撳墠鐧诲綍璐﹀彿
+ if(workorder.getQwnoticeMemberIds().indexOf(closeDTO.getMember().getQwId())<Constants.ZERO){
+ throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"瀵逛笉璧凤紝褰撳墠宸ュ崟闈炴偍鐨勫伐鍗曪紝鏃犳硶杩涜澶勭悊");
+ }
+ workorder.setStatus(Constants.WorkOrderStatus.sheClose.getKey());
+ }else if(Constants.equalsInteger(workorder.getStatus(),Constants.WorkOrderStatus.waitAllocation.getKey())){
+ //鍒ゆ柇SHE浜哄憳鍐呮槸鍚︽湁褰撳墠鐧诲綍璐﹀彿
+ if(workorder.getQwnoticeMemberIds().indexOf(closeDTO.getMember().getQwId())<Constants.ZERO && !workorder.getManagerId().equals(closeDTO.getMember().getQwId())){
+ throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"瀵逛笉璧凤紝褰撳墠宸ュ崟闈炴偍鐨勫伐鍗曪紝鏃犳硶杩涜澶勭悊");
+ }
+ workorder.setStatus(Constants.WorkOrderStatus.wtsClose.getKey());
+ }else if(Constants.equalsInteger(workorder.getStatus(),Constants.WorkOrderStatus.waitDeal.getKey())){
+ //鍒ゆ柇SHE浜哄憳鍐呮槸鍚︽湁褰撳墠鐧诲綍璐﹀彿
+ if(workorder.getQwnoticeMemberIds().indexOf(closeDTO.getMember().getQwId())<Constants.ZERO && !workorder.getManagerId().equals(closeDTO.getMember().getQwId())
+ && !workorder.getDealerId().equals(closeDTO.getMember().getQwId()) ){
+ throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"瀵逛笉璧凤紝褰撳墠宸ュ崟闈炴偍鐨勫伐鍗曪紝鏃犳硶杩涜澶勭悊");
+ }
+ workorder.setStatus(Constants.WorkOrderStatus.wtsClose.getKey());
+ }else{
+ throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(),"宸ュ崟鐘舵�佸凡娴佽浆");
+ }
+ workorder.setEditDate(new Date());
+ workorder.setDealTime(new Date());
+ workorder.setDealInfo(closeDTO.getInfo());
+ workorderMapper.updateById(workorder);
+ //澶勭悊涓婃姤鏃ュ織
+ Integer logId = this.saveLog(beforeJson,workorder,Constants.THREE,workorder.getMemberId(),"浠诲姟宸插鐞�",closeDTO.getInfo());
+ List<Multifile> multifileList = workorder.getMultifileList();
+ if(com.github.xiaoymin.knife4j.core.util.CollectionUtils.isNotEmpty(multifileList)){
+ for (Multifile multifile:multifileList) {
+ multifile.setObjId(logId);
+ multifile.setCreateDate(new Date());
+ multifile.setObjType(Constants.multiFileType.deal);
+ }
+ multifileMapper.insert(multifileList);
+ }
+ }
+
+
+ @Override
+ public void passOn(PassOnDTO passOnDTO){
+ if(Objects.isNull(passOnDTO)
+ || Objects.isNull(passOnDTO.getWorkorderId())
+ || Objects.isNull(passOnDTO.getPassOnUserId())
+ ){
+ throw new BusinessException(ResponseStatus.BAD_REQUEST);
+ }
+ Member member = memberMapper.selectById(passOnDTO.getPassOnUserId());
+ if(Objects.isNull(member)){
+ throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(),"鏈煡璇㈠埌琚浆浜や汉淇℃伅");
+ }
+ Workorder workorder = workorderMapper.selectById(passOnDTO.getWorkorderId());
+ String beforeJson = JSONObject.toJSONString(workorder);
+ if(Objects.isNull(workorder)){
+ throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(),"鏈煡璇㈠埌宸ュ崟鏁版嵁");
+ }
+ if(Constants.equalsInteger(workorder.getType(),Constants.ZERO)){
+ throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(),"SHE宸ュ崟鏃犳硶杩涜璇ユ搷浣�");
+ }
+ if(Constants.equalsInteger(passOnDTO.getPassOnType(),Constants.ZERO)){
+ if(!Constants.equalsInteger(workorder.getStatus(),Constants.WorkOrderStatus.waitConfirm.getKey())){
+ throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(),"宸ュ崟鐘舵�佸凡娴佽浆");
+ }
+ workorder.setManagerId(member.getQwId());
+ workorder.setStatus(Constants.WorkOrderStatus.waitAllocation.getKey());
+ }else{
+ if(!(Constants.equalsInteger(workorder.getStatus(),Constants.WorkOrderStatus.waitAllocation.getKey())
+ || Constants.equalsInteger(workorder.getStatus(),Constants.WorkOrderStatus.waitDeal.getKey()))){
+ throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(),"宸ュ崟鐘舵�佸凡娴佽浆");
+ }
+ workorder.setDealerId(member.getQwId());
+ workorder.setStatus(Constants.WorkOrderStatus.waitDeal.getKey());
+ }
+ workorder.setEditDate(new Date());
+ workorder.setUrgeDate(DateUtil.afterHoursDate(new Date(),24));
+ workorderMapper.updateById(workorder);
+ //澶勭悊涓婃姤鏃ュ織
+ 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();
+ if(com.github.xiaoymin.knife4j.core.util.CollectionUtils.isNotEmpty(multifileList)){
+ for (Multifile multifile:multifileList) {
+ multifile.setObjId(logId);
+ multifile.setCreateDate(new Date());
+ multifile.setObjType(Constants.multiFileType.passOn);
+ }
+ multifileMapper.insert(multifileList);
+ }
+ //TODO 浼佷笟寰俊閫氱煡
+ }
+
+
+
+ @Override
+ @Transactional(rollbackFor = {BusinessException.class,Exception.class})
+ public void urge(Integer workorderId,Member member){
+ Workorder workorder = workorderMapper.selectById(workorderId);
+ workorder.setEditDate(new Date());
+ workorder.setUrgeDate(DateUtil.afterHoursDate(new Date(),24));
+ workorderMapper.updateById(workorder);
+ if(Objects.isNull(workorder)){
+ throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(),"鏈煡璇㈠埌宸ュ崟鏁版嵁");
+ }
+ Member urgeUser = new Member();
+ //濡傛灉宸插垎閰� 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())){
+ 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());
+ //TODO 鍙戦�佷紒寰�氱煡
+
+ }
+
+ @Override
+ public void jobUrge(){
+ List<Workorder> workorderList = workorderMapper.selectList(new QueryWrapper<Workorder>().lambda().eq(Workorder::getIsdeleted,Constants.ZERO)
+ .in(Workorder::getStatus,Constants.WorkOrderStatus.waitAllocation.getKey(),Constants.WorkOrderStatus.waitDeal.getKey())
+ .apply(" urge_time > now() ")
+ );
+ if(com.github.xiaoymin.knife4j.core.util.CollectionUtils.isNotEmpty(workorderList)){
+ for (Workorder workorder:workorderList) {
+ this.autoUrge(workorder);
+ workorder.setEditDate(new Date());
+ workorder.setUrgeDate(DateUtil.afterHoursDate(new Date(),24));
+ workorderMapper.updateById(workorder);
+ }
+ }
+ }
+
+
+
+ public void autoUrge(Workorder workorder){
+ if(Objects.isNull(workorder)){
+ return;
+ }
+ Member urgeUser = new Member();
+ //濡傛灉宸插垎閰� 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())){
+ urgeUser = memberMapper.selectOne(new QueryWrapper<Member>().lambda().eq(Member::getIsdeleted,Constants.ZERO).eq(Member::getQwId,workorder.getDealerId()).last("limit 1 "));
+ }else{
+ return;
+ }
+ //TODO 鍙戦�佷紒寰�氱煡
+ }
+
+
+ /**
+ * 鏁版嵁鎶ヨ〃
+ * @param queryType 0=鎸夌収鏈堜唤锛�1=鎸夌収瀛ｅ害锛�2=鎸夌収骞翠唤锛堟殏涓嶅鐞嗭級
+ * @return
+ */
+ @Override
+ public List<WorkOrderDataVO> getWorkOrderData(Integer queryType) throws Exception {
+ String year = DateUtil.getNowYear();
+ Integer nowMonth = DateUtil.getNowMonth();
+ Integer quarter = (nowMonth - 1) / 3 + 1;
+ List<WorkOrderDataVO> workOrderDataVOList = new ArrayList<>();
+ //鏌ヨ浠婂勾鎵�鏈夌殑鏁版嵁
+ List<Workorder> workorderList = workorderMapper.selectList(new QueryWrapper<Workorder>().lambda().like(Workorder::getCreateDate,year)
+ .eq(Workorder::getIsdeleted,Constants.ZERO));
+ if(Constants.equalsInteger(queryType,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");
+ List<Workorder> dataList = workorderList.stream().filter(j->DateUtil.formatDate(j.getCreateDate(),"yyyy-MM").equals(monthDay))
+ .collect(Collectors.toList());
+ workOrderDataVO.setDateStr(monthDay);
+ workOrderDataVO.setGcsTotal(Constants.ZERO);
+ workOrderDataVO.setWtsTotal(Constants.ZERO);
+ workOrderDataVO.setSheTotal(Constants.ZERO);
+ workOrderDataVO.setUnCloseTotal(Constants.ZERO);
+ workOrderDataVO.setTotal(Constants.ZERO);
+ if(com.github.xiaoymin.knife4j.core.util.CollectionUtils.isNotEmpty(dataList)){
+ 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());
+ workOrderDataVO.setWtsTotal(dataList.stream().filter(j->Constants.equalsInteger(j.getStatus(),Constants.WorkOrderStatus.wtsClose.getKey())).collect(Collectors.toList()).size());
+ workOrderDataVO.setUnCloseTotal(workOrderDataVO.getTotal() - workOrderDataVO.getSheTotal() - workOrderDataVO.getWtsTotal() - workOrderDataVO.getGcsTotal());
+ }
+ workOrderDataVOList.add(workOrderDataVO);
+ }
+ }else if(Constants.equalsInteger(queryType,Constants.ONE)){
+ //鎸夌収瀛ｅ害鏌ヨ
+ for (int i = 1 ; i <= quarter; i++) {
+ List<Workorder> dataList = new ArrayList<>();
+ if(Constants.equalsInteger(i,Constants.ONE)){
+ dataList = workorderList.stream().filter(j->Integer.valueOf(DateUtil.formatDate(j.getCreateDate(),"MM"))<=3 )
+ .collect(Collectors.toList());
+ }else if(Constants.equalsInteger(i,Constants.TWO)){
+ dataList = workorderList.stream().filter(j->Integer.valueOf(DateUtil.formatDate(j.getCreateDate(),"MM"))<=6 && Integer.valueOf(DateUtil.formatDate(j.getCreateDate(),"MM"))>=4 )
+ .collect(Collectors.toList());
+ }else if(Constants.equalsInteger(i,Constants.THREE)){
+ dataList = workorderList.stream().filter(j->Integer.valueOf(DateUtil.formatDate(j.getCreateDate(),"MM"))<=9 && Integer.valueOf(DateUtil.formatDate(j.getCreateDate(),"MM"))>=7 )
+ .collect(Collectors.toList());
+ }else {
+ dataList = workorderList.stream().filter(j-> Integer.valueOf(DateUtil.formatDate(j.getCreateDate(),"MM"))>=10 )
+ .collect(Collectors.toList());
+ }
+ WorkOrderDataVO workOrderDataVO = new WorkOrderDataVO();
+ workOrderDataVO.setDateStr(i+"瀛ｅ害");
+ workOrderDataVO.setGcsTotal(Constants.ZERO);
+ workOrderDataVO.setWtsTotal(Constants.ZERO);
+ workOrderDataVO.setSheTotal(Constants.ZERO);
+ workOrderDataVO.setUnCloseTotal(Constants.ZERO);
+ workOrderDataVO.setTotal(Constants.ZERO);
+ if(com.github.xiaoymin.knife4j.core.util.CollectionUtils.isNotEmpty(dataList)){
+ 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());
+ workOrderDataVO.setWtsTotal(dataList.stream().filter(j->Constants.equalsInteger(j.getStatus(),Constants.WorkOrderStatus.wtsClose.getKey())).collect(Collectors.toList()).size());
+ workOrderDataVO.setUnCloseTotal(workOrderDataVO.getTotal() - workOrderDataVO.getSheTotal() - workOrderDataVO.getWtsTotal() - workOrderDataVO.getGcsTotal());
+ }
+ workOrderDataVOList.add(workOrderDataVO);
+
+ }
+ }
+ return workOrderDataVOList;
+ }
+
--
Gitblit v1.9.3