花城E+防疫修改

101captain

2022-04-28 292ce3a671a36f2aac62098a66a9596ba8991ff9

花城E+防疫修改

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

New file
@@ -0,0 +1,82 @@
package com.panzhihua.applets.api;


import com.panzhihua.common.controller.BaseController;
import com.panzhihua.common.model.dtos.community.acid.ComActAcidCheckRecordDTO;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.community.acid.ComActAcidCheckRecordVO;
import com.panzhihua.common.service.community.CommunityService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.web.bind.annotation.*;

import javax.annotation.Resource;

/**
 * 排查跟进表(ComActAcidCheckRecord)表控制层
 * projectName 成都呐喊信息技术有限公司-智慧社区项目
 * description: 排查跟进表相关功能
 *
 * @author zzj
 * @since 2022-04-24 16:14:27
 */
@Api(tags = {"排查跟进"})
@RestController
@RequestMapping("comActAcidCheckRecord")
public class ComActAcidCheckRecordApi extends BaseController {
    /**
     * 服务对象
     */
    @Resource
    private CommunityService communityService;

    /**
     * 列表查询
     *
     * @param comActAcidCheckRecordDTO 查询实体
     * @return 所有数据
     */
    @ApiOperation(value = "分页查询",response = ComActAcidCheckRecordVO.class)
    @PostMapping("queryAll")
    public R selectAll(@RequestBody ComActAcidCheckRecordDTO comActAcidCheckRecordDTO) {
        return this.communityService.selectAllComActAcidCheckRecord(comActAcidCheckRecordDTO);
    }

    /**
     * 通过主键查询单条数据
     *
     * @param id 主键
     * @return 单条数据
     */
    @ApiOperation(value = "通过主键查询单条数据",response = ComActAcidCheckRecordVO.class)
    @GetMapping("{id}")
    public R selectOne(@PathVariable("id") Long id) {
        return this.communityService.selectOneComActAcidCheckRecord(id);
    }

    /**
     * 新增数据
     *
     * @param comActAcidCheckRecordVO 实体对象
     * @return 新增结果
     */
    @ApiOperation(value = "新增数据")
    @PostMapping
    public R insert(@RequestBody ComActAcidCheckRecordVO comActAcidCheckRecordVO) {
        comActAcidCheckRecordVO.setUsername(this.getLoginUserInfo().getName());
        return this.communityService.insertComActAcidCheckRecord(comActAcidCheckRecordVO);
    }

    /**
     * 修改数据
     *
     * @param comActAcidCheckRecordVO 实体对象
     * @return 修改结果
     */
    @ApiOperation(value = "修改数据")
    @PostMapping("/update")
    public R update(@RequestBody ComActAcidCheckRecordVO comActAcidCheckRecordVO) {
        return this.communityService.updateComActAcidCheckRecord(comActAcidCheckRecordVO);
    }

}

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

@@ -5,6 +5,7 @@
import com.panzhihua.common.model.dtos.community.acid.ComActAcidRecordDTO;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.community.acid.ComActAcidRecordVO;
import com.panzhihua.common.model.vos.community.reserve.FiveCount;
import com.panzhihua.common.service.community.CommunityService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
@@ -95,4 +96,14 @@
    public R delete(@RequestParam("id") Long id) {
        return this.communityService.deleteComActAcidRecord(id);
    }

    /**
     * 5项常规统计
     * @return
     */
    @ApiOperation(value = "7项常规统计",response = FiveCount.class)
    @GetMapping("fiveCountPlus")
    public R fiveCountPlus(@RequestParam("date")String date,@RequestParam("localCity") String localCity){
        return this.communityService.comActAcidRecordFiveCountPlus(date,localCity);
    }
}

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/acid/ComActAcidCheckRecordDTO.java

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

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

import javax.validation.constraints.NotNull;
import java.io.Serializable;
import java.util.Date;


/**
 * 排查跟进表(ComActAcidCheckRecord)表实体类
 * projectName 成都呐喊信息技术有限公司-智慧社区项目
 * description: 排查跟进表相关功能
 *
 * @author zzj
 * @since 2022-04-24 16:14:25
 */
@Data
@ApiModel("排查跟进表")
public class ComActAcidCheckRecordDTO  {

