Merge remote-tracking branch 'origin/partyBuilding_lyq' into partyBuilding_lyq

tangxiaobao

2022-03-01 0c13eb833bb1f2c27cb825169aac24e52db7c1f7

Merge remote-tracking branch 'origin/partyBuilding_lyq' into partyBuilding_lyq

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

@@ -2,7 +2,9 @@

import javax.annotation.Resource;

import com.panzhihua.common.model.dtos.common.EvaluateEasyDto;
import com.panzhihua.common.model.vos.community.easyPhoto.BannerVO;
import com.panzhihua.common.service.community.ComActEasyPhotoEvaluateFeign;
import org.springframework.util.ObjectUtils;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
@@ -49,6 +51,8 @@
    private UserService userService;
    @Resource
    private CheckService checkService;
    @Resource
    private ComActEasyPhotoEvaluateFeign easyPhotoEvaluateFeign;

    @ApiOperation(value = "分页展示社区随手拍", response = ComActEasyPhotoVO.class)
    @PostMapping("pageeasyphoto")
@@ -379,4 +383,11 @@
    public R easyPhotoClassifyList() {
        return communityService.listPhotoClassify(this.getAreaCode());
    }

    @ApiOperation(value = "随手拍评价")
    @PostMapping("easyphoto/whistle/evaluate")
    public R evaluateEasyPhotoWhistle(@RequestBody EvaluateEasyDto whistleDto) {
        whistleDto.setUserId(this.getUserId());
        return easyPhotoEvaluateFeign.evaluateEasyApplets(whistleDto);
    }
}

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/constants/Constants.java

@@ -230,4 +230,8 @@
     * 党建包名
     */
    public static final String SERVICE_PARTYBUILDING = "partybuilding";
    /**
     * service_community包
     */
    public static final String SERVICE_COMMUNITY = "community";
}

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/common/AddComActEasyPhotoEvaluateDto.java

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

import java.util.Date;

import com.fasterxml.jackson.annotation.JsonFormat;
import org.springframework.format.annotation.DateTimeFormat;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

/**
 * title: 新增随手拍、微心愿评价表请求参数
 * <p>
 * projectName 成都呐喊信息技术有限公司-智慧社区项目
 * <p>
 * description: 新增随手拍、微心愿评价表请求参数
 *
 * @author lyq
 * @date 2022-03-01 13:44:37
 */
@Data
@ApiModel("新增随手拍、微心愿评价表请求参数")
public class AddComActEasyPhotoEvaluateDto {


    /**
     * 社区id
     */
    @ApiModelProperty(value = "社区id")
    private Long communityId;

    /**
     * 业务记录id
     */
    @ApiModelProperty(value = "业务记录id")
    private Long serviceId;

    /**
     * 用户id
     */
    @ApiModelProperty(value = "用户id")
    private Long userId;

    /**
     * 评分
     */
    @ApiModelProperty(value = "评分")
    private Integer score;

    /**
     * 评价内容
     */
    @ApiModelProperty(value = "评价内容")
    private String content;

    /**
     * 创建时间
     */
    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    @ApiModelProperty(value = "创建时间")
    private Date createAt;

    /**
     * 业务分类（1.随手拍 2.微心愿）
     */
    @ApiModelProperty(value = "业务分类（1.随手拍 2.微心愿）")
    private Integer serviceType;


}


 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/common/AddComActEasyPhotoHandlerDto.java

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

import com.fasterxml.jackson.annotation.JsonFormat;
import org.springframework.format.annotation.DateTimeFormat;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

/**
 * title: 新增随手拍、微心愿处理人绑定表请求参数
 * <p>
 * projectName 成都呐喊信息技术有限公司-智慧社区项目
 * <p>
 * description: 新增随手拍、微心愿处理人绑定表请求参数
 *
 * @author lyq
 * @date 2022-03-01 13:45:12
 */
@Data
@ApiModel("新增随手拍、微心愿处理人绑定表请求参数")
public class AddComActEasyPhotoHandlerDto {


    /**
     * 社区id
     */
    @ApiModelProperty(value = "社区id")
    private Long communityId;

    /**
     * 处理人id
     */
    @ApiModelProperty(value = "处理人id")
    private Long userId;

    /**
     * 业务id
     */
    @ApiModelProperty(value = "业务id")
    private Long serviceId;

    /**
     * 人员类型（1.后台用户 2.党员 3.志愿者 4.社工 5.四长四员）
     */
    @ApiModelProperty(value = "人员类型（1.后台用户 2.党员 3.志愿者 4.社工 5.四长四员）")
    private Integer type;

    /**
     * 业务类型（1.随手拍 2.微心愿）
     */
    @ApiModelProperty(value = "业务类型（1.随手拍 2.微心愿）")
    private Integer serviceType;


}


 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/common/EditComActEasyPhotoEvaluateDto.java

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

import java.util.Date;

import com.fasterxml.jackson.annotation.JsonFormat;
import org.springframework.format.annotation.DateTimeFormat;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

/**
 * title: 编辑随手拍、微心愿评价表请求参数
 * <p>
 * projectName 成都呐喊信息技术有限公司-智慧社区项目
 * <p>
 * description: 编辑随手拍、微心愿评价表请求参数
 *
 * @author lyq
 * @date 2022-03-01 13:44:37
 */
@Data
@ApiModel("编辑随手拍、微心愿评价表请求参数")
public class EditComActEasyPhotoEvaluateDto {

    /**
     * 主键id
     */
    @ApiModelProperty(value = "主键id")
    private Long id;
    /**
     * 社区id
     */
    @ApiModelProperty(value = "社区id")
    private Long communityId;
    /**
     * 业务记录id
     */
    @ApiModelProperty(value = "业务记录id")
    private Long serviceId;
    /**
     * 用户id
     */
    @ApiModelProperty(value = "用户id")
    private Long userId;
    /**
     * 评分
     */
    @ApiModelProperty(value = "评分")
    private Integer score;
    /**
     * 评价内容
     */
    @ApiModelProperty(value = "评价内容")
    private String content;
    /**
     * 创建时间
     */
    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    @ApiModelProperty(value = "创建时间")
    private Date createAt;
    /**
     * 业务分类（1.随手拍 2.微心愿）
     */
    @ApiModelProperty(value = "业务分类（1.随手拍 2.微心愿）")
    private Integer serviceType;

}


 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/common/EditComActEasyPhotoHandlerDto.java

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

import com.fasterxml.jackson.annotation.JsonFormat;
import org.springframework.format.annotation.DateTimeFormat;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

/**
 * title: 编辑随手拍、微心愿处理人绑定表请求参数
 * <p>
 * projectName 成都呐喊信息技术有限公司-智慧社区项目
 * <p>
 * description: 编辑随手拍、微心愿处理人绑定表请求参数
 *
 * @author lyq
 * @date 2022-03-01 13:45:12
 */
@Data
@ApiModel("编辑随手拍、微心愿处理人绑定表请求参数")
public class EditComActEasyPhotoHandlerDto {

    /**
     * 主键id
     */
    @ApiModelProperty(value = "主键id")
    private Long id;
    /**
     * 社区id
     */
    @ApiModelProperty(value = "社区id")
    private Long communityId;
    /**
     * 处理人id
     */
    @ApiModelProperty(value = "处理人id")
    private Long userId;
    /**
     * 业务id
     */
    @ApiModelProperty(value = "业务id")
    private Long serviceId;
    /**
     * 人员类型（1.后台用户 2.党员 3.志愿者 4.社工 5.四长四员）
     */
    @ApiModelProperty(value = "人员类型（1.后台用户 2.党员 3.志愿者 4.社工 5.四长四员）")
    private Integer type;
    /**
     * 业务类型（1.随手拍 2.微心愿）
     */
    @ApiModelProperty(value = "业务类型（1.随手拍 2.微心愿）")
    private Integer serviceType;

}


 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/common/EvaluateEasyDto.java

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

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

