随手拍 微心愿改版提交

101captain

2022-03-15 753e4c0b40c52ca8f6804fa0411d0a14cf8fdac6

随手拍 微心愿改版提交

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

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

import javax.annotation.Resource;

import com.panzhihua.common.model.dtos.common.EditComActEasyPhotoHandlerDto;
import com.panzhihua.common.model.dtos.common.EvaluateEasyDto;
import com.panzhihua.common.model.dtos.common.PageComActEasyPhotoHandlerDto;
import com.panzhihua.common.model.vos.common.ComActEasyPhotoHandlerVo;
@@ -102,6 +103,19 @@
        comActEasyPhotoHandler.setUserId(this.getUserId());
        return this.communityService.queryEasyPhotoHandler(comActEasyPhotoHandler);
    }
    /**
     * description  edit  编辑数据
     *
     * @param comActEasyPhotoHandler 请求参数
     * @return 编辑结果
     * @author lyq
     * @date 2022-03-01 13:45:10
     */
    @ApiOperation(value = "提交反馈")
    @PostMapping("/editEasyPhotoHandler")
    public R editEasyPhotoHandler(@RequestBody EditComActEasyPhotoHandlerDto comActEasyPhotoHandler) {
        return this.communityService.editEasyPhotoHandler(comActEasyPhotoHandler);
    }

    @ApiOperation(value = "查询随手拍是否有活动", response = ComActEasyPhotoActivityVO.class)
    @PostMapping("getEasyPhotoActivity")

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

@@ -6,6 +6,8 @@
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

import java.util.Date;

/**
 * title: 编辑随手拍、微心愿处理人绑定表请求参数
 * <p>
@@ -51,5 +53,31 @@
    @ApiModelProperty(value = "业务类型（1.随手拍 2.微心愿）")
    private Integer serviceType;

    /**
     * 服务状态 0待执行 1已完成
     */
    @ApiModelProperty(value = "服务状态 0待执行 1已完成")
    private Integer status;
    /**
     * 发起人id
     */
    private Long senderId;

    private Date createTime;
    /**
     * 得分
     */
    @ApiModelProperty(value = "得分")
    private Integer score;
    /**
     * 汇报内容
     */
    @ApiModelProperty(value = "汇报内容")
    private String resultContent;
    /**
     * 汇报图片
     */
    @ApiModelProperty(value = "汇报图片")
    private String resultUrl;
}


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

@@ -60,5 +60,8 @@
    @ApiModelProperty(value = "关键词")
    private String keyWord;

    @ApiModelProperty(value = "状态 0待执行 1已完成")
    private Integer status;

}


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

@@ -6,6 +6,8 @@
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

import java.util.Date;

/**
 * title: 随手拍、微心愿处理人绑定表返回参数
 * <p>
@@ -51,4 +53,13 @@
    @ApiModelProperty(value = "业务类型（1.随手拍 2.微心愿）")
    private Integer serviceType;

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

    @ApiModelProperty(value = "状态")
    private Integer status;

    @ApiModelProperty(value = "发起人名称")
    private String senderName;

}

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

@@ -9494,4 +9494,15 @@
     */
    @PostMapping("/comActEasyPhotoHandler/page")
    R queryEasyPhotoHandler(@RequestBody PageComActEasyPhotoHandlerDto comActEasyPhotoHandler);

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

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

@@ -58,7 +58,7 @@
     * @author lyq
     * @date 2022-03-01 13:45:10
     */
    @PutMapping("/edit")
    @PostMapping("/edit")
    public R edit(@RequestBody EditComActEasyPhotoHandlerDto comActEasyPhotoHandler) {
        return this.comActEasyPhotoHandlerService.update(comActEasyPhotoHandler);
    }

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

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

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

import lombok.Data;

@@ -38,11 +39,40 @@
     */
    private Integer serviceType;
    /**
     * 服务状态 0待执行 1已完成
     */
    private Integer status;
    /**
     * 发起人id
     */
    private Long senderId;

    private Date createTime;
    /**
     * 得分
     */
    private Integer score;
    /**
     * 汇报内容
     */
    private String resultContent;
    /**
     * 汇报图片
     */
    private String resultUrl;
    /**
     * 业务分类（1.随手拍 2.微心愿）
     */
    public interface ServiceType{
        int SSP = 1;
        int WXY = 2;
    }
    /**
     * 服务状态 0待执行 1已完成
     */
    public interface Status{
        int DZX = 0;
        int YWC= 1;
    }
}


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

