yuyang/XH-Power-Cloud
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

更新工单列表拼接办理人员和部门显示

Browse Source
This commit is contained in:
panshuling321 2022-06-10 14:18:53 +08:00
parent 17f3561ed0
commit 191a365f10
2 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
xhpc-modules/xhpc-activity/src/main/java/com/xhpc/activity/service/impl/WorkOrderServiceImpl.java
View File

@ -135,7 +135,10 @@ public class WorkOrderServiceImpl implements WorkOrderService {
userIdList.insert(0, userDomain.getWorkUserId() + ","); userIdList.insert(0, userDomain.getWorkUserId() + ",");
} }
orderMapper.insertOrderUser(orderUserDomainList);
if(orderUserDomainList.size() > 0){
orderMapper.insertOrderUser(orderUserDomainList);
}
if(StringUtils.isNotEmpty(userIdList.toString()) && domain.getStatus() != null && domain.getStatus()==1){ if(StringUtils.isNotEmpty(userIdList.toString()) && domain.getStatus() != null && domain.getStatus()==1){
sendSms(userIdList.toString(), domain.getWorkOrderId().toString()); sendSms(userIdList.toString(), domain.getWorkOrderId().toString());

8
xhpc-modules/xhpc-activity/src/main/resources/mapper/XhpcWorkOrderMapper.xml
View File

@ -55,10 +55,10 @@
o.title as 'title', o.title as 'title',
o.type as 'typeId', o.type as 'typeId',
td.name as 'typeName', td.name as 'typeName',
u.dept_id as 'deptId', GROUP_CONCAT(u.dept_id) as 'deptId',
d.dept_name as 'deptName', GROUP_CONCAT(d.dept_name) as 'deptName',
u.work_user_id as 'userId', GROUP_CONCAT(u.work_user_id) as 'userId',
u.user_name as 'userName', GROUP_CONCAT(u.user_name, '(', d.dept_name, ')') as 'userName',
o.`status` as 'status' o.`status` as 'status'
from xhpc_work_order o from xhpc_work_order o
left join xhpc_work_type_dict td on td.work_type_id=o.type left join xhpc_work_type_dict td on td.work_type_id=o.type