/**
 * @author lyq
 * 随手拍、微心愿评价请求参数
 */
@Data
@ApiModel("随手拍、微心愿评价请求参数")
public class EvaluateEasyDto {

    @ApiModelProperty(value = "id")
    private Long  id;

    @ApiModelProperty(value = "用户id",hidden = true)
    private Long userId;

    @ApiModelProperty(value = "评论内容")
    private String content;

    @ApiModelProperty(value = "评分")
    private Integer score;
}

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/common/PageComActEasyPhotoEvaluateDto.java

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

import java.util.Date;

import com.fasterxml.jackson.annotation.JsonFormat;
import org.springframework.format.annotation.DateTimeFormat;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

/**
 * title: 分页查询随手拍、微心愿评价表请求参数
 * <p>
 * projectName 成都呐喊信息技术有限公司-智慧社区项目
 * <p>
 * description: 分页查询随手拍、微心愿评价表请求参数
 *
 * @author lyq
 * @date 2022-03-01 13:44:24
 */
@Data
@ApiModel("分页查询随手拍、微心愿评价表请求参数")
public class PageComActEasyPhotoEvaluateDto {

    /**
     * 主键id
     */
    @ApiModelProperty(value = "主键id")
    private Long id;
    /**
     * 社区id
     */
    @ApiModelProperty(value = "社区id")
    private Long communityId;
    /**
     * 业务记录id
     */
    @ApiModelProperty(value = "业务记录id")
    private Long serviceId;
    /**
     * 用户id
     */
    @ApiModelProperty(value = "用户id")
    private Long userId;
    /**
     * 评分
     */
    @ApiModelProperty(value = "评分")
    private Integer score;
    /**
     * 评价内容
     */
    @ApiModelProperty(value = "评价内容")
    private String content;
    /**
     * 创建时间
     */
    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    @ApiModelProperty(value = "创建时间")
    private Date createAt;
    /**
     * 业务分类（1.随手拍 2.微心愿）
     */
    @ApiModelProperty(value = "业务分类（1.随手拍 2.微心愿）")
    private Integer serviceType;

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

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

    @ApiModelProperty(value = "关键词")
    private String keyWord;

}


 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/common/PageComActEasyPhotoHandlerDto.java

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

import com.fasterxml.jackson.annotation.JsonFormat;
import org.springframework.format.annotation.DateTimeFormat;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

/**
 * title: 分页查询随手拍、微心愿处理人绑定表请求参数
 * <p>
 * projectName 成都呐喊信息技术有限公司-智慧社区项目
 * <p>
 * description: 分页查询随手拍、微心愿处理人绑定表请求参数
 *
 * @author lyq
 * @date 2022-03-01 13:45:11
 */
@Data
@ApiModel("分页查询随手拍、微心愿处理人绑定表请求参数")
public class PageComActEasyPhotoHandlerDto {

    /**
     * 主键id
     */
    @ApiModelProperty(value = "主键id")
    private Long id;
    /**
     * 社区id
     */
    @ApiModelProperty(value = "社区id")
    private Long communityId;
    /**
     * 处理人id
     */
    @ApiModelProperty(value = "处理人id")
    private Long userId;
    /**
     * 业务id
     */
    @ApiModelProperty(value = "业务id")
    private Long serviceId;
    /**
     * 人员类型（1.后台用户 2.党员 3.志愿者 4.社工 5.四长四员）
     */
    @ApiModelProperty(value = "人员类型（1.后台用户 2.党员 3.志愿者 4.社工 5.四长四员）")
    private Integer type;
    /**
     * 业务类型（1.随手拍 2.微心愿）
     */
    @ApiModelProperty(value = "业务类型（1.随手拍 2.微心愿）")
    private Integer serviceType;

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

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

    @ApiModelProperty(value = "关键词")
    private String keyWord;

}


 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/common/ComActEasyPhotoEvaluateVo.java

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

import java.util.Date;

import com.fasterxml.jackson.annotation.JsonFormat;
import org.springframework.format.annotation.DateTimeFormat;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

/**
 * title: 随手拍、微心愿评价表返回参数
 * <p>
 * projectName 成都呐喊信息技术有限公司-智慧社区项目
 * <p>
 * description: 随手拍、微心愿评价表返回参数
 *
 * @author lyq
 * @date 2022-03-01 13:44:37
 */
@Data
@ApiModel("随手拍、微心愿评价表返回参数")
public class ComActEasyPhotoEvaluateVo {

    /**
     * 主键id
     */
    @ApiModelProperty(value = "主键id")
    private Long id;
    /**
     * 社区id
     */
    @ApiModelProperty(value = "社区id")
    private Long communityId;
    /**
     * 业务记录id
     */
    @ApiModelProperty(value = "业务记录id")
    private Long serviceId;
    /**
     * 用户id
     */
    @ApiModelProperty(value = "用户id")
    private Long userId;
    /**
     * 评分
     */
    @ApiModelProperty(value = "评分")
    private Integer score;
    /**
     * 评价内容
     */
    @ApiModelProperty(value = "评价内容")
    private String content;
    /**
     * 创建时间
     */
    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    @ApiModelProperty(value = "创建时间")
    private Date createAt;
    /**
     * 业务分类（1.随手拍 2.微心愿）
     */
    @ApiModelProperty(value = "业务分类（1.随手拍 2.微心愿）")
    private Integer serviceType;

}

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/common/ComActEasyPhotoHandlerVo.java

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

import com.fasterxml.jackson.annotation.JsonFormat;
import org.springframework.format.annotation.DateTimeFormat;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

/**
 * title: 随手拍、微心愿处理人绑定表返回参数
 * <p>
 * projectName 成都呐喊信息技术有限公司-智慧社区项目
 * <p>
 * description: 随手拍、微心愿处理人绑定表返回参数
 *
 * @author lyq
 * @date 2022-03-01 13:45:12
 */
@Data
@ApiModel("随手拍、微心愿处理人绑定表返回参数")
public class ComActEasyPhotoHandlerVo {

    /**
     * 主键id
     */
    @ApiModelProperty(value = "主键id")
    private Long id;
    /**
     * 社区id
     */
    @ApiModelProperty(value = "社区id")
    private Long communityId;
    /**
     * 处理人id
     */
    @ApiModelProperty(value = "处理人id")
    private Long userId;
    /**
     * 业务id
     */
    @ApiModelProperty(value = "业务id")
    private Long serviceId;
    /**
     * 人员类型（1.后台用户 2.党员 3.志愿者 4.社工 5.四长四员）
     */
    @ApiModelProperty(value = "人员类型（1.后台用户 2.党员 3.志愿者 4.社工 5.四长四员）")
    private Integer type;
    /**
     * 业务类型（1.随手拍 2.微心愿）
     */
    @ApiModelProperty(value = "业务类型（1.随手拍 2.微心愿）")
    private Integer serviceType;

}

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

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

    @ApiModelProperty("状态 1待审核  2进行中 3已驳回 4已完成")
    @ApiModelProperty("状态 1待审核  2进行中 3已驳回 4待评价 5.已完成")
    private Integer status;

    @ApiModelProperty("处理人id")
@@ -207,4 +207,8 @@
    @ApiModelProperty(value = "单张图片高度")
    private BigDecimal imgHeight;

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

}

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