@@ -82,7 +82,8 @@
     * @param serviceId 业务id
     * @param type  人员类型（1.后台用户 2.党员 3.志愿者 4.社工 5.四长四员）
     * @param serviceType   业务类型（1.随手拍 2.微心愿）
     * @param sponsorId 发起人id
     */
    void addHandleRecord(Long communityId,Long userId,Long serviceId,Integer type,Integer serviceType);
    void addHandleRecord(Long communityId,Long userId,Long serviceId,Integer type,Integer serviceType,Long sponsorId);

}

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

@@ -10,6 +10,8 @@
import org.springframework.stereotype.Service;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;

import java.util.Date;

/**
 * title: 随手拍、微心愿处理人绑定表表服务实现类
 * <p>
@@ -126,10 +128,13 @@
     * @param serviceType   业务类型（1.随手拍 2.微心愿）
     */
    @Override
    public void addHandleRecord(Long communityId, Long userId, Long serviceId, Integer type, Integer serviceType) {
    public void addHandleRecord(Long communityId, Long userId, Long serviceId, Integer type, Integer serviceType,Long sponsorId) {
        ComActEasyPhotoHandler easyPhotoHandler = new ComActEasyPhotoHandler();
        easyPhotoHandler.setCommunityId(communityId);
        easyPhotoHandler.setStatus(ComActEasyPhotoHandler.Status.DZX);
        easyPhotoHandler.setCreateTime(new Date());
        easyPhotoHandler.setUserId(userId);
        easyPhotoHandler.setSenderId(sponsorId);
        easyPhotoHandler.setServiceId(serviceId);
        easyPhotoHandler.setType(type);
        easyPhotoHandler.setServiceType(serviceType);

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

@@ -330,7 +330,7 @@
                if(comActEasyPhotoVO.getHandleList() != null && comActEasyPhotoVO.getHandleList().size() > 0){
                    comActEasyPhotoVO.getHandleList().forEach(handle -> {
                        easyPhotoHandlerService.addHandleRecord(cmActEasyPhotoDO.getCommunityId(),comActEasyPhotoVO.getUserId()
                                ,cmActEasyPhotoDO.getId(),handle.getType(), ComActEasyPhotoHandler.ServiceType.SSP);
                                ,cmActEasyPhotoDO.getId(),handle.getType(), ComActEasyPhotoHandler.ServiceType.SSP,comActEasyPhotoVO.getSponsorId());
                    });
                }
                break;

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

@@ -253,7 +253,7 @@
                if(comActMicroWishVO.getHandleList() != null && comActMicroWishVO.getHandleList().size() > 0){
                    comActMicroWishVO.getHandleList().forEach(handle -> {
                        easyPhotoHandlerService.addHandleRecord(microWishDO.getCommunityId(),handle.getUserId()
                                ,microWishDO.getId(),handle.getType(), ComActEasyPhotoHandler.ServiceType.WXY);
                                ,microWishDO.getId(),handle.getType(), ComActEasyPhotoHandler.ServiceType.WXY,comActMicroWishVO.getSponsorId());
                    });
                }
                break;

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

@@ -20,28 +20,31 @@
    </select>

    <!--查询指定行数据-->
    <select id="queryAllByLimit" resultMap="ComActEasyPhotoHandlerMap">
    <select id="queryAllByLimit" resultType="com.panzhihua.common.model.vos.common.ComActEasyPhotoHandlerVo">
        select
        id, community_id, user_id, service_id, type, service_type
        from com_act_easy_photo_handler
        t.id, t.community_id, t.user_id, t.service_id, t.type, t.service_type ,t.status ,t1.name as senderName ,t.create_time
        from com_act_easy_photo_handler t left join sys_user t1 on t.sender_id = t1.user_id
        <where>
            <if test="dto.id != null">
                and id = #{dto.id}
                and t.id = #{dto.id}
            </if>
            <if test="dto.communityId != null">
                and community_id = #{dto.communityId}
                and t.community_id = #{dto.communityId}
            </if>
            <if test="dto.userId != null">
                and user_id = #{dto.userId}
                and t.user_id = #{dto.userId}
            </if>
            <if test="dto.serviceId != null">
                and service_id = #{dto.serviceId}
                and t.service_id = #{dto.serviceId}
            </if>
            <if test="dto.type != null">
                and type = #{dto.type}
                and t.type = #{dto.type}
            </if>
            <if test="dto.serviceType != null">
                and service_type = #{dto.serviceType}
                and t.service_type = #{dto.serviceType}
            </if>
            <if test="dto.status !=null">
                and t.status = #{dto.status}
            </if>
        </where>
        order by create_at desc