From 4d4394311a96e15ea204e2cae03dda00750d0fdd Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期五, 11 四月 2025 17:37:39 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
server/src/main/java/com/doumee/service/business/impl/WorkorderServiceImpl.java | 53 ++++++++++++++++++++++++++++++++++++++++++++---------
1 files changed, 44 insertions(+), 9 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 36aae5b..782492f 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
@@ -135,6 +135,8 @@
}
+ private static final String [] qwDetailUrls = {"/pages/details_she/details_she","/pages/workOrder_dca/workOrder_dca","","/pages/workOrder_she/workOrder_she"};
+
/**
* 閫氱煡鏂囨鏁寸悊
* @param workorder
@@ -147,6 +149,7 @@
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());
if(Constants.equalsInteger(workorder.getType(),Constants.ZERO)){
textCard.setTitle("銆怱HE浜嬩欢涓婃姤銆�");
if(Constants.equalsInteger(workorder.getMemberType(),Constants.ZERO)){
@@ -365,7 +368,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,14 +376,15 @@
.selectAs(Member::getName,Workorder::getMemberName)
.selectAs(Member::getCompanyName,Workorder::getCompanyName)
.select(" c3.name ",Workorder::getTypeName)
- .select(" c4.name ",Workorder::getProblemName)
+ .select(" c4.name ",Workorder::getCategoryName)
.leftJoin(Member.class,Member::getId,Workorder::getMemberId)
.leftJoin(" category c3 on t.TYPE_ID = c3.id ") //椋庨櫓绫诲瀷
- .leftJoin(" category c4 on t.PROBLEM_ID = c4.id ") //DCA闂缂栫爜
+ .leftJoin(" category c4 on t.CATEGORY_ID = c4.id ") //DCA闂缂栫爜
.eq(Workorder::getId,id)
.last(" limit 1 ")
);
if(Objects.nonNull(workorder)){
+ this.dealButton(workorder,member);
//鏌ヨ闄勪欢淇℃伅
List<Multifile> multifileList = multifileMapper.selectList(new QueryWrapper<Multifile>().lambda().eq(Multifile::getIsdeleted,Constants.ZERO)
.eq(Multifile::getObjId,workorder.getId()).orderByAsc(Multifile::getId));
@@ -405,6 +409,29 @@
return workorder;
}
+ public void dealButton(Workorder workorder,Member member){
+ workorder.setPassOnButton(Constants.ZERO);
+ workorder.setCloseButton(Constants.ZERO);
+ if(org.apache.commons.lang3.StringUtils.isNotBlank(member.getQwId())){
+ List<String> closeUserList = new ArrayList<>();
+ closeUserList.addAll(Arrays.asList(workorder.getQwnoticeMemberIds().split(",")));
+ closeUserList.add(org.apache.commons.lang3.StringUtils.isNotBlank(workorder.getManagerId())?workorder.getManagerId():null);
+ closeUserList.add(org.apache.commons.lang3.StringUtils.isNotBlank(workorder.getDealerId())?workorder.getDealerId():null);
+ 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(",")));
+ }else if(Constants.equalsInteger(workorder.getStatus(),Constants.WorkOrderStatus.waitAllocation.getKey())){
+ closeUserList.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){
List<WorkorderLog> logList = workorderLogMapper.selectJoinList(WorkorderLog.class,
@@ -418,7 +445,7 @@
);
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();
for (WorkorderLog workorderLog:logList) {
//鏌ヨ闄勪欢淇℃伅
List<Multifile> multifileList = multifileMapper.selectList(new QueryWrapper<Multifile>().lambda()
@@ -487,6 +514,11 @@
@Override
public List<Workorder> findList(Workorder pageWrap) {
+
+ return workorderMapper.selectJoinList(Workorder.class,getJoinQueryMapper(pageWrap));
+ }
+
+ private MPJLambdaWrapper<Workorder> getJoinQueryMapper(Workorder pageWrap) {
MPJLambdaWrapper<Workorder> queryWrapper = new MPJLambdaWrapper<>();
pageWrap.setIsdeleted(Constants.ZERO);
queryWrapper
@@ -494,11 +526,11 @@
.selectAs(Member::getName,Workorder::getMemberName)
.selectAs(Member::getCompanyName,Workorder::getCompanyName)
.selectAs(Member::getPhone,Workorder::getMemberPhone)
+ .select(" c2.name ",Workorder::getCategoryName)
.select(" c3.name ",Workorder::getTypeName)
- .select(" c4.name ",Workorder::getProblemName)
.leftJoin(Member.class,Member::getId,Workorder::getMemberId)
.leftJoin(" category c3 on t.TYPE_ID = c3.id ") //椋庨櫓绫诲瀷
- .leftJoin(" category c4 on t.PROBLEM_ID = c4.id ") //DCA闂缂栫爜
+ .leftJoin(" category c2 on t.CATEGORY_ID = c2.id ") //DCA涓�绾ч棶棰樼紪鐮�
.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()))
@@ -551,15 +583,15 @@
.or().like(Member::getPhone, pageWrap.getMemberName()) );
}
queryWrapper.orderByDesc(Workorder::getProblemId);
- return workorderMapper.selectJoinList(Workorder.class,queryWrapper);
+ return queryWrapper;
}
-
+
@Override
public PageData<Workorder> findPage(PageWrap<Workorder> pageWrap) {
IPage<Workorder> page = new Page<>(pageWrap.getPage(), pageWrap.getCapacity());
Utils.MP.blankToNull(pageWrap.getModel());
- MPJLambdaWrapper<Workorder> queryWrapper = new MPJLambdaWrapper<>();
pageWrap.getModel().setIsdeleted(Constants.ZERO);
+ MPJLambdaWrapper<Workorder> queryWrapper = getJoinQueryMapper(pageWrap.getModel());
queryWrapper
.selectAll(Workorder.class)
.selectAs(Member::getName,Workorder::getMemberName)
@@ -572,6 +604,9 @@
.leftJoin(" category c3 on t.TYPE_ID = c3.id ") //椋庨櫓绫诲瀷
.leftJoin(" category c4 on t.PROBLEM_ID = c4.id ") //DCA闂缂栫爜
.leftJoin(" category c2 on t.CATEGORY_ID = c2.id ") //DCA闂缂栫爜
+ .apply(Objects.nonNull(pageWrap.getModel().getMyWorkOrder())&& org.apache.commons.lang3.StringUtils.isNotBlank(pageWrap.getModel().getQwId())
+ &&Constants.equalsInteger(Constants.ONE,pageWrap.getModel().getMyWorkOrder()),
+ " ( t.id in ( select OBJ_ID from notices where param1 = '"+pageWrap.getModel().getQwId()+"' )) ")
.eq(pageWrap.getModel().getId() != null, Workorder::getId, pageWrap.getModel().getId())
.eq(pageWrap.getModel().getCreator() != null, Workorder::getCreator, pageWrap.getModel().getCreator())
.ge(pageWrap.getModel().getCreateDate() != null, Workorder::getCreateDate, Utils.Date.getStart(pageWrap.getModel().getCreateDate()))
--
Gitblit v1.9.3