Merge branch 'dev'

puhanshu

2022-06-22 8d9be764777d27c7abf395be5055cf2324bdde8f

Merge branch 'dev'

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

@@ -118,6 +118,13 @@
        return this.communityService.editEasyPhotoHandler(comActEasyPhotoHandler);
    }

    @ApiOperation(value = "查询处理详情", response = ComActEasyPhotoHandlerVo.class)
    @ApiImplicitParam(name = "id", value = "处理id", required = true)
    @GetMapping("/easyPhotoHandler")
    public R detailEasyPhotoHandler(@RequestParam("id") Long id) {
        return this.communityService.detailEasyPhotoHandler(id);
    }

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

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

@@ -63,4 +63,18 @@
    @ApiModelProperty(value = "发起人名称")
    private String senderName;

    @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/service/community/CommunityService.java

@@ -9852,4 +9852,12 @@
     */
    @PostMapping("/screen/dpc/easyPhotoList")
    R dpcEasyPhotoList(@RequestBody PageBaseDTO pageBaseDTO);

    /**
     * 查询详情
     * @param id
     * @return
     */
    @GetMapping("/comActEasyPhotoHandler/detail")
    R detailEasyPhotoHandler(@RequestParam("id") Long id);
}

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

@@ -30,8 +30,9 @@
    List<ComActMessageBackVO> selectMsgBackList(@Param("id") Long id);

    @Select("<script>" + "select * from com_act_message " + " where "
        + " ((sendto_user_id in (select id from com_pb_member_role t1 where t1.phone=#{comActMessageVO.phone})) "
        + " or (sendto_user_id in (select id from com_pb_service_team t2 where t2.phone=#{comActMessageVO.phone})))"
        + " ((sendto_user_id in (select id from com_pb_member_role t1 where t1.phone=#{comActMessageVO.phone}) AND type = 2) "
        + " or (sendto_user_id in (select id from com_pb_service_team t2 where t2.phone=#{comActMessageVO.phone}) AND type = 1) "
        + " or (sendto_user_id in (select id from com_act_dpc t3 where t3.phone=#{comActMessageVO.phone}) AND type = 3)) "
        + "<if test='comActMessageVO.status != null'>" + " and status=#{comActMessageVO.status} \n" + " </if> "
        + " order by create_at desc" + "</script>")
    IPage<PageComActMessageVO> pageSendMeMessageApplets(Page page,

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

@@ -336,7 +336,7 @@
                //添加分配人员
                if(comActEasyPhotoVO.getHandleList() != null && comActEasyPhotoVO.getHandleList().size() > 0){
                    comActEasyPhotoVO.getHandleList().forEach(handle -> {
                        easyPhotoHandlerService.addHandleRecord(cmActEasyPhotoDO.getCommunityId(),comActEasyPhotoVO.getUserId()
                        easyPhotoHandlerService.addHandleRecord(cmActEasyPhotoDO.getCommunityId(), handle.getUserId()
                                ,cmActEasyPhotoDO.getId(),handle.getType(), ComActEasyPhotoHandler.ServiceType.SSP,cmActEasyPhotoDO.getSponsorId());
                    });
                }

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

@@ -525,7 +525,7 @@
        LEFT JOIN sys_user su ON p.handler_id = su.user_id
        LEFT JOIN com_act_easy_photo_comment c ON p.id = c.easy_photo_id
        LEFT JOIN com_act_easy_photo_classify class ON p.classify_id = class.id
        LEFT JOIN com_act_easy_photo_feedback f ON p.id = f.easy_id
        LEFT JOIN (SELECT * FROM com_act_easy_photo_feedback WHERE `type` = 2) f ON p.id = f.easy_id
        <where> p.del_tag = 0
        <if test = 'comActEasyPhotoVO.communityId != null and comActEasyPhotoVO.communityId != 0' >
            AND p.community_id = ${comActEasyPhotoVO.communityId}
@@ -544,7 +544,6 @@
        </if>
        <if test='comActEasyPhotoVO.isReportDpc != null' >
            AND p.`is_report_dpc` = #{comActEasyPhotoVO.isReportDpc}
            AND f.`type` = 2
        </if>
        <if test='comActEasyPhotoVO.keyWord != null and comActEasyPhotoVO.keyWord != &quot;&quot;'>
            AND (class.`name` like concat(#{comActEasyPhotoVO.keyWord},'%') or p.detail like concat(#{comActEasyPhotoVO.keyWord},'%'))

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

@@ -32,7 +32,7 @@
            com_act_easy_photo_feedback AS caepf
            LEFT JOIN sys_user AS su ON su.user_id = caepf.create_by
        WHERE
            caepf.easy_id = #{easyId} AND caepf.type = 2
            caepf.easy_id = #{easyId} AND caepf.type = 1
        ORDER BY caepf.create_at desc
    </select>
    <select id="getPhotoFeedbackListForDpc"

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

@@ -12,11 +12,8 @@
    </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 id="queryById" resultType="com.panzhihua.common.model.vos.common.ComActEasyPhotoHandlerVo">
        select t.*,t1.name as senderName from com_act_easy_photo_handler t left join sys_user t1 on t.sender_id = t1.user_id where t.id = #{id}
    </select>

    <!--查询指定行数据-->

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

@@ -106,7 +106,7 @@
            select user_id,IFNULL(`name`,nick_name) as `name` from sys_user where `type` = 1 AND phone in (select DISTINCT(telephone) from com_act_social_worker where community_id = ${communityId}) and status = 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}) and status = 1
            select user_id,IFNULL(`name`,nick_name) as `name` from sys_user where `type` = 1 AND id_card in (select id_card from com_act_four_member where community_id = ${communityId}) and status = 1
        </if>
    </select>