Merge branch '20250410_sun' of sckj/mz-cloud into master

ruoyi-modules/mz-gljt/src/main/java/com/ruoyi/gljt/controller/GljtQxpzController.java

@@ -1,5 +1,6 @@
 package com.ruoyi.gljt.controller;
 
+import com.ruoyi.common.core.exception.ServiceException;
 import com.ruoyi.common.core.utils.StringUtils;
 import com.ruoyi.common.core.utils.poi.ExcelUtil;
 import com.ruoyi.common.core.web.controller.BaseController;
@@ -17,7 +18,9 @@ import com.ruoyi.gljt.service.IGljtQxpzService;
 import com.ruoyi.gljt.utils.GljtSqUtils;
 import com.ruoyi.system.api.domain.SysDictData;
 import com.ruoyi.system.validate.group.AddGroup;
+import org.apache.commons.collections4.CollectionUtils;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.ObjectUtils;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
@@ -26,6 +29,8 @@ import java.math.BigDecimal;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
 
 /**
  * 高龄津贴_区县配置信息Controller
@@ -43,7 +48,6 @@ public class GljtQxpzController extends BaseController
     @Autowired
     private GljtSqUtils gljtSqUtils;
 
-
     /**
      * 查询高龄津贴_区县配置信息列表
      */
@@ -56,6 +60,22 @@ public class GljtQxpzController extends BaseController
         return getDataTable(list);
     }
 
+    @GetMapping("/getKhyh")
+    public AjaxResult getKhyh(GljtQxpz gljtQxpz) {
+        if (StringUtils.isEmpty(gljtQxpz.getXzqh())) throw new ServiceException("行政区划不能为空");
+        List<SysDictData> dictDataList = DictUtils.getDictCache("C0044");
+        GljtQxpz pz = gljtSqUtils.getQxpz(gljtQxpz.getXzqh());
+        if (ObjectUtils.isEmpty(pz)) {
+            return AjaxResult.success(new ArrayList<>());
+        }
+        if (StringUtils.isNotEmpty(pz.getKhyh()) && CollectionUtils.isNotEmpty(dictDataList)) {
+            List<String> khh = Stream.of(pz.getKhyh().split(",")).collect(Collectors.toList());
+            dictDataList = dictDataList.stream().filter(d -> khh.contains(d.getDictValue())).collect(Collectors.toList());
+            return AjaxResult.success(dictDataList);
+        }
+        return AjaxResult.success(new ArrayList<>());
+    }
+
     /**
      * 导出高龄津贴_区县配置信息列表
      */

ruoyi-modules/mz-gljt/src/main/java/com/ruoyi/gljt/domain/GljtQxpz.java

@@ -160,4 +160,6 @@ public class GljtQxpz extends BaseEntity
     private String bfys;
 
     private String iscns;
+
+    private String khyh;
 }

ruoyi-modules/mz-gljt/src/main/java/com/ruoyi/gljt/utils/GljtSqUtils.java

@@ -88,6 +88,16 @@ public class GljtSqUtils {
         }
     }
 
+    public GljtQxpz getQxpz(String xzqh) {
+        GljtQxpz pz = gljtQxpzMapper.selectOne(new LambdaQueryWrapper<GljtQxpz>()
+                .likeRight(GljtQxpz::getXzqh, xzqh.substring(0, 6)));
+        if (org.apache.commons.lang3.ObjectUtils.isNotEmpty(pz)) {
+            return pz;
+        } else {
+            return null;
+        }
+    }
+
     /**
      * 补贴金额及标准
      * @param jf

ruoyi-ui-gljt/src/views/gljt/qxpz/index.vue

@@ -200,6 +200,10 @@
               {{ dict.label }}</el-radio>
           </el-radio-group>
         </el-form-item>
+
+        <el-form-item label="开户银行" prop="khyh">
+          <el-input v-model="form.khyh" placeholder="开户银行代码(逗号分割)" />
+        </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button type="primary" @click="submitForm" :loading="submitFormLoading">确 定</el-button>
@@ -332,6 +336,7 @@ export default {
         isqr: null,
         iscns: null,
         bfys: null,
+        khyh: null,
       };
       this.resetForm("form");
     },