花城 修改微心愿集星数量列表 详情显示不一致
修改 随手拍一键认领可以多人同时认领
3个文件已修改
143 ■■■■ 已修改文件
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActMicroWishDAO.java 84 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActMicroWishServiceImpl.java 10 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComActMicroWishDOMapper.xml 49 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActMicroWishDAO.java
@@ -119,48 +119,48 @@
    IPage<ComActMicroWishVO> pageMicroWishApplets(Page page, @Param("comActMicroWishVO") ComActMicroWishVO comActMicroWishVO);
    @Select("SELECT " +
            "w.id, " +
            "u.name sponsor_name, " +
            "u.nick_name userNickName, " +
            "w.create_at, " +
            "w.aim_num, " +
            "u.image_url, " +
            "w.sponsor_phone, " +
            "w.`status`, " +
            "w.`sponsor_id`, " +
            "w.wish_name, " +
            "count(wu.id)starNum, " +
            "w.detail, " +
            "w.photo_path_list, " +
            "su.`name` responsible_name, " +
            "w.form, " +
            "w.reject_reason, " +
            "w.community_id, " +
            "w.examine_at, " +
            "w.finish, " +
            "w.finish_photo_path_list, " +
            "w.finish_at, " +
            "w.score, " +
            "w.feedback, " +
            "w.feedback_at, " +
            "w.feedback_photo_path_list, " +
            "w.distribution_at, " +
            "w.evaluate_at, " +
            "w.img_width, " +
            "w.img_height, " +
            "w.handle_id, " +
            "w.evaluate  " +
            "FROM " +
            "com_act_micro_wish w " +
            "LEFT JOIN sys_user u ON w.sponsor_id = u.user_id " +
            "LEFT JOIN com_pb_service_team su ON w.responsible_id = su.id  " +
            "LEFT JOIN com_act_micro_wish_user wu ON w.id = wu.micro_wish_id  " +
            "WHERE " +
            "w.id =#{id}"+
            " group by w.id " +
            "order by w.create_at desc"
    )
//    @Select("SELECT " +
//            "w.id, " +
//            "u.name sponsor_name, " +
//            "u.nick_name userNickName, " +
//            "w.create_at, " +
//            "w.aim_num, " +
//            "u.image_url, " +
//            "w.sponsor_phone, " +
//            "w.`status`, " +
//            "w.`sponsor_id`, " +
//            "w.wish_name, " +
//            "count(wu.id)starNum, " +
//            "w.detail, " +
//            "w.photo_path_list, " +
//            "su.`name` responsible_name, " +
//            "w.form, " +
//            "w.reject_reason, " +
//            "w.community_id, " +
//            "w.examine_at, " +
//            "w.finish, " +
//            "w.finish_photo_path_list, " +
//            "w.finish_at, " +
//            "w.score, " +
//            "w.feedback, " +
//            "w.feedback_at, " +
//            "w.feedback_photo_path_list, " +
//            "w.distribution_at, " +
//            "w.evaluate_at, " +
//            "w.img_width, " +
//            "w.img_height, " +
//            "w.handle_id, " +
//            "w.evaluate  " +
//            "FROM " +
//            "com_act_micro_wish w " +
//            "LEFT JOIN sys_user u ON w.sponsor_id = u.user_id " +
//            "LEFT JOIN com_pb_service_team su ON w.responsible_id = su.id  " +
//            "LEFT JOIN com_act_micro_wish_user wu ON w.id = wu.micro_wish_id  " +
//            "WHERE " +
//            "w.id =#{id}"+
//            " group by w.id " +
//            "order by w.create_at desc"
//    )
    ComActMicroWishVO detailMicroWish(Long id);
    @Select("SELECT " +
            "'2' type " +
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActMicroWishServiceImpl.java
@@ -286,6 +286,7 @@
        if(microWishDO == null){
            return R.fail("未查询到该微心愿记录");
        }
//        1 审核通过 2驳回 3分配人员 4发起活动 5反馈
        switch (type){
            case 1:
@@ -315,6 +316,15 @@
                comActMicroWishOperationRecordMapper.insert(comActMicroWishOperationRecordDO);
                break;
            case 3:
                /**
                 * 状态
                 * 状态 1待审核  2待分配 3进行中  4已驳回 5待确认6 已完成
                 */
                if(comActMicroWishDO.getStatus()!=null && comActMicroWishDO.getStatus()!=2)
                {
                    return R.fail("该微心愿已认领,不可重复认领");
                }
                isUpdate = true;
                comActMicroWishDO.setDistributionAt(date);
                comActMicroWishDO.setResponsibleId(responsibleId);
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComActMicroWishDOMapper.xml
@@ -176,6 +176,55 @@
        ORDER BY  w.create_at desc
    </select>
    <select id="detailMicroWish" resultType="com.panzhihua.common.model.vos.community.ComActMicroWishVO">
       SELECT
            w.id,
            u.name sponsor_name,
            u.nick_name userNickName,
            w.create_at,
            w.aim_num,
            u.image_url,
            w.sponsor_phone,
            w.`status`,
            w.`sponsor_id`,
            w.wish_name,
            count(wu.id)starNum,
            w.detail,
            w.photo_path_list,
            su.`name` responsible_name,
            w.form,
            w.reject_reason,
            w.community_id,
            w.examine_at,
            w.finish,
            w.finish_photo_path_list,
            w.finish_at,
            w.score,
            w.feedback,
            w.feedback_at,
            w.feedback_photo_path_list,
            w.distribution_at,
            w.evaluate_at,
            w.img_width,
            w.img_height,
            w.handle_id,
            w.evaluate
            FROM
            com_act_micro_wish w
            LEFT JOIN sys_user u ON w.sponsor_id = u.user_id
            LEFT JOIN com_pb_service_team su ON w.responsible_id = su.id
            LEFT JOIN com_act_micro_wish_user wu ON w.id = wu.micro_wish_id
            LEFT JOIN (SELECT * FROM com_act_easy_photo_handler WHERE service_type = 2) ch ON w.id = ch.service_id
            LEFT JOIN sys_user u2 ON ch.user_id = u2.user_id
            WHERE
            w.id =#{id}
    </select>
    <select id="selectRealizePercent" resultType="com.panzhihua.common.model.vos.community.StatisticsCommVO">
        SELECT t1.filed, t1.num, ROUND( t1.num / t2.sum * 100, 2 ) AS percent
        FROM