New file
@@ -0,0 +1,85 @@
package com.panzhihua.common.service.community;

import com.panzhihua.common.model.dtos.common.*;
import com.panzhihua.common.model.vos.R;
import org.springframework.web.bind.annotation.*;
import com.panzhihua.common.constants.Constants;
import org.springframework.cloud.openfeign.FeignClient;

/**
 * title: 随手拍、微心愿评价表业务层接口
 * <p>
 * projectName 成都呐喊信息技术有限公司-智慧社区项目
 * <p>
 * description: 随手拍、微心愿评价表业务层接口
 *
 * @author lyq
 * @date 2022-03-01 13:44:43
 */
@FeignClient(name = Constants.SERVICE_COMMUNITY, contextId = "comActEasyPhotoEvaluate", path = "comActEasyPhotoEvaluate")
public interface ComActEasyPhotoEvaluateFeign {

    /**
     * description  queryByPage  分页查询
     *
     * @param comActEasyPhotoEvaluate 请求参数
     * @return 分页查询列表数据
     * @author lyq
     * @date 2022-03-01 13:44:43
     */
    @PostMapping("/page")
    R queryByPage(@RequestBody PageComActEasyPhotoEvaluateDto comActEasyPhotoEvaluate);

    /**
     * description  insert  新增数据
     *
     * @param comActEasyPhotoEvaluate 请求参数
     * @return 新增结果
     * @author lyq
     * @date 2022-03-01 13:44:43
     */
    @PostMapping("/add")
    R insert(@RequestBody AddComActEasyPhotoEvaluateDto comActEasyPhotoEvaluate);

    /**
     * description  update  修改数据
     *
     * @param comActEasyPhotoEvaluate 请求参数
     * @return 修改结果
     * @author lyq
     * @date 2022-03-01 13:44:43
     */
    @PutMapping("/edit")
    R update(@RequestBody EditComActEasyPhotoEvaluateDto comActEasyPhotoEvaluate);

    /**
     * description  deleteById  通过主键删除数据
     *
     * @param id 主键id
     * @return 删除结果
     * @author lyq
     * @date 2022-03-01 13:44:43
     */
    @GetMapping("/delete")
    R deleteById(@RequestParam("id") Long id);

    /**
     * description  detailById  查询详情
     *
     * @param id 主键id
     * @return 详情数据
     * @author lyq
     * @date 2022-03-01 13:44:43
     */
    @GetMapping("/detail")
    R detailById(@RequestParam("id") Long id);

    /**
     * 随手拍评价
     * @param whistleDto    请求参数
     * @return  评价结果
     */
    @PostMapping("/easy/evaluate")
    R evaluateEasyApplets(@RequestBody EvaluateEasyDto whistleDto);

}

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

New file
@@ -0,0 +1,77 @@
package com.panzhihua.common.service.community;

import com.panzhihua.common.model.dtos.common.*;
import com.panzhihua.common.model.vos.R;
import org.springframework.web.bind.annotation.*;
import com.panzhihua.common.constants.Constants;
import org.springframework.cloud.openfeign.FeignClient;

/**
 * title: 随手拍、微心愿处理人绑定表业务层接口
 * <p>
 * projectName 成都呐喊信息技术有限公司-智慧社区项目
 * <p>
 * description: 随手拍、微心愿处理人绑定表业务层接口
 *
 * @author lyq
 * @date 2022-03-01 13:45:12
 */
@FeignClient(name = Constants.SERVICE_COMMUNITY, contextId = "comActEasyPhotoHandler", path = "comActEasyPhotoHandler")
public interface ComActEasyPhotoHandlerFeign {

    /**
     * description  queryByPage  分页查询
     *
     * @param comActEasyPhotoHandler 请求参数
     * @return 分页查询列表数据
     * @author lyq
     * @date 2022-03-01 13:45:12
     */
    @PostMapping("/page")
    R queryByPage(@RequestBody PageComActEasyPhotoHandlerDto comActEasyPhotoHandler);

    /**
     * description  insert  新增数据
     *
     * @param comActEasyPhotoHandler 请求参数
     * @return 新增结果
     * @author lyq
     * @date 2022-03-01 13:45:12
     */
    @PostMapping("/add")
    R insert(@RequestBody AddComActEasyPhotoHandlerDto comActEasyPhotoHandler);

    /**
     * description  update  修改数据
     *
     * @param comActEasyPhotoHandler 请求参数
     * @return 修改结果
     * @author lyq
     * @date 2022-03-01 13:45:12
     */
    @PutMapping("/edit")
    R update(@RequestBody EditComActEasyPhotoHandlerDto comActEasyPhotoHandler);

    /**
     * description  deleteById  通过主键删除数据
     *
     * @param id 主键id
     * @return 删除结果
     * @author lyq
     * @date 2022-03-01 13:45:12
     */
    @GetMapping("/delete")
    R deleteById(@RequestParam("id") Long id);

    /**
     * description  detailById  查询详情
     *
     * @param id 主键id
     * @return 详情数据
     * @author lyq
     * @date 2022-03-01 13:45:12
     */
    @GetMapping("/detail")
    R detailById(@RequestParam("id") Long id);

}

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

