From 76b2eafa5bc27ea062066cf03f7264fd8bec89aa Mon Sep 17 00:00:00 2001 From: chenweiwei Date: Tue, 4 Jun 2024 15:17:13 +0800 Subject: [PATCH] 查询拜访-节点处理人 --- zr-cloud/zr-modules/zr-schsf/src/main/java/com/chinagas/modules/schsf/controller/McVisitController.java | 21 +++++++++++++++++++++ zr-cloud/zr-modules/zr-schsf/src/main/java/com/chinagas/modules/schsf/service/IMcVisitService.java | 17 +++++++++++++---- zr-cloud/zr-modules/zr-schsf/src/main/java/com/chinagas/modules/schsf/service/impl/McVisitServiceImpl.java | 61 ++++++++++++++++++++++++++++++++++++++++++++++--------------- 3 files changed, 80 insertions(+), 19 deletions(-) diff --git a/zr-cloud/zr-modules/zr-schsf/src/main/java/com/chinagas/modules/schsf/controller/McVisitController.java b/zr-cloud/zr-modules/zr-schsf/src/main/java/com/chinagas/modules/schsf/controller/McVisitController.java index 41da03e..95b618d 100644 --- a/zr-cloud/zr-modules/zr-schsf/src/main/java/com/chinagas/modules/schsf/controller/McVisitController.java +++ b/zr-cloud/zr-modules/zr-schsf/src/main/java/com/chinagas/modules/schsf/controller/McVisitController.java @@ -2,6 +2,7 @@ package com.chinagas.modules.schsf.controller; import cn.hutool.core.bean.BeanUtil; import com.alibaba.excel.util.StringUtils; +import com.chinagas.api.system.domain.SysUser; import com.chinagas.common.core.domain.AjaxResult; import com.chinagas.common.core.web.controller.BaseController; import com.chinagas.common.core.web.page.TableDataInfo; @@ -43,6 +44,26 @@ public class McVisitController extends BaseController { } +// setStatusNodeUserList + + /** + * 查看节点处理人 + * @param id + * @return + */ + @RequirePermission("schsf:mcVisit:statusNodeUserList") + @GetMapping("/statusNodeUserList/{id}") + public AjaxResult statusNodeUserList(@PathVariable("id") Long id) { + startPage(); + List list = mcVisitService.selectStatusNodeUserList(id); + return AjaxResult.success(list); + } + + + + + + // /** // * 导出拜访工单列表 // */ diff --git a/zr-cloud/zr-modules/zr-schsf/src/main/java/com/chinagas/modules/schsf/service/IMcVisitService.java b/zr-cloud/zr-modules/zr-schsf/src/main/java/com/chinagas/modules/schsf/service/IMcVisitService.java index cc0bc24..6bc6021 100644 --- a/zr-cloud/zr-modules/zr-schsf/src/main/java/com/chinagas/modules/schsf/service/IMcVisitService.java +++ b/zr-cloud/zr-modules/zr-schsf/src/main/java/com/chinagas/modules/schsf/service/IMcVisitService.java @@ -1,5 +1,6 @@ package com.chinagas.modules.schsf.service; +import com.chinagas.api.system.domain.SysUser; import com.chinagas.modules.schsf.domain.McVisit; import com.chinagas.modules.schsf.domain.vo.McVisitAuditVo; import com.chinagas.modules.schsf.domain.vo.McVisitVo; @@ -12,8 +13,7 @@ import java.util.List; * @author cw * @date 2024-05-30 */ -public interface IMcVisitService -{ +public interface IMcVisitService { /** * 查询拜访工单 * @@ -64,12 +64,13 @@ public interface IMcVisitService /** * 审核 - * 1:发布-一级审核 2：发布2级审核 3：异动1级审核 4：异动2级审核 + * 1:发布-一级审核 2：发布2级审核 3：异动1级审核 4：异动2级审核 */ void SubmitAudit(McVisitAuditVo mcVisitAuditVo) throws CloneNotSupportedException; /** * 数据异动 + * * @param mcVisit * @return */ @@ -78,13 +79,21 @@ public interface IMcVisitService /** * 作废工作单 + * * @return */ - int updateMcVisitCancel(Long id,String remark) throws CloneNotSupportedException; + int updateMcVisitCancel(Long id, String remark) throws CloneNotSupportedException; int getCurrentFiscalYear(); + /** + * 节点处理人 + * + * @param id + * @return + */ + List selectStatusNodeUserList(Long id); } diff --git a/zr-cloud/zr-modules/zr-schsf/src/main/java/com/chinagas/modules/schsf/service/impl/McVisitServiceImpl.java b/zr-cloud/zr-modules/zr-schsf/src/main/java/com/chinagas/modules/schsf/service/impl/McVisitServiceImpl.java index 5d2ea87..e7a2e3e 100644 --- a/zr-cloud/zr-modules/zr-schsf/src/main/java/com/chinagas/modules/schsf/service/impl/McVisitServiceImpl.java +++ b/zr-cloud/zr-modules/zr-schsf/src/main/java/com/chinagas/modules/schsf/service/impl/McVisitServiceImpl.java @@ -25,6 +25,7 @@ import java.time.LocalDateTime; import java.time.Month; import java.time.format.DateTimeFormatter; import java.util.ArrayList; +import java.util.Collections; import java.util.HashMap; import java.util.List; import java.util.concurrent.ThreadLocalRandom; @@ -95,21 +96,21 @@ public class McVisitServiceImpl implements IMcVisitService { mcVisitVo.setIsMyAuditing(null); } List mcVisits = mcVisitMapper.selectMcVisitList(mcVisitVo); - for (McVisit mcVisit : mcVisits) { - if (mcVisit.getPublishStatus().equals("PENDING_LEVEL_1_AUDIT")) { - List statusNodeUserList = mcVisitMapper.selectMcVisitStatusNodeUserList(mcVisit.getId().toString(), "schsf:mcVisit:ticket_submitAuditOne"); - mcVisit.setStatusNodeUserList(statusNodeUserList); - } else if (mcVisit.getPublishStatus().equals("PENDING_LEVEL_2_AUDIT")) { - List statusNodeUserList = mcVisitMapper.selectMcVisitStatusNodeUserList(mcVisit.getId().toString(), "schsf:mcVisit:ticket_submitAuditTwo"); - mcVisit.setStatusNodeUserList(statusNodeUserList); - } else if (StringUtils.isNotEmpty(mcVisit.getModificationStatus()) && mcVisit.getModificationStatus().equals("PENDING_LEVEL_1_AUDIT")) { - List statusNodeUserList = mcVisitMapper.selectMcVisitStatusNodeUserList(mcVisit.getId().toString(), "schsf:mcVisit:modification_submitAuditOne"); - mcVisit.setStatusNodeUserList(statusNodeUserList); - } else if (StringUtils.isNotEmpty(mcVisit.getModificationStatus()) && mcVisit.getModificationStatus().equals("PENDING_LEVEL_2_AUDIT")) { - List statusNodeUserList = mcVisitMapper.selectMcVisitStatusNodeUserList(mcVisit.getId().toString(), "schsf:mcVisit:modification_submitAuditTwo"); - mcVisit.setStatusNodeUserList(statusNodeUserList); - } - } +// for (McVisit mcVisit : mcVisits) { +// if (mcVisit.getPublishStatus().equals("PENDING_LEVEL_1_AUDIT")) { +// List statusNodeUserList = mcVisitMapper.selectMcVisitStatusNodeUserList(mcVisit.getId().toString(), "schsf:mcVisit:ticket_submitAuditOne"); +// mcVisit.setStatusNodeUserList(statusNodeUserList); +// } else if (mcVisit.getPublishStatus().equals("PENDING_LEVEL_2_AUDIT")) { +// List statusNodeUserList = mcVisitMapper.selectMcVisitStatusNodeUserList(mcVisit.getId().toString(), "schsf:mcVisit:ticket_submitAuditTwo"); +// mcVisit.setStatusNodeUserList(statusNodeUserList); +// } else if (StringUtils.isNotEmpty(mcVisit.getModificationStatus()) && mcVisit.getModificationStatus().equals("PENDING_LEVEL_1_AUDIT")) { +// List statusNodeUserList = mcVisitMapper.selectMcVisitStatusNodeUserList(mcVisit.getId().toString(), "schsf:mcVisit:modification_submitAuditOne"); +// mcVisit.setStatusNodeUserList(statusNodeUserList); +// } else if (StringUtils.isNotEmpty(mcVisit.getModificationStatus()) && mcVisit.getModificationStatus().equals("PENDING_LEVEL_2_AUDIT")) { +// List statusNodeUserList = mcVisitMapper.selectMcVisitStatusNodeUserList(mcVisit.getId().toString(), "schsf:mcVisit:modification_submitAuditTwo"); +// mcVisit.setStatusNodeUserList(statusNodeUserList); +// } +// } return mcVisits; } @@ -480,4 +481,34 @@ public class McVisitServiceImpl implements IMcVisitService { return date.getYear() + 1; } } + + /** + * 节点处理人 + * + * @param id + * @return + */ + @Override + public List selectStatusNodeUserList(Long id) { + McVisit mcVisit = mcVisitMapper.selectMcVisitById(id); + if (BeanUtil.isEmpty(mcVisit) || + StringUtils.isEmpty(mcVisit.getStatusCode()) || + mcVisit.getStatusCode().equals(VisitStatusEnums.APPROVED) || + mcVisit.getStatusCode().equals(VisitStatusEnums.CANCEL)) { + return null; + } + List statusNodeUserList = new ArrayList<>(); + if (mcVisit.getPublishStatus().equals("PENDING_LEVEL_1_AUDIT")) { + return mcVisitMapper.selectMcVisitStatusNodeUserList(mcVisit.getId().toString(), "schsf:mcVisit:ticket_submitAuditOne"); + } else if (mcVisit.getPublishStatus().equals("PENDING_LEVEL_2_AUDIT")) { + return mcVisitMapper.selectMcVisitStatusNodeUserList(mcVisit.getId().toString(), "schsf:mcVisit:ticket_submitAuditTwo"); + } else if (mcVisit.getPublishStatus().equals("REJECTED") || mcVisit.getPublishStatus().equals("EDITING")) { + return mcVisitMapper.selectMcVisitStatusNodeUserList(mcVisit.getId().toString(), "schsf:mcVisit:edit"); + } else if (StringUtils.isNotEmpty(mcVisit.getModificationStatus()) && mcVisit.getModificationStatus().equals("PENDING_LEVEL_1_AUDIT")) { + return mcVisitMapper.selectMcVisitStatusNodeUserList(mcVisit.getId().toString(), "schsf:mcVisit:modification_submitAuditOne"); + } else if (StringUtils.isNotEmpty(mcVisit.getModificationStatus()) && mcVisit.getModificationStatus().equals("PENDING_LEVEL_2_AUDIT")) { + return mcVisitMapper.selectMcVisitStatusNodeUserList(mcVisit.getId().toString(), "schsf:mcVisit:modification_submitAuditTwo"); + } + return Collections.emptyList(); + } } -- libgit2 0.21.2