Pārlūkot izejas kodu

加入按月折算

java110 5 gadi atpakaļ
vecāks
revīzija
ef6bc6654d
18 mainītis faili ar 970 papildinājumiem un 28 dzēšanām
  1. 104 0
      java110-bean/src/main/java/com/java110/dto/reportFeeMonthCollectionDetail/ReportFeeMonthCollectionDetailDto.java
  2. 81 0
      java110-bean/src/main/java/com/java110/po/reportFeeMonthCollectionDetail/ReportFeeMonthCollectionDetailPo.java
  3. 1 0
      java110-core/src/main/java/com/java110/core/factory/GenerateCodeFactory.java
  4. 142 0
      java110-db/src/main/resources/mapper/report/ReportFeeMonthCollectionDetailServiceDaoImplMapper.xml
  5. 18 28
      java110-generator/src/main/resources/newBack/template_1.json
  6. 53 0
      java110-interface/src/main/java/com/java110/intf/report/IReportFeeMonthCollectionDetailInnerServiceSMO.java
  7. 112 0
      service-report/src/main/java/com/java110/report/api/ReportFeeMonthCollectionDetailApi.java
  8. 17 0
      service-report/src/main/java/com/java110/report/bmo/reportFeeMonthCollectionDetail/IDeleteReportFeeMonthCollectionDetailBMO.java
  9. 16 0
      service-report/src/main/java/com/java110/report/bmo/reportFeeMonthCollectionDetail/IGetReportFeeMonthCollectionDetailBMO.java
  10. 17 0
      service-report/src/main/java/com/java110/report/bmo/reportFeeMonthCollectionDetail/ISaveReportFeeMonthCollectionDetailBMO.java
  11. 17 0
      service-report/src/main/java/com/java110/report/bmo/reportFeeMonthCollectionDetail/IUpdateReportFeeMonthCollectionDetailBMO.java
  12. 34 0
      service-report/src/main/java/com/java110/report/bmo/reportFeeMonthCollectionDetail/impl/DeleteReportFeeMonthCollectionDetailBMOImpl.java
  13. 44 0
      service-report/src/main/java/com/java110/report/bmo/reportFeeMonthCollectionDetail/impl/GetReportFeeMonthCollectionDetailBMOImpl.java
  14. 38 0
      service-report/src/main/java/com/java110/report/bmo/reportFeeMonthCollectionDetail/impl/SaveReportFeeMonthCollectionDetailBMOImpl.java
  15. 34 0
      service-report/src/main/java/com/java110/report/bmo/reportFeeMonthCollectionDetail/impl/UpdateReportFeeMonthCollectionDetailBMOImpl.java
  16. 61 0
      service-report/src/main/java/com/java110/report/dao/IReportFeeMonthCollectionDetailServiceDao.java
  17. 98 0
      service-report/src/main/java/com/java110/report/dao/impl/ReportFeeMonthCollectionDetailServiceDaoImpl.java
  18. 83 0
      service-report/src/main/java/com/java110/report/smo/impl/ReportFeeMonthCollectionDetailInnerServiceSMOImpl.java

+ 104 - 0
java110-bean/src/main/java/com/java110/dto/reportFeeMonthCollectionDetail/ReportFeeMonthCollectionDetailDto.java

@@ -0,0 +1,104 @@
+package com.java110.dto.reportFeeMonthCollectionDetail;
+
+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 ReportFeeMonthCollectionDetailDto extends PageDto implements Serializable {
+
+    private String collectionYear;
+private String cdId;
+private String collectionMonth;
+private String detailId;
+private String receivableAmount;
+private String discountAmount;
+private String receivedAmount;
+private String communityId;
+private String collectionId;
+
+
+    private Date createTime;
+
+    private String statusCd = "0";
+
+
+    public String getCollectionYear() {
+        return collectionYear;
+    }
+public void setCollectionYear(String collectionYear) {
+        this.collectionYear = collectionYear;
+    }
+public String getCdId() {
+        return cdId;
+    }
+public void setCdId(String cdId) {
+        this.cdId = cdId;
+    }
+public String getCollectionMonth() {
+        return collectionMonth;
+    }
+public void setCollectionMonth(String collectionMonth) {
+        this.collectionMonth = collectionMonth;
+    }
+public String getDetailId() {
+        return detailId;
+    }
+public void setDetailId(String detailId) {
+        this.detailId = detailId;
+    }
+public String getReceivableAmount() {
+        return receivableAmount;
+    }
+public void setReceivableAmount(String receivableAmount) {
+        this.receivableAmount = receivableAmount;
+    }
+public String getDiscountAmount() {
+        return discountAmount;
+    }
+public void setDiscountAmount(String discountAmount) {
+        this.discountAmount = discountAmount;
+    }
+public String getReceivedAmount() {
+        return receivedAmount;
+    }
+public void setReceivedAmount(String receivedAmount) {
+        this.receivedAmount = receivedAmount;
+    }
+public String getCommunityId() {
+        return communityId;
+    }
+public void setCommunityId(String communityId) {
+        this.communityId = communityId;
+    }
+public String getCollectionId() {
+        return collectionId;
+    }
+public void setCollectionId(String collectionId) {
+        this.collectionId = collectionId;
+    }
+
+
+    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;
+    }
+}

+ 81 - 0
java110-bean/src/main/java/com/java110/po/reportFeeMonthCollectionDetail/ReportFeeMonthCollectionDetailPo.java

