Merge remote-tracking branch 'origin/xinghong-dev'

java110-bean/src/main/java/com/java110/dto/account/AccountDto.java

@@ -39,7 +39,8 @@ public class AccountDto extends PageDto implements Serializable {
     private String objType;
     private String partId;
     private String hasMoney; // 1 标识有
-
+    private String link;
+    private String idCard;
 
     private Date createTime;
 
@@ -134,4 +135,20 @@ public class AccountDto extends PageDto implements Serializable {
     public void setHasMoney(String hasMoney) {
         this.hasMoney = hasMoney;
     }
+
+    public String getLink() {
+        return link;
+    }
+
+    public void setLink(String link) {
+        this.link = link;
+    }
+
+    public String getIdCard() {
+        return idCard;
+    }
+
+    public void setIdCard(String idCard) {
+        this.idCard = idCard;
+    }
 }

java110-bean/src/main/java/com/java110/dto/applyRoomDiscount/ApplyRoomDiscountDto.java

@@ -42,6 +42,9 @@ public class ApplyRoomDiscountDto extends PageDto implements Serializable {
     private Date createTime;
 
     private String bId;
+    private String feeId;
+    private String returnWay;
+    private String returnAmount;
 
     private String statusCd = "0";
 
@@ -228,4 +231,28 @@ public class ApplyRoomDiscountDto extends PageDto implements Serializable {
     public void setbId(String bId) {
         this.bId = bId;
     }
+
+    public String getFeeId() {
+        return feeId;
+    }
+
+    public void setFeeId(String feeId) {
+        this.feeId = feeId;
+    }
+
+    public String getReturnWay() {
+        return returnWay;
+    }
+
+    public void setReturnWay(String returnWay) {
+        this.returnWay = returnWay;
+    }
+
+    public String getReturnAmount() {
+        return returnAmount;
+    }
+
+    public void setReturnAmount(String returnAmount) {
+        this.returnAmount = returnAmount;
+    }
 }

java110-bean/src/main/java/com/java110/dto/communitySetting/CommunitySettingDto.java

+package com.java110.dto.communitySetting;
+
+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 CommunitySettingDto extends PageDto implements Serializable {
+
+    private String csId;
+    private String settingValue;
+    private String remark;
+    private String communityId;
+    private String settingKey;
+    private String settingType;
+    private String settingTypeName;
+    private String settingName;
+
+    private Date createTime;
+
+    private String statusCd = "0";
+
+    public String getCsId() {
+        return csId;
+    }
+
+    public void setCsId(String csId) {
+        this.csId = csId;
+    }
+
+    public String getSettingValue() {
+        return settingValue;
+    }
+
+    public void setSettingValue(String settingValue) {
+        this.settingValue = settingValue;
+    }
+
+    public String getRemark() {
+        return remark;
+    }
+
+    public void setRemark(String remark) {
+        this.remark = remark;
+    }
+
+    public String getCommunityId() {
+        return communityId;
+    }
+
+    public void setCommunityId(String communityId) {
+        this.communityId = communityId;
+    }
+
+    public String getSettingKey() {
+        return settingKey;
+    }
+
+    public void setSettingKey(String settingKey) {
+        this.settingKey = settingKey;
+    }
+
+    public String getSettingType() {
+        return settingType;
+    }
+
+    public void setSettingType(String settingType) {
+        this.settingType = settingType;
+    }
+
+    public String getSettingName() {
+        return settingName;
+    }
+
+    public void setSettingName(String settingName) {
+        this.settingName = settingName;
+    }
+
+    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 getSettingTypeName() {
+        return settingTypeName;
+    }
+
+    public void setSettingTypeName(String settingTypeName) {
+        this.settingTypeName = settingTypeName;
+    }
+}

java110-bean/src/main/java/com/java110/dto/feeDiscount/FeeDiscountRuleDto.java

@@ -21,6 +21,7 @@ public class FeeDiscountRuleDto extends PageDto implements Serializable {
     private String ruleId;
     private String beanImpl;
     private String discountType;
+    private String discountSmallType;
 
     private List<FeeDiscountRuleSpecDto> feeDiscountRuleSpecs;
 
@@ -94,4 +95,12 @@ public class FeeDiscountRuleDto extends PageDto implements Serializable {
     public void setDiscountType(String discountType) {
         this.discountType = discountType;
     }
+
+    public String getDiscountSmallType() {
+        return discountSmallType;
+    }
+
+    public void setDiscountSmallType(String discountSmallType) {
+        this.discountSmallType = discountSmallType;
+    }
 }

java110-bean/src/main/java/com/java110/dto/reportFeeMonthStatistics/ReportFeeMonthStatisticsDto.java

@@ -46,6 +46,7 @@ public class ReportFeeMonthStatisticsDto extends PageDto implements Serializable
     private String contractCode;
     private String payerObjType;
     private String ownerName;
+    private String detailId;
 
     private String objCount;
     private String normalCount;
@@ -601,4 +602,12 @@ public class ReportFeeMonthStatisticsDto extends PageDto implements Serializable
     public void setCurOweAmount(String curOweAmount) {
         this.curOweAmount = curOweAmount;
     }
+
+    public String getDetailId() {
+        return detailId;
+    }
+
+    public void setDetailId(String detailId) {
+        this.detailId = detailId;
+    }
 }

java110-bean/src/main/java/com/java110/dto/roomRenovation/RoomRenovationDto.java

@@ -30,6 +30,11 @@ public class RoomRenovationDto extends PageDto implements Serializable {
     private String personTel;
     //当前用户id
     private String userId;
+    private String isPostpone;
+    private String postponeTime;
+    private String renovationCompany;
+    private String personMain;
+    private String personMainTel;
 
 
     private Date createTime;
@@ -165,4 +170,44 @@ public class RoomRenovationDto extends PageDto implements Serializable {
     public void setUserId(String userId) {
         this.userId = userId;
     }
+
+    public String getIsPostpone() {
+        return isPostpone;
+    }
+
+    public void setIsPostpone(String isPostpone) {
+        this.isPostpone = isPostpone;
+    }
+
+    public String getPostponeTime() {
+        return postponeTime;
+    }
+
+    public void setPostponeTime(String postponeTime) {
+        this.postponeTime = postponeTime;
+    }
+
+    public String getRenovationCompany() {
+        return renovationCompany;
+    }
+
+    public void setRenovationCompany(String renovationCompany) {
+        this.renovationCompany = renovationCompany;
+    }
+
+    public String getPersonMain() {
+        return personMain;
+    }
+
+    public void setPersonMain(String personMain) {
+        this.personMain = personMain;
+    }
+
+    public String getPersonMainTel() {
+        return personMainTel;
+    }
+
+    public void setPersonMainTel(String personMainTel) {
+        this.personMainTel = personMainTel;
+    }
 }

java110-bean/src/main/java/com/java110/po/applyRoomDiscount/ApplyRoomDiscountPo.java

@@ -22,6 +22,9 @@ public class ApplyRoomDiscountPo implements Serializable {
     private String state;
     private String communityId;
     private String discountId;
+    private String feeId;
+    private String returnWay;
+    private String returnAmount;
 
     //是否可用状态
     private String inUse;
@@ -180,4 +183,28 @@ public class ApplyRoomDiscountPo implements Serializable {
     public void setbId(String bId) {
         this.bId = bId;
     }
+
+    public String getFeeId() {
+        return feeId;
+    }
+
+    public void setFeeId(String feeId) {
+        this.feeId = feeId;
+    }
+
+    public String getReturnWay() {
+        return returnWay;
+    }
+
+    public void setReturnWay(String returnWay) {
+        this.returnWay = returnWay;
+    }
+
+    public String getReturnAmount() {
+        return returnAmount;
+    }
+
+    public void setReturnAmount(String returnAmount) {
+        this.returnAmount = returnAmount;
+    }
 }

java110-bean/src/main/java/com/java110/po/communitySetting/CommunitySettingPo.java

+package com.java110.po.communitySetting;
+
+import java.io.Serializable;
+
+public class CommunitySettingPo implements Serializable {
+
+    private String csId;
+    private String settingValue;
+    private String remark;
+    private String statusCd = "0";
+    private String communityId;
+    private String settingKey;
+    private String settingType;
+    private String settingName;
+
+    public String getCsId() {
+        return csId;
+    }
+
+    public void setCsId(String csId) {
+        this.csId = csId;
+    }
+
+    public String getSettingValue() {
+        return settingValue;
+    }
+
+    public void setSettingValue(String settingValue) {
+        this.settingValue = settingValue;
+    }
+
+    public String getRemark() {
+        return remark;
+    }
+
+    public void setRemark(String remark) {
+        this.remark = remark;
+    }
+
+    public String getStatusCd() {
+        return statusCd;
+    }
+
+    public void setStatusCd(String statusCd) {
+        this.statusCd = statusCd;
+    }
+
+    public String getCommunityId() {
+        return communityId;
+    }
+
+    public void setCommunityId(String communityId) {
+        this.communityId = communityId;
+    }
+
+    public String getSettingKey() {
+        return settingKey;
+    }
+
+    public void setSettingKey(String settingKey) {
+        this.settingKey = settingKey;
+    }
+
+    public String getSettingType() {
+        return settingType;
+    }
+
+    public void setSettingType(String settingType) {
+        this.settingType = settingType;
+    }
+
+    public String getSettingName() {
+        return settingName;
+    }
+
+    public void setSettingName(String settingName) {
+        this.settingName = settingName;
+    }
+
+
+}

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

@@ -26,7 +26,7 @@ public class PayFeePo implements Serializable {
     private String state;
     private String configId;
     private String payerObjType;
-    private String statusCd;
+    private String statusCd = "0";
     private String createTime;
     private String batchId;
 

java110-bean/src/main/java/com/java110/po/roomRenovation/RoomRenovationPo.java

@@ -23,6 +23,11 @@ public class RoomRenovationPo implements Serializable {
     private String videoName;
     private String isTrue;
     private String isTrueName;
+    private String isPostpone;
+    private String postponeTime;
+    private String renovationCompany;
+    private String personMain;
+    private String personMainTel;
 
     public String getStatusCd() {
         return statusCd;
@@ -167,4 +172,44 @@ public class RoomRenovationPo implements Serializable {
     public void setIsTrueName(String isTrueName) {
         this.isTrueName = isTrueName;
     }
+
+    public String getIsPostpone() {
+        return isPostpone;
+    }
+
+    public void setIsPostpone(String isPostpone) {
+        this.isPostpone = isPostpone;
+    }
+
+    public String getPostponeTime() {
+        return postponeTime;
+    }
+
+    public void setPostponeTime(String postponeTime) {
+        this.postponeTime = postponeTime;
+    }
+
+    public String getRenovationCompany() {
+        return renovationCompany;
+    }
+
+    public void setRenovationCompany(String renovationCompany) {
+        this.renovationCompany = renovationCompany;
+    }
+
+    public String getPersonMain() {
+        return personMain;
+    }
+
+    public void setPersonMain(String personMain) {
+        this.personMain = personMain;
+    }
+
+    public String getPersonMainTel() {
+        return personMainTel;
+    }
+
+    public void setPersonMainTel(String personMainTel) {
+        this.personMainTel = personMainTel;
+    }
 }

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

@@ -207,6 +207,7 @@ public class GenerateCodeFactory {
     public static final String CODE_PREFIX_rssId = "33";
     public static final String CODE_PREFIX_pfId = "34";
     public static final String CODE_PREFIX_ARDRID = "35";
+    public static final String CODE_PREFIX_csId = "36";
     public static final String CODE_PREFIX_bankId = "74";
     public static final String CODE_PREFIX_bondId = "76";
     public static final String CODE_PREFIX_bobjId = "77";

java110-db/src/main/resources/mapper/community/CommunitySettingServiceDaoImplMapper.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="communitySettingServiceDaoImpl">
+
+
+    <!-- 保存小区相关设置信息 add by wuxw 2018-07-03 -->
+    <insert id="saveCommunitySettingInfo" parameterType="Map">
+        insert into community_setting(
+            cs_id,setting_value,remark,community_id,setting_key,setting_type,setting_name
+        ) values (
+            #{csId},#{settingValue},#{remark},#{communityId},#{settingKey},#{settingType},#{settingName}
+        )
+    </insert>
+
+
+    <!-- 查询小区相关设置信息 add by wuxw 2018-07-03 -->
+    <select id="getCommunitySettingInfo" parameterType="Map" resultType="Map">
+        select t.cs_id,t.cs_id csId,t.setting_value,t.setting_value settingValue,t.remark,t.status_cd,t.status_cd
+        statusCd,t.community_id,t.community_id communityId,t.setting_key,t.setting_key
+        settingKey,t.setting_type,t.setting_type settingType,t.setting_name,t.setting_name settingName,
+        td.name settingTypeName
+        from community_setting t
+        left join t_dict td on t.setting_type = td.status_cd and td.table_name = 'community_setting' and
+        td.table_columns = 'setting_type'
+        where 1 = 1
+        <if test="csId !=null and csId != ''">
+            and t.cs_id= #{csId}
+        </if>
+        <if test="settingValue !=null and settingValue != ''">
+            and t.setting_value= #{settingValue}
+        </if>
+        <if test="remark !=null and remark != ''">
+            and t.remark= #{remark}
+        </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="settingKey !=null and settingKey != ''">
+            and t.setting_key= #{settingKey}
+        </if>
+        <if test="settingType !=null and settingType != ''">
+            and t.setting_type= #{settingType}
+        </if>
+        <if test="settingName !=null and settingName != ''">
+            and t.setting_name= #{settingName}
+        </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="updateCommunitySettingInfo" parameterType="Map">
+        update community_setting t set t.status_cd = #{statusCd}
+        <if test="newBId != null and newBId != ''">
+            ,t.b_id = #{newBId}
+        </if>
+        <if test="settingValue !=null and settingValue != ''">
+            , t.setting_value= #{settingValue}
+        </if>
+        <if test="remark !=null and remark != ''">
+            , t.remark= #{remark}
+        </if>
+        <if test="communityId !=null and communityId != ''">
+            , t.community_id= #{communityId}
+        </if>
+        <if test="settingKey !=null and settingKey != ''">
+            , t.setting_key= #{settingKey}
+        </if>
+        <if test="settingType !=null and settingType != ''">
+            , t.setting_type= #{settingType}
+        </if>
+        <if test="settingName !=null and settingName != ''">
+            , t.setting_name= #{settingName}
+        </if>
+        where 1=1
+        <if test="csId !=null and csId != ''">
+            and t.cs_id= #{csId}
+        </if>
+
+    </update>
+
+    <!-- 查询小区相关设置数量 add by wuxw 2018-07-03 -->
+    <select id="queryCommunitySettingsCount" parameterType="Map" resultType="Map">
+        select count(1) count
+        from community_setting t
+        where 1 =1
+        <if test="csId !=null and csId != ''">
+            and t.cs_id= #{csId}
+        </if>
+        <if test="settingValue !=null and settingValue != ''">
+            and t.setting_value= #{settingValue}
+        </if>
+        <if test="remark !=null and remark != ''">
+            and t.remark= #{remark}
+        </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="settingKey !=null and settingKey != ''">
+            and t.setting_key= #{settingKey}
+        </if>
+        <if test="settingType !=null and settingType != ''">
+            and t.setting_type= #{settingType}
+        </if>
+        <if test="settingName !=null and settingName != ''">
+            and t.setting_name= #{settingName}
+        </if>
+
+
+    </select>
+
+</mapper>

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

@@ -7,9 +7,9 @@
     <!-- 保存装修申请信息 add by wuxw 2018-07-03 -->
     <insert id="saveRoomRenovationInfo" parameterType="Map">
         insert into room_renovation(
-        remark,is_violation,r_id,room_id,room_name,person_name,violation_desc,start_time,end_time,state,community_id,person_tel
+        remark,is_violation,r_id,room_id,room_name,person_name,violation_desc,start_time,end_time,state,community_id,person_tel,is_postpone,postpone_time,renovation_company,person_main,person_main_tel
         ) values (
-        #{remark},#{isViolation},#{rId},#{roomId},#{roomName},#{personName},#{violationDesc},#{startTime},#{endTime},#{state},#{communityId},#{personTel}
+        #{remark},#{isViolation},#{rId},#{roomId},#{roomName},#{personName},#{violationDesc},#{startTime},#{endTime},#{state},#{communityId},#{personTel},#{isPostpone},#{postponeTime},#{renovationCompany},#{personMain},#{personMainTel}
         )
     </insert>
 
@@ -19,7 +19,8 @@
         rId,t.room_id,t.room_id roomId,t.room_name,t.room_name roomName,t.person_name,t.person_name
         personName,t.violation_desc,t.violation_desc violationDesc,t.start_time,t.start_time
         startTime,t.end_time,t.end_time endTime,t.state,td.name stateName,t.community_id,t.community_id
-        communityId,t.person_tel,t.person_tel personTel,t.create_time createTime
+        communityId,t.person_tel,t.person_tel personTel,t.create_time createTime,t.is_postpone,t.is_postpone isPostpone,t.postpone_time,t.postpone_time postponeTime,
+        t.renovation_company,t.renovation_company renovationCompany,t.person_main,t.person_main personMain,t.person_main_tel,t.person_main_tel personMainTel
         from room_renovation t
         left join t_dict td on td.table_name='room_renovation' and td.table_columns='state'
         and t.state=td.status_cd
@@ -33,6 +34,9 @@
         <if test="isViolation !=null and isViolation != ''">
             and t.is_violation= #{isViolation}
         </if>
+        <if test="isPostpone !=null and isPostpone != ''">
+            and t.is_postpone= #{isPostpone}
+        </if>
         <if test="rId !=null and rId != ''">
             and t.r_id= #{rId}
         </if>
@@ -112,6 +116,21 @@
         <if test="examineRemark != null and examineRemark != ''">
             , t.examineRemark = #{examineRemark}
         </if>
+        <if test="isPostpone != null and isPostpone != ''">
+            , t.is_postpone = #{isPostpone}
+        </if>
+        <if test="postponeTime != null and postponeTime != ''">
+            , t.postpone_time = #{postponeTime}
+        </if>
+        <if test="renovationCompany != null and renovationCompany != ''">
+            , t.renovation_company = #{renovationCompany}
+        </if>
+        <if test="personMain != null and personMain != ''">
+            , t.person_main = #{personMain}
+        </if>
+        <if test="personMainTel != null and personMainTel != ''">
+            , t.person_main_tel = #{personMainTel}
+        </if>
         where 1=1
         <if test="rId !=null and rId != ''">
             and t.r_id= #{rId}
@@ -174,6 +193,21 @@
         <if test="personTel !=null and personTel != ''">
             and t.person_tel= #{personTel}
         </if>
+        <if test="isPostpone != null and isPostpone != ''">
+            and t.is_postpone = #{isPostpone}
+        </if>
+        <if test="postponeTime != null and postponeTime != ''">
+            and t.postpone_time = #{postponeTime}
+        </if>
+        <if test="renovationCompany != null and renovationCompany != ''">
+            and t.renovation_company = #{renovationCompany}
+        </if>
+        <if test="personMain != null and personMain != ''">
+            and t.person_main = #{personMain}
+        </if>
+        <if test="personMainTel != null and personMainTel != ''">
+            and t.person_main_tel = #{personMainTel}
+        </if>
     </select>
 
 </mapper>

java110-db/src/main/resources/mapper/fee/ApplyRoomDiscountServiceDaoImplMapper.xml

@@ -7,10 +7,10 @@
     <!-- 保存房屋折扣申请信息 add by wuxw 2018-07-03 -->
     <insert id="saveApplyRoomDiscountInfo" parameterType="Map">
         insert into apply_room_discount(
-        apply_type,ard_id,create_user_name,create_user_tel,create_remark,check_user_id,check_remark,room_id,room_name,review_user_id,review_remark,start_time,end_time,state,community_id,discount_id,in_use
+        apply_type,ard_id,create_user_name,create_user_tel,create_remark,check_user_id,check_remark,room_id,room_name,review_user_id,review_remark,start_time,end_time,state,community_id,discount_id,in_use,fee_id,return_way,return_amount
         ) values (
         #{applyType},#{ardId},#{createUserName},#{createUserTel},#{createRemark},#{checkUserId},#{checkRemark},#{roomId},#{roomName},#{reviewUserId},#{reviewRemark},#{startTime},#{endTime},#{state},
-        #{communityId},#{discountId},#{inUse}
+        #{communityId},#{discountId},#{inUse},#{feeId},#{returnWay},#{returnAmount}
         )
     </insert>
 
@@ -22,11 +22,14 @@
         statusCd,t.check_remark,t.check_remark checkRemark,t.room_id,t.room_id roomId,t.room_name,t.room_name
         roomName,t.review_user_id,t.review_user_id reviewUserId,t.review_remark,t.review_remark
         reviewRemark,t.start_time,t.start_time startTime,t.end_time,t.end_time
-        endTime,t.state,td.name stateName,t.community_id,t.community_id communityId,t.discount_id,t.discount_id discountId,t.in_use,t.in_use inUse,t.create_time,t.create_time createTime,
+        endTime,t.state,td.name stateName,t.community_id,t.community_id communityId,t.discount_id,t.discount_id
+        discountId,t.in_use,t.in_use inUse,t.fee_id,t.fee_id feeId,t.return_way,t.return_way returnWay,t.return_amount,t.return_amount returnAmount,t.create_time,t.create_time createTime,
         ardt.type_name applyTypeName,fd.discount_name discountName
         from apply_room_discount t
-        left join t_dict td on t.state = td.status_cd and td.table_name='apply_room_discount' and td.table_columns ='state'
-        left join apply_room_discount_type ardt on t.apply_type = ardt.apply_type and t.community_id = ardt.community_id and ardt.status_cd = '0'
+        left join t_dict td on t.state = td.status_cd and td.table_name='apply_room_discount' and td.table_columns
+        ='state'
+        left join apply_room_discount_type ardt on t.apply_type = ardt.apply_type and t.community_id = ardt.community_id
+        and ardt.status_cd = '0'
         left join fee_discount fd on t.discount_id=fd.discount_id
         where t.status_cd = '0'
         <if test="applyType !=null and applyType != ''">
@@ -80,6 +83,15 @@
         <if test="inUse !=null and inUse != ''">
             and t.in_use= #{inUse}
         </if>
+        <if test="feeId !=null and feeId != ''">
+            and t.fee_id= #{feeId}
+        </if>
+        <if test="returnWay !=null and returnWay != ''">
+            and t.return_way= #{returnWay}
+        </if>
+        <if test="returnAmount !=null and returnAmount != ''">
+            and t.return_amount= #{returnAmount}
+        </if>
         <if test="bId !=null and bId != ''">
             and t.b_id= #{bId}
         </if>
@@ -154,6 +166,15 @@
         <if test="inUse !=null and inUse != ''">
             and t.in_use= #{inUse}
         </if>
+        <if test="returnWay !=null and returnWay != ''">
+            and t.return_way= #{returnWay}
+        </if>
+        <if test="returnAmount !=null and returnAmount != ''">
+            and t.return_amount= #{returnAmount}
+        </if>
+        <if test="feeId !=null and feeId != ''">
+            and t.fee_id= #{feeId}
+        </if>
         order by t.create_time desc limit 0,1
     </select>
 
@@ -206,6 +227,15 @@
         <if test="inUse !=null and inUse != ''">
             , t.in_use= #{inUse}
         </if>
+        <if test="feeId !=null and feeId != ''">
+            , t.fee_id= #{feeId}
+        </if>
+        <if test="returnWay !=null and returnWay != ''">
+            , t.return_way= #{returnWay}
+        </if>
+        <if test="returnAmount !=null and returnAmount != ''">
+            , t.return_amount= #{returnAmount}
+        </if>
         <if test="bId !=null and bId != ''">
             , t.b_id= #{bId}
         </if>
@@ -271,6 +301,15 @@
         <if test="inUse !=null and inUse != ''">
             and t.in_use= #{inUse}
         </if>
+        <if test="returnWay !=null and returnWay != ''">
+            and t.return_way= #{returnWay}
+        </if>
+        <if test="returnAmount !=null and returnAmount != ''">
+            and t.return_amount= #{returnAmount}
+        </if>
+        <if test="feeId !=null and feeId != ''">
+            and t.fee_id= #{feeId}
+        </if>
     </select>
 
 </mapper>

java110-db/src/main/resources/mapper/fee/FeeDiscountRuleServiceDaoImplMapper.xml

@@ -18,9 +18,10 @@
     <!-- 查询费用折扣规则信息 add by wuxw 2018-07-03 -->
     <select id="getFeeDiscountRuleInfo" parameterType="Map" resultType="Map">
         select t.rule_name,t.rule_name ruleName,t.remark,t.status_cd,t.status_cd statusCd,t.rule_id,t.rule_id
-        ruleId,t.bean_impl,t.bean_impl beanImpl,t.discount_type discountType
+        ruleId,t.bean_impl,t.bean_impl beanImpl,t.discount_type discountType,t.discount_small_type ,
+        t.discount_small_type discountSmallType
         from fee_discount_rule t
-        where 1 =1
+        where 1 = 1
         <if test="ruleName !=null and ruleName != ''">
             and t.rule_name= #{ruleName}
         </if>
@@ -39,6 +40,9 @@
         <if test="discountType !=null and discountType != ''">
             and t.discount_type= #{discountType}
         </if>
+        <if test="discountSmallType !=null and discountSmallType != ''">
+            and t.discount_small_type= #{discountSmallType}
+        </if>
         order by t.create_time desc
         <if test="page != -1 and page != null ">
             limit #{page}, #{row}

java110-db/src/main/resources/mapper/report/ReportFeeMonthStatisticsServiceDaoImplMapper.xml

@@ -1136,7 +1136,8 @@
         t.receivable_amount receivableAmount,t.received_amount receivedAmount,pfa.`value`
         importFeeName,t.prime_rate,d.name primeRate,fdr.discount_small_type discountSmallType,fdr.rule_name
         ruleName,pfdd.discount_price discountPrice,co.contract_code contractCode,pfo.`value` ownerName,cb.o_id oId,
-        d2.name feeTypeCdName,pfc.fee_type_cd feeTypeCd,t.state,d3.name stateName,t.fee_id feeId,pft.`value` repairId
+        d2.name feeTypeCdName,pfc.fee_type_cd feeTypeCd,t.state,d3.name stateName,t.fee_id feeId,pft.`value` repairId,
+        t.detail_id,t.detail_id detailId
         from pay_fee_detail t
         INNER JOIN pay_fee pf on t.fee_id = pf.fee_id and pf.status_cd = '0'
         inner join pay_fee_config pfc on pf.config_id = pfc.config_id and pfc.status_cd = '0'

java110-db/src/main/resources/mapper/report/ReportOweFeeServiceDaoImplMapper.xml

@@ -270,6 +270,9 @@
         <if test="configId !=null and configId != ''">
             and t.config_id= #{configId}
         </if>
+        <if test='hasOweFee !=null and hasOweFee == "Y"'>
+            and t.amount_owed &gt; 0
+        </if>
         <if test="configIds !=null">
             and t.config_id in
             <foreach collection="configIds" item="item" index="index" open="(" close=")" separator=",">
@@ -351,6 +354,9 @@
         <if test="configId !=null and configId != ''">
             and t.config_id= #{configId}
         </if>
+        <if test='hasOweFee !=null and hasOweFee == "Y"'>
+            and t.amount_owed &gt; 0
+        </if>
         <if test="configIds !=null">
             and t.config_id in
             <foreach collection="configIds" item="item" index="index" open="(" close=")" separator=",">
@@ -432,6 +438,9 @@
         <if test="configId !=null and configId != ''">
             and t.config_id= #{configId}
         </if>
+        <if test='hasOweFee !=null and hasOweFee == "Y"'>
+            and t.amount_owed &gt; 0
+        </if>
         <if test="configIds !=null">
             and t.config_id in
             <foreach collection="configIds" item="item" index="index" open="(" close=")" separator=",">

java110-generator/src/main/resources/newBack/template_communitySetting.json

+{
+  "autoMove": true,
+  "id": "csId",
+  "name": "communitySetting",
+  "desc": "小区相关设置",
+  "shareParam": "communityId",
+  "shareColumn": "community_id",
+  "shareName": "community",
+  "tableName": "community_setting",
+  "param": {
+    "csId": "cs_id",
+    "communityId": "community_id",
+    "settingName": "setting_name",
+    "settingType": "setting_type",
+    "settingKey": "setting_key",
+    "settingValue": "setting_value",
+    "remark": "remark",
+    "statusCd": "status_cd"
+  },
+  "required": [
+    {
+      "code": "communityId",
+      "msg": "小区ID不能为空"
+    },
+    {
+      "code": "settingType",
+      "msg": "设置类型不能为空"
+    },
+    {
+      "code": "settingKey",
+      "msg": "设置key不能为空"
+    }
+  ]
+}
+

java110-generator/src/main/resources/web/template_communitySetting.json

+{
+  "templateName": "小区设置",
+  "templateCode": "communitySetting",
+  "templateKey": "csId",
+  "templateKeyName": "小区设置ID",
+  "searchCode": "csId",
+  "searchName": "小区设置ID",
+  "directories": "property",
+  "conditions": [
+    {
+      "name": "配置类型",
+      "inputType": "select",
+      "selectValue":"1001,2002",
+      "selectValueName":"装修,其他",
+      "code": "settingType",
+      "whereCondition": "equal"
+    },
+    {
+      "name": "配置名称",
+      "inputType": "input",
+      "code": "settingName",
+      "whereCondition": "equal"
+    },
+    {
+      "name": "配置键名称",
+      "inputType": "input",
+      "code": "settingKey",
+      "whereCondition": "equal"
+    }
+  ],
+  "columns": [
+    {
+      "code": "settingType",
+      "cnCode": "配置类型",
+      "desc": "必填，请填写配置类型",
+      "required": true,
+      "hasDefaultValue": false,
+      "inputType": "select",
+      "selectValue":"1001",
+      "selectValueName":"装修",
+      "limit": "maxLength",
+      "limitParam": "12",
+      "limitErrInfo": "配置类型不能为空",
+      "show": true
+    },
+    {
+      "code": "settingName",
+      "cnCode": "配置名称",
+      "desc": "必填，请填配置名称",
+      "required": true,
+      "hasDefaultValue": false,
+      "inputType": "input",
+      "limit": "maxLength",
+      "limitParam": "64",
+      "limitErrInfo": "流配置名称超过64位",
+      "show": true
+    },
+    {
+      "code": "settingKey",
+      "cnCode": "配置KEY",
+      "desc": "必填，请填配置取值",
+      "required": true,
+      "hasDefaultValue": false,
+      "inputType": "input",
+      "limit": "maxLength",
+      "limitParam": "200",
+      "limitErrInfo": "配置取值超过200位",
+      "show": true
+    },
+    {
+      "code": "settingValue",
+      "cnCode": "配置取值",
+      "desc": "必填，请填配置取值",
+      "required": true,
+      "hasDefaultValue": false,
+      "inputType": "input",
+      "limit": "maxLength",
+      "limitParam": "200",
+      "limitErrInfo": "配置取值超过200位",
+      "show": true
+    },
+    {
+      "code": "remark",
+      "cnCode": "备注",
+      "desc": "可填，请填写备注",
+      "required": false,
+      "hasDefaultValue": false,
+      "defaultValue": "",
+      "inputType": "input",
+      "limit": "maxLength",
+      "limitParam": "200",
+      "limitErrInfo": "备注内容不能超过200",
+      "show": false
+    }
+  ]
+}
\ No newline at end of file

java110-interface/src/main/java/com/java110/intf/community/ICommunitySettingInnerServiceSMO.java

+package com.java110.intf.community;
+
+import com.java110.config.feign.FeignConfiguration;
+import com.java110.dto.communitySetting.CommunitySettingDto;
+import com.java110.po.communitySetting.CommunitySettingPo;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+
+import java.util.List;
+
+/**
+ * @ClassName ICommunitySettingInnerServiceSMO
+ * @Description 小区相关设置接口类
+ * @Author wuxw
+ * @Date 2019/4/24 9:04
+ * @Version 1.0
+ * add by wuxw 2019/4/24
+ **/
+@FeignClient(name = "community-service", configuration = {FeignConfiguration.class})
+@RequestMapping("/communitySettingApi")
+public interface ICommunitySettingInnerServiceSMO {
+
+
+    @RequestMapping(value = "/saveCommunitySetting", method = RequestMethod.POST)
+    public int saveCommunitySetting(@RequestBody CommunitySettingPo communitySettingPo);
+
+    @RequestMapping(value = "/updateCommunitySetting", method = RequestMethod.POST)
+    public int updateCommunitySetting(@RequestBody CommunitySettingPo communitySettingPo);
+
+    @RequestMapping(value = "/deleteCommunitySetting", method = RequestMethod.POST)
+    public int deleteCommunitySetting(@RequestBody CommunitySettingPo communitySettingPo);
+
+    /**
+     * <p>查询小区楼信息</p>
+     *
+     * @param communitySettingDto 数据对象分享
+     * @return CommunitySettingDto 对象数据
+     */
+    @RequestMapping(value = "/queryCommunitySettings", method = RequestMethod.POST)
+    List<CommunitySettingDto> queryCommunitySettings(@RequestBody CommunitySettingDto communitySettingDto);
+
+    /**
+     * 查询<p>小区楼</p>总记录数
+     *
+     * @param communitySettingDto 数据对象分享
+     * @return 小区下的小区楼记录数
+     */
+    @RequestMapping(value = "/queryCommunitySettingsCount", method = RequestMethod.POST)
+    int queryCommunitySettingsCount(@RequestBody CommunitySettingDto communitySettingDto);
+}