花城 修改金汇社区空间预约个人列表没数据问题

lidongdong

2024-10-23 2921faa2c11ee98913e5a6a3f867f87f832086f3

花城 修改金汇社区空间预约个人列表没数据问题

 springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/JinHuiCommnuityApi.java

@@ -370,9 +370,10 @@
                             @RequestParam(value = "state", required = false) String state,
                             @RequestParam(value = "interspaceTime",required = false) String interspaceTime,
                             @RequestParam(value = "subscribeTimeFrame",required = false) String subscribeTimeFrame,
                             @RequestParam(value = "interspaceId",required = false) String  interspaceId) {
                             @RequestParam(value = "interspaceId",required = false) String  interspaceId,
                             @RequestParam(value = "userId",required = false) String userId) {
        return jinhuiCommunityService.applyForGetList(pageNum, pageSize, intendantType,
                state,interspaceTime,subscribeTimeFrame,interspaceId);
                state,interspaceTime,subscribeTimeFrame,interspaceId,userId);
    }

    /**

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/jinhui/JinhuiInterspaceApplyForVO.java

@@ -38,6 +38,9 @@
    @ApiModelProperty(value = "预约人姓名")
    private String userName;

    @ApiModelProperty(value = "预约人id")
    private String userId;

    @ApiModelProperty(value = "预约人电话")
    private String userPhone;


 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/jinhui/JinhuiCommunityService.java

@@ -425,7 +425,8 @@
                             @RequestParam(value = "state",required = false) String state,
                             @RequestParam(value = "interspaceTime",required = false) String interspaceTime,
                             @RequestParam(value = "subscribeTimeFrame",required = false) String subscribeTimeFrame,
                             @RequestParam(value = "interspaceId",required = false) String  interspaceId);
                             @RequestParam(value = "interspaceId",required = false) String interspaceId,
                             @RequestParam(value = "userId",required = false) String userId);

    /**
     * 空间预约申请详情

 springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/JinhuiAppi.java

@@ -348,9 +348,10 @@
                             @RequestParam(value = "state", required = false) String state,
                             @RequestParam(value = "interspaceTime", required = false) String interspaceTime,
                             @RequestParam(value = "subscribeTimeFrame", required = false) String subscribeTimeFrame,
                             @RequestParam(value = "interspaceId", required = false) String interspaceId) {
                             @RequestParam(value = "interspaceId", required = false) String interspaceId,
                             @RequestParam(value = "userId",required = false) String userId) {
        return jinhuiCommunityService.applyForGetList(pageNum, pageSize, intendantType,
                state, interspaceTime, subscribeTimeFrame, interspaceId);
                state, interspaceTime, subscribeTimeFrame, interspaceId,userId);
    }

    /**

 springcloud_k8s_panzhihuazhihuishequ/service_jinhui_community/src/main/java/com/panzhihua/service_jinhui_community/api/JinhuiInterspaceApi.java

@@ -176,9 +176,10 @@
                             @RequestParam(value = "state",required = false) String state,
                             @RequestParam(value = "interspaceTime",required = false) String interspaceTime,
                             @RequestParam(value = "subscribeTimeFrame",required = false) String subscribeTimeFrame,
                             @RequestParam(value = "interspaceId",required = false) String  interspaceId)
                             @RequestParam(value = "interspaceId",required = false) String  interspaceId,
                             @RequestParam(value = "userId",required = false) String  userId)
    {
        return applyForService.getList(pageNum,pageSize,intendantType,state,interspaceTime,subscribeTimeFrame,interspaceId);
        return applyForService.getList(pageNum,pageSize,intendantType,state,interspaceTime,subscribeTimeFrame,interspaceId,userId);
    }

    /**

 springcloud_k8s_panzhihuazhihuishequ/service_jinhui_community/src/main/java/com/panzhihua/service_jinhui_community/dao/JinhuiInterspaceApplyForDao.java

@@ -23,7 +23,8 @@
                                            @Param("state") String state,
                                            @Param("interspaceTime") String interspaceTime,
                                            @Param("subscribeTimeFrame") String subscribeTimeFrame,
                                            @Param("interspaceId") String interspaceId);
                                            @Param("interspaceId") String interspaceId,
                                            @Param("userId") String userId);




 springcloud_k8s_panzhihuazhihuishequ/service_jinhui_community/src/main/java/com/panzhihua/service_jinhui_community/entity/JinhuiInterspaceApplyFor.java

@@ -43,6 +43,9 @@
    @ApiModelProperty(value = "预约人电话")
    private String userPhone;

    @ApiModelProperty(value = "预约人id")
    private String userId;

    @ApiModelProperty(value = "状态（1待处理  2未通过  3已通过）")
    private String state;


 springcloud_k8s_panzhihuazhihuishequ/service_jinhui_community/src/main/java/com/panzhihua/service_jinhui_community/service/JinhuiInterspaceApplyForService.java

@@ -4,6 +4,7 @@
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.jinhui.JinhuiInterspaceApplyForVO;
import com.panzhihua.service_jinhui_community.entity.JinhuiInterspaceApplyFor;
import org.apache.ibatis.annotations.Param;

public interface JinhuiInterspaceApplyForService extends IService<JinhuiInterspaceApplyFor>
{
@@ -13,7 +14,7 @@
     * @return
     */
    R getList(int pageNum,int pageSize,String intendantType,String state,
              String interspaceTime,String subscribeTimeFrame,String interspaceId);
              String interspaceTime,String subscribeTimeFrame,String interspaceId,String userId);

    JinhuiInterspaceApplyFor getDetails(String id);
    /**

 springcloud_k8s_panzhihuazhihuishequ/service_jinhui_community/src/main/java/com/panzhihua/service_jinhui_community/service/impl/JinhuiInterspaceApplyForServiceImpl.java

@@ -23,10 +23,10 @@

    @Override
    public R getList(int pageNum,int pageSize,String intendantType,String state,
                     String interspaceTime,String subscribeTimeFrame,String interspaceId)
                     String interspaceTime,String subscribeTimeFrame,String interspaceId,String userId)
    {
        Page page = new Page<JinhuiInterspaceApplyFor>(pageNum,pageSize);
        return R.ok(baseMapper.getList(page,intendantType,state,interspaceTime,subscribeTimeFrame,interspaceId));
        return R.ok(baseMapper.getList(page,intendantType,state,interspaceTime,subscribeTimeFrame,interspaceId,userId));
    }

    @Override

 springcloud_k8s_panzhihuazhihuishequ/service_jinhui_community/src/main/resources/mapper/JinhuiInterspaceApplyForMapper.xml

@@ -14,6 +14,7 @@
        <result property="updateTime" column="update_time" />
        <result property="content" column="content" />
        <result property="reply" column="reply" />
        <result property="userId" column="user_id" />
    </resultMap>


@@ -35,6 +36,7 @@
            jiaf.creation_time,
            jiaf.update_time,
            jiaf.content,
            jiaf.user_id,
            jiaf.reply
        from jinhui_interspace_apply_for as jiaf
        LEFT JOIN jinhui_interspace as ji ON ji.id = jiaf.interspace_id
@@ -54,6 +56,9 @@
            </if>
            <if test="interspaceId !=null and interspaceId !='' ">
                and jiaf.interspace_id=#{interspaceId}
            </if>
            <if test="userId !=null and userId !='' ">
                and jiaf.user_id=#{userId}
            </if>
        </where>
        order by creation_time desc
@@ -77,6 +82,7 @@
            jiaf.creation_time,
            jiaf.update_time,
            jiaf.content,
            jiaf.user_id,
            jiaf.reply
        from jinhui_interspace_apply_for as jiaf
        LEFT JOIN jinhui_interspace as ji ON ji.id = jiaf.interspace_id
@@ -114,6 +120,9 @@
            <if test="item.reply != null and item.reply != '' ">
                reply,
            </if>
            <if test="item.userId != null and item.userId != '' ">
                user_id,
            </if>
            creation_time
        </trim>
        values
@@ -144,6 +153,9 @@
            </if>
            <if test="item.reply != null and item.reply != '' ">
                #{item.reply},
            </if>
            <if test="item.userId != null and item.userId != '' ">
                #{item.userId},
            </if>
            sysdate()
        </trim>
@@ -179,6 +191,9 @@
            <if test="item.reply != null and item.reply != '' ">
                reply=#{item.reply},
            </if>
            <if test="item.userId != null and item.userId != '' ">
                user_id=#{item.userId},
            </if>
            update_time=sysdate()
        </set>
        where id = #{item.id}