@@ -0,0 +1,81 @@
+package com.java110.po.reportFeeMonthCollectionDetail;
+
+import java.io.Serializable;
+import java.util.Date;
+
+public class ReportFeeMonthCollectionDetailPo implements Serializable {
+
+    private String collectionYear;
+private String cdId;
+private String collectionMonth;
+private String detailId;
+private String receivableAmount;
+private String discountAmount;
+private String statusCd = "0";
+private String receivedAmount;
+private String communityId;
+private String collectionId;
+public String getCollectionYear() {
+        return collectionYear;
+    }
+public void setCollectionYear(String collectionYear) {
+        this.collectionYear = collectionYear;
+    }
+public String getCdId() {
+        return cdId;
+    }
+public void setCdId(String cdId) {
+        this.cdId = cdId;
+    }
+public String getCollectionMonth() {
+        return collectionMonth;
+    }
+public void setCollectionMonth(String collectionMonth) {
+        this.collectionMonth = collectionMonth;
+    }
+public String getDetailId() {
+        return detailId;
+    }
+public void setDetailId(String detailId) {
+        this.detailId = detailId;
+    }
+public String getReceivableAmount() {
+        return receivableAmount;
+    }
+public void setReceivableAmount(String receivableAmount) {
+        this.receivableAmount = receivableAmount;
+    }
+public String getDiscountAmount() {
+        return discountAmount;
+    }
+public void setDiscountAmount(String discountAmount) {
+        this.discountAmount = discountAmount;
+    }
+public String getStatusCd() {
+        return statusCd;
+    }
+public void setStatusCd(String statusCd) {
+        this.statusCd = statusCd;
+    }
+public String getReceivedAmount() {
+        return receivedAmount;
+    }
+public void setReceivedAmount(String receivedAmount) {
+        this.receivedAmount = receivedAmount;
+    }
+public String getCommunityId() {
+        return communityId;
+    }
+public void setCommunityId(String communityId) {
+        this.communityId = communityId;
+    }
+public String getCollectionId() {
+        return collectionId;
+    }
+public void setCollectionId(String collectionId) {
+        this.collectionId = collectionId;
+    }
+
+
+
+}

+ 1 - 0
java110-core/src/main/java/com/java110/core/factory/GenerateCodeFactory.java

