From ee09665193c0e91997a9eb880aefbaa5c7342b24 Mon Sep 17 00:00:00 2001
From: zj <1772600164@qq.com>
Date: Mon, 22 Sep 2025 02:12:26 +0800
Subject: [PATCH] 1

---
 ruoyi-admin/src/main/java/com/ruoyi/web/controller/product/UserPolicyController.java |   51 ++++++++++++++++++++++++++++++++++++++++++++++++---
 1 files changed, 48 insertions(+), 3 deletions(-)

diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/product/UserPolicyController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/product/UserPolicyController.java
index 8bb30d0..a128a55 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/product/UserPolicyController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/product/UserPolicyController.java
@@ -1,16 +1,22 @@
 package com.ruoyi.web.controller.product;
 
+import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.util.ObjectUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.ruoyi.common.core.controller.BaseController;
 import com.ruoyi.common.core.domain.AjaxResult;
 import com.ruoyi.common.core.domain.R;
+import com.ruoyi.common.core.page.TableDataInfo;
 import com.ruoyi.common.utils.StringUtils;
 import com.ruoyi.im.comm.Result;
 import com.ruoyi.im.service.MedicalInsuranceAccountService;
+import com.ruoyi.system.domain.InsuranceProduct;
 import com.ruoyi.system.domain.MedicalInsuranceAccount;
+import com.ruoyi.system.domain.UserAccount;
 import com.ruoyi.system.domain.UserPolicy;
 import com.ruoyi.system.domain.dto.UserPolicyDto;
 import com.ruoyi.im.service.UserPolicyService;
+import com.ruoyi.system.service.UserAccountService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.transaction.interceptor.TransactionAspectSupport;
@@ -26,13 +32,16 @@
 
 @RestController
 @RequestMapping("/userPolicy")
-public class UserPolicyController {
+public class UserPolicyController extends BaseController {
 
     @Autowired
     UserPolicyService userPolicyService;
 
     @Autowired
     MedicalInsuranceAccountService medicalInsuranceAccountService;
+
+    @Autowired
+    UserAccountService userAccountService;
 
     /**
      * 保险购买申请
@@ -51,9 +60,11 @@
      * 根据用户id查询保单
      */
     @GetMapping("/getPolicyById")
-    public Result getPolicyById(@RequestParam(value = "id") Integer id) {
+    public Result getPolicyById(@RequestParam(value = "account") String account) {
         try {
-            List<UserPolicy> list = userPolicyService.list(new LambdaQueryWrapper<UserPolicy>().eq(UserPolicy::getUserId, id));
+            UserAccount userAccount = userAccountService.getOne(new LambdaQueryWrapper<UserAccount>()
+                    .eq(UserAccount::getAccount,account));
+            List<UserPolicy> list = userPolicyService.list(new LambdaQueryWrapper<UserPolicy>().eq(UserPolicy::getUserId, userAccount.getId()));
             return Result.success(list);
         }catch (Exception e){
             e.printStackTrace();
@@ -62,6 +73,40 @@
     }
 
     /**
+     * 保单列表
+     */
+    @GetMapping("/list")
+    public TableDataInfo list(@RequestParam(value = "account",required = false) String account,
+                              @RequestParam(value = "approvalStatus",required = false) Integer approvalStatus,
+                              @RequestParam(value = "productName",required = false) String productName) {
+        startPage();
+
+        LambdaQueryWrapper<UserPolicy> wrapper = new LambdaQueryWrapper<>();
+
+        // 产品名称模糊查询
+        if (org.apache.commons.lang3.StringUtils.isNotBlank(account)) {
+            wrapper.like(UserPolicy::getUserId, account);
+        }
+
+        // 产品代码模糊查询
+        if (org.apache.commons.lang3.StringUtils.isNotBlank(productName)) {
+            wrapper.like(UserPolicy::getProductName, productName);
+        }
+
+        // 产品状态精确查询
+        if (approvalStatus != null) {
+            wrapper.eq(UserPolicy::getApprovalStatus, approvalStatus);
+        }
+
+        // 按创建时间倒序排列
+        wrapper.orderByDesc(UserPolicy::getCreatedAt);
+
+        List<UserPolicy> list = userPolicyService.list(wrapper);
+        return getDataTable(list);
+    }
+
+
+    /**
      * 保单审批
      */
     @GetMapping("/examine")

--
Gitblit v1.9.3