feat: 购房表房主身份证 + 带安置家庭成员名称,这两个条件 满足 购房表 则修改为安置状态
3个文件已修改
45 ■■■■■ 已修改文件
cz-admin/src/main/resources/application-druid.yml 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
cz-admin/src/main/resources/application.yml 6 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
cz-bussiness/src/main/java/com/ruoyi/bussiness/service/impl/PlacementBatchServiceImpl.java 35 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
cz-admin/src/main/resources/application-druid.yml
@@ -6,9 +6,9 @@
        druid:
            # 主库数据源
            master:
                url: jdbc:mysql://127.0.0.1:10633/chongzhou?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
                url: jdbc:mysql://146.56.242.51:3306/chongzhou?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
                username: root
                password: ChongZhou@2025!
                password: mysqlpwd
            # 从库数据源
            slave:
                # 从数据源开关/默认关闭
cz-admin/src/main/resources/application.yml
@@ -68,13 +68,13 @@
  # redis 配置
  redis:
    # 地址
    host: 127.0.0.1
    host: 146.56.242.51
    # 端口,默认为6379
    port: 6379
    port: 10012
    # 数据库索引
    database: 0
    # 密码
    password: ChongZhou@2025!
    password:
    # 连接超时时间
    timeout: 10s
    jedis:
cz-bussiness/src/main/java/com/ruoyi/bussiness/service/impl/PlacementBatchServiceImpl.java
@@ -3,6 +3,7 @@
import cn.hutool.core.bean.BeanUtil;
import cn.hutool.core.util.NumberUtil;
import cn.hutool.core.util.ObjUtil;
import cn.hutool.core.util.ObjectUtil;
import cn.hutool.core.util.StrUtil;
import com.alibaba.excel.EasyExcelFactory;
import com.alibaba.excel.write.builder.ExcelWriterBuilder;
@@ -687,25 +688,33 @@
            placementApplyRecordLambdaQueryWrapper.eq(PlacementBatchHousehold::getPlacementBatchId, placementBatch.getId());
            //家庭成员
            List<PlacementBatchHousehold> households = placementBatchHouseholdService.list(placementApplyRecordLambdaQueryWrapper);
            //户主
            List<String> houseHead = households.stream().map(PlacementBatchHousehold::getHouseholdHead).collect(Collectors.toList());
            if (ObjUtil.isNotEmpty(households)) {
                List<String> familyNames = households.stream().map(PlacementBatchHousehold::getWaitFamilyNames).collect(Collectors.toList());
                List<String> allFamilyNames = new ArrayList<>();
                for(String familyName : familyNames) {
                    List<String> names = Arrays.asList(familyName.split("、"));
                    allFamilyNames.addAll(names);
                }
                LambdaUpdateWrapper<Placement> placementLambdaUpdateWrapper = new LambdaUpdateWrapper<>();
                placementLambdaUpdateWrapper.set(Placement::getStatus, 1);
                placementLambdaUpdateWrapper.and(query -> query.in(Placement::getFamilyName, allFamilyNames));
                placementService.update(placementLambdaUpdateWrapper);
            if(ObjectUtil.isEmpty(households)){
                return;
            }
            //修改户主安置状态
            List<String> houseHead = households.stream().map(PlacementBatchHousehold::getHouseholdHead).collect(Collectors.toList());
            if (ObjUtil.isNotEmpty(houseHead)) {
                LambdaUpdateWrapper<Placement> placementHouseHeadUpdateWrapper = new LambdaUpdateWrapper<>();
                placementHouseHeadUpdateWrapper.set(Placement::getStatus, 1);
                placementHouseHeadUpdateWrapper.and(query -> query.in(Placement::getHouseholdHead, houseHead));
                placementService.update(placementHouseHeadUpdateWrapper);
            }
            //修改家庭成员安置状态
            for(PlacementBatchHousehold household : households){
                if(ObjUtil.isEmpty(household.getWaitFamilyNames())){
                    continue;
                }
                //购房表家庭成员姓名
                List<String> names = Arrays.asList(household.getWaitFamilyNames().split("、"));
                //购房表户主身份证
                String headIdCard = household.getIdCard();
                LambdaUpdateWrapper<Placement> placementLambdaUpdateWrapper = new LambdaUpdateWrapper<>();
                placementLambdaUpdateWrapper.set(Placement::getStatus, 1);
                placementLambdaUpdateWrapper.eq(Placement::getIdCard,headIdCard);
                placementLambdaUpdateWrapper.and(query -> query.in(Placement::getFamilyName, names));
                placementService.update(placementLambdaUpdateWrapper);
            }
        }
        //同步待处理消息