修改查询sql

Api/src/main/java/com/java110/api/listener/floor/DeleteFloorListener.java

@@ -108,7 +108,7 @@ public class DeleteFloorListener extends AbstractServiceApiDataFlowListener {
         business.put(CommonConstant.HTTP_BUSINESS_TYPE_CD, BusinessTypeConstant.BUSINESS_TYPE_MEMBER_QUIT_COMMUNITY);
         business.put(CommonConstant.HTTP_SEQ, DEFAULT_SEQ + 1);
         business.put(CommonConstant.HTTP_INVOKE_MODEL, CommonConstant.HTTP_INVOKE_MODEL_S);
-        JSONObject businessFloor = new JSONObject();
+        JSONObject businessCommunityMember = new JSONObject();
         CommunityMemberDto communityMemberDto = new CommunityMemberDto();
         communityMemberDto.setMemberId(paramInJson.getString("floorId"));
         communityMemberDto.setCommunityId(paramInJson.getString("communityId"));
@@ -121,8 +121,8 @@ public class DeleteFloorListener extends AbstractServiceApiDataFlowListener {
         }
 
 
-        businessFloor.put("communityMemberId", communityMemberDtoList.get(0).getCommunityMemberId());
-        business.getJSONObject(CommonConstant.HTTP_BUSINESS_DATAS).put("businessCommunityMember", businessFloor);
+        businessCommunityMember.put("communityMemberId", communityMemberDtoList.get(0).getCommunityMemberId());
+        business.getJSONObject(CommonConstant.HTTP_BUSINESS_DATAS).put("businessCommunityMember", businessCommunityMember);
 
         return business;
     }

CommunityService/src/main/java/com/java110/community/listener/MemberQuitCommunityListener.java

