Merge branch 'master' of http://git.homecommunity.cn/supervip/MicroCommunity

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

@@ -283,10 +283,10 @@
         <if test="communityId !=null and communityId != ''">
             and t.community_id= #{communityId}
         </if>
-        <if test="startTime !=null">
+        <if test="startTime !=null and startTime != ''">
             and t.create_time &gt;= #{startTime}
         </if>
-        <if test="endTime !=null">
+        <if test="endTime !=null and endTime != ''">
             and t.create_time &lt;= #{endTime}
         </if>
         group by t.fee_year,t.fee_month
@@ -337,10 +337,10 @@
         <if test="communityId !=null and communityId != ''">
             and t.community_id= #{communityId}
         </if>
-        <if test="startTime !=null">
+        <if test="startTime !=null and startTime != ''">
             and t.create_time &gt;= #{startTime}
         </if>
-        <if test="endTime !=null">
+        <if test="endTime !=null and endTime != ''">
             and t.create_time &lt;= #{endTime}
         </if>
         group by t.fee_year,t.fee_month
@@ -393,10 +393,10 @@
         <if test="communityId !=null and communityId != ''">
             and t.community_id= #{communityId}
         </if>
-        <if test="startTime !=null">
+        <if test="startTime !=null and startTime != ''">
             and t.create_time &gt;= #{startTime}
         </if>
-        <if test="endTime !=null">
+        <if test="endTime !=null and endTime != ''">
             and t.create_time &lt;= #{endTime}
         </if>
     </select>
@@ -444,10 +444,10 @@
         <if test="communityId !=null and communityId != ''">
             and t.community_id= #{communityId}
         </if>
-        <if test="startTime !=null">
+        <if test="startTime !=null and startTime != ''">
             and t.create_time &gt;= #{startTime}
         </if>
-        <if test="endTime !=null">
+        <if test="endTime !=null and endTime != ''">
             and t.create_time &lt;= #{endTime}
         </if>
         GROUP BY t.fee_year,t.fee_month,f.floor_num,bu.unit_id,bu.unit_num
@@ -499,10 +499,10 @@
         <if test="communityId !=null and communityId != ''">
             and t.community_id= #{communityId}
         </if>
-        <if test="startTime !=null">
+        <if test="startTime !=null and startTime != ''">
             and t.create_time &gt;= #{startTime}
         </if>
-        <if test="endTime !=null">
+        <if test="endTime !=null and endTime != ''">
             and t.create_time &lt;= #{endTime}
         </if>
         GROUP BY t.fee_year,t.fee_month,f.floor_num,bu.unit_id,bu.unit_num
@@ -556,10 +556,10 @@
         <if test="communityId !=null and communityId != ''">
             and t.community_id= #{communityId}
         </if>
-        <if test="startTime !=null">
+        <if test="startTime !=null and startTime != ''">
             and t.create_time &gt;= #{startTime}
         </if>
-        <if test="endTime !=null">
+        <if test="endTime !=null and endTime != ''">
             and t.create_time &lt;= #{endTime}
         </if>
     </select>
@@ -615,10 +615,10 @@
         <if test="communityId !=null and communityId != ''">
             and t.community_id= #{communityId}
         </if>
-        <if test="startTime !=null">
+        <if test="startTime !=null and startTime != ''">
             and pfc.start_time &gt;= #{startTime}
         </if>
-        <if test="endTime !=null">
+        <if test="endTime !=null and endTime != ''">
             and pfc.start_time &lt;= #{endTime}
         </if>
         group by t.config_id,t.fee_name,pfc.start_time
@@ -675,10 +675,10 @@
         <if test="communityId !=null and communityId != ''">
             and t.community_id= #{communityId}
         </if>
-        <if test="startTime !=null">
+        <if test="startTime !=null and startTime != ''">
             and pfc.start_time &gt;= #{startTime}
         </if>
-        <if test="endTime !=null">
+        <if test="endTime !=null and endTime != ''">
             and pfc.start_time &lt;= #{endTime}
         </if>
         group by t.config_id,t.fee_name,pfc.start_time
@@ -737,10 +737,10 @@
         <if test="communityId !=null and communityId != ''">
             and t.community_id= #{communityId}
         </if>
-        <if test="startTime !=null">
+        <if test="startTime !=null and startTime != ''">
             and pfc.start_time &gt;= #{startTime}
         </if>
-        <if test="endTime !=null">
+        <if test="endTime !=null and endTime != ''">
             and pfc.start_time &lt;= #{endTime}
         </if>
         order by t.create_time desc