@@ -215,6 +215,7 @@ public class GenerateCodeFactory {
     public static final String CODE_PREFIX_anValueId = "68";
 
     public static final String CODE_PREFIX_backId = "78";
+    public static final String CODE_PREFIX_cdId = "79";
 
 
 

+ 142 - 0
java110-db/src/main/resources/mapper/report/ReportFeeMonthCollectionDetailServiceDaoImplMapper.xml

@@ -0,0 +1,142 @@
+<?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="reportFeeMonthCollectionDetailServiceDaoImpl">
+
+
+
+
+
+    <!-- 保存月缴费表信息 add by wuxw 2018-07-03 -->
+    <insert id="saveReportFeeMonthCollectionDetailInfo" parameterType="Map">
+        insert into report_fee_month_collection_detail(
+collection_year,cd_id,collection_month,detail_id,receivable_amount,discount_amount,received_amount,community_id,collection_id
+) values (
+#{collectionYear},#{cdId},#{collectionMonth},#{detailId},#{receivableAmount},#{discountAmount},#{receivedAmount},#{communityId},#{collectionId}
+)
+    </insert>
+
+
+
+    <!-- 查询月缴费表信息 add by wuxw 2018-07-03 -->
+    <select id="getReportFeeMonthCollectionDetailInfo" parameterType="Map" resultType="Map">
+        select  t.collection_year,t.collection_year collectionYear,t.cd_id,t.cd_id cdId,t.collection_month,t.collection_month collectionMonth,t.detail_id,t.detail_id detailId,t.receivable_amount,t.receivable_amount receivableAmount,t.discount_amount,t.discount_amount discountAmount,t.status_cd,t.status_cd statusCd,t.received_amount,t.received_amount receivedAmount,t.community_id,t.community_id communityId,t.collection_id,t.collection_id collectionId 
+from report_fee_month_collection_detail t 
+where 1 =1 
+<if test="collectionYear !=null and collectionYear != ''">
+   and t.collection_year= #{collectionYear}
+</if> 
+<if test="cdId !=null and cdId != ''">
+   and t.cd_id= #{cdId}
+</if> 
+<if test="collectionMonth !=null and collectionMonth != ''">
+   and t.collection_month= #{collectionMonth}
+</if> 
+<if test="detailId !=null and detailId != ''">
+   and t.detail_id= #{detailId}
+</if> 
+<if test="receivableAmount !=null and receivableAmount != ''">
+   and t.receivable_amount= #{receivableAmount}
+</if> 
+<if test="discountAmount !=null and discountAmount != ''">
+   and t.discount_amount= #{discountAmount}
+</if> 
+<if test="statusCd !=null and statusCd != ''">
+   and t.status_cd= #{statusCd}
+</if> 
+<if test="receivedAmount !=null and receivedAmount != ''">
+   and t.received_amount= #{receivedAmount}
+</if> 
+<if test="communityId !=null and communityId != ''">
+   and t.community_id= #{communityId}
+</if> 
+<if test="collectionId !=null and collectionId != ''">
+   and t.collection_id= #{collectionId}
+</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="updateReportFeeMonthCollectionDetailInfo" parameterType="Map">
+        update  report_fee_month_collection_detail t set t.status_cd = #{statusCd}
+<if test="newBId != null and newBId != ''">
+,t.b_id = #{newBId}
+</if> 
+<if test="collectionYear !=null and collectionYear != ''">
+, t.collection_year= #{collectionYear}
+</if> 
+<if test="collectionMonth !=null and collectionMonth != ''">
+, t.collection_month= #{collectionMonth}
+</if> 
+<if test="detailId !=null and detailId != ''">
+, t.detail_id= #{detailId}
+</if> 
+<if test="receivableAmount !=null and receivableAmount != ''">
+, t.receivable_amount= #{receivableAmount}
+</if> 
+<if test="discountAmount !=null and discountAmount != ''">
+, t.discount_amount= #{discountAmount}
+</if> 
+<if test="receivedAmount !=null and receivedAmount != ''">
+, t.received_amount= #{receivedAmount}
+</if> 
+<if test="communityId !=null and communityId != ''">
+, t.community_id= #{communityId}
+</if> 
+<if test="collectionId !=null and collectionId != ''">
+, t.collection_id= #{collectionId}
+</if> 
+ where 1=1 <if test="cdId !=null and cdId != ''">
+and t.cd_id= #{cdId}
+</if> 
+
+    </update>
+
+    <!-- 查询月缴费表数量 add by wuxw 2018-07-03 -->
+     <select id="queryReportFeeMonthCollectionDetailsCount" parameterType="Map" resultType="Map">
+        select  count(1) count 
+from report_fee_month_collection_detail t 
+where 1 =1 
+<if test="collectionYear !=null and collectionYear != ''">
+   and t.collection_year= #{collectionYear}
+</if> 
+<if test="cdId !=null and cdId != ''">
+   and t.cd_id= #{cdId}
+</if> 
+<if test="collectionMonth !=null and collectionMonth != ''">
+   and t.collection_month= #{collectionMonth}
+</if> 
+<if test="detailId !=null and detailId != ''">
+   and t.detail_id= #{detailId}
+</if> 
+<if test="receivableAmount !=null and receivableAmount != ''">
+   and t.receivable_amount= #{receivableAmount}
+</if> 
+<if test="discountAmount !=null and discountAmount != ''">
+   and t.discount_amount= #{discountAmount}
+</if> 
+<if test="statusCd !=null and statusCd != ''">
+   and t.status_cd= #{statusCd}
+</if> 
+<if test="receivedAmount !=null and receivedAmount != ''">
+   and t.received_amount= #{receivedAmount}
+</if> 
+<if test="communityId !=null and communityId != ''">
+   and t.community_id= #{communityId}
+</if> 
+<if test="collectionId !=null and collectionId != ''">
+   and t.collection_id= #{collectionId}
+</if> 
+
+
+     </select>
+
+</mapper>

+ 18 - 28
java110-generator/src/main/resources/newBack/template_1.json

@@ -1,46 +1,36 @@
 {
   "autoMove": true,
-  "id": "titleId",
-  "name": "reportInfoSettingTitle",
-  "desc": "进出上报题目设置",
+  "id": "cdId",
+  "name": "reportFeeMonthCollectionDetail",
+  "desc": "月缴费表",
   "shareParam": "communityId",
   "shareColumn": "community_id",
   "shareName": "report",
-  "tableName": "report_info_setting_title",
+  "tableName": "report_fee_month_collection_detail",
   "param": {
-    "titleId": "title_id",
-    "settingId": "setting_id",
-    "title": "title",
-    "titleType": "title_type",
-    "seq": "seq",
+    "cdId": "cd_id",
+    "detailId": "detail_id",
+    "collectionId": "collection_id",
+    "collectionYear": "collection_year",
+    "collectionMonth": "collection_month",
     "communityId": "community_id",
-    "createTime": "create_time",
+    "receivableAmount": "receivable_amount",
+    "receivedAmount": "received_amount",
+    "discountAmount": "discount_amount",
     "statusCd": "status_cd"
   },
   "required": [
     {
-      "code": "titleId",
-      "msg": "合同ID不能为空"
+      "code": "detailId",
+      "msg": "缴费ID不能为空"
     },
     {
-      "code": "settingId",
-      "msg": "商户ID不能为空"
+      "code": "collectionYear",
+      "msg": "年份不能为空"
     },
     {
-      "code": "title",
-      "msg": "用户规格不能为空"
-    },
-    {
-      "code": "titleType",
-      "msg": "用户规格不能为空"
-    },
-    {
-      "code": "seq",
-      "msg": "用户规格不能为空"
-    },
-    {
-      "code": "communityId",
-      "msg": "用户规格不能为空"
+      "code": "collectionMonth",
+      "msg": "月份不能为空"
     }
   ]
 }

+ 53 - 0
java110-interface/src/main/java/com/java110/intf/report/IReportFeeMonthCollectionDetailInnerServiceSMO.java

@@ -0,0 +1,53 @@
+package com.java110.intf.report;
+
+import com.java110.config.feign.FeignConfiguration;
+import com.java110.dto.reportFeeMonthCollectionDetail.ReportFeeMonthCollectionDetailDto;
+import com.java110.po.reportFeeMonthCollectionDetail.ReportFeeMonthCollectionDetailPo;
+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 IReportFeeMonthCollectionDetailInnerServiceSMO
+ * @Description 月缴费表接口类
+ * @Author wuxw
+ * @Date 2019/4/24 9:04
+ * @Version 1.0
+ * add by wuxw 2019/4/24
+ **/
+@FeignClient(name = "report-service", configuration = {FeignConfiguration.class})
+@RequestMapping("/reportFeeMonthCollectionDetailApi")
+public interface IReportFeeMonthCollectionDetailInnerServiceSMO {
+
+
+    @RequestMapping(value = "/saveReportFeeMonthCollectionDetail", method = RequestMethod.POST)
+    public int saveReportFeeMonthCollectionDetail(@RequestBody ReportFeeMonthCollectionDetailPo reportFeeMonthCollectionDetailPo);
+
+    @RequestMapping(value = "/updateReportFeeMonthCollectionDetail", method = RequestMethod.POST)
+    public int updateReportFeeMonthCollectionDetail(@RequestBody  ReportFeeMonthCollectionDetailPo reportFeeMonthCollectionDetailPo);
+
+    @RequestMapping(value = "/deleteReportFeeMonthCollectionDetail", method = RequestMethod.POST)
+    public int deleteReportFeeMonthCollectionDetail(@RequestBody  ReportFeeMonthCollectionDetailPo reportFeeMonthCollectionDetailPo);
+
+    /**
+     * <p>查询小区楼信息</p>
+     *
+     *
+     * @param reportFeeMonthCollectionDetailDto 数据对象分享
+     * @return ReportFeeMonthCollectionDetailDto 对象数据
+     */
+    @RequestMapping(value = "/queryReportFeeMonthCollectionDetails", method = RequestMethod.POST)
+    List<ReportFeeMonthCollectionDetailDto> queryReportFeeMonthCollectionDetails(@RequestBody ReportFeeMonthCollectionDetailDto reportFeeMonthCollectionDetailDto);
+
+    /**
+     * 查询<p>小区楼</p>总记录数
+     *
+     * @param reportFeeMonthCollectionDetailDto 数据对象分享
+     * @return 小区下的小区楼记录数
+     */
+    @RequestMapping(value = "/queryReportFeeMonthCollectionDetailsCount", method = RequestMethod.POST)
+    int queryReportFeeMonthCollectionDetailsCount(@RequestBody ReportFeeMonthCollectionDetailDto reportFeeMonthCollectionDetailDto);
+}

+ 112 - 0
service-report/src/main/java/com/java110/report/api/ReportFeeMonthCollectionDetailApi.java

@@ -0,0 +1,112 @@
+package com.java110.report.api;
+
+import com.alibaba.fastjson.JSONObject;
+import com.java110.dto.reportFeeMonthCollectionDetail.ReportFeeMonthCollectionDetailDto;
+import com.java110.po.reportFeeMonthCollectionDetail.ReportFeeMonthCollectionDetailPo;
+import com.java110.report.bmo.reportFeeMonthCollectionDetail.IDeleteReportFeeMonthCollectionDetailBMO;
+import com.java110.report.bmo.reportFeeMonthCollectionDetail.IGetReportFeeMonthCollectionDetailBMO;
+import com.java110.report.bmo.reportFeeMonthCollectionDetail.ISaveReportFeeMonthCollectionDetailBMO;
+import com.java110.report.bmo.reportFeeMonthCollectionDetail.IUpdateReportFeeMonthCollectionDetailBMO;
+import com.java110.utils.util.Assert;
+import com.java110.utils.util.BeanConvertUtil;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+
+@RestController
+@RequestMapping(value = "/reportFeeMonthCollectionDetail")
+public class ReportFeeMonthCollectionDetailApi {
+
+    @Autowired
+    private ISaveReportFeeMonthCollectionDetailBMO saveReportFeeMonthCollectionDetailBMOImpl;
+    @Autowired
+    private IUpdateReportFeeMonthCollectionDetailBMO updateReportFeeMonthCollectionDetailBMOImpl;
+    @Autowired
+    private IDeleteReportFeeMonthCollectionDetailBMO deleteReportFeeMonthCollectionDetailBMOImpl;
+
+    @Autowired
+    private IGetReportFeeMonthCollectionDetailBMO getReportFeeMonthCollectionDetailBMOImpl;
+
+    /**
+     * 微信保存消息模板
+     *
+     * @param reqJson
+     * @return
+     * @serviceCode /reportFeeMonthCollectionDetail/saveReportFeeMonthCollectionDetail
+     * @path /app/reportFeeMonthCollectionDetail/saveReportFeeMonthCollectionDetail
+     */
+    @RequestMapping(value = "/saveReportFeeMonthCollectionDetail", method = RequestMethod.POST)
+    public ResponseEntity<String> saveReportFeeMonthCollectionDetail(@RequestBody JSONObject reqJson) {
+
+        Assert.hasKeyAndValue(reqJson, "detailId", "请求报文中未包含detailId");
+        Assert.hasKeyAndValue(reqJson, "collectionYear", "请求报文中未包含collectionYear");
+        Assert.hasKeyAndValue(reqJson, "collectionMonth", "请求报文中未包含collectionMonth");
+
+
+        ReportFeeMonthCollectionDetailPo reportFeeMonthCollectionDetailPo = BeanConvertUtil.covertBean(reqJson, ReportFeeMonthCollectionDetailPo.class);
+        return saveReportFeeMonthCollectionDetailBMOImpl.save(reportFeeMonthCollectionDetailPo);
+    }
+
+    /**
+     * 微信修改消息模板
+     *
+     * @param reqJson
+     * @return
+     * @serviceCode /reportFeeMonthCollectionDetail/updateReportFeeMonthCollectionDetail
+     * @path /app/reportFeeMonthCollectionDetail/updateReportFeeMonthCollectionDetail
+     */
+    @RequestMapping(value = "/updateReportFeeMonthCollectionDetail", method = RequestMethod.POST)
+    public ResponseEntity<String> updateReportFeeMonthCollectionDetail(@RequestBody JSONObject reqJson) {
+
+        Assert.hasKeyAndValue(reqJson, "detailId", "请求报文中未包含detailId");
+        Assert.hasKeyAndValue(reqJson, "collectionYear", "请求报文中未包含collectionYear");
+        Assert.hasKeyAndValue(reqJson, "collectionMonth", "请求报文中未包含collectionMonth");
+        Assert.hasKeyAndValue(reqJson, "cdId", "cdId不能为空");
+
+
+        ReportFeeMonthCollectionDetailPo reportFeeMonthCollectionDetailPo = BeanConvertUtil.covertBean(reqJson, ReportFeeMonthCollectionDetailPo.class);
+        return updateReportFeeMonthCollectionDetailBMOImpl.update(reportFeeMonthCollectionDetailPo);
+    }
+
+    /**
+     * 微信删除消息模板
+     *
+     * @param reqJson
+     * @return
+     * @serviceCode /reportFeeMonthCollectionDetail/deleteReportFeeMonthCollectionDetail
+     * @path /app/reportFeeMonthCollectionDetail/deleteReportFeeMonthCollectionDetail
+     */
+    @RequestMapping(value = "/deleteReportFeeMonthCollectionDetail", method = RequestMethod.POST)
+    public ResponseEntity<String> deleteReportFeeMonthCollectionDetail(@RequestBody JSONObject reqJson) {
+        Assert.hasKeyAndValue(reqJson, "communityId", "小区ID不能为空");
+
+        Assert.hasKeyAndValue(reqJson, "cdId", "cdId不能为空");
+
+
+        ReportFeeMonthCollectionDetailPo reportFeeMonthCollectionDetailPo = BeanConvertUtil.covertBean(reqJson, ReportFeeMonthCollectionDetailPo.class);
+        return deleteReportFeeMonthCollectionDetailBMOImpl.delete(reportFeeMonthCollectionDetailPo);
+    }
+
+    /**
+     * 微信删除消息模板
+     *
+     * @param communityId 小区ID
+     * @return
+     * @serviceCode /reportFeeMonthCollectionDetail/queryReportFeeMonthCollectionDetail
+     * @path /app/reportFeeMonthCollectionDetail/queryReportFeeMonthCollectionDetail
+     */
+    @RequestMapping(value = "/queryReportFeeMonthCollectionDetail", method = RequestMethod.GET)
+    public ResponseEntity<String> queryReportFeeMonthCollectionDetail(@RequestParam(value = "communityId") String communityId,
+                                                                      @RequestParam(value = "page") int page,
+                                                                      @RequestParam(value = "row") int row) {
+        ReportFeeMonthCollectionDetailDto reportFeeMonthCollectionDetailDto = new ReportFeeMonthCollectionDetailDto();
+        reportFeeMonthCollectionDetailDto.setPage(page);
+        reportFeeMonthCollectionDetailDto.setRow(row);
+        reportFeeMonthCollectionDetailDto.setCommunityId(communityId);
+        return getReportFeeMonthCollectionDetailBMOImpl.get(reportFeeMonthCollectionDetailDto);
+    }
+}

+ 17 - 0
service-report/src/main/java/com/java110/report/bmo/reportFeeMonthCollectionDetail/IDeleteReportFeeMonthCollectionDetailBMO.java

@@ -0,0 +1,17 @@
+package com.java110.report.bmo.reportFeeMonthCollectionDetail;
+import com.java110.po.reportFeeMonthCollectionDetail.ReportFeeMonthCollectionDetailPo;
+import org.springframework.http.ResponseEntity;
+
+public interface IDeleteReportFeeMonthCollectionDetailBMO {
+
+
+    /**
+     * 修改月缴费表
+     * add by wuxw
+     * @param reportFeeMonthCollectionDetailPo
+     * @return
+     */
+    ResponseEntity<String> delete(ReportFeeMonthCollectionDetailPo reportFeeMonthCollectionDetailPo);
+
+
+}

+ 16 - 0
service-report/src/main/java/com/java110/report/bmo/reportFeeMonthCollectionDetail/IGetReportFeeMonthCollectionDetailBMO.java

@@ -0,0 +1,16 @@
+package com.java110.report.bmo.reportFeeMonthCollectionDetail;
+import com.java110.dto.reportFeeMonthCollectionDetail.ReportFeeMonthCollectionDetailDto;
+import org.springframework.http.ResponseEntity;
+public interface IGetReportFeeMonthCollectionDetailBMO {
+
+
+    /**
+     * 查询月缴费表
+     * add by wuxw
+     * @param  reportFeeMonthCollectionDetailDto
+     * @return
+     */
+    ResponseEntity<String> get(ReportFeeMonthCollectionDetailDto reportFeeMonthCollectionDetailDto);
+
+
+}

+ 17 - 0
service-report/src/main/java/com/java110/report/bmo/reportFeeMonthCollectionDetail/ISaveReportFeeMonthCollectionDetailBMO.java

@@ -0,0 +1,17 @@
+package com.java110.report.bmo.reportFeeMonthCollectionDetail;
+
+import com.java110.po.reportFeeMonthCollectionDetail.ReportFeeMonthCollectionDetailPo;
+import org.springframework.http.ResponseEntity;
+public interface ISaveReportFeeMonthCollectionDetailBMO {
+
+
+    /**
+     * 添加月缴费表
+     * add by wuxw
+     * @param reportFeeMonthCollectionDetailPo
+     * @return
+     */
+    ResponseEntity<String> save(ReportFeeMonthCollectionDetailPo reportFeeMonthCollectionDetailPo);
+
+
+}

+ 17 - 0
service-report/src/main/java/com/java110/report/bmo/reportFeeMonthCollectionDetail/IUpdateReportFeeMonthCollectionDetailBMO.java

@@ -0,0 +1,17 @@
+package com.java110.report.bmo.reportFeeMonthCollectionDetail;
+import com.java110.po.reportFeeMonthCollectionDetail.ReportFeeMonthCollectionDetailPo;
+import org.springframework.http.ResponseEntity;
+
+public interface IUpdateReportFeeMonthCollectionDetailBMO {
+
+
+    /**
+     * 修改月缴费表
+     * add by wuxw
+     * @param reportFeeMonthCollectionDetailPo
+     * @return
+     */
+    ResponseEntity<String> update(ReportFeeMonthCollectionDetailPo reportFeeMonthCollectionDetailPo);
+
+
+}

+ 34 - 0
service-report/src/main/java/com/java110/report/bmo/reportFeeMonthCollectionDetail/impl/DeleteReportFeeMonthCollectionDetailBMOImpl.java

@@ -0,0 +1,34 @@
+package com.java110.report.bmo.reportFeeMonthCollectionDetail.impl;
+
+import com.java110.core.annotation.Java110Transactional;
+import com.java110.intf.report.IReportFeeMonthCollectionDetailInnerServiceSMO;
+import com.java110.po.reportFeeMonthCollectionDetail.ReportFeeMonthCollectionDetailPo;
+import com.java110.report.bmo.reportFeeMonthCollectionDetail.IDeleteReportFeeMonthCollectionDetailBMO;
+import com.java110.vo.ResultVo;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.ResponseEntity;
+import org.springframework.stereotype.Service;
+
+@Service("deleteReportFeeMonthCollectionDetailBMOImpl")
+public class DeleteReportFeeMonthCollectionDetailBMOImpl implements IDeleteReportFeeMonthCollectionDetailBMO {
+
+    @Autowired
+    private IReportFeeMonthCollectionDetailInnerServiceSMO reportFeeMonthCollectionDetailInnerServiceSMOImpl;
+
+    /**
+     * @param reportFeeMonthCollectionDetailPo 数据
+     * @return 订单服务能够接受的报文
+     */
+    @Java110Transactional
+    public ResponseEntity<String> delete(ReportFeeMonthCollectionDetailPo reportFeeMonthCollectionDetailPo) {
+
+        int flag = reportFeeMonthCollectionDetailInnerServiceSMOImpl.deleteReportFeeMonthCollectionDetail(reportFeeMonthCollectionDetailPo);
+
+        if (flag > 0) {
+            return ResultVo.createResponseEntity(ResultVo.CODE_OK, "保存成功");
+        }
+
+        return ResultVo.createResponseEntity(ResultVo.CODE_ERROR, "保存失败");
+    }
+
+}

+ 44 - 0
service-report/src/main/java/com/java110/report/bmo/reportFeeMonthCollectionDetail/impl/GetReportFeeMonthCollectionDetailBMOImpl.java

@@ -0,0 +1,44 @@
+package com.java110.report.bmo.reportFeeMonthCollectionDetail.impl;
+
+import com.java110.dto.reportFeeMonthCollectionDetail.ReportFeeMonthCollectionDetailDto;
+import com.java110.intf.report.IReportFeeMonthCollectionDetailInnerServiceSMO;
+import com.java110.report.bmo.reportFeeMonthCollectionDetail.IGetReportFeeMonthCollectionDetailBMO;
+import com.java110.vo.ResultVo;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.HttpStatus;
+import org.springframework.http.ResponseEntity;
+import org.springframework.stereotype.Service;
+
+import java.util.ArrayList;
+import java.util.List;
+
+@Service("getReportFeeMonthCollectionDetailBMOImpl")
+public class GetReportFeeMonthCollectionDetailBMOImpl implements IGetReportFeeMonthCollectionDetailBMO {
+
+    @Autowired
+    private IReportFeeMonthCollectionDetailInnerServiceSMO reportFeeMonthCollectionDetailInnerServiceSMOImpl;
+
+    /**
+     * @param reportFeeMonthCollectionDetailDto
+     * @return 订单服务能够接受的报文
+     */
+    public ResponseEntity<String> get(ReportFeeMonthCollectionDetailDto reportFeeMonthCollectionDetailDto) {
+
+
+        int count = reportFeeMonthCollectionDetailInnerServiceSMOImpl.queryReportFeeMonthCollectionDetailsCount(reportFeeMonthCollectionDetailDto);
+
+        List<ReportFeeMonthCollectionDetailDto> reportFeeMonthCollectionDetailDtos = null;
+        if (count > 0) {
+            reportFeeMonthCollectionDetailDtos = reportFeeMonthCollectionDetailInnerServiceSMOImpl.queryReportFeeMonthCollectionDetails(reportFeeMonthCollectionDetailDto);
+        } else {
+            reportFeeMonthCollectionDetailDtos = new ArrayList<>();
+        }
+
+        ResultVo resultVo = new ResultVo((int) Math.ceil((double) count / (double) reportFeeMonthCollectionDetailDto.getRow()), count, reportFeeMonthCollectionDetailDtos);
+
+        ResponseEntity<String> responseEntity = new ResponseEntity<String>(resultVo.toString(), HttpStatus.OK);
+
+        return responseEntity;
+    }
+
+}

+ 38 - 0
service-report/src/main/java/com/java110/report/bmo/reportFeeMonthCollectionDetail/impl/SaveReportFeeMonthCollectionDetailBMOImpl.java

@@ -0,0 +1,38 @@
+package com.java110.report.bmo.reportFeeMonthCollectionDetail.impl;
+
+import com.java110.core.annotation.Java110Transactional;
+import com.java110.core.factory.GenerateCodeFactory;
+import com.java110.intf.report.IReportFeeMonthCollectionDetailInnerServiceSMO;
+import com.java110.po.reportFeeMonthCollectionDetail.ReportFeeMonthCollectionDetailPo;
+import com.java110.report.bmo.reportFeeMonthCollectionDetail.ISaveReportFeeMonthCollectionDetailBMO;
+import com.java110.vo.ResultVo;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.ResponseEntity;
+import org.springframework.stereotype.Service;
+
+@Service("saveReportFeeMonthCollectionDetailBMOImpl")
+public class SaveReportFeeMonthCollectionDetailBMOImpl implements ISaveReportFeeMonthCollectionDetailBMO {
+
+    @Autowired
+    private IReportFeeMonthCollectionDetailInnerServiceSMO reportFeeMonthCollectionDetailInnerServiceSMOImpl;
+
+    /**
+     * 添加小区信息
+     *
+     * @param reportFeeMonthCollectionDetailPo
+     * @return 订单服务能够接受的报文
+     */
+    @Java110Transactional
+    public ResponseEntity<String> save(ReportFeeMonthCollectionDetailPo reportFeeMonthCollectionDetailPo) {
+
+        reportFeeMonthCollectionDetailPo.setCdId(GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_cdId));
+        int flag = reportFeeMonthCollectionDetailInnerServiceSMOImpl.saveReportFeeMonthCollectionDetail(reportFeeMonthCollectionDetailPo);
+
+        if (flag > 0) {
+            return ResultVo.createResponseEntity(ResultVo.CODE_OK, "保存成功");
+        }
+
+        return ResultVo.createResponseEntity(ResultVo.CODE_ERROR, "保存失败");
+    }
+
+}

