Merge branch 'test_screen' into 'test'

罗元桥

2021-06-22 7df36d4bf09248b6d4f82ef52b5cb2d197619bed

Merge branch 'test_screen' into 'test'

Test screen

See merge request root/zhihuishequ!75

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/bigscreen/event/ScreenEventListDTO.java

New file
@@ -0,0 +1,59 @@
package com.panzhihua.common.model.dtos.community.bigscreen.event;

import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

import javax.validation.constraints.NotNull;

@Data
@ApiModel("大屏事件列表请求参数")
public class ScreenEventListDTO {

    @ApiModelProperty(value = "分页每页数量",example = "10")
    private Long pageSize = 10L;

    @ApiModelProperty(value = "分页当前记录数",example = "1")
    private Long pageNum = 1L;

    @ApiModelProperty(value = "社区id", example = "2", required = true)
    @NotNull(message = "社区id不能为空")
    private Long communityId;

    @ApiModelProperty(value="查询开始时间")
    private String startTime;

    @ApiModelProperty(value="查询结束时间")
    private String endTime;

    @ApiModelProperty(value="网格id")
    private Long gridId;

    @ApiModelProperty(value="事件类型（1治安隐患、2公共服务、3矛盾纠纷、4不稳定因素、5突发事件、6特殊人群信息上报 8宣传教育）")
    private Integer eventType;

    @ApiModelProperty(value="事件分类(1、办件事件2、宣传事件3、阅读事件)",hidden = true)
    private Integer eventCategory = 1;

    @ApiModelProperty(value="事件处理状态(1待处理、2待验证、3已上报、4已解决、5草稿箱、6已撤销、7已失效 8 已发布)")
    private Integer eventDealStatus;

    @ApiModelProperty("是否紧急")
    private Boolean urgent;

    @ApiModelProperty("是否重大")
    private Boolean major;

    /**
     * 事件类型（1治安隐患、2公共服务、3矛盾纠纷、4不稳定因素、5突发事件、6特殊人群信息上报 8宣传教育）
     */
    public interface eventType{
        int za = 1;
        int gg = 2;
        int md = 3;
        int bwd = 4;
        int tf = 5;
        int ts = 6;
        int xc = 8;
    }
}

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/bigscreen/work/ScreenActActivityListDTO.java

New file
@@ -0,0 +1,39 @@
package com.panzhihua.common.model.dtos.community.bigscreen.work;

import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

import javax.validation.constraints.NotNull;

@Data
@ApiModel("工作大屏一起议列表请求参数")
public class ScreenActActivityListDTO {

    @ApiModelProperty(value = "分页每页数量",example = "10")
    private Long pageSize = 10L;

    @ApiModelProperty(value = "分页当前记录数",example = "1")
    private Long pageNum = 1L;

    @ApiModelProperty(value = "社区id", example = "2", required = true)
    @NotNull(message = "社区id不能为空")
    private Long communityId;

    @ApiModelProperty(value="查询开始时间")
    private String startTime;

    @ApiModelProperty(value="查询结束时间")
    private String endTime;

    @ApiModelProperty(value="发布类型 1 图文 2 投票")
    private Integer type;

    /**
     * 发布类型 1 图文 2 投票
     */
    public interface type{
        int tw = 1;
        int tp = 2;
    }
}

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/bigscreen/work/ScreenActActivityPeopleListDTO.java

New file
@@ -0,0 +1,23 @@
package com.panzhihua.common.model.dtos.community.bigscreen.work;

import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

import javax.validation.constraints.NotNull;

@Data
@ApiModel("工作大屏一起议列表请求参数")
public class ScreenActActivityPeopleListDTO {

    @ApiModelProperty(value = "分页每页数量",example = "10")
    private Long pageSize = 10L;

    @ApiModelProperty(value = "分页当前记录数",example = "1")
    private Long pageNum = 1L;

    @ApiModelProperty(value = "活动id", example = "2", required = true)
    @NotNull(message = "活动id不可为空")
    private Long activityId;

}

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/bigscreen/work/ScreenDiscussListDTO.java

New file
@@ -0,0 +1,39 @@
package com.panzhihua.common.model.dtos.community.bigscreen.work;

import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

import javax.validation.constraints.NotNull;

@Data
@ApiModel("工作大屏一起议列表请求参数")
public class ScreenDiscussListDTO {

    @ApiModelProperty(value = "分页每页数量",example = "10")
    private Long pageSize = 10L;

    @ApiModelProperty(value = "分页当前记录数",example = "1")
    private Long pageNum = 1L;

    @ApiModelProperty(value = "社区id", example = "2", required = true)
    @NotNull(message = "社区id不能为空")
    private Long communityId;

    @ApiModelProperty(value="查询开始时间")
    private String startTime;

    @ApiModelProperty(value="查询结束时间")
    private String endTime;

    @ApiModelProperty(value="发布类型 1 图文 2 投票")
    private Integer type;

    /**
     * 发布类型 1 图文 2 投票
     */
    public interface type{
        int tw = 1;
        int tp = 2;
    }
}

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/bigscreen/work/ScreenMicroListDTO.java

New file
@@ -0,0 +1,32 @@
package com.panzhihua.common.model.dtos.community.bigscreen.work;

import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

import javax.validation.constraints.NotNull;

@Data
@ApiModel("工作大屏微心愿列表请求参数")
public class ScreenMicroListDTO {

    @ApiModelProperty(value = "分页每页数量",example = "10")
    private Long pageSize = 10L;

    @ApiModelProperty(value = "分页当前记录数",example = "1")
    private Long pageNum = 1L;

    @ApiModelProperty(value = "社区id", example = "2", required = true)
    @NotNull(message = "社区id不能为空")
    private Long communityId;

    @ApiModelProperty(value="查询开始时间")
    private String startTime;

    @ApiModelProperty(value="查询结束时间")
    private String endTime;

    @ApiModelProperty(value="状态 1待审核  2待分配 3进行中  4已驳回 5待确认6 已完成")
    private Integer status;

}

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/neighbor/ComActNeighborCircleAdminDTO.java

@@ -36,4 +36,7 @@
    @ApiModelProperty(value = "社区id",hidden = true)
    private Long communityId;

    @ApiModelProperty(value="发布状态(1.待审核 2.显示 3.隐藏 4.驳回)")
    private Integer status;

}

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComMngPopulationTotalVO.java

@@ -32,4 +32,10 @@
    @ApiModelProperty("特殊群体")
    private Integer specialTotal;

    /**
     * 小区总数
     */
    @ApiModelProperty("小区总数")
    private Integer villageTotal;

}

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/screen/civil/CivilVillageStatisticsVO.java

@@ -24,6 +24,42 @@
    private String villageImages;

    @ApiModelProperty("小区id")
    private String villageId;
    private Long villageId;

    @ApiModelProperty("总户数")
    private Integer houseNum;

    @ApiModelProperty("总人数")
    private Integer peopleNum;

    @ApiModelProperty("户籍人数")
    private Integer registerNum;

    @ApiModelProperty("流动人数")
    private Integer flowNum;

    @ApiModelProperty("楼栋长数量")
    private Integer buildingPeopleNum;

    @ApiModelProperty("居民小组长数量")
    private Integer smallHeadmanNum;

    @ApiModelProperty("党小组长数量")
    private Integer partyPeopleNum;

    @ApiModelProperty("妇女小组长数量")
    private Integer womanPeopleNum;

    @ApiModelProperty("卫生员数量")
    private Integer hygienePeopleNum;

    @ApiModelProperty("安全员数量")
    private Integer securityPeopleNum;

    @ApiModelProperty("监督员数量")
    private Integer supervisePeopleNum;

    @ApiModelProperty("其他人员")
    private Integer otherPeopleNum;

}

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/screen/event/EventListVO.java

New file
@@ -0,0 +1,71 @@
package com.panzhihua.common.model.vos.community.screen.event;

import com.fasterxml.jackson.annotation.JsonFormat;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
import com.panzhihua.common.model.vos.grid.EventResourceVO;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

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

@Data
@ApiModel("事件列表返回参数")
public class EventListVO {

    @ApiModelProperty("事件id")
    @JsonSerialize(using = ToStringSerializer.class)
    private Long id;

    @ApiModelProperty("发布人昵称")
    private String userName;

    @ApiModelProperty("发布人id")
    private Long gridMemberId;

    @ApiModelProperty("发布人头像")
    private String imageUrl;

    @ApiModelProperty("事件上报时间")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    private Date createAt;

    @ApiModelProperty("事件描述")
    private String eventDes;

    @ApiModelProperty("危险级别:0 (无) 1（特别重大）、2（重大）、3（较大）、4（一般）")
    private String dangerLevel;

    @ApiModelProperty("是否紧急")
    private Boolean urgent;

    @ApiModelProperty("是否重大")
    private Boolean major;

    @ApiModelProperty("事件发生地点")
    private String happenAddress;

    @ApiModelProperty("事件发生地点备注")
    private String happentAddress;

    @ApiModelProperty("事件发生经纬度（长在前短在后）")
    private String happentLatLng;

    @ApiModelProperty("事件分类1治安隐患、2公共服务、3矛盾纠纷、4不稳定因素、5突发事件、6特殊人群信息上报")
    private Integer eventType;

    @ApiModelProperty("事件分类（1、办件事件2、宣传事件3、阅读事件）")
    private Integer eventCategory;

    @ApiModelProperty("事件处理状态(1待处理、2待验证、3已上报、4已解决、5草稿箱、6已撤销、7已失效 8 已发布)")
    private Integer eventDealStatus;

    @ApiModelProperty("事件类型")
    private String eventClazz;

    @ApiModelProperty("发生区域")
    private String gridName;

}

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/screen/event/EventNewStatisticsVO.java

@@ -25,7 +25,7 @@
    @ApiModelProperty("发布人头像")
    private String imageUrl;

    @ApiModelProperty("发布时间")
    @ApiModelProperty("事件上报时间")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    private Date createAt;

@@ -50,11 +50,20 @@
    @ApiModelProperty("事件分类1治安隐患、2公共服务、3矛盾纠纷、4不稳定因素、5突发事件、6特殊人群信息上报")
    private Integer eventType;

    @ApiModelProperty("事件处理状态(1待处理、4已解决)")
    @ApiModelProperty("事件分类（1、办事事件2、宣传事件3、阅读事件）")
    private Integer eventCategory;

    @ApiModelProperty("事件处理状态(1待处理、2待验证、3已上报、4已解决、5草稿箱、6已撤销、7已失效 8 已发布)")
    private Integer eventDealStatus;

    @ApiModelProperty("随手拍图片集合")
    private String photoPathList;

    @ApiModelProperty("事件类型")
    private String eventClazz;

    @ApiModelProperty("发生区域")
    private String gridName;

    @ApiModelProperty(value = "音频")
    private List<EventResourceVO> audios;
@@ -65,4 +74,7 @@
    @ApiModelProperty(value = "图片")
    private List<EventResourceVO> pics;

    @ApiModelProperty(value = "事件处理流转记录")
    private List<EventTransferRecordVO> transferRecordList;

}

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/screen/event/EventStatisticsVO.java

@@ -1,5 +1,7 @@
package com.panzhihua.common.model.vos.community.screen.event;

import com.panzhihua.common.model.vos.community.ComMngPopulationTotalVO;
import com.panzhihua.common.model.vos.community.screen.civil.CivilVillageStatisticsVO;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -22,4 +24,10 @@
    @ApiModelProperty("社区事件数据")
    private List<EventGridIncidentStatisticsVO> gridIncidentList;

    @ApiModelProperty("小区列表数据")
    private List<CivilVillageStatisticsVO> villageStatisticsList;

    @ApiModelProperty("人口统计数据")
    private ComMngPopulationTotalVO populationTotalVO;

}

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/screen/event/EventTransferRecordVO.java

New file
@@ -0,0 +1,20 @@
package com.panzhihua.common.model.vos.community.screen.event;

import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

import java.util.Date;

@Data
@ApiModel("大屏事件播报流转记录返回参数")
public class EventTransferRecordVO {

    @ApiModelProperty("事件处理时间")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    private Date processDate;

    @ApiModelProperty("事件处理结果")
    private String processResult;
}

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/screen/work/ActActivityListVO.java

New file
@@ -0,0 +1,81 @@
package com.panzhihua.common.model.vos.community.screen.work;

import com.fasterxml.jackson.annotation.JsonFormat;
import com.panzhihua.common.model.vos.community.ComActDiscussOptionVO;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

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

@Data
@ApiModel("大屏社区活动列表返回参数")
public class ActActivityListVO {

    @ApiModelProperty("主键id")
    private Long id;

    @ApiModelProperty("负责人姓名")
    private String userName;

    @ApiModelProperty("负责人id")
    private Long sponsorId;

    @ApiModelProperty("负责人头像")
    private String imageUrl;

    @ApiModelProperty("活动状态 1 待发布 2 未开始 3 报名中 4 进行中 5 已结束 6 已取消")
    private Integer status;

    @ApiModelProperty("发布时间")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    private Date createAt;

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

    @ApiModelProperty("活动结束时间")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    private Date endAt;

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

    @ApiModelProperty("报名结束时间")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    private Date signUpEnd;

    @ApiModelProperty("志愿者人数下限")
    private Integer volunteerMin;

    @ApiModelProperty("志愿者人数上限")
    private Integer volunteerMax;

    @ApiModelProperty("参与者人数下限")
    private Integer participantMin;

    @ApiModelProperty("参与者人数上限")
    private Integer participantMax;

    @ApiModelProperty("活动名称")
    private String activityName;

    @ApiModelProperty("活动内容")
    private String content;

    @ApiModelProperty("活动封面")
    private String cover;

    @ApiModelProperty("活动地址")
    private String activityAddr;

    @ApiModelProperty("居民参加人数")
    private Integer participantCount;

    @ApiModelProperty("志愿者参加人数")
    private Integer volunteerCount;

}

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/screen/work/ActActivityPeopleListVO.java

New file
@@ -0,0 +1,30 @@
package com.panzhihua.common.model.vos.community.screen.work;

import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

import java.util.Date;

@Data
@ApiModel("大屏社区活动报名详情返回参数")
public class ActActivityPeopleListVO {

    @ApiModelProperty("用户id")
    private Long userId;

    @ApiModelProperty("姓名")
    private String name;

    @ApiModelProperty("身份")
    private String identity;

    @ApiModelProperty("手机号")
    private String phone;

    @ApiModelProperty("报名时间")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    private Date createAt;

}

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/screen/work/DiscussListVO.java

New file
@@ -0,0 +1,53 @@
package com.panzhihua.common.model.vos.community.screen.work;

import com.fasterxml.jackson.annotation.JsonFormat;
import com.panzhihua.common.model.vos.community.ComActDiscussOptionVO;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

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

@Data
@ApiModel("大屏一起议列表返回参数")
public class DiscussListVO {

    @ApiModelProperty("主键id")
    private Long id;

    @ApiModelProperty("发布人昵称")
    private String userName;

