Merge remote-tracking branch 'origin/master'

mrzcc

2020-02-19 44f9cd5c403584c39c8bb893f69244e4835daab8

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

@@ -2,10 +2,10 @@


import com.alibaba.fastjson.JSONObject;
import com.java110.common.constant.StateConstant;
import com.java110.utils.constant.StateConstant;
import com.java110.core.context.IPageData;
import com.java110.core.context.PageData;
import com.java110.web.smo.community.IAuditCommunitySMO;
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;
@@ -26,7 +26,7 @@
    private IListAuditEnterCommunitysSMO listAuditEnterCommunitysSMOImpl;

    @Autowired
    private IAuditCommunitySMO auditCommunitySMOImpl;
    private IAuditEnterCommunitySMO auditEnterCommunitySMOImpl;

    /**
     * 查询小区列表
@@ -37,9 +37,9 @@
    public ResponseEntity<String> list(IPageData pd) {

        JSONObject reqParam = JSONObject.parseObject(pd.getReqData());
        reqParam.put("auditStatusCd", StateConstant.NO_AUDIT);
        //reqParam.put("auditStatusCd", StateConstant.NO_AUDIT);

        IPageData newPd = PageData.newInstance().builder(pd.getUserId(), pd.getToken(),
        IPageData newPd = PageData.newInstance().builder(pd.getUserId(), pd.getUserName(), pd.getToken(),
                reqParam.toJSONString(), pd.getComponentCode(), pd.getComponentMethod(), "", pd.getSessionId());

        return listAuditEnterCommunitysSMOImpl.listAuditEnterCommunitys(newPd);
@@ -52,16 +52,15 @@
     * @return 返回 ResponseEntity 对象
     */
    public ResponseEntity<String> audit(IPageData pd) {
        return auditCommunitySMOImpl.auditCommunity(pd);
        return auditEnterCommunitySMOImpl.auditEnterCommunity(pd);
    }


    public IAuditCommunitySMO getAuditCommunitySMOImpl() {
        return auditCommunitySMOImpl;
    public IAuditEnterCommunitySMO getAuditEnterCommunitySMOImpl() {
        return auditEnterCommunitySMOImpl;
    }

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

    public IListAuditEnterCommunitysSMO getListAuditEnterCommunitysSMOImpl() {