+ 34 - 0
service-report/src/main/java/com/java110/report/bmo/reportFeeMonthCollectionDetail/impl/UpdateReportFeeMonthCollectionDetailBMOImpl.java

@@ -0,0 +1,34 @@
+package com.java110.report.bmo.reportFeeMonthCollectionDetail.impl;
+
+import com.java110.core.annotation.Java110Transactional;
+import com.java110.intf.report.IReportFeeMonthCollectionDetailInnerServiceSMO;
+import com.java110.po.reportFeeMonthCollectionDetail.ReportFeeMonthCollectionDetailPo;
+import com.java110.report.bmo.reportFeeMonthCollectionDetail.IUpdateReportFeeMonthCollectionDetailBMO;
+import com.java110.vo.ResultVo;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.ResponseEntity;
+import org.springframework.stereotype.Service;
+
+@Service("updateReportFeeMonthCollectionDetailBMOImpl")
+public class UpdateReportFeeMonthCollectionDetailBMOImpl implements IUpdateReportFeeMonthCollectionDetailBMO {
+
+    @Autowired
+    private IReportFeeMonthCollectionDetailInnerServiceSMO reportFeeMonthCollectionDetailInnerServiceSMOImpl;
+
+    /**
+     * @param reportFeeMonthCollectionDetailPo
+     * @return 订单服务能够接受的报文
+     */
+    @Java110Transactional
+    public ResponseEntity<String> update(ReportFeeMonthCollectionDetailPo reportFeeMonthCollectionDetailPo) {
+
+        int flag = reportFeeMonthCollectionDetailInnerServiceSMOImpl.updateReportFeeMonthCollectionDetail(reportFeeMonthCollectionDetailPo);
+
+        if (flag > 0) {
+            return ResultVo.createResponseEntity(ResultVo.CODE_OK, "保存成功");
+        }
+
+        return ResultVo.createResponseEntity(ResultVo.CODE_ERROR, "保存失败");
+    }
+
+}