    @NotNull(message = "分页参数不能为空")
    private Integer page;
    @ApiModelProperty("条数")
    @NotNull(message = "分页参数不能为空")
    private Integer size;
    /**
     * 人员id
     */
    @ApiModelProperty(value = "人员id")
    private Long memberId;

    /**
     * 处理情况 1：集中隔离 2：居家隔离 3：健康监测 4：失联或尚需追踪 5：排除风险 6：暂未管控
     */
    @ApiModelProperty(value = "处理情况 1：集中隔离 2：居家隔离 3：健康监测 4：失联或尚需追踪 5：排除风险 6：暂未管控")
    private Integer status;

    /**
     * 备注
     */
    @ApiModelProperty(value = "备注")
    private String remark;

    /**
     * 创建时间
     */
    @ApiModelProperty(value = "创建时间")
    private Date createTime;

    /**
     * 操作人
     */
    @ApiModelProperty(value = "操作人")
    private String username;

}

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

New file
@@ -0,0 +1,65 @@
package com.panzhihua.common.model.vos.community.acid;

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

import java.io.Serializable;
import java.util.Date;


/**
 * 排查跟进表(ComActAcidCheckRecord)表实体类
 * projectName 成都呐喊信息技术有限公司-智慧社区项目
 * description: 排查跟进表相关功能
 *
 * @author zzj
 * @since 2022-04-24 16:14:25
 */
@Data
@ApiModel("排查跟进表")
public class ComActAcidCheckRecordVO implements Serializable {

    private static final long serialVersionUID = 511018347419682300L;

    private Long id;

    /**
     * 人员id
     */
    @ApiModelProperty(value = "人员id")
    private Long memberId;

    /**
     * 处理情况 1：集中隔离 2：居家隔离 3：健康监测 4：失联或尚需追踪 5：排除风险 6：暂未管控
     */
    @ApiModelProperty(value = "处理情况 1：集中隔离 2：居家隔离 3：健康监测 4：失联或尚需追踪 5：排除风险 6：暂未管控")
    private Integer status;

    /**
     * 备注
     */
    @ApiModelProperty(value = "备注")
    private String remark;

    /**
     * 创建时间
     */
    @ApiModelProperty(value = "创建时间")
    private Date createTime;

    /**
     * 操作人
     */
    @ApiModelProperty(value = "操作人")
    private String username;

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

}

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

@@ -5,10 +5,7 @@
import com.panzhihua.common.model.dtos.PageBaseDTO;
import com.panzhihua.common.model.dtos.civil.*;
import com.panzhihua.common.model.dtos.common.*;
import com.panzhihua.common.model.dtos.community.acid.ComActAcidDangerMemberDTO;
import com.panzhihua.common.model.dtos.community.acid.ComActAcidMemberDTO;
import com.panzhihua.common.model.dtos.community.acid.ComActAcidRecordDTO;
import com.panzhihua.common.model.dtos.community.acid.PageDangerMemberDTO;
import com.panzhihua.common.model.dtos.community.acid.*;
import com.panzhihua.common.model.dtos.community.reserve.*;
import com.panzhihua.common.model.dtos.community.warehouse.ComActWarehouseApplyDTO;
import com.panzhihua.common.model.dtos.community.GetIdentityEidTokenDTO;
@@ -28,6 +25,7 @@
import com.panzhihua.common.model.vos.civil.ComActSocialWorkerDetailsVO;
import com.panzhihua.common.model.vos.civil.ComActSocialWorkerVO;
import com.panzhihua.common.model.vos.community.*;
import com.panzhihua.common.model.vos.community.acid.ComActAcidCheckRecordVO;
import com.panzhihua.common.model.vos.community.acid.ComActAcidMemberVO;
import com.panzhihua.common.model.vos.community.acid.ComActAcidRecordVO;
import com.panzhihua.common.model.vos.community.cluster.admin.ComClusterMemberExcelVO;
@@ -9612,7 +9610,7 @@
     * @return
     */
    @GetMapping("/comActAcidRecord/fiveCountPlus")
    R comActAcidRecordFiveCountPlus(@RequestParam("date")String date);
    R comActAcidRecordFiveCountPlus(@RequestParam("date")String date,@RequestParam("localCity")String localCity);

    @GetMapping("/comActAcidRecord/statics")
    R comActAcidRecordStatics(@RequestParam("date")String date);