@@ -1096,7 +1096,7 @@

    @ApiOperation(value = "查询微心愿处理人列表接口")
    @GetMapping("wish/handle/list")
    @ApiImplicitParam(name = "type", value = "处理人类型（1.后台用户  2.党员  3.志愿者）", required = true)
    @ApiImplicitParam(name = "type", value = "处理人类型（1.后台用户  2.党员  3.志愿者 4.社工 5.四长四员）", required = true)
    public R wishHandleListAdmin(@RequestParam("type") Integer type) {
        LoginUserInfoVO loginUserInfo = this.getLoginUserInfo();
        if (loginUserInfo == null) {

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

New file
@@ -0,0 +1,111 @@
package com.panzhihua.service_community.api;

import com.panzhihua.service_community.service.ComActEasyPhotoEvaluateService;
import com.panzhihua.common.model.dtos.common.*;
import com.panzhihua.common.model.vos.R;
import org.springframework.web.bind.annotation.*;

import javax.annotation.Resource;

/**
 * title: 随手拍、微心愿评价表(ComActEasyPhotoEvaluate)  表控制层
 * <p>
 * projectName 成都呐喊信息技术有限公司-智慧社区项目
 * <p>
 * description: 随手拍、微心愿评价表
 *
 * @author lyq
 * @date 2022-03-01 13:44:22
 */
@RestController
@RequestMapping("/comActEasyPhotoEvaluate")
public class ComActEasyPhotoEvaluateController {

    @Resource
    private ComActEasyPhotoEvaluateService comActEasyPhotoEvaluateService;

    /**
     * description  queryByPage  分页查询
     *
     * @param comActEasyPhotoEvaluate 请求参数
     * @return 分页查询返回参数
     * @author lyq
     * @date 2022-03-01 13:44:22
     */
    @PostMapping("/page")
    public R queryByPage(@RequestBody PageComActEasyPhotoEvaluateDto comActEasyPhotoEvaluate) {
        return this.comActEasyPhotoEvaluateService.queryByPage(comActEasyPhotoEvaluate);
    }

    /**
     * description  add  新增数据
     *
     * @param comActEasyPhotoEvaluate 请求参数
     * @return 新增结果
     * @author lyq
     * @date 2022-03-01 13:44:22
     */
    @PostMapping("/add")
    public R add(@RequestBody AddComActEasyPhotoEvaluateDto comActEasyPhotoEvaluate) {
        return this.comActEasyPhotoEvaluateService.insert(comActEasyPhotoEvaluate);
    }

    /**
     * description  edit  编辑数据
     *
     * @param comActEasyPhotoEvaluate 请求参数
     * @return 编辑结果
     * @author lyq
     * @date 2022-03-01 13:44:22
     */
    @PutMapping("/edit")
    public R edit(@RequestBody EditComActEasyPhotoEvaluateDto comActEasyPhotoEvaluate) {
        return this.comActEasyPhotoEvaluateService.update(comActEasyPhotoEvaluate);
    }

    /**
     * description  deleteById  删除数据
     *
     * @param id 主键id
     * @return 删除结果
     * @author lyq
     * @date 2022-03-01 13:44:22
     */
    @GetMapping("/delete")
    public R deleteById(@RequestParam("id") Long id) {
        return this.comActEasyPhotoEvaluateService.deleteById(id);
    }

    /**
     * description  detailById  查询详情
     *
     * @param id 主键id
     * @return 详情数据
     * @author lyq
     * @date 2022-03-01 13:44:22
     */
    @GetMapping("/detail")
    public R detailById(@RequestParam("id") Long id) {
        return this.comActEasyPhotoEvaluateService.detailById(id);
    }

    /**
     * description  queryByPage  查询列表
     *
     * @param comActEasyPhotoEvaluate 请求参数
     * @return 列表数据
     * @author lyq
     * @date 2022-03-01 13:44:22
     */
    @PostMapping("/list")
    public R queryByList(@RequestBody PageComActEasyPhotoEvaluateDto comActEasyPhotoEvaluate) {
        return this.comActEasyPhotoEvaluateService.queryByList(comActEasyPhotoEvaluate);
    }

    @PostMapping("/easy/evaluate")
    public R evaluateEasyApplets(@RequestBody EvaluateEasyDto whistleDto){
        return this.comActEasyPhotoEvaluateService.evaluateEasyApplets(whistleDto);
    }

}


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

New file
@@ -0,0 +1,106 @@
package com.panzhihua.service_community.api;

import com.panzhihua.service_community.service.ComActEasyPhotoHandlerService;
import com.panzhihua.common.model.dtos.common.*;
import com.panzhihua.common.model.vos.R;
import org.springframework.web.bind.annotation.*;

import javax.annotation.Resource;

/**
 * title: 随手拍、微心愿处理人绑定表(ComActEasyPhotoHandler)  表控制层
 * <p>
 * projectName 成都呐喊信息技术有限公司-智慧社区项目
 * <p>
 * description: 随手拍、微心愿处理人绑定表
 *
 * @author lyq
 * @date 2022-03-01 13:45:10
 */
@RestController
@RequestMapping("/comActEasyPhotoHandler")
public class ComActEasyPhotoHandlerController {

    @Resource
    private ComActEasyPhotoHandlerService comActEasyPhotoHandlerService;

    /**
     * description  queryByPage  分页查询
     *
     * @param comActEasyPhotoHandler 请求参数
     * @return 分页查询返回参数
     * @author lyq
     * @date 2022-03-01 13:45:10
     */
    @PostMapping("/page")
    public R queryByPage(@RequestBody PageComActEasyPhotoHandlerDto comActEasyPhotoHandler) {
        return this.comActEasyPhotoHandlerService.queryByPage(comActEasyPhotoHandler);
    }

    /**
     * description  add  新增数据
     *
     * @param comActEasyPhotoHandler 请求参数
     * @return 新增结果
     * @author lyq
     * @date 2022-03-01 13:45:10
     */
    @PostMapping("/add")
    public R add(@RequestBody AddComActEasyPhotoHandlerDto comActEasyPhotoHandler) {
        return this.comActEasyPhotoHandlerService.insert(comActEasyPhotoHandler);
    }

    /**
     * description  edit  编辑数据
     *
     * @param comActEasyPhotoHandler 请求参数
     * @return 编辑结果
     * @author lyq
     * @date 2022-03-01 13:45:10
     */
    @PutMapping("/edit")
    public R edit(@RequestBody EditComActEasyPhotoHandlerDto comActEasyPhotoHandler) {
        return this.comActEasyPhotoHandlerService.update(comActEasyPhotoHandler);
    }

    /**
     * description  deleteById  删除数据
     *
     * @param id 主键id
     * @return 删除结果
     * @author lyq
     * @date 2022-03-01 13:45:10
     */
    @GetMapping("/delete")
    public R deleteById(@RequestParam("id") Long id) {
        return this.comActEasyPhotoHandlerService.deleteById(id);
    }

    /**
     * description  detailById  查询详情
     *
     * @param id 主键id
     * @return 详情数据
     * @author lyq
     * @date 2022-03-01 13:45:10
     */
    @GetMapping("/detail")
    public R detailById(@RequestParam("id") Long id) {
        return this.comActEasyPhotoHandlerService.detailById(id);
    }

    /**
     * description  queryByPage  查询列表
     *
     * @param comActEasyPhotoHandler 请求参数
     * @return 列表数据
     * @author lyq
     * @date 2022-03-01 13:45:10
     */
    @PostMapping("/list")
    public R queryByList(@RequestBody PageComActEasyPhotoHandlerDto comActEasyPhotoHandler) {
        return this.comActEasyPhotoHandlerService.queryByList(comActEasyPhotoHandler);
    }

}


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

New file
@@ -0,0 +1,58 @@
package com.panzhihua.service_community.dao;

import com.panzhihua.service_community.entity.ComActEasyPhotoEvaluate;
import com.panzhihua.common.model.dtos.common.*;
import com.panzhihua.common.model.vos.common.*;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import org.apache.ibatis.annotations.Param;
import org.apache.ibatis.annotations.Mapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;

import java.util.List;

/**
 * title: 随手拍、微心愿评价表表数据库访问层
 * <p>
 * projectName 成都呐喊信息技术有限公司-智慧社区项目
 * <p>
 * description: 随手拍、微心愿评价表表数据库访问层
 *
 * @author lyq
 * @date 2022-03-01 13:44:22
 */
@Mapper
public interface ComActEasyPhotoEvaluateMapper extends BaseMapper<ComActEasyPhotoEvaluate> {

    /**
     * description  detailById  查询详情
     *
     * @param id 主键id
     * @return 详情数据
     * @author lyq
     * @date 2022-03-01 13:44:22
     */
    ComActEasyPhotoEvaluateVo queryById(Long id);

    /**
     * description  queryAllByLimit  分页查询
     *
     * @param comActEasyPhotoEvaluate 请求参数
     * @param page                    分页参数
     * @return 分页查询列表数据
     * @author lyq
     * @date 2022-03-01 13:44:22
     */
    IPage<ComActEasyPhotoEvaluateVo> queryAllByLimit(@Param("dto") PageComActEasyPhotoEvaluateDto comActEasyPhotoEvaluate, Page page);

    /**
     * description  queryByPage  查询列表
     *
     * @param comActEasyPhotoEvaluate 请求参数
     * @return 列表数据
     * @author lyq
     * @date 2022-03-01 13:44:22
     */
    List<ComActEasyPhotoEvaluateVo> queryAllByList(@Param("dto") PageComActEasyPhotoEvaluateDto comActEasyPhotoEvaluate);
}


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

New file
@@ -0,0 +1,58 @@
package com.panzhihua.service_community.dao;

import com.panzhihua.service_community.entity.ComActEasyPhotoHandler;
import com.panzhihua.common.model.dtos.common.*;
import com.panzhihua.common.model.vos.common.*;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import org.apache.ibatis.annotations.Param;
import org.apache.ibatis.annotations.Mapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;

import java.util.List;

/**
 * title: 随手拍、微心愿处理人绑定表表数据库访问层
 * <p>
 * projectName 成都呐喊信息技术有限公司-智慧社区项目
 * <p>
 * description: 随手拍、微心愿处理人绑定表表数据库访问层
 *
 * @author lyq
 * @date 2022-03-01 13:45:11
 */
@Mapper
public interface ComActEasyPhotoHandlerMapper extends BaseMapper<ComActEasyPhotoHandler> {

    /**
     * description  detailById  查询详情
     *
     * @param id 主键id
     * @return 详情数据
     * @author lyq
     * @date 2022-03-01 13:45:11
     */
    ComActEasyPhotoHandlerVo queryById(Long id);

    /**
     * description  queryAllByLimit  分页查询
     *
     * @param comActEasyPhotoHandler 请求参数
     * @param page                   分页参数
     * @return 分页查询列表数据
     * @author lyq
     * @date 2022-03-01 13:45:11
     */
    IPage<ComActEasyPhotoHandlerVo> queryAllByLimit(@Param("dto") PageComActEasyPhotoHandlerDto comActEasyPhotoHandler, Page page);

    /**
     * description  queryByPage  查询列表
     *
     * @param comActEasyPhotoHandler 请求参数
     * @return 列表数据
     * @author lyq
     * @date 2022-03-01 13:45:11
     */
    List<ComActEasyPhotoHandlerVo> queryAllByList(@Param("dto") PageComActEasyPhotoHandlerDto comActEasyPhotoHandler);
}


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

New file
@@ -0,0 +1,59 @@
package com.panzhihua.service_community.entity;

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

import lombok.Data;

/**
 * 随手拍、微心愿评价表(ComActEasyPhotoEvaluate)实体类
 *
 * @author lyq
 * @since 2022-03-01 13:44:23
 */
@Data
public class ComActEasyPhotoEvaluate implements Serializable {
    private static final long serialVersionUID = -10187231854376444L;
    /**
     * 主键id
     */
    private Long id;
    /**
     * 社区id
     */
    private Long communityId;
    /**
     * 业务记录id
     */
    private Long serviceId;
    /**
     * 用户id
     */
    private Long userId;
    /**
     * 评分
     */
    private Integer score;
    /**
     * 评价内容
     */
    private String content;
    /**
     * 创建时间
     */
    private Date createAt;
    /**
     * 业务分类（1.随手拍 2.微心愿）
     */
    private Integer serviceType;

    /**
     * 业务分类（1.随手拍 2.微心愿）
     */
    public interface ServiceType{
        int SSP = 1;
        int WXY = 2;
    }

}


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

New file
@@ -0,0 +1,43 @@
package com.panzhihua.service_community.entity;

import java.io.Serializable;

import lombok.Data;

/**
 * 随手拍、微心愿处理人绑定表(ComActEasyPhotoHandler)实体类
 *
 * @author lyq
 * @since 2022-03-01 13:45:11
 */
@Data
public class ComActEasyPhotoHandler implements Serializable {
    private static final long serialVersionUID = -15137895736835383L;
    /**
     * 主键id
     */
    private Long id;
    /**
     * 社区id
     */
    private Long communityId;
    /**
     * 处理人id
     */
    private Long userId;
    /**
     * 业务id
     */
    private Long serviceId;
    /**
     * 人员类型（1.后台用户 2.党员 3.志愿者 4.社工 5.四长四员）
     */
    private Integer type;
    /**
     * 业务类型（1.随手拍 2.微心愿）
     */
    private Integer serviceType;


}


 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComActEasyPhotoDO.java

@@ -36,7 +36,7 @@
    private String happenAddr;

    /**
     * 状态 1待审核 2进行中 3已驳回 4已完成
     * 状态 1待审核 2进行中 3已驳回 4待评价 5.已完成
     */
    private Integer status;

@@ -180,6 +180,10 @@
     * 单张图片高度
     */
    private BigDecimal imgHeight;
    /**
     * 评价时间
     */
    private Date evaluateDate;

    /**
     * 参加活动标签（1.优质 2.精良 3.普通 4.一般）
@@ -193,12 +197,13 @@
    }

    /**
     * 状态 1待审核 2进行中 3已驳回 4已完成
     * 状态 1待审核 2进行中 3已驳回 4待评价 5.已完成
     */
    public interface status {
        int dsh = 1;
        int dfk = 2;
        int ybh = 3;
        int ywc = 4;
        int dpj = 4;
        int ywc = 5;
    }
}

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComActMicroWishOperationRecordDO.java

@@ -74,7 +74,7 @@
                '}';
    }
    /**
     *操作类型 1已提交 2审核通过 3 驳回 4完成集心 5 分配 6 完成 7反馈 8系统自动确认
     *操作类型 1已提交 2审核通过 3 驳回 4完成集心 5 分配 6 完成 7反馈 8系统自动确认 9评价
     */
    public interface type{
        int ytj=1;
@@ -85,5 +85,6 @@
        int wc=6;
        int fk=7;
        int zd=8;
        int pj = 9;
    }
}

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