    @ApiModelProperty("发布人id")
    private Long userId;

    @ApiModelProperty("发布人头像")
    private String imageUrl;

    @ApiModelProperty("发布类型 1 图文 2 投票")
    private Integer type;

    @ApiModelProperty("发布时间")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    private Date createAt;

    @ApiModelProperty("发布主题")
    private String discussSubject;

    @ApiModelProperty("投票标题")
    private String voteTitle;

    @ApiModelProperty("图片地址 多个用逗号隔开")
    private String photoPah;

    @ApiModelProperty("评论数量")
    private Integer commentCount;

    @ApiModelProperty("点赞数量")
    private Integer fabulousCount;

    @ApiModelProperty("投票选项列表")
    private List<ComActDiscussOptionVO> discussOptionList;

}

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/screen/work/MicroListVO.java

New file
@@ -0,0 +1,71 @@
package com.panzhihua.common.model.vos.community.screen.work;

import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

import java.util.Date;

@Data
@ApiModel("大屏微心愿列表返回参数")
public class MicroListVO {

    @ApiModelProperty("主键id")
    private Long id;

    @ApiModelProperty("发起人姓名")
    private String userName;

    @ApiModelProperty("发起人id")
    private Long sponsorId;

    @ApiModelProperty("发起人头像")
    private String imageUrl;

    @ApiModelProperty("发起人手机号")
    private String phone;

    @ApiModelProperty("状态 1待审核  2待分配 3进行中  4已驳回 5待确认6 已完成")
    private Integer status;

    @ApiModelProperty("发起时间")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    private Date createAt;

    @ApiModelProperty("微心愿名称")
    private String wishName;

    @ApiModelProperty("微心愿内容")
    private String detail;

    @ApiModelProperty("活动封面")
    private String photoPathList;

    @ApiModelProperty("集星数")
    private Integer starNum;

    @ApiModelProperty("评价时间")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    private Date evaluateAt;

    @ApiModelProperty("评价星数")
    private Integer score;

    @ApiModelProperty("负责人名字")
    private String responsibleName;

    @ApiModelProperty("形式  1分配人员  2发起活动")
    private Integer form;

    @ApiModelProperty("分配时间")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    private Date distributionAt;

    @ApiModelProperty("完成情况描述")
    private String finish;

    @ApiModelProperty("完成情况图片列表，逗号分隔")
    private String finishPhotoPathList;

}

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/CommunityService.java

@@ -9,6 +9,11 @@
import com.panzhihua.common.model.dtos.community.bigscreen.BigScreenStatisticAgeGenderDTO;
import com.panzhihua.common.model.dtos.community.bigscreen.BigScreenStatisticPartyActivityDTO;
import com.panzhihua.common.model.dtos.community.bigscreen.PageBigScreenStatisticPartyOrg;
import com.panzhihua.common.model.dtos.community.bigscreen.event.ScreenEventListDTO;
import com.panzhihua.common.model.dtos.community.bigscreen.work.ScreenActActivityListDTO;
import com.panzhihua.common.model.dtos.community.bigscreen.work.ScreenActActivityPeopleListDTO;
import com.panzhihua.common.model.dtos.community.bigscreen.work.ScreenDiscussListDTO;
import com.panzhihua.common.model.dtos.community.bigscreen.work.ScreenMicroListDTO;
import com.panzhihua.common.model.dtos.elders.ComEldersAuthGetResultDTO;
import com.panzhihua.common.model.dtos.elders.ComEldersAuthPageDTO;
import com.panzhihua.common.model.dtos.elders.ComEldersAuthUserAddAppDTO;
@@ -3031,4 +3036,37 @@
     */
    @PostMapping("/screen/getScreenEventDetail")
    R getScreenEventDetail(@RequestBody BigScreenEventDetailDTO eventDetailDTO);

    /**
     * 工作大屏-一起议列表
     * @param discussListDTO    请求参数
     * @return  一起议列表
     */
    @PostMapping("/screen/work/getScreenDiscussList")
    R getScreenDiscussList(@RequestBody ScreenDiscussListDTO discussListDTO);

    /**
     * 工作大屏-社区活动列表
     * @param actActivityListDTO    请求参数
     * @return  活动列表
     */
    @PostMapping("/screen/work/getScreenActActivityList")
    R getScreenActActivityList(@RequestBody ScreenActActivityListDTO actActivityListDTO);

    /**
     * 工作大屏-社区活动报名人员列表
     * @param activityPeopleListDTO 请求参数
     * @return  社区活动报名人员列表
     */
    @PostMapping("/screen/work/getActActivityPeopleList")
    R getActActivityPeopleList(@RequestBody ScreenActActivityPeopleListDTO activityPeopleListDTO);

    /**
     * 工作大屏-微心愿列表
     * @param microListDTO  请求参数
     * @return  微心愿列表
     */
    @PostMapping("/screen/work/getScreenMicroList")
    R getScreenMicroList(@RequestBody ScreenMicroListDTO microListDTO);

}

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/grid/GridService.java

@@ -1,5 +1,6 @@
package com.panzhihua.common.service.grid;

import com.panzhihua.common.model.dtos.community.bigscreen.event.ScreenEventListDTO;
import com.panzhihua.common.model.dtos.grid.*;
import com.panzhihua.common.model.vos.*;
import com.panzhihua.common.model.vos.grid.*;
@@ -894,6 +895,14 @@
    R timedTaskGridMember();

    /**
     * 事件大屏查询事件列表
     * @param eventListDTO  请求参数
     * @return  事件列表
     */
    @PostMapping("/screen/event/list")
    R getScreenEventList(@RequestBody ScreenEventListDTO eventListDTO);

    /**
     * description 根据本地网格ID，查询对于的浪潮市平台对应的ID
     *
     * @param  id 本地网格ID

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

@@ -1,12 +1,16 @@
package com.panzhihua.community_backstage.api;

import com.panzhihua.common.model.dtos.community.bigscreen.BigScreenEventDetailDTO;
import com.panzhihua.common.model.dtos.community.bigscreen.event.ScreenEventListDTO;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.community.screen.civil.CivilStatisticsVO;
import com.panzhihua.common.model.vos.community.screen.event.EventGridStatisticsVO;
import com.panzhihua.common.model.vos.community.screen.event.EventListVO;
import com.panzhihua.common.model.vos.community.screen.event.EventNewStatisticsVO;
import com.panzhihua.common.model.vos.community.screen.event.EventStatisticsVO;
import com.panzhihua.common.model.vos.community.screen.index.IndexStatisticsVO;
import com.panzhihua.common.service.community.CommunityService;
import com.panzhihua.common.service.grid.GridService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
@@ -22,6 +26,8 @@

    @Resource
    private CommunityService communityService;
    @Resource
    private GridService gridService;

    @ApiOperation(value = "大屏测试接口")
    @GetMapping("/test/noToken")
@@ -47,7 +53,7 @@
        return communityService.getScreenEvent(communityId);
    }

    @ApiOperation(value = "事件大屏详情接口@lyq",response = EventStatisticsVO.class)
    @ApiOperation(value = "事件大屏详情接口@lyq",response = EventNewStatisticsVO.class)
    @PostMapping("/event/detail/noToken")
    public R eventDetail(@RequestBody BigScreenEventDetailDTO eventDetailDTO) {
        if(eventDetailDTO.getEventId() == null || eventDetailDTO.getType() == null){
@@ -73,4 +79,13 @@
        }
        return communityService.getScreenGirds(communityId);
    }

    @ApiOperation(value = "事件大屏事件列表接口@lyq",response = EventListVO.class)
    @PostMapping("/civil/list/noToken")
    public R eventList(@RequestBody ScreenEventListDTO eventListDTO) {
        if(eventListDTO.getCommunityId() == null){
            return R.fail("参数错误");
        }
        return gridService.getScreenEventList(eventListDTO);
    }
}

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

@@ -1,16 +1,28 @@
package com.panzhihua.community_backstage.api;

import com.panzhihua.common.controller.BaseController;
import com.panzhihua.common.model.dtos.community.bigscreen.work.ScreenActActivityListDTO;
import com.panzhihua.common.model.dtos.community.bigscreen.work.ScreenActActivityPeopleListDTO;
import com.panzhihua.common.model.dtos.community.bigscreen.work.ScreenDiscussListDTO;
import com.panzhihua.common.model.dtos.community.bigscreen.work.ScreenMicroListDTO;
import com.panzhihua.common.model.dtos.neighbor.ComActNeighborCircleAdminDTO;
import com.panzhihua.common.model.dtos.neighbor.DetailNeighborAllCommentByAdminDTO;
import com.panzhihua.common.model.dtos.neighbor.DetailNeighborCommentReplyByAdminDTO;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.community.screen.work.ActActivityListVO;
import com.panzhihua.common.model.vos.community.screen.work.ActActivityPeopleListVO;
import com.panzhihua.common.model.vos.community.screen.work.DiscussListVO;
import com.panzhihua.common.model.vos.community.screen.work.MicroListVO;
import com.panzhihua.common.model.vos.neighbor.ComActNeighborCircleAdminVO;
import com.panzhihua.common.model.vos.neighbor.ComActNeighborCommentByAdminVO;
import com.panzhihua.common.model.vos.neighbor.ComActNeighborCommentReplyByAdminVO;
import com.panzhihua.common.model.vos.neighbor.DetailNeighborCircleAdminVO;
import com.panzhihua.common.model.vos.screen.*;
import com.panzhihua.common.service.community.CommunityService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;
import org.springframework.web.bind.annotation.*;

import javax.annotation.Resource;

@@ -107,13 +119,74 @@
    @ApiOperation(value = "工作情况@xyh",response = ComActWorkScreenVO.class)
    @GetMapping("/workCount")
    public R workCount(@RequestParam("communityId") Long communityId){

        return communityService.workCount(communityId);
    }


    @ApiOperation(value = "工作大屏一起议列表接口@lyq",response = DiscussListVO.class)
    @PostMapping("/discuss/list")
    public R discussList(@RequestBody ScreenDiscussListDTO discussListDTO) {
        if(discussListDTO.getCommunityId() == null){
            return R.fail("参数错误");
        }
        return communityService.getScreenDiscussList(discussListDTO);
    }

    @ApiOperation(value = "工作大屏社区活动列表接口@lyq",response = ActActivityListVO.class)
    @PostMapping("/act/activity/list")
    public R actActivityList(@RequestBody ScreenActActivityListDTO actActivityListDTO) {
        if(actActivityListDTO.getCommunityId() == null){
            return R.fail("参数错误");
        }
        return communityService.getScreenActActivityList(actActivityListDTO);
    }

    @ApiOperation(value = "工作大屏社区活动报名详情接口@lyq",response = ActActivityPeopleListVO.class)
    @PostMapping("/act/activity/people/list")
    public R actActivityPeopleList(@RequestBody ScreenActActivityPeopleListDTO activityPeopleListDTO) {
        return communityService.getActActivityPeopleList(activityPeopleListDTO);
    }

    @ApiOperation(value = "工作大屏微心愿列表接口@lyq",response = MicroListVO.class)
    @PostMapping("/micro/list")
    public R microList(@RequestBody ScreenMicroListDTO microListDTO) {
        if(microListDTO.getCommunityId() == null){
            return R.fail("参数错误");
        }
        return communityService.getScreenMicroList(microListDTO);
    }

    @ApiOperation(value = "工作大屏邻里圈列表接口@lyq",response = ComActNeighborCircleAdminVO.class)
    @PostMapping("/neighbor/list")
    public R neighborList(@RequestBody ComActNeighborCircleAdminDTO neighborCircleAdminDTO) {
        if(neighborCircleAdminDTO.getCommunityId() == null){
            return R.fail("参数错误");
        }
        return communityService.pageNeighborByAdmin(neighborCircleAdminDTO);
    }

    @ApiOperation(value = "工作大屏邻里圈详情接口@lyq",response = ComActNeighborCircleAdminVO.class)
    @GetMapping("/neighbor/detail")
    public R neighborDetail(@RequestParam("id")Long id) {
        return communityService.detailNeighborByAdmin(id);
    }

    @ApiOperation(value = "工作大屏邻里圈详情的所有评论接口@lyq",response = ComActNeighborCommentByAdminVO.class)
    @PostMapping("/neighbor/detail/comment")
    public R detailNeighborAllCommentByAdmin(@RequestBody DetailNeighborAllCommentByAdminDTO dto){
        return communityService.detailNeighborAllCommentByAdmin(dto);
    }

    @ApiOperation(value = "工作大屏邻里圈评论详情接口@lyq",response = ComActNeighborCommentByAdminVO.class)
    @GetMapping("/neighbor/detail/comment/detail")
    public R detailNeighborCommentByAdmin(@RequestParam("id") Long id){
        return communityService.detailNeighborCommentByAdmin(id);
    }

    @ApiOperation(value = "工作大屏邻里圈评论详情回复列表接口@lyq",response = ComActNeighborCommentReplyByAdminVO.class)
    @PostMapping("/neighbor/detail/comment/reply")
    public R detailNeighborCommentAllReply(@RequestBody DetailNeighborCommentReplyByAdminDTO dto){
        return communityService.detailNeighborCommentAllReply(dto);
    }

}

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ScreenWorkApi.java

@@ -1,11 +1,15 @@
package com.panzhihua.service_community.api;

import com.panzhihua.common.model.dtos.community.bigscreen.work.ScreenActActivityListDTO;
import com.panzhihua.common.model.dtos.community.bigscreen.work.ScreenActActivityPeopleListDTO;
import com.panzhihua.common.model.dtos.community.bigscreen.work.ScreenDiscussListDTO;
import com.panzhihua.common.model.dtos.community.bigscreen.work.ScreenMicroListDTO;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.service_community.service.ComActActivityService;
import com.panzhihua.service_community.service.ComActDiscussService;
import com.panzhihua.service_community.service.ComActMicroWishService;
import com.panzhihua.service_community.service.ScreenWorkService;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;
import org.springframework.web.bind.annotation.*;

import javax.annotation.Resource;

@@ -19,6 +23,12 @@

    @Resource
    private ScreenWorkService screenWorkService;
    @Resource
    private ComActDiscussService comActDiscussService;
    @Resource
    private ComActActivityService comActActivityService;
    @Resource
    private ComActMicroWishService comActMicroWishService;

    /**
     * 大屏统计邻里圈
@@ -89,4 +99,29 @@
    R workCount(@RequestParam("communityId")Long communityId){
        return screenWorkService.workCount(communityId);
    }

    /**
     * 工作大屏-一起议列表
     * @param discussListDTO    请求参数
     * @return  一起议列表
     */
    @PostMapping("/getScreenDiscussList")
    public R getScreenDiscussList(@RequestBody ScreenDiscussListDTO discussListDTO) {
        return comActDiscussService.getScreenDiscussList(discussListDTO);
    }

    @PostMapping("/getScreenActActivityList")
    public R getScreenActActivityList(@RequestBody ScreenActActivityListDTO actActivityListDTO) {
        return comActActivityService.getScreenActActivityList(actActivityListDTO);
    }

    @PostMapping("/getActActivityPeopleList")
    public R getActActivityPeopleList(@RequestBody ScreenActActivityPeopleListDTO activityPeopleListDTO) {
        return comActActivityService.getActActivityPeopleList(activityPeopleListDTO);
    }

    @PostMapping("/getScreenMicroList")
    public R getScreenMicroList(@RequestBody ScreenMicroListDTO microListDTO) {
        return comActMicroWishService.getScreenMicroList(microListDTO);
    }
}

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActActSignDAO.java

