lidongdong
2023-10-17 866660a359ec6bb3940ef0db4fd2d7741d59ea30
金汇小程序空间申请查询
1个文件已添加
8个文件已修改
124 ■■■■■ 已修改文件
springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/JinHuiCommnuityApi.java 8 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/jinhui/JinhuiCommunityService.java 5 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/JinhuiAppi.java 8 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_jinhui_community/src/main/java/com/panzhihua/service_jinhui_community/api/JinhuiInterspaceApi.java 7 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_jinhui_community/src/main/java/com/panzhihua/service_jinhui_community/api/JinhuiMicroVolunteeringApi.java 74 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_jinhui_community/src/main/java/com/panzhihua/service_jinhui_community/dao/JinhuiInterspaceApplyForDao.java 5 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_jinhui_community/src/main/java/com/panzhihua/service_jinhui_community/service/JinhuiInterspaceApplyForService.java 3 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_jinhui_community/src/main/java/com/panzhihua/service_jinhui_community/service/impl/JinhuiInterspaceApplyForServiceImpl.java 5 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_jinhui_community/src/main/resources/mapper/JinhuiInterspaceApplyForMapper.xml 9 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/JinHuiCommnuityApi.java
@@ -350,8 +350,12 @@
    public R applyForGetList(@RequestParam("pageNum") int pageNum,
                             @RequestParam("pageSize") int pageSize,
                             @RequestParam(value = "intendantType", required = false) String intendantType,
                             @RequestParam(value = "state", required = false) String state) {
        return jinhuiCommunityService.applyForGetList(pageNum, pageSize, intendantType, state);
                             @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) {
        return jinhuiCommunityService.applyForGetList(pageNum, pageSize, intendantType,
                state,interspaceTime,subscribeTimeFrame,interspaceId);
    }
    /**
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/jinhui/JinhuiCommunityService.java
@@ -410,7 +410,10 @@
    public R applyForGetList(@RequestParam("pageNum") int pageNum,
                             @RequestParam("pageSize") int pageSize,
                             @RequestParam(value = "intendantType",required = false) String intendantType,
                             @RequestParam(value = "state",required = false) String state);
                             @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);
    /**
     * 空间预约申请详情
springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/JinhuiAppi.java
@@ -336,8 +336,12 @@
    public R applyForGetList(@RequestParam("pageNum") int pageNum,
                             @RequestParam("pageSize") int pageSize,
                             @RequestParam(value = "intendantType", required = false) String intendantType,
                             @RequestParam(value = "state", required = false) String state) {
        return jinhuiCommunityService.applyForGetList(pageNum, pageSize, intendantType, state);
                             @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) {
        return jinhuiCommunityService.applyForGetList(pageNum, pageSize, intendantType,
                                                    state,interspaceTime,subscribeTimeFrame,interspaceId);
    }
    /**
springcloud_k8s_panzhihuazhihuishequ/service_jinhui_community/src/main/java/com/panzhihua/service_jinhui_community/api/JinhuiInterspaceApi.java
@@ -173,9 +173,12 @@
    public R applyForGetList(@RequestParam("pageNum") int pageNum,
                             @RequestParam("pageSize") int pageSize,
                             @RequestParam(value = "intendantType",required = false) String intendantType,
                             @RequestParam(value = "state",required = false) String state)
                             @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)
    {
        return applyForService.getList(pageNum,pageSize,intendantType,state);
        return applyForService.getList(pageNum,pageSize,intendantType,state,interspaceTime,subscribeTimeFrame,interspaceId);
    }
    /**
springcloud_k8s_panzhihuazhihuishequ/service_jinhui_community/src/main/java/com/panzhihua/service_jinhui_community/api/JinhuiMicroVolunteeringApi.java
New file
@@ -0,0 +1,74 @@
package com.panzhihua.service_jinhui_community.api;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.jinhui.JinhuiGoldCoinRecordVO;
import com.panzhihua.common.model.vos.jinhui.JinhuiMicroVolunteeringVO;
import com.panzhihua.service_jinhui_community.entity.JinhuiMicroVolunteering;
import com.panzhihua.service_jinhui_community.service.JinhuiGoldCoinRecordService;
import com.panzhihua.service_jinhui_community.service.JinhuiMicroVolunteeringService;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
import org.apache.ibatis.annotations.Param;
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
/**
 * @auther llming
 * @describe 金汇微心愿
 */
