Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/mobile_c...

liujie

2026-01-28 72189753cd1a791a8d90aad34c5bcc165143bf49

Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/mobile_community

 ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/DataStatisticsController.java

@@ -139,6 +139,12 @@
        // 重点人数
        long keyCount = largeKeyGridUserService.count(Wrappers.lambdaQuery(TLargeKeyGridUser.class)
                .eq(TLargeKeyGridUser::getUserType, 1));
        List<TLargeKeyPersonnelType> list = largeKeyPersonnelTypeService.list(Wrappers.lambdaQuery(TLargeKeyPersonnelType.class)
                .eq(TLargeKeyPersonnelType::getShowType, 1));
        if(!CollectionUtils.isEmpty(list)){
            int sum = list.stream().filter(e->Objects.nonNull(e.getShowNumber())).mapToInt(TLargeKeyPersonnelType::getShowNumber).sum();
            keyCount += sum;
        }
        // 网格人数
        long gridCount = largeKeyGridUserService.count(Wrappers.lambdaQuery(TLargeKeyGridUser.class)
                .eq(TLargeKeyGridUser::getUserType, 2));

 ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TLargeKeyGridUserController.java

@@ -279,7 +279,7 @@
                i++;
                continue;
            }
            if (!largeKeyGridUserImport.getContactNumber().matches("^$|^1[3-9]\\d{9}$")){
            if (largeKeyGridUserImport.getContactNumber().length() != 11){
                result.append("第"+i+"行：[", "联系电话"+"]格式不正确");
                i++;
                continue;
@@ -356,36 +356,36 @@
        JSONObject result = new JSONObject();
        int i = 1;
        for (LargeKeyGridUserImport largeKeyGridUserImport : largeKeyGridUserImports) {
            if (!StringUtils.hasLength(largeKeyGridUserImport.getGridInfo())){
                result.append("第"+i+"行：[", "网格"+"]不能为空");
                i++;
                continue;
            }
            if (!StringUtils.hasLength(largeKeyGridUserImport.getCommunityName())){
                result.append("第"+i+"行：[", "小区名称"+"]不能为空");
                i++;
                continue;
            }
            if (!StringUtils.hasLength(largeKeyGridUserImport.getRegisteredResidence())){
                result.append("第"+i+"行：[", "户籍地"+"]不能为空");
                i++;
                continue;
            }
            if (!StringUtils.hasLength(largeKeyGridUserImport.getBuildingInfo())){
                result.append("第"+i+"行：[", "楼栋信息"+"]不能为空");
                i++;
                continue;
            }
            if (!StringUtils.hasLength(largeKeyGridUserImport.getUnitNumber())){
                result.append("第"+i+"行：[", "单元号"+"]不能为空");
                i++;
                continue;
            }
            if (!StringUtils.hasLength(largeKeyGridUserImport.getHouseNumber())){
                result.append("第"+i+"行：[", "门牌号"+"]不能为空");
                i++;
                continue;
            }
//            if (!StringUtils.hasLength(largeKeyGridUserImport.getGridInfo())){
//                result.append("第"+i+"行：[", "网格"+"]不能为空");
//                i++;
//                continue;
//            }
//            if (!StringUtils.hasLength(largeKeyGridUserImport.getCommunityName())){
//                result.append("第"+i+"行：[", "小区名称"+"]不能为空");
//                i++;
//                continue;
//            }
//            if (!StringUtils.hasLength(largeKeyGridUserImport.getRegisteredResidence())){
//                result.append("第"+i+"行：[", "户籍地"+"]不能为空");
//                i++;
//                continue;
//            }
//            if (!StringUtils.hasLength(largeKeyGridUserImport.getBuildingInfo())){
//                result.append("第"+i+"行：[", "楼栋信息"+"]不能为空");
//                i++;
//                continue;
//            }
//            if (!StringUtils.hasLength(largeKeyGridUserImport.getUnitNumber())){
//                result.append("第"+i+"行：[", "单元号"+"]不能为空");
//                i++;
//                continue;
//            }
//            if (!StringUtils.hasLength(largeKeyGridUserImport.getHouseNumber())){
//                result.append("第"+i+"行：[", "门牌号"+"]不能为空");
//                i++;
//                continue;
//            }
            if (!StringUtils.hasLength(largeKeyGridUserImport.getUserName())){
                result.append("第"+i+"行：[", "姓名"+"]不能为空");
                i++;
@@ -411,7 +411,7 @@
                i++;
                continue;
            }
            if (!largeKeyGridUserImport.getContactNumber().matches("^$|^1[3-9]\\d{9}$")){
            if (largeKeyGridUserImport.getContactNumber().length() != 11){
                result.append("第"+i+"行：[", "联系电话"+"]格式不正确");
                i++;
                continue;
@@ -436,21 +436,23 @@
                TLargeKeyPersonnelType largeKeyPersonnelType = largeKeyPersonnelTypeService.getOne(Wrappers.lambdaQuery(TLargeKeyPersonnelType.class)
                        .eq(TLargeKeyPersonnelType::getTypeName, largeKeyGridUserImport.getTypeName())
                        .last("LIMIT 1"));
                if(Objects.isNull(largeKeyPersonnelType)){
                    result.append("第"+i+"行：[", "类型名称"+"]不存在");
                    i++;
                    continue;
//                if(Objects.isNull(largeKeyPersonnelType)){
//                    result.append("第"+i+"行：[", "类型名称"+"]不存在");
//                    i++;
//                    continue;
//                }
                if(Objects.nonNull(largeKeyPersonnelType)){
                    largeKeyGridUser.setTypeId(largeKeyPersonnelType.getId());
                }
                largeKeyGridUser.setTypeId(largeKeyPersonnelType.getId());
            }
            largeKeyGridUser.setUserType(2);
            largeKeyGridUsers.add(largeKeyGridUser);
            i++;
        }
        largeKeyGridUserService.saveBatch(largeKeyGridUsers);
        if(!result.isEmpty()){
            return R.fail(result.toString());
        }
        largeKeyGridUserService.saveBatch(largeKeyGridUsers);
        return R.ok();
    }


 ruoyi-applet/src/main/java/com/ruoyi/web/controller/api/CourseController.java

@@ -146,6 +146,15 @@
            return R.fail("报名人数已满");
        }

        long userCount = courseOrderService.count(Wrappers.lambdaQuery(TCourseOrder.class)
                .eq(TCourseOrder::getIdCard, courseOrder.getIdCard())
                .eq(TCourseOrder::getCourseId, course.getId())
                .in(TCourseOrder::getPayStatus, 1, 2, 5, 6));

        if(userCount>0){
            return R.fail("该课程已提交相同的报名意向!");
        }

        courseOrder.setAppUserId(userId);
        courseOrder.setPayMoney(course.getCourseCost());
        courseOrder.setPayStatus(1);

 ruoyi-system/src/main/java/com/ruoyi/system/model/TCourse.java

@@ -73,6 +73,10 @@
    @TableField("end_time")
    private LocalDate endTime;

    @ApiModelProperty(value = "是否开启课程缴费 1=是 0=否")
    @TableField("is_open_course")
    private Integer isOpenCourse;

    @ApiModelProperty(value = "已经报名人数")
    @TableField(exist = false)
    private Integer signUpNum;

 ruoyi-system/src/main/java/com/ruoyi/system/model/TLargeKeyGridUser.java

@@ -74,7 +74,8 @@
    @TableField("id_card")
    private String idCard;

    @Pattern(regexp = "^$|^1[3-9]\\d{9}$",message = "手机号格式不正确")
//    @Pattern(regexp = "^$|^1[3-9]\\d{9}$",message = "手机号格式不正确")
    @Length(max = 11,message = "手机号不能超过11个字符")
    @ApiModelProperty(value = "联系电话")
    @TableField("contact_number")
    private String contactNumber;

 ruoyi-system/src/main/java/com/ruoyi/system/model/TOtherConfig.java

@@ -42,4 +42,8 @@
    @TableField("is_open_course")
    private Integer isOpenCourse;

    @ApiModelProperty(value = "是否开启保险缴费 1=是 0=否")
    @TableField("is_open_insurance")
    private Integer isOpenInsurance;

}

 ruoyi-system/src/main/resources/mapper/system/TCourseMapper.xml

@@ -14,6 +14,7 @@
        <result column="course_detail" property="courseDetail" />
        <result column="course_lecturer" property="courseLecturer" />
        <result column="status" property="status" />
        <result column="is_open_course" property="isOpenCourse" />
        <result column="end_time" property="endTime" />
        <result column="create_time" property="createTime" />
        <result column="update_time" property="updateTime" />
@@ -25,7 +26,7 @@
    <!-- 通用查询结果列 -->
    <sql id="Base_Column_List">
        id, course_title, course_type, course_cost, course_cover, course_carousel, people_limit,
          course_detail, course_lecturer, status, end_time,
          course_detail, course_lecturer, status, end_time,is_open_course,
          create_time, update_time, create_by, update_by, disabled
    </sql>
    <select id="pageList" resultType="com.ruoyi.system.vo.TCourseVO">

 ruoyi-system/src/main/resources/mapper/system/TCourseOrderMapper.xml

@@ -48,7 +48,7 @@
               tco.real_name, tco.user_phone, tco.id_card, tco.pay_status, tco.request_refund_time, tco.refund_money, tco.refund_reason,
               tco.refund_reason_pictures,tco.refund_number, tco.refund_transaction_id, tco.bank_card_number, tco.cardholder_name,
               tco.bank_name, tco.refund_status, tco.refund_voucher, tco.reject_reason, tco.create_time, tco.update_time, tco.create_by,
               tco.update_by, tco.disabled,tc.course_title,tc.course_type
               tco.update_by, tco.disabled,tc.course_title,tc.course_type,tc.course_cover
        from t_course_order tco
        left join t_course tc on tc.id = tco.course_id
        <where>

 ruoyi-system/src/main/resources/mapper/system/THelpNeedsMapper.xml

@@ -41,6 +41,7 @@
        <if test="query.startTime != null and query.startTime != '' and query.endTime != null and query.endTime != ''">
            and t1.create_time between #{query.startTime} and #{query.endTime}
        </if>
        AND t1.disabled = ${@com.ruoyi.common.enums.DisabledEnum@NO.getCode()}
        order by t1.create_time desc
    </select>
    <select id="exportHelpNeeds" resultType="com.ruoyi.system.export.THelpNeedsExport">
@@ -55,6 +56,7 @@
        <if test="query.startTime != null and query.startTime != '' and query.endTime != null and query.endTime != ''">
            and t1.create_time between #{query.startTime} and #{query.endTime}
        </if>
        AND t1.disabled = ${@com.ruoyi.common.enums.DisabledEnum@NO.getCode()}
        order by t1.create_time desc
    </select>


 ruoyi-system/src/main/resources/mapper/system/TOtherConfigMapper.xml

@@ -8,11 +8,12 @@
        <result column="elderly_age" property="elderlyAge" />
        <result column="days" property="days" />
        <result column="is_open_course" property="isOpenCourse" />
        <result column="is_open_insurance" property="isOpenInsurance" />
    </resultMap>

    <!-- 通用查询结果列 -->
    <sql id="Base_Column_List">
        id, elderly_age, days,is_open_course
        id, elderly_age, days,is_open_course,is_open_insurance
    </sql>

</mapper>