From 999ee4d29c1e3c8b92086b6d68e19cf0a9e09855 Mon Sep 17 00:00:00 2001 From: xyc <3422692813@qq.com> Date: Mon, 23 Jun 2025 17:38:35 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/ApiAppLoginServiceImpl.java | 2 +- .../module/constant/InspectionConstants.java | 11 +++ .../controller/AppGoodsController.java | 1 + .../controller/InspectionStaffController.java | 21 +++++ .../InspectionBusinessChannelController.java | 7 ++ .../inspection/entity/InspectionInfo.java | 2 + .../impl/InspectionStaffServiceImpl.java | 83 ++++++++++--------- .../impl/InspectionWorkNodeServiceImpl.java | 39 +++++++-- .../inspection/vo/InspectionStaffSaveVo.java | 3 + .../payment/controller/OrderController.java | 7 +- .../payment/mapper/OrderInfoMapper.java | 2 +- .../payment/service/OrderInfoService.java | 2 +- .../service/impl/OrderInfoServiceImpl.java | 4 +- .../mapper/InspectionWorkNodeMapper.xml | 25 +++--- .../inspection/AppInspectionGoodsMapper.xml | 2 +- .../inspection/InspectionInfoMapper.xml | 55 ++++++------ .../inspection/InspectionStaffMapper.xml | 2 +- .../mapper/payment/OrderInfoMapper.xml | 3 + .../core/query/LambdaQueryWrapperX.java | 6 ++ .../admin/auth/vo/AuthLoginReqVO.java | 7 +- .../vo/profile/UserProfileUpdateReqVO.java | 3 + .../admin/user/vo/user/UserPageReqVO.java | 10 +++ .../dal/mysql/user/AdminUserMapper.java | 28 +++++-- .../service/auth/AdminAuthServiceImpl.java | 2 +- .../service/tenant/TenantServiceImpl.java | 71 ++++++++++------ .../service/user/AdminUserServiceImpl.java | 33 ++++---- .../main/resources/mapper/UserRoleMapper.xml | 6 +- 27 files changed, 290 insertions(+), 147 deletions(-) diff --git a/dl-module-company/src/main/java/cn/iocoder/yudao/module/staff/service/impl/ApiAppLoginServiceImpl.java b/dl-module-company/src/main/java/cn/iocoder/yudao/module/staff/service/impl/ApiAppLoginServiceImpl.java index 39aab7c8..b184e1e3 100644 --- a/dl-module-company/src/main/java/cn/iocoder/yudao/module/staff/service/impl/ApiAppLoginServiceImpl.java +++ b/dl-module-company/src/main/java/cn/iocoder/yudao/module/staff/service/impl/ApiAppLoginServiceImpl.java @@ -115,7 +115,7 @@ public class ApiAppLoginServiceImpl implements ApiAppLoginService { flag = this.checkRepairCanLogin(user, roleCodeList); } else if (SystemEnum.INSPECTION.getCode().equals(loginBody.getSysCode())) { //检测业务系统 - + flag = true; } else if (SystemEnum.SCHOOL.getCode().equals(loginBody.getSysCode())) { //驾校业务系统 flag = this.checkSchoolCanLogin(user, roleCodeList,loginBody.getTypes()); diff --git a/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/constant/InspectionConstants.java b/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/constant/InspectionConstants.java index f4521fdc..09ab21e6 100644 --- a/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/constant/InspectionConstants.java +++ b/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/constant/InspectionConstants.java @@ -1,5 +1,7 @@ package cn.iocoder.yudao.module.constant; +import java.util.Locale; + /** * @Description: 检测常量信息 * @Author: 86187 @@ -90,4 +92,13 @@ public class InspectionConstants { */ public static final String INSPECTION_NOTICE_TEMPLATE_BUSINESS_MANAGER_MEET_CAR_ORDER_CREATE = "%s的工单已创建，详细信息请前往列表查看"; + /** + * 检测站内信模板-提示业务经理 接车订单以完成 + */ + public static final String INSPECTION_NOTICE_TEMPLATE_BUSINESS_MANAGER_MEET_CAR_ORDER_COMPLETE = "%s的工单已完成，详细信息请前往列表查看"; + + /** + * 检测站内信模板-提示业务经理 接车订单不合格 + */ + public static final String INSPECTION_NOTICE_TEMPLATE_BUSINESS_MANAGER_MEET_CAR_ORDER_UNQUALIFIED = "%s的工单不合格，详细信息请前往列表查看"; } diff --git a/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/controller/AppGoodsController.java b/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/controller/AppGoodsController.java index 6bd0fd3d..3dcdf88e 100644 --- a/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/controller/AppGoodsController.java +++ b/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/controller/AppGoodsController.java @@ -44,6 +44,7 @@ public class AppGoodsController extends BaseController { * 商品列表查询 */ @GetMapping("/list") + @TenantIgnore public CommonResult goodsList(GoodsQuery goodsQuery) { List list = appInspectionGoodsService.goodsList(goodsQuery); diff --git a/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/controller/InspectionStaffController.java b/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/controller/InspectionStaffController.java index 19805aef..f6c933e7 100644 --- a/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/controller/InspectionStaffController.java +++ b/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/controller/InspectionStaffController.java @@ -9,8 +9,10 @@ import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.PhoneUtil; import cn.iocoder.yudao.framework.apilog.core.annotation.ApiAccessLog; import cn.iocoder.yudao.framework.common.pojo.CommonResult; +import cn.iocoder.yudao.framework.common.pojo.PageResult; import cn.iocoder.yudao.framework.excel.core.util.ExcelUtils; import cn.iocoder.yudao.module.core.controller.BaseController; +import cn.iocoder.yudao.module.inspection.entity.InspectionStaff; import cn.iocoder.yudao.module.inspection.enums.DriverLicenseType; import cn.iocoder.yudao.module.inspection.query.InspectionListQuery; import cn.iocoder.yudao.module.inspection.query.InspectionStaffQuery; @@ -20,8 +22,11 @@ import cn.iocoder.yudao.module.inspection.vo.InspectionStaffSaveVo; import cn.iocoder.yudao.module.inspection.vo.StaffImportExcelVO; import cn.iocoder.yudao.module.system.api.dict.DictDataApi; import cn.iocoder.yudao.module.system.api.dict.dto.DictDataRespDTO; +import cn.iocoder.yudao.module.system.controller.admin.user.vo.user.UserPageReqVO; import cn.iocoder.yudao.module.system.dal.dataobject.permission.RoleDO; +import cn.iocoder.yudao.module.system.dal.dataobject.user.AdminUserDO; import cn.iocoder.yudao.module.system.service.permission.RoleService; +import cn.iocoder.yudao.module.system.service.user.AdminUserService; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import org.springframework.beans.factory.annotation.Autowired; @@ -30,8 +35,10 @@ import org.springframework.web.multipart.MultipartFile; import javax.annotation.Resource; import javax.servlet.http.HttpServletResponse; +import javax.validation.Valid; import java.io.IOException; import java.util.*; +import java.util.stream.Collectors; import static cn.iocoder.yudao.framework.apilog.core.enums.OperateTypeEnum.EXPORT; import static cn.iocoder.yudao.framework.excel.core.util.ExcelUtils.exportBlankTemplate; @@ -52,6 +59,9 @@ public class InspectionStaffController extends BaseController { @Resource private RoleService roleService; + @Resource + private AdminUserService userService; + /** * 获取检测员工列表 * @@ -67,6 +77,17 @@ public class InspectionStaffController extends BaseController { return success(list); } + @GetMapping("/listSelectUser") + public CommonResult listSelectUser(@Valid UserPageReqVO pageReqVO){ + // 查询目前所有的userId + List list = inspectionStaffService.list(); + List ids = list.stream().map(InspectionStaff::getUserId).collect(Collectors.toList()); + pageReqVO.setUserIds(ids); + // 获得用户分页列表 + PageResult pageResult = userService.getUserPage(pageReqVO); + return success(new PageResult<>(pageResult.getList(), pageResult.getTotal())); + } + /** * 获取检测员工详情 * diff --git a/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/controller/admin/InspectionBusinessChannelController.java b/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/controller/admin/InspectionBusinessChannelController.java index 50f36871..7bad4144 100644 --- a/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/controller/admin/InspectionBusinessChannelController.java +++ b/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/controller/admin/InspectionBusinessChannelController.java @@ -34,6 +34,13 @@ public class InspectionBusinessChannelController { */ @PostMapping("/add") public boolean addChannel(@RequestBody InspectionBusinessChannel channel) { + if (ObjectUtil.isNotEmpty(channel.getUserIdList())) { + String userIds = channel.getUserIdList().stream() + .map(String::valueOf) + .collect(Collectors.joining(",")); + channel.setUserIds(userIds); + + } return inspectionBusinessChannelService.save(channel); } diff --git a/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/entity/InspectionInfo.java b/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/entity/InspectionInfo.java index 1bdd68d0..d54b7079 100644 --- a/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/entity/InspectionInfo.java +++ b/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/entity/InspectionInfo.java @@ -212,4 +212,6 @@ public class InspectionInfo extends TenantBaseDO private Integer meetType; @TableField(exist = false) private String content; + @TableField(exist = false) + private Long inspectionInfoId; } diff --git a/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/service/impl/InspectionStaffServiceImpl.java b/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/service/impl/InspectionStaffServiceImpl.java index 0e0f43a6..ea9e5197 100644 --- a/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/service/impl/InspectionStaffServiceImpl.java +++ b/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/service/impl/InspectionStaffServiceImpl.java @@ -106,9 +106,12 @@ public class InspectionStaffServiceImpl extends ServiceImpllambdaQuery().eq(AdminUserDO::getUsername, inspectionStaffVo.getUsername()).last("LIMIT 1")); - Long userId = null; - if (one == null) { - UserSaveReqVO userDTO = BeanUtil.copyProperties(inspectionStaffVo, UserSaveReqVO.class); - userDTO.setId(inspectionStaffVo.getUserId()); - //获取当前人的租户id - LoginUser loginUser = SecurityFrameworkUtils.getLoginUser(); - userDTO.setTenantId(loginUser.getTenantId()); - userId = userService.createUser(userDTO); - } else { - userId = one.getId(); - } + //获取当前人的租户id + LoginUser loginUser = SecurityFrameworkUtils.getLoginUser(); + if (CollUtil.isEmpty(inspectionStaffVo.getAdminUsers())) { + //新增system_users主表 + // 判断账号是否存在 + AdminUserDO one = userService.getOne(Wrappers.lambdaQuery().eq(AdminUserDO::getUsername, inspectionStaffVo.getUsername()).eq(AdminUserDO::getTenantId, loginUser.getTenantId()).last("LIMIT 1")); + Long userId = null; + if (one == null) { + UserSaveReqVO userDTO = BeanUtil.copyProperties(inspectionStaffVo, UserSaveReqVO.class); + userDTO.setId(inspectionStaffVo.getUserId()); -// //查询检测基础员工角色 -// List role = roleService.getRoleListByCodesTenant(Collections.singletonList(InspectionConstants.INSPECTION_BASE_STAFF_ROLE)); -// -// if (ObjectUtil.isNull(role)) { -// throw new RuntimeException("检测基础员工角色不存在"); -// } -// -// Set roleIds = role.stream().map(RoleDO::getId).collect(Collectors.toSet()); -// //设置角色为检测基础员工 -// permissionService.assignUserRole(userId, roleIds); - - // 查询子表中是否存在 - InspectionStaff staff = this.getOne(Wrappers.lambdaQuery().eq(InspectionStaff::getUserId, userId)); - if (ObjectUtil.isNull(staff)) { - - InspectionStaff inspectionStaff = BeanUtil.copyProperties(inspectionStaffVo, InspectionStaff.class); - inspectionStaff.setUserId(userId); - //新增检测员工子表 - this.save(inspectionStaff); - if (ObjectUtil.isNotEmpty(inspectionStaffVo.getFileList())) { - addFile(inspectionStaffVo.getFileList(), inspectionStaffVo.getNickname(), null, inspectionStaff.getUserId()); + userDTO.setTenantId(loginUser.getTenantId()); + userId = userService.createUser(userDTO); + } else { + userId = one.getId(); } - return inspectionStaff.getUserId(); - }else { - throw new RuntimeException("该员工已存在"); - } + // 查询子表中是否存在 + InspectionStaff staff = this.getOne(Wrappers.lambdaQuery().eq(InspectionStaff::getUserId, userId)); + if (ObjectUtil.isNull(staff)) { + + InspectionStaff inspectionStaff = BeanUtil.copyProperties(inspectionStaffVo, InspectionStaff.class); + inspectionStaff.setUserId(userId); + //新增检测员工子表 + this.save(inspectionStaff); + if (ObjectUtil.isNotEmpty(inspectionStaffVo.getFileList())) { + addFile(inspectionStaffVo.getFileList(), inspectionStaffVo.getNickname(), null, inspectionStaff.getUserId()); + } + return inspectionStaff.getUserId(); + }else { + throw new RuntimeException("该员工已存在"); + } + }else { + // 循环adminusers 查询子表中是否存在如果存在不添加 + for (AdminUserDO adminUser : inspectionStaffVo.getAdminUsers()) { + InspectionStaff staff = this.getOne(Wrappers.lambdaQuery().eq(InspectionStaff::getUserId, adminUser.getId())); + if (ObjectUtil.isNull(staff)) { + InspectionStaff inspectionStaff = BeanUtil.copyProperties(inspectionStaffVo, InspectionStaff.class); + inspectionStaff.setUserId(adminUser.getId()); + this.save(inspectionStaff); + } + } + } + return inspectionStaffVo.getUserId(); } /** diff --git a/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/service/impl/InspectionWorkNodeServiceImpl.java b/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/service/impl/InspectionWorkNodeServiceImpl.java index fa89ca97..2b1454e6 100644 --- a/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/service/impl/InspectionWorkNodeServiceImpl.java +++ b/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/service/impl/InspectionWorkNodeServiceImpl.java @@ -3,18 +3,14 @@ package cn.iocoder.yudao.module.inspection.service.impl; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.ObjectUtil; +import cn.iocoder.yudao.common.service.InspectionNoticeService; import cn.iocoder.yudao.framework.security.core.LoginUser; import cn.iocoder.yudao.framework.security.core.util.SecurityFrameworkUtils; import cn.iocoder.yudao.module.appBase.controller.admin.InspectionSocket; -import cn.iocoder.yudao.module.inspection.entity.DlInspectionProject; -import cn.iocoder.yudao.module.inspection.entity.InspectionInfo; -import cn.iocoder.yudao.module.inspection.entity.InspectionStepInfo; -import cn.iocoder.yudao.module.inspection.entity.InspectionWorkNode; +import cn.iocoder.yudao.module.constant.InspectionConstants; +import cn.iocoder.yudao.module.inspection.entity.*; import cn.iocoder.yudao.module.inspection.mapper.InspectionWorkNodeMapper; -import cn.iocoder.yudao.module.inspection.service.DlInspectionProjectService; -import cn.iocoder.yudao.module.inspection.service.IInspectionInfoService; -import cn.iocoder.yudao.module.inspection.service.IInspectionWorkNodeService; -import cn.iocoder.yudao.module.inspection.service.InspectionStepInfoService; +import cn.iocoder.yudao.module.inspection.service.*; import cn.iocoder.yudao.module.inspection.vo.StaffProjectCountVO; import cn.iocoder.yudao.module.system.api.user.dto.UserDTO; import cn.iocoder.yudao.module.system.dal.dataobject.user.AdminUserDO; @@ -56,6 +52,10 @@ public class InspectionWorkNodeServiceImpl extends ServiceImpl inspectionWorkNodes = this.list(queryWrapper); boolean flag = true; //判断是否是最后一个流程 - if (inspectionWorkNodes.size() == 1 && inspectionWorkNodes.get(0).getId().equals(workNode.getId())) { + if (inspectionWorkNodes.size() == 1 && inspectionWorkNodes.get(0).getId().equals(workNode.getId()) && "1".equals(inspectionWorkNode.getType())) { flag = false; } @@ -278,6 +278,16 @@ public class InspectionWorkNodeServiceImpl extends ServiceImpl() + .eq(InspectionMeetCarOrder::getInspectionInfoId, workNode.getInspectionInfoId()).last("limit 1").orderByAsc(InspectionMeetCarOrder::getCreateTime)); + if (ObjectUtil.isNotEmpty(inspectionMeetCarOrder) && inspectionMeetCarOrder.getMeetType() == 2) { + // 发送订单返程的站内信 + String msg = String.format(InspectionConstants.INSPECTION_NOTICE_TEMPLATE_BUSINESS_MANAGER_MEET_CAR_ORDER_COMPLETE, inspectionMeetCarOrder.getBuyName() == null ? inspectionMeetCarOrder.getBuyPhone() : inspectionMeetCarOrder.getBuyName()); + noticeService.sentMessage(inspectionMeetCarOrder.getMeetManId(), msg); + } } // else { // //修改工单表当前流程 @@ -458,6 +468,7 @@ public class InspectionWorkNodeServiceImpl extends ServiceImpl> children = (List>) userEntry.get("children"); + vo.setCount(vo.getCount() == null ? 0 : vo.getCount()); if (vo.getCount() == 0) { continue; } @@ -579,6 +590,16 @@ public class InspectionWorkNodeServiceImpl extends ServiceImpl() + .eq(InspectionMeetCarOrder::getInspectionInfoId, inspectionWorkNode.getInspectionInfoId()).last("limit 1").orderByAsc(InspectionMeetCarOrder::getCreateTime)); + if (ObjectUtil.isNotEmpty(inspectionMeetCarOrder) && inspectionMeetCarOrder.getMeetType() == 2) { + // 发送订单返程的站内信 + String msg = String.format(InspectionConstants.INSPECTION_NOTICE_TEMPLATE_BUSINESS_MANAGER_MEET_CAR_ORDER_UNQUALIFIED, inspectionMeetCarOrder.getBuyName() == null ? inspectionMeetCarOrder.getBuyName() : inspectionMeetCarOrder.getBuyPhone()); + noticeService.sentMessage(inspectionMeetCarOrder.getMeetManId(), msg); + } + //将流程节点改为已完成 // InspectionWorkNode byId = this.getById(inspectionWorkNode.getId()); // byId.setStatus("2"); diff --git a/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/vo/InspectionStaffSaveVo.java b/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/vo/InspectionStaffSaveVo.java index a85da251..329842d7 100644 --- a/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/vo/InspectionStaffSaveVo.java +++ b/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/vo/InspectionStaffSaveVo.java @@ -5,6 +5,7 @@ import cn.iocoder.yudao.module.infra.dal.dataobject.file.FileDO; import cn.iocoder.yudao.module.inspection.entity.InspectionStaff; import cn.iocoder.yudao.module.system.api.user.dto.UserRoleDTO; import cn.iocoder.yudao.module.system.dal.dataobject.permission.RoleDO; +import cn.iocoder.yudao.module.system.dal.dataobject.user.AdminUserDO; import com.alibaba.excel.annotation.ExcelIgnore; import com.alibaba.excel.annotation.ExcelProperty; import com.fasterxml.jackson.databind.annotation.JsonDeserialize; @@ -116,4 +117,6 @@ public class InspectionStaffSaveVo extends InspectionStaff { * 角色集合 */ private List userRoles; + + private List adminUsers; } diff --git a/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/payment/controller/OrderController.java b/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/payment/controller/OrderController.java index 20970b7d..04deefab 100644 --- a/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/payment/controller/OrderController.java +++ b/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/payment/controller/OrderController.java @@ -2,6 +2,7 @@ package cn.iocoder.yudao.module.payment.controller; import cn.iocoder.yudao.framework.common.pojo.CommonResult; +import cn.iocoder.yudao.framework.tenant.core.aop.TenantIgnore; import cn.iocoder.yudao.module.core.controller.BaseController; import cn.iocoder.yudao.module.core.page.PageDomain; import cn.iocoder.yudao.module.core.page.TableSupport; @@ -159,7 +160,9 @@ public class OrderController extends BaseController { */ @GetMapping("/getCommentOrderList") - public CommonResult getCommentOrderList(Long partnerId, + @TenantIgnore + public CommonResult getCommentOrderList( + @RequestParam(value = "tenantId" ,required = false ,defaultValue = "1") Long tenantId, @RequestParam(value = "pageNum" ,required = false ,defaultValue = "1") Integer pageNum, @RequestParam(value ="pageSize" ,required = false ,defaultValue = "10") Integer pageSize) { //判断商家是否开启评论区 @@ -168,7 +171,7 @@ public class OrderController extends BaseController { // return success(new ArrayList<>()); // } Page page = new Page<>(pageNum, pageSize); - IPage commentOrderList = orderInfoService.getCommentOrderList(page,partnerId); + IPage commentOrderList = orderInfoService.getCommentOrderList(page,tenantId); return success(commentOrderList); } diff --git a/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/payment/mapper/OrderInfoMapper.java b/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/payment/mapper/OrderInfoMapper.java index 4dbf1d55..d1148b40 100644 --- a/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/payment/mapper/OrderInfoMapper.java +++ b/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/payment/mapper/OrderInfoMapper.java @@ -61,7 +61,7 @@ public interface OrderInfoMapper extends BaseMapper { Integer getNoCommentOrder(@Param("userId") Long userId); - IPage getCommentOrderList(Page page, @Param("partnerId") Long partnerId); + IPage getCommentOrderList(Page page, @Param("tenantId") Long tenantId); IPage orderListPc(Page page,@Param("vo") OrderInfo orderInfo); } diff --git a/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/payment/service/OrderInfoService.java b/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/payment/service/OrderInfoService.java index 302ddeb6..c4c1b3ac 100644 --- a/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/payment/service/OrderInfoService.java +++ b/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/payment/service/OrderInfoService.java @@ -78,7 +78,7 @@ public interface OrderInfoService extends IService { Integer getNoCommentOrder(); - IPage getCommentOrderList(Page page,Long partnerId); + IPage getCommentOrderList(Page page,Long tenantId); IPage orderListPc(Page page,OrderInfo orderInfo); diff --git a/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/payment/service/impl/OrderInfoServiceImpl.java b/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/payment/service/impl/OrderInfoServiceImpl.java index 13409e73..d8d58d94 100644 --- a/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/payment/service/impl/OrderInfoServiceImpl.java +++ b/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/payment/service/impl/OrderInfoServiceImpl.java @@ -855,8 +855,8 @@ public class OrderInfoServiceImpl extends ServiceImpl getCommentOrderList(Page page, Long partnerId) { - return baseMapper.getCommentOrderList(page, partnerId); + public IPage getCommentOrderList(Page page, Long tenantId) { + return baseMapper.getCommentOrderList(page, tenantId); } @Override diff --git a/dl-module-inspection/src/main/resources/mapper/InspectionWorkNodeMapper.xml b/dl-module-inspection/src/main/resources/mapper/InspectionWorkNodeMapper.xml index 9270dedc..135cebba 100644 --- a/dl-module-inspection/src/main/resources/mapper/InspectionWorkNodeMapper.xml +++ b/dl-module-inspection/src/main/resources/mapper/InspectionWorkNodeMapper.xml @@ -252,21 +252,22 @@ FROM inspection_staff staff LEFT JOIN inspection_work_node iwn ON iwn.deal_user_id = staff.user_id + + AND iwn.create_time BETWEEN concat(#{datetimeRange[0]}, ' 00:00:00') AND concat(#{datetimeRange[1]}, ' 23:59:59') + LEFT JOIN inspection_project ip ON ip.id = iwn.project_id - LEFT JOIN ( - SELECT DISTINCT sur.user_id - FROM system_user_role sur - JOIN system_role sr ON sur.role_id = sr.id - WHERE sr.service_package_id = 'jiance' - AND sr.CODE NOT IN ('jcyh', 'jcywjl') - ) valid_roles ON staff.user_id = valid_roles.user_id +-- LEFT JOIN ( +-- SELECT DISTINCT sur.user_id +-- FROM system_user_role sur +-- JOIN system_role sr ON sur.role_id = sr.id +-- WHERE sr.service_package_id = 'jiance' +-- AND sr.CODE NOT IN ('jcyh', 'jcywjl') +-- ) valid_roles ON staff.user_id = valid_roles.user_id LEFT JOIN system_users su ON su.id = staff.user_id staff.deleted = 0 - AND (valid_roles.user_id IS NOT NULL) -- 只保留有合格角色的用户 - - AND iwn.create_time BETWEEN #{datetimeRange[0]} AND #{datetimeRange[1]} - +-- AND (valid_roles.user_id IS NOT NULL) -- 只保留有合格角色的用户 + GROUP BY staff.user_id ,ip.id @@ -338,6 +339,7 @@ ii.worker_name AS workerName, ii.worker_phone AS workerPhone, ii.worker_avatar AS workerAvatar, + oi.sku_name AS skuName, CASE WHEN ii.is_pass = '0' THEN '不通过' WHEN ii.is_pass = '1' THEN '通过' @@ -348,6 +350,7 @@ FROM inspection_work_node iwn LEFT JOIN inspection_info ii ON iwn.inspection_info_id = ii.id LEFT JOIN inspection_project ip ON ip.id = iwn.project_id + LEFT JOIN order_info oi ON oi.id = ii.inspection_order_id AND iwn.deal_user_id = #{query.userId} diff --git a/dl-module-inspection/src/main/resources/mapper/inspection/AppInspectionGoodsMapper.xml b/dl-module-inspection/src/main/resources/mapper/inspection/AppInspectionGoodsMapper.xml index 6d3e8beb..81fe902a 100644 --- a/dl-module-inspection/src/main/resources/mapper/inspection/AppInspectionGoodsMapper.xml +++ b/dl-module-inspection/src/main/resources/mapper/inspection/AppInspectionGoodsMapper.xml @@ -20,7 +20,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" shop_inspection_category category INNER JOIN shop_inspection_goods goods ON category.id = goods.goods_category_id and goods.is_listing='1' INNER JOIN inspection_goods_sku sku ON goods.id = sku.goods_id - where goods.partner_id = #{partnerId} + where goods.tenant_id = #{tenantId} group by goods.id ORDER BY category.order_num diff --git a/dl-module-inspection/src/main/resources/mapper/inspection/InspectionInfoMapper.xml b/dl-module-inspection/src/main/resources/mapper/inspection/InspectionInfoMapper.xml index 046f684d..c4042478 100644 --- a/dl-module-inspection/src/main/resources/mapper/inspection/InspectionInfoMapper.xml +++ b/dl-module-inspection/src/main/resources/mapper/inspection/InspectionInfoMapper.xml @@ -618,39 +618,44 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - + SELECT + imco.meet_man_id, + imco.buy_name, + imco.buy_phone, + imco.car_num, + imco.other_phone, + imco.inspection_info_id AS inspectionInfoId - ,ii.id AS id,imco.id AS meetCarId,oi.sku_name AS skuName,oi.goods_title,ii.* + ,ii.id AS id, + imco.id AS meetCarId, + oi.sku_name AS skuName, + oi.goods_title, + ii.* ,imco.id AS id FROM inspection_meet_car_order imco - JOIN inspection_business_channel ibc - ON imco.customer_source_id = ibc.id - INNER JOIN inspection_info ii ON imco.inspection_info_id = ii.id AND ii.deleted = 0 - LEFT JOIN order_info oi ON ii.inspection_order_id = oi.id AND oi.deleted = 0 + INNER JOIN inspection_info ii + ON imco.inspection_info_id = ii.id AND ii.deleted = 0 + LEFT JOIN order_info oi + ON ii.inspection_order_id = oi.id AND oi.deleted = 0 + + WHERE imco.deleted = 0 + + AND imco.meet_man_id = #{info.userId} + + + AND imco.car_num LIKE CONCAT('%', #{info.carNum}, '%') + + + AND ii.status = '0' + + + AND ii.status = '1' - - ibc.deleted = 0 - AND imco.deleted = 0 - - AND FIND_IN_SET(#{info.userId}, ibc.user_ids) - AND imco.creator = #{info.userId} - - - AND imco.car_num LIKE CONCAT('%', #{info.carNum}, '%') - - - AND ii.status = '0' - - - AND ii.status = '1' - - select distinct su.*,GROUP_CONCAT(DISTINCT sr2.name SEPARATOR ',') AS roleNames - from system_users su + from inspection_staff staff + LEFT JOIN system_users su on staff.user_id = su.id left join system_user_role sr on su.id = sr.user_id left join system_role sr2 on sr.role_id = sr2.id - su.deleted = 0 and sr2.service_package_id = 'jiance' and sr2.code != 'jcyh' - + su.deleted = 0 and (su.nickname like CONCAT('%',#{role.nickname},'%') OR su.username like CONCAT('%',#{role.nickname},'%'))