@@ -1,9 +1,14 @@
package com.panzhihua.service_community.dao;

import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.panzhihua.common.model.dtos.community.bigscreen.work.ScreenActActivityPeopleListDTO;
import com.panzhihua.common.model.vos.community.ActivitySignVO;
import com.panzhihua.common.model.vos.community.screen.work.ActActivityPeopleListVO;
import com.panzhihua.service_community.model.dos.ComActActSignDO;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import org.apache.ibatis.annotations.Select;

import java.util.List;
@@ -18,39 +23,53 @@
public interface ComActActSignDAO extends BaseMapper<ComActActSignDO> {
//    居民 党员 志愿者 1 2 3
    @Select("<script> " +
            "SELECT\n" +
            "u.user_id id,\n" +
            "u.image_url,\n" +
            "u.name,\n" +
            "u.nick_name,\n" +
            "case WHEN u.is_partymember = 1 THEN '党员' WHEN a.is_volunteer = 1 THEN '志愿者' ELSE '居民' END identity,\n" +
            "u.phone,\n" +
            "a.create_at, \n" +
            "a.is_volunteer \n" +
            "FROM\n" +
            "com_act_act_sign a\n" +
            "JOIN sys_user u ON a.user_id = u.user_id \n" +
            "WHERE\n" +
            "a.activity_id = #{activityId} \n" +
            "SELECT " +
            "u.user_id id, " +
            "u.image_url, " +
            "u.name, " +
            "u.nick_name, " +
            "case WHEN u.is_partymember = 1 THEN '党员' WHEN a.is_volunteer = 1 THEN '志愿者' ELSE '居民' END identity, " +
            "u.phone, " +
            "a.create_at,  " +
            "a.is_volunteer  " +
            "FROM " +
            "com_act_act_sign a " +
            "JOIN sys_user u ON a.user_id = u.user_id  " +
            "WHERE " +
            "a.activity_id = #{activityId}  " +
            "<if test='phone != null and phone.trim() != &quot;&quot;'>" +
            "AND u.phone = #{phone} \n" +
            "AND u.phone = #{phone}  " +
            " </if> " +
            "<if test='name != null and name.trim() != &quot;&quot;'>" +
            "AND u.`name` = #{name} \n" +
            "AND u.`name` = #{name}  " +
            " </if> " +
            "<if test='identity != null and identity.trim() != &quot;&quot; and identity==1'>" +
            "AND u.is_partymember = 0 and a.is_volunteer=0 \n" +
            "AND u.is_partymember = 0 and a.is_volunteer=0  " +
            " </if> " +
            "<if test='identity != null and identity.trim() != &quot;&quot; and identity==2'>" +
            "AND u.is_partymember = 1   \n" +
            "AND u.is_partymember = 1    " +
            " </if> " +
            "<if test='identity != null and identity.trim() != &quot;&quot; and identity==3'>" +
            "AND a.is_volunteer=1  \n" +
            "AND a.is_volunteer=1   " +
            " </if> " +
            "<if test='type != null and type != 0'>" +
            "AND a.is_volunteer=#{type}-1  \n" +
            "AND a.is_volunteer=#{type}-1   " +
            " </if> " +
            " order by a.create_at desc "+
            "</script>")
    List<ActivitySignVO> listActivitySign(ActivitySignVO activitySignVO);

    @Select("SELECT " +
            " caas.user_id, " +
            " su.NAME, " +
            "CASE " +
            "  WHEN su.is_volunteer = 1 THEN " +
            "  '志愿者' ELSE '居民'  " +
            " END identity, " +
            " su.phone, " +
            " caas.create_at  " +
            "FROM " +
            " com_act_act_sign AS caas " +
            " LEFT JOIN sys_user AS su ON su.user_id = caas.user_id where caas.activity_id = #{activityPeopleListDTO.activityId}")
    IPage<ActActivityPeopleListVO> getActActivityPeopleList(Page page,@Param("activityPeopleListDTO") ScreenActActivityPeopleListDTO activityPeopleListDTO);
}

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActActivityDAO.java