@Slf4j
@RestController
@RequestMapping("/Micro")
public class JinhuiMicroVolunteeringApi
{
    @Resource
    private JinhuiMicroVolunteeringService recordService;
    /**
     * 分页查询
     * @param
     * @return
     */
//    @GetMapping("/Volunteering/getList")
//    public R volunteeringGetList(int pageNum,int pageSize,String userId)
//    {
//        return recordService.getList(pageNum,pageSize,userId);
//    }
//
//    @GetMapping("/Volunteering/getList")
//    public R volunteeringGetDetails(String id)
//    {
//        return R.ok(recordService.getDetails(id));
//    }
//    /**
//     * 新增
//     * @param
//     * @return
//     */
//    public R volunteeringAddData(JinhuiMicroVolunteeringVO item)
//    {
//        return recordService.addData(item);
//    }
//
//    public R volunteeringEditData(JinhuiMicroVolunteeringVO item)
//    {
//        return recordService.editData(item);
//    }
//
//    public R volunteeringExpurgateData(String id)
//    {
//        return recordService.expurgateData(id);
//    }
}
springcloud_k8s_panzhihuazhihuishequ/service_jinhui_community/src/main/java/com/panzhihua/service_jinhui_community/dao/JinhuiInterspaceApplyForDao.java
@@ -20,7 +20,10 @@
     */
    IPage<JinhuiInterspaceApplyFor> getList(Page page,
                                            @Param("intendantType") String intendantType,
                                            @Param("state") String state);
                                            @Param("state") String state,
                                            @Param("interspaceTime") String interspaceTime,
                                            @Param("subscribeTimeFrame") String subscribeTimeFrame,
                                            @Param("interspaceId") String interspaceId);
springcloud_k8s_panzhihuazhihuishequ/service_jinhui_community/src/main/java/com/panzhihua/service_jinhui_community/service/JinhuiInterspaceApplyForService.java
@@ -12,7 +12,8 @@
     * @param
     * @return
     */
    R getList(int pageNum,int pageSize,String intendantType,String state);
    R getList(int pageNum,int pageSize,String intendantType,String state,
              String interspaceTime,String subscribeTimeFrame,String interspaceId);
    JinhuiInterspaceApplyFor getDetails(String id);
    /**
springcloud_k8s_panzhihuazhihuishequ/service_jinhui_community/src/main/java/com/panzhihua/service_jinhui_community/service/impl/JinhuiInterspaceApplyForServiceImpl.java
@@ -22,10 +22,11 @@
{
    @Override
    public R getList(int pageNum,int pageSize,String intendantType,String state)
    public R getList(int pageNum,int pageSize,String intendantType,String state,
                     String interspaceTime,String subscribeTimeFrame,String interspaceId)
    {
        Page page = new Page<JinhuiInterspaceApplyFor>(pageNum,pageSize);
        return R.ok(baseMapper.getList(page,intendantType,state));
        return R.ok(baseMapper.getList(page,intendantType,state,interspaceTime,subscribeTimeFrame,interspaceId));
    }
    @Override
springcloud_k8s_panzhihuazhihuishequ/service_jinhui_community/src/main/resources/mapper/JinhuiInterspaceApplyForMapper.xml
@@ -38,6 +38,15 @@
            <if test="intendantType !=null and intendantType !='' ">
                and ji.intendant_type=#{intendantType}
            </if>
            <if test="interspaceTime !=null and interspaceTime !='' ">
                and jiaf.interspace_time=#{interspaceTime}
            </if>
            <if test="subscribeTimeFrame !=null and subscribeTimeFrame !='' ">
                and jiaf.subscribe_time_frame=#{subscribeTimeFrame}
            </if>
            <if test="interspaceId !=null and interspaceId !='' ">
                and jiaf.interspace_id=#{interspaceId}
            </if>
        </where>
        order by creation_time desc
    </select>