花城 需求清单列表新增显示隐藏字段 新增认领人数字段 新增时间段筛选功能

lidongdong

2024-06-28 3cc5256ecb6f34d0bfe0e13903f8a87cf5fcce91

花城 需求清单列表新增显示隐藏字段 新增认领人数字段  新增时间段筛选功能

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

@@ -27,6 +27,8 @@
import org.springframework.web.bind.annotation.*;

import javax.annotation.Resource;
import java.text.ParseException;
import java.text.SimpleDateFormat;
import java.util.Date;

@Slf4j
@@ -79,9 +81,24 @@
                                @RequestParam(value = "status", required = false)String status,
                                @RequestParam(value = "kind", required = false)String kind,
                                @RequestParam(value = "userId", required = false)String userId,
                                @RequestParam(value = "communityId", required = false)String communityId)
                                @RequestParam(value = "communityId", required = false)String communityId,
                                @RequestParam(value = "startTime", required = false) String startTime,
                                @RequestParam(value = "endTime", required = false) String endTime)
    {
        return newStriveForFeign.getNeedProblemList(pageNum,pageSize,search,classifyId,status,kind,userId,getUserId()+"",communityId);
        Date start=null;
        Date end=null;

        try {
            if(!StringUtils.isEmpty(startTime)) {
                start = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").parse(startTime);
            }
            if(!StringUtils.isEmpty(startTime)) {
                end = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").parse(endTime);
            }
        } catch (ParseException e) {
            e.printStackTrace();
        }
        return newStriveForFeign.getNeedProblemList(pageNum,pageSize,search,classifyId,status,kind,userId,getUserId()+"",communityId,"1",start,end);
    }


@@ -91,9 +108,28 @@
                                      @RequestParam("pageSize") int pageSize,
                                      @RequestParam(value = "search", required = false)String search,
                                      @RequestParam(value = "status", required = false)String status,
                                      @RequestParam(value = "kind", required = false)String kind)
                                      @RequestParam(value = "kind", required = false)String kind,
                                      @RequestParam(value = "isDisplay", required = false)String isDisplay,
                                      @RequestParam(value = "startTime", required = false) String startTime,
                                      @RequestParam(value = "endTime", required = false) String endTime)
    {
        return newStriveForFeign.getMyJoinNeedProblemList(pageNum,pageSize,search,status,kind,getUserId()+"",getUserId()+"");
        Date start=null;
        Date end=null;

        try {
            if(!StringUtils.isEmpty(startTime)) {
                start = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").parse(startTime);
            }
            if(!StringUtils.isEmpty(startTime)) {
                end = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").parse(endTime);
            }
        } catch (ParseException e) {
            e.printStackTrace();
        }



        return newStriveForFeign.getMyJoinNeedProblemList(pageNum,pageSize,search,status,kind,getUserId()+"",getUserId()+"",isDisplay,start,end);
    }



 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/partybuilding/NeedProblemInventoryDTO.java

@@ -26,8 +26,11 @@
    @ApiModelProperty("分类id")
    private String classifyId;

    @ApiModelProperty("认领人数(-1 不限制) ")
    @ApiModelProperty("认领人数限制(-1 不限制) ")
    private String claimNum;

    @ApiModelProperty("认领人数")
    private String joinNum;

    @ApiModelProperty("需求地址")
    private String address;
@@ -98,6 +101,9 @@
    @ApiModelProperty("服务时长 毫秒值")
    private String serviceTime;

    @ApiModelProperty("是否显示  1显示  0隐藏  默认显示")
    private String isDisplay;

    @ApiModelProperty("开始时间打卡")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    private Date punchStartTime;

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/partybuilding/NewStriveForFeign.java

@@ -7,6 +7,7 @@
import org.springframework.web.bind.annotation.*;

import javax.annotation.Resource;
import java.util.Date;
import java.util.List;