@@ -3,9 +3,11 @@
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.panzhihua.common.model.dtos.community.bigscreen.work.ScreenActActivityListDTO;
import com.panzhihua.common.model.vos.community.ComActActivityVO;
import com.panzhihua.common.model.vos.community.CommunityActivitiesVO;
import com.panzhihua.common.model.vos.community.CommunityGovernanceTrendsVO;
import com.panzhihua.common.model.vos.community.screen.work.ActActivityListVO;
import com.panzhihua.common.model.vos.partybuilding.PageActivityMembersVO;
import com.panzhihua.common.model.vos.screen.CarouselInfoVO;
import com.panzhihua.service_community.model.dos.ComActActivityDO;
@@ -37,84 +39,84 @@
//            " </where>" +
//            "</script>")
    @Select("<script> " +
            "SELECT \n" +
            "a.id,\n" +
            "a.activity_name,\n" +
            "u.`name` sponsorName,\n" +
            "a.activity_addr,\n" +
            "a.`status`,\n" +
            "a.publish_at,\n" +
            "a.begin_at,\n" +
            "a.cover,\n" +
            "a.end_at,\n" +
            "a.volunteer_max,\n" +
            "count(if(s.is_volunteer=1,s.id,null))volunteer_now,\n"+
            "count(if(s.is_volunteer=0,s.id,null))participant_now,\n"+
            "a.participant_max,\n" +
            "a.sign_up_begin,\n" +
            "a.sign_up_end,\n" +
            "ca.name as communityName \n" +
            "FROM\n" +
            "com_act_activity a \n" +
            "join sys_user u on a.sponsor_id=u.user_id\n" +
            "left join com_act_act_sign s on a.id=s.activity_id \n"+
            "left join com_act ca on a.community_id=ca.community_id \n"+
            "SELECT  " +
            "a.id, " +
            "a.activity_name, " +
            "u.`name` sponsorName, " +
            "a.activity_addr, " +
            "a.`status`, " +
            "a.publish_at, " +
            "a.begin_at, " +
            "a.cover, " +
            "a.end_at, " +
            "a.volunteer_max, " +
            "count(if(s.is_volunteer=1,s.id,null))volunteer_now, "+
            "count(if(s.is_volunteer=0,s.id,null))participant_now, "+
            "a.participant_max, " +
            "a.sign_up_begin, " +
            "a.sign_up_end, " +
            "ca.name as communityName  " +
            "FROM " +
            "com_act_activity a  " +
            "join sys_user u on a.sponsor_id=u.user_id " +
            "left join com_act_act_sign s on a.id=s.activity_id  "+
            "left join com_act ca on a.community_id=ca.community_id  "+
            " where 1=1 " +

            "<if test='comActActivityVO.choice == 0 '>" +
            "AND a.community_id=#{comActActivityVO.communityId}\n" +
            "AND a.community_id=#{comActActivityVO.communityId} " +
            " </if> " +

            "<if test='comActActivityVO.activityName != null and comActActivityVO.activityName.trim() != &quot;&quot;'>" +
            " and a.activity_name like concat(#{comActActivityVO.activityName},'%')  \n" +
            " and a.activity_name like concat(#{comActActivityVO.activityName},'%')   " +
            " </if> " +
            "<if test='comActActivityVO.status != null and comActActivityVO.status !=0 and comActActivityVO.isIng==null'>" +
            "AND a.`status` = #{comActActivityVO.status} \n" +
            "AND a.`status` = #{comActActivityVO.status}  " +
            " </if> " +
            "<if test='comActActivityVO.status != null and comActActivityVO.status !=0 and comActActivityVO.isIng!=null and comActActivityVO.isIng==1'>" +
            "AND a.`status` in (3,4) \n" +
            "AND a.`status` in (3,4)  " +
            " </if> " +
            "<if test='comActActivityVO.isApplets != null and comActActivityVO.isApplets ==1'>" +
            "AND a.`status` != 1 AND  a.`status` != 6  \n" +
            "AND a.`status` != 1 AND  a.`status` != 6   " +
            " </if> " +
            "<if test='comActActivityVO.beginAt != null '>" +
            "AND a.begin_at <![CDATA[ >= ]]> #{comActActivityVO.beginAt} AND a.end_at <![CDATA[ <= ]]> #{comActActivityVO.endAt} \n" +
            "AND a.begin_at <![CDATA[ >= ]]> #{comActActivityVO.beginAt} AND a.end_at <![CDATA[ <= ]]> #{comActActivityVO.endAt}  " +
            " </if> " +
            "<if test='comActActivityVO.type != null and comActActivityVO.type==1 '>" +
            "AND a.volunteer_max!=0 \n" +
            "AND a.volunteer_max!=0  " +
            " </if> " +
            "<if test='comActActivityVO.type != null and comActActivityVO.type==2 '>" +
            "AND a.participant_max!=0 \n" +
            "AND a.participant_max!=0  " +
            " </if> " +
            " group by a.id "+
            " order by a.status asc,a.publish_at desc "+
            "</script>")
    IPage<ComActActivityVO> pageActivity( Page page, @Param("comActActivityVO") ComActActivityVO comActActivityVO);

    @Select("SELECT \n" +
            "u.name sponsorName,\n" +
            "ca.name communityName,\n" +
            "count(if(s.is_volunteer=1,s.id,null))volunteer_now,\n"+
            "count(if(s.is_volunteer=0,s.id,null))participant_now,\n"+
            "a.* \n" +
            "FROM \n" +
            "com_act_activity a \n" +
            "join sys_user u on a.sponsor_id=u.user_id \n"+
            "left join com_act_act_sign s on a.id=s.activity_id \n"+
            "left join com_act ca on a.community_id=ca.community_id \n"+
            "where a.id=#{id} \n"+
    @Select("SELECT  " +
            "u.name sponsorName, " +
            "ca.name communityName, " +
            "count(if(s.is_volunteer=1,s.id,null))volunteer_now, "+
            "count(if(s.is_volunteer=0,s.id,null))participant_now, "+
            "a.*  " +
            "FROM  " +
            "com_act_activity a  " +
            "join sys_user u on a.sponsor_id=u.user_id  "+
            "left join com_act_act_sign s on a.id=s.activity_id  "+
            "left join com_act ca on a.community_id=ca.community_id  "+
            "where a.id=#{id}  "+
            " group by a.id "
    )
    ComActActivityVO inforActivity(Long id);

    @Select("SELECT\n" +
            "a.* \n" +
            "FROM\n" +
            "com_act_act_sign s\n" +
            "JOIN com_act_activity a ON s.activity_id = a.id \n" +
            "WHERE\n" +
            "s.user_id = #{comActActivityVO.sponsorId} \n" +
            "ORDER BY\n" +
    @Select("SELECT " +
            "a.*  " +
            "FROM " +
            "com_act_act_sign s " +
            "JOIN com_act_activity a ON s.activity_id = a.id  " +
            "WHERE " +
            "s.user_id = #{comActActivityVO.sponsorId}  " +
            "ORDER BY " +
            "s.create_at DESC")
    IPage<ComActActivityVO> pageMyActivity(Page page, @Param("comActActivityVO") ComActActivityVO comActActivityVO);

@@ -129,27 +131,27 @@
            "join sys_user u on s.user_id=u.user_id and u.phone=#{phone} and s.is_volunteer=1 " +
            "join com_act_activity t on s.activity_id=t.id and t.status=5")
    List<ComActActivityVO> listActivityByPhone(String phone);
    @Select("select t.id from (\n" +
            "SELECT \n" +
            "a.id,\n" +
            "a.activity_name,\n" +
            "COUNT(case when s.is_volunteer=1 then s.id else null end )volunteernum,\n" +
            "COUNT(case when s.is_volunteer=0 then s.id else null end)usernum,\n" +
            "a.participant_min,\n" +
            "a.volunteer_min\n" +
            "FROM\n" +
            "com_act_activity a \n" +
            "LEFT JOIN com_act_act_sign s on a.id=s.activity_id \n" +
            "WHERE\n" +
            "a.`status` in(3,4) and TIMESTAMPDIFF(MINUTE,SYSDATE(),a.sign_up_end)<=0\n" +
    @Select("select t.id from ( " +
            "SELECT  " +
            "a.id, " +
            "a.activity_name, " +
            "COUNT(case when s.is_volunteer=1 then s.id else null end )volunteernum, " +
            "COUNT(case when s.is_volunteer=0 then s.id else null end)usernum, " +
            "a.participant_min, " +
            "a.volunteer_min " +
            "FROM " +
            "com_act_activity a  " +
            "LEFT JOIN com_act_act_sign s on a.id=s.activity_id  " +
            "WHERE " +
            "a.`status` in(3,4) and TIMESTAMPDIFF(MINUTE,SYSDATE(),a.sign_up_end)<=0 " +
            "GROUP BY a.id)t WHERE t.usernum<participant_min or t.volunteernum<volunteer_min")
    List<Long> selectTimedTaskActActivity();

    @Update("<script> " +
       "update com_act_activity set `status`=6 where id in\n" +
            "<foreach item=\"item\" collection=\"longs\" separator=\",\" open=\"(\" close=\")\" index=\"\">\n"+
            "#{item}\n"+
            "</foreach>\n"+
       "update com_act_activity set `status`=6 where id in " +
            "<foreach item=\"item\" collection=\"longs\" separator=\",\" open=\"(\" close=\")\" index=\"\"> "+
            "#{item} "+
            "</foreach> "+
        "</script>")
    int updateIdBatch(@Param("longs") List<Long> longs);

@@ -162,71 +164,71 @@
    @Update("update com_act_activity set `status`=5 where `status` in (3,4) and TIMESTAMPDIFF(MINUTE,SYSDATE(),sign_up_end)<=0")
    int updateStatusToBeginActiveOrEnd();
    @Select("<script> " +
            "select t.* from (\n" +
            "SELECT \n" +
            "a.id,\n" +
            "a.activity_name,\n" +
            "u.`name` sponsorName,\n" +
            "a.activity_addr,\n" +
            "a.participant_max,\n" +
            "count(if(s.is_volunteer=1,null,s.id))participant_now,\n"+
            "a.volunteer_max,\n" +
            "count(if(s.is_volunteer=1,s.id,null))volunteer_now,\n"+
            "a.`status`,\n" +
            "a.publish_at,\n" +
            "a.begin_at,\n" +
            "a.end_at,\n" +
            "a.sign_up_begin,\n" +
            "a.sign_up_end\n" +
            "FROM\n" +
            "\tcom_act_activity a \n" +
            "\tLEFT JOIN sys_user u on a.sponsor_id=u.user_id\n" +
            "\tLEFT JOIN com_act_act_sign s on a.id=s.activity_id\n" +
            "WHERE\n" +
            "\t a.`status` = 1 and a.community_id=#{comActActivityVO.communityId}\n" +
            "select t.* from ( " +
            "SELECT  " +
            "a.id, " +
            "a.activity_name, " +
            "u.`name` sponsorName, " +
            "a.activity_addr, " +
            "a.participant_max, " +
            "count(if(s.is_volunteer=1,null,s.id))participant_now, "+
            "a.volunteer_max, " +
            "count(if(s.is_volunteer=1,s.id,null))volunteer_now, "+
            "a.`status`, " +
            "a.publish_at, " +
            "a.begin_at, " +
            "a.end_at, " +
            "a.sign_up_begin, " +
            "a.sign_up_end " +
            "FROM " +
            " com_act_activity a  " +
            " LEFT JOIN sys_user u on a.sponsor_id=u.user_id " +
            " LEFT JOIN com_act_act_sign s on a.id=s.activity_id " +
            "WHERE " +
            "  a.`status` = 1 and a.community_id=#{comActActivityVO.communityId} " +
            "<if test='comActActivityVO.activityName != null and comActActivityVO.activityName !=&quot;&quot;'>" +
            "\tand a.activity_name LIKE concat( #{comActActivityVO.activityName}, '%' ) \n" +
            " and a.activity_name LIKE concat( #{comActActivityVO.activityName}, '%' )  " +
            " </if> " +
            "<if test='comActActivityVO.status != null and comActActivityVO.status !=0 and comActActivityVO.status !=1'>" +
            "AND a.`status` = 99 \n" +
            "AND a.`status` = 99  " +
            " </if> " +
            "<if test='comActActivityVO.beginAt != null '>" +
            "AND a.begin_at <![CDATA[ >= ]]> #{comActActivityVO.beginAt} AND a.end_at <![CDATA[ <= ]]> #{comActActivityVO.endAt} \n" +
            "AND a.begin_at <![CDATA[ >= ]]> #{comActActivityVO.beginAt} AND a.end_at <![CDATA[ <= ]]> #{comActActivityVO.endAt}  " +
            " </if> " +
            "group by a.id\n" +
            "\t\n" +
            "\tunion all\n" +
            "select t1.* from (\n"+
            "\t\n" +
            "\tSELECT \n" +
            "a.id,\n" +
            "a.activity_name,\n" +
            "u.`name` sponsorName,\n" +
            "a.activity_addr,\n" +
            "a.participant_max,\n" +
            "count(if(s.is_volunteer=1,null,s.id))participant_now,\n"+
            "a.volunteer_max,\n" +
            "count(if(s.is_volunteer=1,s.id,null))volunteer_now,\n"+
            "a.`status`,\n" +
            "a.publish_at,\n" +
            "a.begin_at,\n" +
            "a.end_at,\n" +
            "a.sign_up_begin,\n" +
            "a.sign_up_end\n" +
            "FROM\n" +
            "\tcom_act_activity a \n" +
            "\tLEFT JOIN sys_user u on a.sponsor_id=u.user_id\n" +
            "\tLEFT JOIN com_act_act_sign s on a.id=s.activity_id\n" +
            "WHERE\n" +
            "\t a.`status` != 1 and a.community_id=#{comActActivityVO.communityId}\n" +
            "group by a.id " +
            "  " +
            " union all " +
            "select t1.* from ( "+
            "  " +
            " SELECT  " +
            "a.id, " +
            "a.activity_name, " +
            "u.`name` sponsorName, " +
            "a.activity_addr, " +
            "a.participant_max, " +
            "count(if(s.is_volunteer=1,null,s.id))participant_now, "+
            "a.volunteer_max, " +
            "count(if(s.is_volunteer=1,s.id,null))volunteer_now, "+
            "a.`status`, " +
            "a.publish_at, " +
            "a.begin_at, " +
            "a.end_at, " +
            "a.sign_up_begin, " +
            "a.sign_up_end " +
            "FROM " +
            " com_act_activity a  " +
            " LEFT JOIN sys_user u on a.sponsor_id=u.user_id " +
            " LEFT JOIN com_act_act_sign s on a.id=s.activity_id " +
            "WHERE " +
            "  a.`status` != 1 and a.community_id=#{comActActivityVO.communityId} " +
            "<if test='comActActivityVO.activityName != null and comActActivityVO.activityName !=&quot;&quot;'>" +
            "\tand a.activity_name LIKE concat( #{comActActivityVO.activityName}, '%' ) \n" +
            " and a.activity_name LIKE concat( #{comActActivityVO.activityName}, '%' )  " +
            " </if> " +
            "<if test='comActActivityVO.status != null and comActActivityVO.status !=0 '>" +
            "AND a.`status` = #{comActActivityVO.status} \n" +
            "AND a.`status` = #{comActActivityVO.status}  " +
            " </if> " +
            "<if test='comActActivityVO.beginAt != null '>" +
            "AND a.begin_at <![CDATA[ >= ]]> #{comActActivityVO.beginAt} AND a.end_at <![CDATA[ <= ]]> #{comActActivityVO.endAt} \n" +
            "AND a.begin_at <![CDATA[ >= ]]> #{comActActivityVO.beginAt} AND a.end_at <![CDATA[ <= ]]> #{comActActivityVO.endAt}  " +
            " </if> " +
            " group by a.id order by a.publish_at desc)t1 )t"+
            "</script>")
@@ -234,29 +236,29 @@

    @Update("update com_act_activity set `status`=4 where `status`=3 and TIMESTAMPDIFF(MINUTE,SYSDATE(),sign_up_end)<=0")
    int updateStatusToBeginAfterSingEnd();
    @Select("select GROUP_CONCAT(t.x1,',',t.x2,',',t.x3,',',t.x4) from (\n" +
            "SELECT\n" +
            "(select COUNT(d.id) from com_act_discuss d where  d.community_id=#{communityId})x1,\n" +
            "(select COUNT(w.id) from com_act_micro_wish w where  w.community_id=#{communityId})x2,\n" +
            "(select COUNT(p.id) from com_act_easy_photo p where  p.community_id=#{communityId})x3,\n" +
            "\tCOUNT( a.id ) x4\n" +
            "FROM\n" +
            "\tcom_pb_activity a \n" +
            "WHERE\n" +
            "\t a.community_id =#{communityId})t")
    @Select("select GROUP_CONCAT(t.x1,',',t.x2,',',t.x3,',',t.x4) from ( " +
            "SELECT " +
            "(select COUNT(d.id) from com_act_discuss d where  d.community_id=#{communityId})x1, " +
            "(select COUNT(w.id) from com_act_micro_wish w where  w.community_id=#{communityId})x2, " +
            "(select COUNT(p.id) from com_act_easy_photo p where  p.community_id=#{communityId})x3, " +
            " COUNT( a.id ) x4 " +
            "FROM " +
            " com_pb_activity a  " +
            "WHERE " +
            "  a.community_id =#{communityId})t")
    String selectCommunityGovernanceTrendsVO(Long communityId);
    @Select("\n" +
            "\tSELECT\n" +
            "\t(select COUNT(d.id) from com_act_discuss d where DATE_FORMAT(d.create_at,'%Y-%m-%d')=DATE_FORMAT(#{date},'%Y-%m-%d') and d.community_id=#{communityId})discuss,\n" +
            "\t(select COUNT(w.id) from com_act_micro_wish w where DATE_FORMAT(w.create_at,'%Y-%m-%d')=DATE_FORMAT(#{date},'%Y-%m-%d') and w.community_id=#{communityId})microWish,\n" +
            "\t(select COUNT(p.id) from com_act_easy_photo p where DATE_FORMAT(p.create_at,'%Y-%m-%d')=DATE_FORMAT(#{date},'%Y-%m-%d') and p.community_id=#{communityId})eashPhoto,\n" +
            "\t(select COUNT(pa.id) from com_pb_activity pa where DATE_FORMAT(pa.create_at,'%Y-%m-%d')=DATE_FORMAT(#{date},'%Y-%m-%d') and pa.community_id=#{communityId})pbActivity,\n" +
            "\t\tCOUNT( a.id ) actActivity\n" +
            "\tFROM\n" +
            "\t\tcom_pb_activity a \n" +
            "\tWHERE\n" +
            "\t\tDATE_FORMAT( a.create_at, '%Y-%m-%d' )=DATE_FORMAT(#{date},'%Y-%m-%d') \n" +
            "\t\tAND a.community_id =#{communityId}")
    @Select(" " +
            " SELECT " +
            " (select COUNT(d.id) from com_act_discuss d where DATE_FORMAT(d.create_at,'%Y-%m-%d')=DATE_FORMAT(#{date},'%Y-%m-%d') and d.community_id=#{communityId})discuss, " +
            " (select COUNT(w.id) from com_act_micro_wish w where DATE_FORMAT(w.create_at,'%Y-%m-%d')=DATE_FORMAT(#{date},'%Y-%m-%d') and w.community_id=#{communityId})microWish, " +
            " (select COUNT(p.id) from com_act_easy_photo p where DATE_FORMAT(p.create_at,'%Y-%m-%d')=DATE_FORMAT(#{date},'%Y-%m-%d') and p.community_id=#{communityId})eashPhoto, " +
            " (select COUNT(pa.id) from com_pb_activity pa where DATE_FORMAT(pa.create_at,'%Y-%m-%d')=DATE_FORMAT(#{date},'%Y-%m-%d') and pa.community_id=#{communityId})pbActivity, " +
            "  COUNT( a.id ) actActivity " +
            " FROM " +
            "  com_pb_activity a  " +
            " WHERE " +
            "  DATE_FORMAT( a.create_at, '%Y-%m-%d' )=DATE_FORMAT(#{date},'%Y-%m-%d')  " +
            "  AND a.community_id =#{communityId}")
    CommunityActivitiesVO selectCommunityActivitiesVO(@Param("communityId") Long communityId, @Param("date")Date date);

    @Select("SELECT COUNT(id) AS totalNum," +
@@ -274,4 +276,65 @@

    @Select("SELECT cover FROM com_act_activity WHERE community_id = #{communityId}")
    List<String> listImg(@Param("communityId")Long communityId);

    @Select("<script> " +
            "SELECT " +
            " caa.id, " +
            " su.`name` AS userName , " +
            " su.image_url, " +
            " caa.sponsor_id, " +
            " caa.`status`, " +
            " caa.create_at, " +
            " caa.begin_at, " +
            " caa.end_at, " +
            " caa.sign_up_begin, " +
            " caa.sign_up_end, " +
            " caa.volunteer_min, " +
            " caa.volunteer_max, " +
            " caa.participant_min, " +
            " caa.participant_max, " +
            " caa.activity_name, " +
            " caa.cover, " +
            " caa.content, " +
            " caa.activity_addr  " +
            "FROM " +
            " com_act_activity AS caa " +
            " LEFT JOIN sys_user AS su ON su.user_id = caa.sponsor_id" +
            " <where> "+
            "<if test='actActivityListDTO.communityId != null '>" +
            " and caa.community_id = #{actActivityListDTO.communityId} " +
            " </if> " +
            "<if test='actActivityListDTO.startTime!=null and actActivityListDTO.startTime != &quot;&quot;'>" +
            " AND DATE_FORMAT(caa.create_at,'%Y-%m-%d %H:%i:%s') <![CDATA[ >= ]]> #{actActivityListDTO.startTime} " +
            " </if> " +
            "<if test='actActivityListDTO.endTime!=null and actActivityListDTO.endTime != &quot;&quot;'>" +
            " AND DATE_FORMAT(caa.create_at,'%Y-%m-%d %H:%i:%s') <![CDATA[ <= ]]> #{actActivityListDTO.endTime} " +
            " </if> " +
            "<if test='actActivityListDTO.type!=null'>" +
            " AND caa.status = #{actActivityListDTO.status} " +
            " </if> " +
            " </where> "+
            "ORDER BY " +
            " caa.create_at DESC " +
            " </script>")
    IPage<ActActivityListVO> getScreenActActivityList(Page page, @Param("actActivityListDTO") ScreenActActivityListDTO actActivityListDTO);

    @Select("SELECT " +
            " count( caas.id ) AS volunteerCount,( " +
            " SELECT " +
            "  count( caas1.id )  " +
            " FROM " +
            "  com_act_act_sign AS caas1 " +
            "  LEFT JOIN sys_user AS su1 ON su1.user_id = caas1.user_id  " +
            " WHERE " +
            "  su1.is_volunteer = 0  " +
            "  AND caas1.activity_id = #{activityId}  " +
            " ) AS participantCount  " +
            "FROM " +
            " com_act_act_sign AS caas " +
            " LEFT JOIN sys_user AS su ON su.user_id = caas.user_id  " +
            "WHERE " +
            " su.is_volunteer = 1  " +
            " AND activity_id = #{activityId} ")
    ActActivityListVO getScreenActActivityPeopleCount(@Param("activityId") Long activityId);
}

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActDiscussDAO.java

@@ -5,10 +5,13 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.panzhihua.common.model.dtos.community.PageComActDiscussCommentDTO;
import com.panzhihua.common.model.dtos.community.PageComActDiscussDTO;
import com.panzhihua.common.model.dtos.community.bigscreen.work.ScreenDiscussListDTO;
import com.panzhihua.common.model.vos.LoginUserInfoVO;
import com.panzhihua.common.model.vos.community.ComActDiscussCommentVO;
import com.panzhihua.common.model.vos.community.ComActDiscussOptionVO;
import com.panzhihua.common.model.vos.community.ComActDiscussVO;
import com.panzhihua.common.model.vos.community.ComActVO;
import com.panzhihua.common.model.vos.community.screen.work.DiscussListVO;
import com.panzhihua.common.model.vos.screen.CarouselInfoVO;
import com.panzhihua.service_community.model.dos.ComActDiscussDO;
import org.apache.ibatis.annotations.Mapper;
@@ -40,27 +43,27 @@
    LoginUserInfoVO selectUserByUserId(Long userId);
    @Select("<script> " +
            "select t.* from ("+
            "SELECT\n" +
            "d.id,\n" +
            "d.`discuss_subject`,\n" +
            "d.type,\n" +
            "COUNT( DISTINCT c.id ) commentNum,\n" +
            "u.name userName,\n" +
            "u.nick_name userNickName,\n" +
            "d.create_at \n" +
            "FROM\n" +
            "com_act_discuss d\n" +
            "JOIN sys_user u ON d.user_id = u.user_id\n" +
            "LEFT JOIN com_act_discuss_comment c ON d.id = c.discuss_id \n" +
            "SELECT " +
            "d.id, " +
            "d.`discuss_subject`, " +
            "d.type, " +
            "COUNT( DISTINCT c.id ) commentNum, " +
            "u.name userName, " +
            "u.nick_name userNickName, " +
            "d.create_at  " +
            "FROM " +
            "com_act_discuss d " +
            "JOIN sys_user u ON d.user_id = u.user_id " +
            "LEFT JOIN com_act_discuss_comment c ON d.id = c.discuss_id  " +
            " where d.community_id=#{pageComActDiscussDTO.communityId}" +
            "<if test='pageComActDiscussDTO.subject != null and pageComActDiscussDTO.subject.trim() != &quot;&quot;'>" +
            " and d.`discuss_subject` LIKE concat( #{pageComActDiscussDTO.subject}, '%' ) \n" +
            " and d.`discuss_subject` LIKE concat( #{pageComActDiscussDTO.subject}, '%' )  " +
            " </if> " +
            "<if test='pageComActDiscussDTO.begin != null '>" +
            "AND d.create_at BETWEEN #{pageComActDiscussDTO.begin} \n" +
            "AND #{pageComActDiscussDTO.end} \n" +
            "AND d.create_at BETWEEN #{pageComActDiscussDTO.begin}  " +
            "AND #{pageComActDiscussDTO.end}  " +
            " </if> " +
            "GROUP BY\n" +
            "GROUP BY " +
            "d.id" +
            ")t order by t.create_at desc "+
            "</script>")
@@ -68,108 +71,108 @@

    @Select("<script> " +
            "select * from ("+
            "SELECT\n" +
            "u.`name` userName,\n" +
            "u.nick_name userNickName,\n" +
            "u.phone,\n" +
            "c.`comment`,\n" +
            "c.`parent_id`,\n" +
            "COUNT(DISTINCT  cu.id ) num,\n" +
            "c.create_at,\n" +
            "c.id \n" +
            "FROM\n" +
            "com_act_discuss_comment c\n" +
            "JOIN sys_user u ON c.user_id = u.user_id \n" +
            "SELECT " +
            "u.`name` userName, " +
            "u.nick_name userNickName, " +
            "u.phone, " +
            "c.`comment`, " +
            "c.`parent_id`, " +
            "COUNT(DISTINCT  cu.id ) num, " +
            "c.create_at, " +
            "c.id  " +
            "FROM " +
            "com_act_discuss_comment c " +
            "JOIN sys_user u ON c.user_id = u.user_id  " +
            "<if test='pageComActDiscussCommentDTO.name != null and pageComActDiscussCommentDTO.name.trim() != &quot;&quot;'>" +
            "AND u.`name` LIKE concat( #{pageComActDiscussCommentDTO.name}, '%' ) \n" +
            "AND u.`name` LIKE concat( #{pageComActDiscussCommentDTO.name}, '%' )  " +
            " </if> " +
            "<if test='pageComActDiscussCommentDTO.account != null and pageComActDiscussCommentDTO.account.trim() != &quot;&quot;'>" +
            "AND u.phone LIKE concat( #{pageComActDiscussCommentDTO.account}, '%' )\n" +
            "AND u.phone LIKE concat( #{pageComActDiscussCommentDTO.account}, '%' ) " +
            " </if> " +
            "LEFT JOIN com_act_discuss_comment_user cu ON c.id = cu.disscuss_comment_id \n" +
            "LEFT JOIN com_act_discuss_comment_user cu ON c.id = cu.disscuss_comment_id  " +
            " where c.discuss_id=#{pageComActDiscussCommentDTO.id}" +
            "<if test='pageComActDiscussCommentDTO.comment != null and pageComActDiscussCommentDTO.comment.trim() != &quot;&quot;'>" +
            " and c.`comment` LIKE concat( '%', #{pageComActDiscussCommentDTO.comment" +
            "}, '%' ) \n" +
            "}, '%' )  " +
            " </if> " +
            "GROUP BY\n" +
            "c.id\n" +
            "GROUP BY " +
            "c.id " +
            ")t order by t.create_at desc"+
            "</script>")
    IPage<ComActDiscussCommentVO> pageDiscussComment(Page page, @Param("pageComActDiscussCommentDTO")PageComActDiscussCommentDTO pageComActDiscussCommentDTO);
    @Select("<script> " +
            "select t.* from ("+
            "SELECT\n" +
            "d.id,\n" +
            "d.vote_title,\n" +
            "if(d.address is null or d.address='null',a.name,d.address )address,\n" +
            "d.photo_pah,\n" +
            "d.`discuss_subject`,\n" +
            "d.type,\n" +
            "COUNT( DISTINCT c.id ) commentNum,\n" +
            "COUNT( DISTINCT du.id ) signNum,\n" +
            "if(u.type=1,u.name,a.name) userName,\n" +
            "if(u.type=1,u.nick_name,a.name) userNickName,\n" +
            "if(du.id is not null,1,0) haveSign,\n" +
            "if(ou.id is not null,1,0) haveVote,\n" +
            "u.image_url,\n" +
            "d.create_at \n" +
            "FROM\n" +
            "com_act_discuss d\n" +
            "JOIN sys_user u ON d.user_id = u.user_id\n" +
            "JOIN com_act a ON d.community_id = a.community_id\n" +
            "LEFT JOIN com_act_discuss_comment c ON d.id = c.discuss_id \n" +
            "LEFT JOIN com_act_discuss_user du ON d.id = du.discuss_id \n" +
            "LEFT JOIN com_act_discuss_option do ON d.id = do.discuss_id \n" +
            "LEFT JOIN com_act_discuss_option_user ou on do.id=ou.discuss_option_id and ou.user_id=#{pageComActDiscussDTO.loginUserId}\n" +
            "SELECT " +
            "d.id, " +
            "d.vote_title, " +
            "if(d.address is null or d.address='null',a.name,d.address )address, " +
            "d.photo_pah, " +
            "d.`discuss_subject`, " +
            "d.type, " +
            "COUNT( DISTINCT c.id ) commentNum, " +
            "COUNT( DISTINCT du.id ) signNum, " +
            "if(u.type=1,u.name,a.name) userName, " +
            "if(u.type=1,u.nick_name,a.name) userNickName, " +
            "if(du.id is not null,1,0) haveSign, " +
            "if(ou.id is not null,1,0) haveVote, " +
            "u.image_url, " +
            "d.create_at  " +
            "FROM " +
            "com_act_discuss d " +
            "JOIN sys_user u ON d.user_id = u.user_id " +
            "JOIN com_act a ON d.community_id = a.community_id " +
            "LEFT JOIN com_act_discuss_comment c ON d.id = c.discuss_id  " +
            "LEFT JOIN com_act_discuss_user du ON d.id = du.discuss_id  " +
            "LEFT JOIN com_act_discuss_option do ON d.id = do.discuss_id  " +
            "LEFT JOIN com_act_discuss_option_user ou on do.id=ou.discuss_option_id and ou.user_id=#{pageComActDiscussDTO.loginUserId} " +
            " where d.community_id=#{pageComActDiscussDTO.communityId}" +
            "<if test='pageComActDiscussDTO.subject != null and pageComActDiscussDTO.subject.trim() != &quot;&quot;'>" +
            " and d.`discuss_subject` LIKE concat( #{pageComActDiscussDTO.subject}, '%' ) \n" +
            " and d.`discuss_subject` LIKE concat( #{pageComActDiscussDTO.subject}, '%' )  " +
            " </if> " +
            "<if test='pageComActDiscussDTO.userId != null and pageComActDiscussDTO.userId !=0 '>" +
            " and d.`user_id` = #{pageComActDiscussDTO.userId} \n" +
            " and d.`user_id` = #{pageComActDiscussDTO.userId}  " +
            " </if> " +
            "<if test='pageComActDiscussDTO.begin != null '>" +
            "AND d.create_at BETWEEN #{pageComActDiscussDTO.begin} \n" +
            "AND #{pageComActDiscussDTO.end} \n" +
            "AND d.create_at BETWEEN #{pageComActDiscussDTO.begin}  " +
            "AND #{pageComActDiscussDTO.end}  " +
            " </if> " +
            "GROUP BY\n" +
            "GROUP BY " +
            "d.id" +
            ")t order by t.create_at desc "+
            "</script>")
    IPage<ComActDiscussVO> pageDiscussApplets(Page page, @Param("pageComActDiscussDTO")PageComActDiscussDTO pageComActDiscussDTO);
    @Select("<script> " +
            "select * from ("+
            "SELECT\n" +
            "u.`name` userName,\n" +
            "u.nick_name userNickName,\n" +
            "u.`image_url`,\n" +
            "u.phone,\n" +
            "c.`comment`,\n" +
            "c.`parent_id`,\n" +
            "c.`is_author`,\n" +
            "c.`is_topping`,\n" +
            "COUNT( cu.id ) num,\n" +
            "c.create_at,\n" +
            "c.id \n" +
            "FROM\n" +
            "com_act_discuss_comment c\n" +
            "JOIN sys_user u ON c.user_id = u.user_id \n" +
            "JOIN com_act_discuss d ON c.discuss_id = d.id \n" +
            "SELECT " +
            "u.`name` userName, " +
            "u.nick_name userNickName, " +
            "u.`image_url`, " +
            "u.phone, " +
            "c.`comment`, " +
            "c.`parent_id`, " +
            "c.`is_author`, " +
            "c.`is_topping`, " +
            "COUNT( cu.id ) num, " +
            "c.create_at, " +
            "c.id  " +
            "FROM " +
            "com_act_discuss_comment c " +
            "JOIN sys_user u ON c.user_id = u.user_id  " +
            "JOIN com_act_discuss d ON c.discuss_id = d.id  " +
            "<if test='pageComActDiscussCommentDTO.name != null and pageComActDiscussCommentDTO.name.trim() != &quot;&quot;'>" +
            "AND u.`name` LIKE concat( #{pageComActDiscussCommentDTO.name}, '%' ) \n" +
            "AND u.`name` LIKE concat( #{pageComActDiscussCommentDTO.name}, '%' )  " +
            " </if> " +
            "<if test='pageComActDiscussCommentDTO.account != null and pageComActDiscussCommentDTO.account.trim() != &quot;&quot;'>" +
            "AND u.phone LIKE concat( #{pageComActDiscussCommentDTO.account}, '%' )\n" +
            "AND u.phone LIKE concat( #{pageComActDiscussCommentDTO.account}, '%' ) " +
            " </if> " +
            "LEFT JOIN com_act_discuss_comment_user cu ON c.id = cu.disscuss_comment_id \n" +
            "LEFT JOIN com_act_discuss_comment_user cu ON c.id = cu.disscuss_comment_id  " +
            " where c.discuss_id=#{pageComActDiscussCommentDTO.id} and parent_id=0 " +
            "<if test='pageComActDiscussCommentDTO.comment != null and pageComActDiscussCommentDTO.comment.trim() != &quot;&quot;'>" +
            " and c.`comment` LIKE concat( '%', #{pageComActDiscussCommentDTO.comment" +
            "}, '%' ) \n" +
            "}, '%' )  " +
            " </if> " +
            "GROUP BY\n" +
            "c.id\n" +
            "GROUP BY " +
            "c.id " +
            ")t order by t.is_topping desc , t.create_at desc"+
            "</script>")
    IPage<ComActDiscussCommentVO> pageDiscussCommentApplets(Page page, @Param("pageComActDiscussCommentDTO")PageComActDiscussCommentDTO pageComActDiscussCommentDTO);
@@ -177,16 +180,16 @@
    @Select("select name,address from com_act where community_id=#{communityId}")
    ComActVO selectCommunity(Long communityId);

    @Select("SELECT \n" +
            "if(du.id is not null,1,0)haveSign,\n" +
            "if(ou.id is not null,1,0)haveVote\n" +
            "FROM\n" +
            "com_act_discuss d \n" +
            "LEFT JOIN com_act_discuss_user du on d.id=du.discuss_id and du.`user_id`=#{loginUserId}\n" +
            "LEFT JOIN com_act_discuss_option op on d.id=op.discuss_id\n" +
            "LEFT JOIN com_act_discuss_option_user ou on op.id=ou.discuss_option_id and ou.user_id=#{loginUserId}\n" +
            "WHERE\n" +
            "d.id =#{id}\n" +
    @Select("SELECT  " +
            "if(du.id is not null,1,0)haveSign, " +
            "if(ou.id is not null,1,0)haveVote " +
            "FROM " +
            "com_act_discuss d  " +
            "LEFT JOIN com_act_discuss_user du on d.id=du.discuss_id and du.`user_id`=#{loginUserId} " +
            "LEFT JOIN com_act_discuss_option op on d.id=op.discuss_id " +
            "LEFT JOIN com_act_discuss_option_user ou on op.id=ou.discuss_option_id and ou.user_id=#{loginUserId} " +
            "WHERE " +
            "d.id =#{id} " +
            "GROUP BY d.id")
    ComActDiscussVO selectHaveSignAndHaveVote(@Param("id") Long id, @Param("loginUserId")Long loginUserId);

@@ -220,4 +223,44 @@

    @Select(" SELECT id,discuss_subject AS content,IF(type = 1,'图文','投票') AS typeName FROM com_act_discuss WHERE community_id = #{communityId} ORDER BY create_at DESC LIMIT #{pageSize}")
    List<CarouselInfoVO> screenDiscuss(@Param("communityId") Long communityId, @Param("pageSize")Integer pageSize);

    @Select("<script> " +
            "SELECT " +
            " cad.id, " +
            " su.nick_name AS userName, " +
            " su.image_url, " +
            " cad.create_at, " +
            " cad.type, " +
            " cad.discuss_subject, " +
            " cad.photo_pah  " +
            "FROM " +
            " com_act_discuss AS cad " +
            " LEFT JOIN sys_user AS su ON su.user_id = cad.user_id  " +
            " <where> "+
            "<if test='discussListDTO.communityId != null '>" +
            " and cad.community_id = #{discussListDTO.communityId} " +
            " </if> " +
            "<if test='discussListDTO.startTime!=null and discussListDTO.startTime != &quot;&quot;'>" +
            " AND DATE_FORMAT(cad.create_at,'%Y-%m-%d %H:%i:%s') <![CDATA[ >= ]]> #{discussListDTO.startTime} " +
            " </if> " +
            "<if test='discussListDTO.endTime!=null and discussListDTO.endTime != &quot;&quot;'>" +
            " AND DATE_FORMAT(cad.create_at,'%Y-%m-%d %H:%i:%s') <![CDATA[ <= ]]> #{discussListDTO.endTime} " +
            " </if> " +
            "<if test='discussListDTO.type!=null'>" +
            " AND cad.type = #{discussListDTO.type} " +
            " </if> " +
            " </where> "+
            "ORDER BY " +
            " cad.create_at DESC " +
            " </script>")
    IPage<DiscussListVO> getScreenDiscussList(Page page, @Param("discussListDTO") ScreenDiscussListDTO discussListDTO);

    @Select("SELECT id, discuss_id, create_at, option_content" +
            ",( SELECT count( id ) FROM com_act_discuss_option_user WHERE discuss_option_id = c.id ) AS num " +
            " FROM " +
            " com_act_discuss_option AS c " +
            " WHERE c.discuss_id = #{discussId}" +
            " ORDER BY " +
            " num DESC")
    List<ComActDiscussOptionVO> getScreenDiscussOptionList(@Param("discussId") Long discussId);
}

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActMicroWishDAO.java

@@ -3,8 +3,10 @@
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.panzhihua.common.model.dtos.community.bigscreen.work.ScreenMicroListDTO;
import com.panzhihua.common.model.vos.community.ComActMicroWishVO;
import com.panzhihua.common.model.vos.community.TodoEventsVO;
import com.panzhihua.common.model.vos.community.screen.work.MicroListVO;
import com.panzhihua.service_community.model.dos.ComActMicroWishDO;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
@@ -24,139 +26,139 @@
public interface ComActMicroWishDAO extends BaseMapper<ComActMicroWishDO> {

    @Select("<script> " +
            "SELECT\n" +
            "w.id,\n" +
            "u.name sponsor_name,\n" +
            "u.nick_name userNickName,\n" +
            "u.image_url ,\n" +
            "w.sponsor_phone,\n" +
            "w.wish_name,\n" +
            "w.`status`,\n" +
            "w.`feedback_at`,\n" +
            "w.`examine_at`,\n" +
            "w.`distribution_at`,\n" +
            "w.`evaluate_at`,\n" +
            "w.`photo_path_list`,\n" +
            "count(wu.id)star_num,\n" +
            "w.`detail`,\n" +
            "w.form,\n" +
            "w.reject_reason,\n" +
            "su.`name` responsible_name,\n" +
            "w.score,\n" +
            "w.create_at \n" +
            "FROM\n" +
            "com_act_micro_wish w\n" +
            "SELECT " +
            "w.id, " +
            "u.name sponsor_name, " +
            "u.nick_name userNickName, " +
            "u.image_url , " +
            "w.sponsor_phone, " +
            "w.wish_name, " +
            "w.`status`, " +
            "w.`feedback_at`, " +
            "w.`examine_at`, " +
            "w.`distribution_at`, " +
            "w.`evaluate_at`, " +
            "w.`photo_path_list`, " +
            "count(wu.id)star_num, " +
            "w.`detail`, " +
            "w.form, " +
            "w.reject_reason, " +
            "su.`name` responsible_name, " +
            "w.score, " +
            "w.create_at  " +
            "FROM " +
            "com_act_micro_wish w " +
            "left join com_act_micro_wish_user wu on w.id=wu.micro_wish_id "+
            "JOIN sys_user u ON w.sponsor_id = u.user_id \n" +
            "JOIN sys_user u ON w.sponsor_id = u.user_id  " +
            "<if test='comActMicroWishVO.sponsorName != null and comActMicroWishVO.sponsorName.trim() != &quot;&quot;'>" +
            "AND u.name like concat(#{comActMicroWishVO.sponsorName},'%')  \n" +
            "AND u.name like concat(#{comActMicroWishVO.sponsorName},'%')   " +
            " </if> " +
            "<if test='comActMicroWishVO.responsibleName == null or comActMicroWishVO.responsibleName.trim() == &quot;&quot;'>" +
            "LEFT JOIN sys_user su ON w.responsible_id = su.user_id \n" +
            "LEFT JOIN sys_user su ON w.responsible_id = su.user_id  " +
            " </if> " +
            "<if test='comActMicroWishVO.responsibleName != null and comActMicroWishVO.responsibleName.trim() != &quot;&quot;'>" +
            " JOIN sys_user su ON w.responsible_id = su.user_id \n" +
            "AND su.`name` like concat(#{comActMicroWishVO.responsibleName},'%')  \n" +
            " JOIN sys_user su ON w.responsible_id = su.user_id  " +
            "AND su.`name` like concat(#{comActMicroWishVO.responsibleName},'%')   " +
            " </if> " +
            " <where>" +
            "<if test='comActMicroWishVO.communityId != null and comActMicroWishVO.communityId != 0'>" +
            " and w.community_id=#{comActMicroWishVO.communityId} \n" +
            " and w.community_id=#{comActMicroWishVO.communityId}  " +
            " </if> " +
            "<if test='comActMicroWishVO.sponsorPhone != null and comActMicroWishVO.sponsorPhone.trim() != &quot;&quot;'>" +
            "AND w.sponsor_phone like concat(#{comActMicroWishVO.sponsorPhone},'%')  \n" +
            "AND w.sponsor_phone like concat(#{comActMicroWishVO.sponsorPhone},'%')   " +
            " </if> " +
            "<if test='comActMicroWishVO.status != null and comActMicroWishVO.status!=0 and comActMicroWishVO.status!=3 and comActMicroWishVO.isPageMyWish==null'>" +
            "AND w.`status` = #{comActMicroWishVO.status} \n" +
            "AND w.`status` = #{comActMicroWishVO.status}  " +
            " </if> " +
            "<if test='comActMicroWishVO.status == 3  and comActMicroWishVO.isPageMyWish==null'>" +
            "AND ( w.`status` = 3 or  w.`status` = 5 )\n" +
            "AND ( w.`status` = 3 or  w.`status` = 5 ) " +
            " </if> " +
            "<if test='comActMicroWishVO.status != null and comActMicroWishVO.status!=0 and comActMicroWishVO.isPageMyWish!=null and comActMicroWishVO.status==1'>" +
            "AND w.`status` =1 \n" +
            "AND w.`status` =1  " +
            " </if> " +
            "<if test='comActMicroWishVO.status != null and comActMicroWishVO.status==3  and comActMicroWishVO.isPageMyWish!=null '>" +
            "AND w.`status` in (2, 3) \n" +
            "AND w.`status` in (2, 3)  " +
            " </if> " +
            "<if test='comActMicroWishVO.createBegin != null '>" +
            "AND w.create_at BETWEEN #{comActMicroWishVO.createBegin} \n" +
            "AND w.create_at BETWEEN #{comActMicroWishVO.createBegin}  " +
            "AND #{comActMicroWishVO.createEnd}" +
            " </if> " +
            "<if test='comActMicroWishVO.isApplets != null and comActMicroWishVO.isApplets != 0'>" +
            "AND w.status  in (3, 5, 6) \n" +
            "AND w.status  in (3, 5, 6)  " +
            " </if> " +
            "<if test='comActMicroWishVO.userId != null and comActMicroWishVO.userId != 0'>" +
            "AND w.sponsor_id  =#{comActMicroWishVO.userId} \n" +
            "AND w.sponsor_id  =#{comActMicroWishVO.userId}  " +
            " </if> " +
            "<if test='comActMicroWishVO.backUserId != null and comActMicroWishVO.backUserId != 0 and  comActMicroWishVO.status==3 '>" +
            "AND w.responsible_id  =#{comActMicroWishVO.backUserId} \n" +
            "AND w.responsible_id  =#{comActMicroWishVO.backUserId}  " +
            " </if> " +
            "<if test='comActMicroWishVO.backUserId != null and comActMicroWishVO.backUserId != 0 and  comActMicroWishVO.status==0 '>" +
            "and (w.status in(1,2,4,5,6) or (w.status=3 and w.responsible_id  =#{comActMicroWishVO.backUserId}))\n" +
            "and (w.status in(1,2,4,5,6) or (w.status=3 and w.responsible_id  =#{comActMicroWishVO.backUserId})) " +
            " </if> " +
            " </where>" +
            " group by w.id  \n"+
            " group by w.id   "+
            "ORDER BY  w.create_at desc "+
            "</script>")
    IPage<ComActMicroWishVO> pageMicroWish(Page page, @Param("comActMicroWishVO") ComActMicroWishVO comActMicroWishVO);
    @Select("SELECT\n" +
            "w.id,\n" +
            "u.name sponsor_name,\n" +
            "u.nick_name userNickName,\n" +
            "w.create_at,\n" +
            "u.image_url,\n" +
            "w.sponsor_phone,\n" +
            "w.`status`,\n" +
            "w.`sponsor_id`,\n" +
            "w.wish_name,\n" +
            "count(wu.id)starNum,\n" +
            "w.detail,\n" +
            "w.photo_path_list,\n" +
            "su.`name` responsible_name,\n" +
            "w.form,\n" +
            "w.reject_reason,\n" +
            "w.examine_at,\n" +
            "w.finish,\n" +
            "w.finish_photo_path_list,\n" +
            "w.finish_at,\n" +
            "w.score,\n" +
            "w.feedback,\n" +
            "w.feedback_at,\n" +
            "w.feedback_photo_path_list,\n" +
            "w.distribution_at,\n" +
            "w.evaluate_at,\n" +
            "w.evaluate \n" +
            "FROM\n" +
            "com_act_micro_wish w\n" +
            "JOIN sys_user u ON w.sponsor_id = u.user_id\n" +
            "LEFT JOIN sys_user su ON w.responsible_id = su.user_id \n" +
            "LEFT JOIN com_act_micro_wish_user wu ON w.id = wu.micro_wish_id \n" +
            "WHERE\n" +
    @Select("SELECT " +
            "w.id, " +
            "u.name sponsor_name, " +
            "u.nick_name userNickName, " +
            "w.create_at, " +
            "u.image_url, " +
            "w.sponsor_phone, " +
            "w.`status`, " +
            "w.`sponsor_id`, " +
            "w.wish_name, " +
            "count(wu.id)starNum, " +
            "w.detail, " +
            "w.photo_path_list, " +
            "su.`name` responsible_name, " +
            "w.form, " +
            "w.reject_reason, " +
            "w.examine_at, " +
            "w.finish, " +
            "w.finish_photo_path_list, " +
            "w.finish_at, " +
            "w.score, " +
            "w.feedback, " +
            "w.feedback_at, " +
            "w.feedback_photo_path_list, " +
            "w.distribution_at, " +
            "w.evaluate_at, " +
            "w.evaluate  " +
            "FROM " +
            "com_act_micro_wish w " +
            "JOIN sys_user u ON w.sponsor_id = u.user_id " +
            "LEFT JOIN sys_user su ON w.responsible_id = su.user_id  " +
            "LEFT JOIN com_act_micro_wish_user wu ON w.id = wu.micro_wish_id  " +
            "WHERE " +
            "w.id =#{id}"+
            " group by w.id " +
            "order by w.create_at desc"
    )
    ComActMicroWishVO detailMicroWish(Long id);
    @Select("SELECT\n" +
            "'2' type\n" +
            "FROM\n" +
            "com_act_micro_wish w \n" +
            "WHERE\n" +
            "w.community_id = #{communityId} \n" +
            "AND w.`status` = 1\n" +
            "\n" +
            "union all \n" +
            "\n" +
            "SELECT\n" +
            "'2' type\n" +
            "FROM\n" +
            "\tcom_act_micro_wish w \n" +
            "WHERE\n" +
            "\tw.community_id = #{communityId} \n" +
            "\tAND w.`status` = 3 \n" +
            "\tAND w.form = 1 \n" +
            "\tAND w.responsible_id = #{userId} \n" +
            "GROUP BY\n" +
            "\tw.community_id\n")
    @Select("SELECT " +
            "'2' type " +
            "FROM " +
            "com_act_micro_wish w  " +
            "WHERE " +
            "w.community_id = #{communityId}  " +
            "AND w.`status` = 1 " +
            " " +
            "union all  " +
            " " +
            "SELECT " +
            "'2' type " +
            "FROM " +
            " com_act_micro_wish w  " +
            "WHERE " +
            " w.community_id = #{communityId}  " +
            " AND w.`status` = 3  " +
            " AND w.form = 1  " +
            " AND w.responsible_id = #{userId}  " +
            "GROUP BY " +
            " w.community_id ")
    List<TodoEventsVO> selectNeedToDo(@Param("communityId") Long communityId, @Param("userId") Long userId);

    @Update("update com_act_micro_wish set `status`=6, evaluate_at=now() where `status`=5 and TIMESTAMPDIFF(HOUR, feedback_at, SYSDATE())>=72")
@@ -170,4 +172,45 @@

    @Select("SELECT photo_path_list FROM com_act_micro_wish WHERE community_id = #{communityId} AND (status =1 OR status =2 OR status = 3 OR status = 5 OR status = 6) ORDER BY create_at DESC limit #{pageSize}")
    List<String> getAllImgs(@Param("communityId") Long communityId,@Param("pageSize") Integer pageSize);

    @Select("<script> " +
            "SELECT " +
            " camw.id, " +
            " su.`name` AS userName, " +
            " camw.sponsor_id, " +
            " su.image_url, " +
            " su.phone, " +
            " camw.`status`, " +
            " camw.create_at, " +
            " camw.wish_name, " +
            " camw.finish, " +
            " camw.finish_photo_path_list, " +
            " camw.form, " +
            " camw.evaluate_at, " +
            " su1.name as responsibleName, " +
            " camw.score, " +
            " camw.distribution_at, " +
            " camw.detail, " +
            " camw.photo_path_list  " +
            "FROM " +
            " com_act_micro_wish AS camw " +
            " LEFT JOIN sys_user AS su ON su.user_id = camw.sponsor_id " +
            " LEFT JOIN sys_user AS su1 ON su1.user_id = camw.responsible_id " +
            " <where> " +
            "<if test='microListDTO.status != null'>" +
            "AND camw.`status` =#{microListDTO.status}  " +
            " </if> " +
            "<if test='microListDTO.communityId != null'>" +
            "AND camw.community_id =#{microListDTO.communityId}  " +
            " </if> " +
            "<if test='microListDTO.startTime!=null and microListDTO.startTime != &quot;&quot;'>" +
            " AND DATE_FORMAT(camw.create_at,'%Y-%m-%d %H:%i:%s') <![CDATA[ >= ]]> #{microListDTO.startTime} " +
            " </if> " +
            "<if test='microListDTO.endTime!=null and microListDTO.endTime != &quot;&quot;'>" +
            " AND DATE_FORMAT(camw.create_at,'%Y-%m-%d %H:%i:%s') <![CDATA[ <= ]]> #{microListDTO.endTime} " +
            " </if> " +
            " </where>" +
            "ORDER BY  camw.create_at desc "+
            " </script>")
    IPage<MicroListVO> getScreenMicroList(Page page, @Param("microListDTO") ScreenMicroListDTO microListDTO);
}

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActNeighborCircleDAO.java

@@ -83,6 +83,9 @@
            "<if test='neighborCircleAdminDTO.startAt != null and neighborCircleAdminDTO.endAt !=null '>" +
            "and nc.create_at between #{neighborCircleAdminDTO.startAt} and #{neighborCircleAdminDTO.endAt}  \n" +
            " </if> " +
            "<if test='neighborCircleAdminDTO.status != null '>" +
            "and nc.status = #{neighborCircleAdminDTO.status} " +
            " </if> " +
            "</where>"+
            "order by " +
            "case when nc.`status`=1 then 0 else 1 end, \n" +

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComMngPopulationDAO.java

@@ -244,6 +244,7 @@
            ",(select count(id) from com_mng_population where act_id = #{communityId} and out_or_local = 1) as localTotal " +
            ",(select count(id) from com_mng_population where act_id = #{communityId} and out_or_local = 2) as outTotal " +
            ",(select count(id) from com_mng_population where act_id = #{communityId} and label is not null) as specialTotal " +
            ",(select count(village_id) from com_mng_village where community_id = #{communityId}) as villageTotal " +
            " from com_mng_population as cmp where act_id = #{communityId}")
    ComMngPopulationTotalVO getPopulationTotalByAdmin(@Param("communityId") Long communityId);

@@ -736,6 +737,17 @@
            " community_id = #{communityId}")
    List<CivilVillageStatisticsVO> getCivilScreenVillageList(@Param("communityId") Long communityId);

    @Select("SELECT " +
            " count( id ) AS peopleNum, " +
            " ( SELECT count( id ) FROM com_mng_population_house AS cmph WHERE village_id = #{villageId} ) AS houseNum, " +
            " ( SELECT count( id ) FROM com_mng_population WHERE village_id = #{villageId} AND out_or_local = 1 ) AS registerNum, " +
            " ( SELECT count( id ) FROM com_mng_population WHERE village_id = #{villageId} AND out_or_local = 2 ) AS flowNum  " +
            "FROM " +
            " com_mng_population AS cmp  " +
            "WHERE " +
            " village_id = #{villageId}")
    CivilVillageStatisticsVO getCivilScreenVillageStatistics(@Param("villageId") Long villageId);


    @Select("SELECT COUNT(id) AS man,(SELECT COUNT(id) FROM com_mng_population WHERE sex = 2 AND act_id = #{communityId}) AS woman FROM com_mng_population WHERE sex = 1 AND act_id = #{communityId}")
    Map<String, Long> countBySex(@Param("communityId") Long communityId);
@@ -809,15 +821,18 @@
    @Select("SELECT " +
            " su.nick_name AS userName, " +
            " su.image_url AS imageUrl, " +
            " e.happen_time as createAt, " +
            " e.create_at as createAt, " +
            " e.event_des, " +
            " e.event_clazz, " +
            " e.danger_level, " +
            " e.urgent, " +
            " e.major, " +
            " e.happen_address, " +
            " e.happent_lat_lng, " +
            " e.event_type, " +
            " e.event_category, " +
            " e.id, " +
            " egd.grid_name, " +
            " e.event_deal_status  " +
            "FROM " +
            " `event` AS e " +
@@ -827,4 +842,10 @@
            " e.id = #{eventId}")
    EventNewStatisticsVO getEventScreenEventDetail(@Param("eventId") Long eventId);

    @Select("select process_date,process_result from event_transfer_record where event_id = #{eventId}")
    List<EventTransferRecordVO> getEventScreenEventTransList(@Param("eventId") Long eventId);

    @Select("select count(id) from com_elders_auth_elderly WHERE community_id = #{communityId}")
    Integer getStatisticsCount(@Param("communityId") Long communityId);

}

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComActActivityService.java

