Merge branch 'master' into wangfy-dev

java110-bean/src/main/java/com/java110/dto/CommunityMemberDto.java

@@ -34,6 +34,9 @@ public class CommunityMemberDto extends CommunityDto implements Serializable {
 
     private boolean noAuditEnterCommunity;
 
+    private String startTime;
+    private String endTime;
+
     public String getCommunityMemberId() {
         return communityMemberId;
     }
@@ -121,4 +124,20 @@ public class CommunityMemberDto extends CommunityDto implements Serializable {
     public void setSubMemberId(String subMemberId) {
         this.subMemberId = subMemberId;
     }
+
+    public String getStartTime() {
+        return startTime;
+    }
+
+    public void setStartTime(String startTime) {
+        this.startTime = startTime;
+    }
+
+    public String getEndTime() {
+        return endTime;
+    }
+
+    public void setEndTime(String endTime) {
+        this.endTime = endTime;
+    }
 }

java110-bean/src/main/java/com/java110/dto/community/CommunityDto.java

@@ -20,6 +20,7 @@ public class CommunityDto extends PageDto implements Serializable {
     private String nearbyLandmarks;
     private String cityCode;
     private String name;
+    private String nameLike;
     private String communityId;
     private String[] notInCommunityId;
     private String mapY;
@@ -36,6 +37,11 @@ public class CommunityDto extends PageDto implements Serializable {
     private String parentAreaCode;
     private String parentAreaName;
     private String tel;
+    private String payFeeMonth;
+    private String feePrice;
+
+    private String startTime;
+    private String endTime;
 
     private String communityArea;
 
@@ -240,4 +246,44 @@ public class CommunityDto extends PageDto implements Serializable {
     public void setTel(String tel) {
         this.tel = tel;
     }
+
+    public String getNameLike() {
+        return nameLike;
+    }
+
+    public void setNameLike(String nameLike) {
+        this.nameLike = nameLike;
+    }
+
+    public String getStartTime() {
+        return startTime;
+    }
+
+    public void setStartTime(String startTime) {
+        this.startTime = startTime;
+    }
+
+    public String getEndTime() {
+        return endTime;
+    }
+
+    public void setEndTime(String endTime) {
+        this.endTime = endTime;
+    }
+
+    public String getPayFeeMonth() {
+        return payFeeMonth;
+    }
+
+    public void setPayFeeMonth(String payFeeMonth) {
+        this.payFeeMonth = payFeeMonth;
+    }
+
+    public String getFeePrice() {
+        return feePrice;
+    }
+
+    public void setFeePrice(String feePrice) {
+        this.feePrice = feePrice;
+    }
 }

java110-bean/src/main/java/com/java110/dto/feePrintPage/FeePrintPageDto.java

+package com.java110.dto.feePrintPage;
+
+import com.java110.dto.PageDto;
+import com.java110.dto.feePrintPageTemplate.FeePrintPageTemplateDto;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * @ClassName FloorDto
+ * @Description 收据模板数据层封装
+ * @Author wuxw
+ * @Date 2019/4/24 8:52
+ * @Version 1.0
+ * add by wuxw 2019/4/24
+ **/
+public class FeePrintPageDto extends FeePrintPageTemplateDto implements Serializable {
+
+    private String pageUrl;
+    private String state;
+    private String pageId;
+    private String communityId;
+    private String pageName;
+
+
+    private Date createTime;
+
+    private String statusCd = "0";
+
+
+    public String getPageUrl() {
+        return pageUrl;
+    }
+
+    public void setPageUrl(String pageUrl) {
+        this.pageUrl = pageUrl;
+    }
+
+    public String getState() {
+        return state;
+    }
+
+    public void setState(String state) {
+        this.state = state;
+    }
+
+    public String getPageId() {
+        return pageId;
+    }
+
+    public void setPageId(String pageId) {
+        this.pageId = pageId;
+    }
+
+    public String getCommunityId() {
+        return communityId;
+    }
+
+    public void setCommunityId(String communityId) {
+        this.communityId = communityId;
+    }
+
+    public String getPageName() {
+        return pageName;
+    }
+
+    public void setPageName(String pageName) {
+        this.pageName = pageName;
+    }
+
+
+    public Date getCreateTime() {
+        return createTime;
+    }
+
+    public void setCreateTime(Date createTime) {
+        this.createTime = createTime;
+    }
+
+    public String getStatusCd() {
+        return statusCd;
+    }
+
+    public void setStatusCd(String statusCd) {
+        this.statusCd = statusCd;
+    }
+}

java110-bean/src/main/java/com/java110/dto/feePrintPageTemplate/FeePrintPageTemplateDto.java

+package com.java110.dto.feePrintPageTemplate;
+
+import com.java110.dto.PageDto;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * @ClassName FloorDto
+ * @Description 收据模板数据层封装
+ * @Author wuxw
+ * @Date 2019/4/24 8:52
+ * @Version 1.0
+ * add by wuxw 2019/4/24
+ **/
+public class FeePrintPageTemplateDto extends PageDto implements Serializable {
+
+    private String name;
+    private String templateName;
+    private String templateId;
+    private String url;
+
+
+    private Date createTime;
+
+    private String statusCd = "0";
+
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public String getTemplateId() {
+        return templateId;
+    }
+
+    public void setTemplateId(String templateId) {
+        this.templateId = templateId;
+    }
+
+    public String getUrl() {
+        return url;
+    }
+
+    public void setUrl(String url) {
+        this.url = url;
+    }
+
+
+    public Date getCreateTime() {
+        return createTime;
+    }
+
+    public void setCreateTime(Date createTime) {
+        this.createTime = createTime;
+    }
+
+    public String getStatusCd() {
+        return statusCd;
+    }
+
+    public void setStatusCd(String statusCd) {
+        this.statusCd = statusCd;
+    }
+
+    public String getTemplateName() {
+        return templateName;
+    }
+
+    public void setTemplateName(String templateName) {
+        this.templateName = templateName;
+    }
+}

java110-bean/src/main/java/com/java110/po/community/CommunityAttrPo.java

@@ -16,6 +16,7 @@ public class CommunityAttrPo implements Serializable {
     private String communityId;
     private String specCd;
     private String value;
+    private String statusCd;
 
     public String getAttrId() {
         return attrId;
@@ -48,4 +49,12 @@ public class CommunityAttrPo implements Serializable {
     public void setValue(String value) {
         this.value = value;
     }
+
+    public String getStatusCd() {
+        return statusCd;
+    }
+
+    public void setStatusCd(String statusCd) {
+        this.statusCd = statusCd;
+    }
 }

java110-bean/src/main/java/com/java110/po/community/CommunityMemberPo.java

@@ -17,6 +17,9 @@ public class CommunityMemberPo implements Serializable {
     private String memberId;
     private String memberTypeCd;
     private String auditStatusCd;
+    private String startTime;
+    private String endTime;
+    private String statusCd = "0";
 
     public String getCommunityMemberId() {
         return communityMemberId;
@@ -57,4 +60,28 @@ public class CommunityMemberPo implements Serializable {
     public void setAuditStatusCd(String auditStatusCd) {
         this.auditStatusCd = auditStatusCd;
     }
+
+    public String getStartTime() {
+        return startTime;
+    }
+
+    public void setStartTime(String startTime) {
+        this.startTime = startTime;
+    }
+
+    public String getEndTime() {
+        return endTime;
+    }
+
+    public void setEndTime(String endTime) {
+        this.endTime = endTime;
+    }
+
+    public String getStatusCd() {
+        return statusCd;
+    }
+
+    public void setStatusCd(String statusCd) {
+        this.statusCd = statusCd;
+    }
 }

java110-bean/src/main/java/com/java110/po/community/CommunityPo.java

@@ -25,6 +25,9 @@ public class CommunityPo implements Serializable {
     private String bId;
 
     private String communityArea;
+    private String payFeeMonth;
+    private String feePrice;
+
 
     private String statusCd = "0";
 
@@ -131,4 +134,20 @@ public class CommunityPo implements Serializable {
     public void setStatusCd(String statusCd) {
         this.statusCd = statusCd;
     }
+
+    public String getPayFeeMonth() {
+        return payFeeMonth;
+    }
+
+    public void setPayFeeMonth(String payFeeMonth) {
+        this.payFeeMonth = payFeeMonth;
+    }
+
+    public String getFeePrice() {
+        return feePrice;
+    }
+
+    public void setFeePrice(String feePrice) {
+        this.feePrice = feePrice;
+    }
 }

java110-bean/src/main/java/com/java110/po/fee/PayFeeConfigPo.java

@@ -32,6 +32,7 @@ public class PayFeeConfigPo implements Serializable {
     private String paymentCd;
 
     private String paymentCycle;
+    private String statusCd;
 
     public String getConfigId() {
         return configId;
@@ -152,4 +153,12 @@ public class PayFeeConfigPo implements Serializable {
     public void setComputingFormulaText(String computingFormulaText) {
         this.computingFormulaText = computingFormulaText;
     }
+
+    public String getStatusCd() {
+        return statusCd;
+    }
+
+    public void setStatusCd(String statusCd) {
+        this.statusCd = statusCd;
+    }
 }

java110-bean/src/main/java/com/java110/po/feePrintPage/FeePrintPagePo.java

+/*
+ * Copyright 2017-2020 吴学文 and java110 team.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.java110.po.feePrintPage;
+
+import java.io.Serializable;
+
+/**
+ * 类表述： Po 数据模型实体对象 基本保持与数据库模型一直 用于 增加修改删除 等时的数据载体
+ * add by 吴学文 at 2021-09-16 22:26:04 mail: 928255095@qq.com
+ * open source address: https://gitee.com/wuxw7/MicroCommunity
+ * 官网：http://www.homecommunity.cn
+ * 温馨提示：如果您对此文件进行修改 请不要删除原有作者及注释信息，请补充您的 修改的原因以及联系邮箱如下
+ * // modify by 张三 at 2021-09-12 第10行在某种场景下存在某种bug 需要修复，注释10至20行 加入 20行至30行
+ */
+public class FeePrintPagePo implements Serializable {
+
+    private String pageUrl;
+    private String statusCd = "0";
+    private String state;
+    private String pageId;
+    private String communityId;
+    private String pageName;
+
+    public String getPageUrl() {
+        return pageUrl;
+    }
+
+    public void setPageUrl(String pageUrl) {
+        this.pageUrl = pageUrl;
+    }
+
+    public String getStatusCd() {
+        return statusCd;
+    }
+
+    public void setStatusCd(String statusCd) {
+        this.statusCd = statusCd;
+    }
+
+    public String getState() {
+        return state;
+    }
+
+    public void setState(String state) {
+        this.state = state;
+    }
+
+    public String getPageId() {
+        return pageId;
+    }
+
+    public void setPageId(String pageId) {
+        this.pageId = pageId;
+    }
+
+    public String getCommunityId() {
+        return communityId;
+    }
+
+    public void setCommunityId(String communityId) {
+        this.communityId = communityId;
+    }
+
+    public String getPageName() {
+        return pageName;
+    }
+
+    public void setPageName(String pageName) {
+        this.pageName = pageName;
+    }
+
+
+}

java110-bean/src/main/java/com/java110/po/feePrintPageTemplate/FeePrintPageTemplatePo.java

+/*
+ * Copyright 2017-2020 吴学文 and java110 team.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.java110.po.feePrintPageTemplate;
+
+import java.io.Serializable;
+import java.util.Date;
+/**
+ * 类表述： Po 数据模型实体对象 基本保持与数据库模型一直 用于 增加修改删除 等时的数据载体
+ * add by 吴学文 at 2021-09-16 23:10:01 mail: 928255095@qq.com
+ * open source address: https://gitee.com/wuxw7/MicroCommunity
+ * 官网：http://www.homecommunity.cn
+ * 温馨提示：如果您对此文件进行修改 请不要删除原有作者及注释信息，请补充您的 修改的原因以及联系邮箱如下
+ * // modify by 张三 at 2021-09-12 第10行在某种场景下存在某种bug 需要修复，注释10至20行 加入 20行至30行
+ */
+public class FeePrintPageTemplatePo implements Serializable {
+
+    private String name;
+private String statusCd = "0";
+private String templateId;
+private String url;
+public String getName() {
+        return name;
+    }
+public void setName(String name) {
+        this.name = name;
+    }
+public String getStatusCd() {
+        return statusCd;
+    }
+public void setStatusCd(String statusCd) {
+        this.statusCd = statusCd;
+    }
+public String getTemplateId() {
+        return templateId;
+    }
+public void setTemplateId(String templateId) {
+        this.templateId = templateId;
+    }
+public String getUrl() {
+        return url;
+    }
+public void setUrl(String url) {
+        this.url = url;
+    }
+
+
+
+}

java110-bean/src/main/java/com/java110/po/owner/OwnerPo.java

@@ -24,6 +24,7 @@ public class OwnerPo implements Serializable {
     private String communityId;
     private String idCard;
     private String state;
+    private String statusCd;
 
     public String getMemberId() {
         return memberId;
@@ -120,4 +121,12 @@ public class OwnerPo implements Serializable {
     public void setState(String state) {
         this.state = state;
     }
+
+    public String getStatusCd() {
+        return statusCd;
+    }
+
+    public void setStatusCd(String statusCd) {
+        this.statusCd = statusCd;
+    }
 }

java110-bean/src/main/java/com/java110/po/unit/UnitPo.java

@@ -20,6 +20,7 @@ public class UnitPo implements Serializable {
     private String userId;
     private String remark;
     private String unitArea;
+    private String statusCd;
 
     public String getUnitId() {
         return unitId;
@@ -84,4 +85,12 @@ public class UnitPo implements Serializable {
     public void setUnitArea(String unitArea) {
         this.unitArea = unitArea;
     }
+
+    public String getStatusCd() {
+        return statusCd;
+    }
+
+    public void setStatusCd(String statusCd) {
+        this.statusCd = statusCd;
+    }
 }

java110-bean/src/main/java/com/java110/po/workflow/WorkflowPo.java

@@ -12,6 +12,7 @@ public class WorkflowPo implements Serializable {
     private String flowName;
     private String flowType;
     private String processDefinitionKey;
+    private String statusCd;
 
     public String getSkipLevel() {
         return skipLevel;
@@ -76,4 +77,12 @@ public class WorkflowPo implements Serializable {
     public void setProcessDefinitionKey(String processDefinitionKey) {
         this.processDefinitionKey = processDefinitionKey;
     }
+
+    public String getStatusCd() {
+        return statusCd;
+    }
+
+    public void setStatusCd(String statusCd) {
+        this.statusCd = statusCd;
+    }
 }

java110-core/src/main/java/com/java110/core/factory/AuthenticationFactory.java

@@ -72,10 +72,10 @@ public class AuthenticationFactory {
                 return null;
             }
             // 判断Key是否为16位
-            if (sKey.length() != 16) {
-                System.out.print("Key长度不是16位");
-                return null;
-            }
+//            if (sKey.length() != 16) {
+//                System.out.print("Key长度不是16位");
+//                return null;
+//            }
             byte[] raw = sKey.getBytes("utf-8");
             SecretKeySpec skeySpec = new SecretKeySpec(raw, "AES");
             Cipher cipher = Cipher.getInstance("AES/ECB/PKCS5Padding");//"算法/模式/补码方式"
@@ -98,10 +98,10 @@ public class AuthenticationFactory {
                 return null;
             }
             // 判断Key是否为16位
-            if (sKey.length() != 16) {
-                System.out.print("Key长度不是16位");
-                return null;
-            }
+//            if (sKey.length() != 16) {
+//                System.out.print("Key长度不是16位");
+//                return null;
+//            }
             byte[] raw = sKey.getBytes("utf-8");
             SecretKeySpec skeySpec = new SecretKeySpec(raw, "AES");
             Cipher cipher = Cipher.getInstance("AES/ECB/PKCS5Padding");

java110-db/src/main/java/com/java110/db/Java110MybatisInterceptor.java

@@ -78,6 +78,7 @@ public class Java110MybatisInterceptor implements Interceptor {
     private void dealDeleteSql(MappedStatement mappedStatement, Object parameter, String sql, Map<String, Object> sqlValue) {
 
         String tmpTable = sql.substring(sql.indexOf("into") + 4, sql.indexOf("(")).trim();
+        String tmpTableHasT = tmpTable;
         if(tmpTable.indexOf(" ") > 0){
             tmpTable = tmpTable.substring(0,tmpTable.indexOf(" "));
         }
@@ -85,7 +86,7 @@ public class Java110MybatisInterceptor implements Interceptor {
         //插入操作时之前的 没有数据 所以 preValue 为空对象
         JSONArray preValues = new JSONArray();
 
-        String execSql = "select * from " + tmpTable + " " + tmpWhere;
+        String execSql = "select * from " + tmpTableHasT + " " + tmpWhere;
 
         queryServiceDAOImpl = ApplicationContextFactory.getBean("queryServiceDAOImpl", IQueryServiceDAO.class);
         List<Map<String, Object>> deleteDatas = queryServiceDAOImpl.executeSql(execSql, null);
@@ -132,6 +133,8 @@ public class Java110MybatisInterceptor implements Interceptor {
 
         String tmpTable = sql.substring(sql.indexOf("update") + 6, sql.indexOf("set")).trim();
 
+        String tmpTableHasT = tmpTable;
+
         if(tmpTable.indexOf(" ") > 0){
             tmpTable = tmpTable.substring(0,tmpTable.indexOf(" "));
         }
@@ -141,7 +144,7 @@ public class Java110MybatisInterceptor implements Interceptor {
         JSONArray preValues = new JSONArray();
         JSONArray afterValues = new JSONArray();
         JSONObject afterVaule = null;
-        String execSql = "select * from " + tmpTable + " " + tmpWhere;
+        String execSql = "select * from " + tmpTableHasT + " " + tmpWhere;
         queryServiceDAOImpl = ApplicationContextFactory.getBean("queryServiceDAOImpl", IQueryServiceDAO.class);
         List<Map<String, Object>> deleteDatas = queryServiceDAOImpl.executeSql(execSql, null);
 

java110-db/src/main/resources/mapper/common/WorkflowV1ServiceDaoImplMapper.xml

+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="workflowV1ServiceDaoImpl">
+
+
+    <!-- 保存工作流程信息 add by wuxw 2018-07-03 -->
+    <insert id="saveWorkflowInfo" parameterType="Map">
+        insert into workflow(
+        skip_level,describle,community_id,store_id,flow_id,flow_name,flow_type,process_definition_key
+        ) values (
+        #{skipLevel},#{describle},#{communityId},#{storeId},#{flowId},#{flowName},#{flowType},#{processDefinitionKey}
+        )
+    </insert>
+
+
+    <!-- 查询工作流程信息 add by wuxw 2018-07-03 -->
+    <select id="getWorkflowInfo" parameterType="Map" resultType="Map">
+        select t.skip_level,t.skip_level skipLevel,t.describle,t.status_cd,t.status_cd
+        statusCd,t.community_id,t.community_id communityId,t.store_id,t.store_id storeId,t.flow_id,t.flow_id
+        flowId,t.flow_name,t.flow_name flowName,t.flow_type,t.flow_type
+        flowType,t.process_definition_key,t.process_definition_key processDefinitionKey
+        from workflow t
+        where 1 =1
+        <if test="skipLevel !=null and skipLevel != ''">
+            and t.skip_level= #{skipLevel}
+        </if>
+        <if test="describle !=null and describle != ''">
+            and t.describle= #{describle}
+        </if>
+        <if test="statusCd !=null and statusCd != ''">
+            and t.status_cd= #{statusCd}
+        </if>
+        <if test="communityId !=null and communityId != ''">
+            and t.community_id= #{communityId}
+        </if>
+        <if test="storeId !=null and storeId != ''">
+            and t.store_id= #{storeId}
+        </if>
+        <if test="flowId !=null and flowId != ''">
+            and t.flow_id= #{flowId}
+        </if>
+        <if test="flowName !=null and flowName != ''">
+            and t.flow_name= #{flowName}
+        </if>
+        <if test="flowType !=null and flowType != ''">
+            and t.flow_type= #{flowType}
+        </if>
+        <if test="processDefinitionKey !=null and processDefinitionKey != ''">
+            and t.process_definition_key= #{processDefinitionKey}
+        </if>
+        order by t.create_time desc
+        <if test="page != -1 and page != null ">
+            limit #{page}, #{row}
+        </if>
+
+    </select>
+
+
+    <!-- 修改工作流程信息 add by wuxw 2018-07-03 -->
+    <update id="updateWorkflowInfo" parameterType="Map">
+        update workflow t set t.status_cd = #{statusCd}
+        <if test="newBId != null and newBId != ''">
+            ,t.b_id = #{newBId}
+        </if>
+        <if test="skipLevel !=null and skipLevel != ''">
+            , t.skip_level= #{skipLevel}
+        </if>
+        <if test="describle !=null and describle != ''">
+            , t.describle= #{describle}
+        </if>
+        <if test="communityId !=null and communityId != ''">
+            , t.community_id= #{communityId}
+        </if>
+        <if test="storeId !=null and storeId != ''">
+            , t.store_id= #{storeId}
+        </if>
+        <if test="flowName !=null and flowName != ''">
+            , t.flow_name= #{flowName}
+        </if>
+        <if test="flowType !=null and flowType != ''">
+            , t.flow_type= #{flowType}
+        </if>
+        <if test="processDefinitionKey !=null and processDefinitionKey != ''">
+            , t.process_definition_key= #{processDefinitionKey}
+        </if>
+        where 1=1
+        <if test="flowId !=null and flowId != ''">
+            and t.flow_id= #{flowId}
+        </if>
+
+    </update>
+
+    <!-- 查询工作流程数量 add by wuxw 2018-07-03 -->
+    <select id="queryWorkflowsCount" parameterType="Map" resultType="Map">
+        select count(1) count
+        from workflow t
+        where 1 =1
+        <if test="skipLevel !=null and skipLevel != ''">
+            and t.skip_level= #{skipLevel}
+        </if>
+        <if test="describle !=null and describle != ''">
+            and t.describle= #{describle}
+        </if>
+        <if test="statusCd !=null and statusCd != ''">
+            and t.status_cd= #{statusCd}
+        </if>
+        <if test="communityId !=null and communityId != ''">
+            and t.community_id= #{communityId}
+        </if>
+        <if test="storeId !=null and storeId != ''">
+            and t.store_id= #{storeId}
+        </if>
+        <if test="flowId !=null and flowId != ''">
+            and t.flow_id= #{flowId}
+        </if>
+        <if test="flowName !=null and flowName != ''">
+            and t.flow_name= #{flowName}
+        </if>
+        <if test="flowType !=null and flowType != ''">
+            and t.flow_type= #{flowType}
+        </if>
+        <if test="processDefinitionKey !=null and processDefinitionKey != ''">
+            and t.process_definition_key= #{processDefinitionKey}
+        </if>
+
+
+    </select>
+
+</mapper>

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

+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="communityAttrV1ServiceDaoImpl">
+
+
+
+
+
+    <!-- 保存小区属性信息 add by wuxw 2018-07-03 -->
+    <insert id="saveCommunityAttrInfo" parameterType="Map">
+        insert into s_community_attr(
+attr_id,spec_cd,community_id,value
+) values (
+#{attrId},#{specCd},#{communityId},#{value}
+)
+    </insert>
+
+
+
+    <!-- 查询小区属性信息 add by wuxw 2018-07-03 -->
+    <select id="getCommunityAttrInfo" parameterType="Map" resultType="Map">
+        select  t.attr_id,t.attr_id attrId,t.spec_cd,t.spec_cd specCd,t.status_cd,t.status_cd statusCd,t.community_id,t.community_id communityId,t.value 
+from s_community_attr t 
+where 1 =1 
+<if test="attrId !=null and attrId != ''">
+   and t.attr_id= #{attrId}
+</if> 
+<if test="specCd !=null and specCd != ''">
+   and t.spec_cd= #{specCd}
+</if> 
+<if test="statusCd !=null and statusCd != ''">
+   and t.status_cd= #{statusCd}
+</if> 
+<if test="communityId !=null and communityId != ''">
+   and t.community_id= #{communityId}
+</if> 
+<if test="value !=null and value != ''">
+   and t.value= #{value}
+</if> 
+order by t.create_time desc
+<if test="page != -1 and page != null ">
+   limit #{page}, #{row}
+</if> 
+
+    </select>
+
+
+
+
+    <!-- 修改小区属性信息 add by wuxw 2018-07-03 -->
+    <update id="updateCommunityAttrInfo" parameterType="Map">
+        update  s_community_attr t set t.status_cd = #{statusCd}
+<if test="newBId != null and newBId != ''">
+,t.b_id = #{newBId}
+</if> 
+<if test="specCd !=null and specCd != ''">
+, t.spec_cd= #{specCd}
+</if> 
+<if test="communityId !=null and communityId != ''">
+, t.community_id= #{communityId}
+</if> 
+<if test="value !=null and value != ''">
+, t.value= #{value}
+</if> 
+ where 1=1 <if test="attrId !=null and attrId != ''">
+and t.attr_id= #{attrId}
+</if> 
+
+    </update>
+
+    <!-- 查询小区属性数量 add by wuxw 2018-07-03 -->
+     <select id="queryCommunityAttrsCount" parameterType="Map" resultType="Map">
+        select  count(1) count 
+from s_community_attr t 
+where 1 =1 
+<if test="attrId !=null and attrId != ''">
+   and t.attr_id= #{attrId}
+</if> 
+<if test="specCd !=null and specCd != ''">
+   and t.spec_cd= #{specCd}
+</if> 
+<if test="statusCd !=null and statusCd != ''">
+   and t.status_cd= #{statusCd}
+</if> 
+<if test="communityId !=null and communityId != ''">
+   and t.community_id= #{communityId}
+</if> 
+<if test="value !=null and value != ''">
+   and t.value= #{value}
+</if> 
+
+
+     </select>
+
+</mapper>

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

+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="communityMemberV1ServiceDaoImpl">
+    <!-- 保存小区成员信息 add by wuxw 2018-07-03 -->
+    <insert id="saveCommunityMemberInfo" parameterType="Map">
+        insert into s_community_member(
+        member_type_cd,start_time,end_time,community_id,community_member_id,member_id
+        ) values (
+        #{memberTypeCd},#{startTime},#{endTime},#{communityId},#{communityMemberId},#{memberId}
+        )
+    </insert>
+
+
+    <!-- 查询小区成员信息 add by wuxw 2018-07-03 -->
+    <select id="getCommunityMemberInfo" parameterType="Map" resultType="Map">
+        select t.member_type_cd,t.member_type_cd memberTypeCd,t.status_cd,t.status_cd statusCd,t.start_time,t.start_time
+        startTime,t.end_time,t.end_time endTime,t.community_id,t.community_id
+        communityId,t.community_member_id,t.community_member_id communityMemberId,t.member_id,t.member_id memberId
+        from s_community_member t
+        where 1 =1
+        <if test="memberTypeCd !=null and memberTypeCd != ''">
+            and t.member_type_cd= #{memberTypeCd}
+        </if>
+        <if test="statusCd !=null and statusCd != ''">
+            and t.status_cd= #{statusCd}
+        </if>
+        <if test="startTime !=null and startTime != ''">
+            and t.start_time= #{startTime}
+        </if>
+        <if test="endTime !=null and endTime != ''">
+            and t.end_time= #{endTime}
+        </if>
+        <if test="communityId !=null and communityId != ''">
+            and t.community_id= #{communityId}
+        </if>
+        <if test="communityMemberId !=null and communityMemberId != ''">
+            and t.community_member_id= #{communityMemberId}
+        </if>
+        <if test="memberId !=null and memberId != ''">
+            and t.member_id= #{memberId}
+        </if>
+        order by t.create_time desc
+        <if test="page != -1 and page != null ">
+            limit #{page}, #{row}
+        </if>
+
+    </select>
+
+
+    <!-- 修改小区成员信息 add by wuxw 2018-07-03 -->
+    <update id="updateCommunityMemberInfo" parameterType="Map">
+        update s_community_member t set t.status_cd = #{statusCd}
+        <if test="newBId != null and newBId != ''">
+            ,t.b_id = #{newBId}
+        </if>
+        <if test="memberTypeCd !=null and memberTypeCd != ''">
+            , t.member_type_cd= #{memberTypeCd}
+        </if>
+        <if test="startTime !=null and startTime != ''">
+            , t.start_time= #{startTime}
+        </if>
+        <if test="endTime !=null and endTime != ''">
+            , t.end_time= #{endTime}
+        </if>
+        <if test="communityId !=null and communityId != ''">
+            , t.community_id= #{communityId}
+        </if>
+        <if test="communityMemberId !=null and communityMemberId != ''">
+            , t.community_member_id= #{communityMemberId}
+        </if>
+        where 1=1
+        <if test="memberId !=null and memberId != ''">
+            and t.member_id= #{memberId}
+        </if>
+
+    </update>
+
+    <!-- 查询小区成员数量 add by wuxw 2018-07-03 -->
+    <select id="queryCommunityMembersCount" parameterType="Map" resultType="Map">
+        select count(1) count
+        from s_community_member t
+        where 1 =1
+        <if test="memberTypeCd !=null and memberTypeCd != ''">
+            and t.member_type_cd= #{memberTypeCd}
+        </if>
+        <if test="statusCd !=null and statusCd != ''">
+            and t.status_cd= #{statusCd}
+        </if>
+        <if test="startTime !=null and startTime != ''">
+            and t.start_time= #{startTime}
+        </if>
+        <if test="endTime !=null and endTime != ''">
+            and t.end_time= #{endTime}
+        </if>
+        <if test="communityId !=null and communityId != ''">
+            and t.community_id= #{communityId}
+        </if>
+        <if test="communityMemberId !=null and communityMemberId != ''">
+            and t.community_member_id= #{communityMemberId}
+        </if>
+        <if test="memberId !=null and memberId != ''">
+            and t.member_id= #{memberId}
+        </if>
+
+
+    </select>
+
+</mapper>

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

@@ -275,15 +275,15 @@
     <!--小区成员加入 add by wuxw 2018-10-27 saveBusinessCommunityMember-->
     <insert id="saveBusinessCommunityMember" parameterType="Map">
         insert into
-        business_community_member(community_member_id,b_id,community_id,member_id,member_type_cd,month,operate,audit_status_cd)
-        values(#{communityMemberId},#{bId},#{communityId},#{memberId},#{memberTypeCd},#{month},#{operate},#{auditStatusCd})
+        business_community_member(community_member_id,b_id,community_id,member_id,member_type_cd,month,operate,audit_status_cd,start_time,end_time)
+        values(#{communityMemberId},#{bId},#{communityId},#{memberId},#{memberTypeCd},#{month},#{operate},#{auditStatusCd},#{startTime},#{endTime})
     </insert>
 
     <!-- 小区成员加入 instance表中 add by wuxw 2018-10-27 -->
     <insert id="saveCommunityMemberInstance" parameterType="Map">
         insert into
-        s_community_member(community_member_id,b_id,community_id,member_id,member_type_cd,status_cd,audit_status_cd)
-        select ms.community_member_id,ms.b_id,ms.community_id,ms.member_id,ms.member_type_cd,'0',ms.audit_status_cd
+        s_community_member(community_member_id,b_id,community_id,member_id,member_type_cd,status_cd,audit_status_cd,start_time,end_time)
+        select ms.community_member_id,ms.b_id,ms.community_id,ms.member_id,ms.member_type_cd,'0',ms.audit_status_cd,ms.start_time,ms.end_time
         from business_community_member ms where
         ms.operate = 'ADD' and ms.b_id=#{bId}
         <if test="communityId != null and communityId != ''">
@@ -294,7 +294,7 @@
     <!-- 查询小区成员 add by wuxw 2018-10-27 getBusinessCommunityMember-->
     <select id="getBusinessCommunityMember" parameterType="Map" resultType="Map">
         select
-        ms.community_member_id,ms.b_id,ms.community_id,ms.member_id,ms.member_type_cd,ms.operate,ms.audit_status_cd
+        ms.community_member_id,ms.b_id,ms.community_id,ms.member_id,ms.member_type_cd,ms.operate,ms.audit_status_cd,ms.start_time,ms.end_time
         from business_community_member ms where 1 = 1
         <if test="operate != null and operate != ''">
             and ms.operate = #{operate}
@@ -315,6 +315,7 @@
         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,
+        ms.start_time,ms.end_time,ms.start_time startTime,ms.end_time endTime,
         (CASE
         WHEN ms.audit_status_cd='1000'
         THEN '待审核'
@@ -392,6 +393,12 @@
         <if test="auditStatusCd !=null and auditStatusCd !=''">
             ,ms.audit_status_cd = #{auditStatusCd}
         </if>
+        <if test="startTime !=null ">
+            ,ms.start_time = #{startTime}
+        </if>
+        <if test="endTime !=null ">
+            ,ms.end_time = #{endTime}
+        </if>
         where 1=1
         <if test="bId != null and bId !=''">
             and ms.b_id = #{bId}
@@ -482,7 +489,7 @@
         '审核拒绝'
         END) stateName,ca.area_code areaCode,ca.area_name areaName,
         ca.parent_area_code parentAreaCode,ca.parent_area_name parentAreaName,
-        t.community_area communityArea
+        t.community_area communityArea,t.pay_fee_month,t.pay_fee_month payFeeMonth,t.fee_price,t.fee_price feePrice
         from s_community t,city_area ca
         <if test="memberId !=null and memberId !=''">
             ,s_community_member cm
@@ -500,7 +507,10 @@
             and t.city_code= #{cityCode}
         </if>
         <if test="name !=null and name != ''">
-            and t.name like concat('%',#{name},'%')
+            and t.name = #{name}
+        </if>
+        <if test="nameLike !=null and nameLike != ''">
+            and t.name like concat('%',#{nameLike},'%')
         </if>
         <if test="statusCd !=null and statusCd != ''">
             and t.status_cd= #{statusCd}
@@ -628,6 +638,8 @@
         scm.`member_type_cd` memberTypeCd,
         scm.audit_status_cd auditStatusCd,
         scm.`status_cd` statusCd,
+        scm.`start_time` startTime,
+        scm.`end_time` endTime,
         ca.area_name areaName,
         ca.parent_area_name cityName,
         ca1.parent_area_name provName,

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

+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="communityV1ServiceDaoImpl">
+
+
+    <!-- 保存小区管理信息 add by wuxw 2018-07-03 -->
+    <insert id="saveCommunityInfo" parameterType="Map">
+        insert into s_community(
+        fee_price,address,city_code,map_y,pay_fee_month,map_x,nearby_landmarks,name,tel,state,community_id,community_area
+        ) values (
+        #{feePrice},#{address},#{cityCode},#{mapY},#{payFeeMonth},#{mapX},#{nearbyLandmarks},#{name},#{tel},#{state},#{communityId},#{communityArea}
+        )
+    </insert>
+
+
+    <!-- 查询小区管理信息 add by wuxw 2018-07-03 -->
+    <select id="getCommunityInfo" parameterType="Map" resultType="Map">
+        select t.fee_price,t.fee_price feePrice,t.address,t.city_code,t.city_code cityCode,t.status_cd,t.status_cd
+        statusCd,t.map_y,t.map_y mapY,t.pay_fee_month,t.pay_fee_month payFeeMonth,t.map_x,t.map_x
+        mapX,t.nearby_landmarks,t.nearby_landmarks nearbyLandmarks,t.name,t.tel,t.state,t.community_id,t.community_id
+        communityId,t.community_area,t.community_area communityArea
+        from s_community t
+        where 1 =1
+        <if test="feePrice !=null and feePrice != ''">
+            and t.fee_price= #{feePrice}
+        </if>
+        <if test="address !=null and address != ''">
+            and t.address= #{address}
+        </if>
+        <if test="cityCode !=null and cityCode != ''">
+            and t.city_code= #{cityCode}
+        </if>
+        <if test="statusCd !=null and statusCd != ''">
+            and t.status_cd= #{statusCd}
+        </if>
+        <if test="mapY !=null and mapY != ''">
+            and t.map_y= #{mapY}
+        </if>
+        <if test="payFeeMonth !=null and payFeeMonth != ''">
+            and t.pay_fee_month= #{payFeeMonth}
+        </if>
+        <if test="mapX !=null and mapX != ''">
+            and t.map_x= #{mapX}
+        </if>
+        <if test="nearbyLandmarks !=null and nearbyLandmarks != ''">
+            and t.nearby_landmarks= #{nearbyLandmarks}
+        </if>
+        <if test="name !=null and name != ''">
+            and t.name= #{name}
+        </if>
+        <if test="tel !=null and tel != ''">
+            and t.tel= #{tel}
+        </if>
+        <if test="state !=null and state != ''">
+            and t.state= #{state}
+        </if>
+        <if test="communityId !=null and communityId != ''">
+            and t.community_id= #{communityId}
+        </if>
+        <if test="communityArea !=null and communityArea != ''">
+            and t.community_area= #{communityArea}
+        </if>
+        order by t.create_time desc
+        <if test="page != -1 and page != null ">
+            limit #{page}, #{row}
+        </if>
+
+    </select>
+
+
+    <!-- 修改小区管理信息 add by wuxw 2018-07-03 -->
+    <update id="updateCommunityInfo" parameterType="Map">
+        update s_community t set t.status_cd = #{statusCd}
+        <if test="newBId != null and newBId != ''">
+            ,t.b_id = #{newBId}
+        </if>
+        <if test="feePrice !=null and feePrice != ''">
+            , t.fee_price= #{feePrice}
+        </if>
+        <if test="address !=null and address != ''">
+            , t.address= #{address}
+        </if>
+        <if test="cityCode !=null and cityCode != ''">
+            , t.city_code= #{cityCode}
+        </if>
+        <if test="mapY !=null and mapY != ''">
+            , t.map_y= #{mapY}
+        </if>
+        <if test="payFeeMonth !=null and payFeeMonth != ''">
+            , t.pay_fee_month= #{payFeeMonth}
+        </if>
+        <if test="mapX !=null and mapX != ''">
+            , t.map_x= #{mapX}
+        </if>
+        <if test="nearbyLandmarks !=null and nearbyLandmarks != ''">
+            , t.nearby_landmarks= #{nearbyLandmarks}
+        </if>
+        <if test="name !=null and name != ''">
+            , t.name= #{name}
+        </if>
+        <if test="tel !=null and tel != ''">
+            , t.tel= #{tel}
+        </if>
+        <if test="state !=null and state != ''">
+            , t.state= #{state}
+        </if>
+        <if test="communityArea !=null and communityArea != ''">
+            , t.community_area= #{communityArea}
+        </if>
+        where 1=1
+        <if test="communityId !=null and communityId != ''">
+            and t.community_id= #{communityId}
+        </if>
+
+    </update>
+
+    <!-- 查询小区管理数量 add by wuxw 2018-07-03 -->
+    <select id="queryCommunitysCount" parameterType="Map" resultType="Map">
+        select count(1) count
+        from s_community t
+        where 1 =1
+        <if test="feePrice !=null and feePrice != ''">
+            and t.fee_price= #{feePrice}
+        </if>
+        <if test="address !=null and address != ''">
+            and t.address= #{address}
+        </if>
+        <if test="cityCode !=null and cityCode != ''">
+            and t.city_code= #{cityCode}
+        </if>
+        <if test="statusCd !=null and statusCd != ''">
+            and t.status_cd= #{statusCd}
+        </if>
+        <if test="mapY !=null and mapY != ''">
+            and t.map_y= #{mapY}
+        </if>
+        <if test="payFeeMonth !=null and payFeeMonth != ''">
+            and t.pay_fee_month= #{payFeeMonth}
+        </if>
+        <if test="mapX !=null and mapX != ''">
+            and t.map_x= #{mapX}
+        </if>
+        <if test="nearbyLandmarks !=null and nearbyLandmarks != ''">
+            and t.nearby_landmarks= #{nearbyLandmarks}
+        </if>
+        <if test="name !=null and name != ''">
+            and t.name= #{name}
+        </if>
+        <if test="tel !=null and tel != ''">
+            and t.tel= #{tel}
+        </if>
+        <if test="state !=null and state != ''">
+            and t.state= #{state}
+        </if>
+        <if test="communityId !=null and communityId != ''">
+            and t.community_id= #{communityId}
+        </if>
+        <if test="communityArea !=null and communityArea != ''">
+            and t.community_area= #{communityArea}
+        </if>
+
+
+    </select>
+
+</mapper>