@@ -9732,4 +9730,40 @@
     */
    @PostMapping("/comActAcidDangerMember/queryAll")
    R pageDangerMemberAdmin(@RequestBody ComActAcidDangerMemberDTO pageDangerMemberDTO);

    /**
     * 列表查询
     *
     * @param comActAcidCheckRecordDTO 查询实体
     * @return 所有数据
     */
    @PostMapping("/comActAcidCheckRecord/queryAll")
    R selectAllComActAcidCheckRecord(@RequestBody ComActAcidCheckRecordDTO comActAcidCheckRecordDTO);

    /**
     * 通过主键查询单条数据
     *
     * @param id 主键
     * @return 单条数据
     */
    @GetMapping("/comActAcidCheckRecord/{id}")
    R selectOneComActAcidCheckRecord(@PathVariable("id") Long id);

    /**
     * 新增数据
     *
     * @param comActAcidCheckRecordVO 实体对象
     * @return 新增结果
     */
    @PostMapping("/comActAcidCheckRecord")
    R insertComActAcidCheckRecord(@RequestBody ComActAcidCheckRecordVO comActAcidCheckRecordVO);

    /**
     * 修改数据
     *
     * @param comActAcidCheckRecordVO 实体对象
     * @return 修改结果
     */
    @PostMapping("/comActAcidCheckRecord/update")
    R updateComActAcidCheckRecord(@RequestBody ComActAcidCheckRecordVO comActAcidCheckRecordVO);
}

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

New file
@@ -0,0 +1,83 @@
package com.panzhihua.community_backstage.api;


import com.panzhihua.common.controller.BaseController;
import com.panzhihua.common.model.dtos.community.acid.ComActAcidCheckRecordDTO;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.community.acid.ComActAcidCheckRecordVO;
import com.panzhihua.common.service.community.CommunityService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.BeanUtils;
import org.springframework.web.bind.annotation.*;

import javax.annotation.Resource;

/**
 * 排查跟进表(ComActAcidCheckRecord)表控制层
 * projectName 成都呐喊信息技术有限公司-智慧社区项目
 * description: 排查跟进表相关功能
 *
 * @author zzj
 * @since 2022-04-24 16:14:27
 */
@Api(tags = {"排查跟进"})
@RestController
@RequestMapping("comActAcidCheckRecord")
public class ComActAcidCheckRecordApi extends BaseController {
    /**
     * 服务对象
     */
    @Resource
    private CommunityService communityService;

    /**
     * 列表查询
     *
     * @param comActAcidCheckRecordDTO 查询实体
     * @return 所有数据
     */
    @ApiOperation(value = "分页查询",response = ComActAcidCheckRecordVO.class)
    @PostMapping("queryAll")
    public R selectAll(@RequestBody ComActAcidCheckRecordDTO comActAcidCheckRecordDTO) {
        return this.communityService.selectAllComActAcidCheckRecord(comActAcidCheckRecordDTO);
    }

    /**
     * 通过主键查询单条数据
     *
     * @param id 主键
     * @return 单条数据
     */
    @ApiOperation(value = "通过主键查询单条数据",response = ComActAcidCheckRecordVO.class)
    @GetMapping("{id}")
    public R selectOne(@PathVariable("id") Long id) {
        return this.communityService.selectOneComActAcidCheckRecord(id);
    }

    /**
     * 新增数据
     *
     * @param comActAcidCheckRecordVO 实体对象
     * @return 新增结果
     */
    @ApiOperation(value = "新增数据")
    @PostMapping
    public R insert(@RequestBody ComActAcidCheckRecordVO comActAcidCheckRecordVO) {
        comActAcidCheckRecordVO.setUsername(this.getLoginUserInfo().getName());
        return this.communityService.insertComActAcidCheckRecord(comActAcidCheckRecordVO);
    }

    /**
     * 修改数据
     *
     * @param comActAcidCheckRecordVO 实体对象
     * @return 修改结果
     */
    @ApiOperation(value = "修改数据")
    @PostMapping("/update")
    public R update(@RequestBody ComActAcidCheckRecordVO comActAcidCheckRecordVO) {
        return this.communityService.updateComActAcidCheckRecord(comActAcidCheckRecordVO);
    }

}

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