New file
@@ -0,0 +1,94 @@
package com.panzhihua.service_community.service;

import com.panzhihua.common.model.dtos.common.*;
import com.panzhihua.common.model.vos.R;
import org.springframework.web.bind.annotation.RequestBody;

import java.util.Date;

/**
 * title: 随手拍、微心愿评价表表服务接口
 * <p>
 * projectName 成都呐喊信息技术有限公司-智慧社区项目
 * <p>
 * description: 随手拍、微心愿评价表表服务接口
 *
 * @author lyq
 * @date 2022-03-01 13:44:24
 */
public interface ComActEasyPhotoEvaluateService {

    /**
     * description  queryByPage  分页查询
     *
     * @param comActEasyPhotoEvaluate 请求参数
     * @return 分页查询列表数据
     * @author lyq
     * @date 2022-03-01 13:44:24
     */
    R queryByPage(PageComActEasyPhotoEvaluateDto comActEasyPhotoEvaluate);

    /**
     * description  insert  新增数据
     *
     * @param comActEasyPhotoEvaluate 请求参数
     * @return 新增结果
     * @author lyq
     * @date 2022-03-01 13:44:24
     */
    R insert(AddComActEasyPhotoEvaluateDto comActEasyPhotoEvaluate);

    /**
     * description  update  修改数据
     *
     * @param comActEasyPhotoEvaluate 请求参数
     * @return 修改结果
     * @author lyq
     * @date 2022-03-01 13:44:24
     */
    R update(EditComActEasyPhotoEvaluateDto comActEasyPhotoEvaluate);

    /**
     * description  deleteById  通过主键删除数据
     *
     * @param id 主键id
     * @return 删除结果
     * @author lyq
     * @date 2022-03-01 13:44:24
     */
    R deleteById(Long id);

    /**
     * description  detailById  查询详情
     *
     * @param id 主键id
     * @return 详情数据
     * @author lyq
     * @date 2022-03-01 13:44:24
     */
    R detailById(Long id);

    /**
     * description  queryByPage  查询列表
     *
     * @param comActEasyPhotoEvaluate 请求参数
     * @return 列表数据
     * @author lyq
     * @date 2022-03-01 13:44:24
     */
    R queryByList(PageComActEasyPhotoEvaluateDto comActEasyPhotoEvaluate);

    R evaluateEasyApplets(EvaluateEasyDto whistleDto);