+ 61 - 0
service-report/src/main/java/com/java110/report/dao/IReportFeeMonthCollectionDetailServiceDao.java

@@ -0,0 +1,61 @@
+package com.java110.report.dao;
+
+
+import com.java110.utils.exception.DAOException;
+import com.java110.entity.merchant.BoMerchant;
+import com.java110.entity.merchant.BoMerchantAttr;
+import com.java110.entity.merchant.Merchant;
+import com.java110.entity.merchant.MerchantAttr;
+
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 月缴费表组件内部之间使用,没有给外围系统提供服务能力
+ * 月缴费表服务接口类,要求全部以字符串传输,方便微服务化
+ * 新建客户,修改客户,删除客户,查询客户等功能
+ *
+ * Created by wuxw on 2016/12/27.
+ */
+public interface IReportFeeMonthCollectionDetailServiceDao {
+
+
+    /**
+     * 保存 月缴费表信息
+     * @param info
+     * @throws DAOException DAO异常
+     */
+    void saveReportFeeMonthCollectionDetailInfo(Map info) throws DAOException;
+
+
+
+
+    /**
+     * 查询月缴费表信息(instance过程)
+     * 根据bId 查询月缴费表信息
+     * @param info bId 信息
+     * @return 月缴费表信息
+     * @throws DAOException DAO异常
+     */
+    List<Map> getReportFeeMonthCollectionDetailInfo(Map info) throws DAOException;
+
+
+
+    /**
+     * 修改月缴费表信息
+     * @param info 修改信息
+     * @throws DAOException DAO异常
+     */
+    void updateReportFeeMonthCollectionDetailInfo(Map info) throws DAOException;
+
+
+    /**
+     * 查询月缴费表总数
+     *
+     * @param info 月缴费表信息
+     * @return 月缴费表数量
+     */
+    int queryReportFeeMonthCollectionDetailsCount(Map info);
+
+}