@@ -199,7 +199,7 @@
    @ApiOperation(value = "7项常规统计",response = FiveCount.class)
    @GetMapping("fiveCountPlus")
    public R fiveCountPlus(@RequestParam("date")String date){
        return this.communityService.comActAcidRecordFiveCountPlus(date);
        return this.communityService.comActAcidRecordFiveCountPlus(date,this.getLoginUserInfo().getName());
    }



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

@@ -3,15 +3,20 @@

import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.extension.api.ApiController;
import com.panzhihua.common.model.dtos.community.acid.ComActAcidCheckRecordDTO;
import com.panzhihua.common.model.dtos.community.acid.ComActAcidDangerMemberDTO;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.dtos.property.CommonPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.panzhihua.common.model.vos.community.acid.ComActAcidCheckRecordVO;
import com.panzhihua.service_community.entity.ComActAcidCheckRecord;
import com.panzhihua.service_community.service.ComActAcidCheckRecordService;
import org.springframework.beans.BeanUtils;
import org.springframework.web.bind.annotation.*;

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

/**
@@ -32,14 +37,14 @@
    private ComActAcidCheckRecordService comActAcidCheckRecordService;

    /**
     * 分页查询所有数据
     * 列表查询
     *
     * @param commonPage 查询实体
     * @param comActAcidCheckRecordDTO 查询实体
     * @return 所有数据
     */
    @PostMapping("queryAll")
    public R selectAll(@RequestBody CommonPage commonPage) {
        return this.comActAcidCheckRecordService.pageList(commonPage);
    public R selectAll(@RequestBody ComActAcidCheckRecordDTO comActAcidCheckRecordDTO) {
        return this.comActAcidCheckRecordService.pageList(comActAcidCheckRecordDTO);
    }

    /**
@@ -49,29 +54,34 @@
     * @return 单条数据
     */
    @GetMapping("{id}")
    public R selectOne(@PathVariable("id") Serializable id) {
    public R selectOne(@PathVariable("id") Long id) {
        return R.ok(this.comActAcidCheckRecordService.getById(id));
    }

    /**
     * 新增数据
     *
     * @param comActAcidCheckRecord 实体对象
     * @param comActAcidCheckRecordVO 实体对象
     * @return 新增结果
     */
    @PostMapping
    public R insert(@RequestBody ComActAcidCheckRecord comActAcidCheckRecord) {
    public R insert(@RequestBody ComActAcidCheckRecordVO comActAcidCheckRecordVO) {
        ComActAcidCheckRecord comActAcidCheckRecord=new ComActAcidCheckRecord();
        BeanUtils.copyProperties(comActAcidCheckRecordVO,comActAcidCheckRecord);
        comActAcidCheckRecord.setCreateTime(new Date());
        return R.ok(this.comActAcidCheckRecordService.save(comActAcidCheckRecord));
    }

    /**
     * 修改数据
     *
     * @param comActAcidCheckRecord 实体对象
     * @param comActAcidCheckRecordVO 实体对象
     * @return 修改结果
     */
    @PostMapping("/update")
    public R update(@RequestBody ComActAcidCheckRecord comActAcidCheckRecord) {
    public R update(@RequestBody ComActAcidCheckRecordVO comActAcidCheckRecordVO) {
        ComActAcidCheckRecord comActAcidCheckRecord=new ComActAcidCheckRecord();
        BeanUtils.copyProperties(comActAcidCheckRecordVO,comActAcidCheckRecord);
        return R.ok(this.comActAcidCheckRecordService.updateById(comActAcidCheckRecord));
    }


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

@@ -117,8 +117,8 @@
     * @return
     */
    @GetMapping("fiveCountPlus")
    public R fiveCountPlus(@RequestParam("date")String date){
        return this.comActAcidRecordService.fiveCountPlus(date);
    public R fiveCountPlus(@RequestParam("date")String date,@RequestParam("localCity")String localCity){
        return this.comActAcidRecordService.fiveCountPlus(date,localCity);
    }

    @GetMapping("/statics")

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

@@ -1,8 +1,16 @@
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.acid.ComActAcidCheckRecordDTO;
import com.panzhihua.common.model.dtos.community.acid.ComActAcidDangerMemberDTO;
import com.panzhihua.common.model.vos.community.acid.ComActAcidCheckRecordVO;
import org.apache.ibatis.annotations.Mapper;
import com.panzhihua.service_community.entity.ComActAcidCheckRecord;
import org.apache.ibatis.annotations.Param;

import java.util.List;

/**
 * 排查跟进表(ComActAcidCheckRecord)表数据库访问层
@@ -15,4 +23,11 @@
@Mapper
public interface ComActAcidCheckRecordDao extends BaseMapper<ComActAcidCheckRecord> {

    /**
     * 列表查询
     * @param page
     * @param comActAcidCheckRecordDTO
     * @return
     */
    IPage<ComActAcidCheckRecordVO> pageList(Page page, @Param("dto") ComActAcidCheckRecordDTO comActAcidCheckRecordDTO);
}

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

@@ -51,9 +51,10 @@
    /**
     * 7项统计
     * @param date
     * @param localCity
     * @return
     */
    FiveCount fiveCountPlus(String date);
    FiveCount fiveCountPlus(@Param("date") String date,@Param("localCity") String localCity);

    /**
     * 统计查询

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/entity/ComActAcidCheckRecord.java

@@ -65,4 +65,5 @@
    @ApiModelProperty(value = "操作人")
    private String username;

    private Date checkTime;
}

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

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

import com.panzhihua.common.model.dtos.community.acid.ComActAcidCheckRecordDTO;
import com.panzhihua.common.model.dtos.community.acid.ComActAcidDangerMemberDTO;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.dtos.property.CommonPage;
import com.baomidou.mybatisplus.extension.service.IService;
@@ -16,9 +18,8 @@
public interface ComActAcidCheckRecordService extends IService<ComActAcidCheckRecord> {
    /**
     * 分页查询
     *
     * @param commonPage
     * @param comActAcidDangerMemberDTO
     * @return
     */
    R pageList(CommonPage commonPage);
    R pageList(ComActAcidCheckRecordDTO comActAcidDangerMemberDTO);
}

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

@@ -48,7 +48,7 @@
     * 5项统计
     * @return
     */
    R fiveCountPlus(String date);
    R fiveCountPlus(String date,String localCity);

    /**
     * 统计

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

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

import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.panzhihua.common.model.dtos.community.acid.ComActAcidCheckRecordDTO;
import com.panzhihua.common.model.dtos.community.acid.ComActAcidDangerMemberDTO;
import com.panzhihua.common.model.dtos.property.CommonPage;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.service_community.entity.ComActAcidCheckRecord;
@@ -22,7 +25,7 @@
public class ComActAcidCheckRecordServiceImpl extends ServiceImpl<ComActAcidCheckRecordDao, ComActAcidCheckRecord> implements ComActAcidCheckRecordService {

    @Override
    public R pageList(CommonPage commonPage) {
        return null;
    public R pageList(ComActAcidCheckRecordDTO comActAcidDangerMemberDTO) {
        return R.ok(this.baseMapper.pageList(new Page(comActAcidDangerMemberDTO.getPage(), comActAcidDangerMemberDTO.getSize()),comActAcidDangerMemberDTO));
    }
}

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

@@ -110,8 +110,8 @@
        return R.ok(this.baseMapper.fiveCount(localCity));
    }
    @Override
    public R fiveCountPlus(String date) {
        return R.ok(this.baseMapper.fiveCountPlus(date));
    public R fiveCountPlus(String date,String localCity) {
        return R.ok(this.baseMapper.fiveCountPlus(date,localCity));
    }

    @Override

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComActAcidCheckRecordMapper.xml

@@ -12,4 +12,14 @@
        <result property="username" column="username"/>
    </resultMap>

    <select id="pageList" resultType="com.panzhihua.common.model.vos.community.acid.ComActAcidCheckRecordVO">
            select * from com_act_acid_check_record
            <where>
                <if test="dto.memberId !=null and dto.memberId !=''">
                    and member_id = #{dto.memberId}
                </if>
            </where>
            order by create_time desc
    </select>

</mapper>

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComActAcidRecordMapper.xml

@@ -117,13 +117,13 @@
    </select>

    <select id="fiveCountPlus" resultType="com.panzhihua.common.model.vos.community.reserve.FiveCount">
        select (select count(*) from com_act_acid_record  <if test="date!=null and date!=''"> where create_time between concat(#{date},' 00:00:00') and concat(#{date},' 23:23:59')</if>) allCount,
        (select count(*) from com_act_acid_record where danger_area = '是'  <if test="date!=null and date!=''"> and create_time between concat(#{date},' 00:00:00') and concat(#{date},' 23:23:59')</if>) dangerCount,
        (select count(*) from com_act_acid_record where color_mark = '绿码' <if test="date!=null and date!=''"> and create_time between concat(#{date},' 00:00:00') and concat(#{date},' 23:23:59')</if>) greenMark,
        (select count(*) from com_act_acid_record where color_mark = '红码' <if test="date!=null and date!=''"> and create_time between concat(#{date},' 00:00:00') and concat(#{date},' 23:23:59')</if>) redMark,
        (select count(*) from com_act_acid_record where color_mark = '黄码' <if test="date!=null and date!=''"> and create_time between concat(#{date},' 00:00:00') and concat(#{date},' 23:23:59')</if>) yellowMark,
        (select count(*) from com_act_acid_record where travel_card = '是' <if test="date!=null and date!=''"> and create_time between concat(#{date},' 00:00:00') and concat(#{date},' 23:23:59')</if>) travelCount,
        (select count(*) from com_act_acid_record where outside_city = '是' <if test="date!=null and date!=''"> and create_time between concat(#{date},' 00:00:00') and concat(#{date},' 23:23:59')</if>) outsideCount
        select (select count(*) from com_act_acid_record  <if test="date!=null and date!=''"> where create_time between concat(#{date},' 00:00:00') and concat(#{date},' 23:23:59')</if> <if test="localCity!=null and localCity!='' and localCity !='panzhihua'"> and local_city like concat('%',#{localCity},'%')</if>) allCount,
        (select count(*) from com_act_acid_record where danger_area = '是'  <if test="date!=null and date!=''"> and create_time between concat(#{date},' 00:00:00') and concat(#{date},' 23:23:59')</if> <if test="localCity!=null and localCity!='' and localCity !='panzhihua'"> and local_city like concat('%',#{localCity},'%')</if>) dangerCount,
        (select count(*) from com_act_acid_record where color_mark = '绿码' <if test="date!=null and date!=''"> and create_time between concat(#{date},' 00:00:00') and concat(#{date},' 23:23:59')</if> <if test="localCity!=null and localCity!='' and localCity !='panzhihua'"> and local_city like concat('%',#{localCity},'%')</if>) greenMark,
        (select count(*) from com_act_acid_record where color_mark = '红码' <if test="date!=null and date!=''"> and create_time between concat(#{date},' 00:00:00') and concat(#{date},' 23:23:59')</if> <if test="localCity!=null and localCity!='' and localCity !='panzhihua'"> and local_city like concat('%',#{localCity},'%')</if>) redMark,
        (select count(*) from com_act_acid_record where color_mark = '黄码' <if test="date!=null and date!=''"> and create_time between concat(#{date},' 00:00:00') and concat(#{date},' 23:23:59')</if> <if test="localCity!=null and localCity!='' and localCity !='panzhihua'"> and local_city like concat('%',#{localCity},'%')</if>) yellowMark,
        (select count(*) from com_act_acid_record where travel_card = '是' <if test="date!=null and date!=''"> and create_time between concat(#{date},' 00:00:00') and concat(#{date},' 23:23:59')</if> <if test="localCity!=null and localCity!='' and localCity !='panzhihua'"> and local_city like concat('%',#{localCity},'%')</if>) travelCount,
        (select count(*) from com_act_acid_record where outside_city = '是' <if test="date!=null and date!=''"> and create_time between concat(#{date},' 00:00:00') and concat(#{date},' 23:23:59')</if> <if test="localCity!=null and localCity!='' and localCity !='panzhihua'"> and local_city like concat('%',#{localCity},'%')</if>) outsideCount
    </select>

</mapper>