From e12f190f8237c93a5054272ccd9f2eb15ac9e48a Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期四, 17 四月 2025 18:17:18 +0800
Subject: [PATCH] 工单业务
---
server/src/main/java/com/doumee/service/business/impl/WorkorderServiceImpl.java | 159 +++++++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 137 insertions(+), 22 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 1bf36db..06e4bb2 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;
@@ -81,12 +82,12 @@
@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浜嬩欢鐘舵��
@@ -142,10 +143,13 @@
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}";
- private static final String [] qwDetailUrls = {"/pages/details_she/details_she","/pages/workOrder_dca/workOrder_dca","","/pages/workOrder_she/workOrder_she"};
/**
* 閫氱煡鏂囨鏁寸悊
@@ -159,7 +163,9 @@
public QywxTextCardMsgRequest dealMessageContent(Workorder workorder,String userName ,String categoryName,Integer contentType,String csInfo){
QywxTextCardMsgRequest textCard = new QywxTextCardMsgRequest();
String message = "";
- textCard.setUrl(qwDetailUrls[workorder.getType()]+"?id="+workorder.getId());
+ 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));
if(Constants.equalsInteger(workorder.getType(),Constants.ZERO)){
textCard.setTitle("銆怱HE浜嬩欢涓婃姤銆�");
if(Constants.equalsInteger(workorder.getMemberType(),Constants.ZERO)){
@@ -167,7 +173,7 @@
}else {
message = Constants.equalsInteger(workorder.getMemberType(),Constants.ONE)?"鍚屼簨":"渚涘簲鍟�";
}
- message = message + "-" + workorder.getMemberNames() + " " + DateUtil.formatDate(new Date(),"yyyy-MM-dd HH:mm") + workorder.getLocationName() + categoryName;
+ message = message + "-" + workorder.getMemberNames() + " " + DateUtil.formatDate(new Date(),"yyyy-MM-dd HH:mm") + "/" +workorder.getLocationName() + "/" + categoryName;
textCard.setDescription("<div class=\"normal\">"+message+"</div>");
}else{
@@ -194,6 +200,7 @@
if (Constants.equalsInteger(workorder.getType(), Constants.THREE) || Constants.equalsInteger(workorder.getType(), Constants.TWO) ) {
//澶勭悊涓婃姤鏃ュ織 DCA宸ュ崟 鏃ュ織瀛樺偍鑷冲瓙涓氬姟 涓嶅瓨鍦ㄤ簬鐖剁骇 涓庤穼缁婃粦
String logTitle = Constants.equalsInteger(workorder.getType(), Constants.THREE) ? "璺岀粖婊戦闄�" : "DCA";
+ workorder.setCreateDate(workorder.getSubmitDate());
this.saveLog(null,workorder,Constants.ZERO,workorder.getMemberId(),workOrderStatus.getLogTitle().replace("{title}",logTitle),null,null);
}
}
@@ -270,6 +277,9 @@
multifileMapper.insert(multifileList);
}
}
+ }else{
+ workorder.setStatus(Constants.WorkOrderStatus.sheClose.getKey());
+ workorderMapper.updateById(workorder);
}
//鏌ヨ涓婚涓嬬殑鎵�鏈夎瀵熼」
@@ -278,13 +288,16 @@
//瀛樺偍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::getParentId,workorder.getTypeId()));
+ 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;
@@ -383,8 +396,8 @@
*/
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));
@@ -563,7 +576,7 @@
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())
- && member.getQwId().equals(workorder.getManagerId()) ){
+ && workorder.getQwnoticeMemberIds().indexOf(member.getQwId())>=Constants.ZERO){
workorderLog.setUrgeButton(Constants.ONE);
}
}
@@ -571,7 +584,7 @@
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())
- && member.getQwId().equals(workorder.getDealerId()) && canOpenUrgeButton){
+ && member.getQwId().equals(workorder.getManagerId()) && canOpenUrgeButton){
workorderLog.setUrgeButton(Constants.ONE);
canOpenUrgeButton = false;
}
@@ -724,7 +737,7 @@
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;
}
@@ -808,7 +821,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())){
@@ -818,7 +831,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{
@@ -858,11 +871,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(),"鏈煡璇㈠埌琚浆浜や汉淇℃伅");
}
@@ -896,7 +909,7 @@
Integer logId = this.saveLog(beforeJson,workorder,
Constants.equalsInteger(passOnDTO.getPassOnType(),Constants.ZERO)?Constants.ONE:Constants.TWO
,workorder.getMemberId(),"浠诲姟鍒嗛厤",passOnDTO.getInfo(),paramr2);
- List<Multifile> multifileList = workorder.getMultifileList();
+ List<Multifile> multifileList = passOnDTO.getMultifileList();
if(com.github.xiaoymin.knife4j.core.util.CollectionUtils.isNotEmpty(multifileList)){
for (Multifile multifile:multifileList) {
multifile.setObjId(logId);
@@ -1109,7 +1122,7 @@
}
this.saveLog(null,workorder,
- Constants.ONE
+ Constants.FOUR
,member.getId(),"鍌績","宸插偓淇� "+urgeUser.getCompanyName() + "/" + urgeUser.getName(),null);
//鍙戦�佷紒寰�氱煡
Category category = categoryMapper.selectById(workorder.getTypeId());
@@ -1188,13 +1201,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>()
@@ -1209,17 +1224,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());
@@ -1251,7 +1274,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());
@@ -1259,11 +1291,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