Commit 76b2eafa5bc27ea062066cf03f7264fd8bec89aa
1 parent
7ba5b364
Exists in
dev
查询拜访-节点处理人
Showing
3 changed files
with
80 additions
and
19 deletions
Show diff stats
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; |
| 2 | 2 | |
| 3 | 3 | import cn.hutool.core.bean.BeanUtil; |
| 4 | 4 | import com.alibaba.excel.util.StringUtils; |
| 5 | +import com.chinagas.api.system.domain.SysUser; | |
| 5 | 6 | import com.chinagas.common.core.domain.AjaxResult; |
| 6 | 7 | import com.chinagas.common.core.web.controller.BaseController; |
| 7 | 8 | import com.chinagas.common.core.web.page.TableDataInfo; |
| ... | ... | @@ -43,6 +44,26 @@ public class McVisitController extends BaseController { |
| 43 | 44 | } |
| 44 | 45 | |
| 45 | 46 | |
| 47 | +// setStatusNodeUserList | |
| 48 | + | |
| 49 | + /** | |
| 50 | + * 查看节点处理人 | |
| 51 | + * @param id | |
| 52 | + * @return | |
| 53 | + */ | |
| 54 | + @RequirePermission("schsf:mcVisit:statusNodeUserList") | |
| 55 | + @GetMapping("/statusNodeUserList/{id}") | |
| 56 | + public AjaxResult statusNodeUserList(@PathVariable("id") Long id) { | |
| 57 | + startPage(); | |
| 58 | + List<SysUser> list = mcVisitService.selectStatusNodeUserList(id); | |
| 59 | + return AjaxResult.success(list); | |
| 60 | + } | |
| 61 | + | |
| 62 | + | |
| 63 | + | |
| 64 | + | |
| 65 | + | |
| 66 | + | |
| 46 | 67 | // /** |
| 47 | 68 | // * 导出拜访工单列表 |
| 48 | 69 | // */ | ... | ... |
zr-cloud/zr-modules/zr-schsf/src/main/java/com/chinagas/modules/schsf/service/IMcVisitService.java
| 1 | 1 | package com.chinagas.modules.schsf.service; |
| 2 | 2 | |
| 3 | +import com.chinagas.api.system.domain.SysUser; | |
| 3 | 4 | import com.chinagas.modules.schsf.domain.McVisit; |
| 4 | 5 | import com.chinagas.modules.schsf.domain.vo.McVisitAuditVo; |
| 5 | 6 | import com.chinagas.modules.schsf.domain.vo.McVisitVo; |
| ... | ... | @@ -12,8 +13,7 @@ import java.util.List; |
| 12 | 13 | * @author cw |
| 13 | 14 | * @date 2024-05-30 |
| 14 | 15 | */ |
| 15 | -public interface IMcVisitService | |
| 16 | -{ | |
| 16 | +public interface IMcVisitService { | |
| 17 | 17 | /** |
| 18 | 18 | * 查询拜访工单 |
| 19 | 19 | * |
| ... | ... | @@ -64,12 +64,13 @@ public interface IMcVisitService |
| 64 | 64 | |
| 65 | 65 | /** |
| 66 | 66 | * 审核 |
| 67 | - * 1:发布-一级审核 2：发布2级审核 3：异动1级审核 4：异动2级审核 | |
| 67 | + * 1:发布-一级审核 2：发布2级审核 3：异动1级审核 4：异动2级审核 | |
| 68 | 68 | */ |
| 69 | 69 | void SubmitAudit(McVisitAuditVo mcVisitAuditVo) throws CloneNotSupportedException; |
| 70 | 70 | |
| 71 | 71 | /** |
| 72 | 72 | * 数据异动 |
| 73 | + * | |
| 73 | 74 | * @param mcVisit |
| 74 | 75 | * @return |
| 75 | 76 | */ |
| ... | ... | @@ -78,13 +79,21 @@ public interface IMcVisitService |
| 78 | 79 | |
| 79 | 80 | /** |
| 80 | 81 | * 作废工作单 |
| 82 | + * | |
| 81 | 83 | * @return |
| 82 | 84 | */ |
| 83 | - int updateMcVisitCancel(Long id,String remark) throws CloneNotSupportedException; | |
| 85 | + int updateMcVisitCancel(Long id, String remark) throws CloneNotSupportedException; | |
| 84 | 86 | |
| 85 | 87 | |
| 86 | 88 | int getCurrentFiscalYear(); |
| 87 | 89 | |
| 88 | 90 | |
| 91 | + /** | |
| 92 | + * 节点处理人 | |
| 93 | + * | |
| 94 | + * @param id | |
| 95 | + * @return | |
| 96 | + */ | |
| 97 | + List<SysUser> selectStatusNodeUserList(Long id); | |
| 89 | 98 | |
| 90 | 99 | } | ... | ... |
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; |
| 25 | 25 | import java.time.Month; |
| 26 | 26 | import java.time.format.DateTimeFormatter; |
| 27 | 27 | import java.util.ArrayList; |
| 28 | +import java.util.Collections; | |
| 28 | 29 | import java.util.HashMap; |
| 29 | 30 | import java.util.List; |
| 30 | 31 | import java.util.concurrent.ThreadLocalRandom; |
| ... | ... | @@ -95,21 +96,21 @@ public class McVisitServiceImpl implements IMcVisitService { |
| 95 | 96 | mcVisitVo.setIsMyAuditing(null); |
| 96 | 97 | } |
| 97 | 98 | List<McVisit> mcVisits = mcVisitMapper.selectMcVisitList(mcVisitVo); |
| 98 | - for (McVisit mcVisit : mcVisits) { | |
| 99 | - if (mcVisit.getPublishStatus().equals("PENDING_LEVEL_1_AUDIT")) { | |
| 100 | - List<SysUser> statusNodeUserList = mcVisitMapper.selectMcVisitStatusNodeUserList(mcVisit.getId().toString(), "schsf:mcVisit:ticket_submitAuditOne"); | |
| 101 | - mcVisit.setStatusNodeUserList(statusNodeUserList); | |
| 102 | - } else if (mcVisit.getPublishStatus().equals("PENDING_LEVEL_2_AUDIT")) { | |
| 103 | - List<SysUser> statusNodeUserList = mcVisitMapper.selectMcVisitStatusNodeUserList(mcVisit.getId().toString(), "schsf:mcVisit:ticket_submitAuditTwo"); | |
| 104 | - mcVisit.setStatusNodeUserList(statusNodeUserList); | |
| 105 | - } else if (StringUtils.isNotEmpty(mcVisit.getModificationStatus()) && mcVisit.getModificationStatus().equals("PENDING_LEVEL_1_AUDIT")) { | |
| 106 | - List<SysUser> statusNodeUserList = mcVisitMapper.selectMcVisitStatusNodeUserList(mcVisit.getId().toString(), "schsf:mcVisit:modification_submitAuditOne"); | |
| 107 | - mcVisit.setStatusNodeUserList(statusNodeUserList); | |
| 108 | - } else if (StringUtils.isNotEmpty(mcVisit.getModificationStatus()) && mcVisit.getModificationStatus().equals("PENDING_LEVEL_2_AUDIT")) { | |
| 109 | - List<SysUser> statusNodeUserList = mcVisitMapper.selectMcVisitStatusNodeUserList(mcVisit.getId().toString(), "schsf:mcVisit:modification_submitAuditTwo"); | |
| 110 | - mcVisit.setStatusNodeUserList(statusNodeUserList); | |
| 111 | - } | |
| 112 | - } | |
| 99 | +// for (McVisit mcVisit : mcVisits) { | |
| 100 | +// if (mcVisit.getPublishStatus().equals("PENDING_LEVEL_1_AUDIT")) { | |
| 101 | +// List<SysUser> statusNodeUserList = mcVisitMapper.selectMcVisitStatusNodeUserList(mcVisit.getId().toString(), "schsf:mcVisit:ticket_submitAuditOne"); | |
| 102 | +// mcVisit.setStatusNodeUserList(statusNodeUserList); | |
| 103 | +// } else if (mcVisit.getPublishStatus().equals("PENDING_LEVEL_2_AUDIT")) { | |
| 104 | +// List<SysUser> statusNodeUserList = mcVisitMapper.selectMcVisitStatusNodeUserList(mcVisit.getId().toString(), "schsf:mcVisit:ticket_submitAuditTwo"); | |
| 105 | +// mcVisit.setStatusNodeUserList(statusNodeUserList); | |
| 106 | +// } else if (StringUtils.isNotEmpty(mcVisit.getModificationStatus()) && mcVisit.getModificationStatus().equals("PENDING_LEVEL_1_AUDIT")) { | |
| 107 | +// List<SysUser> statusNodeUserList = mcVisitMapper.selectMcVisitStatusNodeUserList(mcVisit.getId().toString(), "schsf:mcVisit:modification_submitAuditOne"); | |
| 108 | +// mcVisit.setStatusNodeUserList(statusNodeUserList); | |
| 109 | +// } else if (StringUtils.isNotEmpty(mcVisit.getModificationStatus()) && mcVisit.getModificationStatus().equals("PENDING_LEVEL_2_AUDIT")) { | |
| 110 | +// List<SysUser> statusNodeUserList = mcVisitMapper.selectMcVisitStatusNodeUserList(mcVisit.getId().toString(), "schsf:mcVisit:modification_submitAuditTwo"); | |
| 111 | +// mcVisit.setStatusNodeUserList(statusNodeUserList); | |
| 112 | +// } | |
| 113 | +// } | |
| 113 | 114 | return mcVisits; |
| 114 | 115 | } |
| 115 | 116 | |
| ... | ... | @@ -480,4 +481,34 @@ public class McVisitServiceImpl implements IMcVisitService { |
| 480 | 481 | return date.getYear() + 1; |
| 481 | 482 | } |
| 482 | 483 | } |
| 484 | + | |
| 485 | + /** | |
| 486 | + * 节点处理人 | |
| 487 | + * | |
| 488 | + * @param id | |
| 489 | + * @return | |
| 490 | + */ | |
| 491 | + @Override | |
| 492 | + public List<SysUser> selectStatusNodeUserList(Long id) { | |
| 493 | + McVisit mcVisit = mcVisitMapper.selectMcVisitById(id); | |
| 494 | + if (BeanUtil.isEmpty(mcVisit) || | |
| 495 | + StringUtils.isEmpty(mcVisit.getStatusCode()) || | |
| 496 | + mcVisit.getStatusCode().equals(VisitStatusEnums.APPROVED) || | |
| 497 | + mcVisit.getStatusCode().equals(VisitStatusEnums.CANCEL)) { | |
| 498 | + return null; | |
| 499 | + } | |
| 500 | + List<SysUser> statusNodeUserList = new ArrayList<>(); | |
| 501 | + if (mcVisit.getPublishStatus().equals("PENDING_LEVEL_1_AUDIT")) { | |
| 502 | + return mcVisitMapper.selectMcVisitStatusNodeUserList(mcVisit.getId().toString(), "schsf:mcVisit:ticket_submitAuditOne"); | |
| 503 | + } else if (mcVisit.getPublishStatus().equals("PENDING_LEVEL_2_AUDIT")) { | |
| 504 | + return mcVisitMapper.selectMcVisitStatusNodeUserList(mcVisit.getId().toString(), "schsf:mcVisit:ticket_submitAuditTwo"); | |
| 505 | + } else if (mcVisit.getPublishStatus().equals("REJECTED") || mcVisit.getPublishStatus().equals("EDITING")) { | |
| 506 | + return mcVisitMapper.selectMcVisitStatusNodeUserList(mcVisit.getId().toString(), "schsf:mcVisit:edit"); | |
| 507 | + } else if (StringUtils.isNotEmpty(mcVisit.getModificationStatus()) && mcVisit.getModificationStatus().equals("PENDING_LEVEL_1_AUDIT")) { | |
| 508 | + return mcVisitMapper.selectMcVisitStatusNodeUserList(mcVisit.getId().toString(), "schsf:mcVisit:modification_submitAuditOne"); | |
| 509 | + } else if (StringUtils.isNotEmpty(mcVisit.getModificationStatus()) && mcVisit.getModificationStatus().equals("PENDING_LEVEL_2_AUDIT")) { | |
| 510 | + return mcVisitMapper.selectMcVisitStatusNodeUserList(mcVisit.getId().toString(), "schsf:mcVisit:modification_submitAuditTwo"); | |
| 511 | + } | |
| 512 | + return Collections.emptyList(); | |
| 513 | + } | |
| 483 | 514 | } | ... | ... |