+ 98 - 0
service-report/src/main/java/com/java110/report/dao/impl/ReportFeeMonthCollectionDetailServiceDaoImpl.java

@@ -0,0 +1,98 @@
+package com.java110.report.dao.impl;
+
+import com.alibaba.fastjson.JSONObject;
+import com.java110.utils.constant.ResponseConstant;
+import com.java110.utils.exception.DAOException;
+import com.java110.utils.util.DateUtil;
+import com.java110.core.base.dao.BaseServiceDao;
+import com.java110.report.dao.IReportFeeMonthCollectionDetailServiceDao;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 月缴费表服务 与数据库交互
+ * Created by wuxw on 2017/4/5.
+ */
+@Service("reportFeeMonthCollectionDetailServiceDaoImpl")
+//@Transactional
+public class ReportFeeMonthCollectionDetailServiceDaoImpl extends BaseServiceDao implements IReportFeeMonthCollectionDetailServiceDao {
+
+    private static Logger logger = LoggerFactory.getLogger(ReportFeeMonthCollectionDetailServiceDaoImpl.class);
+
+
+
+
+
+    /**
+     * 保存月缴费表信息 到 instance
+     * @param info   bId 信息
+     * @throws DAOException DAO异常
+     */
+    @Override
+    public void saveReportFeeMonthCollectionDetailInfo(Map info) throws DAOException {
+        logger.debug("保存月缴费表信息Instance 入参 info : {}",info);
+
+        int saveFlag = sqlSessionTemplate.insert("reportFeeMonthCollectionDetailServiceDaoImpl.saveReportFeeMonthCollectionDetailInfo",info);
+
+        if(saveFlag < 1){
+            throw new DAOException(ResponseConstant.RESULT_PARAM_ERROR,"保存月缴费表信息Instance数据失败:"+ JSONObject.toJSONString(info));
+        }
+    }
+
+
+    /**
+     * 查询月缴费表信息(instance)
+     * @param info bId 信息
+     * @return List<Map>
+     * @throws DAOException DAO异常
+     */
+    @Override
+    public List<Map> getReportFeeMonthCollectionDetailInfo(Map info) throws DAOException {
+        logger.debug("查询月缴费表信息 入参 info : {}",info);
+
+        List<Map> businessReportFeeMonthCollectionDetailInfos = sqlSessionTemplate.selectList("reportFeeMonthCollectionDetailServiceDaoImpl.getReportFeeMonthCollectionDetailInfo",info);
+
+        return businessReportFeeMonthCollectionDetailInfos;
+    }
+
+
+    /**
+     * 修改月缴费表信息
+     * @param info 修改信息
+     * @throws DAOException DAO异常
+     */
+    @Override
+    public void updateReportFeeMonthCollectionDetailInfo(Map info) throws DAOException {
+        logger.debug("修改月缴费表信息Instance 入参 info : {}",info);
+
+        int saveFlag = sqlSessionTemplate.update("reportFeeMonthCollectionDetailServiceDaoImpl.updateReportFeeMonthCollectionDetailInfo",info);
+
+        if(saveFlag < 1){
+            throw new DAOException(ResponseConstant.RESULT_PARAM_ERROR,"修改月缴费表信息Instance数据失败:"+ JSONObject.toJSONString(info));
+        }
+    }
+
+     /**
+     * 查询月缴费表数量
+     * @param info 月缴费表信息
+     * @return 月缴费表数量
+     */
+    @Override
+    public int queryReportFeeMonthCollectionDetailsCount(Map info) {
+        logger.debug("查询月缴费表数据 入参 info : {}",info);
+
+        List<Map> businessReportFeeMonthCollectionDetailInfos = sqlSessionTemplate.selectList("reportFeeMonthCollectionDetailServiceDaoImpl.queryReportFeeMonthCollectionDetailsCount", info);
+        if (businessReportFeeMonthCollectionDetailInfos.size() < 1) {
+            return 0;
+        }
+
+        return Integer.parseInt(businessReportFeeMonthCollectionDetailInfos.get(0).get("count").toString());
+    }
+
+
+}

