From 62f2b98b64f6726ca7cb90cbfa996deaac4ffba9 Mon Sep 17 00:00:00 2001
From: xiaogang <905166056@qq.com>
Date: 星期四, 02 十一月 2023 14:09:04 +0800
Subject: [PATCH] 1、优化查询，便于模糊查询条件2、界面查询条件调整
---
service-report/src/main/java/com/java110/report/smo/impl/ReportFeeMonthStatisticsInnerServiceSMOImpl.java | 321 ++++++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 317 insertions(+), 4 deletions(-)
diff --git a/service-report/src/main/java/com/java110/report/smo/impl/ReportFeeMonthStatisticsInnerServiceSMOImpl.java b/service-report/src/main/java/com/java110/report/smo/impl/ReportFeeMonthStatisticsInnerServiceSMOImpl.java
old mode 100644
new mode 100755
index fac3a68..a0b1dcd
--- a/service-report/src/main/java/com/java110/report/smo/impl/ReportFeeMonthStatisticsInnerServiceSMOImpl.java
+++ b/service-report/src/main/java/com/java110/report/smo/impl/ReportFeeMonthStatisticsInnerServiceSMOImpl.java
@@ -1,19 +1,26 @@
package com.java110.report.smo.impl;
+import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.java110.core.base.smo.BaseServiceSMO;
import com.java110.dto.PageDto;
+import com.java110.dto.room.RoomDto;
import com.java110.dto.fee.FeeConfigDto;
-import com.java110.dto.reportFeeMonthStatistics.ReportFeeMonthStatisticsDto;
+import com.java110.dto.owner.OwnerDto;
+import com.java110.dto.repair.RepairUserDto;
+import com.java110.dto.report.ReportDeposit;
+import com.java110.dto.reportFee.ReportFeeMonthStatisticsDto;
import com.java110.intf.report.IReportFeeMonthStatisticsInnerServiceSMO;
-import com.java110.po.reportFeeMonthStatistics.ReportFeeMonthStatisticsPo;
+import com.java110.po.reportFee.ReportFeeMonthStatisticsPo;
import com.java110.report.dao.IReportFeeMonthStatisticsServiceDao;
import com.java110.utils.util.BeanConvertUtil;
+import com.java110.utils.util.DateUtil;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RestController;
+import java.util.Calendar;
import java.util.List;
import java.util.Map;
@@ -50,7 +57,7 @@
public int deleteReportFeeMonthStatistics(@RequestBody ReportFeeMonthStatisticsPo reportFeeMonthStatisticsPo) {
int saveFlag = 1;
reportFeeMonthStatisticsPo.setStatusCd("1");
- reportFeeMonthStatisticsServiceDaoImpl.updateReportFeeMonthStatisticsInfo(BeanConvertUtil.beanCovertMap(reportFeeMonthStatisticsPo));
+ reportFeeMonthStatisticsServiceDaoImpl.deleteReportFeeMonthStatisticsInfo(BeanConvertUtil.beanCovertMap(reportFeeMonthStatisticsPo));
return saveFlag;
}
@@ -97,6 +104,34 @@
}
@Override
+ public int queryReportFeeSummaryDetailCount(@RequestBody ReportFeeMonthStatisticsDto reportFeeMonthStatisticsDto) {
+ return reportFeeMonthStatisticsServiceDaoImpl.queryReportFeeSummaryDetailCount(BeanConvertUtil.beanCovertMap(reportFeeMonthStatisticsDto));
+ }
+
+ @Override
+ public List<ReportFeeMonthStatisticsDto> queryReportFeeSummaryDetail(@RequestBody ReportFeeMonthStatisticsDto reportFeeMonthStatisticsDto) {
+ //鏍￠獙鏄惁浼犱簡 鍒嗛〉淇℃伅
+
+ int page = reportFeeMonthStatisticsDto.getPage();
+
+ if (page != PageDto.DEFAULT_PAGE) {
+ reportFeeMonthStatisticsDto.setPage((page - 1) * reportFeeMonthStatisticsDto.getRow());
+ }
+
+ List<ReportFeeMonthStatisticsDto> reportFeeMonthStatisticss = BeanConvertUtil.covertBeanList(reportFeeMonthStatisticsServiceDaoImpl.queryReportFeeSummaryDetail(BeanConvertUtil.beanCovertMap(reportFeeMonthStatisticsDto)), ReportFeeMonthStatisticsDto.class);
+
+ return reportFeeMonthStatisticss;
+ }
+
+ @Override
+ public ReportFeeMonthStatisticsDto queryReportFeeSummaryMajor(@RequestBody ReportFeeMonthStatisticsDto reportFeeMonthStatisticsDto) {
+ ReportFeeMonthStatisticsDto reportFeeMonthStatistics = BeanConvertUtil.covertBean(
+ reportFeeMonthStatisticsServiceDaoImpl.queryReportFeeSummaryMajor(
+ BeanConvertUtil.beanCovertMap(reportFeeMonthStatisticsDto)), ReportFeeMonthStatisticsDto.class);
+ return reportFeeMonthStatistics;
+ }
+
+ @Override
public int queryReportFloorUnitFeeSummaryCount(@RequestBody ReportFeeMonthStatisticsDto reportFeeMonthStatisticsDto) {
return reportFeeMonthStatisticsServiceDaoImpl.queryReportFloorUnitFeeSummaryCount(BeanConvertUtil.beanCovertMap(reportFeeMonthStatisticsDto));
}
@@ -117,6 +152,34 @@
}
@Override
+ public int queryReportFloorUnitFeeSummaryDetailCount(@RequestBody ReportFeeMonthStatisticsDto reportFeeMonthStatisticsDto) {
+ return reportFeeMonthStatisticsServiceDaoImpl.queryReportFloorUnitFeeSummaryDetailCount(BeanConvertUtil.beanCovertMap(reportFeeMonthStatisticsDto));
+ }
+
+ @Override
+ public List<ReportFeeMonthStatisticsDto> queryReportFloorUnitFeeDetailSummary(@RequestBody ReportFeeMonthStatisticsDto reportFeeMonthStatisticsDto) {
+ //鏍￠獙鏄惁浼犱簡 鍒嗛〉淇℃伅
+
+ int page = reportFeeMonthStatisticsDto.getPage();
+
+ if (page != PageDto.DEFAULT_PAGE) {
+ reportFeeMonthStatisticsDto.setPage((page - 1) * reportFeeMonthStatisticsDto.getRow());
+ }
+
+ List<ReportFeeMonthStatisticsDto> reportFeeMonthStatisticss = BeanConvertUtil.covertBeanList(reportFeeMonthStatisticsServiceDaoImpl.queryReportFloorUnitFeeSummaryDetail(BeanConvertUtil.beanCovertMap(reportFeeMonthStatisticsDto)), ReportFeeMonthStatisticsDto.class);
+
+ return reportFeeMonthStatisticss;
+ }
+
+ @Override
+ public ReportFeeMonthStatisticsDto queryReportFloorUnitFeeSummaryMajor(@RequestBody ReportFeeMonthStatisticsDto reportFeeMonthStatisticsDto) {
+ ReportFeeMonthStatisticsDto reportFeeMonthStatistics = BeanConvertUtil.covertBean(
+ reportFeeMonthStatisticsServiceDaoImpl.queryReportFloorUnitFeeSummaryMajor(
+ BeanConvertUtil.beanCovertMap(reportFeeMonthStatisticsDto)), ReportFeeMonthStatisticsDto.class);
+ return reportFeeMonthStatistics;
+ }
+
+ @Override
public int queryFeeBreakdownCount(@RequestBody ReportFeeMonthStatisticsDto reportFeeMonthStatisticsDto) {
return reportFeeMonthStatisticsServiceDaoImpl.queryFeeBreakdownCount(BeanConvertUtil.beanCovertMap(reportFeeMonthStatisticsDto));
}
@@ -134,6 +197,34 @@
List<ReportFeeMonthStatisticsDto> reportFeeMonthStatisticss = BeanConvertUtil.covertBeanList(reportFeeMonthStatisticsServiceDaoImpl.queryFeeBreakdown(BeanConvertUtil.beanCovertMap(reportFeeMonthStatisticsDto)), ReportFeeMonthStatisticsDto.class);
return reportFeeMonthStatisticss;
+ }
+
+ @Override
+ public int queryFeeBreakdownDetailCount(@RequestBody ReportFeeMonthStatisticsDto reportFeeMonthStatisticsDto) {
+ return reportFeeMonthStatisticsServiceDaoImpl.queryFeeBreakdownDetailCount(BeanConvertUtil.beanCovertMap(reportFeeMonthStatisticsDto));
+ }
+
+ @Override
+ public List<ReportFeeMonthStatisticsDto> queryFeeBreakdownDetail(@RequestBody ReportFeeMonthStatisticsDto reportFeeMonthStatisticsDto) {
+ //鏍￠獙鏄惁浼犱簡 鍒嗛〉淇℃伅
+
+ int page = reportFeeMonthStatisticsDto.getPage();
+
+ if (page != PageDto.DEFAULT_PAGE) {
+ reportFeeMonthStatisticsDto.setPage((page - 1) * reportFeeMonthStatisticsDto.getRow());
+ }
+
+ List<ReportFeeMonthStatisticsDto> reportFeeMonthStatisticss = BeanConvertUtil.covertBeanList(reportFeeMonthStatisticsServiceDaoImpl.queryFeeBreakdownDetail(BeanConvertUtil.beanCovertMap(reportFeeMonthStatisticsDto)), ReportFeeMonthStatisticsDto.class);
+
+ return reportFeeMonthStatisticss;
+ }
+
+ @Override
+ public ReportFeeMonthStatisticsDto queryFeeBreakdownMajor(@RequestBody ReportFeeMonthStatisticsDto reportFeeMonthStatisticsDto) {
+ ReportFeeMonthStatisticsDto reportFeeMonthStatistics = BeanConvertUtil.covertBean(
+ reportFeeMonthStatisticsServiceDaoImpl.queryFeeBreakdownMajor(
+ BeanConvertUtil.beanCovertMap(reportFeeMonthStatisticsDto)), ReportFeeMonthStatisticsDto.class);
+ return reportFeeMonthStatistics;
}
@Override
@@ -203,6 +294,14 @@
}
@Override
+ public ReportFeeMonthStatisticsDto queryOweFeeDetailMajor(@RequestBody ReportFeeMonthStatisticsDto reportFeeMonthStatisticsDto) {
+ ReportFeeMonthStatisticsDto reportFeeMonthStatistics = BeanConvertUtil.covertBean(
+ reportFeeMonthStatisticsServiceDaoImpl.queryOweFeeDetailMajor(
+ BeanConvertUtil.beanCovertMap(reportFeeMonthStatisticsDto)), ReportFeeMonthStatisticsDto.class);
+ return reportFeeMonthStatistics;
+ }
+
+ @Override
public JSONObject queryPayFeeDetailCount(@RequestBody ReportFeeMonthStatisticsDto reportFeeMonthStatisticsDto) {
Map info = reportFeeMonthStatisticsServiceDaoImpl.queryPayFeeDetailCount(BeanConvertUtil.beanCovertMap(reportFeeMonthStatisticsDto));
@@ -226,8 +325,16 @@
@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;
+ }
+
+ @Override
+ public List<ReportFeeMonthStatisticsDto> queryPayFeeDetailSum(@RequestBody ReportFeeMonthStatisticsDto reportFeeMonthStatisticsDto) {
+ List<ReportFeeMonthStatisticsDto> reportFeeMonthStatisticss = BeanConvertUtil.covertBeanList(reportFeeMonthStatisticsServiceDaoImpl.queryPayFeeDetailSum(BeanConvertUtil.beanCovertMap(reportFeeMonthStatisticsDto)), ReportFeeMonthStatisticsDto.class);
return reportFeeMonthStatisticss;
}
@@ -289,11 +396,217 @@
}
@Override
+ public JSONObject queryReportProficientCount(@RequestBody ReportFeeMonthStatisticsDto reportFeeMonthStatisticsDto) {
+
+ JSONObject result = new JSONObject();
+ Map info = reportFeeMonthStatisticsServiceDaoImpl.getReceivableInformation(BeanConvertUtil.beanCovertMap(reportFeeMonthStatisticsDto));
+ result.put("receivableInformation", info);
+
+ List<Map> infos = reportFeeMonthStatisticsServiceDaoImpl.getFloorReceivableInformation(BeanConvertUtil.beanCovertMap(reportFeeMonthStatisticsDto));
+ result.put("floorReceivableInformations", JSONArray.parseArray(JSONArray.toJSONString(infos)));
+
+ List<Map> tempInfos = reportFeeMonthStatisticsServiceDaoImpl.getFeeConfigReceivableInformation(BeanConvertUtil.beanCovertMap(reportFeeMonthStatisticsDto));
+ result.put("feeConfigReceivableInformations", JSONArray.parseArray(JSONArray.toJSONString(tempInfos)));
+
+
+ reportFeeMonthStatisticsDto.setStartTime(DateUtil.getNow(DateUtil.DATE_FORMATE_STRING_A));
+ Calendar calendar = Calendar.getInstance();
+ calendar.add(Calendar.DAY_OF_MONTH, 7);
+ reportFeeMonthStatisticsDto.setEndTime(DateUtil.getFormatTimeString(calendar.getTime(), DateUtil.DATE_FORMATE_STRING_A));
+
+ int deadlineFeeCount = reportFeeMonthStatisticsServiceDaoImpl.queryDeadlineFeeCount(BeanConvertUtil.beanCovertMap(reportFeeMonthStatisticsDto));
+ int prePaymentCount = reportFeeMonthStatisticsServiceDaoImpl.queryPrePaymentNewCount(BeanConvertUtil.beanCovertMap(reportFeeMonthStatisticsDto));
+
+
+ JSONObject remindInfomation = new JSONObject();
+ remindInfomation.put("deadlineFeeCount", deadlineFeeCount);
+ remindInfomation.put("prePaymentCount", prePaymentCount);
+
+ result.put("remindInfomation", remindInfomation);
+
+ return result;
+ }
+
+ @Override
public List<FeeConfigDto> queryFeeConfigs(FeeConfigDto feeConfigDto) {
List<FeeConfigDto> feeConfigs = BeanConvertUtil.covertBeanList(reportFeeMonthStatisticsServiceDaoImpl.getFeeConfigInfo(BeanConvertUtil.beanCovertMap(feeConfigDto)), FeeConfigDto.class);
return feeConfigs;
}
+ /**
+ * 鏌ヨ鎶ヤ慨淇℃伅
+ *
+ * @param repairUserDto
+ * @return
+ */
+ @Override
+ public List<RepairUserDto> queryRepair(RepairUserDto repairUserDto) {
+ //鏍￠獙鏄惁浼犱簡 鍒嗛〉淇℃伅
+
+ int page = repairUserDto.getPage();
+
+ if (page != PageDto.DEFAULT_PAGE) {
+ repairUserDto.setPage((page - 1) * repairUserDto.getRow());
+ }
+ List<RepairUserDto> repairUserDtoList = BeanConvertUtil.covertBeanList(reportFeeMonthStatisticsServiceDaoImpl.getRepairUserInfo(BeanConvertUtil.beanCovertMap(repairUserDto)), RepairUserDto.class);
+ return repairUserDtoList;
+ }
+
+ /**
+ * 鏌ヨ鎶ヤ慨淇℃伅
+ *
+ * @param repairUserDto
+ * @return
+ */
+ @Override
+ public List<RepairUserDto> queryRepairWithOutPage(RepairUserDto repairUserDto) {
+ List<RepairUserDto> repairUserDtoList = BeanConvertUtil.covertBeanList(reportFeeMonthStatisticsServiceDaoImpl.getRepairWithOutPage(BeanConvertUtil.beanCovertMap(repairUserDto)), RepairUserDto.class);
+ return repairUserDtoList;
+ }
+
+ /**
+ * 鏌ヨ鍛樺伐鎶ヤ慨琛ㄥ憳宸ヤ俊鎭�
+ *
+ * @param repairUserDto
+ * @return
+ */
+ @Override
+ public List<RepairUserDto> queryRepairForStaff(RepairUserDto repairUserDto) {
+ //鏍￠獙鏄惁浼犱簡 鍒嗛〉淇℃伅
+
+ int page = repairUserDto.getPage();
+
+ if (page != PageDto.DEFAULT_PAGE) {
+ repairUserDto.setPage((page - 1) * repairUserDto.getRow());
+ }
+ List<RepairUserDto> repairUserDtoList = BeanConvertUtil.covertBeanList(reportFeeMonthStatisticsServiceDaoImpl.getRepairStaff(BeanConvertUtil.beanCovertMap(repairUserDto)), RepairUserDto.class);
+ return repairUserDtoList;
+ }
+
+ @Override
+ public int queryNoFeeRoomsCount(@RequestBody RoomDto roomDto) {
+ return reportFeeMonthStatisticsServiceDaoImpl.queryNoFeeRoomsCount(BeanConvertUtil.beanCovertMap(roomDto));
+ }
+
+ @Override
+ public List<RoomDto> queryNoFeeRooms(@RequestBody RoomDto roomDto) {
+//鏍￠獙鏄惁浼犱簡 鍒嗛〉淇℃伅
+
+ int page = roomDto.getPage();
+
+ if (page != PageDto.DEFAULT_PAGE) {
+ roomDto.setPage((page - 1) * roomDto.getRow());
+ }
+
+ List<RoomDto> rooms =
+ BeanConvertUtil.covertBeanList(reportFeeMonthStatisticsServiceDaoImpl.queryNoFeeRooms(BeanConvertUtil.beanCovertMap(roomDto)),
+ RoomDto.class);
+
+ return rooms;
+ }
+
+ @Override
+ public List<ReportDeposit> queryPayFeeDeposit(@RequestBody ReportDeposit reportDeposit) {
+ int page = reportDeposit.getPage();
+
+ if (page != PageDto.DEFAULT_PAGE) {
+ reportDeposit.setPage((page - 1) * reportDeposit.getRow());
+ }
+ List<ReportDeposit> deposits = BeanConvertUtil.covertBeanList(reportFeeMonthStatisticsServiceDaoImpl.queryPayFeeDeposit(BeanConvertUtil.beanCovertMap(reportDeposit)),
+ ReportDeposit.class);
+ return deposits;
+ }
+
+ @Override
+ public List<ReportDeposit> queryFeeDepositAmount(@RequestBody ReportDeposit reportDeposit) {
+ List<ReportDeposit> deposits = BeanConvertUtil.covertBeanList(reportFeeMonthStatisticsServiceDaoImpl.queryFeeDepositAmount(BeanConvertUtil.beanCovertMap(reportDeposit)),
+ ReportDeposit.class);
+ return deposits;
+ }
+
+ @Override
+ public int queryHuaningOweFeeCount(@RequestBody ReportFeeMonthStatisticsDto reportFeeMonthStatisticsDto) {
+ return reportFeeMonthStatisticsServiceDaoImpl.queryHuaningOweFeeCount(BeanConvertUtil.beanCovertMap(reportFeeMonthStatisticsDto));
+ }
+
+ @Override
+ public List<ReportFeeMonthStatisticsDto> queryHuaningOweFee(@RequestBody ReportFeeMonthStatisticsDto reportFeeMonthStatisticsDto) {
+ int page = reportFeeMonthStatisticsDto.getPage();
+
+ if (page != PageDto.DEFAULT_PAGE) {
+ reportFeeMonthStatisticsDto.setPage((page - 1) * reportFeeMonthStatisticsDto.getRow());
+ }
+ List<ReportFeeMonthStatisticsDto> deposits = BeanConvertUtil.covertBeanList(reportFeeMonthStatisticsServiceDaoImpl.queryHuaningOweFee(BeanConvertUtil.beanCovertMap(reportFeeMonthStatisticsDto)),
+ ReportFeeMonthStatisticsDto.class);
+ return deposits;
+ }
+
+ @Override
+ public int queryHuaningOweFeeCounts(@RequestBody ReportFeeMonthStatisticsDto reportFeeMonthStatisticsDto) {
+ return reportFeeMonthStatisticsServiceDaoImpl.queryHuaningOweFeeCounts(BeanConvertUtil.beanCovertMap(reportFeeMonthStatisticsDto));
+ }
+
+ @Override
+ public int queryHuaningPayFeeCount(@RequestBody Map paramInfo) {
+ return reportFeeMonthStatisticsServiceDaoImpl.queryHuaningPayFeeCount(paramInfo);
+ }
+
+ @Override
+ public List<Map> queryHuaningPayFee(@RequestBody Map paramInfo) {
+ int page = (int)paramInfo.get("page");
+
+ if (page != PageDto.DEFAULT_PAGE) {
+ paramInfo.put("page",(page - 1) * (int)paramInfo.get("row"));
+ }
+ List<Map> deposits = reportFeeMonthStatisticsServiceDaoImpl.queryHuaningPayFee(paramInfo);
+ return deposits;
+ }
+
+ @Override
+ public int queryHuaningPayFeeCounts(@RequestBody Map paramInfo) {
+ return reportFeeMonthStatisticsServiceDaoImpl.queryHuaningPayFeeCounts(paramInfo);
+ }
+
+ @Override
+ public int queryHuaningPayFeeTwoCount(@RequestBody Map paramInfo) {
+ return reportFeeMonthStatisticsServiceDaoImpl.queryHuaningPayFeeTwoCount(paramInfo);
+ }
+
+ @Override
+ public List<Map> queryHuaningPayFeeTwo(@RequestBody Map paramInfo) {
+ int page = (int)paramInfo.get("page");
+
+ if (page != PageDto.DEFAULT_PAGE) {
+ paramInfo.put("page",(page - 1) * (int)paramInfo.get("row"));
+ }
+ List<Map> deposits = reportFeeMonthStatisticsServiceDaoImpl.queryHuaningPayFeeTwo(paramInfo);
+ return deposits;
+ }
+
+ @Override
+ public int queryHuaningOweFeeDetailCount(@RequestBody Map paramInfo) {
+ return reportFeeMonthStatisticsServiceDaoImpl.queryHuaningOweFeeDetailCount(paramInfo);
+ }
+
+ @Override
+ public List<Map> queryHuaningOweFeeDetail(@RequestBody Map paramInfo) {
+ int page = (int)paramInfo.get("page");
+
+ if (page != PageDto.DEFAULT_PAGE) {
+ paramInfo.put("page",(page - 1) * (int)paramInfo.get("row"));
+ }
+ List<Map> deposits = reportFeeMonthStatisticsServiceDaoImpl.queryHuaningOweFeeDetail(paramInfo);
+ return deposits;
+ }
+
+ @Override
+ public List<OwnerDto> queryRoomAndParkingSpace(@RequestBody OwnerDto ownerDto) {
+ List<OwnerDto> deposits = BeanConvertUtil.covertBeanList(reportFeeMonthStatisticsServiceDaoImpl.queryRoomAndParkingSpace(BeanConvertUtil.beanCovertMap(ownerDto)),
+ OwnerDto.class);
+ return deposits;
+ }
+
+
public IReportFeeMonthStatisticsServiceDao getReportFeeMonthStatisticsServiceDaoImpl() {
return reportFeeMonthStatisticsServiceDaoImpl;
--
Gitblit v1.8.0