Merge remote-tracking branch 'origin/master'

mrzcc

2020-02-19 9efb739152062fed7a1b073cbb0034d519283f2d

Merge remote-tracking branch 'origin/master'

 WebService/src/main/java/com/java110/web/components/community/RecallAuditEnterFinishCommunityComponent.java

New file
@@ -0,0 +1,46 @@
package com.java110.web.components.community;


import com.alibaba.fastjson.JSONObject;
import com.java110.core.context.IPageData;
import com.java110.core.context.PageData;
import com.java110.web.smo.community.IAuditEnterCommunitySMO;
import com.java110.web.smo.community.IListAuditEnterCommunitysSMO;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.ResponseEntity;
import org.springframework.stereotype.Component;


/**
 * 小区审核
 * <p>
 * add by wuxw
 * <p>
 * 2019-06-29
 */
@Component("recallAuditEnterFinishCommunity")
public class RecallAuditEnterFinishCommunityComponent {

    @Autowired
    private IAuditEnterCommunitySMO auditEnterCommunitySMOImpl;


    /**
     * 审核 小区
     *
     * @param pd 页面数据封装
     * @return 返回 ResponseEntity 对象
     */
    public ResponseEntity<String> recall(IPageData pd) {
        return auditEnterCommunitySMOImpl.auditEnterCommunity(pd);
    }

    public IAuditEnterCommunitySMO getAuditEnterCommunitySMOImpl() {
        return auditEnterCommunitySMOImpl;
    }

    public void setAuditEnterCommunitySMOImpl(IAuditEnterCommunitySMO auditEnterCommunitySMOImpl) {
        this.auditEnterCommunitySMOImpl = auditEnterCommunitySMOImpl;
    }

}

 WebService/src/main/resources/components/communityPackage/audit-enter-community-manage/auditEnterCommunityManage.html

@@ -98,7 +98,7 @@
                            <td>{{community.tel}}</td>
                            <td>{{community.address}}</td>
                            <td>{{community.stateName}}</td>
                            <td>
                            <td class="text-right">
                                <div class="btn-group" v-if="community.auditStatusCd=='1000'">
                                    <button class="btn-white btn btn-xs"
                                            v-on:click="_openEnterAuditCommunityModal(community)">审核
@@ -107,6 +107,7 @@
                                <!--v-on:click="_openEnterAuditCommunityModal(community)"-->
                                <div class="btn-group" v-if="community.auditStatusCd!='1000'">
                                    <button class="btn-white btn btn-xs"
                                            v-on:click="_openRecallAuditFinishCommunityModal(community)
                                            >撤回审核
                                    </button>
                                </div>
@@ -132,5 +133,7 @@
               callBackListener="auditEnterCommunityManage"
               callBackFunction="notifyAuditInfo"
    ></vc:create>
    <!--撤回审核-->
    <vc:create name="recallAuditEnterFinishCommunity"></vc:create>

</div>

 WebService/src/main/resources/components/communityPackage/audit-enter-community-manage/auditEnterCommunityManage.js

@@ -66,6 +66,9 @@
                vc.component.auditEnterCommunityManageInfo.currentCommunityMemberId = _community.communityMemberId;
                vc.emit('audit','openAuditModal',{});
            },
            _openRecallAuditFinishCommunityModal:function(_community){
                vc.emit('recallAuditEnterFinishCommunity','openRecallAuditEnterFinishCommunityModal',_community);
            },
            _auditEnterCommunityState:function(_auditInfo){
                _auditInfo.communityMemberId = vc.component.auditEnterCommunityManageInfo.currentCommunityMemberId;
                vc.http.post(

 WebService/src/main/resources/components/communityPackage/recallAuditEnterFinishCommunity/recallAuditEnterFinishCommunity.html

New file
@@ -0,0 +1,19 @@
<div class="modal fade" id="recallAuditEnterFinishCommunityModel" tabindex="-1" role="dialog" aria-labelledby="exampleModalLabel" aria-hidden="true">
    <div class="modal-dialog" role="document">
        <div class="modal-content">
            <div class="modal-header">
                <h5 class="modal-title" id="exampleModalLabel">请确认您的操作!</h5>
                <button type="button" class="close" data-dismiss="modal" aria-label="Close">
                    <span aria-hidden="true">&times;</span>
                </button>
            </div>
            <div class="modal-body">
                <tr align="center"><th>确定撤回审核</th></tr>
            </div>
            <div class="modal-footer">
                <button type="button" class="btn btn-secondary" data-dismiss="modal" v-on:click="closeRecallAuditEnterFinishCommunityModel()">点错了</button>
                <button type="button" class="btn btn-primary" v-on:click="recallAuditEnterFinishCommunity()">确认撤回</button>
            </div>
        </div>
    </div>
</div>

 WebService/src/main/resources/components/communityPackage/recallAuditEnterFinishCommunity/recallAuditEnterFinishCommunity.js

New file
@@ -0,0 +1,56 @@
(function(vc,vm){

    vc.extends({
        data:{
            recallAuditEnterFinishCommunityInfo:{

            }
        },
         _initMethod:function(){

         },
         _initEvent:function(){
             vc.on('recallAuditEnterFinishCommunity','openRecallAuditEnterFinishCommunityModal',function(_params){

                vc.component.recallAuditEnterFinishCommunityInfo = _params;
                $('#recallAuditEnterFinishCommunityModel').modal('show');

            });
        },
        methods:{
            recallAuditEnterFinishCommunity:function(){
                var _paramObj = {
                    communityMemberId:vc.component.recallAuditEnterFinishCommunityInfo.communityMemberId,
                    state:'1000',
                    remark:'撤回审核'
                };
                vc.http.post(
                    'recallAuditEnterFinishCommunity',
                    'recall',
                    JSON.stringify(_paramObj),
                    {
                        emulateJSON:true
                     },
                     function(json,res){
                        //vm.menus = vm.refreshMenuActive(JSON.parse(json),0);
                        if(res.status == 200){
                            //关闭model
                            $('#recallAuditEnterFinishCommunityModel').modal('hide');
                            vc.emit('auditEnterCommunityManage','listCommunity',{});
                            return ;
                        }
                        vc.message(json);
                     },
                     function(errInfo,error){
                        console.log('请求失败处理');
                        vc.message(json);

                     });
            },
            closeRecallAuditEnterFinishCommunityModel:function(){
                $('#recallAuditEnterFinishCommunityModel').modal('hide');
            }
        }
    });

})(window.vc,window.vc.component);

 java110-db/src/main/resources/mapper/community/CommunityServiceDaoImplMapper.xml

@@ -315,6 +315,7 @@
        <if test="memberId != null and memberId != '' and needCommunityInfo == true">
            AND ms.`community_id` = msc.`community_id`
            and msc.member_id = #{memberId}
            and msc.status_cd = '0'
        </if>
        <if test="memberId != null and memberId != '' and needCommunityInfo == false">
            and ms.member_id = #{memberId}
@@ -390,6 +391,7 @@
        <if test="memberId != null and memberId != '' and needCommunityInfo == true">
            AND ms.`community_id` = msc.`community_id`
            and msc.member_id = #{memberId}
            and msc.status_cd = '0'
        </if>
        <if test="memberId != null and memberId != '' and needCommunityInfo == false">
            and ms.member_id = #{memberId}

 java110-utils/src/main/java/com/java110/utils/constant/CommunityMemberTypeConstant.java

@@ -28,10 +28,10 @@


    //运维团队
    public static final String OPT = "800900000001";
    public static final String OPT = "390001200000";


    //开发团队
    public static final String DEV = "800900000000";
    public static final String DEV = "390001200005";

}