+ 83 - 0
service-report/src/main/java/com/java110/report/smo/impl/ReportFeeMonthCollectionDetailInnerServiceSMOImpl.java

@@ -0,0 +1,83 @@
+package com.java110.report.smo.impl;
+
+
+import com.java110.core.base.smo.BaseServiceSMO;
+import com.java110.dto.PageDto;
+import com.java110.dto.reportFeeMonthCollectionDetail.ReportFeeMonthCollectionDetailDto;
+import com.java110.intf.report.IReportFeeMonthCollectionDetailInnerServiceSMO;
+import com.java110.po.reportFeeMonthCollectionDetail.ReportFeeMonthCollectionDetailPo;
+import com.java110.report.dao.IReportFeeMonthCollectionDetailServiceDao;
+import com.java110.utils.util.BeanConvertUtil;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.List;
+
+/**
+ * @ClassName FloorInnerServiceSMOImpl
+ * @Description 月缴费表内部服务实现类
+ * @Author wuxw
+ * @Date 2019/4/24 9:20
+ * @Version 1.0
+ * add by wuxw 2019/4/24
+ **/
+@RestController
+public class ReportFeeMonthCollectionDetailInnerServiceSMOImpl extends BaseServiceSMO implements IReportFeeMonthCollectionDetailInnerServiceSMO {
+
+    @Autowired
+    private IReportFeeMonthCollectionDetailServiceDao reportFeeMonthCollectionDetailServiceDaoImpl;
+
+
+    @Override
+    public int saveReportFeeMonthCollectionDetail(@RequestBody ReportFeeMonthCollectionDetailPo reportFeeMonthCollectionDetailPo) {
+        int saveFlag = 1;
+        reportFeeMonthCollectionDetailServiceDaoImpl.saveReportFeeMonthCollectionDetailInfo(BeanConvertUtil.beanCovertMap(reportFeeMonthCollectionDetailPo));
+        return saveFlag;
+    }
+
+    @Override
+    public int updateReportFeeMonthCollectionDetail(@RequestBody ReportFeeMonthCollectionDetailPo reportFeeMonthCollectionDetailPo) {
+        int saveFlag = 1;
+        reportFeeMonthCollectionDetailServiceDaoImpl.updateReportFeeMonthCollectionDetailInfo(BeanConvertUtil.beanCovertMap(reportFeeMonthCollectionDetailPo));
+        return saveFlag;
+    }
+
+    @Override
+    public int deleteReportFeeMonthCollectionDetail(@RequestBody ReportFeeMonthCollectionDetailPo reportFeeMonthCollectionDetailPo) {
+        int saveFlag = 1;
+        reportFeeMonthCollectionDetailPo.setStatusCd("1");
+        reportFeeMonthCollectionDetailServiceDaoImpl.updateReportFeeMonthCollectionDetailInfo(BeanConvertUtil.beanCovertMap(reportFeeMonthCollectionDetailPo));
+        return saveFlag;
+    }
+
+    @Override
+    public List<ReportFeeMonthCollectionDetailDto> queryReportFeeMonthCollectionDetails(@RequestBody ReportFeeMonthCollectionDetailDto reportFeeMonthCollectionDetailDto) {
+
+        //校验是否传了 分页信息
+
+        int page = reportFeeMonthCollectionDetailDto.getPage();
+
+        if (page != PageDto.DEFAULT_PAGE) {
+            reportFeeMonthCollectionDetailDto.setPage((page - 1) * reportFeeMonthCollectionDetailDto.getRow());
+        }
+
+        List<ReportFeeMonthCollectionDetailDto> reportFeeMonthCollectionDetails = BeanConvertUtil.covertBeanList(reportFeeMonthCollectionDetailServiceDaoImpl.getReportFeeMonthCollectionDetailInfo(BeanConvertUtil.beanCovertMap(reportFeeMonthCollectionDetailDto)), ReportFeeMonthCollectionDetailDto.class);
+
+        return reportFeeMonthCollectionDetails;
+    }
+
+
+    @Override
+    public int queryReportFeeMonthCollectionDetailsCount(@RequestBody ReportFeeMonthCollectionDetailDto reportFeeMonthCollectionDetailDto) {
+        return reportFeeMonthCollectionDetailServiceDaoImpl.queryReportFeeMonthCollectionDetailsCount(BeanConvertUtil.beanCovertMap(reportFeeMonthCollectionDetailDto));
+    }
+
+    public IReportFeeMonthCollectionDetailServiceDao getReportFeeMonthCollectionDetailServiceDaoImpl() {
+        return reportFeeMonthCollectionDetailServiceDaoImpl;
+    }
+
+    public void setReportFeeMonthCollectionDetailServiceDaoImpl(IReportFeeMonthCollectionDetailServiceDao reportFeeMonthCollectionDetailServiceDaoImpl) {
+        this.reportFeeMonthCollectionDetailServiceDaoImpl = reportFeeMonthCollectionDetailServiceDaoImpl;
+    }
+}