@@ -1,6 +1,8 @@
package com.panzhihua.service_community.service;

import com.baomidou.mybatisplus.extension.service.IService;
import com.panzhihua.common.model.dtos.community.bigscreen.work.ScreenActActivityListDTO;
import com.panzhihua.common.model.dtos.community.bigscreen.work.ScreenActActivityPeopleListDTO;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.community.ActivitySignVO;
import com.panzhihua.common.model.vos.community.ComActActivityVO;
@@ -109,4 +111,8 @@
     */
    R indexDataCommunityBackstageEchart(Long communityId);

    R getScreenActActivityList(ScreenActActivityListDTO actActivityListDTO);

    R getActActivityPeopleList(ScreenActActivityPeopleListDTO activityPeopleListDTO);

}

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComActDiscussService.java

@@ -1,6 +1,7 @@
package com.panzhihua.service_community.service;

import com.panzhihua.common.model.dtos.community.*;
import com.panzhihua.common.model.dtos.community.bigscreen.work.ScreenDiscussListDTO;
import com.panzhihua.common.model.vos.R;

/**
@@ -101,4 +102,11 @@
     * @return 点赞结果
     */
    R putDiscussCommentUser(ComActDiscussCommentUserDTO comActDiscussUserDTO);

    /**
     * 工作大屏-一起议列表
     * @param discussListDTO    请求参数
     * @return  一起议列表
     */
    R getScreenDiscussList(ScreenDiscussListDTO discussListDTO);
}

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComActMicroWishService.java

