20221201_sun修正高龄津贴台账

ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/RemoteUserService.java

@@ -12,7 +12,7 @@ import org.springframework.web.bind.annotation.*;
 
 /**
  * 用户服务
- * 
+ *
  * @author ruoyi
  */
 @FeignClient(contextId = "remoteUserService", value = ServiceNameConstants.SYSTEM_SERVICE, fallbackFactory = RemoteUserFallbackFactory.class)
@@ -28,6 +28,9 @@ public interface RemoteUserService
     @GetMapping("/user/info/{username}")
     public R<LoginUser> getUserInfo(@PathVariable("username") String username, @RequestHeader(SecurityConstants.FROM_SOURCE) String source);
 
+    @GetMapping("/user/info/lastChangePwd/{username}")
+    public R<Boolean> getLastChangePwd(@PathVariable("username") String username, @RequestHeader(SecurityConstants.FROM_SOURCE) String source);
+
     /**
      * 注册用户信息
      *

ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/factory/RemoteUserFallbackFactory.java

@@ -5,6 +5,7 @@ import com.ruoyi.common.core.web.domain.AjaxResult;
 import com.ruoyi.system.api.RemoteUserService;
 import com.ruoyi.system.api.domain.SysUser;
 import com.ruoyi.system.api.model.LoginUser;
+import com.sun.org.apache.xpath.internal.operations.Bool;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.cloud.openfeign.FallbackFactory;
@@ -12,7 +13,7 @@ import org.springframework.stereotype.Component;
 
 /**
  * 用户服务降级处理
- * 
+ *
  * @author ruoyi
  */
 @Component
@@ -32,6 +33,11 @@ public class RemoteUserFallbackFactory implements FallbackFactory<RemoteUserServ
                 return R.fail("获取用户失败:" + throwable.getMessage());
             }
 
+            @Override
+            public R<Boolean> getLastChangePwd(String username, String source) {
+                return R.fail("获取用户失败:" + throwable.getMessage());
+            }
+
             @Override
             public R<Boolean> registerUserInfo(SysUser sysUser, String source)
             {

ruoyi-auth/src/main/java/com/ruoyi/auth/service/SysLoginService.java

@@ -16,7 +16,7 @@ import org.springframework.stereotype.Component;
 
 /**
  * 登录校验方法
- * 
+ *
  * @author ruoyi
  */
 @Component
@@ -69,7 +69,7 @@ public class SysLoginService
         {
             throw new ServiceException(userResult.getMsg());
         }
-        
+
         LoginUser userInfo = userResult.getData();
         SysUser user = userResult.getData().getSysUser();
         if (UserStatus.DELETED.getCode().equals(user.getDelFlag()))
@@ -82,6 +82,7 @@ public class SysLoginService
             recordLogService.recordLogininfor(username, Constants.LOGIN_FAIL, "用户已停用，请联系管理员");
             throw new ServiceException("对不起，您的账号：" + username + " 已停用");
         }
+
         passwordService.validate(user, password);
         recordLogService.recordLogininfor(username, Constants.LOGIN_SUCCESS, "登录成功");
         return userInfo;

ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/DateUtils.java

@@ -156,6 +156,18 @@ public class DateUtils extends org.apache.commons.lang3.time.DateUtils
         return day + "天" + hour + "小时" + min + "分钟";
     }
 
+    public static long checkDays(String end)
+    {
+        Date endDate = dateTime(YYYYMMDDHHMMSS, end);
+        Date nowDate = new Date();
+        long nd = 1000 * 24 * 60 * 60;
+        // long ns = 1000;
+        // 获得两个时间的毫秒时间差异
+        long diff = nowDate.getTime() - endDate.getTime();
+        // 计算差多少天
+        return diff / nd;
+    }
+
     /**
      * 增加 LocalDateTime ==> Date
      */

ruoyi-modules/mz-business-btgl/src/main/java/com/ruoyi/business/domain/ZwywBtglGlbtmx.java

@@ -78,6 +78,12 @@ public class ZwywBtglGlbtmx extends BaseEntity
     @TableField(exist = false)
     private ZwywBtglGlbt glbt;
 
+    @TableField(exist = false)
+    private String ffyf;
+
+    @TableField(exist = false)
+    private String ffdq;
+
     @Excel(name = "发放金额")
     @ApiModelProperty(value = "发放金额", required = true)
     @Range(min=0,max=10000000000L,message = "{发放金额}")

ruoyi-modules/mz-business-btgl/src/main/java/com/ruoyi/business/domain/ZwywBtglGlbtqd.java

@@ -1,6 +1,7 @@
 package com.ruoyi.business.domain;
 
 import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.ruoyi.common.core.annotation.Excel;
@@ -70,4 +71,19 @@ public class ZwywBtglGlbtqd extends BaseEntity
     @Range(min=0,max=10000000000L,message = "{总金额}")
     @Digits(integer = 10,fraction = 2,message = "{总金额}")
     private String zje;
+
+    @TableField(exist = false)
+    private String szje;
+
+    @TableField(exist = false)
+    private String czje;
+
+    @TableField(exist = false)
+    private String qzje;
+
+    @TableField(exist = false)
+    private String isPresent;
+
+    @TableField(exist = false)
+    private String ffdqName;
 }

ruoyi-modules/mz-business-btgl/src/main/java/com/ruoyi/business/mapper/ZwywBtglGlbtqdMapper.java

@@ -1,13 +1,17 @@
 package com.ruoyi.business.mapper;
 
+import com.baomidou.mybatisplus.annotation.InterceptorIgnore;
 import com.ruoyi.business.domain.ZwywBtglGlbtqd;
 import com.ruoyi.common.datascope.handler.DataColumn;
 import com.ruoyi.common.datascope.handler.DataPermission;
 import com.ruoyi.common.datascope.utils.BaseMapperPlus;
 
+import java.util.List;
+import java.util.Map;
+
 /**
  * 补贴管理高龄补贴清单信息Mapper接口
- * 
+ *
  * @author sun
  * @date 2022-11-18
  */
@@ -16,4 +20,6 @@ import com.ruoyi.common.datascope.utils.BaseMapperPlus;
 })
 public interface ZwywBtglGlbtqdMapper extends BaseMapperPlus<ZwywBtglGlbtqd> {
 
+    @InterceptorIgnore(tenantLine = "true")
+    public List<Map<String, Object>> selectZwywBtglGlbtqdList(ZwywBtglGlbtqd query);
 }

ruoyi-modules/mz-business-btgl/src/main/java/com/ruoyi/business/service/IZwywBtglGlbtqdService.java

@@ -1,19 +1,21 @@
 package com.ruoyi.business.service;
 
 import java.util.List;