@@ -790,10 +790,10 @@
         <if test="communityId !=null and communityId != ''">
             and t.community_id= #{communityId}
         </if>
-        <if test="startTime !=null">
+        <if test="startTime !=null and startTime != ''">
             and t.create_time &gt;= #{startTime}
         </if>
-        <if test="endTime !=null">
+        <if test="endTime !=null and endTime != ''">
             and t.create_time &lt;= #{endTime}
         </if>
         group by t.config_id,t.fee_name,t.fee_create_time,t.obj_id,t.obj_name,t.deadline_time
@@ -845,10 +845,10 @@
         <if test="communityId !=null and communityId != ''">
             and t.community_id= #{communityId}
         </if>
-        <if test="startTime !=null">
+        <if test="startTime !=null and startTime != ''">
             and t.create_time &gt;= #{startTime}
         </if>
-        <if test="endTime !=null">
+        <if test="endTime !=null and endTime != ''">
             and t.create_time &lt;= #{endTime}
         </if>
         group by t.config_id,t.fee_name,t.fee_create_time,t.obj_id,t.obj_name
@@ -900,10 +900,10 @@
         <if test="communityId !=null and communityId != ''">
             and t.community_id= #{communityId}
         </if>
-        <if test="startTime !=null">
+        <if test="startTime !=null and startTime != ''">
             and t.create_time &gt;= #{startTime}
         </if>
-        <if test="endTime !=null">
+        <if test="endTime !=null and endTime != ''">
             and t.create_time &lt;= #{endTime}
         </if>
     </select>
@@ -947,10 +947,10 @@
         <if test="communityId !=null and communityId != ''">
             and t.community_id= #{communityId}
         </if>
-        <if test="startTime !=null">
+        <if test="startTime !=null and startTime != ''">
             and t.create_time &gt;= #{startTime}
         </if>
-        <if test="endTime !=null">
+        <if test="endTime !=null and endTime != ''">
             and t.create_time &lt;= #{endTime}
         </if>
         group by t.fee_name,t.payer_obj_id,t.payer_obj_name
@@ -996,10 +996,10 @@
         <if test="communityId !=null and communityId != ''">
             and t.community_id= #{communityId}
         </if>
-        <if test="startTime !=null">
+        <if test="startTime !=null and startTime != ''">
             and t.create_time &gt;= #{startTime}
         </if>
-        <if test="endTime !=null">
+        <if test="endTime !=null and endTime != ''">
             and t.create_time &lt;= #{endTime}
         </if>
         group by t.fee_name,t.payer_obj_id,t.payer_obj_name
@@ -1045,10 +1045,10 @@
         <if test="communityId !=null and communityId != ''">
             and t.community_id= #{communityId}
         </if>
-        <if test="startTime !=null">
+        <if test="startTime !=null and startTime != ''">
             and t.create_time &gt;= #{startTime}
         </if>
-        <if test="endTime !=null">
+        <if test="endTime !=null and endTime != ''">
             and t.create_time &lt;= #{endTime}
         </if>
     </select>
@@ -1120,10 +1120,10 @@
         <if test="feeTypeCd != null and feeTypeCd != ''">
             and pfc.fee_type_cd = #{feeTypeCd}
         </if>
-        <if test="startTime !=null">
+        <if test="startTime !=null and startTime != ''">
             and t.create_time &gt;= #{startTime}
         </if>
-        <if test="endTime !=null">
+        <if test="endTime !=null and endTime != ''">
             and t.create_time &lt;= #{endTime}
         </if>
         ) t
@@ -1202,10 +1202,10 @@
         <if test="feeTypeCd != null and feeTypeCd != ''">
             and pfc.fee_type_cd = #{feeTypeCd}
         </if>
-        <if test="startTime !=null">
+        <if test="startTime !=null and startTime != ''">
             and t.create_time &gt;= #{startTime}
         </if>
-        <if test="endTime !=null">
+        <if test="endTime !=null and endTime != ''">
             and t.create_time &lt;= #{endTime}
         </if>
         order by t.create_time desc
@@ -1261,10 +1261,10 @@
         <if test="primeRate != null and primeRate != ''">
             and t.prime_rate = #{primeRate}
         </if>
-        <if test="startTime !=null">
+        <if test="startTime !=null and startTime != ''">
             and t.create_time &gt;= #{startTime}
         </if>
-        <if test="endTime !=null">
+        <if test="endTime !=null and endTime != ''">
             and t.create_time &lt;= #{endTime}
         </if>
     </select>
@@ -1326,10 +1326,10 @@
         <if test="primeRate != null and primeRate != ''">
             and t.prime_rate = #{primeRate}
         </if>
