optmize sya

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

@@ -950,4 +950,17 @@
     </select>
 
 
+    <!-- 按缴费方式统计 -->
+    <select id="getReceivedFeeByPrimeRate" parameterType="Map" resultType="Map">
+        select td.`name`,td.status_cd primeRate,SUM(t.received_amount) receivedAmount
+        from pay_fee_detail t
+        left join t_dict td on td.status_cd = t.prime_rate and td.table_name = 'pay_fee_detail' and td.table_columns = 'prime_rate'
+        where
+        1=1
+        and t.community_id = #{communityId}
+        and t.create_time &gt; #{startDate}
+        and t.create_time &lt; #{endDate}
+        and t.status_cd = '0'
+        group by td.status_cd,td.`name`
+    </select>
 </mapper>

java110-interface/src/main/java/com/java110/intf/report/IReportFeeStatisticsInnerServiceSMO.java

@@ -188,4 +188,7 @@ public interface IReportFeeStatisticsInnerServiceSMO {
      */
     @RequestMapping(value = "/getReceivedFeeByFloor", method = RequestMethod.POST)
     List<Map> getReceivedFeeByFloor(@RequestBody QueryStatisticsDto queryStatisticsDto);
+
+    @RequestMapping(value = "/getReceivedFeeByPrimeRate", method = RequestMethod.POST)
+    List<Map> getReceivedFeeByPrimeRate(@RequestBody QueryStatisticsDto queryStatisticsDto);
 }

service-report/src/main/java/com/java110/report/cmd/dataReport/QueryReceivedWayStatisticsCmd.java

@@ -0,0 +1,62 @@
+package com.java110.report.cmd.dataReport;
+
+import com.alibaba.fastjson.JSONObject;
+import com.java110.core.annotation.Java110Cmd;
+import com.java110.core.context.ICmdDataFlowContext;
+import com.java110.core.event.cmd.Cmd;
+import com.java110.core.event.cmd.CmdEvent;
+import com.java110.dto.report.QueryStatisticsDto;
+import com.java110.report.statistics.IFeeStatistics;
+import com.java110.utils.exception.CmdException;
+import com.java110.utils.util.Assert;
+import com.java110.utils.util.StringUtil;
+import com.java110.vo.ResultVo;
+import org.springframework.beans.factory.annotation.Autowired;
+
+import java.math.BigDecimal;
+import java.text.ParseException;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 查询收款方式统计
+ */
+@Java110Cmd(serviceCode = "dataReport.queryReceivedWayStatistics")
+public class QueryReceivedWayStatisticsCmd extends Cmd {
+
+    @Autowired
+    private IFeeStatistics feeStatisticsImpl;
+
+    @Override
+    public void validate(CmdEvent event, ICmdDataFlowContext context, JSONObject reqJson) throws CmdException, ParseException {
+        Assert.hasKeyAndValue(reqJson, "communityId", "未包含小区");
+        String startDate = reqJson.getString("startDate");
+        String endDate = reqJson.getString("endDate");
+        if (!StringUtil.isEmpty(startDate) && !startDate.contains(":")) {
+            startDate += " 00:00:00";
+            reqJson.put("startDate", startDate);
+        }
+        if (!StringUtil.isEmpty(endDate) && !endDate.contains(":")) {
+            endDate += " 23:59:59";
+            reqJson.put("endDate", endDate);
+        }
+    }
+
+    @Override
+    public void doCmd(CmdEvent event, ICmdDataFlowContext context, JSONObject reqJson) throws CmdException, ParseException {
+        QueryStatisticsDto queryStatisticsDto = new QueryStatisticsDto();
+        queryStatisticsDto.setCommunityId(reqJson.getString("communityId"));
+        queryStatisticsDto.setStartDate(reqJson.getString("startDate"));
+        queryStatisticsDto.setEndDate(reqJson.getString("endDate"));
+
+        List<Map> datas = null;
+        // todo 根据缴费方式统计
+        datas = feeStatisticsImpl.getReceivedFeeByPrimeRate(queryStatisticsDto);
+
+        context.setResponseEntity(ResultVo.createResponseEntity(datas));
+    }
+
+
+
+}

service-report/src/main/java/com/java110/report/dao/IReportFeeStatisticsServiceDao.java

