From 7658b1364caa5df10d232117d7728a8a96f57b75 Mon Sep 17 00:00:00 2001 From: mitao <2763622819@qq.com> Date: 星期日, 23 二月 2025 22:56:29 +0800 Subject: [PATCH] 工单列表、详情、办理进度添加、办理结果录入接口 --- springcloud_k8s_panzhihuazhihuishequ/service_sangeshenbian/src/main/java/com/panzhihua/sangeshenbian/service/impl/ComplaintServiceImpl.java | 92 +++++++++++++++++++++++++++++++++++++++++----- 1 files changed, 82 insertions(+), 10 deletions(-) diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_sangeshenbian/src/main/java/com/panzhihua/sangeshenbian/service/impl/ComplaintServiceImpl.java b/springcloud_k8s_panzhihuazhihuishequ/service_sangeshenbian/src/main/java/com/panzhihua/sangeshenbian/service/impl/ComplaintServiceImpl.java index 1bf936b..a2cf0c1 100644 --- a/springcloud_k8s_panzhihuazhihuishequ/service_sangeshenbian/src/main/java/com/panzhihua/sangeshenbian/service/impl/ComplaintServiceImpl.java +++ b/springcloud_k8s_panzhihuazhihuishequ/service_sangeshenbian/src/main/java/com/panzhihua/sangeshenbian/service/impl/ComplaintServiceImpl.java @@ -1,21 +1,31 @@ package com.panzhihua.sangeshenbian.service.impl; +import cn.hutool.core.bean.BeanUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.panzhihua.common.utlis.DateUtils; +import com.panzhihua.common.model.vos.LoginUserInfoVO; import com.panzhihua.sangeshenbian.model.dto.ComplaintCompletionDTO; import com.panzhihua.sangeshenbian.model.dto.ComplaintProcessDTO; import com.panzhihua.sangeshenbian.model.entity.Complaint; import com.panzhihua.sangeshenbian.enums.ProcessStatusEnum; import com.panzhihua.sangeshenbian.dao.ComplaintMapper; +import com.panzhihua.sangeshenbian.model.entity.ComplaintFlow; +import com.panzhihua.sangeshenbian.model.entity.ComplaintProgress; +import com.panzhihua.sangeshenbian.model.entity.SystemUser; import com.panzhihua.sangeshenbian.model.query.ComplaintQuery; +import com.panzhihua.sangeshenbian.service.IComplaintFlowService; +import com.panzhihua.sangeshenbian.service.IComplaintProgressService; import com.panzhihua.sangeshenbian.service.IComplaintService; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.panzhihua.sangeshenbian.model.vo.ComplaintVO; +import com.panzhihua.sangeshenbian.service.ISystemUserService; +import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; import java.text.SimpleDateFormat; import java.util.Date; +import java.util.List; +import java.util.Optional; import static cn.hutool.core.util.ObjectUtil.isNull; @@ -28,7 +38,11 @@ * @since 2025-02-22 */ @Service +@RequiredArgsConstructor public class ComplaintServiceImpl extends ServiceImpl<ComplaintMapper, Complaint> implements IComplaintService { + private final ISystemUserService systemUserService; + private final IComplaintFlowService complaintFlowService; + private final IComplaintProgressService complaintProgressService; @Override public void saveComplaint(Complaint complaint,Long userId) { @@ -57,43 +71,101 @@ // 设置其他字段 complaint.setStatus(ProcessStatusEnum.PROCESSING.getCode()); - complaint.setCreateTime(DateUtils.getCurrentDate()); + complaint.setCreateTime(new Date()); complaint.setCreateBy(userId); complaint.setUpdateBy(userId); - complaint.setUpdateTime(DateUtils.getCurrentDate()); + complaint.setUpdateTime(new Date()); // 保存诉求记录 save(complaint); } /** - * * @param query + * @param loginUserInfoVO * @return */ @Override - public Page<ComplaintVO> complaintList(ComplaintQuery query) { - //判断当前登录用户级别,查询对应工单 + public Page<ComplaintVO> complaintList(ComplaintQuery query, LoginUserInfoVO loginUserInfoVO) { Page<ComplaintVO> page = new Page<>(query.getPageNum(), query.getPageSize()); + //判断当前登录用户级别,查询对应工单 + Optional<SystemUser> systemUserByPhone = systemUserService.getSystemUserByPhone(loginUserInfoVO.getPhone()); + String targetId = ""; + int isSuperior = 0; + //上级 + if (systemUserByPhone.isPresent()) { + SystemUser systemUser = systemUserByPhone.get(); + Integer accountLevel = systemUser.getAccountLevel(); + switch (accountLevel) { + case 1: + //市级 + targetId = "510400"; + break; + case 2: + //区县级 + targetId = systemUser.getDistrictsCode(); + break; + case 3: + //街道 + targetId = systemUser.getStreetCode(); + break; + case 4: + //社区 + targetId = systemUser.getCommunityCode(); + break; + } + isSuperior = 1; + } else { + //党员 + targetId = loginUserInfoVO.getUserId().toString(); + } + //查询对应诉求 + page = baseMapper.selectComplaintPage(page, query, targetId,isSuperior); return page; + } + + /** + * 工单详情 + * @param id + * @return + */ + @Override + public ComplaintVO detail(Long id) { + ComplaintVO detail = baseMapper.getDetail(id); + if (detail.getStatus().equals(0)) { + List<ComplaintFlow> list = complaintFlowService.lambdaQuery().eq(ComplaintFlow::getComplaintId, id).orderByAsc(ComplaintFlow::getCreateTime).list(); + detail.setComplaintFlows(list); + } + return detail; } /** *办理进度录入 * @param dto + * @param userId */ @Override - public void saveProcess(ComplaintProcessDTO dto) { - + public void saveProcess(ComplaintProcessDTO dto,Long userId) { + ComplaintProgress complaintProgress = BeanUtil.copyProperties(dto, ComplaintProgress.class); + complaintProgress.setCreateTime(new Date()); + complaintProgress.setCreateBy(userId); + complaintProgressService.save(complaintProgress); } /** * 办理结果录入 + * * @param dto + * @param loginUserInfoVO */ @Override - public void saveResult(ComplaintCompletionDTO dto) { - + public void saveResult(ComplaintCompletionDTO dto, LoginUserInfoVO loginUserInfoVO) { + Complaint complaint = BeanUtil.copyProperties(dto, Complaint.class); + complaint.setUpdateTime(new Date()); + complaint.setCompletionUserId(loginUserInfoVO.getUserId()); + complaint.setCompletionUsername(loginUserInfoVO.getName()); + complaint.setCompletionTime(new Date()); + this.updateById(complaint); } } -- Gitblit v1.7.1