@@ -1,6 +1,7 @@
package com.panzhihua.service_community.service;

import com.baomidou.mybatisplus.extension.service.IService;
import com.panzhihua.common.model.dtos.community.bigscreen.work.ScreenMicroListDTO;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.community.ComActMicroWishVO;
import com.panzhihua.common.model.vos.community.TodoEventsVO;
@@ -68,4 +69,6 @@
     * @return
     */
    R timedTaskActMicroWishAll();

    R getScreenMicroList(ScreenMicroListDTO microListDTO);
}

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActActivityServiceImpl.java

@@ -7,10 +7,13 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.panzhihua.common.model.dtos.community.ExcelElderAuthDTO;
import com.panzhihua.common.model.dtos.community.bigscreen.work.ScreenActActivityListDTO;
import com.panzhihua.common.model.dtos.community.bigscreen.work.ScreenActActivityPeopleListDTO;
import com.panzhihua.common.model.vos.IndexDataVO;
import com.panzhihua.common.model.vos.LoginUserInfoVO;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.community.*;
import com.panzhihua.common.model.vos.community.screen.work.ActActivityListVO;
import com.panzhihua.common.service.user.UserService;
import com.panzhihua.service_community.dao.ComActActSignDAO;
import com.panzhihua.service_community.dao.ComActActivityDAO;
@@ -429,6 +432,27 @@
        return R.ok(indexDataVO);
    }

    @Override
    public R getScreenActActivityList(ScreenActActivityListDTO actActivityListDTO){
        IPage<ActActivityListVO> actActivityListVOIPage = comActActivityDAO.getScreenActActivityList(
                new Page(actActivityListDTO.getPageNum(),actActivityListDTO.getPageSize()),actActivityListDTO);
        if(!actActivityListVOIPage.getRecords().isEmpty()){
            actActivityListVOIPage.getRecords().forEach(actActivityListVO -> {
                ActActivityListVO activityListVO = comActActivityDAO.getScreenActActivityPeopleCount(actActivityListVO.getId());
                if(activityListVO != null){
                    actActivityListVO.setParticipantCount(activityListVO.getParticipantCount());
                    actActivityListVO.setVolunteerCount(activityListVO.getVolunteerCount());
                }
            });
        }
        return R.ok(actActivityListVOIPage);
    }

    @Override
    public R getActActivityPeopleList(ScreenActActivityPeopleListDTO activityPeopleListDTO){
        return R.ok(comActActSignDAO.getActActivityPeopleList(new Page(activityPeopleListDTO.getPageNum(),activityPeopleListDTO.getPageSize()),activityPeopleListDTO));
    }

    /**
     * 获取最近七天的时间
     * @return

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActDiscussServiceImpl.java

@@ -5,12 +5,14 @@
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.panzhihua.common.model.dtos.community.*;
import com.panzhihua.common.model.dtos.community.bigscreen.work.ScreenDiscussListDTO;
import com.panzhihua.common.model.vos.LoginUserInfoVO;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.community.ComActDiscussCommentVO;
import com.panzhihua.common.model.vos.community.ComActDiscussOptionVO;
import com.panzhihua.common.model.vos.community.ComActDiscussVO;
import com.panzhihua.common.model.vos.community.ComActVO;
import com.panzhihua.common.model.vos.community.screen.work.DiscussListVO;
import com.panzhihua.service_community.dao.*;
import com.panzhihua.service_community.model.dos.*;
import com.panzhihua.service_community.service.ComActDiscussOptionService;
@@ -557,4 +559,31 @@
        }
        return R.fail();
    }

    /**
     * 工作大屏-一起议列表
     * @param discussListDTO    请求参数
     * @return  一起议列表
     */
    @Override
    public R getScreenDiscussList(ScreenDiscussListDTO discussListDTO){
        IPage<DiscussListVO> discussListVOIPage = comActDiscussDAO.getScreenDiscussList(new Page(discussListDTO.getPageNum(),discussListDTO.getPageSize()),discussListDTO);
        if(!discussListVOIPage.getRecords().isEmpty()){
            discussListVOIPage.getRecords().forEach(discussListVO -> {
                //查询评论数量和点赞数量
                Integer integer = comActDiscussCommentDAO.selectCount(new QueryWrapper<ComActDiscussCommentDO>().lambda().eq(ComActDiscussCommentDO::getDiscussId, discussListVO.getId()));
                discussListVO.setCommentCount(integer);
                Integer integer1 = comActDiscussUserDAO.selectCount(new QueryWrapper<ComActDiscussUserDO>().lambda().eq(ComActDiscussUserDO::getDiscussId, discussListVO.getId()));
                discussListVO.setFabulousCount(integer1);

                if(discussListVO.getType().equals(ScreenDiscussListDTO.type.tp)){//投票
                    List<ComActDiscussOptionVO> discussOptionList = comActDiscussDAO.getScreenDiscussOptionList(discussListVO.getId());
                    if(!discussOptionList.isEmpty()){
                        discussListVO.setDiscussOptionList(discussOptionList);
                    }
                }
            });
        }
        return R.ok(discussListVOIPage);
    }
}

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActMicroWishServiceImpl.java

