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-job/src/main/java/com/java110/job/export/adapt/ExportOwnerCarAdapt.java | 69 +++++++++++++++++++++++-----------
1 files changed, 47 insertions(+), 22 deletions(-)
diff --git a/service-job/src/main/java/com/java110/job/export/adapt/ExportOwnerCarAdapt.java b/service-job/src/main/java/com/java110/job/export/adapt/ExportOwnerCarAdapt.java
index 7bc7f97..ba6bfe0 100644
--- a/service-job/src/main/java/com/java110/job/export/adapt/ExportOwnerCarAdapt.java
+++ b/service-job/src/main/java/com/java110/job/export/adapt/ExportOwnerCarAdapt.java
@@ -1,12 +1,10 @@
package com.java110.job.export.adapt;
-import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.java110.dto.data.ExportDataDto;
import com.java110.dto.owner.OwnerCarDto;
import com.java110.dto.owner.OwnerRoomRelDto;
import com.java110.dto.parking.ParkingSpaceDto;
-import com.java110.dto.reportFee.ReportFeeMonthStatisticsDto;
import com.java110.dto.room.RoomDto;
import com.java110.intf.community.IParkingSpaceInnerServiceSMO;
import com.java110.intf.community.IRoomInnerServiceSMO;
@@ -23,8 +21,14 @@
import org.springframework.stereotype.Service;
import java.util.ArrayList;
+import java.util.Date;
import java.util.List;
+/**
+ * 涓氫富杞﹁締瀵煎嚭
+ *
+ * @date 2023-09-08
+ */
@Service("exportOwnerCar")
public class ExportOwnerCarAdapt implements IExportDataAdapt {
@@ -49,20 +53,19 @@
//宸ヤ綔琛�
workbook = new SXSSFWorkbook();
workbook.setCompressTempFiles(false);
-
-
Sheet sheet = workbook.createSheet("涓氫富杞﹁締");
Row row = sheet.createRow(0);
row.createCell(0).setCellValue("杞︾墝鍙�");
- row.createCell(1).setCellValue("鎴垮眿");
- row.createCell(2).setCellValue("杞﹁締绫诲瀷");
- row.createCell(3).setCellValue("棰滆壊");
- row.createCell(4).setCellValue("涓氫富");
- row.createCell(5).setCellValue("鎵嬫満鍙�");
- row.createCell(6).setCellValue("杞︿綅");
- row.createCell(7).setCellValue("寮�濮嬫椂闂�");
- row.createCell(8).setCellValue("缁撴潫鏃堕棿");
-
+ row.createCell(1).setCellValue("鎴愬憳杞﹁締");
+ row.createCell(2).setCellValue("鎴垮眿鍙�");
+ row.createCell(3).setCellValue("杞﹁締鍝佺墝");
+ row.createCell(4).setCellValue("杞﹁締绫诲瀷");
+ row.createCell(5).setCellValue("棰滆壊");
+ row.createCell(6).setCellValue("涓氫富");
+ row.createCell(7).setCellValue("杞︿綅");
+ row.createCell(8).setCellValue("鏈夋晥鏈�");
+ row.createCell(9).setCellValue("鐘舵��");
+ row.createCell(10).setCellValue("澶囨敞");
JSONObject reqJson = exportDataDto.getReqJson();
if (reqJson.containsKey("num") && !StringUtil.isEmpty(reqJson.getString("num"))) {
ParkingSpaceDto parkingSpaceDto = new ParkingSpaceDto();
@@ -102,16 +105,38 @@
row = sheet.createRow(roomIndex + step + 1);
dataObj = ownerCarDtoList.get(roomIndex);
row.createCell(0).setCellValue(dataObj.getCarNum());
- row.createCell(1).setCellValue(dataObj.getRoomName());
- row.createCell(2).setCellValue(dataObj.getCarTypeName());
- row.createCell(3).setCellValue(dataObj.getCarColor());
- row.createCell(4).setCellValue(dataObj.getOwnerName());
- row.createCell(5).setCellValue(dataObj.getLink());
- row.createCell(6).setCellValue(dataObj.getAreaNum()+"-"+dataObj.getNum());
- row.createCell(7).setCellValue(DateUtil.getFormatTimeStringA(dataObj.getStartTime()));
- row.createCell(8).setCellValue(DateUtil.getFormatTimeStringA(dataObj.getEndTime()));
+ if (!StringUtil.isEmpty(dataObj.getMemberCarCount())) {
+ row.createCell(1).setCellValue(dataObj.getMemberCarCount());
+ } else {
+ row.createCell(1).setCellValue("0");
+ }
+ row.createCell(2).setCellValue(dataObj.getRoomName());
+ row.createCell(3).setCellValue(dataObj.getCarBrand());
+ row.createCell(4).setCellValue(dataObj.getCarTypeName());
+ row.createCell(5).setCellValue(dataObj.getCarColor());
+ row.createCell(6).setCellValue(dataObj.getOwnerName() + "(" + dataObj.getLink() + ")");
+ if (!StringUtil.isEmpty(dataObj.getAreaNum()) && dataObj.getState().equals("1001")) {
+ row.createCell(7).setCellValue(dataObj.getAreaNum() + "-" + dataObj.getNum());
+ } else {
+ row.createCell(7).setCellValue("杞︿綅宸查噴鏀�");
+ }
+ if (!StringUtil.isEmpty(dataObj.getLeaseType()) && dataObj.getLeaseType().equals("H")) { //H 鏈堢杞︼紱S鍑哄敭杞︼紱I 鍐呴儴杞︼紱NM 鍏嶈垂杞︼紱R 棰勭害杞�
+ row.createCell(8).setCellValue(DateUtil.getFormatTimeStringA(dataObj.getStartTime()) + "~" + DateUtil.getFormatTimeStringA(dataObj.getEndTime()));
+ } else {
+ row.createCell(8).setCellValue("--");
+ }
+ //缁撴潫鏃堕棿
+ Date endTime = dataObj.getEndTime();
+ Date date = new Date();
+ if (!StringUtil.isEmpty(dataObj.getState()) && dataObj.getState().equals("3003")) { //1001 姝ｅ父锛�2002 娆犺垂锛�3003 杞︿綅閲婃斁
+ row.createCell(9).setCellValue("鍒版湡");
+ } else if (endTime.getTime() > date.getTime()) {
+ row.createCell(9).setCellValue("姝ｅ父");
+ } else {
+ row.createCell(9).setCellValue("鍒版湡");
+ }
+ row.createCell(10).setCellValue(dataObj.getRemark());
}
-
}
private void freshPs(List<OwnerCarDto> ownerCarDtoList) {
--
Gitblit v1.8.0