-        <if test="startTime !=null">
+        <if test="startTime !=null and startTime != ''">
             and t.create_time &gt;= #{startTime}
         </if>
-        <if test="endTime !=null">
+        <if test="endTime !=null and endTime != ''">
             and t.create_time &lt;= #{endTime}
         </if>
         group by fdr.discount_small_type
@@ -1384,10 +1384,10 @@
         <if test="communityId !=null and communityId != ''">
             and t.community_id= #{communityId}
         </if>
-        <if test="startTime !=null">
+        <if test="startTime !=null and startTime != ''">
             and t.deadline_time &gt;= #{startTime}
         </if>
-        <if test="endTime !=null">
+        <if test="endTime !=null and endTime != ''">
             and t.deadline_time &lt;= #{endTime}
         </if>
         ) t
@@ -1441,10 +1441,10 @@
         <if test="communityId !=null and communityId != ''">
             and t.community_id= #{communityId}
         </if>
-        <if test="startTime !=null">
+        <if test="startTime !=null and startTime !=''">
             and t.deadline_time &gt;= #{startTime}
         </if>
-        <if test="endTime !=null">
+        <if test="endTime !=null and endTime != ''">
             and t.deadline_time &lt;= #{endTime}
         </if>
         order by t.deadline_time
@@ -1470,10 +1470,10 @@
         <if test="communityId !=null and communityId != ''">
             and t.community_id= #{communityId}
         </if>
-        <if test="startTime !=null">
+        <if test="startTime !=null and startTime != ''">
             and t.end_time &gt;= #{startTime}
         </if>
-        <if test="endTime !=null">
+        <if test="endTime !=null and endTime != ''">
             and t.end_time &lt;= #{endTime}
         </if>
         ) t
@@ -1495,10 +1495,10 @@
         <if test="communityId !=null and communityId != ''">
             and t.community_id= #{communityId}
         </if>
-        <if test="startTime !=null">
+        <if test="startTime !=null and startTime != ''">
             and t.end_time &gt;= #{startTime}
         </if>
-        <if test="endTime !=null">
+        <if test="endTime !=null  and endTime != ''">
             and t.end_time &lt;= #{endTime}
         </if>
         <if test="page != -1 and page != null ">
@@ -2198,7 +2198,7 @@
         select t.floor_num
         from f_floor t
         where 1=1
-            and t.community_id= #{communityId}
+        and t.community_id= #{communityId}
         GROUP BY t.floor_num
         ) tt
     </select>

service-api/src/main/java/com/java110/api/bmo/community/impl/CommunityBMOImpl.java