+import java.util.Map;
+
 import com.ruoyi.business.domain.ZwywBtglGlbtqd;
 
 /**
  * 补贴管理高龄补贴清单信息Service接口
- * 
+ *
  * @author sun
  * @date 2022-11-18
  */
-public interface IZwywBtglGlbtqdService 
+public interface IZwywBtglGlbtqdService
 {
     /**
      * 查询补贴管理高龄补贴清单信息
-     * 
+     *
      * @param id 补贴管理高龄补贴清单信息主键
      * @return 补贴管理高龄补贴清单信息
      */
@@ -21,15 +23,15 @@ public interface IZwywBtglGlbtqdService
 
     /**
      * 查询补贴管理高龄补贴清单信息列表
-     * 
+     *
      * @param zwywBtglGlbtqd 补贴管理高龄补贴清单信息
      * @return 补贴管理高龄补贴清单信息集合
      */
-    public List<ZwywBtglGlbtqd> selectZwywBtglGlbtqdList(ZwywBtglGlbtqd zwywBtglGlbtqd);
+    public List<Map<String, Object>> selectZwywBtglGlbtqdList(ZwywBtglGlbtqd zwywBtglGlbtqd);
 
     /**
      * 新增补贴管理高龄补贴清单信息
-     * 
+     *
      * @param zwywBtglGlbtqd 补贴管理高龄补贴清单信息
      * @return 结果
      */
@@ -37,7 +39,7 @@ public interface IZwywBtglGlbtqdService
 
     /**
      * 修改补贴管理高龄补贴清单信息
-     * 
+     *
      * @param zwywBtglGlbtqd 补贴管理高龄补贴清单信息
      * @return 结果
      */
@@ -45,7 +47,7 @@ public interface IZwywBtglGlbtqdService
 
     /**
      * 批量删除补贴管理高龄补贴清单信息
-     * 
+     *
      * @param ids 需要删除的补贴管理高龄补贴清单信息主键集合
      * @return 结果
      */

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

@@ -68,6 +68,7 @@ public class ZwywBtglGlbtmxServiceImpl implements IZwywBtglGlbtmxService
         res.forEach(r -> {
             setHighLevelAmount(r);
             r.setGlbt(zwywBtglGlbtMapper.selectById(r.getGlbtId()));
+            r.setFfdq(sysDeptJlMapper.getXzqhNames(r.getGlbt().getXzqh()));
         });
         return res;
     }

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

@@ -5,11 +5,15 @@ import com.ruoyi.business.domain.ZwywBtglGlbtqd;
 import com.ruoyi.business.mapper.ZwywBtglGlbtqdMapper;
 import com.ruoyi.business.service.IZwywBtglGlbtqdService;
 import com.ruoyi.system.mapper.SysDeptJlMapper;
+import org.apache.commons.collections4.CollectionUtils;
+import org.apache.commons.lang3.ObjectUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.math.BigDecimal;
 import java.util.Arrays;
 import java.util.List;
+import java.util.Map;
 
 /**
  * 补贴管理高龄补贴清单信息Service业务层处理
@@ -45,11 +49,28 @@ public class ZwywBtglGlbtqdServiceImpl implements IZwywBtglGlbtqdService
      * @return 补贴管理高龄补贴清单信息
      */
     @Override
-    public List<ZwywBtglGlbtqd> selectZwywBtglGlbtqdList(ZwywBtglGlbtqd zwywBtglGlbtqd)
+    public List<Map<String, Object>> selectZwywBtglGlbtqdList(ZwywBtglGlbtqd zwywBtglGlbtqd)
     {
-        List<ZwywBtglGlbtqd> res = zwywBtglGlbtqdMapper.selectList(new LambdaQueryWrapper<>(zwywBtglGlbtqd)
-                .orderByDesc(ZwywBtglGlbtqd::getFfyf));
-        res.forEach(r -> r.setFfdq(sysDeptJlMapper.getXzqhNames(r.getFfdq())));
+        List<Map<String, Object>> res = zwywBtglGlbtqdMapper.selectZwywBtglGlbtqdList(zwywBtglGlbtqd);
+        if (CollectionUtils.isNotEmpty(res)) {
+            Map<String, Object> map = res.get(0);
+            if (ObjectUtils.isNotEmpty(map)) {
+                BigDecimal zje = BigDecimal.ZERO;
+                if (map.containsKey("qzje")) {
+                    map.put("qzje", new BigDecimal(map.get("qzje").toString()));
+                    zje = zje.add(new BigDecimal(map.get("qzje").toString()));
+                }
+                if (map.containsKey("czje")) {
+                    map.put("czje", new BigDecimal(map.get("czje").toString()));
+                    zje = zje.add(new BigDecimal(map.get("czje").toString()));
+                }
+                if (map.containsKey("szje")) {
+                    map.put("szje", new BigDecimal(map.get("szje").toString()));
+                    zje = zje.add(new BigDecimal(map.get("szje").toString()));
+                }
+                map.put("zje", zje.toString());
+            }
+        }
         return res;
     }
 

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

@@ -34,7 +34,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <select id="selectGlbtmxList" parameterType="ZwywBtglGlbtmx" resultMap="ZwywBtglGlbtmxResult">
         select * from zwyw_btgl_glbtmx
         <where>
