From a858d0f96cd50b7587cd0ac7291e0432e48ac759 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期六, 12 七月 2025 10:19:26 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TAppealController.java | 234 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 232 insertions(+), 2 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TAppealController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TAppealController.java
index b597244..a8d58d5 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TAppealController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TAppealController.java
@@ -1,9 +1,33 @@
package com.ruoyi.web.controller.api;
+import com.ruoyi.common.annotation.Log;
+import com.ruoyi.common.basic.PageInfo;
+import com.ruoyi.common.core.domain.BaseModel;
+import com.ruoyi.common.core.domain.R;
+import com.ruoyi.common.core.domain.entity.SysUser;
+import com.ruoyi.common.enums.BusinessType;
+import com.ruoyi.common.utils.bean.BeanUtils;
+import com.ruoyi.framework.web.service.TokenService;
+import com.ruoyi.system.dto.TAppealAuditDTO;
+import com.ruoyi.system.model.*;
+import com.ruoyi.system.query.InsepectorListQuery;
+import com.ruoyi.system.service.*;
+import com.ruoyi.system.vo.system.AppealDetailVO;
+import com.ruoyi.system.vo.system.AppealListVO;
+import com.tencentcloudapi.es.v20180416.models.TaskDetail;
import io.swagger.annotations.Api;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.util.CollectionUtils;
+import org.springframework.util.StringUtils;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+import javax.validation.Valid;
+import java.time.LocalDateTime;
+import java.util.Arrays;
+import java.util.List;
+import java.util.stream.Collectors;
/**
* <p>
@@ -17,6 +41,212 @@
@RestController
@RequestMapping("/t-appeal")
public class TAppealController {
+ @Resource
+ private TTaskCleanService taskCleanService;
+
+
+
+ @Resource
+ private TLocationTypeService locationTypeService;
+ @Resource
+ private TLocationService locationService;
+
+ @Resource
+ private TTaskDetailService tTaskDetailService;
+ @Resource
+ private TProjectDeptService projectDeptService;
+ @Resource
+ private TDeptService deptService;
+ @Resource
+ private ISysUserService sysUserService;
+
+ @Resource
+ private TokenService tokenService;
+
+ @Resource
+ private TAppealService appealService;
+ @ApiOperation(value = "申诉记录分页列表")
+ @PostMapping(value = "/pageList")
+ public R<PageInfo<AppealListVO>> pageList(@RequestBody InsepectorListQuery query) {
+ List<SysUser> sysUsers = sysUserService.selectAllList();
+ List<TLocation> locationList = locationService.list();
+ if (StringUtils.hasLength(query.getDeptName())){
+ List<TProjectDept> list = projectDeptService.lambdaQuery().like(TProjectDept::getProjectName, query.getDeptName()).list();
+ List<String> listIds = projectDeptService.lambdaQuery().like(TProjectDept::getProjectName, query.getDeptName()).list()
+ .stream().map(TProjectDept::getId).collect(Collectors.toList());
+ for (TProjectDept tProjectDept : list) {
+ if (tProjectDept.getParentId().equals("0")){
+ List<String> collect = projectDeptService.lambdaQuery().eq(TProjectDept::getParentId, tProjectDept.getId()).list()
+ .stream().map(TProjectDept::getId).collect(Collectors.toList());
+ listIds.addAll(collect);
+ }
+ }
+ List<String> deptIds = deptService.lambdaQuery().like(TDept::getDeptName, query.getDeptName()).list()
+ .stream().map(TDept::getId).collect(Collectors.toList());
+ listIds.addAll(deptIds);
+ if (listIds.isEmpty()){
+ listIds.add("0");
+ }
+ query.setPatrolInspectorIds(sysUsers.stream().filter(e->listIds.contains(e.getDeptId())).map(SysUser::getUserId)
+ .collect(Collectors.toList()));
+ if (StringUtils.hasLength(query.getPhonenumber())){
+ List<Long> patrolInspectorIds = sysUsers.stream().filter(sysUser ->
+ sysUser.getPhonenumber().equals(query.getPhonenumber())
+ && listIds.contains(sysUser.getDeptId())
+ ).map(SysUser::getUserId).collect(Collectors.toList());
+ if (patrolInspectorIds.isEmpty()){
+ return R.ok(new PageInfo<>());
+ }
+ query.setPatrolInspectorIds(patrolInspectorIds);
+ }
+ }
+ if (StringUtils.hasLength(query.getPhonenumber())){
+ List<Long> patrolInspectorIds = sysUsers.stream().filter(sysUser ->
+ sysUser.getPhonenumber().equals(query.getPhonenumber())
+ ).map(SysUser::getUserId).collect(Collectors.toList());
+ if (!CollectionUtils.isEmpty(query.getPatrolInspectorIds())){
+ // 取交集
+ patrolInspectorIds = patrolInspectorIds.stream().filter(query.getPatrolInspectorIds()::contains).collect(Collectors.toList());
+ }
+ query.setPatrolInspectorIds(patrolInspectorIds);
+ if (patrolInspectorIds.isEmpty()){
+ return R.ok(new PageInfo<>());
+ }
+ }
+ if (query.getClearStatus()!=null){
+ List<String> collect = tTaskDetailService.lambdaQuery().eq(TTaskDetail::getClearStatus, query.getClearStatus())
+ .eq(TTaskDetail::getHandleType,1)
+ .groupBy(TTaskDetail::getTaskId)
+ .orderByDesc(BaseModel::getCreateTime)
+ .list().stream().map(TTaskDetail::getTaskId).collect(Collectors.toList());
+
+ query.setTaskIds(collect);
+ if (collect.isEmpty()){
+ return R.ok(new PageInfo<>());
+ }
+ }
+ if (query.getLocationType()!=null){
+ List<String> collect = locationList.stream().filter(e -> e.getLocationType().equals(query.getLocationType())).map(TLocation::getId)
+ .collect(Collectors.toList());
+ if (collect.isEmpty()){
+ return R.ok(new PageInfo<>());
+ }
+ query.setLocationIds(collect);
+ }
+ if (StringUtils.hasLength(query.getLocationName())){
+ List<String> collect = locationList.stream().filter(e -> e.getLocationName().contains(query.getLocationName())).map(TLocation::getId)
+ .collect(Collectors.toList());
+ if (collect.isEmpty()){
+ query.setLocationIds(collect);
+ return R.ok(new PageInfo<>());
+ }else{
+ if (query.getLocationIds()!=null){
+ collect = collect.stream().filter(query.getLocationIds()::contains).collect(Collectors.toList());
+ if (collect.isEmpty()){
+ return R.ok(new PageInfo<>());
+ }
+ }
+ query.setLocationIds(collect);
+ }
+ }
+ return R.ok(appealService.pageList(query));
+ }
+ @Log(title = "批量删除申诉记录", businessType = BusinessType.DELETE)
+ @ApiOperation(value = "批量删除申诉记录")
+ @DeleteMapping(value = "/deleteByIds")
+ public R<Boolean> deleteByIds(@RequestParam String ids) {
+ String[] split = ids.split(",");
+ appealService.removeBatchByIds(Arrays.asList(split));
+ return R.ok();
+ }
+ @Log(title = "删除申诉记录", businessType = BusinessType.DELETE)
+ @ApiOperation(value = "删除申诉记录")
+ @DeleteMapping(value = "/deleteById")
+ public R<Boolean> deleteById(@RequestParam String id) {
+ appealService.removeById(id);
+ return R.ok();
+ }
+ @ApiOperation(value = "详情申诉记录")
+ @GetMapping(value = "/detail")
+ public R<AppealDetailVO> detail(@RequestParam String id) {
+ AppealDetailVO appealDetailVO = new AppealDetailVO();
+ TAppeal appeal = appealService.getById(id);
+ BeanUtils.copyProperties(appeal,appealDetailVO);
+ TTask byId = taskCleanService.getById(appeal.getTaskId());
+ TLocation byId1 = locationService.getById(byId.getLocationId());
+ TLocationType byId2 = locationTypeService.getById(byId1.getLocationType());
+ appealDetailVO.setLocationAddress(byId1.getLocationAddress());
+ appealDetailVO.setLocationIcon(byId2.getLocationIcon());
+ appealDetailVO.setLocationName(byId2.getLocationName());
+ appealDetailVO.setTaskId(byId.getId());
+ if (appeal.getAuditPerson()!=null){
+ SysUser sysUser = sysUserService.selectUserById(Long.valueOf(appeal.getAuditPerson()));
+ if (sysUser!=null){
+ appealDetailVO.setAuditPersonName(sysUser.getUserName());
+ }
+ }
+ appealDetailVO.setTaskName(byId.getTaskName());
+ appealDetailVO.setTaskCode(byId.getTaskCode());
+ return R.ok(appealDetailVO);
+ }
+ @Resource
+ private TNoticeService noticeService;
+ @Log(title = "审核申诉记录", businessType = BusinessType.UPDATE)
+ @ApiOperation(value = "审核申诉记录")
+ @PostMapping(value = "/audit")
+ public R<Boolean> audit(@RequestBody @Valid TAppealAuditDTO dto) {
+ TAppeal appeal = appealService.getById(dto.getId());
+ dto.setStatus(dto.getStatus());
+ dto.setAuditPerson(tokenService.getLoginUser().getUserId()+"");
+ dto.setAuditTime(LocalDateTime.now());
+ TTask task = taskCleanService.getById(appeal.getTaskId());
+ TLocation location = locationService.getById(task.getLocationId());
+ TNotice tNotice = new TNotice();
+ tNotice.setUserId(appeal.getAppealPerson());
+ tNotice.setStatus(1);
+ tNotice.setDataId(dto.getId());
+ dto.setAuditTime(LocalDateTime.now());
+ TTaskDetail taskDetail = new TTaskDetail();
+ taskDetail.setTaskId(appeal.getTaskId());
+ Long count = tTaskDetailService.lambdaQuery().eq(TTaskDetail::getTaskId, appeal.getTaskId())
+ .eq(TTaskDetail::getHandleType, 1).count();
+ if (dto.getStatus()==2){
+ taskDetail.setClearStatus(1);
+ taskDetail.setAuditTime(LocalDateTime.now());
+ taskDetail.setAuditPerson(tokenService.getLoginUser().getUserId()+"");
+ taskDetail.setAuditStatus(1);
+ taskDetail.setAuditRemark(dto.getAuditRemark());
+ taskDetail.setHandleType(5);
+ taskDetail.setAppealId(dto.getId());
+ // 通过
+ TTask byId = taskCleanService.getById(dto.getTaskId());
+ if (count>1){
+ byId.setStatus(5);
+ }else{
+ byId.setStatus(6);
+
+ }
+
+ taskCleanService.updateById(byId);
+ tNotice.setNoticeType(5);
+ tNotice.setNoticeContent("【"+location.getLocationName()+"】任务申诉通过");
+ }else{
+ taskDetail.setClearStatus(2);
+ taskDetail.setAuditTime(LocalDateTime.now());
+ taskDetail.setAuditPerson(tokenService.getLoginUser().getUserId()+"");
+ taskDetail.setAuditStatus(2);
+ taskDetail.setAuditRemark(dto.getAuditRemark());
+ taskDetail.setHandleType(6);
+ taskDetail.setAppealId(dto.getId());
+ tNotice.setNoticeType(4);
+ tNotice.setNoticeContent("【"+location.getLocationName()+"】任务申诉驳回");
+ }
+ noticeService.save(tNotice);
+ dto.setAuditPerson(tokenService.getLoginUser().getUserId()+"");
+ appealService.updateById(dto);
+ tTaskDetailService.save(taskDetail);
+ return R.ok();
+ }
}
--
Gitblit v1.7.1