@@ -5,9 +5,11 @@
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.panzhihua.common.model.dtos.community.bigscreen.work.ScreenMicroListDTO;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.community.ComActMicroWishVO;
import com.panzhihua.common.model.vos.community.TodoEventsVO;
import com.panzhihua.common.model.vos.community.screen.work.MicroListVO;
import com.panzhihua.common.utlis.SensitiveUtil;
import com.panzhihua.service_community.dao.ComActMicroWishDAO;
import com.panzhihua.service_community.dao.ComActMicroWishUserDAO;
@@ -260,4 +262,17 @@
        log.info("定时任务--修改待自动确认微心愿状态数量【{}】",num);
        return R.ok();
    }

    @Override
    public R getScreenMicroList(ScreenMicroListDTO microListDTO){
        IPage<MicroListVO> microListVOIPage = comActMicroWishDAO.getScreenMicroList(new Page(microListDTO.getPageNum(),microListDTO.getPageSize()),microListDTO);
        if(!microListVOIPage.getRecords().isEmpty()){
            microListVOIPage.getRecords().forEach(microListVO -> {
                Integer count = comActMicroWishUserDAO.selectCount(new QueryWrapper<ComActMicroWishUserDO>().lambda()
                        .eq(ComActMicroWishUserDO::getMicroWishId,microListVO.getId()));
                microListVO.setStarNum(count);
            });
        }
        return R.ok(microListVOIPage);
    }
}

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComMngPopulationServiceImpl.java

@@ -923,7 +923,12 @@
                                specialStatisticsVO.setTitle(userTag.getTagName());
                                specialStatisticsVO.setSum(264);
                                specialStatisticsVOList.add(specialStatisticsVO);
                            } else {
                            }else if(userTag.getTagName().equals("高龄老人")){
                                IndexSpecialStatisticsVO specialStatisticsVO = new IndexSpecialStatisticsVO();
                                specialStatisticsVO.setTitle(userTag.getTagName());
                                specialStatisticsVO.setSum(comMngPopulationDAO.getStatisticsCount(communityId));
                                specialStatisticsVOList.add(specialStatisticsVO);
                            }else{
                                IndexSpecialStatisticsVO specialStatisticsVO = new IndexSpecialStatisticsVO();
                                specialStatisticsVO.setTitle(userTag.getTagName());
                                Integer count = comMngPopulationDAO.getSpecialStatisticsByLabel(userTag.getTagName());
@@ -1039,6 +1044,10 @@
            newStatisticsVO.setAudios(audioList);
            newStatisticsVO.setPics(picList);
            newStatisticsVO.setVideos(videoList);

            //查询事件流转记录
            List<EventTransferRecordVO> transferRecordList = this.baseMapper.getEventScreenEventTransList(newStatisticsVO.getId());
            newStatisticsVO.setTransferRecordList(transferRecordList);
        }
        statisticsVO.setNewStatisticsVO(newStatisticsVO);

@@ -1049,6 +1058,22 @@
        //查询社区事件列表
        List<EventGridIncidentStatisticsVO> gridIncidentList = this.baseMapper.getEventScreenEventList(communityId);
        statisticsVO.setGridIncidentList(gridIncidentList);

        //查询小区列表
        List<CivilVillageStatisticsVO> villageStatisticsList = this.baseMapper.getCivilScreenVillageList(communityId);
        if(!villageStatisticsList.isEmpty()){
            villageStatisticsList.forEach(village -> {
                CivilVillageStatisticsVO villageStatisticsVO = this.baseMapper.getCivilScreenVillageStatistics(village.getVillageId());
                if(villageStatisticsVO != null){
                    BeanUtils.copyProperties(villageStatisticsVO,village);
                }
            });
        }
        statisticsVO.setVillageStatisticsList(villageStatisticsList);

        //查询统计人口数据
        ComMngPopulationTotalVO populationTotalVO = populationDAO.getPopulationTotalByAdmin(communityId);
        statisticsVO.setPopulationTotalVO(populationTotalVO);

        return R.ok(statisticsVO);
    }
