20231205_sun

ruoyi-common/ruoyi-common-datascope/src/main/java/com/ruoyi/common/datascope/handler/DataScopeType.java

@@ -65,7 +65,7 @@ public enum DataScopeType {
     /**
      * 仅本行政区划以下数据权限
      */
-    XZQH_AND_CHILD("8", " #{#xzqhName} like concat('#{#user.sysUser.dept.locationFilter}', '%') ", ""),
+    XZQH_AND_CHILD("8", " #{#xzqhName} = '#{#user.sysUser.dept.locationFilter}' OR #{#xzqhName} like concat('#{#user.sysUser.dept.locationFilter}', ',', '%') ", ""),
     XZQH_AND_CHILD2("998", " #{#xzqhName} IN ( SELECT code FROM sys_dept_jl WHERE code = #{#user.sysUser.dept.locationCode} or find_in_set( #{#user.sysUser.dept.locationCode} , ancestors ) )", ""),
 
     /**

ruoyi-modules/mz-business/src/main/java/com/ruoyi/business/service/impl/SearchYljgJcxxServiceImpl.java

@@ -62,7 +62,7 @@ public class SearchYljgJcxxServiceImpl implements ISearchYljgJcxxService
     public Map<String,Object> selectYljgTj()
     {
         Map<String,Object> res = new HashMap<>();
-        res.put("yljg", gztMapper.selectYljg(SecurityUtils.getUserToUnitId()));
+        res.put("yljg", gztMapper.selectYljg(SecurityUtils.getAreaCode()));
         return res;
     }
 
@@ -70,7 +70,7 @@ public class SearchYljgJcxxServiceImpl implements ISearchYljgJcxxService
     @Override
     public Map<String, Object> selectSqylTj() {
         Map<String,Object> res = new HashMap<>();
-        res.put("sqylfwjghss", gztMapper.selectYljgSq(SecurityUtils.getUserToUnitId()));
+        res.put("sqylfwjghss", gztMapper.selectYljgSq(SecurityUtils.getAreaCode()));
         return res;
     }
 

ruoyi-modules/mz-business/src/main/resources/mapper/business/GztMapper.xml

@@ -5,21 +5,21 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 <mapper namespace="com.ruoyi.business.mapper.GztMapper">
     <select id="selectYljg" parameterType="String" resultType="java.util.Map">
         SELECT
-            (select count(*) from yljg_jcxx where (sczt = '01') and (create_unit IN (SELECT dept_id FROM sys_dept WHERE dept_id = #{unit} OR find_in_set(#{unit}, ancestors)))) as zs,
-            (select count(*) from yljg_jcxx where (sczt = '01') and (create_unit IN (SELECT dept_id FROM sys_dept WHERE dept_id = #{unit} OR find_in_set(#{unit}, ancestors))) and is_ba = '1') as bazs,
-            (select sum(cwzs) from yljg_jcxx where (sczt = '01') and (create_unit IN (SELECT dept_id FROM sys_dept WHERE dept_id = #{unit} OR find_in_set(#{unit}, ancestors)))) as cwzs,
-            (select count(*) from yljg_kh_jbxx kh where is_rz = '1' and jg_id in (select id from yljg_jcxx where (sczt = '01') and (create_unit IN (SELECT dept_id FROM sys_dept WHERE dept_id = #{unit} OR find_in_set(#{unit}, ancestors))))) as xssqfwlnrs,
-            (select count(*) from yljg_yg_jbxx yg where zzzt = '1' and state = '1' and jg_id in (select id from yljg_jcxx where (sczt = '01') and (create_unit IN (SELECT dept_id FROM sys_dept WHERE dept_id = #{unit} OR find_in_set(#{unit}, ancestors))))) as cyry,
-            (select count(*) from yljg_yg_jbxx yg where zzzt = '1' and state = '1' and zylx = '01' and jg_id in (select id from yljg_jcxx where (sczt = '01') and (create_unit IN (SELECT dept_id FROM sys_dept WHERE dept_id = #{unit} OR find_in_set(#{unit}, ancestors))))) as ylhly
+            (select count(*) from yljg_jcxx where (sczt = '01') and (create_qhjsc = #{unit} or create_qhjsc like CONCAT(#{unit}, ',', '%')) and jlrq is not null) as zs,
+            (select count(*) from yljg_jcxx where (sczt = '01') and (create_qhjsc = #{unit} or create_qhjsc like CONCAT(#{unit}, ',', '%'))  and jlrq is not null and is_ba = '1') as bazs,
+            (select sum(cwzs) from yljg_jcxx where (sczt = '01') and (create_qhjsc = #{unit} or create_qhjsc like CONCAT(#{unit}, ',', '%'))) as cwzs,
+            (select count(*) from yljg_kh_jbxx kh where is_rz = '1' and jg_id in (select id from yljg_jcxx where (sczt = '01') and (create_qhjsc = #{unit} or create_qhjsc like CONCAT(#{unit}, ',', '%')) and jlrq is not null)) as xssqfwlnrs,
+            (select count(*) from yljg_yg_jbxx yg where zzzt = '1' and state = '1' and jg_id in (select id from yljg_jcxx where (sczt = '01') and (create_qhjsc = #{unit} or create_qhjsc like CONCAT(#{unit}, ',', '%')) and jlrq is not null)) as cyry,
+            (select count(*) from yljg_yg_jbxx yg where zzzt = '1' and state = '1' and zylx = '01' and jg_id in (select id from yljg_jcxx where (sczt = '01') and (create_qhjsc = #{unit} or create_qhjsc like CONCAT(#{unit}, ',', '%')) and jlrq is not null)) as ylhly
     </select>
 
     <select id="selectYljgSq" parameterType="String" resultType="java.util.Map">
         SELECT
-            (select count(*) from yljgsq_jcxx where (sczt = '01') and (create_unit IN (SELECT dept_id FROM sys_dept WHERE dept_id = #{unit} OR find_in_set(#{unit}, ancestors)))) as total,
-            (select sum(cwzs) from yljgsq_jcxx where (sczt = '01') and (create_unit IN (SELECT dept_id FROM sys_dept WHERE dept_id = #{unit} OR find_in_set(#{unit}, ancestors)))) as cwzs,
-            (select count(*) from yljg_kh_jbxx where jg_id in (select id from yljgsq_jcxx where (sczt = '01') and (create_unit IN (SELECT dept_id FROM sys_dept WHERE dept_id = #{unit} OR find_in_set(#{unit}, ancestors))))) as xssqfwlnrs,
-            (select count(*) from yljg_yg_jbxx where zzzt = '1' and state = '1' and jg_id in (select id from yljgsq_jcxx where (sczt = '01') and (create_unit IN (SELECT dept_id FROM sys_dept WHERE dept_id = #{unit} OR find_in_set(#{unit}, ancestors))))) as cyry,
-            (select count(*) from yljg_yg_jbxx where zzzt = '1' and state = '1' and zylx = '01' and jg_id in (select id from yljgsq_jcxx where (sczt = '01') and (create_unit IN (SELECT dept_id FROM sys_dept WHERE dept_id = #{unit} OR find_in_set(#{unit}, ancestors))))) as ylhly
+            (select count(*) from yljgsq_jcxx where (sczt = '01') and (create_qhjsc = #{unit} or create_qhjsc like CONCAT(#{unit}, ',', '%')) and jlrq is not null) as total,
+            (select sum(cwzs) from yljgsq_jcxx where (sczt = '01') and (create_qhjsc = #{unit} or create_qhjsc like CONCAT(#{unit}, ',', '%')) and jlrq is not null) as cwzs,
+            (select count(*) from yljg_kh_jbxx where jg_id in (select id from yljgsq_jcxx where (sczt = '01') and (create_qhjsc = #{unit} or create_qhjsc like CONCAT(#{unit}, ',', '%')) and jlrq is not null)) as xssqfwlnrs,
+            (select count(*) from yljg_yg_jbxx where zzzt = '1' and state = '1' and jg_id in (select id from yljgsq_jcxx where (sczt = '01') and (create_qhjsc = #{unit} or create_qhjsc like CONCAT(#{unit}, ',', '%')) and jlrq is not null)) as cyry,
+            (select count(*) from yljg_yg_jbxx where zzzt = '1' and state = '1' and zylx = '01' and jg_id in (select id from yljgsq_jcxx where (sczt = '01') and (create_qhjsc = #{unit} or create_qhjsc like CONCAT(#{unit}, ',', '%')) and jlrq is not null)) as ylhly
     </select>
 
     <select id="selectWddb" parameterType="String" resultType="java.util.Map">

ruoyi-ui/src/views/search/xxcx/glbtmdcx/index.vue

@@ -482,6 +482,8 @@ export default {
 					{ label: '申请人姓名', prop: 'sqrXm', width: '' },
 					{ label: '身份证号', prop: 'sqrZjhm', width: '' },
 					{ label: '年龄', prop: 'age', width: '' },
+          { label: '银行账号', prop: 'yhzh', width: '' },
+          { label: '开户名称', prop: 'khmc', width: '' },
 					{ label: '行政区划', prop: 'xzqhNames', width: '' },
 					{ label: '申请时间', prop: 'ffyf', width: '' },
 					{ label: '是否补发', prop: 'isBf', width: '' },
@@ -520,6 +522,7 @@ export default {
 					item.bfys == null ? item.bfys = 0 : false
 				})
 				this.excelData.vales = data
+        console.log(data);
 				this.handleExport(this.excelData, '高龄津贴名单查询')
 			})
 		},