@@ -488,6 +488,7 @@ public class CommunityBMOImpl extends ApiBaseBMO implements ICommunityBMO {
      */
     public void addCommunityMembers(JSONObject paramInJson, DataFlowContext dataFlowContext) {
 
+
         JSONObject businessCommunityMember = new JSONObject();
         businessCommunityMember.put("communityMemberId", "-1");
         businessCommunityMember.put("communityId", paramInJson.getString("communityId"));

service-api/src/main/java/com/java110/api/bmo/floor/impl/FloorBMOImpl.java

@@ -4,16 +4,20 @@ import com.alibaba.fastjson.JSONObject;
 import com.java110.api.bmo.ApiBaseBMO;
 import com.java110.api.bmo.floor.IFloorBMO;
 import com.java110.core.context.DataFlowContext;
+import com.java110.dto.community.CommunityDto;
 import com.java110.intf.community.ICommunityInnerServiceSMO;
 import com.java110.dto.CommunityMemberDto;
 import com.java110.po.community.CommunityMemberPo;
 import com.java110.po.floor.FloorPo;
 import com.java110.utils.constant.*;
 import com.java110.utils.exception.ListenerExecuteException;
+import com.java110.utils.util.Assert;
 import com.java110.utils.util.BeanConvertUtil;
+import com.java110.utils.util.DateUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.util.Calendar;
 import java.util.List;
 
 /**
@@ -118,12 +122,25 @@ public class FloorBMOImpl extends ApiBaseBMO implements IFloorBMO {
      */
     public void addCommunityMember(JSONObject paramInJson, DataFlowContext context) {
 
+        //查询小区是否存在
+        CommunityDto communityDto = new CommunityDto();
+        communityDto.setCommunityId(paramInJson.getString("communityId"));
+        List<CommunityDto> communityDtos = communityInnerServiceSMOImpl.queryCommunitys(communityDto);
+
+        Assert.listOnlyOne(communityDtos, "小区不存");
+
         JSONObject businessCommunityMember = new JSONObject();
         businessCommunityMember.put("communityMemberId", "-1");
         businessCommunityMember.put("communityId", paramInJson.getString("communityId"));
         businessCommunityMember.put("memberId", paramInJson.getString("floorId"));
         businessCommunityMember.put("memberTypeCd", CommunityMemberTypeConstant.FLOOR);
         businessCommunityMember.put("auditStatusCd", StateConstant.AGREE_AUDIT);
+
+        businessCommunityMember.put("startTime", DateUtil.getNow(DateUtil.DATE_FORMATE_STRING_A));
+        Calendar endTime  = Calendar.getInstance();
+        endTime.add(Calendar.MONTH,Integer.parseInt(communityDtos.get(0).getPayFeeMonth()));
+        businessCommunityMember.put("endTime", DateUtil.getFormatTimeString(endTime.getTime(),DateUtil.DATE_FORMATE_STRING_A));
+
         CommunityMemberPo communityMemberPo = BeanConvertUtil.covertBean(businessCommunityMember, CommunityMemberPo.class);
         super.insert(context, communityMemberPo, BusinessTypeConstant.BUSINESS_TYPE_MEMBER_JOINED_COMMUNITY);
     }

service-api/src/main/java/com/java110/api/bmo/owner/impl/OwnerBMOImpl.java

@@ -35,6 +35,7 @@ import com.java110.utils.util.DateUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.util.Calendar;
 import java.util.List;
 import java.util.Map;
 
@@ -234,7 +235,12 @@ public class OwnerBMOImpl extends ApiBaseBMO implements IOwnerBMO {
      * @return 小区成员信息
      */
     public void addCommunityMember(JSONObject paramInJson, DataFlowContext dataFlowContext) {
+        //查询小区是否存在
+        CommunityDto communityDto = new CommunityDto();
+        communityDto.setCommunityId(paramInJson.getString("communityId"));
+        List<CommunityDto> communityDtos = communityInnerServiceSMOImpl.queryCommunitys(communityDto);
 
+        Assert.listOnlyOne(communityDtos, "小区不存");
 
         JSONObject businessCommunityMember = new JSONObject();
         businessCommunityMember.put("communityMemberId", "-1");
@@ -242,6 +248,10 @@ public class OwnerBMOImpl extends ApiBaseBMO implements IOwnerBMO {
         businessCommunityMember.put("memberId", paramInJson.getString("ownerId"));
         businessCommunityMember.put("memberTypeCd", CommunityMemberTypeConstant.OWNER);
         businessCommunityMember.put("auditStatusCd", StateConstant.AGREE_AUDIT);
+        businessCommunityMember.put("startTime", DateUtil.getNow(DateUtil.DATE_FORMATE_STRING_A));
+        Calendar endTime  = Calendar.getInstance();
+        endTime.add(Calendar.MONTH,Integer.parseInt(communityDtos.get(0).getPayFeeMonth()));
+        businessCommunityMember.put("endTime", DateUtil.getFormatTimeString(endTime.getTime(),DateUtil.DATE_FORMATE_STRING_A));
         CommunityMemberPo communityMemberPo = BeanConvertUtil.covertBean(businessCommunityMember, CommunityMemberPo.class);
         super.insert(dataFlowContext, communityMemberPo, BusinessTypeConstant.BUSINESS_TYPE_MEMBER_JOINED_COMMUNITY);
     }

service-report/src/main/java/com/java110/report/smo/impl/ReportFeeMonthStatisticsInnerServiceSMOImpl.java

@@ -263,7 +263,9 @@ public class ReportFeeMonthStatisticsInnerServiceSMOImpl extends BaseServiceSMO
 
     @Override
     public List<ReportFeeMonthStatisticsDto> queryAllPayFeeDetail(@RequestBody ReportFeeMonthStatisticsDto reportFeeMonthStatisticsDto) {
-        List<ReportFeeMonthStatisticsDto> reportFeeMonthStatisticss = BeanConvertUtil.covertBeanList(reportFeeMonthStatisticsServiceDaoImpl.queryAllPayFeeDetail(BeanConvertUtil.beanCovertMap(reportFeeMonthStatisticsDto)), ReportFeeMonthStatisticsDto.class);
+        List<ReportFeeMonthStatisticsDto> reportFeeMonthStatisticss = BeanConvertUtil.covertBeanList(
+                reportFeeMonthStatisticsServiceDaoImpl.queryAllPayFeeDetail(BeanConvertUtil.beanCovertMap(reportFeeMonthStatisticsDto)),
+                ReportFeeMonthStatisticsDto.class);
 
         return reportFeeMonthStatisticss;
     }