-            <if test="glbtqdId != null  and glbtqdId != ''"> and glbtqd_id = #{glbtqdId}</if>
+            <if test="ffyf != null and ffyf != '' and ffdq != null and ffdq != ''"> and glbtqd_id in (select id from zwyw_btgl_glbtqd where ffyf = #{ffyf} and ffdq in (select code from sys_dept_jl where code = #{ffdq} or find_in_set(#{ffdq}, ancestors)))</if>
             <if test="sqrXm != null  and sqrXm != ''"> and glbt_id in (select id from zwyw_btgl_glbt where sqr_xm = #{sqrXm})</if>
             <if test="sqrZjhm != null  and sqrZjhm != ''"> and glbt_id in (select id from zwyw_btgl_glbt where sqr_zjhm = #{sqrZjhm})</if>
         </where>

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

@@ -10,6 +10,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="ffdq"    column="ffdq"    />
         <result property="zrs"    column="zrs"    />
         <result property="zje"    column="zje"    />
+        <result property="zje"    column="zje"    />
+        <result property="zje"    column="zje"    />
         <result property="createTimeStr"    column="create_time_str"    />
         <result property="createUserId"    column="create_user_id"    />
         <result property="createBy"    column="create_by"    />
@@ -24,4 +26,43 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="updateUnitName"    column="update_unit_name"    />
     </resultMap>
 
+    <select id="selectZwywBtglGlbtqdList" parameterType="ZwywBtglGlbtqd" resultType="java.util.Map">
+        SELECT
+            #{ffyf} as ffyf,
+            #{ffdq} as ffdq,
+            getxzqhmcbycode (#{ffdq}) AS ffdqName,
+            count(0) AS zrs,
+            sum(zje) AS qzje,
+            sum(czje) AS czje,
+            sum(szje) AS szje
+        FROM
+            zwyw_btgl_glbtmx
+        <where>
+            <if test='isPresent == "0"'> and glbtqd_id IN (
+             SELECT
+                id
+            FROM
+                zwyw_btgl_glbtqd
+            WHERE
+                ffyf = #{ffyf}
+            AND ffdq = #{ffdq})</if>
+            <if test='isPresent == "1"'> and glbtqd_id IN (
+                SELECT
+                    id
+                FROM
+                    zwyw_btgl_glbtqd
+                WHERE
+                    ffyf = #{ffyf}
+                AND ffdq IN (
+                    SELECT
+                        code
+                    FROM
+                        sys_dept_jl
+                    WHERE
+                        code = #{ffdq}
+                    OR find_in_set(#{ffdq}, ancestors)
+                )
+                )</if>
+        </where>
+    </select>
 </mapper>

ruoyi-modules/mz-business-xmsb/src/main/java/com/ruoyi/business/domain/ZwywXmsbKz.java

@@ -57,6 +57,6 @@ public class ZwywXmsbKz extends BaseEntity
     @ApiModelProperty(value = "输入值", required = true)
     @NotBlank(message = "{输入值}",groups = AddGroup.class)
     @Size(min = 1, max = 400, message = "{输入值}")
-    private String value;
+    private String ivalue;
 
 }

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

@@ -162,23 +162,25 @@ public class ZwywXmsbCommonServiceImpl implements IZwywXmsbCommonService
         int res = 0;
         zwywXmsbCommon.setSbzt(XmsbStatus.CG.getCode());
         res = zwywXmsbCommonMapper.insert(zwywXmsbCommon);
-        List<Map<String, Object>> maps = new ArrayList<>();
-        JSONArray array = JSONArray.parseArray(zwywXmsbCommon.getKz());
-        array.forEach(a -> maps.add(JSONObject.parseObject(a.toString())));
-        List<ZwywXmsbKz> pzList = new ArrayList<>();
-        maps.forEach(m -> {
-            ZwywXmsbKz kzPz = new ZwywXmsbKz();
-            if (m.containsKey("id") && m.containsKey("value")) {
-                if (StringUtils.isNotEmpty(m.get("value").toString())) {
-                    kzPz.setPzId(m.get("id").toString());
-                    kzPz.setXmsbId(zwywXmsbCommon.getId());
-                    kzPz.setXmlxId(zwywXmsbCommon.getXmlx());
-                    kzPz.setValue(m.get("value").toString());
-                    pzList.add(kzPz);
+        if (StringUtils.isNotEmpty(zwywXmsbCommon.getKz())) {
+            List<Map<String, Object>> maps = new ArrayList<>();
+            JSONArray array = JSONArray.parseArray(zwywXmsbCommon.getKz());
+            array.forEach(a -> maps.add(JSONObject.parseObject(a.toString())));
+            List<ZwywXmsbKz> pzList = new ArrayList<>();
+            maps.forEach(m -> {
+                ZwywXmsbKz kzPz = new ZwywXmsbKz();
+                if (m.containsKey("id") && m.containsKey("value")) {
+                    if (StringUtils.isNotEmpty(m.get("value").toString())) {
+                        kzPz.setPzId(m.get("id").toString());
+                        kzPz.setXmsbId(zwywXmsbCommon.getId());
+                        kzPz.setXmlxId(zwywXmsbCommon.getXmlx());
+                        kzPz.setIvalue(m.get("value").toString());
+                        pzList.add(kzPz);
+                    }
                 }
-            }
-        });
-        zwywXmsbKzMapper.insertBatchKz(pzList);
+            });
+            zwywXmsbKzMapper.insertBatchKz(pzList);
+        }
         return res;
     }
 
@@ -192,24 +194,26 @@ public class ZwywXmsbCommonServiceImpl implements IZwywXmsbCommonService
     public int updateZwywXmsbCommon(ZwywXmsbCommon zwywXmsbCommon)
     {
         int res = zwywXmsbCommonMapper.updateById(zwywXmsbCommon);
-        zwywXmsbKzMapper.deleteBatchKz(zwywXmsbCommon.getId());
-        List<Map<String, Object>> maps = new ArrayList<>();
-        JSONArray array = JSONArray.parseArray(zwywXmsbCommon.getKz());
-        array.forEach(a -> maps.add(JSONObject.parseObject(a.toString())));
-        List<ZwywXmsbKz> pzList = new ArrayList<>();
-        maps.forEach(m -> {
-            ZwywXmsbKz kzPz = new ZwywXmsbKz();
-            if (m.containsKey("id") && m.containsKey("value")) {
-                if (StringUtils.isNotEmpty(m.get("value").toString())) {
-                    kzPz.setPzId(m.get("id").toString());
-                    kzPz.setXmsbId(zwywXmsbCommon.getId());
-                    kzPz.setXmlxId(zwywXmsbCommon.getXmlx());
-                    kzPz.setValue(m.get("value").toString());
-                    pzList.add(kzPz);
+        if (StringUtils.isNotEmpty(zwywXmsbCommon.getKz())) {
+            zwywXmsbKzMapper.deleteBatchKz(zwywXmsbCommon.getId());
+            List<Map<String, Object>> maps = new ArrayList<>();
+            JSONArray array = JSONArray.parseArray(zwywXmsbCommon.getKz());
+            array.forEach(a -> maps.add(JSONObject.parseObject(a.toString())));
+            List<ZwywXmsbKz> pzList = new ArrayList<>();
+            maps.forEach(m -> {
+                ZwywXmsbKz kzPz = new ZwywXmsbKz();
+                if (m.containsKey("id") && m.containsKey("value")) {
+                    if (StringUtils.isNotEmpty(m.get("value").toString())) {
+                        kzPz.setPzId(m.get("id").toString());
+                        kzPz.setXmsbId(zwywXmsbCommon.getId());
+                        kzPz.setXmlxId(zwywXmsbCommon.getXmlx());
+                        kzPz.setIvalue(m.get("value").toString());
+                        pzList.add(kzPz);
+                    }
                 }
-            }
-        });
-        zwywXmsbKzMapper.insertBatchKz(pzList);
+            });
+            zwywXmsbKzMapper.insertBatchKz(pzList);
+        }
         return res;
     }
 

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

@@ -3,13 +3,13 @@
 PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.ruoyi.business.mapper.ZwywXmsbKzMapper">
-    
+
     <resultMap type="ZwywXmsbKz" id="ZwywXmsbKzResult">
         <result property="id"    column="id"    />
         <result property="xmlxId"    column="xmlx_id"    />
         <result property="pzId"    column="pz_id"    />
         <result property="xmsbId"    column="xmsb_id"    />
-        <result property="value"    column="value"    />
+        <result property="ivalue"    column="ivalue"    />
         <result property="createTimeStr"    column="create_time_str"    />
         <result property="createUserId"    column="create_user_id"    />
         <result property="createBy"    column="create_by"    />
@@ -26,13 +26,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </resultMap>
 
     <insert id="insertBatchKz">
-        insert into zwyw_xmsb_kz( id, xmlx_id, pz_id, xmsb_id, value ) values
+        insert into zwyw_xmsb_kz( id, xmlx_id, pz_id, xmsb_id, ivalue ) values
         <foreach item="item" index="index" collection="list" separator=",">
-            ( #{item.id}, #{item.xmlxId}, #{item.pzId}, #{item.xmsbId}, #{item.value} )
+            ( #{item.id}, #{item.xmlxId}, #{item.pzId}, #{item.xmsbId}, #{item.ivalue} )
         </foreach>
     </insert>
 
     <insert id="deleteBatchKz">
         delete from zwyw_xmsb_kz where xmsb_id = #{id}
     </insert>
-</mapper>
+</mapper>

ruoyi-modules/mz-business/src/main/java/com/ruoyi/business/controller/ZwywBtglGlbtmxController.java

@@ -46,9 +46,6 @@ public class ZwywBtglGlbtmxController extends BaseController
     @GetMapping("/list")
     public TableDataInfo list(ZwywBtglGlbtmx zwywBtglGlbtmx)
     {
-        if (StringUtils.isEmpty(zwywBtglGlbtmx.getGlbtqdId())) {
-            return getDataTable(new ArrayList<>());
-        }
         startPage();
         List<ZwywBtglGlbtmx> list = zwywBtglGlbtmxService.selectZwywBtglGlbtmxList(zwywBtglGlbtmx);
         return getDataTable(list);

ruoyi-modules/mz-business/src/main/java/com/ruoyi/business/controller/ZwywBtglGlbtqdController.java

@@ -2,6 +2,7 @@ package com.ruoyi.business.controller;
 
 import com.ruoyi.business.domain.ZwywBtglGlbtqd;
 import com.ruoyi.business.service.IZwywBtglGlbtqdService;
+import com.ruoyi.common.core.utils.StringUtils;
 import com.ruoyi.common.core.utils.poi.ExcelUtil;
 import com.ruoyi.common.core.web.controller.BaseController;
 import com.ruoyi.common.core.web.domain.AjaxResult;
@@ -9,6 +10,7 @@ import com.ruoyi.common.core.web.page.TableDataInfo;
 import com.ruoyi.common.log.annotation.Log;
 import com.ruoyi.common.log.enums.BusinessType;
 import com.ruoyi.common.security.annotation.RequiresPermissions;
+import com.ruoyi.common.security.utils.SecurityUtils;
 import com.ruoyi.system.validate.group.AddGroup;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.annotation.Validated;
@@ -16,6 +18,7 @@ import org.springframework.web.bind.annotation.*;
 
 import javax.servlet.http.HttpServletResponse;
 import java.util.List;
+import java.util.Map;
 
 /**
  * 补贴管理高龄补贴清单信息Controller
@@ -37,24 +40,15 @@ public class ZwywBtglGlbtqdController extends BaseController
     @GetMapping("/list")
     public TableDataInfo list(ZwywBtglGlbtqd zwywBtglGlbtqd)
     {
-        startPage();
-        List<ZwywBtglGlbtqd> list = zwywBtglGlbtqdService.selectZwywBtglGlbtqdList(zwywBtglGlbtqd);
+        if (StringUtils.isEmpty(zwywBtglGlbtqd.getFfdq())) {
+            zwywBtglGlbtqd.setFfdq(SecurityUtils.getAreaCode());
+        }
+        List<Map<String, Object>> list = zwywBtglGlbtqdService.selectZwywBtglGlbtqdList(zwywBtglGlbtqd);
+//        startPage();
+//        List<ZwywBtglGlbtqd> list = zwywBtglGlbtqdService.selectZwywBtglGlbtqdList(zwywBtglGlbtqd);
         return getDataTable(list);
     }
 
-    /**
-     * 导出补贴管理高龄补贴清单信息列表
-     */
-    @RequiresPermissions("business:glbtqd:export")
-    @Log(title = "补贴管理高龄补贴清单信息", businessType = BusinessType.EXPORT)
-    @PostMapping("/export")
-    public void export(HttpServletResponse response, ZwywBtglGlbtqd zwywBtglGlbtqd)
-    {
-        List<ZwywBtglGlbtqd> list = zwywBtglGlbtqdService.selectZwywBtglGlbtqdList(zwywBtglGlbtqd);
-        ExcelUtil<ZwywBtglGlbtqd> util = new ExcelUtil<ZwywBtglGlbtqd>(ZwywBtglGlbtqd.class);
-        util.exportExcel(response, list, "补贴管理高龄补贴清单信息数据");
-    }
-
     /**
      * 获取补贴管理高龄补贴清单信息详细信息
      */

ruoyi-modules/mz-organization-khgl/src/main/java/com/ruoyi/organization/service/impl/YljgKhHtxxServiceImpl.java

@@ -147,25 +147,25 @@ public class YljgKhHtxxServiceImpl implements IYljgKhHtxxService
     @Override
     public int updateYljgKhHtxx(YljgKhHtxx yljgKhHtxx)
     {
-        YljgKhHtxx oldYljgKhHtxx = yljgKhHtxxMapper.selectYljgKhHtxxById(yljgKhHtxx.getId());
-        if (!StringUtils.equals(oldYljgKhHtxx.getCwId(), yljgKhHtxx.getCwId())) {
-            YljgFwcdCw oldCw = yljgFwcdCwMapper.selectYljgFwcdCwById(oldYljgKhHtxx.getCwId());
-            oldCw.setIsRz(WhetherStatus.NO.getCode());
-            oldCw.setIsYs(WhetherStatus.NO.getCode());
-            yljgFwcdCwMapper.updateYljgFwcdCw(oldCw);
-            YljgFwcdCw newCw = yljgFwcdCwMapper.selectYljgFwcdCwById(yljgKhHtxx.getCwId());
-            newCw.setIsYs(WhetherStatus.YES.getCode());
-            YljgKhJbxx jbxx = yljgKhJbxxMapper.selectYljgKhJbxxById(yljgKhHtxx.getKhId());
-            if (StringUtils.equals(jbxx.getIsRz(), WhetherStatus.YES.getCode())) {
-                newCw.setIsRz(WhetherStatus.YES.getCode());
-            }
-            yljgFwcdCwMapper.updateYljgFwcdCw(newCw);
-        }
-        // 20220401 暂存 start
-        yljgKhHtxx.setLy(yljgFwcdLyMapper.selectYljgFwcdLyById(yljgKhHtxx.getLyId()).getLymc());
-        yljgKhHtxx.setLc(yljgFwcdLcMapper.selectYljgFwcdLcById(yljgKhHtxx.getLcId()).getLcmc());
-        yljgKhHtxx.setFjh(yljgFwcdFjMapper.selectYljgFwcdFjById(yljgKhHtxx.getFjId()).getFjmc());
-        yljgKhHtxx.setCwh(yljgFwcdCwMapper.selectYljgFwcdCwById(yljgKhHtxx.getCwId()).getCwh());
+//        YljgKhHtxx oldYljgKhHtxx = yljgKhHtxxMapper.selectYljgKhHtxxById(yljgKhHtxx.getId());
+//        if (!StringUtils.equals(oldYljgKhHtxx.getCwId(), yljgKhHtxx.getCwId())) {
+//            YljgFwcdCw oldCw = yljgFwcdCwMapper.selectYljgFwcdCwById(oldYljgKhHtxx.getCwId());
+//            oldCw.setIsRz(WhetherStatus.NO.getCode());
+//            oldCw.setIsYs(WhetherStatus.NO.getCode());
+//            yljgFwcdCwMapper.updateYljgFwcdCw(oldCw);
+//            YljgFwcdCw newCw = yljgFwcdCwMapper.selectYljgFwcdCwById(yljgKhHtxx.getCwId());
+//            newCw.setIsYs(WhetherStatus.YES.getCode());
+//            YljgKhJbxx jbxx = yljgKhJbxxMapper.selectYljgKhJbxxById(yljgKhHtxx.getKhId());
+//            if (StringUtils.equals(jbxx.getIsRz(), WhetherStatus.YES.getCode())) {
+//                newCw.setIsRz(WhetherStatus.YES.getCode());
+//            }
+//            yljgFwcdCwMapper.updateYljgFwcdCw(newCw);
+//        }
+//        // 20220401 暂存 start
+//        yljgKhHtxx.setLy(yljgFwcdLyMapper.selectYljgFwcdLyById(yljgKhHtxx.getLyId()).getLymc());
+//        yljgKhHtxx.setLc(yljgFwcdLcMapper.selectYljgFwcdLcById(yljgKhHtxx.getLcId()).getLcmc());
+//        yljgKhHtxx.setFjh(yljgFwcdFjMapper.selectYljgFwcdFjById(yljgKhHtxx.getFjId()).getFjmc());
+//        yljgKhHtxx.setCwh(yljgFwcdCwMapper.selectYljgFwcdCwById(yljgKhHtxx.getCwId()).getCwh());
         // 20220401 暂存 end
         return yljgKhHtxxMapper.updateYljgKhHtxx(yljgKhHtxx);
     }

ruoyi-modules/mz-system-ext/src/main/java/com/ruoyi/system/mapper/SysDeptJlMapper.java

@@ -40,6 +40,8 @@ public interface SysDeptJlMapper extends BaseMapperPlus<SysDeptJl>
 
     public List<SysDeptJl> selectSysDeptJlTree(SysDeptJl sysDeptJl);
 
+    public List<SysDeptJl> selectSysDeptJlTreeFiveLevel(SysDeptJl sysDeptJl);
+
     /**
      * 新增吉林地区管理
      *

ruoyi-modules/mz-system-ext/src/main/java/com/ruoyi/system/service/ISysDeptJlService.java

@@ -31,6 +31,8 @@ public interface ISysDeptJlService
 
 
     public List<SysDeptJl> selectSysDeptJlTree(SysDeptJl sysDeptJl);
+
+    public List<SysDeptJl> selectSysDeptJlTreeFiveLevel(SysDeptJl sysDeptJl);
     /**
      * 检查是否有父级行政地区id信息
      *

ruoyi-modules/mz-system-ext/src/main/java/com/ruoyi/system/service/impl/SysDeptJlServiceImpl.java

@@ -77,6 +77,11 @@ public class SysDeptJlServiceImpl implements ISysDeptJlService {
         return sysDeptJlMapper.selectSysDeptJlTree(sysDeptJl);
     }
 
+    @Override
+    public List<SysDeptJl> selectSysDeptJlTreeFiveLevel(SysDeptJl sysDeptJl) {
+        return sysDeptJlMapper.selectSysDeptJlTreeFiveLevel(sysDeptJl);
+    }
+
     @Override
     public void checkParentId(String parentId) {
         if (StringUtils.isNull(sysDeptJlMapper.selectSysDeptJlById(parentId))) {

ruoyi-modules/mz-system-ext/src/main/resources/mapper/system/SysDeptJlMapper.xml

@@ -95,6 +95,18 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         order by a.code asc
     </select>
 
+    <select id="selectSysDeptJlTreeFiveLevel" parameterType="SysDeptJl" resultMap="SysDeptJlResult">
+        select * from (select id, code, name, parent_id, level from sys_dept_jl) as a
+        <where>
+            <if test="id != null  and id != ''"> and a.code = #{id}</if>
+            <if test="code != null  and code != ''"> and a.code = #{code}</if>
+            <if test="name != null  and name != ''"> and a.name like concat('%', #{name}, '%')</if>
+            <if test="parentId != null  and parentId != ''"> and a.parent_id = #{parentId} </if>
+            <if test="level != null "> and level = #{level}</if>
+        </where>
+        order by a.code asc
+    </select>
+
     <select id="selectSysDeptJlById" parameterType="String" resultMap="SysDeptJlResult">
         <include refid="selectSysDeptJlVo"/>
         where a.id = #{id}

ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysDeptJlController.java

@@ -88,6 +88,13 @@ public class SysDeptJlController extends BaseController
         return AjaxResult.success(list);
     }
 
+    @GetMapping("/treeFiveLevel")
+    public AjaxResult treeFiveLevel(SysDeptJl sysDeptJl)
+    {
+        List<SysDeptJl> list = sysDeptJlService.selectSysDeptJlTreeFiveLevel(sysDeptJl);
+        return AjaxResult.success(list);
+    }
+
     /**
      *
      * 同步行政区 到部门表

ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysUserController.java

@@ -1,7 +1,9 @@
 package com.ruoyi.system.controller;
 
+import com.ruoyi.common.core.constant.SecurityConstants;
 import com.ruoyi.common.core.constant.UserConstants;
 import com.ruoyi.common.core.domain.R;
+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;
@@ -32,7 +34,7 @@ import java.util.stream.Collectors;
 
 /**
  * 用户信息
- * 
+ *
  * @author ruoyi
  */
 @RestController
@@ -121,7 +123,14 @@ public class SysUserController extends BaseController
         sysUserVo.setSysUser(sysUser);
         sysUserVo.setRoles(roles);
         sysUserVo.setPermissions(permissions);
-        return R.ok(sysUserVo);
+        String msg = null;
+        return R.ok(sysUserVo, msg);
+    }
+
+    @GetMapping("/info/lastChangePwd/{username}")
+    public R<Boolean> lastChangePwd(@PathVariable("username") String username)
+    {
+        return R.ok(userService.checkLastChangePwd(username));
     }
 
     /**
@@ -145,7 +154,7 @@ public class SysUserController extends BaseController
 
     /**
      * 获取用户信息
-     * 
+     *
      * @return 用户信息
      */
     @GetMapping("getInfo")

ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysUserMapper.java

@@ -157,4 +157,6 @@ public interface SysUserMapper extends BaseMapperPlus<SysUser>
     HashMap<String,Long> selectJgCount(SysUser user);
 
     public void insertUserHistory(SysUser user);
+
+    public List<SysUser> selectUserHistory(String userName);
 }

ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysUserService.java

@@ -121,6 +121,7 @@ public interface ISysUserService
      */
     public boolean registerUser(SysUser user);
 
+    public boolean checkLastChangePwd(String userName);
     /**
      * 修改用户信息
      *

ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java

@@ -2,12 +2,15 @@ package com.ruoyi.system.service.impl;
 
 import com.ruoyi.common.core.constant.UserConstants;
 import com.ruoyi.common.core.exception.ServiceException;
+import com.ruoyi.common.core.utils.DateUtils;
 import com.ruoyi.common.core.utils.SpringUtils;
 import com.ruoyi.common.core.utils.StringUtils;
 import com.ruoyi.common.core.utils.bean.BeanValidators;
 import com.ruoyi.common.core.utils.uuid.IdUtils;
 import com.ruoyi.common.datascope.annotation.DataScope;
+import com.ruoyi.common.security.utils.DictUtils;
 import com.ruoyi.common.security.utils.SecurityUtils;
+import com.ruoyi.system.api.domain.SysDictData;
 import com.ruoyi.system.api.domain.SysRole;
 import com.ruoyi.system.api.domain.SysUser;
 import com.ruoyi.system.domain.SysPost;
@@ -26,7 +29,9 @@ import org.springframework.util.ObjectUtils;
 
 import javax.validation.Validator;
 import java.util.ArrayList;
+import java.util.Comparator;
 import java.util.List;
+import java.util.Optional;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
@@ -259,6 +264,29 @@ public class SysUserServiceImpl implements ISysUserService {
         return userMapper.insertUser(user) > 0;
     }
 
+    @Override
+    public boolean checkLastChangePwd(String userName) {
+        boolean res = true;
+        List<SysDictData> ts = DictUtils.getDictCache("pwd_overdue");
+        if (!CollectionUtils.isEmpty(ts)) {
+            String days = ts.get(0).getDictValue();
+            SysUser user = userMapper.selectUserByUserName(userName);
+            List<SysUser> hisList = userMapper.selectUserHistory(userName);
+            SysUser last = hisList.stream().filter(h -> StringUtils.equals(h.getPassword(), user.getPassword()))
+                    .max(Comparator.comparing(SysUser::getCreateTimeStr)).orElse(null);
+            if (!ObjectUtils.isEmpty(last)) {
+                if ((int)DateUtils.checkDays(last.getCreateTimeStr()) > Integer.parseInt(days)) {
+                    res = false;
+                }
+            } else {
+                if ((int)DateUtils.checkDays(user.getCreateTimeStr()) > Integer.parseInt(days)) {
+                    res = false;
+                }
+            }
+        }
+        return res;
+    }
+
     /**
      * 修改保存用户信息
      *

ruoyi-ui/package.json

@@ -43,6 +43,7 @@
         "core-js": "3.19.1",
         "dayjs": "^1.11.1",
         "echarts": "4.9.0",
+        "moment": "^2.29.3",
         "echarts-liquidfill": "^2.0.6",
         "element-ui": "2.15.8",
         "file-saver": "2.0.5",

ruoyi-ui/src/api/system/region.js

@@ -18,10 +18,18 @@ export function treeDeptJlList(query) {
   })
 }
 
+export function treeDeptFiveJlList(query) {
+  return request({
+    url: '/system/jlDept/treeFiveLevel',
+    method: 'get',
+    params: query
+  })
+}
+
 export function TLTreeList(query){
   return request({
     url: '/system/jlDept/getLevelZS',
     method: 'get',
     params: query
   })
-}
+}

ruoyi-ui/src/components/deptTree/index.vue

@@ -17,7 +17,7 @@
 </template>
 
 <script>
-import {treeDeptJlList} from "@/api/system/region";
+import {treeDeptJlList, treeDeptFiveJlList} from "@/api/system/region";
 import {Constant} from '@/utils/constant';
 import {mapState} from 'vuex'
 import { decryptData_ECB, decryptRowData_ECB } from "@/api/tool/sm4";
@@ -43,7 +43,10 @@ export default {
         type:Boolean,
         default:true,
       },
-
+      isFive:{
+        type:Boolean,
+        default:false,
+      },
     },
     data(){
       return{
@@ -101,7 +104,7 @@ export default {
           userId = this.user.userData.dept.locationCode
         }
         let parentId = node.level == 0?{id:userId} :{parentId:node.data.id};
-        let {code, data} = await treeDeptJlList(parentId);
+        let {code, data} = this.isFive ? await treeDeptFiveJlList(parentId) : await treeDeptJlList(parentId);
         if (code !== 200) {
           return;
         }

ruoyi-ui/src/main.js

@@ -74,6 +74,8 @@ import SelectionJg from '@/components/SelectionJg/index'
 import deptTree from '@/components/deptTree'
 //图表
 import echarts from 'echarts'
+//时间
+import moment from 'moment'
 //生成pdf
 import htmlToPdf from '@/utils/htmlToPdf'
 import CryptoJS from 'crypto-js'
@@ -129,6 +131,7 @@ Vue.prototype.deepCopy = deepCopy
 Vue.prototype.dictFilter = dictFilter
 Vue.prototype.valid = valid
 Vue.prototype.handleExport = handleExport
+Vue.prototype.$moment = moment;
 
 // 发放月份过滤器
 Vue.filter('ffyfFilter', (value) => {

ruoyi-ui/src/views/business/btgl/glbtmx/index.vue

@@ -45,6 +45,7 @@
           {{ scope.row.glbt.sqrZjhm }}
         </template>
       </el-table-column>
+      <el-table-column label="行政区划" align="center" prop="ffdq" />
       <el-table-column label="发放月份" align="center">
         {{ ffyf | ffyfFilter }}
       </el-table-column>
@@ -202,6 +203,10 @@ export default {
       type: String,
       default: "",
     },
+    ffdq: {
+      type: String,
+      default: "",
+    },
   },
   data() {
     return {
@@ -254,7 +259,13 @@ export default {
     };
   },
   watch: {
-    qdId: {
+    ffdq: {
+      handler(newName, oldName) {
+        this.getList();
+      },
+      immediate: true,
+    },
+    ffyf: {
       handler(newName, oldName) {
         this.getList();
       },
@@ -268,7 +279,7 @@ export default {
     /** 查询补贴管理高龄补贴明细信息列表 */
     getList() {
       this.loading = true;
-      listGlbtmx({ ...this.queryParams, glbtqdId: this.qdId }).then(
+      listGlbtmx({ ...this.queryParams, ffyf: this.ffyf, ffdq: this.ffdq }).then(
         (response) => {
           response.rows.forEach((item) => {
             item.glbt = decryptData_ECB(
@@ -278,7 +289,9 @@ export default {
             );
           });
           if (response.rows) {
-            this.level = response.rows[0].level;
+            if (response.rows.length > 0) {
+              this.level = response.rows[0].level;
+            }
           }
           this.glbtmxList = response.rows;
           this.total = response.total;

ruoyi-ui/src/views/business/btgl/glbtqd/index.vue

@@ -1,23 +1,34 @@
 <template>
   <div class="app-container">
-    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
-      <el-form-item label="发放年月" prop="ffyf">
-        <el-date-picker clearable v-model="queryParams.ffyf" type="month" value-format="yyyyMM" placeholder="请输入发放月份"
-          @keyup.enter.native="handleQuery">
-        </el-date-picker>
-      </el-form-item>
-      <el-form-item label="发放地区" prop="xzqh">
-        <RegionCascaderSelect v-model="xzqh" style="width: 100%" valueProp="code" :isDataRoot="true">
-        </RegionCascaderSelect>
-      </el-form-item>
-      <el-form-item>
-        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
-        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
-      </el-form-item>
-    </el-form>
+    <el-row :gutter="20">
+      <!--部门数据-->
+      <el-col :span="4" :xs="24">
+        <QueryThisLevel :initLevel="queryParams.isPresent" :active="0" :inactive="1" @changeLevel="changSwitch">
+        </QueryThisLevel>
+        <span class="sxzd">发放地区</span>
+        <dept-tree :userId="user.userData.dept.parentId" :isFive="true" @handleNodeClick="handleNodeClick">
+        </dept-tree>
+      </el-col>
+      <el-col :span="20" :xs="24">
+        <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch"
+          label-width="68px">
+          <el-form-item label="发放年月" prop="ffyf">
+            <el-date-picker clearable v-model="queryParams.ffyf" type="month" value-format="yyyyMM"
+              placeholder="请输入发放月份" @keyup.enter.native="handleQuery">
+            </el-date-picker>
+          </el-form-item>
+          <!--      <el-form-item label="发放地区" prop="xzqh">-->
+          <!--        <RegionCascaderSelect v-model="xzqh" style="width: 100%" valueProp="code" :isDataRoot="true">-->
+          <!--        </RegionCascaderSelect>-->
+          <!--      </el-form-item>-->
+          <el-form-item>
+            <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
+            <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+          </el-form-item>
+        </el-form>
 
-    <el-row :gutter="10" class="mb8">
-      <!-- <el-col :span="1.5">
+        <el-row :gutter="10" class="mb8">
+          <!-- <el-col :span="1.5">
         <el-button
           type="warning"
           plain
@@ -27,36 +38,55 @@
           v-hasPermi="['business:glbtqd:export']"
         >导出</el-button>
       </el-col> -->
-      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
-    </el-row>
+          <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+        </el-row>
 
-    <el-table v-loading="loading" :data="glbtqdList">
-      <el-table-column label="序号" align="center">
-        <template slot-scope="scope">
-          {{
-              (queryParams.pageNum - 1) * queryParams.pageSize + scope.$index + 1
-          }}
-        </template>
-      </el-table-column>
-      <el-table-column label="发放月份" align="center" prop="ffyf">
-        <template slot-scope="scope">
-          {{ scope.row.ffyf | ffyfFilter }}
-        </template>
-      </el-table-column>
-      <el-table-column label="发放地区" align="center" prop="ffdq" />
-      <el-table-column label="总人数" align="center" prop="zrs" />
-      <el-table-column label="总金额" align="center" prop="zje" />
-      <el-table-column label="操作" align="center" class-name="small-padding fixed-width" fixed="right">
-        <template slot-scope="scope">
-          <el-button size="mini" type="text" icon="el-icon-edit" @click="handleMx(scope.row)"
-            v-hasPermi="['business:glbtqd:edit']">明细</el-button>
-        </template>
-      </el-table-column>
-    </el-table>
-    <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize"
-      @pagination="getList" />
-    <el-dialog v-dialog-drag :title="title" :visible.sync="openQd" width="1000px" append-to-body>
-      <mx :qdId="qdId" :ffyf="ffyf" />
+        <el-table v-loading="loading" :data="glbtqdList">
+          <el-table-column label="序号" align="center">
+            <template slot-scope="scope">
+              {{
+                  (queryParams.pageNum - 1) * queryParams.pageSize +
+                  scope.$index +
+                  1
+              }}
+            </template>
+          </el-table-column>
+          <el-table-column label="发放月份" align="center" prop="ffyf">
+            <template slot-scope="scope">
+              {{ scope.row.ffyf | ffyfFilter }}
+            </template>
+          </el-table-column>
+          <el-table-column label="发放地区" align="center" prop="ffdqName" />
+          <el-table-column label="总人数" align="center" prop="zrs" />
+          <el-table-column label="区县发放金额" align="center" prop="qzje">
+            <template slot-scope="scope">
+              {{ scope.row.qzje ? scope.row.qzje : "0.00" }}
+            </template>
+          </el-table-column>
+          <el-table-column label="市发放金额" align="center" prop="czje">
+            <template slot-scope="scope">
+              {{ scope.row.czje ? scope.row.czje : "0.00" }}
+            </template>
+          </el-table-column>
+          <el-table-column label="省发放金额" align="center" prop="szje">
+            <template slot-scope="scope">
+              {{ scope.row.szje ? scope.row.szje : "0.00" }}
+            </template>
+          </el-table-column>
+          <el-table-column label="总金额" align="center" prop="zje" />
+          <el-table-column label="操作" align="center" class-name="small-padding fixed-width" fixed="right">
+            <template slot-scope="scope">
+              <el-button size="mini" type="text" icon="el-icon-edit" @click="handleMx(scope.row)"
+                v-hasPermi="['business:glbtqd:edit']">明细</el-button>
+            </template>
+          </el-table-column>
+        </el-table>
+        <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum"
+          :limit.sync="queryParams.pageSize" @pagination="getList" />
+      </el-col>
+    </el-row>
+    <el-dialog v-dialog-drag :title="title" :visible.sync="openQd" width="1500px" append-to-body>
+      <mx :ffyf="ffyf" :ffdq="ffdq" />
 
       <div slot="footer" class="dialog-footer">
         <el-button type="primary" @click="cancelQd">确 定</el-button>
@@ -75,12 +105,20 @@ import {
 } from "@/api/business/btgl/glbtqd";
 import { chineseOne, idCard, Regular } from "@/utils/regular";
 import mx from "../glbtmx/index";
+import { mapGetters, mapState } from "vuex";
 
 export default {
   name: "Glbtqd",
   components: {
     mx: mx,
   },
+  computed: {
+    ...mapState(["user"]),
+    ...mapGetters(["level"]),
+    currentLevels() {
+      return this.levels.filter((item, index) => index >= this.level);
+    },
+  },
   data() {
     return {
       // 遮罩层
@@ -88,7 +126,7 @@ export default {
       submitFormLoading: false,
       // 选中数组
       ids: [],
-      xzqh: [],
+      // xzqh: [],
       // 非单个禁用
       single: true,
       // 非多个禁用
@@ -100,6 +138,7 @@ export default {
       total: 0,
       qdId: null,
       ffyf: null,
+      ffdq: null,
       // 补贴管理高龄补贴清单信息表格数据
       glbtqdList: [],
       // 弹出层标题
@@ -110,6 +149,9 @@ export default {
       queryParams: {
         pageNum: 1,
         pageSize: 10,
+        isPresent: "1",
+        ffyf: this.$moment().subtract(1, "month").format("yyyyMM"),
+        ffdq: null,
       },
       // 表单参数
       form: {},
@@ -139,9 +181,23 @@ export default {
     this.getList();
   },
   methods: {
+    handleNodeClick(data) {
+      this.queryParams.ffdq = data.code;
+      this.handleQuery();
+    },
+    //查询本级
+    changSwitch(value) {
+      this.queryParams.isPresent = value;
+      this.getList();
+    },
     /** 查询补贴管理高龄补贴清单信息列表 */
     getList() {
       this.loading = true;
+      if (!this.queryParams.ffyf) {
+        this.queryParams.ffyf = this.$moment()
+          .subtract(1, "month")
+          .format("yyyyMM");
+      }
       listGlbtqd(this.queryParams).then((response) => {
         this.glbtqdList = response.rows;
         this.total = response.total;
@@ -169,17 +225,17 @@ export default {
     /** 搜索按钮操作 */
     handleQuery() {
       this.queryParams.pageNum = 1;
-      if (this.xzqh) {
-        this.queryParams.ffdq = this.xzqh[this.xzqh.length - 1];
-      } else {
-        this.queryParams.ffdq = null;
-      }
+      // if (this.xzqh) {
+      //   this.queryParams.ffdq = this.xzqh[this.xzqh.length - 1];
+      // } else {
+      //   this.queryParams.ffdq = null;
+      // }
       this.getList();
     },
     /** 重置按钮操作 */
     resetQuery() {
       this.resetForm("queryForm");
-      this.xzqh = [];
+      // this.xzqh = [];
       this.handleQuery();
     },
     // 多选框选中数据
@@ -191,6 +247,7 @@ export default {
     handleMx(row) {
       this.qdId = row.id;
       this.ffyf = row.ffyf;
+      this.ffdq = row.ffdq;
       this.openQd = true;
     },
     cancelQd() {
@@ -222,3 +279,18 @@ export default {
   },
 };
 </script>
+<style ref="stylesheet/scss" lang="scss" scoped>
+@import "@/assets/styles/common/common.scss";
+
+.switch {
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  margin-bottom: 10px;
+}
+
+.sxzd {
+  font-weight: 600;
+  margin: 10px 15px;
+}
+</style>

ruoyi-ui/src/views/organization/kugl/htqd/index.vue

@@ -144,18 +144,18 @@
         </div>
         <div class="formFlex">
           <el-form-item label="楼宇" prop="lyId" class="formWidth2">
-            <BizDict :value="form.lyId" :parmar="parmarLy" @changeData="changeDataLy" :para1="form.jgId"></BizDict>
+            <BizDict :value="form.lyId" :parmar="parmarLy" @changeData="changeDataLy" :para1="form.jgId" :disabled="form.id"></BizDict>
           </el-form-item>
           <el-form-item label="楼层" prop="lcId" class="formWidth2">
-            <BizDict :value="form.lcId" :parmar="parmarLc" @changeData="changeDataLc" :para1="para1"></BizDict>
+            <BizDict :value="form.lcId" :parmar="parmarLc" @changeData="changeDataLc" :para1="para1" :disabled="form.id"></BizDict>
           </el-form-item>
         </div>
         <div class="formFlex">
           <el-form-item label="房间" prop="fjId" class="formWidth2">
-            <BizDict :value="form.fjId" :parmar="parmarFjh" @changeData="changeDataFjh" :para1="para2"></BizDict>
+            <BizDict :value="form.fjId" :parmar="parmarFjh" @changeData="changeDataFjh" :para1="para2" :disabled="form.id"></BizDict>
           </el-form-item>
           <el-form-item label="床位" prop="cwId" class="formWidth2">
-            <BizDict :value="form.cwId" :parmar="parmarCwh" @changeData="changeDataCwh" :para1="para3"></BizDict>
+            <BizDict :value="form.cwId" :parmar="parmarCwh" @changeData="changeDataCwh" :para1="para3" :disabled="form.id"></BizDict>
           </el-form-item>
         </div>
         <div class="formFlex">