    /**
     * 添加随手拍、微心愿评价记录
     * @param communityId   社区id
     * @param userId    用户id
     * @param serviceId 业务记录id
     * @param score     评价分数
     * @param content   评价内容
     * @param nowDate   评价时间
     * @param serviceType   业务类型（1.随手拍 2.微心愿）
     */
    void addEasyPhotoEvaluateRecord(Long communityId, Long userId, Long serviceId, Integer score, String content, Date nowDate,Integer serviceType);
}

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

New file
@@ -0,0 +1,78 @@
package com.panzhihua.service_community.service;

import com.panzhihua.common.model.dtos.common.*;
import com.panzhihua.common.model.vos.R;

/**
 * title: 随手拍、微心愿处理人绑定表表服务接口
 * <p>
 * projectName 成都呐喊信息技术有限公司-智慧社区项目
 * <p>
 * description: 随手拍、微心愿处理人绑定表表服务接口
 *
 * @author lyq
 * @date 2022-03-01 13:45:11
 */
public interface ComActEasyPhotoHandlerService {

    /**
     * description  queryByPage  分页查询
     *
     * @param comActEasyPhotoHandler 请求参数
     * @return 分页查询列表数据
     * @author lyq
     * @date 2022-03-01 13:45:11
     */
    R queryByPage(PageComActEasyPhotoHandlerDto comActEasyPhotoHandler);

    /**
     * description  insert  新增数据
     *
     * @param comActEasyPhotoHandler 请求参数
     * @return 新增结果
     * @author lyq
     * @date 2022-03-01 13:45:11
     */
    R insert(AddComActEasyPhotoHandlerDto comActEasyPhotoHandler);

    /**
     * description  update  修改数据
     *
     * @param comActEasyPhotoHandler 请求参数
     * @return 修改结果
     * @author lyq
     * @date 2022-03-01 13:45:11
     */
    R update(EditComActEasyPhotoHandlerDto comActEasyPhotoHandler);

    /**
     * description  deleteById  通过主键删除数据
     *
     * @param id 主键id
     * @return 删除结果
     * @author lyq
     * @date 2022-03-01 13:45:11
     */
    R deleteById(Long id);

    /**
     * description  detailById  查询详情
     *
     * @param id 主键id
     * @return 详情数据
     * @author lyq
     * @date 2022-03-01 13:45:11
     */
    R detailById(Long id);

    /**
     * description  queryByPage  查询列表
     *
     * @param comActEasyPhotoHandler 请求参数
     * @return 列表数据
     * @author lyq
     * @date 2022-03-01 13:45:11
     */
    R queryByList(PageComActEasyPhotoHandlerDto comActEasyPhotoHandler);

}

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

New file
@@ -0,0 +1,180 @@
package com.panzhihua.service_community.service.impl;

import com.panzhihua.service_community.dao.ComActEasyPhotoDAO;
import com.panzhihua.service_community.dao.ComActMicroWishDAO;
import com.panzhihua.service_community.entity.ComActEasyPhotoEvaluate;
import com.panzhihua.service_community.dao.ComActEasyPhotoEvaluateMapper;
import com.panzhihua.service_community.model.dos.ComActEasyPhotoDO;
import com.panzhihua.service_community.model.dos.ComActMicroWishDO;
import com.panzhihua.service_community.service.ComActEasyPhotoEvaluateService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.panzhihua.service_community.service.ComActMicroWishOperationRecordService;
import com.panzhihua.service_community.service.ComActMicroWishService;
import org.springframework.beans.BeanUtils;
import com.panzhihua.common.model.dtos.common.*;
import com.panzhihua.common.model.vos.R;
import org.springframework.stereotype.Service;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import org.springframework.transaction.annotation.Transactional;

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

/**
 * title: 随手拍、微心愿评价表表服务实现类
 * <p>
 * projectName 成都呐喊信息技术有限公司-智慧社区项目
 * <p>
 * description: 随手拍、微心愿评价表表服务实现类
 *
 * @author lyq
 * @date 2022-03-01 13:44:24
 */
@Service("comActEasyPhotoEvaluateService")
public class ComActEasyPhotoEvaluateServiceImpl extends ServiceImpl<ComActEasyPhotoEvaluateMapper, ComActEasyPhotoEvaluate> implements ComActEasyPhotoEvaluateService {

    @Resource
    private ComActEasyPhotoDAO easyPhotoDAO;
    @Resource
    private ComActMicroWishDAO microWishDAO;
    @Resource
    private ComActMicroWishOperationRecordService microWishOperationRecordService;

    /**
     * description  queryByPage  分页查询
     *
     * @param comActEasyPhotoEvaluate 请求参数
     * @return 分页查询列表数据
     * @author lyq
     * @date 2022-03-01 13:44:24
     */
    @Override
    public R queryByPage(PageComActEasyPhotoEvaluateDto comActEasyPhotoEvaluate) {
        return R.ok(this.baseMapper.queryAllByLimit(comActEasyPhotoEvaluate, new Page(comActEasyPhotoEvaluate.getPageNum(), comActEasyPhotoEvaluate.getPageSize())));
    }

    /**
     * description  insert  新增数据
     *
     * @param comActEasyPhotoEvaluate 请求参数
     * @return 新增结果
     * @author lyq
     * @date 2022-03-01 13:44:24
     */
    @Override
    public R insert(AddComActEasyPhotoEvaluateDto comActEasyPhotoEvaluate) {
        ComActEasyPhotoEvaluate entity = new ComActEasyPhotoEvaluate();
        BeanUtils.copyProperties(comActEasyPhotoEvaluate, entity);
        if (this.baseMapper.insert(entity) > 0) {
            return R.ok();
        }
        return R.fail("添加失败");
    }

    /**
     * description  update  修改数据
     *
     * @param editDto 请求参数
     * @return 修改结果
     * @author lyq
     * @date 2022-03-01 13:44:24
     */
    @Override
    public R update(EditComActEasyPhotoEvaluateDto editDto) {
        ComActEasyPhotoEvaluate entity = this.baseMapper.selectById(editDto.getId());
        if (entity == null) {
            return R.fail("未查询到该记录");
        }
        BeanUtils.copyProperties(editDto, entity);
        if (this.baseMapper.updateById(entity) > 0) {
            return R.ok();
        }
        return R.fail("修改失败");
    }

    /**
     * description  deleteById  通过主键删除数据
     *
     * @param id 主键id
     * @return 删除结果
     * @author lyq
     * @date 2022-03-01 13:44:24
     */
    @Override
    public R deleteById(Long id) {
        if (this.baseMapper.deleteById(id) > 0) {
            return R.ok();
        }
        return R.fail("删除失败");
    }

    /**
     * description  detailById  查询详情
     *
     * @param id 主键id
     * @return 详情数据
     * @author lyq
     * @date 2022-03-01 13:44:24
     */
    @Override
    public R detailById(Long id) {
        return R.ok(this.baseMapper.queryById(id));
    }

    /**
     * description  queryByPage  查询列表
     *
     * @param comActEasyPhotoEvaluate 请求参数
     * @return 列表数据
     * @author lyq
     * @date 2022-03-01 13:44:24
     */
    @Override
    public R queryByList(PageComActEasyPhotoEvaluateDto comActEasyPhotoEvaluate) {
        return R.ok(this.baseMapper.queryAllByList(comActEasyPhotoEvaluate));
    }