@@ -199,4 +199,11 @@ public interface IReportFeeStatisticsServiceDao {
      * @return
      */
     List<Map> getReceivedFeeByFloor(Map info);
+
+    /**
+     * 查询 收款方式统计
+     * @param info
+     * @return
+     */
+    List<Map> getReceivedFeeByPrimeRate(Map info);
 }

service-report/src/main/java/com/java110/report/dao/impl/ReportFeeStatisticsServiceDaoImpl.java

@@ -346,4 +346,10 @@ public class ReportFeeStatisticsServiceDaoImpl extends BaseServiceDao implements
         return infos;
     }
 
+    @Override
+    public List<Map> getReceivedFeeByPrimeRate(Map info) {
+        List<Map> infos = sqlSessionTemplate.selectList("reportFeeStatisticsServiceDaoImpl.getReceivedFeeByPrimeRate", info);
+        return infos;
+    }
+
 }

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

@@ -233,4 +233,15 @@ public class ReportFeeStatisticsInnerServiceSMOImpl extends BaseServiceSMO imple
         List<Map> infos = reportFeeStatisticsServiceDaoImpl.getReceivedFeeByFloor(BeanConvertUtil.beanCovertMap(queryStatisticsDto));
         return infos;
     }
+
+    /**
+     * 按收款方式统计收入
+     * @param queryStatisticsDto
+     * @return
+     */
+    @Override
+    public List<Map> getReceivedFeeByPrimeRate(@RequestBody QueryStatisticsDto queryStatisticsDto) {
+        List<Map> infos = reportFeeStatisticsServiceDaoImpl.getReceivedFeeByPrimeRate(BeanConvertUtil.beanCovertMap(queryStatisticsDto));
+        return infos;
+    }
 }

service-report/src/main/java/com/java110/report/statistics/IFeeStatistics.java

@@ -180,4 +180,11 @@ public interface IFeeStatistics {
      * @return
      */
     List<Map> getReceivedFeeByFloor(QueryStatisticsDto queryStatisticsDto);
+
+    /**
+     * 查询 收款方式统计
+     * @param queryStatisticsDto
+     * @return
+     */
+    List<Map> getReceivedFeeByPrimeRate(QueryStatisticsDto queryStatisticsDto);
 }

service-report/src/main/java/com/java110/report/statistics/impl/BaseDataStatisticsImpl.java

@@ -51,7 +51,9 @@ public class BaseDataStatisticsImpl implements IBaseDataStatistics {
         RoomDto roomDto = new RoomDto();
         roomDto.setFloorId(queryStatisticsDto.getFloorId());
         roomDto.setCommunityId(queryStatisticsDto.getCommunityId());
-
+        roomDto.setOwnerName(queryStatisticsDto.getOwnerName());
+        roomDto.setFloorId(queryStatisticsDto.getFloorId());
+        roomDto.setLink(queryStatisticsDto.getLink());
         addRoomNumCondition(queryStatisticsDto, roomDto);
         return baseDataStatisticsInnerServiceSMOImpl.getRoomCount(roomDto);
     }
@@ -69,6 +71,9 @@ public class BaseDataStatisticsImpl implements IBaseDataStatistics {
         roomDto.setFloorId(queryStatisticsDto.getFloorId());
         roomDto.setPage(queryStatisticsDto.getPage());
         roomDto.setRow(queryStatisticsDto.getRow());
+        roomDto.setOwnerName(queryStatisticsDto.getOwnerName());
+        roomDto.setFloorId(queryStatisticsDto.getFloorId());
+        roomDto.setLink(queryStatisticsDto.getLink());
         addRoomNumCondition(queryStatisticsDto, roomDto);
         return baseDataStatisticsInnerServiceSMOImpl.getRoomInfo(roomDto);
     }

service-report/src/main/java/com/java110/report/statistics/impl/FeeStatisticsImpl.java

@@ -208,4 +208,14 @@ public class FeeStatisticsImpl implements IFeeStatistics {
         return reportFeeStatisticsInnerServiceSMOImpl.getReceivedFeeByFloor(queryStatisticsDto);
     }
 
+    /**
+     * 收款方式统计
+     * @param queryStatisticsDto
+     * @return
+     */
+    @Override
+    public List<Map> getReceivedFeeByPrimeRate(QueryStatisticsDto queryStatisticsDto) {
+        return reportFeeStatisticsInnerServiceSMOImpl.getReceivedFeeByPrimeRate(queryStatisticsDto);
+    }
+
 }