@@ -1100,7 +1125,12 @@
                                specialStatisticsVO.setTitle(userTag.getTagName());
                                specialStatisticsVO.setSum(264);
                                specialStatisticsVOList.add(specialStatisticsVO);
                            } else {
                            }else if(userTag.getTagName().equals("高龄老人")){
                                IndexSpecialStatisticsVO specialStatisticsVO = new IndexSpecialStatisticsVO();
                                specialStatisticsVO.setTitle(userTag.getTagName());
                                specialStatisticsVO.setSum(comMngPopulationDAO.getStatisticsCount(communityId));
                                specialStatisticsVOList.add(specialStatisticsVO);
                            }else{
                                IndexSpecialStatisticsVO specialStatisticsVO = new IndexSpecialStatisticsVO();
                                specialStatisticsVO.setTitle(userTag.getTagName());
                                Integer count = comMngPopulationDAO.getSpecialStatisticsByLabel(userTag.getTagName());
@@ -1153,7 +1183,69 @@
        comActPopulationScreenVO.setTotalNum(vo.getPopulationTotal() == null ? 0 : vo.getPopulationTotal());
        comActPopulationScreenVO.setLocalNum(vo.getLocalTotal() == null ? 0 : vo.getLocalTotal().longValue());
        comActPopulationScreenVO.setOutNum(vo.getOutTotal() == null ? 0 : vo.getOutTotal().longValue());
        comActPopulationScreenVO.setSpecialNum(vo.getSpecialTotal() == null ? 0 : vo.getSpecialTotal().longValue());

        //查询特殊人群统计
        List<IndexSpecialStatisticsVO> specialStatisticsVOList = new ArrayList<>();

        //查询特殊人群标签列表
        List<ComMngUserTagVO> userTagList = comMngPopulationDAO.getUserTagListByCommunityId(communityId);
        IndexSpecialStatisticsVO otherSpecialVO = new IndexSpecialStatisticsVO();
        otherSpecialVO.setTitle("其他");
        otherSpecialVO.setSum(0);
        if(!userTagList.isEmpty()){
            userTagList.forEach(userTag -> {
                if(userTag != null){
                    if(userTag.getSysFlag().equals(0)){
                        Integer count = comMngPopulationDAO.getSpecialStatisticsByLabel(userTag.getTagName());
                        otherSpecialVO.setSum(otherSpecialVO.getSum() + count);
                    }else{
                        if(StringUtils.isNotEmpty(userTag.getTagName())){
                            if(userTag.getTagName().equals("特扶家庭")){
                                IndexSpecialStatisticsVO specialStatisticsVO = new IndexSpecialStatisticsVO();
                                specialStatisticsVO.setTitle(userTag.getTagName());
                                specialStatisticsVO.setSum(22);
                                specialStatisticsVOList.add(specialStatisticsVO);
                            }else if(userTag.getTagName().equals("低保户")){
                                IndexSpecialStatisticsVO specialStatisticsVO = new IndexSpecialStatisticsVO();
                                specialStatisticsVO.setTitle(userTag.getTagName());
                                specialStatisticsVO.setSum(94);
                                specialStatisticsVOList.add(specialStatisticsVO);
                            }else if(userTag.getTagName().equals("低收入人群")){
                                IndexSpecialStatisticsVO specialStatisticsVO = new IndexSpecialStatisticsVO();
                                specialStatisticsVO.setTitle(userTag.getTagName());
                                specialStatisticsVO.setSum(2);
                                specialStatisticsVOList.add(specialStatisticsVO);
                            }else if(userTag.getTagName().equals("退役军人")){
                                IndexSpecialStatisticsVO specialStatisticsVO = new IndexSpecialStatisticsVO();
                                specialStatisticsVO.setTitle(userTag.getTagName());
                                specialStatisticsVO.setSum(264);
                                specialStatisticsVOList.add(specialStatisticsVO);
                            }else if(userTag.getTagName().equals("高龄老人")){
                                IndexSpecialStatisticsVO specialStatisticsVO = new IndexSpecialStatisticsVO();
                                specialStatisticsVO.setTitle(userTag.getTagName());
                                specialStatisticsVO.setSum(comMngPopulationDAO.getStatisticsCount(communityId));
                                specialStatisticsVOList.add(specialStatisticsVO);
                            }else{
                                IndexSpecialStatisticsVO specialStatisticsVO = new IndexSpecialStatisticsVO();
                                specialStatisticsVO.setTitle(userTag.getTagName());
                                Integer count = comMngPopulationDAO.getSpecialStatisticsByLabel(userTag.getTagName());
                                specialStatisticsVO.setSum(count);
                                specialStatisticsVOList.add(specialStatisticsVO);
                            }
                        }
                    }
                }
            });
        }
        //计算特殊人群总数
        specialStatisticsVOList.add(otherSpecialVO);
        Integer specialNum = 0;
        if(!specialStatisticsVOList.isEmpty()){
            for (IndexSpecialStatisticsVO special:specialStatisticsVOList) {
                specialNum += special.getSum();
            }
        }
        comActPopulationScreenVO.setSpecialNum(specialNum.longValue());
        //统计已使用社区通人数
        Long count = populationDAO.countUsedCommunityPopulation(communityId);
        comActPopulationScreenVO.setUsedCommunityNum(count == null ? 0 : count);
@@ -1320,6 +1412,10 @@
                statisticsVO.setAudios(audioList);
                statisticsVO.setPics(picList);
                statisticsVO.setVideos(videoList);

                //查询事件流转记录
                List<EventTransferRecordVO> transferRecordList = this.baseMapper.getEventScreenEventTransList(eventDetailDTO.getEventId());
                statisticsVO.setTransferRecordList(transferRecordList);
            }
        }
        return R.ok(statisticsVO);

 springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/api/BigScreenApi.java

New file
@@ -0,0 +1,37 @@
package com.panzhihua.service_grid.api;

import com.panzhihua.common.controller.BaseController;
import com.panzhihua.common.model.dtos.community.bigscreen.event.ScreenEventListDTO;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.service_grid.service.EventService;
import lombok.extern.slf4j.Slf4j;
import org.springframework.web.bind.annotation.*;

import javax.annotation.Resource;

/**
 * @ClasssName BigScreenApi
 * @Description 网格大屏/事件
 * @Author lyq
 * @Date 2021/6/18
 * @Version 1.0
 **/
@Slf4j
@RestController
@RequestMapping("/screen/")
public class BigScreenApi extends BaseController {

    @Resource
    private EventService eventService;

    /**
     * 事件大屏查询事件列表
     * @param eventListDTO  请求参数
     * @return  事件列表
     */
    @PostMapping("/event/list")
    public R eventList(@RequestBody ScreenEventListDTO eventListDTO) {
        return eventService.getScreenEventList(eventListDTO);
    }

}

 springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/dao/EventMapper.java

@@ -4,7 +4,9 @@
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.panzhihua.common.model.dtos.community.bigscreen.event.ScreenEventListDTO;
import com.panzhihua.common.model.dtos.grid.*;
import com.panzhihua.common.model.vos.community.screen.event.EventListVO;
import com.panzhihua.common.model.vos.grid.*;
import com.panzhihua.service_grid.model.dos.EventDO;
import org.apache.ibatis.annotations.Mapper;
@@ -98,4 +100,12 @@
     * @return
     */
    Map<String, Object> getUserBaseInfo(@Param("gridMemberId")Long gridMemberId);

    /**
     * 事件大屏查询事件列表
     * @param eventListDTO  请求参数
     * @return  事件列表
     */
    IPage<EventListVO> getScreenEventList(Page page, @Param("eventListDTO") ScreenEventListDTO eventListDTO);

}

 springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/service/EventService.java

@@ -2,6 +2,7 @@

import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.service.IService;
import com.panzhihua.common.model.dtos.community.bigscreen.event.ScreenEventListDTO;
import com.panzhihua.common.model.dtos.grid.*;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.community.ComActVO;
@@ -242,6 +243,13 @@
     * @return
     */
    R reportDirect(CommonEventDirectReportDTO commonEventDirectReportDTO);

    /**
     * 事件大屏查询事件列表
     * @param eventListDTO  请求参数
     * @return  事件列表
     */
    R getScreenEventList(ScreenEventListDTO eventListDTO);
    /**
     * description 获取所有未上传到浪潮平台的事件列表
     *

 springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/service/impl/EventServiceImpl.java

@@ -9,9 +9,11 @@
import com.panzhihua.common.enums.EventType;
import com.panzhihua.common.exceptions.ServiceException;
import com.panzhihua.common.model.dtos.community.ComMngPopulationDTO;
import com.panzhihua.common.model.dtos.community.bigscreen.event.ScreenEventListDTO;
import com.panzhihua.common.model.dtos.grid.*;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.community.ComActVO;
import com.panzhihua.common.model.vos.community.screen.event.EventListVO;
import com.panzhihua.common.model.vos.grid.*;
import com.panzhihua.common.service.community.CommunityService;
import com.panzhihua.common.utlis.ExcelSelectListUtil;
@@ -58,6 +60,7 @@
    private EventGridDataService eventGridDataService;
    @Resource
    private EventResourceMapper eventResourceMapper;

    /**
     * 分页查找事件
     *
@@ -2060,6 +2063,19 @@
        return R.fail();
    }

    /**
     * 事件大屏查询事件列表
     * @param eventListDTO  请求参数
     * @return  事件列表
     */
    @Override
    public R getScreenEventList(ScreenEventListDTO eventListDTO){
        if( eventListDTO.getEventType() != null && eventListDTO.getEventType().equals(ScreenEventListDTO.eventType.xc)){
            eventListDTO.setEventCategory(2);
        }
        IPage<EventListVO> eventPageList = this.baseMapper.getScreenEventList(new Page(eventListDTO.getPageNum(),eventListDTO.getPageSize()),eventListDTO);
        return R.ok(eventPageList);

    @Override
    public List<EventDetailsVO> getUnUploadEvent() {
        List<EventDetailsVO> eventDetailsVOList =new ArrayList<>();

 springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/resources/mapper/EventMapper.xml

@@ -879,4 +879,70 @@
    <select id="getUserBaseInfo" parameterType="java.lang.Long" resultType="java.util.Map">
        select name,image_url from sys_user where user_id = #{gridMemberId}
    </select>

    <select id="getScreenEventList" parameterType="com.panzhihua.common.model.dtos.community.bigscreen.event.ScreenEventListDTO"
            resultType="com.panzhihua.common.model.vos.community.screen.event.EventListVO">
        SELECT
            e.id,
            e.grid_member_id,
            su.image_url,
            su.nick_name AS userName,
            e.create_at,
            e.urgent,
            e.danger_level,
            e.major,
            e.event_des,
            e.event_category,
            e.event_type,
            e.event_clazz,
            e.happen_address,
            e.happent_lat_lng,
            e.happent_address,
            e.event_deal_status,
            egd.grid_name
        FROM
            `event` AS e
            LEFT JOIN sys_user AS su ON su.user_id = e.grid_member_id
            LEFT JOIN event_grid_data AS egd ON egd.id = e.grid_id
            <where>
                and event_status = 2
                <if test='eventListDTO.communityId != null'>
                    and egd.grid_community_id = #{eventListDTO.communityId}
                </if>

                <if test='eventListDTO.startTime != null and eventListDTO.startTime != &quot;&quot;'>
                    and e.create_at <![CDATA[>=]]> #{eventListDTO.startTime}
                </if>

                <if test='eventListDTO.endTime != null and eventListDTO.endTime != &quot;&quot;'>
                    and e.create_at <![CDATA[<=]]> #{eventListDTO.endTime}
                </if>

                <if test='eventListDTO.gridId != null'>
                    and e.grid_id = #{eventListDTO.gridId}
                </if>

                <if test='eventListDTO.eventCategory != null'>
                    and e.event_category = #{eventListDTO.eventCategory}
                </if>

                <if test='eventListDTO.eventType != null'>
                    and e.event_type = #{eventListDTO.eventType}
                </if>

                <if test='eventListDTO.eventDealStatus != null'>
                    and e.event_deal_status = #{eventListDTO.eventDealStatus}
                </if>

                <if test='eventListDTO.urgent != null and eventListDTO.urgent != &quot;&quot;'>
                    and e.urgent = #{eventListDTO.urgent}
                </if>

                <if test='eventListDTO.major != null and eventListDTO.major != &quot;&quot;'>
                    and e.major = #{eventListDTO.major}
                </if>
            </where>
            order by e.create_at desc
    </select>

</mapper>

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

@@ -17,6 +17,7 @@
import com.panzhihua.common.utlis.DateUtils;
import com.panzhihua.common.utlis.RichTextUtil;
import com.panzhihua.common.utlis.SensitiveUtil;
import com.panzhihua.common.utlis.StringUtils;
import com.panzhihua.service_dangjian.dao.*;
import com.panzhihua.service_dangjian.model.dos.*;
import com.panzhihua.service_dangjian.service.ComPbMemberService;
@@ -141,6 +142,7 @@
        if (!ObjectUtils.isEmpty(list)) {
            List<PartyOrganizationVO> partyOrganizationVOArrayList=partyOrganizationVOS;
            list.forEach(partyBuildingMemberExcelVO -> {

                ComPbMemberDO comPbMemberDO=new ComPbMemberDO();
                Date date=new Date();
                comPbMemberDO.setUpdateAt(date);
@@ -153,21 +155,38 @@
                    PartyOrganizationVO partyOrganizationVO = collect.get(0);
                    comPbMemberDO.setOrgId(partyOrganizationVO.getId());
                    comPbMemberDO.setCommunityId(partyOrganizationVO.getCommunityId());

                    List<ComPbMemberDO> comPbMemberDOList = this.baseMapper.selectList(new QueryWrapper<ComPbMemberDO>().lambda()
                            .eq(ComPbMemberDO::getIdCard,partyBuildingMemberExcelVO.getIdCard())
                            .eq(ComPbMemberDO::getCommunityId,partyOrganizationVO.getCommunityId())
                            .in(ComPbMemberDO::getAuditResult,0,1));
                    if(!comPbMemberDOList.isEmpty()){
                        throw new PartyBuildingMemberException("导入失败，您导入的数据中有已存在的党员信息,已存在的数据:"+ partyBuildingMemberExcelVO.getEmploymentTime() + "，已存在的人名：" + partyBuildingMemberExcelVO.getName());
                    }
                }

                if(!DateUtils.isValidDate(partyBuildingMemberExcelVO.getEmploymentTime())){
                if(StringUtils.isNotEmpty(partyBuildingMemberExcelVO.getEmploymentTime()) && !DateUtils.isValidDate(partyBuildingMemberExcelVO.getEmploymentTime())){
                    throw new PartyBuildingMemberException("导入失败,您导入的数据中有转正日期格式错误，错误数据:" + partyBuildingMemberExcelVO.getEmploymentTime() + "，错误人名：" + partyBuildingMemberExcelVO.getName());
                }

                if(!DateUtils.isValidDate(partyBuildingMemberExcelVO.getJoinTime())){
                if(StringUtils.isNotEmpty(partyBuildingMemberExcelVO.getJoinTime()) && !DateUtils.isValidDate(partyBuildingMemberExcelVO.getJoinTime())){
                    throw new PartyBuildingMemberException("导入失败,您导入的数据中有入党日期格式错误，错误数据:" + partyBuildingMemberExcelVO.getJoinTime() + "，错误人名：" + partyBuildingMemberExcelVO.getName());
                }

                Date employmentTime = DateUtils.toValidDate(partyBuildingMemberExcelVO.getEmploymentTime());
                Date joinTime = DateUtils.toValidDate(partyBuildingMemberExcelVO.getJoinTime());
                if(StringUtils.isNotEmpty(partyBuildingMemberExcelVO.getEmploymentTime())){
                    Date employmentTime = DateUtils.toValidDate(partyBuildingMemberExcelVO.getEmploymentTime());
                    comPbMemberDO.setEmploymentTime(employmentTime);
                }else{
                    comPbMemberDO.setEmploymentTime(null);
                }

                comPbMemberDO.setEmploymentTime(employmentTime);
                comPbMemberDO.setJoinTime(joinTime);
                if(StringUtils.isNotEmpty(partyBuildingMemberExcelVO.getJoinTime())){
                    Date joinTime = DateUtils.toValidDate(partyBuildingMemberExcelVO.getJoinTime());
                    comPbMemberDO.setJoinTime(joinTime);
                }else{
                    comPbMemberDO.setJoinTime(null);
                }

                comPbMemberDO.setName(partyBuildingMemberExcelVO.getName());
                comPbMemberDO.setIdCard(partyBuildingMemberExcelVO.getIdCard());
                comPbMemberDOS.add(comPbMemberDO);