    @Override
    @Transactional(rollbackFor = Exception.class)
    public R evaluateEasyApplets(EvaluateEasyDto whistleDto) {
        ComActEasyPhotoDO easyPhotoDO = easyPhotoDAO.selectById(whistleDto.getId());
        if(easyPhotoDO == null){
            return R.fail("未查询到该记录");
        }
        if(!easyPhotoDO.getStatus().equals(ComActEasyPhotoDO.status.dpj)){
            return R.fail("当前状态不可进行评价");
        }
        Date nowDate = new Date();
        //新增评价记录
        this.addEasyPhotoEvaluateRecord(easyPhotoDO.getCommunityId(),whistleDto.getUserId(),easyPhotoDO.getId(),whistleDto.getScore()
                ,whistleDto.getContent(),nowDate,ComActEasyPhotoEvaluate.ServiceType.SSP);
        //更新随手拍状态
        easyPhotoDO.setStatus(ComActEasyPhotoDO.status.ywc);
        easyPhotoDO.setEvaluateDate(nowDate);
        easyPhotoDAO.updateById(easyPhotoDO);
        return R.ok();
    }

    /**
     * 添加随手拍、微心愿评价记录
     * @param communityId   社区id
     * @param userId    用户id
     * @param serviceId 业务记录id
     * @param score     评价分数
     * @param content   评价内容
     * @param nowDate   评价时间
     * @param serviceType   业务类型（1.随手拍 2.微心愿）
     */
    @Override
    public void addEasyPhotoEvaluateRecord(Long communityId, Long userId, Long serviceId, Integer score, String content, Date nowDate, Integer serviceType) {
        ComActEasyPhotoEvaluate easyPhotoEvaluate = new ComActEasyPhotoEvaluate();
        easyPhotoEvaluate.setCommunityId(communityId);
        easyPhotoEvaluate.setUserId(userId);
        easyPhotoEvaluate.setServiceId(serviceId);
        easyPhotoEvaluate.setScore(score);
        easyPhotoEvaluate.setContent(content);
        easyPhotoEvaluate.setCreateAt(nowDate);
        easyPhotoEvaluate.setServiceType(serviceType);
        this.baseMapper.insert(easyPhotoEvaluate);
    }
}

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

New file
@@ -0,0 +1,119 @@
package com.panzhihua.service_community.service.impl;

import com.panzhihua.service_community.entity.ComActEasyPhotoHandler;
import com.panzhihua.service_community.dao.ComActEasyPhotoHandlerMapper;
import com.panzhihua.service_community.service.ComActEasyPhotoHandlerService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.springframework.beans.BeanUtils;
import com.panzhihua.common.model.dtos.common.*;
import com.panzhihua.common.model.vos.R;
import org.springframework.stereotype.Service;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;

/**
 * title: 随手拍、微心愿处理人绑定表表服务实现类
 * <p>
 * projectName 成都呐喊信息技术有限公司-智慧社区项目
 * <p>
 * description: 随手拍、微心愿处理人绑定表表服务实现类
 *
 * @author lyq
 * @date 2022-03-01 13:45:11
 */
@Service("comActEasyPhotoHandlerService")
public class ComActEasyPhotoHandlerServiceImpl extends ServiceImpl<ComActEasyPhotoHandlerMapper, ComActEasyPhotoHandler> implements ComActEasyPhotoHandlerService {

    /**
     * description  queryByPage  分页查询
     *
     * @param comActEasyPhotoHandler 请求参数
     * @return 分页查询列表数据
     * @author lyq
     * @date 2022-03-01 13:45:11
     */
    @Override
    public R queryByPage(PageComActEasyPhotoHandlerDto comActEasyPhotoHandler) {
        return R.ok(this.baseMapper.queryAllByLimit(comActEasyPhotoHandler, new Page(comActEasyPhotoHandler.getPageNum(), comActEasyPhotoHandler.getPageSize())));
    }

    /**
     * description  insert  新增数据
     *
     * @param comActEasyPhotoHandler 请求参数
     * @return 新增结果
     * @author lyq
     * @date 2022-03-01 13:45:11
     */
    @Override
    public R insert(AddComActEasyPhotoHandlerDto comActEasyPhotoHandler) {
        ComActEasyPhotoHandler entity = new ComActEasyPhotoHandler();
        BeanUtils.copyProperties(comActEasyPhotoHandler, entity);
        if (this.baseMapper.insert(entity) > 0) {
            return R.ok();
        }
        return R.fail("添加失败");
    }

    /**
     * description  update  修改数据
     *
     * @param editDto 请求参数
     * @return 修改结果
     * @author lyq
     * @date 2022-03-01 13:45:11
     */
    @Override
    public R update(EditComActEasyPhotoHandlerDto editDto) {
        ComActEasyPhotoHandler entity = this.baseMapper.selectById(editDto.getId());
        if (entity == null) {
            return R.fail("未查询到该记录");
        }
        BeanUtils.copyProperties(editDto, entity);
        if (this.baseMapper.updateById(entity) > 0) {
            return R.ok();
        }
        return R.fail("修改失败");
    }

    /**
     * description  deleteById  通过主键删除数据
     *
     * @param id 主键id
     * @return 删除结果
     * @author lyq
     * @date 2022-03-01 13:45:11
     */
    @Override
    public R deleteById(Long id) {
        if (this.baseMapper.deleteById(id) > 0) {
            return R.ok();
        }
        return R.fail("删除失败");
    }

    /**
     * description  detailById  查询详情
     *
     * @param id 主键id
     * @return 详情数据
     * @author lyq
     * @date 2022-03-01 13:45:11
     */
    @Override
    public R detailById(Long id) {
        return R.ok(this.baseMapper.queryById(id));
    }

    /**
     * description  queryByPage  查询列表
     *
     * @param comActEasyPhotoHandler 请求参数
     * @return 列表数据
     * @author lyq
     * @date 2022-03-01 13:45:11
     */
    @Override
    public R queryByList(PageComActEasyPhotoHandlerDto comActEasyPhotoHandler) {
        return R.ok(this.baseMapper.queryAllByList(comActEasyPhotoHandler));
    }
}

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

New file
@@ -0,0 +1,93 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.panzhihua.service_community.dao.ComActEasyPhotoEvaluateMapper">

    <resultMap type="com.panzhihua.service_community.entity.ComActEasyPhotoEvaluate" id="ComActEasyPhotoEvaluateMap">
        <result property="id" column="id" jdbcType="INTEGER"/>
        <result property="communityId" column="community_id" jdbcType="INTEGER"/>
        <result property="serviceId" column="service_id" jdbcType="INTEGER"/>
        <result property="userId" column="user_id" jdbcType="INTEGER"/>
        <result property="score" column="score" jdbcType="INTEGER"/>
        <result property="content" column="content" jdbcType="VARCHAR"/>
        <result property="createAt" column="create_at" jdbcType="TIMESTAMP"/>
        <result property="serviceType" column="service_type" jdbcType="INTEGER"/>
    </resultMap>

    <!--查询单个-->
    <select id="queryById" resultMap="ComActEasyPhotoEvaluateMap">
        select
          id, community_id, service_id, user_id, score, content, create_at, service_type
        from com_act_easy_photo_evaluate
        where id = #{id}
    </select>

    <!--查询指定行数据-->
    <select id="queryAllByLimit" resultMap="ComActEasyPhotoEvaluateMap">
        select
        id, community_id, service_id, user_id, score, content, create_at, service_type
        from com_act_easy_photo_evaluate
        <where>
            <if test="dto.id != null">
                and id = #{dto.id}
            </if>
            <if test="dto.communityId != null">
                and community_id = #{dto.communityId}
            </if>
            <if test="dto.serviceId != null">
                and service_id = #{dto.serviceId}
            </if>
            <if test="dto.userId != null">
                and user_id = #{dto.userId}
            </if>
            <if test="dto.score != null">
                and score = #{dto.score}
            </if>
            <if test="dto.content != null and dto.content != ''">
                and content = #{dto.content}
            </if>
            <if test="dto.createAt != null">
                and create_at = #{dto.createAt}
            </if>
            <if test="dto.serviceType != null">
                and service_type = #{dto.serviceType}
            </if>
        </where>
        order by create_at desc
    </select>

    <!--查询所有数据-->
    <select id="queryAllByList" resultMap="ComActEasyPhotoEvaluateMap">
        select
        id, community_id, service_id, user_id, score, content, create_at, service_type
        from com_act_easy_photo_evaluate
        <where>
            <if test="dto.id != null">
                and id = #{dto.id}
            </if>
            <if test="dto.communityId != null">
                and community_id = #{dto.communityId}
            </if>
            <if test="dto.serviceId != null">
                and service_id = #{dto.serviceId}
            </if>
            <if test="dto.userId != null">
                and user_id = #{dto.userId}
            </if>
            <if test="dto.score != null">
                and score = #{dto.score}
            </if>
            <if test="dto.content != null and dto.content != ''">
                and content = #{dto.content}
            </if>
            <if test="dto.createAt != null">
                and create_at = #{dto.createAt}
            </if>
            <if test="dto.serviceType != null">
                and service_type = #{dto.serviceType}
            </if>
        </where>
        order by create_at desc
    </select>