@@ -20,7 +20,7 @@ import java.util.Map;
 
 /**
  * 小区成员退出 侦听
- *
+ * <p>
  * 处理节点
  * 1、businessCommunityMember:{} 小区基本信息节点
  * 协议地址 ：https://github.com/java110/MicroCommunity/wiki/%E5%88%A0%E9%99%A4%E5%95%86%E6%88%B7%E4%BF%A1%E6%81%AF-%E5%8D%8F%E8%AE%AE
@@ -46,28 +46,30 @@ public class MemberQuitCommunityListener extends AbstractCommunityBusinessServic
 
     /**
      * 根据删除信息 查出Instance表中数据 保存至business表 （状态写DEL） 方便撤单时直接更新回去
+     *
      * @param dataFlowContext 数据对象
-     * @param business 当前业务对象
+     * @param business        当前业务对象
      */
     @Override
     protected void doSaveBusiness(DataFlowContext dataFlowContext, Business business) {
         JSONObject data = business.getDatas();
 
-        Assert.notEmpty(data,"没有datas 节点，或没有子节点需要处理");
+        Assert.notEmpty(data, "没有datas 节点，或没有子节点需要处理");
 
         //处理 businessCommunity 节点 按理这里不应该处理，程序上支持，以防真有这种业务
-        if(data.containsKey("businessCommunityMember")){
+        if (data.containsKey("businessCommunityMember")) {
             JSONObject memberCommunity = data.getJSONObject("businessCommunityMember");
-            doBusinessCommunityMember(business,memberCommunity);
-            dataFlowContext.addParamOut("communityMemberId",memberCommunity.getString("communityMemberId"));
+            doBusinessCommunityMember(business, memberCommunity);
+            dataFlowContext.addParamOut("communityMemberId", memberCommunity.getString("communityMemberId"));
         }
 
     }
 
     /**
      * 删除 instance数据
+     *
      * @param dataFlowContext 数据对象
-     * @param business 当前业务对象
+     * @param business        当前业务对象
      */
     @Override
     protected void doBusinessToInstance(DataFlowContext dataFlowContext, Business business) {
@@ -76,73 +78,72 @@ public class MemberQuitCommunityListener extends AbstractCommunityBusinessServic
 
         //小区信息
         Map info = new HashMap();
-        info.put("bId",business.getbId());
-        info.put("operate",StatusConstant.OPERATE_DEL);
+        info.put("bId", business.getbId());
+        info.put("operate", StatusConstant.OPERATE_DEL);
 
         //小区信息
         Map businessCommunityMember = communityServiceDaoImpl.getBusinessCommunityMember(info);
-        if( businessCommunityMember != null && !businessCommunityMember.isEmpty()) {
-            flushBusinessCommunityMember(businessCommunityMember,StatusConstant.STATUS_CD_AUDIT_INVALID);
+        if (businessCommunityMember != null && !businessCommunityMember.isEmpty()) {
+            flushBusinessCommunityMember(businessCommunityMember, StatusConstant.STATUS_CD_AUDIT_INVALID);
             communityServiceDaoImpl.updateCommunityMemberInstance(businessCommunityMember);
-            dataFlowContext.addParamOut("communityMemberId",businessCommunityMember.get("member_community_id"));
+            dataFlowContext.addParamOut("communityMemberId", businessCommunityMember.get("member_community_id"));
         }
     }
 
     /**
      * 撤单
      * 从business表中查询到DEL的数据 将instance中的数据更新回来
+     *
      * @param dataFlowContext 数据对象
-     * @param business 当前业务对象
+     * @param business        当前业务对象
      */
     @Override
     protected void doRecover(DataFlowContext dataFlowContext, Business business) {
         String bId = business.getbId();
         //Assert.hasLength(bId,"请求报文中没有包含 bId");
         Map info = new HashMap();
-        info.put("bId",bId);
-        info.put("statusCd",StatusConstant.STATUS_CD_INVALID);
+        info.put("bId", bId);
+        info.put("statusCd", StatusConstant.STATUS_CD_INVALID);
 
         Map delInfo = new HashMap();
-        delInfo.put("bId",business.getbId());
-        delInfo.put("operate",StatusConstant.OPERATE_DEL);
+        delInfo.put("bId", business.getbId());
+        delInfo.put("operate", StatusConstant.OPERATE_DEL);
         //小区信息
         Map memberCommunity = communityServiceDaoImpl.getCommunityMember(info);
-        if(memberCommunity != null && !memberCommunity.isEmpty()){
+        if (memberCommunity != null && !memberCommunity.isEmpty()) {
 
             //小区信息
             Map businessCommunityMember = communityServiceDaoImpl.getBusinessCommunityMember(delInfo);
             //除非程序出错了，这里不会为空
-            if(businessCommunityMember == null || businessCommunityMember.isEmpty()){
-                throw new ListenerExecuteException(ResponseConstant.RESULT_CODE_INNER_ERROR,"撤单失败（member community），程序内部异常,请检查！ "+delInfo);
+            if (businessCommunityMember == null || businessCommunityMember.isEmpty()) {
+                throw new ListenerExecuteException(ResponseConstant.RESULT_CODE_INNER_ERROR, "撤单失败（member community），程序内部异常,请检查！ " + delInfo);
             }
 
-            flushBusinessCommunityMember(businessCommunityMember,StatusConstant.STATUS_CD_VALID);
+            flushBusinessCommunityMember(businessCommunityMember, StatusConstant.STATUS_CD_VALID);
             communityServiceDaoImpl.updateCommunityMemberInstance(businessCommunityMember);
-            dataFlowContext.addParamOut("communityMemberId",memberCommunity.get("member_community_id"));
+            dataFlowContext.addParamOut("communityMemberId", memberCommunity.get("member_community_id"));
         }
     }
 
 
-
     /**
      * 处理 businessCommunity 节点
-     * @param business 总的数据节点
+     *
+     * @param business          总的数据节点
      * @param businessCommunity 小区节点
      */
-    private void doBusinessCommunityMember(Business business,JSONObject businessCommunity){
+    private void doBusinessCommunityMember(Business business, JSONObject businessCommunity) {
 
-        Assert.jsonObjectHaveKey(businessCommunity,"communityMemberId","doBusinessCommunityMember 节点下没有包含 communityMemberId 节点");
+        Assert.jsonObjectHaveKey(businessCommunity, "communityMemberId", "doBusinessCommunityMember 节点下没有包含 communityMemberId 节点");
 
-        if(businessCommunity.getString("communityMemberId").startsWith("-")){
-            throw new ListenerExecuteException(ResponseConstant.RESULT_PARAM_ERROR,"communityMemberId 错误，不能自动生成（必须已经存在的communityMemberId）"+businessCommunity);
+        if (businessCommunity.getString("communityMemberId").startsWith("-")) {
+            throw new ListenerExecuteException(ResponseConstant.RESULT_PARAM_ERROR, "communityMemberId 错误，不能自动生成（必须已经存在的communityMemberId）" + businessCommunity);
         }
         //自动插入DEL
-        autoSaveDelBusinessCommunityMember(business,businessCommunity);
+        autoSaveDelBusinessCommunityMember(business, businessCommunity);
     }
 
 
-
-
     public ICommunityServiceDao getCommunityServiceDaoImpl() {
         return communityServiceDaoImpl;
     }

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

@@ -267,7 +267,9 @@
 
     <!-- 查询小区成员  add by wuxw 2018-07-03 -->
     <select id="getCommunityMember" parameterType="Map" resultType="Map">
-        select ms.community_member_id,ms.b_id,ms.community_id,ms.member_id,ms.member_type_cd,ms.status_cd,ms.audit_status_cd
+        select ms.community_member_id ,ms.b_id,ms.community_id,ms.member_id,ms.member_type_cd,ms.status_cd,ms.audit_status_cd,
+        ms.community_member_id communityMemberId ,ms.b_id bId,ms.community_id communityId,ms.member_id memberId,ms.member_type_cd memberTypeCd,ms.status_cd statusCd,
+        ms.audit_status_cd auditStatusCd
         from s_community_member ms
         where 1=1
         <if test="statusCd != null and statusCd != ''">
@@ -289,6 +291,10 @@
         <if test="auditStatusCd != null and auditStatusCd != ''">
             and ms.audit_status_cd = #{auditStatusCd}
         </if>
+
+        <if test="communityId != null and communityId != ''">
+            and ms.community_id = #{communityId}
+        </if>
     </select>
 
     <!-- 修改小区成员 add by wuxw 2018-07-03 -->