/**
@@ -54,7 +55,10 @@
                                @RequestParam(value = "kind", required = false)String kind,
                                @RequestParam(value = "userId", required = false)String userId,
                                @RequestParam(value = "userIds", required = false)String userIds,
                                @RequestParam(value = "communityId", required = false)String communityId);
                                @RequestParam(value = "communityId", required = false)String communityId,
                                @RequestParam(value = "isDisplay", required = false)String isDisplay,
                                @RequestParam(value = "startTime", required = false) Date startTime,
                                @RequestParam(value = "endTime", required = false) Date endTime);

    @GetMapping("/NeedProblem/getMyJoinNeedProblemList")
    public R getMyJoinNeedProblemList(@RequestParam("pageNum") int pageNum,
@@ -63,7 +67,10 @@
                                      @RequestParam(value = "status", required = false)String status,
                                      @RequestParam(value = "kind", required = false)String kind,
                                      @RequestParam(value = "userIds", required = false)String userIds,
                                      @RequestParam(value = "userId", required = false)String userId);
                                      @RequestParam(value = "userId", required = false)String userId,
                                      @RequestParam(value = "isDisplay", required = false)String isDisplay,
                                      @RequestParam(value = "startTime", required = false) Date startTime,
                                      @RequestParam(value = "endTime", required = false) Date endTime);


    @GetMapping("/NeedProblem/getDetails")

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

@@ -10,12 +10,15 @@
import com.panzhihua.common.model.vos.community.building.NewFightShoppingVO;
import com.panzhihua.common.model.vos.user.SysUserVO;
import com.panzhihua.common.service.partybuilding.NewStriveForFeign;
import com.panzhihua.common.utlis.StringUtils;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
import org.springframework.web.bind.annotation.*;

import javax.annotation.Resource;
import java.text.ParseException;
import java.text.SimpleDateFormat;
import java.util.Date;

@Slf4j
@@ -43,9 +46,25 @@
                                @RequestParam(value = "status", required = false)String status,
                                @RequestParam(value = "kind", required = false)String kind,
                                @RequestParam(value = "userId", required = false)String userId,
                                @RequestParam(value = "communityId", required = false)String communityId)
                                @RequestParam(value = "communityId", required = false)String communityId,
                                @RequestParam(value = "isDisplay", required = false)String isDisplay,
                                @RequestParam(value = "startTime", required = false) String startTime,
                                @RequestParam(value = "endTime", required = false) String endTime)
    {
        return newStriveForFeign.getNeedProblemList(pageNum,pageSize,search,classifyId,status,kind,userId,getUserId()+"",communityId);
        Date start=null;
        Date end=null;

        try {
            if(!StringUtils.isEmpty(startTime)) {
                start = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").parse(startTime);
            }
            if(!StringUtils.isEmpty(startTime)) {
                end = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").parse(endTime);
            }
        } catch (ParseException e) {
            e.printStackTrace();
        }
        return newStriveForFeign.getNeedProblemList(pageNum,pageSize,search,classifyId,status,kind,userId,getUserId()+"",communityId,isDisplay,start,end);
    }


@@ -55,9 +74,25 @@
                                      @RequestParam("pageSize") int pageSize,
                                      @RequestParam(value = "search", required = false)String search,
                                      @RequestParam(value = "status", required = false)String status,
                                      @RequestParam(value = "kind", required = false)String kind)
                                      @RequestParam(value = "kind", required = false)String kind,
                                      @RequestParam(value = "isDisplay", required = false)String isDisplay,
                                      @RequestParam(value = "startTime", required = false) String startTime,
                                      @RequestParam(value = "endTime", required = false) String endTime)
    {
        return newStriveForFeign.getMyJoinNeedProblemList(pageNum,pageSize,search,status,kind,getUserId()+"",getUserId()+"");
        Date start=null;
        Date end=null;

        try {
            if(!StringUtils.isEmpty(startTime)) {
                start = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").parse(startTime);
            }
            if(!StringUtils.isEmpty(startTime)) {
                end = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").parse(endTime);
            }
        } catch (ParseException e) {
            e.printStackTrace();
        }
        return newStriveForFeign.getMyJoinNeedProblemList(pageNum,pageSize,search,status,kind,getUserId()+"",getUserId()+"",isDisplay,start,end);
    }



 springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/api/NeedProblemApi.java

@@ -8,6 +8,7 @@
import org.springframework.web.bind.annotation.*;

import javax.annotation.Resource;
import java.util.Date;

@Slf4j
@RestController
@@ -26,9 +27,12 @@
                                @RequestParam(value = "kind", required = false)String kind,
                                @RequestParam(value = "userId", required = false)String userId,
                                @RequestParam(value = "userIds", required = false)String userIds,
                                @RequestParam(value = "communityId", required = false)String communityId)
                                @RequestParam(value = "communityId", required = false)String communityId,
                                @RequestParam(value = "isDisplay", required = false) String isDisplay,
                                @RequestParam(value = "startTime", required = false) Date startTime,
                                @RequestParam(value = "endTime", required = false) Date endTime)
    {
        return R.ok(inventoryService.getList(pageNum,pageSize,search,classifyId,status,kind,userId,userIds,communityId));
        return R.ok(inventoryService.getList(pageNum,pageSize,search,classifyId,status,kind,userId,userIds,isDisplay,communityId,startTime,endTime));
    }

    @GetMapping("/getMyJoinNeedProblemList")
@@ -38,9 +42,12 @@
                                      @RequestParam(value = "status", required = false) String status,
                                      @RequestParam(value = "kind", required = false) String kind,
                                      @RequestParam(value = "userIds", required = false) String userIds,
                                      @RequestParam(value = "userId", required = false)String userId)
                                      @RequestParam(value = "userId", required = false)String userId,
                                      @RequestParam(value = "isDisplay", required = false)String isDisplay,
                                      @RequestParam(value = "startTime", required = false) Date startTime,
                                      @RequestParam(value = "endTime", required = false) Date endTime)
    {
        return R.ok(inventoryService.getMyJoinList(pageNum,pageSize,search,status,kind,userIds,userId));
        return R.ok(inventoryService.getMyJoinList(pageNum,pageSize,search,status,kind,userIds,isDisplay,userId,startTime,endTime));
    }

    @GetMapping("/getDetails")

 springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/dao/NeedProblemInventoryDAO.java

@@ -9,6 +9,7 @@
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;

import java.util.Date;
import java.util.List;

/**
@@ -28,14 +29,20 @@
                                           @Param("kind") String kind,
                                           @Param("userId") String userId,
                                           @Param("userIds") String userIds,
                                           @Param("communityId") String communityId);
                                           @Param("isDisplay") String isDisplay,
                                           @Param("communityId") String communityId,
                                           @Param("startTime") Date startTime,
                                           @Param("endTime") Date endTime);

    IPage<NeedProblemInventoryDTO> getMyJoinList(Page page,
                                                 @Param("search") String search,
                                                 @Param("status") String status,
                                                 @Param("kind") String kind,
                                                 @Param("userIds") String userIds,
                                                 @Param("userId") String userId);
                                                 @Param("isDisplay") String isDisplay,
                                                 @Param("userId") String userId,
                                                 @Param("startTime") Date startTime,
                                                 @Param("endTime") Date endTime);

    NeedProblemInventoryDTO getDetails(@Param("id")String id,@Param("userIds") String userIds);


 springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/service/NeedProblemInventoryService.java

@@ -7,6 +7,7 @@
import com.panzhihua.common.model.vos.R;
import org.apache.ibatis.annotations.Param;

import java.util.Date;
import java.util.List;

/**
@@ -18,20 +19,27 @@
public interface NeedProblemInventoryService
{

    IPage<NeedProblemInventoryDTO> getList(int pageNum, int pageSize,
    IPage<NeedProblemInventoryDTO> getList(int pageNum,
                                           int pageSize,
                                           String search,
                                           String classifyId,
                                           String status,
                                           String kind,
                                           String userId,
                                           String userIds,
                                           String communityId);
                                           String isDisplay,
                                           String communityId,
                                           Date startTime,
                                           Date endTime);

    IPage<NeedProblemInventoryDTO> getMyJoinList(int pageNum, int pageSize,
                                                 String search,String status,
                                                 String kind,
                                                 String userIds,
                                                 String userId);
                                                 String isDisplay,
                                                 String userId,
                                                 Date startTime,
                                                 Date endTime);

    NeedProblemInventoryDTO getDetails(String id,String userIds);


 springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/service/impl/NeedProblemInventoryServiceImpl.java

@@ -21,6 +21,7 @@
import org.springframework.util.CollectionUtils;

import javax.annotation.Resource;
import java.util.Date;
import java.util.List;

/**
@@ -42,19 +43,25 @@
                                                  String kind,
                                                  String userId,
                                                  String userIds,
                                                  String communityId)
                                                  String isDisplay,
                                                  String communityId,
                                                  Date startTime,
                                                  Date endTime)
    {
        Page page = new Page<>(pageNum,pageSize);
        return baseMapper.getList(page, search, classifyId,status,kind,userId,userIds,communityId);
        return baseMapper.getList(page, search, classifyId,status,kind,userId,userIds,isDisplay,communityId,startTime,endTime);
    }

    @Override
    public IPage<NeedProblemInventoryDTO> getMyJoinList(int pageNum, int pageSize,String search,String status,
                                                        String kind,
                                                        String userIds,
                                                        String userId) {
                                                        String isDisplay,
                                                        String userId,
                                                        Date startTime,
                                                        Date endTime) {
        Page page = new Page<>(pageNum,pageSize);
        return baseMapper.getMyJoinList(page, search, status,kind,userIds,userId);
        return baseMapper.getMyJoinList(page, search, status,kind,userIds,isDisplay,userId,startTime,endTime);
    }

    @Override

 springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/resources/mapper/NeedProblemInventoryMapper.xml

@@ -27,6 +27,7 @@
        update_time,
        kind,
        community_id,
        is_display,
        user_id
    </sql>

@@ -62,6 +63,7 @@
            (count(task_id)) as joinNum,
            nfnpc.service_time,
            nfpi.status,
            nfpi.is_display,
            nfpi.user_id
        FROM new_fight_need_problem_inventory as nfpi
        left join com_act_neighbor_circle_topic_new as canct on canct.id=nfpi.classify_id
@@ -70,6 +72,9 @@
            1=1
            <if test="search !=null and search != '' ">
                and nfpi.title like concat ('%',#{search},'%')
            </if>
            <if test="isDisplay !=null and isDisplay != '' ">
                and nfpi.is_display=#{isDisplay}
            </if>
            <if test="classifyId !=null and classifyId != '' ">
                and nfpi.classify_id=#{classifyId}
@@ -85,6 +90,12 @@
            </if>
            <if test="userId !=null and userId != '' ">
                and nfpi.user_id =#{userId}
            </if>
            <if test="startTime != null">
                AND nfpi.creation_time <![CDATA[ >= ]]> #{startTime}
            </if>
            <if test="endTime != null">
                AND nfpi.creation_time <![CDATA[ <= ]]> #{endTime}
            </if>
        </where>
        GROUP BY nfpi.id
@@ -121,12 +132,16 @@
            if(nfnpc.user_id>0,1,0) as isJoin,
            (count(task_id)) as joinNum,
            nfpi.status,
            nfpi.is_display,
            nfpi.user_id
        FROM new_fight_need_problem_inventory as nfpi
        left join com_act_neighbor_circle_topic_new as canct on canct.id=nfpi.classify_id
        left join new_fight_need_problem_claim as nfnpc on nfnpc.task_id=nfpi.id and nfnpc.user_id=#{userIds}
        <where>
            1=1
            <if test="isDisplay !=null and isDisplay != '' ">
                and nfpi.is_display=#{isDisplay}
            </if>
            <if test="search !=null and search != '' ">
                and nfpi.title like concat ('%',#{search},'%')
            </if>
@@ -138,6 +153,12 @@
            </if>
            <if test="userId !=null and userId != '' ">
                and nfpi.id in(SELECT task_id FROM new_fight_need_problem_claim where user_id=#{userId} )
            </if>
            <if test="startTime != null ">
                AND nfpi.creation_time <![CDATA[ >= ]]> #{startTime}
            </if>
            <if test="endTime != null ">
                AND nfpi.creation_time <![CDATA[ <= ]]> #{endTime}
            </if>
        </where>
        GROUP BY nfpi.id
@@ -174,6 +195,7 @@
            if(nfnpc.user_id>0,1,0) as isJoin,
            (count(task_id)) as joinNum,
            nfpi.status,
            nfpi.is_display,
            nfpi.user_id
        FROM new_fight_need_problem_inventory as nfpi
        left join com_act_neighbor_circle_topic_new as canct on canct.id=nfpi.classify_id
@@ -257,6 +279,9 @@
            <if test="item.status != null and item.status !='' " >
                status,
            </if>
            <if test="item.isDisplay != null and item.isDisplay !='' " >
                is_display,
            </if>
            creation_time
        </trim>
        values
@@ -326,6 +351,9 @@
            </if>
            <if test="item.status != null and item.status !='' " >
                #{item.status},
            </if>
            <if test="item.isDisplay != null and item.isDisplay !='' " >
                #{item.isDisplay},
            </if>
            sysdate()
        </trim>
@@ -400,6 +428,9 @@
            <if test="item.status != null and item.status !='' " >
                status=#{item.status},
            </if>
            <if test="item.isDisplay != null and item.isDisplay !='' " >
                is_display=#{item.isDisplay},
            </if>
            update_time=sysdate()
        </set>
        where id = #{item.id}