From d61c7fab8cd9036e7c4736b6c1008d018f363e5f Mon Sep 17 00:00:00 2001
From: sunzheng <sunzheng.cn>
Date: Fri, 12 Jan 2024 15:04:54 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E6=8C=89id=E6=9F=A5=E8=AF=A2?=
 =?UTF-8?q?=E8=B5=B7=E8=8D=89=E7=BB=84=E4=BF=A1=E6=81=AF(=E5=85=8Dtoken)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/jero/config/shiro/ShiroConfig.java    |  5 ++++
 .../PayDraftingGroupController.java           | 26 +++++++++++++++++++
 2 files changed, 31 insertions(+)

diff --git a/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/config/shiro/ShiroConfig.java b/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/config/shiro/ShiroConfig.java
index 60449e9d..0953459f 100644
--- a/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/config/shiro/ShiroConfig.java
+++ b/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/config/shiro/ShiroConfig.java
@@ -201,6 +201,11 @@ public class ShiroConfig {
         // 快递100-快递信息
         filterChainDefinitionMap.put("/mail/postInfo/queryInfo","anon");
 
+        // 起草组报名-按照id查询
+        filterChainDefinitionMap.put("/drafting/payDraftingGroup/applyQueryById","anon");
+        // 起草组报名-提交信息
+        filterChainDefinitionMap.put("/drafting/payDraftingGroupSubitem/addByQRCode","anon");
+
         // 添加自己的过滤器并且取名为jwt
         Map<String, Filter> filterMap = new HashMap<String, Filter>(1);
         //如果cloudServer为空 则说明是单体 需要加载跨域配置
diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/drafting/controller/PayDraftingGroupController.java b/jero-boot-incoming-payment/src/main/java/com/jero/drafting/controller/PayDraftingGroupController.java
index c9c7f675..7afad13c 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/drafting/controller/PayDraftingGroupController.java
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/drafting/controller/PayDraftingGroupController.java
@@ -300,4 +300,30 @@ public class PayDraftingGroupController extends JeroController<PayDraftingGroup,
     public Result<String> createBase64(String contact) {
         return Result.OK(QrcodeUtil.create(contact));
     }
+
+    /**
+     * 报名-起草组项目报名-通过id查询
+     *
+     * @param id 起草组项目id
+     * @return
+     */
+    @ApiOperation(value="报名-起草组项目-通过id查询", notes="报名-起草组项目-通过id查询")
+    @GetMapping(value = "/applyQueryById")
+    public Result<?> applyQueryById(@RequestParam(name="id") String id) {
+        if (StringUtils.isBlank(id)) {
+            return Result.error("起草组id不能为空");
+        }
+        PayDraftingGroup payDraftingGroup = payDraftingGroupService.getById(id);
+        if(Objects.isNull(payDraftingGroup)) {
+            return Result.error("未找到对应数据");
+        }
+        // 根据工作组id查询对应的工作组名称
+        if (StringUtils.isNotBlank(payDraftingGroup.getWorkingGroupId())) {
+            PayWorkingGroup payWorkingGroup = payDraftingGroupService.getPayWorkingGroupNameById(payDraftingGroup.getWorkingGroupId());
+            if (!Objects.isNull(payWorkingGroup)) {
+                payDraftingGroup.setWorkingGroupName(payWorkingGroup.getWorkingGroupProject());
+            }
+        }
+        return Result.OK(payDraftingGroup);
+    }
 }
\ No newline at end of file