</mapper>


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

New file
@@ -0,0 +1,79 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.panzhihua.service_community.dao.ComActEasyPhotoHandlerMapper">

    <resultMap type="com.panzhihua.service_community.entity.ComActEasyPhotoHandler" id="ComActEasyPhotoHandlerMap">
        <result property="id" column="id" jdbcType="INTEGER"/>
        <result property="communityId" column="community_id" jdbcType="INTEGER"/>
        <result property="userId" column="user_id" jdbcType="INTEGER"/>
        <result property="serviceId" column="service_id" jdbcType="INTEGER"/>
        <result property="type" column="type" jdbcType="INTEGER"/>
        <result property="serviceType" column="service_type" jdbcType="INTEGER"/>
    </resultMap>

    <!--查询单个-->
    <select id="queryById" resultMap="ComActEasyPhotoHandlerMap">
        select
          id, community_id, user_id, service_id, type, service_type
        from com_act_easy_photo_handler
        where id = #{id}
    </select>

    <!--查询指定行数据-->
    <select id="queryAllByLimit" resultMap="ComActEasyPhotoHandlerMap">
        select
        id, community_id, user_id, service_id, type, service_type
        from com_act_easy_photo_handler
        <where>
            <if test="dto.id != null">
                and id = #{dto.id}
            </if>
            <if test="dto.communityId != null">
                and community_id = #{dto.communityId}
            </if>
            <if test="dto.userId != null">
                and user_id = #{dto.userId}
            </if>
            <if test="dto.serviceId != null">
                and service_id = #{dto.serviceId}
            </if>
            <if test="dto.type != null">
                and type = #{dto.type}
            </if>
            <if test="dto.serviceType != null">
                and service_type = #{dto.serviceType}
            </if>
        </where>
        order by create_at desc
    </select>

    <!--查询所有数据-->
    <select id="queryAllByList" resultMap="ComActEasyPhotoHandlerMap">
        select
        id, community_id, user_id, service_id, type, service_type
        from com_act_easy_photo_handler
        <where>
            <if test="dto.id != null">
                and id = #{dto.id}
            </if>
            <if test="dto.communityId != null">
                and community_id = #{dto.communityId}
            </if>
            <if test="dto.userId != null">
                and user_id = #{dto.userId}
            </if>
            <if test="dto.serviceId != null">
                and service_id = #{dto.serviceId}
            </if>
            <if test="dto.type != null">
                and type = #{dto.type}
            </if>
            <if test="dto.serviceType != null">
                and service_type = #{dto.serviceType}
            </if>
        </where>
        order by create_at desc
    </select>

</mapper>


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

@@ -102,6 +102,9 @@
        <if test="type != null and type == 3">
            select user_id,IFNULL(`name`,nick_name) as `name` from sys_user where `type` = 1 and community_id = ${communityId} and status = 1 and is_volunteer = 1
        </if>
        <if test="type != null and type == 5">
            select user_id,IFNULL(`name`,nick_name) as `name` from sys_user where user_id in (select user_id from com_act_four_member where community_id = ${communityId})
        </if>
    </select>

    <select id="getUserByUserId" resultType="com.panzhihua.common.model.vos.user.SysUserVO">

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

@@ -193,7 +193,7 @@
            IFNULL(( SELECT integral_available_volunteer FROM com_act_integral_user WHERE user_id = #{userId} AND community_id = #{communityId} ), 0 ) AS volunteerActivityIntegral,
            ( SELECT count( caas.id ) FROM com_act_act_sign AS caas
            LEFT JOIN com_act_activity AS caa ON caa.id = caas.activity_id
            WHERE caas.user_id = #{userId} and caas.status = 1 and caa.community_id = #{communityId}
            WHERE caas.user_id = #{userId} and caas.status = 1 and caa.type = 1 and caa.community_id = #{communityId}
            ) AS volunteerActivityCount,
            IFNULL((
                SELECT
@@ -202,7 +202,7 @@
                    com_act_act_sign AS caas
                    LEFT JOIN com_act_activity AS caa ON caa.id = caas.activity_id
                WHERE
                    caas.user_id = #{userId} and caas.status = 1 and caa.community_id = #{communityId}
                    caas.user_id = #{userId} and caas.status = 1 and caa.type = 1 and caa.community_id = #{communityId}
                    ),
                0
            ) AS volunteerActivityDuration,
@@ -298,7 +298,7 @@

    <select id="getOrgDataStatisticsLeftDown" resultType="com.panzhihua.common.model.vos.partybuilding.ComDataStatisticsOrgVo">
        SELECT
            count( id ) AS participateVolunteerActivityNum,
            count( caas1.id ) AS participateVolunteerActivityNum,
            (
            SELECT
                IFNULL( sum( caa.duration ), 0 )
@@ -307,7 +307,7 @@
                LEFT JOIN com_act_activity AS caa ON caa.id = caas.activity_id
            WHERE
                caas.`status` = 1
                AND caas.is_volunteer = 1
                AND caas.is_volunteer = 1 and caa.type = 1
                AND caas.user_id IN ( SELECT user_id FROM com_pb_member WHERE audit_result = 1 AND community_id = #{communityId} AND user_id IS NOT NULL
        <if test="orgIds != null and orgIds.size > 0">
            AND org_id in
@@ -338,19 +338,20 @@
        </if>
            ) AS participatePartyActivityNum
        FROM
            com_act_act_sign
            com_act_act_sign as caas1
            left join com_act_activity as caa1 on caa1.id = caas1.activity_id
        WHERE
            `status` = 1
            AND is_volunteer = 1
            AND user_id IN ( SELECT user_id FROM com_pb_member WHERE audit_result = 1 AND community_id = #{communityId} AND user_id IS NOT NULL
        caas1.`status` = 1 and caa1.type = 1
            AND caas1.is_volunteer = 1
            AND caas1.user_id IN ( SELECT user_id FROM com_pb_member WHERE audit_result = 1 AND community_id = #{communityId} AND user_id IS NOT NULL
        <if test="orgIds != null and orgIds.size > 0">
            AND org_id in
            AND caas1.org_id in
            <foreach collection="orgIds" item="item" open="(" separator="," close=")">
                #{item}
            </foreach>
        </if>
            )
            AND create_at BETWEEN #{startTime}
            AND caas1.create_at BETWEEN #{startTime}
            AND #{endTime}
    </select>